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
This commit is contained in:
@@ -46,11 +46,8 @@ public class AppPermissionPreferenceController extends AppInfoPreferenceControll
|
|||||||
public void onPermissionSummaryResult(int standardGrantedPermissionCount,
|
public void onPermissionSummaryResult(int standardGrantedPermissionCount,
|
||||||
int requestedPermissionCount, int additionalGrantedPermissionCount,
|
int requestedPermissionCount, int additionalGrantedPermissionCount,
|
||||||
List<CharSequence> grantedGroupLabels) {
|
List<CharSequence> grantedGroupLabels) {
|
||||||
if (mParent.getActivity() == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
final Resources res = mContext.getResources();
|
final Resources res = mContext.getResources();
|
||||||
CharSequence summary = null;
|
CharSequence summary;
|
||||||
|
|
||||||
if (requestedPermissionCount == 0) {
|
if (requestedPermissionCount == 0) {
|
||||||
summary = res.getString(
|
summary = res.getString(
|
||||||
|
@@ -17,6 +17,7 @@
|
|||||||
package com.android.settings.applications.appinfo;
|
package com.android.settings.applications.appinfo;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
import static org.mockito.ArgumentMatchers.any;
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.ArgumentMatchers.anyInt;
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
import static org.mockito.ArgumentMatchers.argThat;
|
import static org.mockito.ArgumentMatchers.argThat;
|
||||||
@@ -28,6 +29,9 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.ApplicationInfo;
|
import android.content.pm.ApplicationInfo;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.SettingsActivity;
|
import com.android.settings.SettingsActivity;
|
||||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||||
@@ -42,9 +46,6 @@ import org.robolectric.RuntimeEnvironment;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import androidx.preference.Preference;
|
|
||||||
import androidx.preference.PreferenceScreen;
|
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
public class AppPermissionPreferenceControllerTest {
|
public class AppPermissionPreferenceControllerTest {
|
||||||
|
|
||||||
@@ -83,8 +84,7 @@ public class AppPermissionPreferenceControllerTest {
|
|||||||
public void onPermissionSummaryResult_noRequestedPermission_shouldDisablePreference() {
|
public void onPermissionSummaryResult_noRequestedPermission_shouldDisablePreference() {
|
||||||
mController.displayPreference(mScreen);
|
mController.displayPreference(mScreen);
|
||||||
|
|
||||||
mController.mPermissionCallback.onPermissionSummaryResult(
|
mController.mPermissionCallback.onPermissionSummaryResult(1, 0, 1, new ArrayList<>());
|
||||||
1, 0, 1, new ArrayList<CharSequence>());
|
|
||||||
|
|
||||||
verify(mPreference).setEnabled(false);
|
verify(mPreference).setEnabled(false);
|
||||||
verify(mPreference).setSummary(mContext.getString(
|
verify(mPreference).setSummary(mContext.getString(
|
||||||
@@ -95,8 +95,7 @@ public class AppPermissionPreferenceControllerTest {
|
|||||||
public void onPermissionSummaryResult_noGrantedPermission_shouldSetNoPermissionSummary() {
|
public void onPermissionSummaryResult_noGrantedPermission_shouldSetNoPermissionSummary() {
|
||||||
mController.displayPreference(mScreen);
|
mController.displayPreference(mScreen);
|
||||||
|
|
||||||
mController.mPermissionCallback.onPermissionSummaryResult(
|
mController.mPermissionCallback.onPermissionSummaryResult(1, 5, 0, new ArrayList<>());
|
||||||
1, 5, 0, new ArrayList<CharSequence>());
|
|
||||||
|
|
||||||
verify(mPreference).setEnabled(true);
|
verify(mPreference).setEnabled(true);
|
||||||
verify(mPreference).setSummary(mContext.getString(
|
verify(mPreference).setSummary(mContext.getString(
|
||||||
|
Reference in New Issue
Block a user