Merge "Merge SP2A.220505.002" (3c7a3e39) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/IPackageInstallerSession.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,4 +55,5 @@ interface IPackageInstallerSession {
		int getParentSessionId();

		boolean isStaged();
		int getInstallFlags();
		}

core/java/android/content/pm/PackageInstaller.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -1431,6 +1431,18 @@ public class PackageInstaller {
		}
		}

		/**
		* @return Session's {@link SessionParams#installFlags}.
		* @hide
		*/
		public int getInstallFlags() {
		try {
		return mSession.getInstallFlags();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* @return the session ID of the multi-package session that this belongs to or
		* {@link SessionInfo#INVALID_ID} if it does not belong to a multi-package session.

core/java/com/android/internal/policy/IKeyguardStateCallback.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		package com.android.internal.policy;

		interface IKeyguardStateCallback {
		void onShowingStateChanged(boolean showing);
		void onShowingStateChanged(boolean showing, int userId);
		void onSimSecureStateChanged(boolean simSecure);
		void onInputRestrictedStateChanged(boolean inputRestricted);
		void onTrustedChanged(boolean trusted);

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -1484,7 +1484,9 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		public void doKeyguardTimeout(Bundle options) {
		mHandler.removeMessages(KEYGUARD_TIMEOUT);
		Message msg = mHandler.obtainMessage(KEYGUARD_TIMEOUT, options);
		mHandler.sendMessage(msg);
		// Treat these messages with priority - A call to timeout means the device should lock
		// as soon as possible and not wait for other messages on the thread to process first.
		mHandler.sendMessageAtFrontOfQueue(msg);
		}

		/**
		@@ -1665,12 +1667,15 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		* @see #handleShow
		*/
		private void showLocked(Bundle options) {
		Trace.beginSection("KeyguardViewMediator#showLocked aqcuiring mShowKeyguardWakeLock");
		Trace.beginSection("KeyguardViewMediator#showLocked acquiring mShowKeyguardWakeLock");
		if (DEBUG) Log.d(TAG, "showLocked");
		// ensure we stay awake until we are finished displaying the keyguard
		mShowKeyguardWakeLock.acquire();
		Message msg = mHandler.obtainMessage(SHOW, options);
		mHandler.sendMessage(msg);
		// Treat these messages with priority - This call can originate from #doKeyguardTimeout,
		// meaning the device should lock as soon as possible and not wait for other messages on
		// the thread to process first.
		mHandler.sendMessageAtFrontOfQueue(msg);
		Trace.endSection();
		}

		@@ -1871,6 +1876,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		case KEYGUARD_TIMEOUT:
		synchronized (KeyguardViewMediator.this) {
		doKeyguardLocked((Bundle) msg.obj);
		notifyDefaultDisplayCallbacks(mShowing);
		}
		break;
		case DISMISS:
		@@ -2880,7 +2886,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		for (int i = size - 1; i >= 0; i--) {
		IKeyguardStateCallback callback = mKeyguardStateCallbacks.get(i);
		try {
		callback.onShowingStateChanged(showing);
		callback.onShowingStateChanged(showing, KeyguardUpdateMonitor.getCurrentUser());
		} catch (RemoteException e) {
		Slog.w(TAG, "Failed to call onShowingStateChanged", e);
		if (e instanceof DeadObjectException) {
		@@ -2914,7 +2920,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
		mKeyguardStateCallbacks.add(callback);
		try {
		callback.onSimSecureStateChanged(mUpdateMonitor.isSimPinSecure());
		callback.onShowingStateChanged(mShowing);
		callback.onShowingStateChanged(mShowing, KeyguardUpdateMonitor.getCurrentUser());
		callback.onInputRestrictedStateChanged(mInputRestricted);
		callback.onTrustedChanged(mUpdateMonitor.getUserHasTrust(
		KeyguardUpdateMonitor.getCurrentUser()));

packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt

+3 −4

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.app.IActivityManager
		import android.app.IUidObserver
		import android.app.Notification
		import android.app.Notification.CallStyle.CALL_TYPE_ONGOING
		import android.content.Intent
		import android.app.PendingIntent
		import android.util.Log
		import android.view.View
		import androidx.annotation.VisibleForTesting
		@@ -98,7 +98,7 @@ class OngoingCallController @Inject constructor(
		val newOngoingCallInfo = CallNotificationInfo(
		entry.sbn.key,
		entry.sbn.notification.`when`,
		entry.sbn.notification.contentIntent?.intent,
		entry.sbn.notification.contentIntent,
		entry.sbn.uid,
		entry.sbn.notification.extras.getInt(
		Notification.EXTRA_CALL_TYPE, -1) == CALL_TYPE_ONGOING,
		@@ -230,7 +230,6 @@ class OngoingCallController @Inject constructor(
		logger.logChipClicked()
		activityStarter.postStartActivityDismissingKeyguard(
		intent,
		0,
		ActivityLaunchAnimator.Controller.fromView(
		backgroundView,
		InteractionJankMonitor.CUJ_STATUS_BAR_APP_LAUNCH_FROM_CALL_CHIP)
		@@ -351,7 +350,7 @@ class OngoingCallController @Inject constructor(
		private data class CallNotificationInfo(
		val key: String,
		val callStartTime: Long,
		val intent: Intent?,
		val intent: PendingIntent?,
		val uid: Int,
		/** True if the call is currently ongoing (as opposed to incoming, screening, etc.). */
		val isOngoing: Boolean,