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

Commit 32cc74b9 authored by Tony Mak's avatar Tony Mak
Browse files

Track the calling user id in SmsTracker 

Store the calling user id in SmsTracker, and consume it throughout
SmsDispatcher.

Test: SmsManager.sendTextMessage in user 0 is working
Test: SmsManager.sendTextMessage in work profile is working
   (Make sure the app is not installed in user 0).

Fix: 35590739

Change-Id: I396880fe33bd0db05f7952dec6234def98f6b916
parent 92851f84

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

+16 −8
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static android.telephony.SmsManager.RESULT_ERROR_NULL_PDU; 
import static android.telephony.SmsManager.RESULT_ERROR_RADIO_OFF;



import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.app.Activity;

import android.app.AlertDialog;

import android.app.PendingIntent;
@@ -980,7 +981,8 @@ public abstract class SMSDispatcher extends Handler { 
        PackageInfo appInfo;

        try {

            // XXX this is lossy- apps can share a UID

            appInfo = pm.getPackageInfo(packageNames[0], PackageManager.GET_SIGNATURES);

            appInfo = pm.getPackageInfoAsUser(

                    packageNames[0], PackageManager.GET_SIGNATURES, tracker.mUserId);

        } catch (PackageManager.NameNotFoundException e) {

            Rlog.e(TAG, "Can't get calling app package info: refusing to send SMS");

            tracker.onFailed(mContext, RESULT_ERROR_GENERIC_FAILURE, 0/*errorCode*/);
@@ -1105,10 +1107,10 @@ public abstract class SMSDispatcher extends Handler { 
     * @param appPackage the package name of the app requesting to send an SMS

     * @return the label for the specified app, or the package name if getApplicationInfo() fails

     */

    private CharSequence getAppLabel(String appPackage) {

    private CharSequence getAppLabel(String appPackage, @UserIdInt int userId) {

        PackageManager pm = mContext.getPackageManager();

        try {

            ApplicationInfo appInfo = pm.getApplicationInfo(appPackage, 0);

            ApplicationInfo appInfo = pm.getApplicationInfoAsUser(appPackage, 0, userId);

            return appInfo.loadSafeLabel(pm);

        } catch (PackageManager.NameNotFoundException e) {

            Rlog.e(TAG, "PackageManager Name Not Found for package " + appPackage);
@@ -1125,7 +1127,7 @@ public abstract class SMSDispatcher extends Handler { 
            return;     // queue limit reached; error was returned to caller

        }



        CharSequence appLabel = getAppLabel(tracker.mAppInfo.packageName);

        CharSequence appLabel = getAppLabel(tracker.mAppInfo.packageName, tracker.mUserId);

        Resources r = Resources.getSystem();

        Spanned messageText = Html.fromHtml(r.getString(R.string.sms_control_message, appLabel));
@@ -1161,7 +1163,7 @@ public abstract class SMSDispatcher extends Handler { 
            detailsId = R.string.sms_short_code_details;

        }



        CharSequence appLabel = getAppLabel(tracker.mAppInfo.packageName);

        CharSequence appLabel = getAppLabel(tracker.mAppInfo.packageName, tracker.mUserId);

        Resources r = Resources.getSystem();

        Spanned messageText = Html.fromHtml(r.getString(R.string.sms_short_code_confirm_message,

                appLabel, tracker.mDestAddress));
@@ -1330,11 +1332,14 @@ public abstract class SMSDispatcher extends Handler { 


        private boolean mPersistMessage;



        // User who sends the SMS.

        private final @UserIdInt int mUserId;



        private SmsTracker(HashMap<String, Object> data, PendingIntent sentIntent,

                PendingIntent deliveryIntent, PackageInfo appInfo, String destAddr, String format,

                AtomicInteger unsentPartCount, AtomicBoolean anyPartFailed, Uri messageUri,

                SmsHeader smsHeader, boolean isExpectMore, String fullMessageText, int subId,

                boolean isText, boolean persistMessage) {

                boolean isText, boolean persistMessage, int userId) {

            mData = data;

            mSentIntent = sentIntent;

            mDeliveryIntent = deliveryIntent;
@@ -1353,6 +1358,7 @@ public abstract class SMSDispatcher extends Handler { 
            mSubId = subId;

            mIsText = isText;

            mPersistMessage = persistMessage;

            mUserId = userId;

        }



        /**
@@ -1566,11 +1572,13 @@ public abstract class SMSDispatcher extends Handler { 
        String[] packageNames = pm.getPackagesForUid(Binder.getCallingUid());



        // Get package info via packagemanager

        final int userId = UserHandle.getCallingUserId();

        PackageInfo appInfo = null;

        if (packageNames != null && packageNames.length > 0) {

            try {

                // XXX this is lossy- apps can share a UID

                appInfo = pm.getPackageInfo(packageNames[0], PackageManager.GET_SIGNATURES);

                appInfo = pm.getPackageInfoAsUser(

                        packageNames[0], PackageManager.GET_SIGNATURES, userId);

            } catch (PackageManager.NameNotFoundException e) {

                // error will be logged in sendRawPdu

            }
@@ -1580,7 +1588,7 @@ public abstract class SMSDispatcher extends Handler { 
        String destAddr = PhoneNumberUtils.extractNetworkPortion((String) data.get("destAddr"));

        return new SmsTracker(data, sentIntent, deliveryIntent, appInfo, destAddr, format,

                unsentPartCount, anyPartFailed, messageUri, smsHeader, isExpectMore,

                fullMessageText, getSubId(), isText, persistMessage);

                fullMessageText, getSubId(), isText, persistMessage, userId);

    }



    protected SmsTracker getSmsTracker(HashMap<String, Object> data, PendingIntent sentIntent,

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+2 −0
Original line number Diff line number Diff line
@@ -470,5 +470,7 @@ public abstract class TelephonyTest { 
    protected void setupMockPackagePermissionChecks() throws Exception {

        doReturn(new String[]{TAG}).when(mPackageManager).getPackagesForUid(anyInt());

        doReturn(mPackageInfo).when(mPackageManager).getPackageInfo(eq(TAG), anyInt());

        doReturn(mPackageInfo).when(mPackageManager).getPackageInfoAsUser(

                eq(TAG), anyInt(), anyInt());

    }

}