Merge "Fix Settings app crash for devices with no USB support." (e6af9327) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/InstalledAppDetails.java

+12 −8

Original line number	Diff line number	Diff line
		@@ -727,11 +727,13 @@ public class InstalledAppDetails extends Fragment
		if (localLOGV)
		Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
		boolean hasUsbDefaults = false;
		if (mUsbManager != null) { // may be null because USB service is optional
		try {
		hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.e(TAG, "mUsbManager.hasDefaults", e);
		}
		}
		boolean hasBindAppWidgetPermission =
		mAppWidgetManager.hasBindAppWidgetPermission(mAppEntry.info.packageName);

		@@ -1378,11 +1380,13 @@ public class InstalledAppDetails extends Fragment
		showDialogInner(DLG_SPECIAL_DISABLE, 0);
		} else if(v == mActivitiesButton) {
		mPm.clearPackagePreferredActivities(packageName);
		if (mUsbManager != null) { // may be null because USB service is optional
		try {
		mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.e(TAG, "mUsbManager.clearDefaults", e);
		}
		}
		mAppWidgetManager.setBindAppWidgetPermission(packageName, false);
		TextView autoLaunchTitleView =
		(TextView) mRootView.findViewById(R.id.auto_launch_title);