Snap for 6660508 from a711165637a784b77c1c484703230a929c5ea4b7 to rvc-release (47db357e) · Commits · e / os / android_frameworks_base

location/java/android/location/LocationManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -1951,7 +1951,8 @@ public class LocationManager {
		}

		try {
		return mGnssStatusListenerManager.addListener(listener, Runnable::run);
		return mGnssStatusListenerManager.addListener(listener,
		new HandlerExecutor(new Handler()));
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -2086,7 +2087,7 @@ public class LocationManager {
		@Deprecated
		@RequiresPermission(ACCESS_FINE_LOCATION)
		public boolean addNmeaListener(@NonNull OnNmeaMessageListener listener) {
		return addNmeaListener(Runnable::run, listener);
		return addNmeaListener(listener, null);
		}

		/**

packages/CarSystemUI/src/com/android/systemui/car/statusbar/DummyNotificationShadeWindowController.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.view.WindowManager;
		import com.android.systemui.car.window.SystemUIOverlayWindowController;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.phone.BiometricUnlockController;
		import com.android.systemui.statusbar.phone.DozeParameters;
		@@ -49,12 +50,14 @@ public class DummyNotificationShadeWindowController extends NotificationShadeWin
		DozeParameters dozeParameters,
		StatusBarStateController statusBarStateController,
		ConfigurationController configurationController,
		KeyguardViewMediator keyguardViewMediator,
		KeyguardBypassController keyguardBypassController,
		SysuiColorExtractor colorExtractor,
		DumpManager dumpManager,
		SystemUIOverlayWindowController overlayWindowController) {
		super(context, windowManager, activityManager, dozeParameters, statusBarStateController,
		configurationController, keyguardBypassController, colorExtractor, dumpManager);
		configurationController, keyguardViewMediator, keyguardBypassController,
		colorExtractor, dumpManager);
		mOverlayWindowController = overlayWindowController;
		}

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -171,7 +171,6 @@ public class PipTouchHandler {
		private float mSavedSnapFraction = -1f;
		private boolean mSendingHoverAccessibilityEvents;
		private boolean mMovementWithinDismiss;
		private boolean mHideMenuAfterShown = false;
		private PipAccessibilityInteractionConnection mConnection;

		// Touch state
		@@ -726,7 +725,6 @@ public class PipTouchHandler {
		// on and changing MotionEvents into HoverEvents.
		// Let's not enable menu show/hide for a11y services.
		if (!mAccessibilityManager.isTouchExplorationEnabled()) {
		mHideMenuAfterShown = true;
		mTouchState.scheduleHoverExitTimeoutCallback();
		}
		if (!shouldDeliverToMenu && mSendingHoverAccessibilityEvents) {
		@@ -813,9 +811,6 @@ public class PipTouchHandler {
		mSavedSnapFraction = mMotionHelper.animateToExpandedState(expandedBounds,
		mMovementBounds, mExpandedMovementBounds, callback);
		}
		if (mHideMenuAfterShown) {
		mMenuController.hideMenu();
		}
		} else if (menuState == MENU_STATE_NONE && mMenuState == MENU_STATE_FULL) {
		// Try and restore the PiP to the closest edge, using the saved snap fraction
		// if possible
		@@ -853,7 +848,6 @@ public class PipTouchHandler {
		}
		}
		mMenuState = menuState;
		mHideMenuAfterShown = false;
		updateMovementBounds();
		// If pip menu has dismissed, we should register the A11y ActionReplacingConnection for pip
		// as well, or it can't handle a11y focus and pip menu can't perform any action.

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -675,6 +675,9 @@ public class DividerView extends FrameLayout implements OnTouchListener,
		}

		private void notifySplitScreenBoundsChanged() {
		if (mSplitLayout.mPrimary == null \|\| mSplitLayout.mSecondary == null) {
		return;
		}
		mOtherTaskRect.set(mSplitLayout.mSecondary);

		mTmpRect.set(mHandle.getLeft(), mHandle.getTop(), mHandle.getRight(), mHandle.getBottom());

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowController.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable,
		private final boolean mKeyguardScreenRotation;
		private final long mLockScreenDisplayTimeout;
		private final Display.Mode mKeyguardDisplayMode;
		private final KeyguardViewMediator mKeyguardViewMediator;
		private final KeyguardBypassController mKeyguardBypassController;
		private ViewGroup mNotificationShadeView;
		private LayoutParams mLp;
		@@ -104,6 +105,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable,
		IActivityManager activityManager, DozeParameters dozeParameters,
		StatusBarStateController statusBarStateController,
		ConfigurationController configurationController,
		KeyguardViewMediator keyguardViewMediator,
		KeyguardBypassController keyguardBypassController, SysuiColorExtractor colorExtractor,
		DumpManager dumpManager) {
		mContext = context;
		@@ -113,6 +115,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable,
		mDozeParameters = dozeParameters;
		mScreenBrightnessDoze = mDozeParameters.getScreenBrightnessDoze();
		mLpChanged = new LayoutParams();
		mKeyguardViewMediator = keyguardViewMediator;
		mKeyguardBypassController = keyguardBypassController;
		mColorExtractor = colorExtractor;
		dumpManager.registerDumpable(getClass().getName(), this);
		@@ -202,6 +205,11 @@ public class NotificationShadeWindowController implements Callback, Dumpable,
		mWindowManager.addView(mNotificationShadeView, mLp);
		mLpChanged.copyFrom(mLp);
		onThemeChanged();

		// Make the state consistent with KeyguardViewMediator#setupLocked during initialization.
		if (mKeyguardViewMediator.isShowingAndNotOccluded()) {
		setKeyguardShowing(true);
		}
		}

		public void setNotificationShadeView(ViewGroup view) {