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

Merge "Don\'t allow pinned activities to request visible behind" into nyc-dev am: 02ebaa0 am: 188b013

Browse Source 
am: bba910f

* commit 'bba910f8a245614949f43565a6ba2ee01dabe752':
  Don't allow pinned activities to request visible behind

Change-Id: Ie3389a2354325045cc465513d7466d359e93d464
This commit is contained in:
Wale Ogunwale
2016-04-18 04:38:46 +00:00
committed by android-build-merger
parent 3ec82f2eb0 bba910f8a2
commit 3cce9525aa
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/ActivityManager.java
View File

@@ -675,6 +675,14 @@ public class ActivityManager {
return isStaticStack(stackId) || stackId == PINNED_STACK_ID
|| stackId == FREEFORM_WORKSPACE_STACK_ID || stackId == DOCKED_STACK_ID;
}
/**
* Returns true if activities contained in this stack can request visible behind by
* calling {@link Activity#requestVisibleBehind}.
*/
public static boolean activitiesCanRequestVisibleBehind(int stackId) {
return stackId == FULLSCREEN_WORKSPACE_STACK_ID;
}
}
/**

14
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -2430,6 +2430,12 @@ public final class ActivityStackSupervisor implements DisplayListener {
try {
final TaskRecord task = r.task;
if (r == task.stack.getVisibleBehindActivity()) {
// An activity can't be pinned and visible behind at the same time. Go ahead and
// release it from been visible behind before pinning.
requestVisibleBehindLocked(r, false);
}
// Need to make sure the pinned stack exist so we can resize it below...
final ActivityStack stack = getStack(PINNED_STACK_ID, CREATE_IF_NEEDED, ON_TOP);
@@ -2689,6 +2695,14 @@ public final class ActivityStackSupervisor implements DisplayListener {
"requestVisibleBehind: r=" + r + " visible=" + visible + " stack is null");
return false;
}
if (visible && !StackId.activitiesCanRequestVisibleBehind(stack.mStackId)) {
if (DEBUG_VISIBLE_BEHIND) Slog.d(TAG_VISIBLE_BEHIND, "requestVisibleBehind: r=" + r
+ " visible=" + visible + " stackId=" + stack.mStackId
+ " can't contain visible behind activities");
return false;
}
final boolean isVisible = stack.hasVisibleBehindActivity();
if (DEBUG_VISIBLE_BEHIND) Slog.d(TAG_VISIBLE_BEHIND,
"requestVisibleBehind r=" + r + " visible=" + visible + " isVisible=" + isVisible);