Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reset the default usb package less often" into oc-dev

Browse Source 
am: 1654143680

Change-Id: I8c7986ed572aea065140999281c91424aade8f48
This commit is contained in:
David Stevens
2017-04-12 01:13:37 +00:00
committed by android-build-merger
parent 6a26575076 1654143680
commit 8e40723876
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java
View File

@@ -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,8 +1206,11 @@ class UsbProfileGroupSettingsManager {
boolean changed = false;
for (DeviceFilter test : mDevicePreferenceMap.keySet()) {
if (filter.matches(test)) {
mDevicePreferenceMap.remove(test);
changed = true;
UserPackage currentMatch = mDevicePreferenceMap.get(test);
if (!currentMatch.packageName.equals(packageName)) {
mDevicePreferenceMap.remove(test);
changed = true;
}
}
}
return changed;
@@ -1218,8 +1220,11 @@ class UsbProfileGroupSettingsManager {
boolean changed = false;
for (AccessoryFilter test : mAccessoryPreferenceMap.keySet()) {
if (filter.matches(test)) {
mAccessoryPreferenceMap.remove(test);
changed = true;
UserPackage currentMatch = mAccessoryPreferenceMap.get(test);
if (!currentMatch.packageName.equals(packageName)) {
mAccessoryPreferenceMap.remove(test);
changed = true;
}
}
}
return changed;