From 41716cd24e41f5b1303d3cca4efaca97fc92f59b Mon Sep 17 00:00:00 2001
From: Chaohui Wang <chaohuiw@google.com>
Date: Sun, 9 Oct 2022 19:30:44 +0800
Subject: [PATCH] Update onPermissionSummaryResult()

standardGrantedPermissionCount is removed.

Bug: 236346018
Test: m Settings
Change-Id: Id1b6a7d5302416f073e342d5b0d70b9b3dd102f0
---
 .../appinfo/AppPermissionPreferenceController.java        | 2 +-
 .../appinfo/AppPermissionPreferenceControllerTest.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
index ce2ff3259f6..047101d522c 100644
--- a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
@@ -56,7 +56,7 @@ public class AppPermissionPreferenceController extends AppInfoPreferenceControll
     final PermissionsSummaryHelper.PermissionsResultCallback mPermissionCallback
             = new PermissionsSummaryHelper.PermissionsResultCallback() {
         @Override
-        public void onPermissionSummaryResult(int standardGrantedPermissionCount,
+        public void onPermissionSummaryResult(
                 int requestedPermissionCount, int additionalGrantedPermissionCount,
                 List<CharSequence> grantedGroupLabels) {
             final Resources res = mContext.getResources();
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
index f00471d9ecc..41ff9ed9dcd 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
@@ -106,7 +106,7 @@ public class AppPermissionPreferenceControllerTest {
     public void onPermissionSummaryResult_noRequestedPermission_shouldDisablePreference() {
         mController.displayPreference(mScreen);
 
-        mController.mPermissionCallback.onPermissionSummaryResult(1, 0, 1, new ArrayList<>());
+        mController.mPermissionCallback.onPermissionSummaryResult(0, 1, new ArrayList<>());
 
         verify(mPreference).setEnabled(false);
         verify(mPreference).setSummary(mContext.getString(
@@ -117,7 +117,7 @@ public class AppPermissionPreferenceControllerTest {
     public void onPermissionSummaryResult_noGrantedPermission_shouldSetNoPermissionSummary() {
         mController.displayPreference(mScreen);
 
-        mController.mPermissionCallback.onPermissionSummaryResult(1, 5, 0, new ArrayList<>());
+        mController.mPermissionCallback.onPermissionSummaryResult(5, 0, new ArrayList<>());
 
         verify(mPreference).setEnabled(true);
         verify(mPreference).setSummary(mContext.getString(
@@ -131,7 +131,7 @@ public class AppPermissionPreferenceControllerTest {
         final ArrayList<CharSequence> labels = new ArrayList<>();
         labels.add(permission);
 
-        mController.mPermissionCallback.onPermissionSummaryResult(1, 5, 0, labels);
+        mController.mPermissionCallback.onPermissionSummaryResult(5, 0, labels);
 
         verify(mPreference).setEnabled(true);
         verify(mPreference).setSummary(permission);
@@ -144,7 +144,7 @@ public class AppPermissionPreferenceControllerTest {
         final ArrayList<CharSequence> labels = new ArrayList<>();
         labels.add(permission);
 
-        mController.mPermissionCallback.onPermissionSummaryResult(1, 5, 2, labels);
+        mController.mPermissionCallback.onPermissionSummaryResult(5, 2, labels);
 
         verify(mPreference).setEnabled(true);
         verify(mPreference).setSummary("Storage and 2 additional permissions");