diff --git a/Android.bp b/Android.bp
index f69f9d856d5eaf5ee31414af49bb0daf7699edeb..4121b8a7f9e11ea3903fe2341d888de77283982a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -601,6 +601,7 @@ java_library {
     errorprone: {
         javacflags: [
             "-Xep:AndroidFrameworkCompatChange:ERROR",
+            "-Xep:AndroidFrameworkUid:ERROR",
         ],
     },
 }
diff --git a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java b/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java
index 900e18d468bb9aa66a00f4501f5beda6b5978d1c..28a96013e1c0d0ac04dc7af445159a76ada16ae6 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 @@ public final class SelectableTargetInfo implements ChooserTargetInfo {
 
         // 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);
diff --git a/services/Android.bp b/services/Android.bp
index 971f4dda440c195ef1a1f3ea03e524d2c9753d3f..25a0d7e06b22b9488c3567075b020457de9d30e5 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -6,6 +6,7 @@ java_defaults {
     errorprone: {
         javacflags: [
             "-Xep:AndroidFrameworkCompatChange:ERROR",
+            "-Xep:AndroidFrameworkUid:ERROR",
         ],
     },
 }