No more UserHandleCompat

Bug: 32745285
Change-Id: I762fb4e268c1afe48a1860ab12a4ccb3f626aa95
This commit is contained in:
Sunny Goyal
2016-12-15 15:53:17 -08:00
parent 338dee9dd7
commit 7c74e4ae64
62 changed files with 376 additions and 505 deletions

View File

@@ -20,11 +20,10 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.UserHandle;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.LauncherModel;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.util.MultiHashMap;
import com.android.launcher3.util.PackageManagerHelper;
@@ -43,10 +42,10 @@ public class SdCardAvailableReceiver extends BroadcastReceiver {
private final LauncherModel mModel;
private final Context mContext;
private final MultiHashMap<UserHandleCompat, String> mPackages;
private final MultiHashMap<UserHandle, String> mPackages;
public SdCardAvailableReceiver(LauncherModel model, Context context,
MultiHashMap<UserHandleCompat, String> packages) {
MultiHashMap<UserHandle, String> packages) {
mModel = model;
mContext = context;
mPackages = packages;
@@ -56,8 +55,8 @@ public class SdCardAvailableReceiver extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) {
final LauncherAppsCompat launcherApps = LauncherAppsCompat.getInstance(context);
final PackageManager manager = context.getPackageManager();
for (Entry<UserHandleCompat, ArrayList<String>> entry : mPackages.entrySet()) {
UserHandleCompat user = entry.getKey();
for (Entry<UserHandle, ArrayList<String>> entry : mPackages.entrySet()) {
UserHandle user = entry.getKey();
final ArrayList<String> packagesRemoved = new ArrayList<>();
final ArrayList<String> packagesUnavailable = new ArrayList<>();