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

Merge "Toast timeout: Just strip FLAG_KEEP_SCREEN_ON" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-15 00:59:19 +00:00
committed by Android (Google) Code Review
parent 2c2f8acdab 291aea2202
commit 3e5df9fb50
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,6 +177,7 @@ import static android.view.WindowManager.DOCKED_TOP;
import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;
import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW;
import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
import static android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
import static android.view.WindowManager.LayoutParams.FLAG_SECURE; import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
@@ -8614,12 +8615,18 @@ public class WindowManagerService extends IWindowManager.Stub
case WINDOW_REMOVE_TIMEOUT: { case WINDOW_REMOVE_TIMEOUT: {
final WindowState window = (WindowState) msg.obj; final WindowState window = (WindowState) msg.obj;
synchronized(mWindowMap) { synchronized(mWindowMap) {
// It's counterintuitive that we check that "mWindowRemovalAllowed" // TODO: This is all about fixing b/21693547
// is false. But in fact if it's true, it means a remove has already // where partially initialized Toasts get stuck
// been requested and we better just not do anything. // around and keep the screen on. We'd like
if (!window.mRemoved && !window.mWindowRemovalAllowed) { // to just remove the toast...but this can cause clients
removeWindowLocked(window); // who miss the timeout due to normal circumstances (e.g.
} // running under debugger) to crash (b/29105388). The windows will
// eventually be removed when the client process finishes.
// The best we can do for now is remove the FLAG_KEEP_SCREEN_ON
// and prevent the symptoms of b/21693547.
window.mAttrs.flags &= ~FLAG_KEEP_SCREEN_ON;
window.setDisplayLayoutNeeded();
mWindowPlacerLocked.performSurfacePlacement();
} }
} }
break; break;