commit c3ad2290b27234e7a2b7358d11ed137429b2be00
author Santos Cordon <santoscordon@google.com> Wed Jul 02 23:41:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 02 21:11:19 2014 +0000
tree 26ca4888fd5040fadda70e788a06fbd3787d8fea
parent fc1fed72d6adf5158be271646655056b14d1ccf2
parent 266a8ac75ab0cd0c0529cf342f8ab33ab1095b20

Merge "Make dialer use PhoneManager.cancelMissedCallsNotification."

src/com/android/dialer/calllog/CallLogFragment.java

diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 1d6ec79..1668895 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -489,7 +489,7 @@
             if (!onEntry) {
                 mCallLogQueryHandler.markMissedCallsAsRead();
             }
-            CallLogNotificationsHelper.removeMissedCallNotifications();
+            CallLogNotificationsHelper.removeMissedCallNotifications(getActivity());
             CallLogNotificationsHelper.updateVoicemailNotifications(getActivity());
         }
     }

src/com/android/dialer/calllog/CallLogNotificationsHelper.java

diff --git a/src/com/android/dialer/calllog/CallLogNotificationsHelper.java b/src/com/android/dialer/calllog/CallLogNotificationsHelper.java
index 6ce66f0..2b4ae50 100644
--- a/src/com/android/dialer/calllog/CallLogNotificationsHelper.java
+++ b/src/com/android/dialer/calllog/CallLogNotificationsHelper.java
@@ -18,32 +18,16 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.util.Log;
-
-import com.android.internal.telephony.ITelephony;
+import android.phone.PhoneManager;
 
 /**
  * Helper class operating on call log notifications.
  */
 public class CallLogNotificationsHelper {
-    private static final String TAG = "CallLogNotificationsHelper";
-
     /** Removes the missed call notifications. */
-    public static void removeMissedCallNotifications() {
-        try {
-            ITelephony telephony =
-                    ITelephony.Stub.asInterface(ServiceManager.getService("phone"));
-            if (telephony != null) {
-                telephony.cancelMissedCallsNotification();
-            } else {
-                Log.w(TAG, "Telephony service is null, can't call " +
-                        "cancelMissedCallsNotification");
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "Failed to clear missed calls notification due to remote exception");
-        }
+    public static void removeMissedCallNotifications(Context context) {
+        PhoneManager phoneManager = (PhoneManager) context.getSystemService(Context.PHONE_SERVICE);
+        phoneManager.cancelMissedCallsNotification();
     }
 
     /** Update the voice mail notifications. */

src/com/android/dialer/list/ShortcutCardsAdapter.java

diff --git a/src/com/android/dialer/list/ShortcutCardsAdapter.java b/src/com/android/dialer/list/ShortcutCardsAdapter.java
index 766bdda..e856d80 100644
--- a/src/com/android/dialer/list/ShortcutCardsAdapter.java
+++ b/src/com/android/dialer/list/ShortcutCardsAdapter.java
@@ -78,7 +78,7 @@
         public void onSwipe(View view) {
             mCallLogQueryHandler.markNewCallsAsOld();
             mCallLogQueryHandler.markNewVoicemailsAsOld();
-            CallLogNotificationsHelper.removeMissedCallNotifications();
+            CallLogNotificationsHelper.removeMissedCallNotifications(mContext);
             CallLogNotificationsHelper.updateVoicemailNotifications(mContext);
             mFragment.dismissShortcut(view);
         }