Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1563)

Unified Diff: base/android/java/src/org/chromium/base/BuildInfo.java

Issue 2772343003: Android: Remove GetApplicationContext part 1 (Closed)
Patch Set: rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/android/java/src/org/chromium/base/BuildInfo.java
diff --git a/base/android/java/src/org/chromium/base/BuildInfo.java b/base/android/java/src/org/chromium/base/BuildInfo.java
index 141b62b9e41f43be6c1404fd7b6cab7742231707..03bf4bc769368414dd17f744ed5080d72f7ab1f4 100644
--- a/base/android/java/src/org/chromium/base/BuildInfo.java
+++ b/base/android/java/src/org/chromium/base/BuildInfo.java
@@ -44,8 +44,8 @@ public class BuildInfo {
/**
* @return The build fingerprint for the current Android install. The value is truncated to a
- * 128 characters as this is used for crash and UMA reporting, which should avoid huge
- * strings.
+ * 128 characters as this is used for crash and UMA reporting, which should avoid huge
+ * strings.
*/
@CalledByNative
public static String getAndroidBuildFingerprint() {
@@ -64,10 +64,11 @@ public class BuildInfo {
}
@CalledByNative
- public static String getGMSVersionCode(Context context) {
+ public static String getGMSVersionCode() {
String msg = "gms versionCode not available.";
try {
- PackageManager packageManager = context.getPackageManager();
+ PackageManager packageManager =
+ ContextUtils.getApplicationContext().getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo("com.google.android.gms", 0);
msg = Integer.toString(packageInfo.versionCode);
} catch (NameNotFoundException e) {
@@ -77,11 +78,11 @@ public class BuildInfo {
}
@CalledByNative
- public static String getPackageVersionCode(Context context) {
+ public static String getPackageVersionCode() {
String msg = "versionCode not available.";
try {
- PackageManager pm = context.getPackageManager();
- PackageInfo pi = pm.getPackageInfo(context.getPackageName(), 0);
+ PackageManager pm = ContextUtils.getApplicationContext().getPackageManager();
+ PackageInfo pi = pm.getPackageInfo(getPackageName(), 0);
msg = "";
if (pi.versionCode > 0) {
msg = Integer.toString(pi.versionCode);
@@ -93,11 +94,11 @@ public class BuildInfo {
}
@CalledByNative
- public static String getPackageVersionName(Context context) {
+ public static String getPackageVersionName() {
String msg = "versionName not available";
try {
- PackageManager pm = context.getPackageManager();
- PackageInfo pi = pm.getPackageInfo(context.getPackageName(), 0);
+ PackageManager pm = ContextUtils.getApplicationContext().getPackageManager();
+ PackageInfo pi = pm.getPackageInfo(getPackageName(), 0);
msg = "";
if (pi.versionName != null) {
msg = pi.versionName;
@@ -109,15 +110,16 @@ public class BuildInfo {
}
@CalledByNative
- public static String getPackageLabel(Context context) {
+ public static String getPackageLabel() {
// Third-party code does disk read on the getApplicationInfo call. http://crbug.com/614343
StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
try {
- PackageManager packageManager = context.getPackageManager();
- ApplicationInfo appInfo = packageManager.getApplicationInfo(context.getPackageName(),
- PackageManager.GET_META_DATA);
+ PackageManager packageManager =
+ ContextUtils.getApplicationContext().getPackageManager();
+ ApplicationInfo appInfo = packageManager.getApplicationInfo(
+ getPackageName(), PackageManager.GET_META_DATA);
CharSequence label = packageManager.getApplicationLabel(appInfo);
- return label != null ? label.toString() : "";
+ return label != null ? label.toString() : "";
} catch (NameNotFoundException e) {
return "";
} finally {
@@ -126,9 +128,11 @@ public class BuildInfo {
}
@CalledByNative
- public static String getPackageName(Context context) {
- String packageName = context != null ? context.getPackageName() : null;
- return packageName != null ? packageName : "";
+ public static String getPackageName() {
+ if (ContextUtils.getApplicationContext() == null) {
+ return "";
+ }
+ return ContextUtils.getApplicationContext().getPackageName();
}
@CalledByNative
« no previous file with comments | « base/android/java/src/org/chromium/base/ApkAssets.java ('k') | base/android/java/src/org/chromium/base/ContentUriUtils.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698