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

Commit 1ee96432 authored by Nate Myren's avatar Nate Myren
Browse files

Change name of getNumRegisteredAttribtionSources 

Bug: 330901543
Test: atest GtsPermissionTestCases
Change-Id: I8188c6f418a78de3ce70f6feac49fb03bbf221ea
parent 57ad21ba

core/java/android/permission/IPermissionManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ interface IPermissionManager { 


    IBinder registerAttributionSource(in AttributionSourceState source);



    int getNumRegisteredAttributionSources(int uid);

    int getRegisteredAttributionSourceCount(int uid);



    boolean isRegisteredAttributionSource(in AttributionSourceState source);

core/java/android/permission/PermissionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1680,9 +1680,9 @@ public final class PermissionManager { 
     * @hide

     */

    @RequiresPermission(Manifest.permission.UPDATE_APP_OPS_STATS)

    public int getNumRegisteredAttributionSourcesForTest(int uid) {

    public int getRegisteredAttributionSourceCountForTest(int uid) {

        try {

            return mPermissionManager.getNumRegisteredAttributionSources(uid);

            return mPermissionManager.getRegisteredAttributionSourceCount(uid);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+9 −10
Original line number Diff line number Diff line
@@ -462,8 +462,8 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
    }



    @Override

    public int getNumRegisteredAttributionSources(int uid) {

        return mAttributionSourceRegistry.getNumRegisteredAttributionSources(uid);

    public int getRegisteredAttributionSourceCount(int uid) {

        return mAttributionSourceRegistry.getRegisteredAttributionSourceCount(uid);

    }



    @Override
@@ -943,7 +943,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
            }

        }



        public int getNumRegisteredAttributionSources(int uid) {

        public int getRegisteredAttributionSourceCount(int uid) {

            mContext.enforceCallingOrSelfPermission(UPDATE_APP_OPS_STATS,

                    "getting the number of registered AttributionSources requires "

                            + "UPDATE_APP_OPS_STATS");
@@ -952,14 +952,13 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
            System.gc();

            System.gc();

            synchronized (mLock) {

                int[] numForUid = { 0 };

                mAttributions.forEach((key, value) -> {

                    if (value.getUid() == uid) {

                        numForUid[0]++;

                int numForUid = 0;

                for (Map.Entry<IBinder, AttributionSource> entry : mAttributions.entrySet()) {

                    if (entry.getValue().getUid() == uid) {

                        numForUid++;

                    }



                });

                return numForUid[0];

                }

                return numForUid;

            }

        }