Merge remote-tracking branch 'origin/v3.3-a15' into a15 (2e7a6b1d) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -8065,13 +8065,13 @@ public class AppOpsManager {
		} else {
		opCodes = null;
		}
		final List<AppOpsManager.PackageOps> result;
		try {
		result = mService.getPackagesForOpsForDevice(opCodes, persistentDeviceId);
		ParceledListSlice<PackageOps> packageOps = mService.getPackagesForOpsForDevice(opCodes,
		persistentDeviceId);
		return packageOps == null ? Collections.emptyList() : packageOps.getList();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		return (result != null) ? result : Collections.emptyList();
		}

		/**
		@@ -8090,8 +8090,9 @@ public class AppOpsManager {
		@UnsupportedAppUsage
		public List<AppOpsManager.PackageOps> getPackagesForOps(int[] ops) {
		try {
		return mService.getPackagesForOpsForDevice(ops,
		ParceledListSlice<PackageOps> packageOps = mService.getPackagesForOpsForDevice(ops,
		VirtualDeviceManager.PERSISTENT_DEVICE_ID_DEFAULT);
		return packageOps == null ? null : packageOps.getList();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/app/ApplicationPackageManager.java

+21 −7

Original line number	Diff line number	Diff line
		@@ -1490,22 +1490,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
		@@ -176,7 +176,6 @@ interface INotificationManager
		void setInterruptionFilter(String pkg, int interruptionFilter, boolean fromUser);

		NotificationChannel createConversationNotificationChannelForPackageFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, String parentChannelId, String conversationId);
		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/KeyguardManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,14 @@ 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/companion/AssociationRequest.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -271,6 +271,7 @@ public final class AssociationRequest implements Parcelable {
		boolean selfManaged,
		boolean forceConfirmation,
		@Nullable Icon deviceIcon) {
		validateDisplayName(displayName);
		mSingleDevice = singleDevice;
		mDeviceFilters = requireNonNull(deviceFilters);
		mDeviceProfile = deviceProfile;
		@@ -365,6 +366,7 @@ public final class AssociationRequest implements Parcelable {

		/** @hide */
		public void setDisplayName(CharSequence displayName) {
		validateDisplayName(displayName);
		mDisplayName = displayName;
		}

		@@ -445,11 +447,7 @@ public final class AssociationRequest implements Parcelable {
		public Builder setDisplayName(@NonNull CharSequence displayName) {
		checkNotUsed();
		mDisplayName = requireNonNull(displayName);
		if (displayName.length() > DISPLAY_NAME_LENGTH_LIMIT) {
		throw new IllegalArgumentException("Length of the display name must be at most "
		+ DISPLAY_NAME_LENGTH_LIMIT + " characters");
		}

		validateDisplayName(displayName);
		return this;
		}

		@@ -728,4 +726,11 @@ public final class AssociationRequest implements Parcelable {
		return new AssociationRequest(in);
		}
		};

		private static void validateDisplayName(@Nullable CharSequence displayName) {
		if (displayName != null && displayName.length() > DISPLAY_NAME_LENGTH_LIMIT) {
		throw new IllegalArgumentException("Length of the display name must be at most "
		+ DISPLAY_NAME_LENGTH_LIMIT + " characters");
		}
		}
		}