From e7c974438750a1999ac2a405d426601822879d16 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 22 Aug 2018 17:04:57 -0700 Subject: [PATCH] Remove unnecessary check when setting permission summary 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 --- .../appinfo/AppPermissionPreferenceController.java | 5 +---- .../AppPermissionPreferenceControllerTest.java | 13 ++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java index 7b14af44a5a..76211edd7cd 100644 --- a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java @@ -46,11 +46,8 @@ public class AppPermissionPreferenceController extends AppInfoPreferenceControll public void onPermissionSummaryResult(int standardGrantedPermissionCount, int requestedPermissionCount, int additionalGrantedPermissionCount, List grantedGroupLabels) { - if (mParent.getActivity() == null) { - return; - } final Resources res = mContext.getResources(); - CharSequence summary = null; + CharSequence summary; if (requestedPermissionCount == 0) { summary = res.getString( 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 73459c4b6c0..e6ae61888c7 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java @@ -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()); + 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()); + mController.mPermissionCallback.onPermissionSummaryResult(1, 5, 0, new ArrayList<>()); verify(mPreference).setEnabled(true); verify(mPreference).setSummary(mContext.getString(