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

@@ -25,11 +25,11 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Handler;
import android.os.UserHandle;
import android.util.Log;
import android.util.LongSparseArray;
import com.android.launcher3.compat.AppWidgetManagerCompat;
import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.model.WidgetItem;
import com.android.launcher3.util.ComponentKey;
@@ -149,11 +149,11 @@ public class WidgetPreviewLoader {
mDb.insertOrReplace(values);
}
public void removePackage(String packageName, UserHandleCompat user) {
public void removePackage(String packageName, UserHandle user) {
removePackage(packageName, user, mUserManager.getSerialNumberForUser(user));
}
private void removePackage(String packageName, UserHandleCompat user, long userSerial) {
private void removePackage(String packageName, UserHandle user, long userSerial) {
synchronized(mPackageVersions) {
mPackageVersions.remove(packageName);
}
@@ -217,7 +217,7 @@ public class WidgetPreviewLoader {
for (int i = 0; i < packagesToDelete.size(); i++) {
long userId = packagesToDelete.keyAt(i);
UserHandleCompat user = mUserManager.getUserForSerialNumber(userId);
UserHandle user = mUserManager.getUserForSerialNumber(userId);
for (String pkg : packagesToDelete.valueAt(i)) {
removePackage(pkg, user, userId);
}
@@ -652,7 +652,7 @@ public class WidgetPreviewLoader {
// TODO: remove dependency on size
@Thunk final String size;
public WidgetCacheKey(ComponentName componentName, UserHandleCompat user, String size) {
public WidgetCacheKey(ComponentName componentName, UserHandle user, String size) {
super(componentName, user);
this.size = size;
}