summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp1
-rw-r--r--core/java/com/android/internal/app/chooser/SelectableTargetInfo.java2
-rw-r--r--services/Android.bp1
3 files changed, 3 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index f69f9d856d5e..4121b8a7f9e1 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 900e18d468bb..28a96013e1c0 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 971f4dda440c..25a0d7e06b22 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -6,6 +6,7 @@ java_defaults {
errorprone: {
javacflags: [
"-Xep:AndroidFrameworkCompatChange:ERROR",
+ "-Xep:AndroidFrameworkUid:ERROR",
],
},
}