commit 5036f199742f1352136249ccdc07986d37f96116
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 27 00:21:40 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 27 00:21:40 2019 +0000
tree b9836c8f21edf4689ddc17ac7768e8cb4000ac0c
parent 78672f8ee962ff3ab6d2f67cdf1d720bc492cd11
parent 3fe04470637b1465507146d146197a2e03c9bcb8

Merge "OverlayManager API fixes" into ub-launcher3-master

src/com/android/customization/model/theme/DefaultThemeProvider.java

diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java
index 510b5e7..f4a09e8 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -103,11 +103,12 @@
 
         Consumer<OverlayInfo> addToMap = overlayInfo -> mOverlayInfos.put(
                 overlayInfo.packageName, overlayInfo);
-        om.getOverlayInfosForTarget(ANDROID_PACKAGE, UserHandle.myUserId()).forEach(addToMap);
-        om.getOverlayInfosForTarget(SYSUI_PACKAGE, UserHandle.myUserId()).forEach(addToMap);
-        om.getOverlayInfosForTarget(SETTINGS_PACKAGE, UserHandle.myUserId()).forEach(addToMap);
-        om.getOverlayInfosForTarget(ResourceConstants.getLauncherPackage(context),
-                UserHandle.myUserId()).forEach(addToMap);
+
+        UserHandle user = UserHandle.of(UserHandle.myUserId());
+        om.getOverlayInfosForTarget(ANDROID_PACKAGE, user).forEach(addToMap);
+        om.getOverlayInfosForTarget(SYSUI_PACKAGE, user).forEach(addToMap);
+        om.getOverlayInfosForTarget(SETTINGS_PACKAGE, user).forEach(addToMap);
+        om.getOverlayInfosForTarget(ResourceConstants.getLauncherPackage(context),user).forEach(addToMap);
         mShapePreviewIconPackages = context.getResources().getStringArray(
                 R.array.icon_shape_preview_packages);
     }

src/com/android/customization/model/theme/OverlayManagerCompat.java

diff --git a/src/com/android/customization/model/theme/OverlayManagerCompat.java b/src/com/android/customization/model/theme/OverlayManagerCompat.java
index 611b23c..8cca1ff 100644
--- a/src/com/android/customization/model/theme/OverlayManagerCompat.java
+++ b/src/com/android/customization/model/theme/OverlayManagerCompat.java
@@ -49,7 +49,8 @@
      * @return true if the operation succeeded
      */
     public boolean setEnabledExclusiveInCategory(String packageName, int userId) {
-        return mOverlayManager.setEnabledExclusiveInCategory(packageName, userId);
+        mOverlayManager.setEnabledExclusiveInCategory(packageName, UserHandle.of(userId));
+        return true;
     }
 
     /**
@@ -57,7 +58,8 @@
      * @return true if the operation succeeded
      */
     public boolean disableOverlay(String packageName, int userId) {
-        return mOverlayManager.setEnabled(packageName, false, userId);
+        mOverlayManager.setEnabled(packageName, false, UserHandle.of(userId));
+        return true;
     }
 
     /**
@@ -119,7 +121,7 @@
 
 
     private List<OverlayInfo> getOverlayInfosForTarget(String targetPackageName, int userId) {
-        return mOverlayManager.getOverlayInfosForTarget(targetPackageName, userId);
+        return mOverlayManager.getOverlayInfosForTarget(targetPackageName, UserHandle.of(userId));
     }
 
     private void addAllEnabledOverlaysForTarget(Map<String, String> overlays, String target) {