Merge "core/Build: ro.system when comparing fingerprint"
am: 82fee58478
Change-Id: I527f1ff7c5e9dda76ec36dbe6fb1d041e6a36437
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index f21956b..4138e53 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1077,7 +1077,7 @@
return result == 0;
}
- final String system = SystemProperties.get("ro.build.fingerprint");
+ final String system = SystemProperties.get("ro.system.build.fingerprint");
final String vendor = SystemProperties.get("ro.vendor.build.fingerprint");
final String bootimage = SystemProperties.get("ro.bootimage.build.fingerprint");
final String requiredBootloader = SystemProperties.get("ro.build.expect.bootloader");
@@ -1086,7 +1086,7 @@
final String currentRadio = SystemProperties.get("gsm.version.baseband");
if (TextUtils.isEmpty(system)) {
- Slog.e(TAG, "Required ro.build.fingerprint is empty!");
+ Slog.e(TAG, "Required ro.system.build.fingerprint is empty!");
return false;
}