merge in nyc-mr1-release history after reset to nyc-mr1-dev
diff --git a/src/java/com/android/internal/telephony/ImsSMSDispatcher.java b/src/java/com/android/internal/telephony/ImsSMSDispatcher.java
index 852d4e6..4d8f62c 100644
--- a/src/java/com/android/internal/telephony/ImsSMSDispatcher.java
+++ b/src/java/com/android/internal/telephony/ImsSMSDispatcher.java
@@ -65,6 +65,7 @@
mGsmDispatcher = new GsmSMSDispatcher(phone, usageMonitor, this, mGsmInboundSmsHandler);
SmsBroadcastUndelivered.initialize(phone.getContext(),
mGsmInboundSmsHandler, mCdmaInboundSmsHandler);
+ InboundSmsHandler.registerNewMessageNotificationActionHandler(phone.getContext());
mCi.registerForOn(this, EVENT_RADIO_ON, null);
mCi.registerForImsNetworkStateChanged(this, EVENT_IMS_STATE_CHANGED, null);
diff --git a/src/java/com/android/internal/telephony/InboundSmsHandler.java b/src/java/com/android/internal/telephony/InboundSmsHandler.java
index ac3beb2..a70aa26 100644
--- a/src/java/com/android/internal/telephony/InboundSmsHandler.java
+++ b/src/java/com/android/internal/telephony/InboundSmsHandler.java
@@ -34,6 +34,7 @@
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
@@ -209,6 +210,9 @@
// Only mark deleted, but keep in db for message de-duping
private final int MARK_DELETED = 2;
+ private static String ACTION_OPEN_SMS_APP =
+ "com.android.internal.telephony.OPEN_DEFAULT_SMS_APP";
+
/**
* Create a new SMS broadcast helper.
* @param name the class name for logging
@@ -877,8 +881,11 @@
return;
}
log("Show new message notification.");
- Intent intent = Intent.makeMainSelectorActivity(
- Intent.ACTION_MAIN, Intent.CATEGORY_APP_MESSAGING);
+ PendingIntent intent = PendingIntent.getBroadcast(
+ mContext,
+ 0,
+ new Intent(ACTION_OPEN_SMS_APP),
+ PendingIntent.FLAG_ONE_SHOT);
Notification.Builder mBuilder = new Notification.Builder(mContext)
.setSmallIcon(com.android.internal.R.drawable.sym_action_chat)
.setAutoCancel(true)
@@ -886,7 +893,7 @@
.setDefaults(Notification.DEFAULT_ALL)
.setContentTitle(mContext.getString(R.string.new_sms_notification_title))
.setContentText(mContext.getString(R.string.new_sms_notification_content))
- .setContentIntent(PendingIntent.getActivity(mContext, 1, intent, 0));
+ .setContentIntent(intent);
NotificationManager mNotificationManager =
(NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
mNotificationManager.notify(
@@ -1596,4 +1603,28 @@
public int getWakeLockTimeout() {
return WAKELOCK_TIMEOUT;
}
+
+ /**
+ * Handler for the broadcast sent when the new message notification is clicked. It launches the
+ * default SMS app.
+ */
+ private static class NewMessageNotificationActionReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (ACTION_OPEN_SMS_APP.equals(intent.getAction())) {
+ context.startActivity(context.getPackageManager().getLaunchIntentForPackage(
+ Telephony.Sms.getDefaultSmsPackage(context)));
+ }
+ }
+ }
+
+ /**
+ * Registers the broadcast receiver to launch the default SMS app when the user clicks the
+ * new message notification.
+ */
+ static void registerNewMessageNotificationActionHandler(Context context) {
+ IntentFilter userFilter = new IntentFilter();
+ userFilter.addAction(ACTION_OPEN_SMS_APP);
+ context.registerReceiver(new NewMessageNotificationActionReceiver(), userFilter);
+ }
}
