commit d41dc06a6abf23d217b92123668f019465d4d626
author Chaohui Wang <chaohuiw@google.com> Tue Oct 11 03:06:06 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 11 03:06:06 2022 +0000
tree 89c467a56c5cda30bd36f17a376a0652e327c438
parent 95b0f3af2d1e4f6cdaa6d95f01a6df4634bd3b22
parent 41716cd24e41f5b1303d3cca4efaca97fc92f59b

Merge "Update onPermissionSummaryResult()"

src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java

diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
index ce2ff32..047101d 100644
--- a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
@@ -56,7 +56,7 @@
     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();

tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java

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 f00471d..41ff9ed 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 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 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 @@
         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 @@
         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");