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

[DO NOT MERGE] Catch a missed case when adding a toast am: 5c90c5e32e

Browse Source 
am: a9aa78b1fd

Change-Id: Iba49fa7331a183fe14cd87583a8614552f33aadd
This commit is contained in:
Svetoslav Ganov
2016-10-19 01:55:18 +00:00
committed by android-build-merger
parent 1ff7f78266 a9aa78b1fd
commit 6c693aa777
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -28,15 +28,11 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
import static com.android.server.wm.WindowState.RESIZE_HANDLE_WIDTH_IN_DP;
import android.app.ActivityManager.StackId;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.Matrix;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.Region;
import android.graphics.Region.Op;
import android.os.Build;
import android.os.UserHandle;
import android.util.DisplayMetrics;
import android.util.Slog;
import android.view.Display;
@@ -728,8 +724,7 @@ class DisplayContent {
for (int i = 0; i < windowCount; i++) {
WindowState window = windows.get(i);
if (window.mAttrs.type == TYPE_TOAST && window.mOwnerUid == uid
&& !window.mPermanentlyHidden && !window.mAnimatingExit
&& !window.mRemoveOnExit) {
&& !window.isRemovedOrHidden()) {
return false;
}
}

6
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2961,4 +2961,10 @@ final class WindowState implements WindowManagerPolicy.WindowState {
public boolean isRtl() {
return mMergedConfiguration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
}
public boolean isRemovedOrHidden() {
return mPermanentlyHidden || mAnimatingExit
|| mRemoveOnExit || mWindowRemovalAllowed
|| mViewVisibility == View.GONE;
}
}