commit 63389badab8f2fcaea3ace027fdd3460b04d5e19
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 10 23:10:47 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 10 23:10:47 2020 +0000
tree b9c36e8433f075cc28d826c6be8687b90530fdc7
parent 4c0d1a02b600ae043044e72549c2070326dee3d8
parent d8d545d048a98ca8c3b6ba83ef89a9e085feafe2

Merge "Remove usage of android.os.Build.IS_USER" am: 9ead9f02ce am: d8d545d048

Change-Id: Ib2db703ea02bfd8b9a689b0a17007764cc3ff6e2

telephony/common/com/android/internal/telephony/SmsNumberUtils.java

diff --git a/telephony/common/com/android/internal/telephony/SmsNumberUtils.java b/telephony/common/com/android/internal/telephony/SmsNumberUtils.java
index cd365a1..95098e8 100644
--- a/telephony/common/com/android/internal/telephony/SmsNumberUtils.java
+++ b/telephony/common/com/android/internal/telephony/SmsNumberUtils.java
@@ -31,6 +31,7 @@
 
 import com.android.internal.telephony.HbpcdLookup.MccIdd;
 import com.android.internal.telephony.HbpcdLookup.MccLookup;
+import com.android.internal.telephony.util.TelephonyUtils;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -677,7 +678,7 @@
      */
     private static String secureHash(byte[] input) {
         // Refrain from logging user personal information in user build.
-        if (android.os.Build.IS_USER) {
+        if (TelephonyUtils.IS_USER) {
             return "****";
         }