Merge "Remove unnecessary check when setting permission summary"

This commit is contained in:
TreeHugger Robot
2018-08-23 01:33:39 +00:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 11 deletions

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(