Merge "Fix crash due to null uri in ContentObserver.onChange" into nyc-dev am: eb3cbd8 (5f54c081) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -646,17 +646,24 @@ public class WindowManagerService extends IWindowManager.Stub

		@Override
		public void onChange(boolean selfChange, Uri uri) {
		if (uri == null) {
		return;
		}

		if (mDisplayInversionEnabledUri.equals(uri)) {
		updateCircularDisplayMaskIfNeeded();
		} else {
		@UpdateAnimationScaleMode
		final int mode;
		if (uri.equals(mWindowAnimationScaleUri)) {
		if (mWindowAnimationScaleUri.equals(uri)) {
		mode = WINDOW_ANIMATION_SCALE;
		} else if (uri.equals(mTransitionAnimationScaleUri)) {
		} else if (mTransitionAnimationScaleUri.equals(uri)) {
		mode = TRANSITION_ANIMATION_SCALE;
		} else { // uri.equals(mAnimationDurationScaleUri)
		} else if (mAnimationDurationScaleUri.equals(uri)) {
		mode = ANIMATION_DURATION_SCALE;
		} else {
		// Ignoring unrecognized content changes
		return;
		}
		Message m = mH.obtainMessage(H.UPDATE_ANIMATION_SCALE, mode, 0);
		mH.sendMessage(m);