Changes to make sure READ_PHONE_STATE permission is not needed to send SMS. (f6c0e348) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/SmsManager.java

+22 −31

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.net.Uri;
		import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.provider.Telephony;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		import android.util.Log;
		@@ -503,27 +502,20 @@ public final class SmsManager {
		public int getSubscriptionId() {
		final int subId = (mSubId == DEFAULT_SUBSCRIPTION_ID)
		? getDefaultSmsSubscriptionId() : mSubId;
		boolean isSmsSimPickActivityNeeded = false;
		final Context context = ActivityThread.currentApplication().getApplicationContext();
		TelephonyManager telephonyManager =
		(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
		List<SubscriptionInfo> subInfoList =
		SubscriptionManager.from(context).getActiveSubscriptionInfoList();

		if (subInfoList != null) {
		final int subInfoLength = subInfoList.size();

		for (int i = 0; i < subInfoLength; ++i) {
		final SubscriptionInfo sir = subInfoList.get(i);
		if (sir != null && sir.getSubscriptionId() == subId) {
		// The subscription id is valid.
		return subId;
		try {
		ISms iccISms = getISmsService();
		if (iccISms != null) {
		isSmsSimPickActivityNeeded = iccISms.isSmsSimPickActivityNeeded(subId);
		}
		} catch (RemoteException ex) {
		Log.e(TAG, "Exception in getSubscriptionId");
		}

		// The subscription id is not valid.
		// Now if there is at least one valid subscription and 2 or more SIM slots, then ask
		// the user for a default SMS SIM.
		if (subInfoList.size() > 0 && telephonyManager.getSimCount() > 1) {
		if (isSmsSimPickActivityNeeded) {
		Log.d(TAG, "getSubscriptionId isSmsSimPickActivityNeeded is true");
		// ask the user for a default SMS SIM.
		Intent intent = new Intent();
		intent.setClassName("com.android.settings",
		"com.android.settings.sim.SimDialogActivity");
		@@ -537,7 +529,6 @@ public final class SmsManager {
		Log.e(TAG, "Unable to launch Settings application.");
		}
		}
		}

		return subId;
		}

src/java/android/telephony/SmsMessage.java

+19 −5

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@

		package android.telephony;

		import android.os.Binder;
		import android.os.Parcel;
		import android.telephony.Rlog;
		import android.content.res.Resources;
		import android.text.TextUtils;

		@@ -772,8 +772,15 @@ public class SmsMessage {
		return true;
		}

		String simOperator = TelephonyManager.getDefault().getSimOperator();
		String gid = TelephonyManager.getDefault().getGroupIdLevel1();
		String simOperator;
		String gid;
		final long identity = Binder.clearCallingIdentity();
		try {
		simOperator = TelephonyManager.getDefault().getSimOperator();
		gid = TelephonyManager.getDefault().getGroupIdLevel1();
		} finally {
		Binder.restoreCallingIdentity(identity);
		}

		for (NoEmsSupportConfig currentConfig : mNoEmsSupportConfigList) {
		if (simOperator.startsWith(currentConfig.mOperatorNumber) &&
		@@ -795,8 +802,15 @@ public class SmsMessage {
		return false;
		}

		String simOperator = TelephonyManager.getDefault().getSimOperator();
		String gid = TelephonyManager.getDefault().getGroupIdLevel1();
		String simOperator;
		String gid;
		final long identity = Binder.clearCallingIdentity();
		try {
		simOperator = TelephonyManager.getDefault().getSimOperator();
		gid = TelephonyManager.getDefault().getGroupIdLevel1();
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		for (NoEmsSupportConfig currentConfig : mNoEmsSupportConfigList) {
		if (simOperator.startsWith(currentConfig.mOperatorNumber) &&
		(TextUtils.isEmpty(currentConfig.mGid1) \|\|

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

+38 −5

Original line number	Diff line number	Diff line
		@@ -18,18 +18,18 @@

		package com.android.internal.telephony;

		import android.app.ActivityThread;
		import android.app.PendingIntent;
		import android.content.Context;
		import android.net.Uri;
		import android.os.Binder;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.telephony.Rlog;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;

		import com.android.internal.telephony.ISms;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.SmsRawData;

		import java.util.ArrayList;
		import java.util.List;

		/**
		@@ -267,6 +267,39 @@ public class UiccSmsController extends ISms.Stub {
		return false;
		}

		@Override
		public boolean isSmsSimPickActivityNeeded(int subId) {
		final Context context = ActivityThread.currentApplication().getApplicationContext();
		TelephonyManager telephonyManager =
		(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
		List<SubscriptionInfo> subInfoList;
		final long identity = Binder.clearCallingIdentity();
		try {
		subInfoList = SubscriptionManager.from(context).getActiveSubscriptionInfoList();
		} finally {
		Binder.restoreCallingIdentity(identity);
		}

		if (subInfoList != null) {
		final int subInfoLength = subInfoList.size();

		for (int i = 0; i < subInfoLength; ++i) {
		final SubscriptionInfo sir = subInfoList.get(i);
		if (sir != null && sir.getSubscriptionId() == subId) {
		// The subscription id is valid, sms sim pick activity not needed
		return false;
		}
		}

		// If reached here and multiple SIMs and subs present, sms sim pick activity is needed
		if (subInfoLength > 0 && telephonyManager.getSimCount() > 1) {
		return true;
		}
		}

		return false;
		}

		public String getImsSmsFormat() {
		return getImsSmsFormatForSubscriber(getPreferredSmsSubscription());
		}