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

Merge ab/AP4A.241205.013 into aosp-main-future

Browse Source 
Bug: 370570306
Merged-In: I0d4c48ef6debfa82597db48a4320b0500f330b1b
Change-Id: Ia46be767cd3e134c3f1b37411a72c4e0be28ecee
This commit is contained in:
Xin Li
2024-11-27 12:53:11 -08:00
parent ed4e2b8fc0 f808bfa343
commit b6cfdb21a8
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
View File

@@ -28,6 +28,10 @@ import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.os.UserManager;
import android.platform.test.annotations.RequiresFlagsDisabled;
import android.platform.test.annotations.RequiresFlagsEnabled;
import android.platform.test.flag.junit.CheckFlagsRule;
import android.platform.test.flag.junit.DeviceFlagsValueProvider;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
@@ -36,6 +40,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -58,6 +63,9 @@ public class PaymentSettingsTest {
private Context mContext;
@Rule
public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
@Mock
private PackageManager mPackageManager;
@@ -98,7 +106,19 @@ public class PaymentSettingsTest {
}
@Test
public void getNonIndexableKey_primaryUser_returnsTrue() {
@RequiresFlagsEnabled(android.permission.flags.Flags.FLAG_WALLET_ROLE_ENABLED)
public void getNonIndexableKey_primaryUser_returnsFalse_walletRoleEnabled() {
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
final List<String> niks =
PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
assertThat(niks).containsAtLeast(FOREGROUND_KEY, PAYMENT_KEY);
}
@Test
@RequiresFlagsDisabled(android.permission.flags.Flags.FLAG_WALLET_ROLE_ENABLED)
public void getNonIndexableKey_primaryUser_returnsTrue_walletRoleDisabled() {
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
final List<String> niks =