Merge "Fixing crash when fetching stack bounds."

This commit is contained in:
Winson Chung
2017-02-08 03:24:56 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 2 deletions

View File

@@ -107,7 +107,9 @@ public class PipMotionHelper {
cancelAnimations();
try {
StackInfo stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID);
mBounds.set(stackInfo.bounds);
if (stackInfo != null) {
mBounds.set(stackInfo.bounds);
}
} catch (RemoteException e) {
Log.w(TAG, "Failed to get pinned stack bounds");
}

View File

@@ -151,7 +151,7 @@ public class PipManager {
private List<MediaListener> mMediaListeners = new ArrayList<>();
private Rect mCurrentPipBounds;
private Rect mPipBounds;
private Rect mDefaultPipBounds;
private Rect mDefaultPipBounds = new Rect();
private Rect mSettingsPipBounds;
private Rect mMenuModePipBounds;
private Rect mRecentsPipBounds;