diff options
author | Tyler Gunn <tgunn@google.com> | 2019-02-19 20:57:56 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-19 20:57:56 -0800 |
commit | c8596617adec3e823262e28d870ac7f364b67144 (patch) | |
tree | 0208648feb9237ff2940ce18e57e0853c95ab2ee | |
parent | 29520b3023b18bf7446d2be4282576e049880026 (diff) | |
parent | 35019747993c8698f138c6c7ca1bafbf5246fda4 (diff) | |
download | BlockedNumberProvider-c8596617adec3e823262e28d870ac7f364b67144.tar.gz |
Add enhanced logging for number blocking provider.
am: 3501974799
Change-Id: Ic9d03b4d5fb3db447850561100fe8e9d5e2a5805
-rw-r--r-- | src/com/android/providers/blockednumber/BlockedNumberProvider.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java index 864f08a..68a8c65 100644 --- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java +++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java @@ -15,6 +15,8 @@ */ package com.android.providers.blockednumber; +import static android.telecom.Log.piiHandle; + import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; @@ -411,15 +413,12 @@ public class BlockedNumberProvider extends ContentProvider { private boolean isBlocked(String phoneNumber) { if (TextUtils.isEmpty(phoneNumber)) { + Log.i(TAG, "isBlocked: NOT BLOCKED; empty #"); return false; } final String inE164 = Utils.getE164Number(getContext(), phoneNumber, null); // may be empty. - if (DEBUG) { - Log.d(TAG, String.format("isBlocked: in=%s, e164=%s", phoneNumber, inE164)); - } - final Cursor c = mDbHelper.getReadableDatabase().rawQuery( "SELECT " + BlockedNumberContract.BlockedNumbers.COLUMN_ORIGINAL_NUMBER + "," + @@ -432,18 +431,22 @@ public class BlockedNumberProvider extends ContentProvider { ); try { while (c.moveToNext()) { - if (DEBUG) { - final String original = c.getString(0); - final String e164 = c.getString(1); - - Log.d(TAG, String.format("match found: original=%s, e164=%s", original, e164)); - } + final String original = c.getString(0); + final String e164 = c.getString(1); + Log.i(TAG, String.format("isBlocked: BLOCKED; number=%s, e164=%s, foundOrig=%s, " + + "foundE164=%s", + piiHandle(phoneNumber), + piiHandle(inE164), + piiHandle(original), + piiHandle(e164))); return true; } } finally { c.close(); } // No match found. + Log.i(TAG, String.format("isBlocked: NOT BLOCKED; number=%s, e164=%s", + piiHandle(phoneNumber), piiHandle(inE164))); return false; } |