PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-11-07 19:13:27 +00:00
committed by Android (Google) Code Review
parent cc0a2c554a b81e7937b3
commit 2a4f034da4
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -731,7 +731,9 @@ public class InstalledAppDetails extends Fragment
Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list"); Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
boolean hasUsbDefaults = false; boolean hasUsbDefaults = false;
try { try {
hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId()); if (mUsbManager != null) {
hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
}
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "mUsbManager.hasDefaults", e); Log.e(TAG, "mUsbManager.hasDefaults", e);
} }
@@ -1380,17 +1382,19 @@ public class InstalledAppDetails extends Fragment
} else if(v == mSpecialDisableButton) { } else if(v == mSpecialDisableButton) {
showDialogInner(DLG_SPECIAL_DISABLE, 0); showDialogInner(DLG_SPECIAL_DISABLE, 0);
} else if(v == mActivitiesButton) { } else if(v == mActivitiesButton) {
mPm.clearPackagePreferredActivities(packageName); if (mUsbManager != null) {
try { mPm.clearPackagePreferredActivities(packageName);
mUsbManager.clearDefaults(packageName, UserHandle.myUserId()); try {
} catch (RemoteException e) { mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
Log.e(TAG, "mUsbManager.clearDefaults", e); } catch (RemoteException e) {
Log.e(TAG, "mUsbManager.clearDefaults", e);
}
mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
TextView autoLaunchTitleView =
(TextView) mRootView.findViewById(R.id.auto_launch_title);
TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
} }
mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
TextView autoLaunchTitleView =
(TextView) mRootView.findViewById(R.id.auto_launch_title);
TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
} else if(v == mClearDataButton) { } else if(v == mClearDataButton) {
if (mAppEntry.info.manageSpaceActivityName != null) { if (mAppEntry.info.manageSpaceActivityName != null) {
if (!Utils.isMonkeyRunning()) { if (!Utils.isMonkeyRunning()) {