Use SystemProperties to access ro.carrier as System.getProperty cannot get it

Bug: 71707082
Test: MotorolaHiddenMenuKeySequenceTest
PiperOrigin-RevId: 186685319
Change-Id: If23ec797a174736e68b6100b3d33c7dccb9a88f8

1 files changed, 4 insertions, 3 deletions

diff --git a/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java b/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java
index 81f6b607c..079624b64 100644
--- a/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java
+++ b/java/com/android/dialer/oem/MotorolaHiddenMenuKeySequence.java
@@ -65,13 +65,14 @@ public class MotorolaHiddenMenuKeySequence {
    */
   private static synchronized MotorolaHiddenMenuKeySequence getInstance(Context context) {
     if (null == instance) {
-      instance = new MotorolaHiddenMenuKeySequence(context);
+      instance = new MotorolaHiddenMenuKeySequence(context, new SystemPropertiesAccessor());
     }
     return instance;
   }
 
   @VisibleForTesting
-  MotorolaHiddenMenuKeySequence(Context context) {
+  MotorolaHiddenMenuKeySequence(
+      Context context, SystemPropertiesAccessor systemPropertiesAccessor) {
     if (MotorolaUtils.isSupportingHiddenMenu(context)) {
       Collections.addAll(
           hiddenKeySequences,
@@ -88,7 +89,7 @@ public class MotorolaHiddenMenuKeySequence {
       featureHiddenMenuEnabled = true;
     }
 
-    if ("tracfone".equals(System.getProperty("ro.carrier"))) {
+    if ("tracfone".equals(systemPropertiesAccessor.get("ro.carrier"))) {
       addHiddenKeySequence("#83865625#", "com.motorola.extensions.TFUnlock");
       addHiddenKeySequence("#83782887#", "com.motorola.extensions.TFStatus");
       featureHiddenMenuEnabled = true;