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

Merge "Fix issue with PiP callbacks not being handled" am: bdd8adb006

Browse Source 
am: 4e11a71210

Change-Id: I0ad21e140aa10566f58acfa01fb7e4172edca0d3
This commit is contained in:
Winson Chung
2017-11-29 20:50:00 +00:00
committed by android-build-merger
parent 374bde37b9 4e11a71210
commit 3b38be2962
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,9 +619,7 @@ public class PipManager implements BasePipManager {
@Override @Override
public void onTaskStackChanged() { public void onTaskStackChanged() {
if (DEBUG) Log.d(TAG, "onTaskStackChanged()"); if (DEBUG) Log.d(TAG, "onTaskStackChanged()");
if (!checkCurrentUserId(mContext, DEBUG)) {
return;
}
if (getState() != STATE_NO_PIP) { if (getState() != STATE_NO_PIP) {
boolean hasPip = false; boolean hasPip = false;
@@ -656,9 +654,7 @@ public class PipManager implements BasePipManager {
@Override @Override
public void onActivityPinned(String packageName, int userId, int taskId) { public void onActivityPinned(String packageName, int userId, int taskId) {
if (DEBUG) Log.d(TAG, "onActivityPinned()"); if (DEBUG) Log.d(TAG, "onActivityPinned()");
if (!checkCurrentUserId(mContext, DEBUG)) {
return;
}
StackInfo stackInfo = getPinnedStackInfo(); StackInfo stackInfo = getPinnedStackInfo();
if (stackInfo == null) { if (stackInfo == null) {
Log.w(TAG, "Cannot find pinned stack"); Log.w(TAG, "Cannot find pinned stack");
@@ -683,9 +679,7 @@ public class PipManager implements BasePipManager {
@Override @Override
public void onPinnedActivityRestartAttempt(boolean clearedTask) { public void onPinnedActivityRestartAttempt(boolean clearedTask) {
if (DEBUG) Log.d(TAG, "onPinnedActivityRestartAttempt()"); if (DEBUG) Log.d(TAG, "onPinnedActivityRestartAttempt()");
if (!checkCurrentUserId(mContext, DEBUG)) {
return;
}
// If PIPed activity is launched again by Launcher or intent, make it fullscreen. // If PIPed activity is launched again by Launcher or intent, make it fullscreen.
movePipToFullscreen(); movePipToFullscreen();
} }
@@ -693,9 +687,7 @@ public class PipManager implements BasePipManager {
@Override @Override
public void onPinnedStackAnimationEnded() { public void onPinnedStackAnimationEnded() {
if (DEBUG) Log.d(TAG, "onPinnedStackAnimationEnded()"); if (DEBUG) Log.d(TAG, "onPinnedStackAnimationEnded()");
if (!checkCurrentUserId(mContext, DEBUG)) {
return;
}
switch (getState()) { switch (getState()) {
case STATE_PIP_MENU: case STATE_PIP_MENU:
showPipMenu(); showPipMenu();