Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_frameworks_base into a14 (8aa8645f) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+21 −7

Original line number	Diff line number	Diff line
		@@ -1461,22 +1461,36 @@ public class ApplicationPackageManager extends PackageManager {

		@Override
		public ResolveInfo resolveActivity(Intent intent, ResolveInfoFlags flags) {
		return resolveActivityAsUser(intent, flags, getUserId());
		return resolveActivityAsUser(intent, /* resolvedType= */ null, flags, getUserId());
		}

		@Override
		public ResolveInfo resolveActivityAsUser(Intent intent, int flags, int userId) {
		return resolveActivityAsUser(intent, ResolveInfoFlags.of(flags), userId);
		return resolveActivityAsUser(intent, /* resolvedType= */ null, ResolveInfoFlags.of(flags),
		userId);
		}

		@Override
		public ResolveInfo resolveActivityAsUser(Intent intent, ResolveInfoFlags flags, int userId) {
		return resolveActivityAsUser(intent, /* resolvedType= */ null, flags, userId);
		}

		@Override
		public ResolveInfo resolveActivityAsUser(Intent intent, String resolvedType,
		int flags, int userId) {
		return resolveActivityAsUser(intent, resolvedType,
		ResolveInfoFlags.of(flags), userId);
		}

		@Override
		public ResolveInfo resolveActivityAsUser(Intent intent, String resolvedType,
		ResolveInfoFlags flags, int userId) {
		try {
		return mPM.resolveIntent(
		intent,
		intent.resolveTypeIfNeeded(mContext.getContentResolver()),
		updateFlagsForComponent(flags.getValue(), userId, intent),
		userId);
		return mPM.resolveIntent(intent,
		resolvedType == null
		? intent.resolveTypeIfNeeded(mContext.getContentResolver())
		: resolvedType,
		updateFlagsForComponent(flags.getValue(), userId, intent), userId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/app/INotificationManager.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -173,7 +173,6 @@ interface INotificationManager
		void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);
		void setInterruptionFilter(String pkg, int interruptionFilter, boolean fromUser);

		void updateNotificationChannelGroupFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannelGroup group);
		void updateNotificationChannelFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannel channel);
		ParceledListSlice getNotificationChannelsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);
		ParceledListSlice getNotificationChannelGroupsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);

core/java/android/app/IUserSwitchObserver.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.os.IRemoteCallback;

		/** {@hide} */
		oneway interface IUserSwitchObserver {
		void onBeforeUserSwitching(int newUserId);
		void onBeforeUserSwitching(int newUserId, IRemoteCallback reply);
		void onUserSwitching(int newUserId, IRemoteCallback reply);
		void onUserSwitchComplete(int newUserId);
		void onForegroundProfileSwitch(int newProfileId);

core/java/android/app/KeyguardManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -202,6 +202,15 @@ public class KeyguardManager {
		*/
		public static final String EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS = "check_dpm";

		/**
		* When switching to a secure user, system server will expect a callback when the UI has
		* completed the switch.
		*
		* @hide
		*/
		public static final String LOCK_ON_USER_SWITCH_CALLBACK = "onSwitchCallback";


		/**
		*
		* Password lock type, see {@link #setLock}

core/java/android/app/UserSwitchObserver.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,11 @@ public class UserSwitchObserver extends IUserSwitchObserver.Stub {
		}

		@Override
		public void onBeforeUserSwitching(int newUserId) throws RemoteException {}
		public void onBeforeUserSwitching(int newUserId, IRemoteCallback reply) throws RemoteException {
		if (reply != null) {
		reply.sendResult(null);
		}
		}

		@Override
		public void onUserSwitching(int newUserId, IRemoteCallback reply) throws RemoteException {