Merge "Reset the default usb package less often" into oc-dev (8e407238) · Commits · e / os / android_frameworks_base

services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -543,9 +543,8 @@ class UsbProfileGroupSettingsManager {
		}

		@Override
		public boolean onPackageChanged(String packageName, int uid, String[] components) {
		public void onPackageUpdateFinished(String packageName, int uid) {
		handlePackageUpdate(packageName);
		return false;
		}

		@Override
		@@ -1207,10 +1206,13 @@ class UsbProfileGroupSettingsManager {
		boolean changed = false;
		for (DeviceFilter test : mDevicePreferenceMap.keySet()) {
		if (filter.matches(test)) {
		UserPackage currentMatch = mDevicePreferenceMap.get(test);
		if (!currentMatch.packageName.equals(packageName)) {
		mDevicePreferenceMap.remove(test);
		changed = true;
		}
		}
		}
		return changed;
		}

		@@ -1218,10 +1220,13 @@ class UsbProfileGroupSettingsManager {
		boolean changed = false;
		for (AccessoryFilter test : mAccessoryPreferenceMap.keySet()) {
		if (filter.matches(test)) {
		UserPackage currentMatch = mAccessoryPreferenceMap.get(test);
		if (!currentMatch.packageName.equals(packageName)) {
		mAccessoryPreferenceMap.remove(test);
		changed = true;
		}
		}
		}
		return changed;
		}