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

libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldAnimationController.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.wm.shell.unfold;

		import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

		import android.annotation.NonNull;
		import android.app.ActivityManager.RunningTaskInfo;
		import android.app.TaskInfo;
		@@ -28,11 +30,11 @@ import com.android.wm.shell.sysui.ShellInit;
		import com.android.wm.shell.unfold.ShellUnfoldProgressProvider.UnfoldListener;
		import com.android.wm.shell.unfold.animation.UnfoldTaskAnimator;

		import dagger.Lazy;

		import java.util.List;
		import java.util.Optional;

		import dagger.Lazy;

		/**
		* Manages fold/unfold animations of tasks on foldable devices.
		* When folding or unfolding a foldable device we play animations that
		@@ -228,7 +230,8 @@ public class UnfoldAnimationController implements UnfoldListener {
		}

		private void maybeResetTask(UnfoldTaskAnimator animator, TaskInfo taskInfo) {
		if (!mIsInStageChange) {
		// TODO(b/311084698): the windowing mode check is added here as a work around.
		if (!mIsInStageChange \|\| taskInfo.getWindowingMode() == WINDOWING_MODE_PINNED) {
		// No need to resetTask if there is no ongoing state change.
		return;
		}

services/core/java/com/android/server/pm/InstallPackageHelper.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -672,6 +672,9 @@ final class InstallPackageHelper {
		if (pkgSetting == null \|\| pkgSetting.getPkg() == null) {
		return Pair.create(PackageManager.INSTALL_FAILED_INVALID_URI, intentSender);
		}
		if (instantApp && (pkgSetting.isSystem() \|\| pkgSetting.isUpdatedSystemApp())) {
		return Pair.create(PackageManager.INSTALL_FAILED_INVALID_URI, intentSender);
		}
		if (!snapshot.canViewInstantApps(callingUid, UserHandle.getUserId(callingUid))) {
		// only allow the existing package to be used if it's installed as a full
		// application for at least one user

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyEngine.java

+66 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.AppGlobals;
		import android.app.BroadcastOptions;
		import android.app.admin.BooleanPolicyValue;
		import android.app.admin.DevicePolicyIdentifiers;
		import android.app.admin.DevicePolicyManager;
		import android.app.admin.DevicePolicyState;
		@@ -142,6 +143,67 @@ final class DevicePolicyEngine {
		mAdminPolicySize = new SparseArray<>();
		}

		private void maybeForceEnforcementRefreshLocked(@NonNull PolicyDefinition<?> policyDefinition) {
		try {
		if (shouldForceEnforcementRefresh(policyDefinition)) {
		// This is okay because it's only true for user restrictions which are all <Boolean>
		forceEnforcementRefreshLocked((PolicyDefinition<Boolean>) policyDefinition);
		}
		} catch (Throwable e) {
		// Catch any possible exceptions just to be on the safe side
		Log.e(TAG, "Exception throw during maybeForceEnforcementRefreshLocked", e);
		}
		}

		private boolean shouldForceEnforcementRefresh(@NonNull PolicyDefinition<?> policyDefinition) {
		// These are all "not nullable" but for the purposes of maximum safety for a lightly tested
		// change we check here
		if (policyDefinition == null) {
		return false;
		}
		PolicyKey policyKey = policyDefinition.getPolicyKey();
		if (policyKey == null) {
		return false;
		}

		if (policyKey instanceof UserRestrictionPolicyKey) {
		// b/307481299 We must force all user restrictions to re-sync local
		// + global on each set/clear
		return true;
		}

		return false;
		}

		private void forceEnforcementRefreshLocked(PolicyDefinition<Boolean> policyDefinition) {
		Binder.withCleanCallingIdentity(() -> {
		// Sync global state
		PolicyValue<Boolean> globalValue = new BooleanPolicyValue(false);
		try {
		PolicyState<Boolean> policyState = getGlobalPolicyStateLocked(policyDefinition);
		globalValue = policyState.getCurrentResolvedPolicy();
		} catch (IllegalArgumentException e) {
		// Expected for local-only policies
		}

		enforcePolicy(policyDefinition, globalValue, UserHandle.USER_ALL);

		// Loop through each user and sync that user's state
		for (UserInfo user : mUserManager.getUsers()) {
		PolicyValue<Boolean> localValue = new BooleanPolicyValue(false);
		try {
		PolicyState<Boolean> localPolicyState = getLocalPolicyStateLocked(
		policyDefinition, user.id);
		localValue = localPolicyState.getCurrentResolvedPolicy();
		} catch (IllegalArgumentException e) {
		// Expected for global-only policies
		}

		enforcePolicy(policyDefinition, localValue, user.id);
		}
		});
		}

		/**
		* Set the policy for the provided {@code policyDefinition} (see {@link PolicyDefinition}) and
		* {@code enforcingAdmin} to the provided {@code value}.
		@@ -188,6 +250,7 @@ final class DevicePolicyEngine {
		// No need to notify admins as no new policy is actually enforced, we're just filling in
		// the data structures.
		if (!skipEnforcePolicy) {
		maybeForceEnforcementRefreshLocked(policyDefinition);
		if (policyChanged) {
		onLocalPolicyChangedLocked(policyDefinition, enforcingAdmin, userId);
		}
		@@ -278,6 +341,7 @@ final class DevicePolicyEngine {
		Objects.requireNonNull(enforcingAdmin);

		synchronized (mLock) {
		maybeForceEnforcementRefreshLocked(policyDefinition);
		if (!hasLocalPolicyLocked(policyDefinition, userId)) {
		return;
		}
		@@ -451,6 +515,7 @@ final class DevicePolicyEngine {
		// No need to notify admins as no new policy is actually enforced, we're just filling in
		// the data structures.
		if (!skipEnforcePolicy) {
		maybeForceEnforcementRefreshLocked(policyDefinition);
		if (policyChanged) {
		onGlobalPolicyChangedLocked(policyDefinition, enforcingAdmin);
		}
		@@ -506,6 +571,7 @@ final class DevicePolicyEngine {

		boolean policyChanged = policyState.removePolicy(enforcingAdmin);

		maybeForceEnforcementRefreshLocked(policyDefinition);
		if (policyChanged) {
		onGlobalPolicyChangedLocked(policyDefinition, enforcingAdmin);
		}