diff options
| author | George Mount <mount@google.com> | 2014-09-04 18:03:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 18:03:52 +0000 |
| commit | 0f6c32af063a44e22af72825f19f51808a2c0cf3 (patch) | |
| tree | a8c61c7af1e28d01b3b15f99e4171bce9b3a0595 /services/core/java/com/android/server/am | |
| parent | 6bed40eddc29c536c064c9238cfefe863c3d0db5 (diff) | |
| parent | 9e18397112df0ebe49b9e4325d7040498b2afcfa (diff) | |
| download | frameworks_base-0f6c32af063a44e22af72825f19f51808a2c0cf3.zip frameworks_base-0f6c32af063a44e22af72825f19f51808a2c0cf3.tar.gz frameworks_base-0f6c32af063a44e22af72825f19f51808a2c0cf3.tar.bz2 | |
Merge ""Back" with translucent window now sets ActivityOptions." into lmp-dev
Diffstat (limited to 'services/core/java/com/android/server/am')
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 2e9df8a..b116d76 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -10346,8 +10346,8 @@ public final class ActivityManagerService extends ActivityManagerNative final boolean translucentChanged = r.changeWindowTranslucency(false); if (translucentChanged) { r.task.stack.convertToTranslucent(r); - mStackSupervisor.ensureActivitiesVisibleLocked(null, 0); } + mStackSupervisor.ensureActivitiesVisibleLocked(null, 0); mWindowManager.setAppFullscreen(token, false); return translucentChanged; } |