Merge tag 'android-5.1.1_r23' into cm-12.1

import org.xmlpull.v1.XmlSerializer;

import android.Manifest;

import android.app.Activity;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.database.ContentObserver;

import android.database.Cursor;

import android.net.Uri;

import android.text.format.Time;

import android.os.Binder;

import android.os.Handler;

import android.os.Process;

import android.provider.BaseColumns;

import android.provider.Telephony;

import android.provider.Telephony.Mms;

        private void actionMessageSent(Context context, Intent intent,

            PushMsgInfo msgInfo) {

            /* Check permission for message deletion. */

            if (context.checkCallingOrSelfPermission(android.Manifest.permission.WRITE_SMS)

                  != PackageManager.PERMISSION_GRANTED) {

                Log.w(TAG, "actionMessageSent: Not allowed to delete SMS/MMS messages");

                return;

            }

            int result = getResultCode();

            boolean delete = false;