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

Remove unnecessary check when setting permission summary

Browse Source 
Activity null check is probably necessary when this logic is written in
fragment, now the logic is in a controller where all dependencies are
self contained, so we don't need to check activity null here.

Change-Id: Ifa32e0d6563c411f19bec07f176765a7c94c8a40
Fixes: 112289663
Test: robotests
This commit is contained in:
Fan Zhang
2018-08-22 17:04:57 -07:00
parent 161ff18a0b
commit e7c9744387
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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