Merge changes I23025e9b,Ic9486b3f

* changes:
  Support local emergency phone number check when there are multiple SIMs.
  Add additional logging to missed call notification code path

1 files changed, 8 insertions, 0 deletions

diff --git a/java/com/android/dialer/app/calllog/MissedCallNotifier.java b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
index 80901ce88..158ae2b03 100644
--- a/java/com/android/dialer/app/calllog/MissedCallNotifier.java
+++ b/java/com/android/dialer/app/calllog/MissedCallNotifier.java
@@ -106,6 +106,8 @@ public class MissedCallNotifier implements Worker<Pair<Integer, String>, Void> {
   @VisibleForTesting
   @WorkerThread
   void updateMissedCallNotification(int count, @Nullable String number) {
+    LogUtil.enterBlock("MissedCallNotifier.updateMissedCallNotification");
+
     final int titleResId;
     CharSequence expandedText; // The text in the notification's line 1 and 2.
 
@@ -137,6 +139,7 @@ public class MissedCallNotifier implements Worker<Pair<Integer, String>, Void> {
     if (count == CallLogNotificationsService.UNKNOWN_MISSED_CALL_COUNT) {
       // If the intent did not contain a count, and we are unable to get a count from the
       // call log, then no notification can be shown.
+      LogUtil.i("MissedCallNotifier.updateMissedCallNotification", "unknown missed call count");
       return;
     }
 
@@ -144,6 +147,9 @@ public class MissedCallNotifier implements Worker<Pair<Integer, String>, Void> {
     boolean useCallList = newCalls != null;
 
     if (count == 1) {
+      LogUtil.i(
+          "MissedCallNotifier.updateMissedCallNotification",
+          "1 missed call, looking up contact info");
       NewCall call =
           useCallList
               ? newCalls.get(0)
@@ -188,6 +194,8 @@ public class MissedCallNotifier implements Worker<Pair<Integer, String>, Void> {
       expandedText = context.getString(R.string.notification_missedCallsMsg, count);
     }
 
+    LogUtil.i("MissedCallNotifier.updateMissedCallNotification", "preparing notification");
+
     // Create a public viewable version of the notification, suitable for display when sensitive
     // notification content is hidden.
     Notification.Builder publicSummaryBuilder = createNotificationBuilder();