PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update onPermissionSummaryResult()"

Browse Source
This commit is contained in:
Chaohui Wang
2022-10-11 03:06:06 +00:00
committed by Android (Google) Code Review
parent 95b0f3af2d 41716cd24e
commit d41dc06a6a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
View File

@@ -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();

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

@@ -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");