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

Commit 2534aea3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary check when setting permission summary"

parents 1becb776 e7c97443

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

+1 −4
Original line number Diff line number Diff line
@@ -46,11 +46,8 @@ public class AppPermissionPreferenceController extends AppInfoPreferenceControll 
        public void onPermissionSummaryResult(int standardGrantedPermissionCount,

                int requestedPermissionCount, int additionalGrantedPermissionCount,

                List<CharSequence> grantedGroupLabels) {

            if (mParent.getActivity() == null) {

                return;

            }

            final Resources res = mContext.getResources();

            CharSequence summary = null;

            CharSequence summary;



            if (requestedPermissionCount == 0) {

                summary = res.getString(

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

+6 −7
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.applications.appinfo;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.argThat;
@@ -28,6 +29,9 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.ApplicationInfo;



import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,9 +46,6 @@ import org.robolectric.RuntimeEnvironment; 


import java.util.ArrayList;



import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



@RunWith(SettingsRobolectricTestRunner.class)

public class AppPermissionPreferenceControllerTest {
@@ -83,8 +84,7 @@ public class AppPermissionPreferenceControllerTest { 
    public void onPermissionSummaryResult_noRequestedPermission_shouldDisablePreference() {

        mController.displayPreference(mScreen);



        mController.mPermissionCallback.onPermissionSummaryResult(

                1, 0, 1, new ArrayList<CharSequence>());

        mController.mPermissionCallback.onPermissionSummaryResult(1, 0, 1, new ArrayList<>());



        verify(mPreference).setEnabled(false);

        verify(mPreference).setSummary(mContext.getString(
@@ -95,8 +95,7 @@ public class AppPermissionPreferenceControllerTest { 
    public void onPermissionSummaryResult_noGrantedPermission_shouldSetNoPermissionSummary() {

        mController.displayPreference(mScreen);



        mController.mPermissionCallback.onPermissionSummaryResult(

                1, 5, 0, new ArrayList<CharSequence>());

        mController.mPermissionCallback.onPermissionSummaryResult(1, 5, 0, new ArrayList<>());



        verify(mPreference).setEnabled(true);

        verify(mPreference).setSummary(mContext.getString(