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

Browse Source 
We allow a single toast window per UID. It is possible that
the UID had another toast window that is going away and this
CL adds a missed check for when a window is scheduled to be
removed.

bug:31340854

Change-Id: I0621516019542c85fe7121f7fe61659e4d4eb672
This commit is contained in:
Svetoslav Ganov
2016-10-17 18:41:48 -07:00
parent c81e1f15d2
commit 5c90c5e32e
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 static com.android.server.wm.WindowState.RESIZE_HANDLE_WIDTH_IN_DP;
import android.app.ActivityManager.StackId; import android.app.ActivityManager.StackId;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.graphics.Region; import android.graphics.Region;
import android.graphics.Region.Op; import android.graphics.Region.Op;
import android.os.Build;
import android.os.UserHandle;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Slog; import android.util.Slog;
import android.view.Display; import android.view.Display;
@@ -728,8 +724,7 @@ class DisplayContent {
for (int i = 0; i < windowCount; i++) { for (int i = 0; i < windowCount; i++) {
WindowState window = windows.get(i); WindowState window = windows.get(i);
if (window.mAttrs.type == TYPE_TOAST && window.mOwnerUid == uid if (window.mAttrs.type == TYPE_TOAST && window.mOwnerUid == uid
&& !window.mPermanentlyHidden && !window.mAnimatingExit && !window.isRemovedOrHidden()) {
&& !window.mRemoveOnExit) {
return false; 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() { public boolean isRtl() {
return mMergedConfiguration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; return mMergedConfiguration.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
} }
public boolean isRemovedOrHidden() {
return mPermanentlyHidden || mAnimatingExit
|| mRemoveOnExit || mWindowRemovalAllowed
|| mViewVisibility == View.GONE;
}
} }