No more UserHandleCompat

Bug: 32745285
Change-Id: I762fb4e268c1afe48a1860ab12a4ccb3f626aa95

1 files changed, 8 insertions, 8 deletions

diff --git a/src/com/android/launcher3/AllAppsList.java b/src/com/android/launcher3/AllAppsList.java
index bbc865036..34a44fc05 100644
--- a/src/com/android/launcher3/AllAppsList.java
+++ b/src/com/android/launcher3/AllAppsList.java
@@ -18,10 +18,10 @@ package com.android.launcher3;
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.os.UserHandle;
 
 import com.android.launcher3.compat.LauncherActivityInfoCompat;
 import com.android.launcher3.compat.LauncherAppsCompat;
-import com.android.launcher3.compat.UserHandleCompat;
 import com.android.launcher3.util.FlagOp;
 import com.android.launcher3.util.ItemInfoMatcher;
 
@@ -95,7 +95,7 @@ public class AllAppsList {
     /**
      * Add the icons for the supplied apk called packageName.
      */
-    public void addPackage(Context context, String packageName, UserHandleCompat user) {
+    public void addPackage(Context context, String packageName, UserHandle user) {
         final LauncherAppsCompat launcherApps = LauncherAppsCompat.getInstance(context);
         final List<LauncherActivityInfoCompat> matches = launcherApps.getActivityList(packageName,
                 user);
@@ -108,7 +108,7 @@ public class AllAppsList {
     /**
      * Remove the apps for the given apk identified by packageName.
      */
-    public void removePackage(String packageName, UserHandleCompat user) {
+    public void removePackage(String packageName, UserHandle user) {
         final List<AppInfo> data = this.data;
         for (int i = data.size() - 1; i >= 0; i--) {
             AppInfo info = data.get(i);
@@ -133,7 +133,7 @@ public class AllAppsList {
         }
     }
 
-    public void updateIconsAndLabels(HashSet<String> packages, UserHandleCompat user,
+    public void updateIconsAndLabels(HashSet<String> packages, UserHandle user,
             ArrayList<AppInfo> outUpdates) {
         for (AppInfo info : data) {
             if (info.user.equals(user) && packages.contains(info.componentName.getPackageName())) {
@@ -146,7 +146,7 @@ public class AllAppsList {
     /**
      * Add and remove icons for this package which has been updated.
      */
-    public void updatePackage(Context context, String packageName, UserHandleCompat user) {
+    public void updatePackage(Context context, String packageName, UserHandle user) {
         final LauncherAppsCompat launcherApps = LauncherAppsCompat.getInstance(context);
         final List<LauncherActivityInfoCompat> matches = launcherApps.getActivityList(packageName,
                 user);
@@ -210,7 +210,7 @@ public class AllAppsList {
      * MAIN/LAUNCHER activities in the supplied package.
      */
     static boolean packageHasActivities(Context context, String packageName,
-            UserHandleCompat user) {
+            UserHandle user) {
         final LauncherAppsCompat launcherApps = LauncherAppsCompat.getInstance(context);
         return launcherApps.getActivityList(packageName, user).size() > 0;
     }
@@ -219,7 +219,7 @@ public class AllAppsList {
      * Returns whether <em>apps</em> contains <em>component</em>.
      */
     private static boolean findActivity(ArrayList<AppInfo> apps, ComponentName component,
-            UserHandleCompat user) {
+            UserHandle user) {
         final int N = apps.size();
         for (int i = 0; i < N; i++) {
             final AppInfo info = apps.get(i);
@@ -233,7 +233,7 @@ public class AllAppsList {
     /**
      * Find an ApplicationInfo object for the given packageName and className.
      */
-    private AppInfo findApplicationInfoLocked(String packageName, UserHandleCompat user,
+    private AppInfo findApplicationInfoLocked(String packageName, UserHandle user,
             String className) {
         for (AppInfo info: data) {
             if (user.equals(info.user) && packageName.equals(info.componentName.getPackageName())