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

Commit 7a616b3e authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Use external pakcageName id if ActivityThread has no current PackageName" 

am: 6229e5d6

Change-Id: Ifd64a6f575e146357c1449926e805dac22da1dab
parents e6e7822e 6229e5d6

AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ 
    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

    <uses-permission android:name="android.permission.READ_CALL_LOG" />

    <uses-permission android:name="android.permission.READ_CALL_LOG" />

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.SEND_SMS" />

    <uses-permission android:name="android.permission.STOP_APP_SWITCHES" />

    <uses-permission android:name="android.permission.STOP_APP_SWITCHES" />

    <uses-permission android:name="android.permission.VIBRATE" />

    <uses-permission android:name="android.permission.VIBRATE" />

    <uses-permission android:name="android.permission.WRITE_CALL_LOG" />

    <uses-permission android:name="android.permission.WRITE_CALL_LOG" />

src/com/android/server/telecom/RespondViaSmsManager.java

+2 −8
Original line number Original line Diff line number Diff line
@@ -17,20 +17,14 @@ 
package com.android.server.telecom;

package com.android.server.telecom;





// TODO: Needed for move to system service: import com.android.internal.R;

// TODO: Needed for move to system service: import com.android.internal.R;

import com.android.internal.os.SomeArgs;



import android.app.Activity;

import android.app.Activity;

import android.app.PendingIntent;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.content.SharedPreferences;

import android.content.res.Resources;

import android.content.res.Resources;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.telecom.Connection;

import android.telecom.Connection;

import android.telecom.Log;

import android.telecom.Log;

import android.telecom.Response;

import android.telecom.Response;
@@ -217,8 +211,8 @@ public class RespondViaSmsManager extends CallsManagerListenerBase { 
                    !TextUtils.isEmpty(contactName) ? contactName : phoneNumber,

                    !TextUtils.isEmpty(contactName) ? contactName : phoneNumber,

                    messageParts.size());

                    messageParts.size());

            context.registerReceiver(receiver, new IntentFilter(ACTION_MESSAGE_SENT));

            context.registerReceiver(receiver, new IntentFilter(ACTION_MESSAGE_SENT));

            smsManager.sendMultipartTextMessage(phoneNumber, null, messageParts,

            smsManager.sendMultipartTextMessageExternal(phoneNumber, null, messageParts,

                    sentIntents/*sentIntent*/, null /*deliveryIntent*/);

                    sentIntents/*sentIntent*/, null /*deliveryIntent*/, context.getOpPackageName());

        } catch (IllegalArgumentException e) {

        } catch (IllegalArgumentException e) {

            Log.w(RespondViaSmsManager.this, "Couldn't send SMS message: " +

            Log.w(RespondViaSmsManager.this, "Couldn't send SMS message: " +

                    e.getMessage());

                    e.getMessage());