diff options
6 files changed, 2 insertions, 50 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 32ef99582ac9..7adfa8dbae4f 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -144,7 +144,6 @@ interface IWindowManager void setAppStartingWindow(IBinder token, String pkg, int theme, in CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes, int icon, int logo, int windowFlags, IBinder transferFrom, boolean createIfNeeded); - void setAppWillBeHidden(IBinder token); void setAppVisibility(IBinder token, boolean visible); void startAppFreezingScreen(IBinder token, int configChanges); void stopAppFreezingScreen(IBinder token, boolean force); diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 5d106dce294b..a796ea7d4ab5 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1957,7 +1957,6 @@ final class ActivityStack { ? AppTransition.TRANSIT_ACTIVITY_CLOSE : AppTransition.TRANSIT_TASK_CLOSE, false); } - mWindowManager.setAppWillBeHidden(prev.appToken); mWindowManager.setAppVisibility(prev.appToken, false); } else { if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, @@ -1973,10 +1972,6 @@ final class ActivityStack { : AppTransition.TRANSIT_TASK_OPEN, false); } } - if (false) { - mWindowManager.setAppWillBeHidden(prev.appToken); - mWindowManager.setAppVisibility(prev.appToken, false); - } } else { if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare open transition: no previous"); if (mNoAnimActivities.contains(next)) { diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index ff216c5c763d..5a1ed582358c 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -74,10 +74,6 @@ class AppWindowToken extends WindowToken { // case do not clear allDrawn until the animation completes. boolean deferClearAllDrawn; - // Is this token going to be hidden in a little while? If so, it - // won't be taken into account for setting the screen orientation. - boolean willBeHidden; - // Is this window's surface needed? This is almost like hidden, except // it will sometimes be true a little earlier: when the token has // been shown, but is still waiting for its app transition to execute @@ -321,7 +317,6 @@ class AppWindowToken extends WindowToken { pw.print(" requestedOrientation="); pw.println(requestedOrientation); pw.print(prefix); pw.print("hiddenRequested="); pw.print(hiddenRequested); pw.print(" clientHidden="); pw.print(clientHidden); - pw.print(" willBeHidden="); pw.print(willBeHidden); pw.print(" reportedDrawn="); pw.print(reportedDrawn); pw.print(" reportedVisible="); pw.println(reportedVisible); if (paused) { diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 11960fe4299c..76e7c3c84575 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -3268,8 +3268,7 @@ public class WindowManagerService extends IWindowManager.Stub // if we're about to tear down this window and not seek for // the behind activity, don't use it for orientation - if (!findingBehind - && (!atoken.hidden && atoken.hiddenRequested)) { + if (!findingBehind && !atoken.hidden && atoken.hiddenRequested) { if (DEBUG_ORIENTATION) Slog.v(TAG, "Skipping " + atoken + " -- going to hide"); continue; @@ -3290,7 +3289,7 @@ public class WindowManagerService extends IWindowManager.Stub } // We ignore any hidden applications on the top. - if (atoken.hiddenRequested || atoken.willBeHidden) { + if (atoken.hiddenRequested) { if (DEBUG_ORIENTATION) Slog.v(TAG, "Skipping " + atoken + " -- hidden on top"); continue; @@ -3786,7 +3785,6 @@ public class WindowManagerService extends IWindowManager.Stub if (!ttoken.hidden) { wtoken.hidden = false; wtoken.hiddenRequested = false; - wtoken.willBeHidden = false; } if (wtoken.clientHidden != ttoken.clientHidden) { wtoken.clientHidden = ttoken.clientHidden; @@ -3842,25 +3840,6 @@ public class WindowManagerService extends IWindowManager.Stub } } - @Override - public void setAppWillBeHidden(IBinder token) { - if (!checkCallingPermission(android.Manifest.permission.MANAGE_APP_TOKENS, - "setAppWillBeHidden()")) { - throw new SecurityException("Requires MANAGE_APP_TOKENS permission"); - } - - AppWindowToken wtoken; - - synchronized(mWindowMap) { - wtoken = findAppWindowToken(token); - if (wtoken == null) { - Slog.w(TAG, "Attempted to set will be hidden of non-existing app token: " + token); - return; - } - wtoken.willBeHidden = true; - } - } - public void setAppFullscreen(IBinder token, boolean toOpaque) { synchronized (mWindowMap) { AppWindowToken atoken = findAppWindowToken(token); @@ -3897,7 +3876,6 @@ public class WindowManagerService extends IWindowManager.Stub wtoken.sendAppVisibilityToClients(); } - wtoken.willBeHidden = false; // Allow for state changes and animation to be applied if: // * token is transitioning visibility state // * or the token was marked as hidden and is exiting before we had a chance to play the diff --git a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java index b9e7500598d1..a390b0cab321 100644 --- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java @@ -175,16 +175,6 @@ public class WindowManagerPermissionTests extends TestCase { } try { - mWm.setAppWillBeHidden(null); - fail("IWindowManager.setAppWillBeHidden did not throw SecurityException as" - + " expected"); - } catch (SecurityException e) { - // expected - } catch (RemoteException e) { - fail("Unexpected remote exception"); - } - - try { mWm.setAppVisibility(null, false); fail("IWindowManager.setAppVisibility did not throw SecurityException as" + " expected"); diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java index 778d1a5e51ac..0da6bb62006c 100644 --- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java +++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java @@ -338,11 +338,6 @@ public class IWindowManagerImpl implements IWindowManager { } @Override - public void setAppWillBeHidden(IBinder arg0) throws RemoteException { - // TODO Auto-generated method stub - } - - @Override public void setEventDispatching(boolean arg0) throws RemoteException { // TODO Auto-generated method stub } |