commit b578bdbe43ef7bedcda2993cf262137c7452e802
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 29 17:10:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 29 17:10:43 2019 +0000
tree 3a4565155eaa9cc11089973a860aa893b564c4cd
parent 82fee5847845950fcf6ac1be2c057f269a9a7b76
parent 6a509cf4a598c1595c8a237b8b1579f91ebc922b

Merge "Adding version code R for development"

Android.bp

diff --git a/Android.bp b/Android.bp
index 5f06a63..2e8e907 100644
--- a/Android.bp
+++ b/Android.bp
@@ -949,7 +949,8 @@
     "--hide CallbackInterface " +
     "--hide MissingPermission --hide BroadcastBehavior " +
     "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
-    "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo "
+    "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +
+    "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*"
 
 packages_to_document = [
     "android",

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 7787443..1eda4d9 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1082,7 +1082,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");
@@ -1091,7 +1091,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;
         }