Snap for 9866333 from 67c703c94523062bbbb3ef6d883aeadc5b095c27 to tm-qpr3-release (434bb4e5) · Commits · e / os / android_frameworks_base

apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -225,6 +225,8 @@ public interface AppStandbyInternal {

		void setActiveAdminApps(Set<String> adminPkgs, int userId);

		void setAdminProtectedPackages(Set<String> packageNames, int userId);

		/**
		* @return {@code true} if the given package is an active device admin app.
		*/

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+40 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,10 @@ public class AppStandbyController
		@GuardedBy("mActiveAdminApps")
		private final SparseArray<Set<String>> mActiveAdminApps = new SparseArray<>();

		/** List of admin protected packages. Can contain {@link android.os.UserHandle#USER_ALL}. */
		@GuardedBy("mAdminProtectedPackages")
		private final SparseArray<Set<String>> mAdminProtectedPackages = new SparseArray<>();

		/**
		* Set of system apps that are headless (don't have any "front door" activities, enabled or
		* disabled). Presence in this map indicates that the app is a headless system app.
		@@ -1335,6 +1339,9 @@ public class AppStandbyController
		synchronized (mActiveAdminApps) {
		mActiveAdminApps.remove(userId);
		}
		synchronized (mAdminProtectedPackages) {
		mAdminProtectedPackages.remove(userId);
		}
		}
		}

		@@ -1424,6 +1431,10 @@ public class AppStandbyController
		return STANDBY_BUCKET_EXEMPTED;
		}

		if (isAdminProtectedPackages(packageName, userId)) {
		return STANDBY_BUCKET_EXEMPTED;
		}

		if (isActiveNetworkScorer(packageName)) {
		return STANDBY_BUCKET_EXEMPTED;
		}
		@@ -1871,6 +1882,17 @@ public class AppStandbyController
		}
		}

		private boolean isAdminProtectedPackages(String packageName, int userId) {
		synchronized (mAdminProtectedPackages) {
		if (mAdminProtectedPackages.contains(UserHandle.USER_ALL)
		&& mAdminProtectedPackages.get(UserHandle.USER_ALL).contains(packageName)) {
		return true;
		}
		return mAdminProtectedPackages.contains(userId)
		&& mAdminProtectedPackages.get(userId).contains(packageName);
		}
		}

		@Override
		public void addActiveDeviceAdmin(String adminPkg, int userId) {
		synchronized (mActiveAdminApps) {
		@@ -1894,6 +1916,17 @@ public class AppStandbyController
		}
		}

		@Override
		public void setAdminProtectedPackages(Set<String> packageNames, int userId) {
		synchronized (mAdminProtectedPackages) {
		if (packageNames == null \|\| packageNames.isEmpty()) {
		mAdminProtectedPackages.remove(userId);
		} else {
		mAdminProtectedPackages.put(userId, packageNames);
		}
		}
		}

		@Override
		public void onAdminDataAvailable() {
		mAdminDataAvailableLatch.countDown();
		@@ -1916,6 +1949,13 @@ public class AppStandbyController
		}
		}

		@VisibleForTesting
		Set<String> getAdminProtectedPackagesForTest(int userId) {
		synchronized (mAdminProtectedPackages) {
		return mAdminProtectedPackages.get(userId);
		}
		}

		/**
		* Returns {@code true} if the supplied package is the device provisioning app. Otherwise,
		* returns {@code false}.

core/java/android/app/admin/DevicePolicyManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -14635,7 +14635,8 @@ public class DevicePolicyManager {
		/**
		* Called by a device owner or a profile owner to disable user control over apps. User will not
		* be able to clear app data or force-stop packages. When called by a device owner, applies to
		* all users on the device.
		* all users on the device. Packages with user control disabled are exempted from
		* App Standby Buckets.
		*
		* @param admin which {@link DeviceAdminReceiver} this request is associated with
		* @param packages The package names for the apps.

core/java/com/android/internal/app/ChooserActivity.java

+2 −33

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT
		import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_PERSONAL;
		import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CANT_SHARE_WITH_WORK;
		import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_CROSS_PROFILE_BLOCKED_TITLE;
		import static android.content.ContentProvider.getUserIdFromUri;
		import static android.stats.devicepolicy.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_PERSONAL;
		import static android.stats.devicepolicy.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_WORK;

		@@ -162,7 +161,6 @@ import java.util.List;
		import java.util.Map;
		import java.util.Objects;
		import java.util.function.Supplier;
		import java.util.stream.Collectors;

		/**
		* The Chooser Activity handles intent resolution specifically for sharing intents -
		@@ -1426,11 +1424,7 @@ public class ChooserActivity extends ResolverActivity implements

		String action = targetIntent.getAction();
		if (Intent.ACTION_SEND.equals(action)) {
		Uri uri = targetIntent.getParcelableExtra(Intent.EXTRA_STREAM, android.net.Uri.class);
		if (!validForContentPreview(uri)) {
		contentPreviewLayout.setVisibility(View.GONE);
		return contentPreviewLayout;
		}
		Uri uri = targetIntent.getParcelableExtra(Intent.EXTRA_STREAM);
		imagePreview.findViewById(R.id.content_preview_image_1_large)
		.setTransitionName(ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME);
		mPreviewCoord.loadUriIntoView(R.id.content_preview_image_1_large, uri, 0);
		@@ -1440,7 +1434,7 @@ public class ChooserActivity extends ResolverActivity implements
		List<Uri> uris = targetIntent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
		List<Uri> imageUris = new ArrayList<>();
		for (Uri uri : uris) {
		if (validForContentPreview(uri) && isImageType(resolver.getType(uri))) {
		if (isImageType(resolver.getType(uri))) {
		imageUris.add(uri);
		}
		}
		@@ -1550,16 +1544,9 @@ public class ChooserActivity extends ResolverActivity implements
		String action = targetIntent.getAction();
		if (Intent.ACTION_SEND.equals(action)) {
		Uri uri = targetIntent.getParcelableExtra(Intent.EXTRA_STREAM);
		if (!validForContentPreview(uri)) {
		contentPreviewLayout.setVisibility(View.GONE);
		return contentPreviewLayout;
		}
		loadFileUriIntoView(uri, contentPreviewLayout);
		} else {
		List<Uri> uris = targetIntent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
		uris = uris.stream()
		.filter(ChooserActivity::validForContentPreview)
		.collect(Collectors.toList());
		int uriCount = uris.size();

		if (uriCount == 0) {
		@@ -1618,24 +1605,6 @@ public class ChooserActivity extends ResolverActivity implements
		}
		}

		/**
		* Indicate if the incoming content URI should be allowed.
		*
		* @param uri the uri to test
		* @return true if the URI is allowed for content preview
		*/
		private static boolean validForContentPreview(Uri uri) throws SecurityException {
		if (uri == null) {
		return false;
		}
		int userId = getUserIdFromUri(uri, UserHandle.USER_CURRENT);
		if (userId != UserHandle.USER_CURRENT && userId != UserHandle.myUserId()) {
		Log.e(TAG, "dropped invalid content URI belonging to user " + userId);
		return false;
		}
		return true;
		}

		@VisibleForTesting
		protected boolean isImageType(String mimeType) {
		return mimeType != null && mimeType.startsWith("image/");

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitPresenter.java

+48 −28

Original line number	Diff line number	Diff line
		@@ -661,21 +661,14 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
		@NonNull SplitAttributes splitAttributes) {
		final Configuration taskConfiguration = taskProperties.getConfiguration();
		final FoldingFeature foldingFeature = getFoldingFeature(taskProperties);
		final SplitType splitType = computeSplitType(splitAttributes, taskConfiguration,
		foldingFeature);
		final SplitAttributes computedSplitAttributes = new SplitAttributes.Builder()
		.setSplitType(splitType)
		.setLayoutDirection(splitAttributes.getLayoutDirection())
		.build();
		if (!shouldShowSplit(computedSplitAttributes)) {
		if (!shouldShowSplit(splitAttributes)) {
		return new Rect();
		}
		switch (position) {
		case POSITION_START:
		return getPrimaryBounds(taskConfiguration, computedSplitAttributes, foldingFeature);
		return getPrimaryBounds(taskConfiguration, splitAttributes, foldingFeature);
		case POSITION_END:
		return getSecondaryBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		return getSecondaryBounds(taskConfiguration, splitAttributes, foldingFeature);
		case POSITION_FILL:
		default:
		return new Rect();
		@@ -685,63 +678,76 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
		@NonNull
		private Rect getPrimaryBounds(@NonNull Configuration taskConfiguration,
		@NonNull SplitAttributes splitAttributes, @Nullable FoldingFeature foldingFeature) {
		if (!shouldShowSplit(splitAttributes)) {
		final SplitAttributes computedSplitAttributes = updateSplitAttributesType(splitAttributes,
		computeSplitType(splitAttributes, taskConfiguration, foldingFeature));
		if (!shouldShowSplit(computedSplitAttributes)) {
		return new Rect();
		}
		switch (splitAttributes.getLayoutDirection()) {
		switch (computedSplitAttributes.getLayoutDirection()) {
		case SplitAttributes.LayoutDirection.LEFT_TO_RIGHT: {
		return getLeftContainerBounds(taskConfiguration, splitAttributes, foldingFeature);
		return getLeftContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		case SplitAttributes.LayoutDirection.RIGHT_TO_LEFT: {
		return getRightContainerBounds(taskConfiguration, splitAttributes, foldingFeature);
		return getRightContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		case SplitAttributes.LayoutDirection.LOCALE: {
		final boolean isLtr = taskConfiguration.getLayoutDirection()
		== View.LAYOUT_DIRECTION_LTR;
		return isLtr
		? getLeftContainerBounds(taskConfiguration, splitAttributes, foldingFeature)
		: getRightContainerBounds(taskConfiguration, splitAttributes,
		? getLeftContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature)
		: getRightContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		case SplitAttributes.LayoutDirection.TOP_TO_BOTTOM: {
		return getTopContainerBounds(taskConfiguration, splitAttributes, foldingFeature);
		return getTopContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		case SplitAttributes.LayoutDirection.BOTTOM_TO_TOP: {
		return getBottomContainerBounds(taskConfiguration, splitAttributes, foldingFeature);
		return getBottomContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		default:
		throw new IllegalArgumentException("Unknown layout direction:"
		+ splitAttributes.getLayoutDirection());
		+ computedSplitAttributes.getLayoutDirection());
		}
		}

		@NonNull
		private Rect getSecondaryBounds(@NonNull Configuration taskConfiguration,
		@NonNull SplitAttributes splitAttributes, @Nullable FoldingFeature foldingFeature) {
		if (!shouldShowSplit(splitAttributes)) {
		final SplitAttributes computedSplitAttributes = updateSplitAttributesType(splitAttributes,
		computeSplitType(splitAttributes, taskConfiguration, foldingFeature));
		if (!shouldShowSplit(computedSplitAttributes)) {
		return new Rect();
		}
		switch (splitAttributes.getLayoutDirection()) {
		switch (computedSplitAttributes.getLayoutDirection()) {
		case SplitAttributes.LayoutDirection.LEFT_TO_RIGHT: {
		return getRightContainerBounds(taskConfiguration, splitAttributes, foldingFeature);
		return getRightContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		case SplitAttributes.LayoutDirection.RIGHT_TO_LEFT: {
		return getLeftContainerBounds(taskConfiguration, splitAttributes, foldingFeature);
		return getLeftContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		case SplitAttributes.LayoutDirection.LOCALE: {
		final boolean isLtr = taskConfiguration.getLayoutDirection()
		== View.LAYOUT_DIRECTION_LTR;
		return isLtr
		? getRightContainerBounds(taskConfiguration, splitAttributes,
		? getRightContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature)
		: getLeftContainerBounds(taskConfiguration, splitAttributes,
		: getLeftContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		case SplitAttributes.LayoutDirection.TOP_TO_BOTTOM: {
		return getBottomContainerBounds(taskConfiguration, splitAttributes, foldingFeature);
		return getBottomContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		case SplitAttributes.LayoutDirection.BOTTOM_TO_TOP: {
		return getTopContainerBounds(taskConfiguration, splitAttributes, foldingFeature);
		return getTopContainerBounds(taskConfiguration, computedSplitAttributes,
		foldingFeature);
		}
		default:
		throw new IllegalArgumentException("Unknown layout direction:"
		@@ -749,6 +755,19 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
		}
		}

		/**
		* Returns the {@link SplitAttributes} that update the {@link SplitType} to
		* {@code splitTypeToUpdate}.
		*/
		private static SplitAttributes updateSplitAttributesType(
		@NonNull SplitAttributes splitAttributes, @NonNull SplitType splitTypeToUpdate) {
		return new SplitAttributes.Builder()
		.setSplitType(splitTypeToUpdate)
		.setLayoutDirection(splitAttributes.getLayoutDirection())
		.setAnimationBackgroundColor(splitAttributes.getAnimationBackgroundColor())
		.build();
		}

		@NonNull
		private Rect getLeftContainerBounds(@NonNull Configuration taskConfiguration,
		@NonNull SplitAttributes splitAttributes, @Nullable FoldingFeature foldingFeature) {
		@@ -841,7 +860,8 @@ class SplitPresenter extends JetpackTaskFragmentOrganizer {
		}

		@Nullable
		private FoldingFeature getFoldingFeature(@NonNull TaskProperties taskProperties) {
		@VisibleForTesting
		FoldingFeature getFoldingFeature(@NonNull TaskProperties taskProperties) {
		final int displayId = taskProperties.getDisplayId();
		final WindowConfiguration windowConfiguration = taskProperties.getConfiguration()
		.windowConfiguration;