commit 8afd76dc4bee913834d4d29fabc1a3edb257e20d
author Santos Cordon <santoscordon@google.com> Mon Dec 08 23:24:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 08 23:24:00 2014 +0000
tree 02a20dc06040372cd3626c6aa07329947521e581
parent ffcffb3968f576a1be5bbdb71000ccc02dd30aec
parent 0b5cb4d0036a45725d4a3250fe8475599a31a202

Merge "(Telecom-system part 1) Move global state from TelecomApp to TelecomGlobals." into lmp-mr1-dev

src/com/android/server/telecom/Log.java

diff --git a/src/com/android/server/telecom/Log.java b/src/com/android/server/telecom/Log.java
index 280a470..3ec8267 100644
--- a/src/com/android/server/telecom/Log.java
+++ b/src/com/android/server/telecom/Log.java
@@ -34,7 +34,7 @@
     private static final String TAG = "Telecom";
 
     public static final boolean FORCE_LOGGING = false; /* STOP SHIP if true */
-    public static final boolean SYSTRACE_DEBUG = true; /* STOP SHIP if true */
+    public static final boolean SYSTRACE_DEBUG = false; /* STOP SHIP if true */
     public static final boolean DEBUG = isLoggable(android.util.Log.DEBUG);
     public static final boolean INFO = isLoggable(android.util.Log.INFO);
     public static final boolean VERBOSE = isLoggable(android.util.Log.VERBOSE);

src/com/android/server/telecom/MissedCallNotifier.java

diff --git a/src/com/android/server/telecom/MissedCallNotifier.java b/src/com/android/server/telecom/MissedCallNotifier.java
index ed30642..2c1e78b 100644
--- a/src/com/android/server/telecom/MissedCallNotifier.java
+++ b/src/com/android/server/telecom/MissedCallNotifier.java
@@ -29,6 +29,7 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.UserHandle;
 import android.provider.CallLog;
 import android.provider.CallLog.Calls;
@@ -91,18 +92,22 @@
 
     /** Clears missed call notification and marks the call log's missed calls as read. */
     void clearMissedCalls() {
-        // Clear the list of new missed calls from the call log.
-        ContentValues values = new ContentValues();
-        values.put(Calls.NEW, 0);
-        values.put(Calls.IS_READ, 1);
-        StringBuilder where = new StringBuilder();
-        where.append(Calls.NEW);
-        where.append(" = 1 AND ");
-        where.append(Calls.TYPE);
-        where.append(" = ?");
-        mContext.getContentResolver().update(Calls.CONTENT_URI, values, where.toString(),
-                new String[]{ Integer.toString(Calls.MISSED_TYPE) });
-
+        AsyncTask.execute(new Runnable() {
+            @Override
+            public void run() {
+                // Clear the list of new missed calls from the call log.
+                ContentValues values = new ContentValues();
+                values.put(Calls.NEW, 0);
+                values.put(Calls.IS_READ, 1);
+                StringBuilder where = new StringBuilder();
+                where.append(Calls.NEW);
+                where.append(" = 1 AND ");
+                where.append(Calls.TYPE);
+                where.append(" = ?");
+                mContext.getContentResolver().update(Calls.CONTENT_URI, values, where.toString(),
+                        new String[]{ Integer.toString(Calls.MISSED_TYPE) });
+            }
+        });
         cancelMissedCallNotification();
     }