Fix errorprone warnings that should be errors

This commit is part of a large scale change to fix errorprone
errors that have been downgraded to warnings in the android
source tree, so that they can be promoted to errors again.
The full list of changes include the following, but not all
will be present in any one individual commit:

BadAnnotationImplementation
BadShiftAmount
BanJNDI
BoxedPrimitiveEquality
ComparableType
ComplexBooleanConstant
CollectionToArraySafeParameter
ConditionalExpressionNumericPromotion
DangerousLiteralNull
DoubleBraceInitialization
DurationFrom
DurationTemporalUnit
EmptyTopLevelDeclaration
EqualsNull
EqualsReference
FormatString
FromTemporalAccessor
GetClassOnAnnotation
GetClassOnClass
HashtableContains
IdentityBinaryExpression
IdentityHashMapBoxing
InstantTemporalUnit
InvalidTimeZoneID
InvalidZoneId
IsInstanceIncompatibleType
JUnitParameterMethodNotFound
LockOnBoxedPrimitive
MathRoundIntLong
MislabeledAndroidString
MisusedDayOfYear
MissingSuperCall
MisusedWeekYear
ModifyingCollectionWithItself
NoCanIgnoreReturnValueOnClasses
NonRuntimeAnnotation
NullableOnContainingClass
NullTernary
OverridesJavaxInjectableMethod
ParcelableCreator
PeriodFrom
PreconditionsInvalidPlaceholder
ProtoBuilderReturnValueIgnored
ProtoFieldNullComparison
RandomModInteger
RectIntersectReturnValueIgnored
ReturnValueIgnored
SelfAssignment
SelfComparison
SelfEquals
SizeGreaterThanOrEqualsZero
StringBuilderInitWithChar
TreeToString
TryFailThrowable
UnnecessaryCheckNotNull
UnusedCollectionModifiedInPlace
XorPower

See https://errorprone.info/bugpatterns for more
information on the checks.

Bug: 253827323
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I29f691a22617b1fc834680ff1cf4ab4244203f06

23 files changed, 120 insertions, 128 deletions

diff --git a/src/com/android/settings/TrustedCredentialsDialogBuilder.java b/src/com/android/settings/TrustedCredentialsDialogBuilder.java
index 0dc8c256761..363560e7fc9 100644
--- a/src/com/android/settings/TrustedCredentialsDialogBuilder.java
+++ b/src/com/android/settings/TrustedCredentialsDialogBuilder.java
@@ -171,8 +171,8 @@ class TrustedCredentialsDialogBuilder extends AlertDialog.Builder {
             } else {
                 new AlertDialog.Builder(mActivity)
                         .setMessage(R.string.trusted_credentials_remove_confirmation)
-                        .setPositiveButton(android.R.string.yes, onConfirm)
-                        .setNegativeButton(android.R.string.no, null)
+                        .setPositiveButton(android.R.string.ok, onConfirm)
+                        .setNegativeButton(android.R.string.cancel, null)
                         .show();
 
             }
diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java
index a2b6182a715..b45033acea1 100644
--- a/src/com/android/settings/accounts/AccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDashboardFragment.java
@@ -123,6 +123,7 @@ public class AccountDashboardFragment extends DashboardFragment {
                     return controllers;
                 }
 
