release-request-6c9f747d-7df5-465f-8bde-1149394b99b4-for-git_oc-mr1-release-42... (fcaaf194) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+28 −13

Original line number	Diff line number	Diff line
		@@ -762,6 +762,10 @@ public class Activity extends ContextThemeWrapper
		private boolean mDestroyed;
		private boolean mDoReportFullyDrawn = true;
		private boolean mRestoredFromBundle;

		/** {@code true} if the activity lifecycle is in a state which supports picture-in-picture.
		* This only affects the client-side exception, the actual state check still happens in AMS. */
		private boolean mCanEnterPictureInPicture = false;
		/** true if the activity is going through a transient pause */
		/package/ boolean mTemporaryPause = false;
		/** true if the activity is being destroyed in order to recreate it with a new configuration */
		@@ -2091,6 +2095,10 @@ public class Activity extends ContextThemeWrapper
		if (params == null) {
		throw new IllegalArgumentException("Expected non-null picture-in-picture params");
		}
		if (!mCanEnterPictureInPicture) {
		throw new IllegalStateException("Activity must be resumed to enter"
		+ " picture-in-picture");
		}
		return ActivityManagerNative.getDefault().enterPictureInPictureMode(mToken, params);
		} catch (RemoteException e) {
		return false;
		@@ -6957,25 +6965,29 @@ public class Activity extends ContextThemeWrapper
		return mParent != null ? mParent.getActivityToken() : mToken;
		}

		final void performCreateCommon() {
		mVisibleFromClient = !mWindow.getWindowStyle().getBoolean(
		com.android.internal.R.styleable.Window_windowNoDisplay, false);
		mFragments.dispatchActivityCreated();
		mActivityTransitionState.setEnterActivityOptions(this, getActivityOptions());
		}

		final void performCreate(Bundle icicle) {
		restoreHasCurrentPermissionRequest(icicle);
		onCreate(icicle);
		mActivityTransitionState.readState(icicle);
		performCreateCommon();
		performCreate(icicle, null);
		}

		final void performCreate(Bundle icicle, PersistableBundle persistentState) {
		mCanEnterPictureInPicture = true;
		restoreHasCurrentPermissionRequest(icicle);
		if (persistentState != null) {
		onCreate(icicle, persistentState);
		} else {
		onCreate(icicle);
		}
		mActivityTransitionState.readState(icicle);
		performCreateCommon();

		mVisibleFromClient = !mWindow.getWindowStyle().getBoolean(
		com.android.internal.R.styleable.Window_windowNoDisplay, false);
		mFragments.dispatchActivityCreated();
		mActivityTransitionState.setEnterActivityOptions(this, getActivityOptions());
		}

		final void performNewIntent(Intent intent) {
		mCanEnterPictureInPicture = true;
		onNewIntent(intent);
		}

		final void performStart() {
		@@ -7126,6 +7138,9 @@ public class Activity extends ContextThemeWrapper
		mDoReportFullyDrawn = false;
		mFragments.doLoaderStop(mChangingConfigurations /retain/);

		// Disallow entering picture-in-picture after the activity has been stopped
		mCanEnterPictureInPicture = false;

		if (!mStopped) {
		if (mWindow != null) {
		mWindow.closeAllPanels();

core/java/android/app/Instrumentation.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import android.view.KeyEvent;
		import android.view.MotionEvent;
		import android.view.ViewConfiguration;
		import android.view.Window;

		import com.android.internal.content.ReferrerIntent;

		import java.io.File;
		@@ -1305,7 +1306,7 @@ public class Instrumentation {
		* @param intent The new intent being received.
		*/
		public void callActivityOnNewIntent(Activity activity, Intent intent) {
		activity.onNewIntent(intent);
		activity.performNewIntent(intent);
		}

		/**

core/java/android/app/Notification.java

+3 −42

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ import android.text.SpannableStringBuilder;
		import android.text.Spanned;
		import android.text.TextUtils;
		import android.text.style.AbsoluteSizeSpan;
		import android.text.style.BackgroundColorSpan;
		import android.text.style.CharacterStyle;
		import android.text.style.ForegroundColorSpan;
		import android.text.style.RelativeSizeSpan;
		@@ -3923,7 +3922,7 @@ public class Notification implements Parcelable

		private CharSequence processTextSpans(CharSequence text) {
		if (hasForegroundColor()) {
		return clearColorSpans(text);
		return NotificationColorUtil.clearColorSpans(text);
		}
		return text;
		}
		@@ -4683,7 +4682,7 @@ public class Notification implements Parcelable
		CharSequence title = action.title;
		ColorStateList[] outResultColor = null;
		if (isLegacy()) {
		title = clearColorSpans(title);
		title = NotificationColorUtil.clearColorSpans(title);
		} else {
		outResultColor = new ColorStateList[1];
		title = ensureColorSpanContrast(title, bgColor, outResultColor);
		@@ -4710,45 +4709,6 @@ public class Notification implements Parcelable
		return button;
		}

		/**
		* Clears all color spans of a text
		* @param charSequence the input text
		* @return the same text but without color spans
		*/
		private CharSequence clearColorSpans(CharSequence charSequence) {
		if (charSequence instanceof Spanned) {
		Spanned ss = (Spanned) charSequence;
		Object[] spans = ss.getSpans(0, ss.length(), Object.class);
		SpannableStringBuilder builder = new SpannableStringBuilder(ss.toString());
		for (Object span : spans) {
		Object resultSpan = span;
		if (resultSpan instanceof CharacterStyle) {
		resultSpan = ((CharacterStyle) span).getUnderlying();
		}
		if (resultSpan instanceof TextAppearanceSpan) {
		TextAppearanceSpan originalSpan = (TextAppearanceSpan) resultSpan;
		if (originalSpan.getTextColor() != null) {
		resultSpan = new TextAppearanceSpan(
		originalSpan.getFamily(),
		originalSpan.getTextStyle(),
		originalSpan.getTextSize(),
		null,
		originalSpan.getLinkTextColor());
		}
		} else if (resultSpan instanceof ForegroundColorSpan
		\|\| (resultSpan instanceof BackgroundColorSpan)) {
		continue;
		} else {
		resultSpan = span;
		}
		builder.setSpan(resultSpan, ss.getSpanStart(span), ss.getSpanEnd(span),
		ss.getSpanFlags(span));
		}
		return builder;
		}
		return charSequence;
		}

		/**
		* Ensures contrast on color spans against a background color. also returns the color of the
		* text if a span was found that spans over the whole text.
		@@ -7075,6 +7035,7 @@ public class Notification implements Parcelable
		// Need to clone customContent before adding, because otherwise it can no longer be
		// parceled independently of remoteViews.
		customContent = customContent.clone();
		customContent.overrideTextColors(mBuilder.getPrimaryTextColor());
		remoteViews.removeAllViews(id);
		remoteViews.addView(id, customContent);
		remoteViews.setReapplyDisallowed();

core/java/android/app/SharedElementCallback.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.app;
		import android.content.Context;
		import android.content.res.Resources;
		import android.graphics.Bitmap;
		import android.graphics.GraphicBuffer;
		import android.graphics.Matrix;
		import android.graphics.RectF;
		import android.graphics.drawable.BitmapDrawable;
		@@ -44,6 +45,8 @@ import java.util.Map;
		public abstract class SharedElementCallback {
		private Matrix mTempMatrix;
		private static final String BUNDLE_SNAPSHOT_BITMAP = "sharedElement:snapshot:bitmap";
		private static final String BUNDLE_SNAPSHOT_GRAPHIC_BUFFER =
		"sharedElement:snapshot:graphicBuffer";
		private static final String BUNDLE_SNAPSHOT_IMAGE_SCALETYPE = "sharedElement:snapshot:imageScaleType";
		private static final String BUNDLE_SNAPSHOT_IMAGE_MATRIX = "sharedElement:snapshot:imageMatrix";

		@@ -176,7 +179,12 @@ public abstract class SharedElementCallback {
		Bitmap bitmap = TransitionUtils.createDrawableBitmap(d);
		if (bitmap != null) {
		Bundle bundle = new Bundle();
		if (bitmap.getConfig() != Bitmap.Config.HARDWARE) {
		bundle.putParcelable(BUNDLE_SNAPSHOT_BITMAP, bitmap);
		} else {
		GraphicBuffer graphicBuffer = bitmap.createGraphicBufferHandle();
		bundle.putParcelable(BUNDLE_SNAPSHOT_GRAPHIC_BUFFER, graphicBuffer);
		}
		bundle.putString(BUNDLE_SNAPSHOT_IMAGE_SCALETYPE,
		imageView.getScaleType().toString());
		if (imageView.getScaleType() == ScaleType.MATRIX) {
		@@ -218,10 +226,14 @@ public abstract class SharedElementCallback {
		View view = null;
		if (snapshot instanceof Bundle) {
		Bundle bundle = (Bundle) snapshot;
		Bitmap bitmap = (Bitmap) bundle.getParcelable(BUNDLE_SNAPSHOT_BITMAP);
		if (bitmap == null) {
		GraphicBuffer buffer = bundle.getParcelable(BUNDLE_SNAPSHOT_GRAPHIC_BUFFER);
		Bitmap bitmap = bundle.getParcelable(BUNDLE_SNAPSHOT_BITMAP);
		if (buffer == null && bitmap == null) {
		return null;
		}
		if (bitmap == null) {
		bitmap = Bitmap.createHardwareBitmap(buffer);
		}
		ImageView imageView = new ImageView(context);
		view = imageView;
		imageView.setImageBitmap(bitmap);

core/java/android/content/pm/PackageInfo.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -188,7 +188,16 @@ public class PackageInfo implements Parcelable {

		/**
		* Array of all signatures read from the package file. This is only filled
		* in if the flag {@link PackageManager#GET_SIGNATURES} was set.
		* in if the flag {@link PackageManager#GET_SIGNATURES} was set. A package
		* must be singed with at least one certificate which is at position zero.
		* The package can be signed with additional certificates which appear as
		* subsequent entries.
		*
		* <strong>Note:</strong> Signature ordering is not guaranteed to be
		* stable which means that a package signed with certificates A and B is
		* equivalent to being signed with certificates B and A. This means that
		* in case multiple signatures are reported you cannot assume the one at
		* the first position to be the same across updates.
		*/
		public Signature[] signatures;