Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12f06193 authored by Ji Yang's avatar Ji Yang
Browse files

Launch the default SMS app for notification action. 

Use a broadcast receiver to launch the default SMS app when the user clicks
the new message notification.

Bug:30882932
Change-Id: I44c48043e94119d0886cf24f3518891168a54d17
parent d009ecff

src/java/com/android/internal/telephony/ImsSMSDispatcher.java

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class ImsSMSDispatcher extends SMSDispatcher { 
        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);

src/java/com/android/internal/telephony/InboundSmsHandler.java

+34 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.content.ContentUris; 
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 @@ public abstract class InboundSmsHandler extends StateMachine { 
    // 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 @@ public abstract class InboundSmsHandler extends StateMachine { 
            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 @@ public abstract class InboundSmsHandler extends StateMachine { 
                .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 abstract class InboundSmsHandler extends StateMachine { 
    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);

    }

}