commit 9af4aea0c38306c341b7b29cfbc558afccd2c27d
author Jeff Sharkey <jsharkey@android.com> Fri Oct 02 12:00:59 2020 -0600
committer Jeff Sharkey <jsharkey@android.com> Fri Oct 02 13:56:44 2020 -0600
tree 15da0f96348fc209715c71dac698c7d1df1b86de
parent 6c8ffbca512efd5478108aac7a55831985e1229d

Upgrade AndroidFrameworkUid to be fatal error.

We've fixed the one remaining example of code that accidentally
crosses UID with userId, so this change upgrades the check to become
a fatal build error to prevent future bugs.

Bug: 155703208
Test: atest error_prone_android_framework_test
Change-Id: I3bc46f8039a88b5f3d5f89dc9b5fda785d5c654f

Android.bp

diff --git a/Android.bp b/Android.bp
index f69f9d8..4121b8a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -601,6 +601,7 @@
     errorprone: {
         javacflags: [
             "-Xep:AndroidFrameworkCompatChange:ERROR",
+            "-Xep:AndroidFrameworkUid:ERROR",
         ],
     },
 }

core/java/com/android/internal/app/chooser/SelectableTargetInfo.java

diff --git a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java b/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java
index 900e18d..28a9601 100644
--- a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java
+++ b/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java
@@ -166,7 +166,7 @@
 
         // Now fetch app icon and raster with no badging even in work profile
         Bitmap appIcon = mSelectableTargetInfoCommunicator.makePresentationGetter(info)
-                .getIconBitmap(UserHandle.getUserHandleForUid(UserHandle.myUserId()));
+                .getIconBitmap(android.os.Process.myUserHandle());
 
         // Raster target drawable with appIcon as a badge
         SimpleIconFactory sif = SimpleIconFactory.obtain(mContext);

services/Android.bp

diff --git a/services/Android.bp b/services/Android.bp
index 971f4dd..25a0d7e 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -6,6 +6,7 @@
     errorprone: {
         javacflags: [
             "-Xep:AndroidFrameworkCompatChange:ERROR",
+            "-Xep:AndroidFrameworkUid:ERROR",
         ],
     },
 }