Merge changes I20bdab1b,Id82f9081 into oc-dev am: 64b044680c (60252a27) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityOptions.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1244,7 +1244,7 @@ public class ActivityOptions {
		// Once we parcel the thumbnail for transfering over to the system, create a copy of
		// the bitmap to a hardware bitmap and pass through the GraphicBuffer
		if (mThumbnail != null) {
		final Bitmap hwBitmap = mThumbnail.copy(Config.HARDWARE, true /* immutable */);
		final Bitmap hwBitmap = mThumbnail.copy(Config.HARDWARE, false /* isMutable */);
		if (hwBitmap != null) {
		b.putParcelable(KEY_ANIM_THUMBNAIL, hwBitmap.createGraphicBufferHandle());
		} else {

+4 −1

Original line number	Diff line number	Diff line
		@@ -155,6 +155,10 @@ class PinnedStackController {
		mSnapAlgorithm = new PipSnapAlgorithm(service.mContext);
		mDisplayInfo.copyFrom(mDisplayContent.getDisplayInfo());
		reloadResources();
		// Initialize the aspect ratio to the default aspect ratio. Don't do this in reload
		// resources as it would clobber mAspectRatio when entering PiP from fullscreen which
		// triggers a configuration change and the resources to be reloaded.
		mAspectRatio = mDefaultAspectRatio;
		}

		void onConfigurationChanged() {
		@@ -171,7 +175,6 @@ class PinnedStackController {
		mCurrentMinSize = mDefaultMinSize;
		mDefaultAspectRatio = res.getFloat(
		com.android.internal.R.dimen.config_pictureInPictureDefaultAspectRatio);
		mAspectRatio = mDefaultAspectRatio;
		final String screenEdgeInsetsDpString = res.getString(
		com.android.internal.R.string.config_defaultPictureInPictureScreenEdgeInsets);
		final Size screenEdgeInsetsDp = !screenEdgeInsetsDpString.isEmpty()