Merge "Follow API changes in framework." into jb-mr1-dev

This commit is contained in:
Jeff Sharkey
2012-10-02 19:02:46 -07:00
committed by Android (Google) Code Review

View File

@@ -605,7 +605,7 @@ 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); hasUsbDefaults = mUsbManager.hasDefaults(packageName, UserHandle.myUserId());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "mUsbManager.hasDefaults", e); Log.e(TAG, "mUsbManager.hasDefaults", e);
} }
@@ -1218,7 +1218,7 @@ public class InstalledAppDetails extends Fragment
} else if(v == mActivitiesButton) { } else if(v == mActivitiesButton) {
mPm.clearPackagePreferredActivities(packageName); mPm.clearPackagePreferredActivities(packageName);
try { try {
mUsbManager.clearDefaults(packageName); mUsbManager.clearDefaults(packageName, UserHandle.myUserId());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "mUsbManager.clearDefaults", e); Log.e(TAG, "mUsbManager.clearDefaults", e);
} }