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

Commit 29916a6c authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Simplify PermissionsSummaryHelper 

Remove unused permissionCount, grantedStandardCount &
onAppWithPermissionsCountsResult.

And also no need to pass standardGrantedPermissionCount through
onPermissionSummaryResult(), because its value always equals to
grantedGroupLabels.size

Bug: 236346018
Test: m Settings
Test: m CarSettings
Change-Id: Idb8faae47b1583cc02956a97097569aa00cd17d1
parent 9d8f4ade

packages/SettingsLib/src/com/android/settingslib/applications/PermissionsSummaryHelper.java

+15 −19
Original line number Diff line number Diff line
@@ -21,9 +21,11 @@ import android.permission.RuntimePermissionPresentationInfo; 


import java.text.Collator;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;



/**

 * Helper to get the runtime permissions for an app.

 */

public class PermissionsSummaryHelper {



    public static void getPermissionSummary(Context context, String pkg,
@@ -31,20 +33,16 @@ public class PermissionsSummaryHelper { 
        final PermissionControllerManager permController =

                context.getSystemService(PermissionControllerManager.class);

        permController.getAppPermissions(pkg, permissions -> {

            final int permissionCount = permissions.size();



            int grantedStandardCount = 0;

            int grantedAdditionalCount = 0;

            int requestedCount = 0;

            List<CharSequence> grantedStandardLabels = new ArrayList<>();



            for (int i = 0; i < permissionCount; i++) {

                RuntimePermissionPresentationInfo permission = permissions.get(i);

            for (RuntimePermissionPresentationInfo permission : permissions) {

                requestedCount++;

                if (permission.isGranted()) {

                    if (permission.isStandard()) {

                        grantedStandardLabels.add(permission.getLabel());

                        grantedStandardCount++;

                    } else {

                        grantedAdditionalCount++;

                    }
@@ -53,23 +51,21 @@ public class PermissionsSummaryHelper { 


            Collator collator = Collator.getInstance();

            collator.setStrength(Collator.PRIMARY);

            Collections.sort(grantedStandardLabels, collator);

            grantedStandardLabels.sort(collator);



            callback.onPermissionSummaryResult(grantedStandardCount, requestedCount,

                    grantedAdditionalCount, grantedStandardLabels);

            callback.onPermissionSummaryResult(

                    requestedCount, grantedAdditionalCount, grantedStandardLabels);

        }, null);

    }



    public static abstract class PermissionsResultCallback {

        public void onAppWithPermissionsCountsResult(int standardGrantedPermissionAppCount,

                int standardUsedPermissionAppCount) {

            /* do nothing - stub */

        }

    /**

     * Callback for the runtime permissions result for an app.

     */

    public interface PermissionsResultCallback {



        public void onPermissionSummaryResult(int standardGrantedPermissionCount,

        /** The runtime permission summary result for an app. */

        void onPermissionSummaryResult(

                int requestedPermissionCount, int additionalGrantedPermissionCount,

                List<CharSequence> grantedGroupLabels) {

            /* do nothing - stub */

        }

                List<CharSequence> grantedGroupLabels);

    }

}