summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorFelix <google@ix5.org>2019-11-28 18:49:53 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-28 18:49:53 -0800
commitdce3bc68cd5e877660de082e4df59dcddf2010dc (patch)
treefb9c85da4b265f0be7629058a07897fd8443ec9b /core/java
parenta4b7bf2d43ed02ac69340980430bab7f6b89c448 (diff)
parent13973373464baeb39e0176d1862135dc79364a33 (diff)
Merge "core/Build: ro.system when comparing fingerprint" am: 82fee58478
am: 1397337346 Change-Id: I3af5fa835de85906b1ab01e92856d93e82afb51c
Diffstat (limited to 'core/java')
-rwxr-xr-xcore/java/android/os/Build.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index b07e3c1ec6d5..c24ba63f734d 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1078,7 +1078,7 @@ public class Build {
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");
@@ -1087,7 +1087,7 @@ public class Build {
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;
}