Snap for 7779705 from 48647682a0ffc766c1b9c45012b31f4fa16a9512 to sc-qpr1-release (cafffd40) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -1008,13 +1008,21 @@ public class JobSchedulerService extends com.android.server.SystemService
		}

		@Override
		public void onUserUnlocked(@NonNull TargetUser user) {
		public void onUserStarting(@NonNull TargetUser user) {
		synchronized (mLock) {
		// Note that the user has started after its unlocked instead of when the user
		// actually starts because the storage won't be decrypted until unlock.
		mStartedUsers = ArrayUtils.appendInt(mStartedUsers, user.getUserIdentifier());
		}
		// Let's kick any outstanding jobs for this user.
		// The user is starting but credential encrypted storage is still locked.
		// Only direct-boot-aware jobs can safely run.
		// Let's kick off any eligible jobs for this user.
		mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
		}

		@Override
		public void onUserUnlocked(@NonNull TargetUser user) {
		// The user is fully unlocked and credential encrypted storage is now decrypted.
		// Direct-boot-UNaware jobs can now safely run.
		// Let's kick off any outstanding jobs for this user.
		mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
		}

+17 −0

Original line number	Diff line number	Diff line
		@@ -1257,6 +1257,23 @@ public final class DisplayManager {
		*/
		String KEY_FIXED_REFRESH_RATE_HIGH_AMBIENT_BRIGHTNESS_THRESHOLDS =
		"fixed_refresh_rate_high_ambient_brightness_thresholds";

		/**
		* Key for refresh rate when the device is in high brightness mode for sunlight visility.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.integer#config_defaultRefreshRateInHbmSunlight
		*/
		String KEY_REFRESH_RATE_IN_HBM_SUNLIGHT = "refresh_rate_in_hbm_sunlight";

		/**
		* Key for refresh rate when the device is in high brightness mode for HDR.
		*
		* @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER
		* @see android.R.integer#config_defaultRefreshRateInHbmHdr
		*/
		String KEY_REFRESH_RATE_IN_HBM_HDR = "refresh_rate_in_hbm_hdr";

		/**
		* Key for default peak refresh rate
		*

+2 −1

Original line number	Diff line number	Diff line
		@@ -20830,13 +20830,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		mPrivateFlags &= ~PFLAG_SCROLL_CONTAINER_ADDED;
		}

		notifyAppearedOrDisappearedForContentCaptureIfNeeded(false);

		mAttachInfo = null;
		if (mOverlay != null) {
		mOverlay.getOverlayView().dispatchDetachedFromWindow();
		}

		notifyEnterOrExitForAutoFillIfNeeded(false);
		notifyAppearedOrDisappearedForContentCaptureIfNeeded(false);
		}

		/**

+10 −6

Original line number	Diff line number	Diff line
		@@ -2836,8 +2836,13 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		final boolean surfaceControlChanged =
		(relayoutResult & RELAYOUT_RES_SURFACE_CHANGED)
		== RELAYOUT_RES_SURFACE_CHANGED;

		if (mSurfaceControl.isValid()) {
		updateOpacity(mWindowAttributes, dragResizing);
		updateOpacity(mWindowAttributes, dragResizing,
		surfaceControlChanged /forceUpdate /);
		}

		if (DEBUG_LAYOUT) Log.v(mTag, "relayout: frame=" + frame.toShortString()
		@@ -2872,9 +2877,7 @@ public final class ViewRootImpl implements ViewParent,
		// RELAYOUT_RES_SURFACE_CHANGED since it should indicate that WMS created a new
		// SurfaceControl.
		surfaceReplaced = (surfaceGenerationId != mSurface.getGenerationId()
		\|\| (relayoutResult & RELAYOUT_RES_SURFACE_CHANGED)
		== RELAYOUT_RES_SURFACE_CHANGED)
		&& mSurface.isValid();
		\|\| surfaceControlChanged) && mSurface.isValid();
		if (surfaceReplaced) {
		mSurfaceSequenceId++;
		}
		@@ -7824,7 +7827,8 @@ public final class ViewRootImpl implements ViewParent,
		return relayoutResult;
		}

		private void updateOpacity(WindowManager.LayoutParams params, boolean dragResizing) {
		private void updateOpacity(WindowManager.LayoutParams params, boolean dragResizing,
		boolean forceUpdate) {
		boolean opaque = false;

		if (!PixelFormat.formatHasAlpha(params.format)
		@@ -7840,7 +7844,7 @@ public final class ViewRootImpl implements ViewParent,
		opaque = true;
		}

		if (mIsSurfaceOpaque == opaque) {
		if (!forceUpdate && mIsSurfaceOpaque == opaque) {
		return;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,9 @@ public class WifiPowerCalculator extends PowerCalculator {
		+ "ms tx=" + txTime + "ms power=" + formatCharge(
		powerDurationAndTraffic.powerMah));
		}
		} else {
		powerDurationAndTraffic.durationMs = 0;
		powerDurationAndTraffic.powerMah = 0;
		}
		} else {
		final long wifiRunningTime = u.getWifiRunningTime(rawRealtimeUs, statsType) / 1000;