Snap for 7566880 from c312c6481ba1c11b11dc84fb147b95fd3f7ca5b2 to sc-release (fbd0179a) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -3944,8 +3944,8 @@ public class DeviceIdleController extends SystemService
		} else {
		if (mConstants.USE_WINDOW_ALARMS) {
		mAlarmManager.setWindow(AlarmManager.ELAPSED_REALTIME_WAKEUP,
		mConstants.FLEX_TIME_SHORT,
		mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler);
		mNextAlarmTime, mConstants.FLEX_TIME_SHORT,
		"DeviceIdleController.deep", mDeepAlarmListener, mHandler);
		} else {
		mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
		mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler);

+2 −2

Original line number	Diff line number	Diff line
		@@ -10151,8 +10151,8 @@ public class DevicePolicyManager {
		* An example of a supported preferential network service is the Enterprise
		* slice on 5G networks.
		*
		* By default, preferential network service is enabled on the work profile on supported
		* carriers and devices. Admins can explicitly disable it with this API.
		* By default, preferential network service is disabled on the work profile on supported
		* carriers and devices. Admins can explicitly enable it with this API.
		* On fully-managed devices this method is unsupported because all traffic is considered
		* work traffic.
		*

+0 −3

Original line number	Diff line number	Diff line
		@@ -72,9 +72,6 @@ public final class DisplayManager {
		* {@link #EXTRA_WIFI_DISPLAY_STATUS} extra.
		* </p><p>
		* This broadcast is only sent to registered receivers and can only be sent by the system.
		* </p><p>
		* {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission is required to
		* receive this broadcast.
		* </p>
		* @hide
		*/

+6 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,12 @@ public class TelephonyRegistryManager {
		IOnSubscriptionsChangedListener callback = new IOnSubscriptionsChangedListener.Stub() {
		@Override
		public void onSubscriptionsChanged () {
		final long identity = Binder.clearCallingIdentity();
		try {
		executor.execute(() -> listener.onSubscriptionsChanged());
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}
		};
		mSubscriptionChangedListenerMap.put(listener, callback);

+9 −3

Original line number	Diff line number	Diff line
		@@ -1081,7 +1081,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		\|\| mWindowSpaceTop != mLocation[1];
		final boolean layoutSizeChanged = getWidth() != mScreenRect.width()
		\|\| getHeight() != mScreenRect.height();
		final boolean hintChanged = viewRoot.getSurfaceTransformHint() != mTransformHint;
		final boolean hintChanged = (viewRoot.getSurfaceTransformHint() != mTransformHint)
		&& mRequestedVisible;

		if (creating \|\| formatChanged \|\| sizeChanged \|\| visibleChanged \|\|
		(mUseAlpha && alphaChanged) \|\| windowVisibleChanged \|\|
		@@ -1227,7 +1228,9 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		// Therefore, we must explicitly recreate the {@link Surface} in these
		// cases.
		if (mUseBlastAdapter) {
		if (mBlastBufferQueue != null) {
		mSurface.transferFrom(mBlastBufferQueue.createSurfaceWithHandle());
		}
		} else {
		mSurface.createFrom(mSurfaceControl);
		}
		@@ -1237,7 +1240,10 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
		private void setBufferSize(Transaction transaction) {
		if (mUseBlastAdapter) {
		mBlastSurfaceControl.setTransformHint(mTransformHint);
		mBlastBufferQueue.update(mBlastSurfaceControl, mSurfaceWidth, mSurfaceHeight, mFormat);
		if (mBlastBufferQueue != null) {
		mBlastBufferQueue.update(mBlastSurfaceControl, mSurfaceWidth, mSurfaceHeight,
		mFormat);
		}
		} else {
		transaction.setBufferSize(mSurfaceControl, mSurfaceWidth, mSurfaceHeight);
		}