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

Close PIP when PIP activity is finished

Browse Source 
Bug: 26717072
Change-Id: I5dd431b0ee64ca152bd49013bb6bbb3e8d9fba71
This commit is contained in:
Youngsang Cho
2016-01-26 17:51:33 -08:00
parent 40089ca995
commit 23df699451
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java
View File

@@ -101,7 +101,26 @@ public class PipManager {
@Override
public void run() {
if (mState != STATE_NO_PIP) {
// TODO: check whether PIP task is closed.
StackInfo stackInfo = null;
try {
stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID);
if (stackInfo == null) {
Log.w(TAG, "There is no pinned stack");
closeInternal(false);
return;
}
} catch (RemoteException e) {
Log.e(TAG, "getStackInfo failed", e);
return;
}
for (int i = stackInfo.taskIds.length - 1; i >= 0; --i) {
if (stackInfo.taskIds[i] == mPipTaskId) {
// PIP task is still alive.
return;
}
}
// PIP task doesn't exist anymore in PINNED_STACK.
closeInternal(true);
}
}
};
@@ -203,12 +222,18 @@ public class PipManager {
* Closes PIP (PIPed activity and PIP system UI).
*/
public void closePip() {
closeInternal(true);
}
private void closeInternal(boolean removePipStack) {
mState = STATE_NO_PIP;
mPipTaskId = TASK_ID_NO_PIP;
try {
mActivityManager.removeStack(PINNED_STACK_ID);
} catch (RemoteException e) {
Log.e(TAG, "removeStack failed", e);
if (removePipStack) {
try {
mActivityManager.removeStack(PINNED_STACK_ID);
} catch (RemoteException e) {
Log.e(TAG, "removeStack failed", e);
}
}
}