Snap for 6439596 from 1126d505a0858c448bc4913660123cfa7d4884a3 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I3c739e80ee3a10f59d0053936949665cc66c7779

8 files changed, 6 insertions, 112 deletions

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index f0f5ffa..6963473 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="3836152623003881586">"অবরুদ্ধ নম্বরগুলির সঞ্চয়স্থান"</string>
+    <string name="app_label" msgid="3836152623003881586">"ব্লক করা নম্বরগুলির স্টোরেজ"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 85f4998..ec0fdaa 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="3836152623003881586">"अवरोधित नंबरों का संग्रहण"</string>
+    <string name="app_label" msgid="3836152623003881586">"ब्लॉक नंबरों की स्टोरेज"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 374c7c5..2abbb76 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="3836152623003881586">"Արգելափակված համարների պահեստ"</string>
+    <string name="app_label" msgid="3836152623003881586">"Արգելափակված համարների պահոց"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 23dd405..ee2ced3 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="3836152623003881586">"अवरोधित केलेल्या नंबरचा स्टोरेज"</string>
+    <string name="app_label" msgid="3836152623003881586">"ब्लॉक केलेल्या नंबरचा स्टोरेज"</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 5dea283..0bb1812 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="3836152623003881586">"ଅବରୋଧିତ ସଂଖ୍ୟାର ଷ୍ଟୋରେଜ୍"</string>
+    <string name="app_label" msgid="3836152623003881586">"ବ୍ଲକ୍ ହୋଇଥିବା ସଂଖ୍ୟାର ଷ୍ଟୋରେଜ୍"</string>
 </resources>
diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
index 4d6a284..2e029d8 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -15,7 +15,7 @@
  */
 package com.android.providers.blockednumber;
 
-import static com.android.providers.blockednumber.Utils.piiHandle;
+import static android.telecom.Log.piiHandle;
 
 import android.Manifest;
 import android.annotation.NonNull;
diff --git a/src/com/android/providers/blockednumber/Utils.java b/src/com/android/providers/blockednumber/Utils.java
index 66f0fcb..6aaf178 100644
--- a/src/com/android/providers/blockednumber/Utils.java
+++ b/src/com/android/providers/blockednumber/Utils.java
@@ -15,33 +15,21 @@
  */
 package com.android.providers.blockednumber;
 
-import static android.util.Log.isLoggable;
-
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.content.Context;
 import android.location.Country;
 import android.location.CountryDetector;
-import android.net.Uri;
-import android.os.Build;
-import android.telecom.PhoneAccount;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
 import java.util.Locale;
 
 public class Utils {
-    /**
-     * When generating a bug report, include the last X dialable digits when logging phone numbers.
-     */
-    private static final int NUM_DIALABLE_DIGITS_TO_LOG = Build.IS_USER ? 0 : 2;
-
     private Utils() {
     }
 
     public static final int MIN_INDEX_LEN = 8;
-    public static String TAG = "BlockedNumberProvider";
-    public static boolean VERBOSE = isLoggable(TAG, android.util.Log.VERBOSE);
 
     /**
      * @return The current country code.
@@ -86,92 +74,4 @@ public class Utils {
     public static @Nullable String wrapSelectionWithParens(@Nullable String selection) {
         return TextUtils.isEmpty(selection) ? null : "(" + selection + ")";
     }
-
-    /**
-     * Generates an obfuscated string for a calling handle in {@link Uri} format, or a raw phone
-     * phone number in {@link String} format.
-     * @param pii The information to obfuscate.
-     * @return The obfuscated string.
-     */
-    public static String piiHandle(Object pii) {
-        if (pii == null || VERBOSE) {
-            return String.valueOf(pii);
-        }
-
-        StringBuilder sb = new StringBuilder();
-        if (pii instanceof Uri) {
-            Uri uri = (Uri) pii;
-            String scheme = uri.getScheme();
-
-            if (!TextUtils.isEmpty(scheme)) {
-                sb.append(scheme).append(":");
-            }
-
-            String textToObfuscate = uri.getSchemeSpecificPart();
-            if (PhoneAccount.SCHEME_TEL.equals(scheme)) {
-                obfuscatePhoneNumber(sb, textToObfuscate);
-            } else if (PhoneAccount.SCHEME_SIP.equals(scheme)) {
-                for (int i = 0; i < textToObfuscate.length(); i++) {
-                    char c = textToObfuscate.charAt(i);
-                    if (c != '@' && c != '.') {
-                        c = '*';
-                    }
-                    sb.append(c);
-                }
-            } else {
-                sb.append(pii(pii));
-            }
-        } else if (pii instanceof String) {
-            String number = (String) pii;
-            obfuscatePhoneNumber(sb, number);
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * Obfuscates a phone number, allowing NUM_DIALABLE_DIGITS_TO_LOG digits to be exposed for the
-     * phone number.
-     * @param sb String buffer to write obfuscated number to.
-     * @param phoneNumber The number to obfuscate.
-     */
-    private static void obfuscatePhoneNumber(StringBuilder sb, String phoneNumber) {
-        int numDigitsToObfuscate = getDialableCount(phoneNumber)
-                - NUM_DIALABLE_DIGITS_TO_LOG;
-        for (int i = 0; i < phoneNumber.length(); i++) {
-            char c = phoneNumber.charAt(i);
-            boolean isDialable = PhoneNumberUtils.isDialable(c);
-            if (isDialable) {
-                numDigitsToObfuscate--;
-            }
-            sb.append(isDialable && numDigitsToObfuscate >= 0 ? "*" : c);
-        }
-    }
-
-    /**
-     * Redact personally identifiable information for production users.
-     * If we are running in verbose mode, return the original string,
-     * and return "***" otherwise.
-     */
-    public static String pii(Object pii) {
-        if (pii == null || VERBOSE) {
-            return String.valueOf(pii);
-        }
-        return "***";
-    }
-
-    /**
-     * Determines the number of dialable characters in a string.
-     * @param toCount The string to count dialable characters in.
-     * @return The count of dialable characters.
-     */
-    private static int getDialableCount(String toCount) {
-        int numDialable = 0;
-        for (char c : toCount.toCharArray()) {
-            if (PhoneNumberUtils.isDialable(c)) {
-                numDialable++;
-            }
-        }
-        return numDialable;
-    }
 }
diff --git a/tests/src/com/android/providers/blockednumber/MyMockContext.java b/tests/src/com/android/providers/blockednumber/MyMockContext.java
index 2c998e5..85617f3 100644
--- a/tests/src/com/android/providers/blockednumber/MyMockContext.java
+++ b/tests/src/com/android/providers/blockednumber/MyMockContext.java
@@ -61,7 +61,6 @@ public class MyMockContext extends MockContext {
     private BlockedNumberProviderTestable mProvider;
     private Context mRealTestContext;
     final List<String> mIntentsBroadcasted = new ArrayList<>();
-    private final String packageName = "com.android.providers.blockednumber";
 
     public MyMockContext(Context realTestContext) {
         this.mRealTestContext = realTestContext;
@@ -145,11 +144,6 @@ public class MyMockContext extends MockContext {
                 CarrierConfigManager.class, Context.CARRIER_CONFIG_SERVICE);
     }
 
-    @Override
-    public String getOpPackageName() {
-        return packageName;
-    }
-
     public void shutdown() {
         mProvider.shutdown();
     }