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

Bug: 4061035

Change-Id: Idfec53b1da7b9b981c1c762468a3f69f78fedd7a
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2011-03-09 12:10:41 -05:00
parent 36469186b7
commit e6c7e45fdb

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);
} }