Merge "Guard against exception when reg/unreg content observer" into main (49fc26ce) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/dashboard/DashboardFragment.java

+13 −4

Original line number	Diff line number	Diff line
		@@ -649,8 +649,12 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
		DynamicDataObserver observer) {
		Log.d(TAG, "register observer: @" + Integer.toHexString(observer.hashCode())
		+ ", uri: " + observer.getUri());
		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);
		if (mRegisteredObservers.remove(observer)) {
		try {
		resolver.unregisterContentObserver(observer);
		} catch (Exception e) {
		Log.w(TAG, "Cannot unregister observer: " + observer.getUri(), e);
		}
		}
		});
		}