Snap for 8022168 from 80b9d0eb42e95c23ae0a52ed3a087a591564cab6 to sc-v2-release (dbe95e57) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -363,7 +363,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
		}

		RemoteAnimationTarget[] onGoingToRecentsLegacy(boolean cancel, RemoteAnimationTarget[] apps) {
		if (!isSplitScreenVisible()) return null;
		if (apps.length < 2) return null;
		final SurfaceControl.Builder builder = new SurfaceControl.Builder(new SurfaceSession())
		.setContainerLayer()
		.setName("RecentsAnimationSplitTasks")

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+21 −6

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		private boolean mExitSplitScreenOnHide;
		private boolean mKeyguardOccluded;
		private boolean mDeviceSleep;
		private boolean mIsDividerRemoteAnimating;

		@StageType
		private int mDismissTop = NO_DISMISS;
		@@ -364,6 +365,8 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		void startTasksWithLegacyTransition(int mainTaskId, @Nullable Bundle mainOptions,
		int sideTaskId, @Nullable Bundle sideOptions, @SplitPosition int sidePosition,
		float splitRatio, RemoteAnimationAdapter adapter) {
		// Init divider first to make divider leash for remote animation target.
		setDividerVisibility(true /* visible */);
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		// Need to add another wrapper here in shell so that we can inject the divider bar
		// and also manage the process elevation via setRunningRemote
		@@ -374,12 +377,23 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		RemoteAnimationTarget[] wallpapers,
		RemoteAnimationTarget[] nonApps,
		final IRemoteAnimationFinishedCallback finishedCallback) {
		mIsDividerRemoteAnimating = true;
		RemoteAnimationTarget[] augmentedNonApps =
		new RemoteAnimationTarget[nonApps.length + 1];
		for (int i = 0; i < nonApps.length; ++i) {
		augmentedNonApps[i] = nonApps[i];
		}
		augmentedNonApps[augmentedNonApps.length - 1] = getDividerBarLegacyTarget();

		IRemoteAnimationFinishedCallback wrapCallback =
		new IRemoteAnimationFinishedCallback.Stub() {
		@Override
		public void onAnimationFinished() throws RemoteException {
		mIsDividerRemoteAnimating = false;
		mSyncQueue.runInSync(t -> applyDividerVisibility(t));
		finishedCallback.onAnimationFinished();
		}
		};
		try {
		try {
		ActivityTaskManager.getService().setRunningRemoteTransitionDelegate(
		@@ -388,8 +402,8 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		Slog.e(TAG, "Unable to boost animation thread. This should only happen"
		+ " during unit tests");
		}
		adapter.getRunner().onAnimationStart(transit, apps, wallpapers, nonApps,
		finishedCallback);
		adapter.getRunner().onAnimationStart(transit, apps, wallpapers,
		augmentedNonApps, wrapCallback);
		} catch (RemoteException e) {
		Slog.e(TAG, "Error starting remote animation", e);
		}
		@@ -397,6 +411,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,

		@Override
		public void onAnimationCancelled() {
		mIsDividerRemoteAnimating = false;
		try {
		adapter.getRunner().onAnimationCancelled();
		} catch (RemoteException e) {
		@@ -832,7 +847,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		}

		private void setDividerVisibility(boolean visible) {
		if (mDividerVisible == visible) return;
		if (mIsDividerRemoteAnimating \|\| mDividerVisible == visible) return;
		mDividerVisible = visible;
		if (visible) {
		mSplitLayout.init();
		@@ -880,10 +895,10 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		}

		private void applyDividerVisibility(SurfaceControl.Transaction t) {
		if (mIsDividerRemoteAnimating) return;

		final SurfaceControl dividerLeash = mSplitLayout.getDividerLeash();
		if (dividerLeash == null) {
		return;
		}
		if (dividerLeash == null) return;

		if (mDividerVisible) {
		t.show(dividerLeash)

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+20 −1

Original line number	Diff line number	Diff line
		@@ -1338,6 +1338,13 @@ public class SettingsProvider extends ContentProvider {
		// Anyone can get the global settings, so no security checks.
		for (int i = 0; i < nameCount; i++) {
		String name = names.get(i);
		try {
		enforceSettingReadable(name, SETTINGS_TYPE_GLOBAL,
		UserHandle.getCallingUserId());
		} catch (SecurityException e) {
		// Caller doesn't have permission to read this setting
		continue;
		}
		Setting setting = settingsState.getSettingLocked(name);
		appendSettingToCursor(result, setting);
		}
		@@ -1515,6 +1522,13 @@ public class SettingsProvider extends ContentProvider {
		continue;
		}

		try {
		enforceSettingReadable(name, SETTINGS_TYPE_SECURE, callingUserId);
		} catch (SecurityException e) {
		// Caller doesn't have permission to read this setting
		continue;
		}

		// As of Android O, the SSAID is read from an app-specific entry in table
		// SETTINGS_FILE_SSAID, unless accessed by a system process.
		final Setting setting;
		@@ -1777,7 +1791,12 @@ public class SettingsProvider extends ContentProvider {

		for (int i = 0; i < nameCount; i++) {
		String name = names.get(i);

		try {
		enforceSettingReadable(name, SETTINGS_TYPE_SYSTEM, callingUserId);
		} catch (SecurityException e) {
		// Caller doesn't have permission to read this setting
		continue;
		}
		// Determine the owning user as some profile settings are cloned from the parent.
		final int owningUserId = resolveOwningUserIdForSystemSettingLocked(callingUserId,
		name);

packages/SystemUI/src/com/android/systemui/doze/DozeHost.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ public interface DozeHost {
		void extendPulse(int reason);

		void setAnimateWakeup(boolean animateWakeup);
		void setAnimateScreenOff(boolean animateScreenOff);

		/**
		* Reports that a tap event happend on the Sensors Low Power Island.

packages/SystemUI/src/com/android/systemui/doze/DozeUi.java

+2 −69

Original line number	Diff line number	Diff line
		@@ -21,22 +21,17 @@ import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSED;

		import android.app.AlarmManager;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.os.Handler;
		import android.os.SystemClock;
		import android.provider.Settings;
		import android.text.format.Formatter;
		import android.util.Log;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.keyguard.KeyguardUpdateMonitorCallback;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.doze.dagger.DozeScope;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.phone.DozeParameters;
		import com.android.systemui.statusbar.policy.ConfigurationController;
		import com.android.systemui.tuner.TunerService;
		import com.android.systemui.util.AlarmTimeout;
		import com.android.systemui.util.wakelock.WakeLock;

		@@ -50,8 +45,7 @@ import dagger.Lazy;
		* The policy controlling doze.
		*/
		@DozeScope
		public class DozeUi implements DozeMachine.Part, TunerService.Tunable,
		ConfigurationController.ConfigurationListener {
		public class DozeUi implements DozeMachine.Part {
		// if enabled, calls dozeTimeTick() whenever the time changes:
		private static final boolean BURN_IN_TESTING_ENABLED = false;
		private static final long TIME_TICK_DEADLINE_MILLIS = 90 * 1000; // 1.5min
		@@ -65,18 +59,8 @@ public class DozeUi implements DozeMachine.Part, TunerService.Tunable,
		private final DozeParameters mDozeParameters;
		private final DozeLog mDozeLog;
		private final Lazy<StatusBarStateController> mStatusBarStateController;
		private final TunerService mTunerService;
		private final ConfigurationController mConfigurationController;

		private boolean mKeyguardShowing;
		private final KeyguardUpdateMonitorCallback mKeyguardVisibilityCallback =
		new KeyguardUpdateMonitorCallback() {
		@Override
		public void onKeyguardVisibilityChanged(boolean showing) {
		mKeyguardShowing = showing;
		updateAnimateScreenOff();
		}

		@Override
		public void onTimeChanged() {
		if (BURN_IN_TESTING_ENABLED && mStatusBarStateController != null
		@@ -88,11 +72,6 @@ public class DozeUi implements DozeMachine.Part, TunerService.Tunable,
		mHandler.post(mWakeLock.wrap(() -> {}));
		}
		}

		@Override
		public void onShadeExpandedChanged(boolean expanded) {
		updateAnimateScreenOff();
		}
		};

		private long mLastTimeTickElapsed = 0;
		@@ -101,9 +80,7 @@ public class DozeUi implements DozeMachine.Part, TunerService.Tunable,
		public DozeUi(Context context, AlarmManager alarmManager,
		WakeLock wakeLock, DozeHost host, @Main Handler handler,
		DozeParameters params, KeyguardUpdateMonitor keyguardUpdateMonitor,
		DozeLog dozeLog, TunerService tunerService,
		Lazy<StatusBarStateController> statusBarStateController,
		ConfigurationController configurationController) {
		DozeLog dozeLog, Lazy<StatusBarStateController> statusBarStateController) {
		mContext = context;
		mWakeLock = wakeLock;
		mHost = host;
		@@ -113,19 +90,7 @@ public class DozeUi implements DozeMachine.Part, TunerService.Tunable,
		mTimeTicker = new AlarmTimeout(alarmManager, this::onTimeTick, "doze_time_tick", handler);
		keyguardUpdateMonitor.registerCallback(mKeyguardVisibilityCallback);
		mDozeLog = dozeLog;
		mTunerService = tunerService;
		mStatusBarStateController = statusBarStateController;

		mTunerService.addTunable(this, Settings.Secure.DOZE_ALWAYS_ON);

		mConfigurationController = configurationController;
		mConfigurationController.addCallback(this);
		}

		@Override
		public void destroy() {
		mTunerService.removeTunable(this);
		mConfigurationController.removeCallback(this);
		}

		@Override
		@@ -133,21 +98,6 @@ public class DozeUi implements DozeMachine.Part, TunerService.Tunable,
		mMachine = dozeMachine;
		}

		/**
		* Decide if we're taking over the screen-off animation
		* when the device was configured to skip doze after screen off.
		*/
		private void updateAnimateScreenOff() {
		if (mCanAnimateTransition) {
		final boolean controlScreenOff =
		mDozeParameters.getAlwaysOn()
		&& (mKeyguardShowing \|\| mDozeParameters.shouldControlUnlockedScreenOff())
		&& !mHost.isPowerSaveActive();
		mDozeParameters.setControlScreenOffAnimation(controlScreenOff);
		mHost.setAnimateScreenOff(controlScreenOff);
		}
		}

		private void pulseWhileDozing(int reason) {
		mHost.pulseWhileDozing(
		new DozeHost.PulseCallback() {
		@@ -276,21 +226,4 @@ public class DozeUi implements DozeMachine.Part, TunerService.Tunable,

		scheduleTimeTick();
		}

		@VisibleForTesting
		KeyguardUpdateMonitorCallback getKeyguardCallback() {
		return mKeyguardVisibilityCallback;
		}

		@Override
		public void onTuningChanged(String key, String newValue) {
		if (key.equals(Settings.Secure.DOZE_ALWAYS_ON)) {
		updateAnimateScreenOff();
		}
		}

		@Override
		public void onConfigChanged(Configuration newConfig) {
		updateAnimateScreenOff();
		}
		}