diff options
3 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 90feab4327b7..82170d1ac60f 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -1195,6 +1195,12 @@ public class ActivityManager { */ public Rect bounds; + /** + * True if the task can go in the docked stack. + * @hide + */ + public boolean isDockable; + public RecentTaskInfo() { } @@ -1238,6 +1244,7 @@ public class ActivityManager { } else { dest.writeInt(0); } + dest.writeInt(isDockable ? 1 : 0); } public void readFromParcel(Parcel source) { @@ -1260,6 +1267,7 @@ public class ActivityManager { numActivities = source.readInt(); bounds = source.readInt() > 0 ? Rect.CREATOR.createFromParcel(source) : null; + isDockable = source.readInt() == 1; } public static final Creator<RecentTaskInfo> CREATOR @@ -1444,6 +1452,12 @@ public class ActivityManager { */ public long lastActiveTime; + /** + * True if the task can go in the docked stack. + * @hide + */ + public boolean isDockable; + public RunningTaskInfo() { } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 69cc39b3d378..978e69c9140a 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8591,6 +8591,7 @@ public final class ActivityManagerService extends ActivityManagerNative if (tr.mBounds != null) { rti.bounds = new Rect(tr.mBounds); } + rti.isDockable = tr.canGoInDockedStack(); ActivityRecord base = null; ActivityRecord top = null; diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index b9b2bb6a06ae..7de254ef9482 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -4542,6 +4542,7 @@ final class ActivityStack { } ci.numActivities = numActivities; ci.numRunning = numRunning; + ci.isDockable = task.canGoInDockedStack(); list.add(ci); } } |