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

Merge "Fix Settings app crash for devices with no USB support."

Browse Source
This commit is contained in:
David Turner
2014-12-03 10:46:30 +00:00
committed by Gerrit Code Review
parent c5aa905a31 4c25fe2724
commit e6af93277c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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