commit 226ae567a63a3ae8dd5292b127d59abf107417f4
author Yorke Lee <yorkelee@google.com> Fri Mar 27 14:00:13 2015 -0700
committer Yorke Lee <yorkelee@google.com> Fri Mar 27 15:25:01 2015 -0700
tree fc511da71ad55e240707b3e86bf4f1e68a3a420a
parent 512d6350a66b44f1065d6fd2e14ec328449e8119

Fix some issues with TelecomBroadcastReceiver

* Fix missing ACTION_CLEAR_MISSED_CALLS action
* Make sure that PendingIntents are sent to the right class (TelecomBroadcastReciever,
not TelecomBroadcastIntentProcessor)

Bug: 19803865

Change-Id: I7611a5491286c34c82a85d3dfba30ec3527ee372

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bbdb9a4..1688d15 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -190,7 +190,7 @@
         <receiver android:name=".components.TelecomBroadcastReceiver" android:exported="false"
                 android:process="system">
             <intent-filter>
-                <action android:name="com.android.server.telecom.ACTION_CALL_BACK_FROM_NOTIFICATION" />
+                <action android:name="com.android.server.telecom.ACTION_CLEAR_MISSED_CALLS" />
                 <action android:name="com.android.server.telecom.ACTION_CALL_BACK_FROM_NOTIFICATION" />
                 <action android:name="com.android.server.telecom.ACTION_SEND_SMS_FROM_NOTIFICATION" />
             </intent-filter>
@@ -240,7 +240,7 @@
                 android:singleUser="true"
                 android:process="system">
             <intent-filter>
-                <android android:name="android.telecom.ITelecomService" />
+                <action android:name="android.telecom.ITelecomService" />
             </intent-filter>
         </service>
 

src/com/android/server/telecom/ui/MissedCallNotifierImpl.java

diff --git a/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java b/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
index bb1faed..d7e9759 100644
--- a/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
+++ b/src/com/android/server/telecom/ui/MissedCallNotifierImpl.java
@@ -26,6 +26,7 @@
 import com.android.server.telecom.R;
 import com.android.server.telecom.TelecomBroadcastIntentProcessor;
 import com.android.server.telecom.TelecomSystem;
+import com.android.server.telecom.components.TelecomBroadcastReceiver;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -106,6 +107,7 @@
     }
 
     /** Clears missed call notification and marks the call log's missed calls as read. */
+    @Override
     public void clearMissedCalls() {
         AsyncTask.execute(new Runnable() {
             @Override
@@ -131,6 +133,7 @@
      *
      * @param call The missed call.
      */
+    @Override
     public void showMissedCallNotification(Call call) {
         mMissedCallCount++;
 
@@ -290,7 +293,7 @@
      * @param data The intent data.
      */
     private PendingIntent createTelecomPendingIntent(String action, Uri data) {
-        Intent intent = new Intent(action, data, mContext, TelecomBroadcastIntentProcessor.class);
+        Intent intent = new Intent(action, data, mContext, TelecomBroadcastReceiver.class);
         return PendingIntent.getBroadcast(mContext, 0, intent, 0);
     }