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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29755206'] into 24Q4-release.

Browse Source 
Change-Id: Ic80fb8f08fa10da2944aecc6e14f9ee1f07186dc
This commit is contained in:
Android Build Coastguard Worker
2024-10-11 01:04:07 +00:00
parent e029aede58 a506a48b9f
commit 2dd7679394
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/nfc/PaymentSettings.java
View File

@@ -30,6 +30,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.internal.hidden_from_bootclasspath.android.permission.flags.Flags;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
@@ -120,6 +121,9 @@ public class PaymentSettings extends DashboardFragment {
@Override @Override
protected boolean isPageSearchEnabled(Context context) { protected boolean isPageSearchEnabled(Context context) {
if (Flags.walletRoleEnabled()) {
return false;
}
final UserManager userManager = context.getSystemService(UserManager.class); final UserManager userManager = context.getSystemService(UserManager.class);
final UserInfo myUserInfo = userManager.getUserInfo(UserHandle.myUserId()); final UserInfo myUserInfo = userManager.getUserInfo(UserHandle.myUserId());
if (myUserInfo.isGuest()) { if (myUserInfo.isGuest()) {

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.content.pm.UserInfo;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; 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.Preference;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
@@ -36,6 +40,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.shadow.ShadowNfcAdapter; import com.android.settings.testutils.shadow.ShadowNfcAdapter;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -58,6 +63,9 @@ public class PaymentSettingsTest {
private Context mContext; private Context mContext;
@Rule
public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
@Mock @Mock
private PackageManager mPackageManager; private PackageManager mPackageManager;
@@ -98,7 +106,19 @@ public class PaymentSettingsTest {
} }
@Test @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); when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
final List<String> niks = final List<String> niks =