Snap for 6746904 from 4eb63b672f77883b088901aea584e795ecfa247c to rvc-qpr1-release (7a2cc11f) · Commits · e / os / android_frameworks_base

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -455,9 +455,6 @@ public class AppStandbyController implements AppStandbyInternal {

		mSystemServicesReady = true;

		// Offload to handler thread to avoid boot time impact.
		mHandler.post(AppStandbyController.this::updatePowerWhitelistCache);

		boolean userFileExists;
		synchronized (mAppIdleLock) {
		userFileExists = mAppIdleHistory.userFileExists(UserHandle.USER_SYSTEM);
		@@ -474,7 +471,9 @@ public class AppStandbyController implements AppStandbyInternal {
		setChargingState(mInjector.isCharging());

		// Offload to handler thread after boot completed to avoid boot time impact. This means
		// that headless system apps may be put in a lower bucket until boot has completed.
		// that app standby buckets may be slightly out of date and headless system apps may be
		// put in a lower bucket until boot has completed.
		mHandler.post(AppStandbyController.this::updatePowerWhitelistCache);
		mHandler.post(this::loadHeadlessSystemAppCache);
		}
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -259,6 +259,13 @@ public abstract class DisplayManagerInternal {
		public abstract DisplayedContentSample getDisplayedContentSample(
		int displayId, long maxFrames, long timestamp);

		/**
		* Temporarily ignore proximity-sensor-based display behavior until there is a change
		* to the proximity sensor state. This allows the display to turn back on even if something
		* is obstructing the proximity sensor.
		*/
		public abstract void ignoreProximitySensorUntilChanged();

		/**
		* Describes the requested power state of the display.
		*

+4 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.os;

		import android.view.Display;
		import android.view.KeyEvent;

		import java.util.function.Consumer;

		@@ -319,4 +320,7 @@ public abstract class PowerManagerInternal {

		/** Returns information about the last wakeup event. */
		public abstract PowerManager.WakeData getLastWakeup();

		/** Allows power button to intercept a power key button press. */
		public abstract boolean interceptPowerKeyDown(KeyEvent event);
		}

+10 −6

Original line number	Diff line number	Diff line
		@@ -618,16 +618,20 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
		return false;
		}
		if (DEBUG) Log.d(TAG, "onStateChanged: " + state);
		updateState(state);

		boolean localStateChanged = !mState.equals(mLastDispatchedState,
		true /* excludingCaptionInsets /, true / excludeInvisibleIme */);
		mLastDispatchedState.set(state, true /* copySources */);

		final InsetsState lastState = new InsetsState(mState, true /* copySources */);
		updateState(state);
		applyLocalVisibilityOverride();
		if (localStateChanged) {
		if (DEBUG) Log.d(TAG, "onStateChanged, notifyInsetsChanged, send state to WM: " + mState);

		if (!mState.equals(lastState, true /* excludingCaptionInsets */,
		true /* excludeInvisibleIme */)) {
		if (DEBUG) Log.d(TAG, "onStateChanged, notifyInsetsChanged");
		mHost.notifyInsetsChanged();
		}
		if (!mState.equals(state, true /* excludingCaptionInsets */,
		true /* excludeInvisibleIme */)) {
		if (DEBUG) Log.d(TAG, "onStateChanged, send state to WM: " + mState);
		updateRequestedState();
		}
		return true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -784,8 +784,8 @@ public class ChooserActivity extends ResolverActivity implements
		FrameworkStatsLog.SHARESHEET_STARTED,
		getReferrerPackageName(),
		target.getType(),
		initialIntents == null ? 0 : initialIntents.length,
		mCallerChooserTargets == null ? 0 : mCallerChooserTargets.length,
		initialIntents == null ? 0 : initialIntents.length,
		isWorkProfile(),
		findPreferredContentPreview(getTargetIntent(), getContentResolver()),
		target.getAction()