am e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter

* commit 'e6c7e45fdb5f23462693ea76eeac9489dd5c8dac':
  DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
This commit is contained in:
Mike Lockwood
2011-03-14 13:34:57 -07:00
committed by Android Git Automerger

View File

@@ -428,7 +428,7 @@ public class InstalledAppDetails extends Activity
if(localLOGV) Log.i(TAG, "Have "+prefActList.size()+" number of activities in prefered list"); if(localLOGV) Log.i(TAG, "Have "+prefActList.size()+" number of activities in prefered list");
boolean hasUsbDefaults = false; boolean hasUsbDefaults = false;
try { try {
hasUsbDefaults = mUsbManager.hasDefaults(packageName, mAppEntry.info.uid); hasUsbDefaults = mUsbManager.hasDefaults(packageName);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "mUsbManager.hasDefaults", e); Log.e(TAG, "mUsbManager.hasDefaults", e);
} }
@@ -752,7 +752,7 @@ public class InstalledAppDetails extends Activity
} else if(v == mActivitiesButton) { } else if(v == mActivitiesButton) {
mPm.clearPackagePreferredActivities(packageName); mPm.clearPackagePreferredActivities(packageName);
try { try {
mUsbManager.clearDefaults(packageName, mAppEntry.info.uid); mUsbManager.clearDefaults(packageName);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "mUsbManager.clearDefaults", e); Log.e(TAG, "mUsbManager.clearDefaults", e);
} }