Launcher change corresponding to platform change.

Here is platform change : ag/540450

Added try catch block so the APK works on older builds as well.

Bug: 17390424
Change-Id: Id5731c65f036e35b71aa74ce6d8ae031107ed60b
This commit is contained in:
Dharmesh Mokani
2014-09-05 15:59:00 -07:00
parent a38dc90188
commit f9847b9bd3
3 changed files with 30 additions and 13 deletions

View File

@@ -18,6 +18,7 @@
package com.android.launcher3.compat;
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
import android.os.UserManager;
@@ -27,9 +28,11 @@ import java.util.Collections;
import java.util.List;
public class UserManagerCompatVL extends UserManagerCompatV17 {
private final PackageManager mPm;
UserManagerCompatVL(Context context) {
super(context);
mPm = context.getPackageManager();
}
@Override
@@ -48,7 +51,13 @@ public class UserManagerCompatVL extends UserManagerCompatV17 {
@Override
public Drawable getBadgedDrawableForUser(Drawable unbadged, UserHandleCompat user) {
return mUserManager.getBadgedIconForUser(unbadged, user.getUser());
// STOPSHIP(mokani): Remove catch block once dogfood build is bigger than LRW70.
// This hack is just to prevent crash in older builds.
try {
return mPm.getUserBadgedIcon(unbadged, user.getUser());
} catch (Exception e) {
return unbadged;
}
}
@Override
@@ -56,7 +65,13 @@ public class UserManagerCompatVL extends UserManagerCompatV17 {
if (user == null) {
return label;
}
return mUserManager.getBadgedLabelForUser(label, user.getUser());
// STOPSHIP(mokani): Remove catch block once dogfood build is bigger than LRW70.
// This hack is just to prevent crash in older builds.
try {
return mPm.getUserBadgedLabel(label, user.getUser());
} catch (Exception e) {
return label;
}
}
}