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

Merge "Fix crash due to null uri in ContentObserver.onChange" into nyc-dev

Browse Source 
am: eb3cbd8

* commit 'eb3cbd82ee223a2c96be843c7eecba991e170c52':
  Fix crash due to null uri in ContentObserver.onChange

Change-Id: I722f912375a87e7420b744c75fa286964fb30721
This commit is contained in:
Chong Zhang
2016-04-14 23:31:19 +00:00
committed by android-build-merger
parent af47d077c3 eb3cbd82ee
commit 882ca9918c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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);