PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard against exception when reg/unreg content observer

Browse Source 
When an app injects an entry to Settings with dynamic title/summary, and
disables its content provider at runtime, Settings will crash while
trying to registering/unregistering the data observer.

Fix: 337567627
Test: manual
Flag: EXEMPT bugfix
Change-Id: I9c7f689c6696d91f0b8e40113a8df10375930ede
This commit is contained in:
Jason Chiu
2024-06-25 20:55:35 +08:00
parent aba2d057d6
commit f22b2668e0
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -649,8 +649,12 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
DynamicDataObserver observer) {
Log.d(TAG, "register observer: @" + Integer.toHexString(observer.hashCode())
+ ", uri: " + observer.getUri());
resolver.registerContentObserver(observer.getUri(), false, observer);
mRegisteredObservers.add(observer);
try {
resolver.registerContentObserver(observer.getUri(), false, observer);
mRegisteredObservers.add(observer);
} catch (Exception e) {
Log.w(TAG, "Cannot register observer: " + observer.getUri(), e);
}
}
private void unregisterDynamicDataObservers(List<DynamicDataObserver> observers) {
@@ -661,8 +665,13 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
observers.forEach(observer -> {
Log.d(TAG, "unregister observer: @" + Integer.toHexString(observer.hashCode())
+ ", uri: " + observer.getUri());
mRegisteredObservers.remove(observer);
resolver.unregisterContentObserver(observer);
if (mRegisteredObservers.remove(observer)) {
try {
resolver.unregisterContentObserver(observer);
} catch (Exception e) {
Log.w(TAG, "Cannot unregister observer: " + observer.getUri(), e);
}
}
});
}