Merge "UsbDeviceSettingsManager: don't write settings file when not necessary" (6ebc6bde) · Commits · e / os / android_frameworks_base

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

+18 −8

Original line number	Diff line number	Diff line
		@@ -741,29 +741,39 @@ class UsbDeviceSettingsManager {

		public void setDevicePackage(UsbDevice device, String packageName) {
		DeviceFilter filter = new DeviceFilter(device);
		boolean changed = false;
		synchronized (mLock) {
		if (packageName == null) {
		mDevicePreferenceMap.remove(filter);
		changed = (mDevicePreferenceMap.remove(filter) != null);
		} else {
		changed = !packageName.equals(mDevicePreferenceMap.get(filter));
		if (changed) {
		mDevicePreferenceMap.put(filter, packageName);
		}
		// FIXME - only if changed
		}
		if (changed) {
		writeSettingsLocked();
		}
		}
		}

		public void setAccessoryPackage(UsbAccessory accessory, String packageName) {
		AccessoryFilter filter = new AccessoryFilter(accessory);
		boolean changed = false;
		synchronized (mLock) {
		if (packageName == null) {
		mAccessoryPreferenceMap.remove(filter);
		changed = (mAccessoryPreferenceMap.remove(filter) != null);
		} else {
		changed = !packageName.equals(mAccessoryPreferenceMap.get(filter));
		if (changed) {
		mAccessoryPreferenceMap.put(filter, packageName);
		}
		// FIXME - only if changed
		}
		if (changed) {
		writeSettingsLocked();
		}
		}
		}

		public void grantDevicePermission(UsbDevice device, int uid) {
		synchronized (mLock) {