Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010623',... (bc7d429e) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+5 −4

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

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

core/java/android/app/ApplicationPackageManager.java

+21 −7

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

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

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

core/java/android/app/INotificationManager.aidl

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -173,7 +173,6 @@ interface INotificationManager
	void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);		void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);
	void setInterruptionFilter(String pkg, int interruptionFilter, boolean fromUser);		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);		void updateNotificationChannelFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannel channel);
	ParceledListSlice getNotificationChannelsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);		ParceledListSlice getNotificationChannelsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);
	ParceledListSlice getNotificationChannelGroupsFromPrivilegedListener(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	Original line	Diff line number	Diff line
	@@ -202,6 +202,14 @@ public class KeyguardManager {
	*/		*/
	public static final String EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS = "check_dpm";		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}		* Password lock type, see {@link #setLock}

core/java/android/companion/AssociationRequest.java

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -261,6 +261,7 @@ public final class AssociationRequest implements Parcelable {
	@Nullable CharSequence displayName,		@Nullable CharSequence displayName,
	boolean selfManaged,		boolean selfManaged,
	boolean forceConfirmation) {		boolean forceConfirmation) {
			validateDisplayName(displayName);
	mSingleDevice = singleDevice;		mSingleDevice = singleDevice;
	mDeviceFilters = requireNonNull(deviceFilters);		mDeviceFilters = requireNonNull(deviceFilters);
	mDeviceProfile = deviceProfile;		mDeviceProfile = deviceProfile;
	@@ -342,6 +343,7 @@ public final class AssociationRequest implements Parcelable {

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

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

	return this;		return this;
	}		}

	@@ -672,4 +670,11 @@ public final class AssociationRequest implements Parcelable {
	return new AssociationRequest(in);		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");
			}
			}
	}		}