Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master (dc07ebea) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -5956,7 +5956,7 @@ package android.location {
		method public int getEphemerisSource();
		method @FloatRange public double getIonoDelayMeters();
		method @IntRange(from=0, to=1023) public int getIssueOfDataClock();
		method @IntRange(from=0, to=255) public int getIssueOfDataEphemeris();
		method @IntRange(from=0, to=1023) public int getIssueOfDataEphemeris();
		method @Nullable public android.location.SatellitePvt.PositionEcef getPositionEcef();
		method @IntRange(from=0) public long getTimeOfClockSeconds();
		method @IntRange(from=0) public long getTimeOfEphemerisSeconds();
		@@ -5984,7 +5984,7 @@ package android.location {
		method @NonNull public android.location.SatellitePvt.Builder setEphemerisSource(int);
		method @NonNull public android.location.SatellitePvt.Builder setIonoDelayMeters(@FloatRange(from=0.0f, to=100.0f) double);
		method @NonNull public android.location.SatellitePvt.Builder setIssueOfDataClock(@IntRange(from=0, to=1023) int);
		method @NonNull public android.location.SatellitePvt.Builder setIssueOfDataEphemeris(@IntRange(from=0, to=255) int);
		method @NonNull public android.location.SatellitePvt.Builder setIssueOfDataEphemeris(@IntRange(from=0, to=1023) int);
		method @NonNull public android.location.SatellitePvt.Builder setPositionEcef(@NonNull android.location.SatellitePvt.PositionEcef);
		method @NonNull public android.location.SatellitePvt.Builder setTimeOfClockSeconds(@IntRange(from=0) long);
		method @NonNull public android.location.SatellitePvt.Builder setTimeOfEphemerisSeconds(@IntRange(from=0) long);

location/java/android/location/SatellitePvt.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -539,7 +539,7 @@ public final class SatellitePvt implements Parcelable {
		*
		* <p>This field is valid if {@link #hasIssueOfDataEphemeris()} is true.
		*/
		@IntRange(from = 0, to = 255)
		@IntRange(from = 0, to = 1023)
		public int getIssueOfDataEphemeris() {
		return mIssueOfDataEphemeris;
		}
		@@ -847,8 +847,8 @@ public final class SatellitePvt implements Parcelable {
		*/
		@NonNull
		public Builder setIssueOfDataEphemeris(
		@IntRange(from = 0, to = 255) int issueOfDataEphemeris) {
		Preconditions.checkArgumentInRange(issueOfDataEphemeris, 0, 255,
		@IntRange(from = 0, to = 1023) int issueOfDataEphemeris) {
		Preconditions.checkArgumentInRange(issueOfDataEphemeris, 0, 1023,
		"issueOfDataEphemeris");
		mIssueOfDataEphemeris = issueOfDataEphemeris;
		mFlags = (byte) (mFlags \| HAS_ISSUE_OF_DATA_EPHEMERIS);

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -599,9 +599,7 @@ public abstract class PanelViewController {
		float collapseSpeedUpFactor, boolean expandBecauseOfFalsing) {
		if (target == mExpandedHeight && mOverExpansion == 0.0f) {
		// We're at the target and didn't fling and there's no overshoot
		endJankMonitoring(CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE);
		mKeyguardStateController.notifyPanelFlingEnd();
		notifyExpandingFinished();
		onFlingEnd(false /* cancelled */);
		return;
		}
		mIsFlinging = true;

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationPanelViewControllerTest.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -985,6 +985,21 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
		verify(mKeyguardStateController).notifyPanelFlingEnd();
		}

		@Test
		public void testSwipe_exactlyToTarget_notifiesNssl() {
		// No over-expansion
		mNotificationPanelViewController.setOverExpansion(0f);
		// Fling to a target that is equal to the current position (i.e. a no-op fling).
		mNotificationPanelViewController.flingToHeight(
		0f,
		true,
		mNotificationPanelViewController.mExpandedHeight,
		1f,
		false);
		// Verify that the NSSL is notified that the panel is not flinging.
		verify(mNotificationStackScrollLayoutController).setPanelFlinging(false);
		}

		@Test
		public void testDoubleTapRequired_Keyguard() {
		FalsingManager.FalsingTapListener listener = getFalsingTapListener();

services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java

+1 −12

Original line number	Diff line number	Diff line
		@@ -398,18 +398,7 @@ public class AppPredictionPerUserService extends
		final IBinder.DeathRecipient mDeathRecipient;

		private final RemoteCallbackList<IPredictionCallback> mCallbacks =
		new RemoteCallbackList<IPredictionCallback>() {
		@Override
		public void onCallbackDied(IPredictionCallback callback) {
		if (DEBUG) {
		Slog.d(TAG, "Binder died for session Id=" + mSessionId
		+ " and callback=" + callback.asBinder());
		}
		if (mCallbacks.getRegisteredCallbackCount() == 0) {
		destroy();
		}
		}
		};
		new RemoteCallbackList<>();

		AppPredictionSessionInfo(
		@NonNull final AppPredictionSessionId id,