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

Commit 5fb1885e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Extend previously added limits for listeners" am: 875e6cc3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2467204



Change-Id: I892b03eba2439e81e186a2d2f550b8dbb4f6cdea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04302a25 875e6cc3

services/core/java/com/android/server/TelephonyRegistry.java

+16 −7
Original line number Diff line number Diff line
@@ -873,6 +873,13 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        mContext.registerReceiver(mBroadcastReceiver, filter);

    }



    //helper function to determine if limit on num listeners applies to callingUid

    private boolean doesLimitApplyForListeners(int callingUid, int exemptUid) {

        return (callingUid != Process.SYSTEM_UID

                && callingUid != Process.PHONE_UID

                && callingUid != exemptUid);

    }



    @Override

    public void addOnSubscriptionsChangedListener(String callingPackage, String callingFeatureId,

            IOnSubscriptionsChangedListener callback) {
@@ -887,7 +894,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        synchronized (mRecords) {

            // register

            IBinder b = callback.asBinder();

            Record r = add(b, Binder.getCallingUid(), Binder.getCallingPid(), false);

            boolean doesLimitApply = doesLimitApplyForListeners(Binder.getCallingUid(),

                    Process.myUid());

            Record r = add(b, Binder.getCallingUid(), Binder.getCallingPid(), doesLimitApply); //



            if (r == null) {

                return;
@@ -941,7 +950,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        synchronized (mRecords) {

            // register

            IBinder b = callback.asBinder();

            Record r = add(b, Binder.getCallingUid(), Binder.getCallingPid(), false);

            boolean doesLimitApply = doesLimitApplyForListeners(Binder.getCallingUid(),

                    Process.myUid());

            Record r = add(b, Binder.getCallingUid(), Binder.getCallingPid(), doesLimitApply); //



            if (r == null) {

                return;
@@ -1070,10 +1081,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
        synchronized (mRecords) {

            // register

            IBinder b = callback.asBinder();

            boolean doesLimitApply =

                    Binder.getCallingUid() != Process.SYSTEM_UID

                            && Binder.getCallingUid() != Process.PHONE_UID

                            && Binder.getCallingUid() != Process.myUid();

            boolean doesLimitApply = doesLimitApplyForListeners(Binder.getCallingUid(),

                    Process.myUid());

            Record r = add(b, Binder.getCallingUid(), Binder.getCallingPid(), doesLimitApply);



            if (r == null) {
@@ -1417,7 +1426,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                        .isRegistrationLimitEnabledInPlatformCompat(callingUid)) {

                    throw new IllegalStateException(errorMsg);

                }

            } else if (doesLimitApply && numRecordsForPid

            } else if (numRecordsForPid

                    >= TelephonyCallback.DEFAULT_PER_PID_REGISTRATION_LIMIT / 2) {

                // Log the warning independently of the dynamically set limit -- apps shouldn't be

                // doing this regardless of whether we're throwing them an exception for it.