+                @SuppressWarnings("MissingSuperCall") // TODO: Fix me
                 @Override
                 public List<SearchIndexableRaw> getDynamicRawDataToIndex(Context context,
                         boolean enabled) {
diff --git a/src/com/android/settings/applications/intentpicker/SupportedLinkWrapper.java b/src/com/android/settings/applications/intentpicker/SupportedLinkWrapper.java
index 0db4361f1c5..f8f9a71b89a 100644
--- a/src/com/android/settings/applications/intentpicker/SupportedLinkWrapper.java
+++ b/src/com/android/settings/applications/intentpicker/SupportedLinkWrapper.java
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
  *  A buffer of the supported link data. This {@link SupportedLinkWrapper} wraps the host, enabled
  *  and a list of {@link DomainOwner}.
  */
-public class SupportedLinkWrapper implements Comparable {
+public class SupportedLinkWrapper implements Comparable<SupportedLinkWrapper> {
     private static final String TAG = "SupportedLinkWrapper";
 
     private String mHost;
@@ -112,8 +112,7 @@ public class SupportedLinkWrapper implements Comparable {
     }
 
     @Override
-    public int compareTo(Object o) {
-        final SupportedLinkWrapper that = (SupportedLinkWrapper) o;
+    public int compareTo(SupportedLinkWrapper that) {
         if (this.mIsEnabled != that.mIsEnabled) {
             return this.mIsEnabled ? -1 : 1;
         }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index de778bdf100..fe263339373 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -713,6 +713,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
         }
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: Fix me
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         switch(newConfig.orientation) {
diff --git a/src/com/android/settings/development/DisableLogPersistWarningDialog.java b/src/com/android/settings/development/DisableLogPersistWarningDialog.java
index 76035cca06b..4514b1b8ec6 100644
--- a/src/com/android/settings/development/DisableLogPersistWarningDialog.java
+++ b/src/com/android/settings/development/DisableLogPersistWarningDialog.java
@@ -57,8 +57,8 @@ public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment i
         return new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.dev_logpersist_clear_warning_title)
                 .setMessage(R.string.dev_logpersist_clear_warning_message)
-                .setPositiveButton(android.R.string.yes, this /* onClickListener */)
-                .setNegativeButton(android.R.string.no, this /* onClickListener */)
+                .setPositiveButton(android.R.string.ok, this /* onClickListener */)
+                .setNegativeButton(android.R.string.cancel, this /* onClickListener */)
                 .create();
     }
 
diff --git a/src/com/android/settings/development/EnableAdbWarningDialog.java b/src/com/android/settings/development/EnableAdbWarningDialog.java
index 1fcd350f1fb..5204130b6e1 100644
--- a/src/com/android/settings/development/EnableAdbWarningDialog.java
+++ b/src/com/android/settings/development/EnableAdbWarningDialog.java
@@ -52,8 +52,8 @@ public class EnableAdbWarningDialog extends InstrumentedDialogFragment implement
         return new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.adb_warning_title)
                 .setMessage(R.string.adb_warning_message)
-                .setPositiveButton(android.R.string.yes, this /* onClickListener */)
-                .setNegativeButton(android.R.string.no, this /* onClickListener */)
+                .setPositiveButton(android.R.string.ok, this /* onClickListener */)
+                .setNegativeButton(android.R.string.cancel, this /* onClickListener */)
                 .create();
     }
 
diff --git a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
index 983f55ed631..6b84cdc4c9f 100644
--- a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
+++ b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
@@ -53,8 +53,8 @@ public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFra
         return new AlertDialog.Builder(getActivity())
                 .setMessage(R.string.dev_settings_warning_message)
                 .setTitle(R.string.dev_settings_warning_title)
-                .setPositiveButton(android.R.string.yes, this)
-                .setNegativeButton(android.R.string.no, this)
+                .setPositiveButton(android.R.string.ok, this)
+                .setNegativeButton(android.R.string.cancel, this)
                 .create();
     }
 
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java
index 4a02d91b5ef..a74204a26c8 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java
@@ -34,7 +34,6 @@ import com.android.settings.homepage.contextualcards.slices.SliceContextualCardR
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 public class ContextualCardLookupTable {
@@ -65,41 +64,39 @@ public class ContextualCardLookupTable {
     }
 
     @VisibleForTesting
-    static final Set<ControllerRendererMapping> LOOKUP_TABLE =
-            new TreeSet<ControllerRendererMapping>() {{
-                add(new ControllerRendererMapping(CardType.CONDITIONAL,
-                        ConditionContextualCardRenderer.VIEW_TYPE_HALF_WIDTH,
-                        ConditionContextualCardController.class,
-                        ConditionContextualCardRenderer.class));
-                add(new ControllerRendererMapping(CardType.CONDITIONAL,
-                        ConditionContextualCardRenderer.VIEW_TYPE_FULL_WIDTH,
-                        ConditionContextualCardController.class,
-                        ConditionContextualCardRenderer.class));
-                add(new ControllerRendererMapping(CardType.LEGACY_SUGGESTION,
-                        LegacySuggestionContextualCardRenderer.VIEW_TYPE,
-                        LegacySuggestionContextualCardController.class,
-                        LegacySuggestionContextualCardRenderer.class));
-                add(new ControllerRendererMapping(CardType.SLICE,
-                        SliceContextualCardRenderer.VIEW_TYPE_FULL_WIDTH,
-                        SliceContextualCardController.class,
-                        SliceContextualCardRenderer.class));
-                add(new ControllerRendererMapping(CardType.SLICE,
-                        SliceContextualCardRenderer.VIEW_TYPE_HALF_WIDTH,
-                        SliceContextualCardController.class,
-                        SliceContextualCardRenderer.class));
-                add(new ControllerRendererMapping(CardType.SLICE,
-                        SliceContextualCardRenderer.VIEW_TYPE_STICKY,
-                        SliceContextualCardController.class,
-                        SliceContextualCardRenderer.class));
-                add(new ControllerRendererMapping(CardType.CONDITIONAL_FOOTER,
-                        ConditionFooterContextualCardRenderer.VIEW_TYPE,
-                        ConditionContextualCardController.class,
-                        ConditionFooterContextualCardRenderer.class));
-                add(new ControllerRendererMapping(CardType.CONDITIONAL_HEADER,
-                        ConditionHeaderContextualCardRenderer.VIEW_TYPE,
-                        ConditionContextualCardController.class,
-                        ConditionHeaderContextualCardRenderer.class));
-            }};
+    static final Set<ControllerRendererMapping> LOOKUP_TABLE = Set.of(
+            new ControllerRendererMapping(CardType.CONDITIONAL,
+                    ConditionContextualCardRenderer.VIEW_TYPE_HALF_WIDTH,
+                    ConditionContextualCardController.class,
+                    ConditionContextualCardRenderer.class),
+            new ControllerRendererMapping(CardType.CONDITIONAL,
+                    ConditionContextualCardRenderer.VIEW_TYPE_FULL_WIDTH,
+                    ConditionContextualCardController.class,
+                    ConditionContextualCardRenderer.class),
+            new ControllerRendererMapping(CardType.LEGACY_SUGGESTION,
+                    LegacySuggestionContextualCardRenderer.VIEW_TYPE,
+                    LegacySuggestionContextualCardController.class,
+                    LegacySuggestionContextualCardRenderer.class),
+            new ControllerRendererMapping(CardType.SLICE,
+                    SliceContextualCardRenderer.VIEW_TYPE_FULL_WIDTH,
+                    SliceContextualCardController.class,
+                    SliceContextualCardRenderer.class),
+            new ControllerRendererMapping(CardType.SLICE,
+                    SliceContextualCardRenderer.VIEW_TYPE_HALF_WIDTH,
+                    SliceContextualCardController.class,
+                    SliceContextualCardRenderer.class),
+            new ControllerRendererMapping(CardType.SLICE,
+                    SliceContextualCardRenderer.VIEW_TYPE_STICKY,
+                    SliceContextualCardController.class,
+                    SliceContextualCardRenderer.class),
+            new ControllerRendererMapping(CardType.CONDITIONAL_FOOTER,
+                    ConditionFooterContextualCardRenderer.VIEW_TYPE,
+                    ConditionContextualCardController.class,
+                    ConditionFooterContextualCardRenderer.class),
+            new ControllerRendererMapping(CardType.CONDITIONAL_HEADER,
+                    ConditionHeaderContextualCardRenderer.VIEW_TYPE,
+                    ConditionContextualCardController.class,
+                    ConditionHeaderContextualCardRenderer.class));
 
     public static Class<? extends ContextualCardController> getCardControllerClass(
             @CardType int cardType) {
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
index ac35017baab..f5d0e667756 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
@@ -55,7 +55,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -196,11 +195,10 @@ public class ContextualCardManager implements ContextualCardLoader.CardContentLo
         // except Conditional cards, all other cards are from the database. So when the map sent
         // here is empty, we only keep Conditional cards.
         if (cardTypes.isEmpty()) {
-            final Set<Integer> conditionalCardTypes = new TreeSet<Integer>() {{
-                add(ContextualCard.CardType.CONDITIONAL);
-                add(ContextualCard.CardType.CONDITIONAL_HEADER);
-                add(ContextualCard.CardType.CONDITIONAL_FOOTER);
-            }};
+            final Set<Integer> conditionalCardTypes = Set.of(
+                    ContextualCard.CardType.CONDITIONAL,
+                    ContextualCard.CardType.CONDITIONAL_HEADER,
+                    ContextualCard.CardType.CONDITIONAL_FOOTER);
             cardsToKeep = mContextualCards.stream()
                     .filter(card -> conditionalCardTypes.contains(card.getCardType()))
                     .collect(Collectors.toList());
diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java
index eac2dd1df3c..5947a879eac 100644
--- a/src/com/android/settings/localepicker/LocaleListEditor.java
+++ b/src/com/android/settings/localepicker/LocaleListEditor.java
@@ -202,7 +202,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment {
             new AlertDialog.Builder(getActivity())
                     .setTitle(R.string.dlg_remove_locales_error_title)
                     .setMessage(R.string.dlg_remove_locales_error_message)
-                    .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                         }
@@ -228,7 +228,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment {
         }
 
         builder.setTitle(title)
-                .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
+                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         setRemoveMode(false);
diff --git a/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java b/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java
index 2506229802f..a8b02aca421 100644
--- a/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java
+++ b/src/com/android/settings/network/TetherProvisioningCarrierDialogActivity.java
@@ -35,7 +35,7 @@ public class TetherProvisioningCarrierDialogActivity extends Activity {
                 .setTitle(R.string.wifi_tether_carrier_unsupport_dialog_title)
                 .setMessage(R.string.wifi_tether_carrier_unsupport_dialog_content)
                 .setCancelable(false)
-                .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         dialog.cancel();
                         finish();
diff --git a/src/com/android/settings/network/apn/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
index 926c77e6530..1c7a4462276 100644
--- a/src/com/android/settings/network/apn/ApnEditor.java
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -568,7 +568,7 @@ public class ApnEditor extends SettingsPreferenceFragment
                 // Network code
                 final String mnc = (subInfo == null) ? null : subInfo.getMncString();
 
-                if ((!TextUtils.isEmpty(mcc)) && (!TextUtils.isEmpty(mcc))) {
+                if (!TextUtils.isEmpty(mcc)) {
                     // Auto populate MNC and MCC for new entries, based on what SIM reports
                     mMcc.setText(mcc);
                     mMnc.setText(mnc);
diff --git a/src/com/android/settings/network/telephony/RoamingDialogFragment.java b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
index 3e9875e9844..5b579921433 100644
--- a/src/com/android/settings/network/telephony/RoamingDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
@@ -70,8 +70,8 @@ public class RoamingDialogFragment extends InstrumentedDialogFragment implements
         builder.setMessage(getResources().getString(message))
                 .setTitle(title)
                 .setIconAttribute(android.R.attr.alertDialogIcon)
-                .setPositiveButton(android.R.string.yes, this)
-                .setNegativeButton(android.R.string.no, this);
+                .setPositiveButton(android.R.string.ok, this)
+                .setNegativeButton(android.R.string.cancel, this);
         AlertDialog dialog = builder.create();
         dialog.setCanceledOnTouchOutside(false);
         return dialog;
diff --git a/src/com/android/settings/notification/SoundWorkSettingsController.java b/src/com/android/settings/notification/SoundWorkSettingsController.java
index c14a7feb0ec..10a3483abf5 100644
--- a/src/com/android/settings/notification/SoundWorkSettingsController.java
+++ b/src/com/android/settings/notification/SoundWorkSettingsController.java
@@ -363,7 +363,7 @@ public class SoundWorkSettingsController extends AbstractPreferenceController
                             () -> context.getString(R.string.work_sync_dialog_message)))
                     .setPositiveButton(R.string.work_sync_dialog_yes,
                             SoundWorkSettingsController.UnifyWorkDialogFragment.this)
-                    .setNegativeButton(android.R.string.no, /* listener= */ null)
+                    .setNegativeButton(android.R.string.cancel, /* listener= */ null)
                     .create();
         }
 
diff --git a/src/com/android/settings/vpn2/AppVpnInfo.java b/src/com/android/settings/vpn2/AppVpnInfo.java
index 079f8d5e365..f225470564f 100644
--- a/src/com/android/settings/vpn2/AppVpnInfo.java
+++ b/src/com/android/settings/vpn2/AppVpnInfo.java
@@ -10,7 +10,7 @@ import java.util.Objects;
  * Holds packageName:userId pairs without any heavyweight fields.
  * {@see ApplicationInfo}
  */
-class AppVpnInfo implements Comparable {
+class AppVpnInfo implements Comparable<AppVpnInfo> {
     public final int userId;
     public final String packageName;
 
@@ -20,12 +20,10 @@ class AppVpnInfo implements Comparable {
     }
 
     @Override
-    public int compareTo(Object other) {
-        AppVpnInfo that = (AppVpnInfo) other;
-
-        int result = packageName.compareTo(that.packageName);
+    public int compareTo(AppVpnInfo other) {
+        int result = packageName.compareTo(other.packageName);
         if (result == 0) {
-            result = that.userId - userId;
+            result = other.userId - userId;
         }
         return result;
     }
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index 9d0ab4768d6..a1ff1ac9a45 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -117,6 +117,7 @@ public class WifiDialog extends AlertDialog implements WifiConfigUiBase,
         }
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: Fix me
     @Override
     protected void onStart() {
         final ImageButton ssidScannerButton = findViewById(R.id.ssid_scanner_button);
diff --git a/src/com/android/settings/wifi/WifiDialog2.java b/src/com/android/settings/wifi/WifiDialog2.java
index 05dad3f1b96..26951d1c482 100644
--- a/src/com/android/settings/wifi/WifiDialog2.java
+++ b/src/com/android/settings/wifi/WifiDialog2.java
@@ -137,6 +137,7 @@ public class WifiDialog2 extends AlertDialog implements WifiConfigUiBase2,
         window.setAttributes(lp);
     }
 
+    @SuppressWarnings("MissingSuperCall") // TODO: Fix me
     @Override
     protected void onStart() {
         final ImageButton ssidScannerButton = findViewById(R.id.ssid_scanner_button);
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index fea28d14b9a..1a371b6dd11 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -405,6 +405,7 @@ public class ToggleFeaturePreferenceFragmentTest {
             // do nothing
         }
 
+        @SuppressWarnings("MissingSuperCall")
         @Override
         public void onDestroyView() {
             // do nothing
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index 00ff9604a52..255902bd509 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -473,6 +473,7 @@ public class ToggleScreenMagnificationPreferenceFragmentTest {
             // do nothing
         }
 
+        @SuppressWarnings("MissingSuperCall")
         @Override
         public void onDestroyView() {
             // do nothing
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
index 0ef94ec1af3..36c0ab86ea1 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
@@ -50,6 +50,7 @@ public class AppFilterItemTest {
         assertThat(item).isEqualTo(item2);
     }
 
+    @SuppressWarnings("SelfComparison")
     @Test
     public void compare_sameContent_return0() {
         final AppFilterItem item = AppFilterRegistry.getInstance().get(FILTER_APPS_USAGE_ACCESS);
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java
index fa4a79c293e..b37a2121187 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BluetoothSampleRateDialogPreferenceControllerTest.java
@@ -141,10 +141,9 @@ public class BluetoothSampleRateDialogPreferenceControllerTest {
 
     @Test
     public void getSelectableIndex_verifyList() {
-        List<BluetoothCodecConfig> mCodecConfigs = new ArrayList() {{
-                    add(mCodecConfigAAC);
-                    add(mCodecConfigSBC);
-                }};
+        List<BluetoothCodecConfig> mCodecConfigs = List.of(
+                mCodecConfigAAC,
+                mCodecConfigSBC);
         mCodecStatus = new BluetoothCodecStatus.Builder()
                 .setCodecConfig(mCodecConfigAAC)
                 .setCodecsSelectableCapabilities(mCodecConfigs)
diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
index cef43dd34ab..e210c5fe321 100644
--- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
@@ -43,16 +43,16 @@ public class ConfirmCredentialTest {
 
         // Launch only one instance at a time.
         assertThat(LastTryDialog.show(
-                fm, "title", mContext.getString(android.R.string.yes),
+                fm, "title", mContext.getString(android.R.string.ok),
                 android.R.string.ok, false)).isTrue();
         assertThat(LastTryDialog.show(
-                fm, "title", mContext.getString(android.R.string.yes),
+                fm, "title", mContext.getString(android.R.string.ok),
                 android.R.string.ok, false)).isFalse();
 
         // After cancelling, the dialog should be re-shown when asked for.
         LastTryDialog.hide(fm);
         assertThat(LastTryDialog.show(
-                fm, "title", mContext.getString(android.R.string.yes),
+                fm, "title", mContext.getString(android.R.string.ok),
                 android.R.string.ok, false)).isTrue();
     }
 }
diff --git a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java
index 735992b927d..0c2a33ff9fc 100644
--- a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java
+++ b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java
@@ -29,7 +29,7 @@ import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.Suppress;
 
-import java.util.HashMap;
+import java.util.Map;
 
 public class SoundSettingsTest extends InstrumentationTestCase {
     private static final String PAGE = Settings.ACTION_SOUND_SETTINGS;
@@ -40,60 +40,54 @@ public class SoundSettingsTest extends InstrumentationTestCase {
     private SettingsHelper mHelper;
 
 
-    private HashMap ringtoneSounds = new HashMap<String, String>() {{
-        put("angler","Dione");
-        put("bullhead","Dione");
-        put("marlin","Spaceship");
-        put("sailfish","Spaceship");
-        put("walleye","Copycat");
-        put("taimen","Copycat");
-    }};
-
-    private HashMap ringtoneCodes = new HashMap<String, String>() {{
-        put("angler","38");
-        put("bullhead","38");
-        put("marlin","37");
-        put("sailfish","37");
-        put("walleye","26");
-        put("taimen","26");
-    }};
-
-    private HashMap alarmSounds = new HashMap<String, String>() {{
-        put("angler","Awaken");
-        put("bullhead","Awaken");
-        put("marlin","Bounce");
-        put("sailfish","Bounce");
-        put("walleye","Cuckoo clock");
-        put("taimen","Cuckoo clock");
-    }};
-
-    private HashMap alarmCodes = new HashMap<String, String>() {{
-        put("angler","6");
-        put("bullhead","6");
-        put("marlin","49");
-        put("sailfish","49");
-        put("walleye","15");
-        put("taimen","15");
-    }};
-
-    private HashMap notificationSounds = new HashMap<String, String>() {{
-        put("angler","Ceres");
-        put("bullhead","Ceres");
-        put("marlin","Trill");
-        put("sailfish","Trill");
-        put("walleye","Pipes");
-        put("taimen","Pipes");
-    }};
-
-
-    private HashMap notificationCodes = new HashMap<String, String>() {{
-        put("angler","26");
-        put("bullhead","26");
-        put("marlin","57");
-        put("sailfish","57");
-        put("walleye","69");
-        put("taimen","69");
-    }};
+    private final Map<String, String> ringtoneSounds = Map.of(
+            "angler", "Dione",
+            "bullhead", "Dione",
+            "marlin", "Spaceship",
+            "sailfish", "Spaceship",
+            "walleye", "Copycat",
+            "taimen", "Copycat");
+
+    private final Map<String, String> ringtoneCodes = Map.of(
+            "angler", "38",
+            "bullhead", "38",
+            "marlin", "37",
+            "sailfish", "37",
+            "walleye", "26",
+            "taimen", "26");
+
+    private final Map<String, String> alarmSounds = Map.of(
+            "angler", "Awaken",
+            "bullhead", "Awaken",
+            "marlin", "Bounce",
+            "sailfish", "Bounce",
+            "walleye", "Cuckoo clock",
+            "taimen", "Cuckoo clock");
+
+    private final Map<String, String> alarmCodes = Map.of(
+            "angler", "6",
+            "bullhead", "6",
+            "marlin", "49",
+            "sailfish", "49",
+            "walleye", "15",
+            "taimen", "15");
+
+    private final Map<String, String> notificationSounds = Map.of(
+            "angler", "Ceres",
+            "bullhead", "Ceres",
+            "marlin", "Trill",
+            "sailfish", "Trill",
+            "walleye", "Pipes",
+            "taimen", "Pipes");
+
+
+    private final Map<String, String> notificationCodes = Map.of(
+            "angler", "26",
+            "bullhead", "26",
+            "marlin", "57",
+            "sailfish", "57",
+            "walleye", "69",
+            "taimen", "69");
 
     @Override
     public void setUp() throws Exception {