Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8d87e941 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-13.0.0_r4' into staging/lineage-20.0_merge-android-13.0.0_r4 

Android 13.0.0 release 4

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYxeEgwAKCRDorT+BmrEO
# eMwoAKCHQG/mUetCpEJRyLca/PUOZLkQuQCfW3rvMsR6dcdi9UezyZscVdth0/I=
# =v3AQ
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Sep  6 20:33:55 2022 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1281 signatures in the past
#      10 months.  Encrypted 4 messages in the past 7 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By John Wu (1) and others
# Via Android Build Coastguard Worker
* tag 'android-13.0.0_r4':
  Fix AppPrediction/Smartspace leak
  Fix the visibility check for sdk_sandbox processes
  Ignore sharedUserId when package already left shared UID
  Fix stale NSSL "fling" state caused by no-op fling
  Correct the range of issueOfDataEphemeris as [0, 1023]
  Remove package name from SafetyNet logs

Change-Id: Ib8e52370ba8dd4cdaf8c9c37f3d98949e1091d64
parents 345ff7b8 53eadee3

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,