Merge branch 'v1-s' into 'v2.2-s' (d835ef89) · Commits · e / os / android_frameworks_base

core/java/android/content/AttributionSource.java

+17 −3

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.os.Parcelable;
		import android.os.Process;
		import android.permission.PermissionManager;
		import android.util.ArraySet;
		import android.util.Log;

		import com.android.internal.annotations.Immutable;

		@@ -86,6 +87,8 @@ import java.util.Set;
		*/
		@Immutable
		public final class AttributionSource implements Parcelable {
		private static final String TAG = "AttributionSource";

		private static final String DESCRIPTOR = "android.content.AttributionSource";

		private static final Binder sDefaultToken = new Binder(DESCRIPTOR);
		@@ -153,10 +156,21 @@ public final class AttributionSource implements Parcelable {
		AttributionSource(@NonNull Parcel in) {
		this(AttributionSourceState.CREATOR.createFromParcel(in));

		if (!Binder.isHandlingTransaction()) {
		Log.e(TAG, "Unable to verify calling UID #" + mAttributionSourceState.uid + " PID #"
		+ mAttributionSourceState.pid + " when not handling Binder transaction; "
		+ "clearing.");
		mAttributionSourceState.pid = -1;
		mAttributionSourceState.uid = -1;
		mAttributionSourceState.packageName = null;
		mAttributionSourceState.attributionTag = null;
		mAttributionSourceState.next = null;
		} else {
		// Since we just unpacked this object as part of it transiting a Binder
		// call, this is the perfect time to enforce that its UID and PID can be trusted
		enforceCallingUidAndPid();
		}
		}

		/** @hide */
		public AttributionSource(@NonNull AttributionSourceState attributionSourceState) {

+10 −0

Original line number	Diff line number	Diff line
		@@ -431,6 +431,8 @@ public class ZygoteProcess {
		throw new ZygoteStartFailedEx("Embedded newlines not allowed");
		} else if (arg.indexOf('\r') >= 0) {
		throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");
		} else if (arg.indexOf('\u0000') >= 0) {
		throw new ZygoteStartFailedEx("Embedded nulls not allowed");
		}
		}

		@@ -972,6 +974,14 @@ public class ZygoteProcess {
		return true;
		}

		for (/* NonNull */ String s : mApiDenylistExemptions) {
		// indexOf() is intrinsified and faster than contains().
		if (s.indexOf('\n') >= 0 \|\| s.indexOf('\r') >= 0 \|\| s.indexOf('\u0000') >= 0) {
		Slog.e(LOG_TAG, "Failed to set API denylist exemptions: Bad character");
		mApiDenylistExemptions = Collections.emptyList();
		return false;
		}
		}
		try {
		state.mZygoteOutputWriter.write(Integer.toString(mApiDenylistExemptions.size() + 1));
		state.mZygoteOutputWriter.newLine();

+2 −5

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import androidx.annotation.VisibleForTesting
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.media.dagger.MediaModule.KEYGUARD
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.statusbar.NotificationLockscreenUserManager
		import com.android.systemui.statusbar.StatusBarState
		import com.android.systemui.statusbar.SysuiStatusBarStateController
		import com.android.systemui.statusbar.notification.stack.MediaHeaderView
		@@ -43,7 +42,6 @@ class KeyguardMediaController @Inject constructor(
		@param:Named(KEYGUARD) private val mediaHost: MediaHost,
		private val bypassController: KeyguardBypassController,
		private val statusBarStateController: SysuiStatusBarStateController,
		private val notifLockscreenUserManager: NotificationLockscreenUserManager,
		private val context: Context,
		configurationController: ConfigurationController
		) {
		@@ -164,8 +162,7 @@ class KeyguardMediaController @Inject constructor(
		// mediaHost.visible required for proper animations handling
		visible = mediaHost.visible &&
		!bypassController.bypassEnabled &&
		keyguardOrUserSwitcher &&
		notifLockscreenUserManager.shouldShowLockscreenNotifications()
		keyguardOrUserSwitcher
		if (visible) {
		showMediaPlayer()
		} else {

+1 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,7 @@ class MediaCarouselController @Inject constructor(
		* It will be called when the container is out of view.
		*/
		lateinit var updateUserVisibility: () -> Unit
		lateinit var updateHostVisibility: () -> Unit

		init {
		dumpManager.registerDumpable(TAG, this)

+13 −0

Original line number	Diff line number	Diff line
		@@ -414,6 +414,7 @@ class MediaHierarchyManager @Inject constructor(
		mediaCarouselController.logSmartspaceImpression(qsExpanded)
		}
		mediaCarouselController.mediaCarouselScrollHandler.visibleToUser = isVisibleToUser()
		mediaCarouselController.updateHostVisibility()
		}

		override fun onDozeAmountChanged(linear: Float, eased: Float) {
		@@ -467,6 +468,11 @@ class MediaHierarchyManager @Inject constructor(
		mediaCarouselController.updateUserVisibility = {
		mediaCarouselController.mediaCarouselScrollHandler.visibleToUser = isVisibleToUser()
		}
		mediaCarouselController.updateHostVisibility = {
		mediaHosts.forEach {
		it?.updateViewVisibility()
		}
		}
		}

		private fun updateConfiguration() {
		@@ -512,6 +518,13 @@ class MediaHierarchyManager @Inject constructor(
		mediaCarouselController.closeGuts()
		}

		/** Return true if the carousel should be hidden because lockscreen is currently visible */
		fun isLockedAndHidden(): Boolean {
		return !notifLockscreenUserManager.shouldShowLockscreenNotifications() &&
		(statusbarState == StatusBarState.SHADE_LOCKED \|\|
		statusbarState == StatusBarState.KEYGUARD)
		}

		private fun createUniqueObjectHost(): UniqueObjectHostView {
		val viewHost = UniqueObjectHostView(context)
		viewHost.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {