Merge "PIP: Rename closeInternal to closePipInternal" into nyc-dev

am: ffd4c73a29

* commit 'ffd4c73a293ebac22efa644db99ba907f9776604':
  PIP: Rename closeInternal to closePipInternal
This commit is contained in:
Youngsang Cho
2016-02-22 20:07:47 +00:00
committed by android-build-merger

View File

@@ -106,7 +106,7 @@ public class PipManager {
stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID);
if (stackInfo == null) {
Log.w(TAG, "There is no pinned stack");
closeInternal(false);
closePipInternal(false);
return;
}
} catch (RemoteException e) {
@@ -120,7 +120,7 @@ public class PipManager {
}
}
// PIP task doesn't exist anymore in PINNED_STACK.
closeInternal(true);
closePipInternal(true);
}
}
};
@@ -222,10 +222,10 @@ public class PipManager {
* Closes PIP (PIPed activity and PIP system UI).
*/
public void closePip() {
closeInternal(true);
closePipInternal(true);
}
private void closeInternal(boolean removePipStack) {
private void closePipInternal(boolean removePipStack) {
mState = STATE_NO_PIP;
mPipTaskId = TASK_ID_NO_PIP;
if (removePipStack) {