Update SubscriptionManager API as per API council. (299dad50) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/SmsManager.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -501,7 +501,7 @@ public final class SmsManager {
		*/
		public int getSubId() {
		if (mSubId == DEFAULT_SUB_ID) {
		return getDefaultSmsSubId();
		return getDefaultSmsSubscriptionId();
		}
		return mSubId;
		}
		@@ -858,10 +858,17 @@ public final class SmsManager {
		* Get default sms subId
		*
		* @return the default SubId
		* @hide
		*/
		public static int getDefaultSmsSubId() {
		return SubscriptionManager.getDefaultSmsSubId();
		public static int getDefaultSmsSubscriptionId() {
		ISms iccISms = null;
		try {
		iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
		return iccISms.getPreferredSmsSubscription();
		} catch (RemoteException ex) {
		return SubscriptionManager.INVALID_SUB_ID;
		} catch (NullPointerException ex) {
		return SubscriptionManager.INVALID_SUB_ID;
		}
		}

		/**

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import android.database.MatrixCursor;
		import android.net.Uri;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.telephony.SubInfoRecord;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		@@ -117,7 +117,7 @@ public class IccProvider extends ContentProvider {

		private Cursor loadAllSimContacts(int efType) {
		Cursor [] result;
		List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
		List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList();

		if ((subInfoList == null) \|\| (subInfoList.size() == 0)) {
		result = new Cursor[0];

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

+3 −33

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ import com.android.internal.telephony.cdma.CDMALTEPhone;
		import com.android.internal.telephony.cdma.CDMAPhone;
		import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
		import com.android.internal.telephony.gsm.GSMPhone;
		import com.android.internal.telephony.SubInfoRecordUpdater;
		import com.android.internal.telephony.SubscriptionInfoUpdater;
		import com.android.internal.telephony.imsphone.ImsPhone;
		import com.android.internal.telephony.imsphone.ImsPhoneFactory;
		import com.android.internal.telephony.sip.SipPhone;
		@@ -66,7 +66,7 @@ public class PhoneFactory {
		static private UiccController mUiccController;

		static private CommandsInterface sCommandsInterface = null;
		static private SubInfoRecordUpdater sSubInfoRecordUpdater = null;
		static private SubscriptionInfoUpdater sSubInfoRecordUpdater = null;

		static private boolean sMadeDefaults = false;
		static private PhoneNotifier sPhoneNotifier;
		@@ -201,7 +201,7 @@ public class PhoneFactory {
		sMadeDefaults = true;

		Rlog.i(LOG_TAG, "Creating SubInfoRecordUpdater ");
		sSubInfoRecordUpdater = new SubInfoRecordUpdater(context,
		sSubInfoRecordUpdater = new SubscriptionInfoUpdater(context,
		sProxyPhones, sCommandsInterfaces);
		SubscriptionController.getInstance().updatePhonesAvailability(sProxyPhones);
		}
		@@ -263,36 +263,6 @@ public class PhoneFactory {
		}
		}

		public static Phone getCdmaPhone() {
		if (!sMadeDefaults) {
		throw new IllegalStateException("Default phones haven't been made yet!");
		}
		Phone phone;
		synchronized(PhoneProxy.lockForRadioTechnologyChange) {
		switch (TelephonyManager.getLteOnCdmaModeStatic()) {
		case PhoneConstants.LTE_ON_CDMA_TRUE: {
		phone = new CDMALTEPhone(sContext, sCommandsInterface, sPhoneNotifier);
		break;
		}
		case PhoneConstants.LTE_ON_CDMA_FALSE:
		case PhoneConstants.LTE_ON_CDMA_UNKNOWN:
		default: {
		phone = new CDMAPhone(sContext, sCommandsInterface, sPhoneNotifier);
		break;
		}
		}
		}
		return phone;
		}

		public static Phone getGsmPhone() {
		int phoneId = SubscriptionController.getInstance().getPhoneId(getDefaultSubscription());
		if (phoneId < 0 \|\| phoneId >= TelephonyManager.getDefault().getPhoneCount()) {
		phoneId = 0;
		}
		return getGsmPhone(phoneId);
		}

		/**
		* Makes a {@link SipPhone} object.
		* @param sipUri the local SIP URI the phone runs on

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

+100 −61

Original line number	Diff line number	Diff line
		@@ -20,25 +20,33 @@ import android.content.ContentResolver;
		import android.content.ContentValues;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.PackageManager;
		import android.database.Cursor;
		import android.graphics.Bitmap;
		import android.graphics.BitmapFactory;
		import android.net.Uri;
		import android.os.AsyncResult;
		import android.os.Binder;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Message;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.provider.BaseColumns;
		import android.provider.Settings;

		import android.telephony.Rlog;
		import android.telephony.SubInfoRecord;
		import android.telephony.SubscriptionInfo;
		import android.telephony.SubscriptionListener;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.text.format.Time;
		import android.util.Log;

		import com.android.internal.telephony.ITelephonyRegistry;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -72,6 +80,25 @@ public class SubscriptionController extends ISub.Stub {
		static final int MAX_LOCAL_LOG_LINES = 500; // TODO: Reduce to 100 when 17678050 is fixed
		private ScLocalLog mLocalLog = new ScLocalLog(MAX_LOCAL_LOG_LINES);

		private static class Record {
		String pkgForDebug;
		IBinder binder;
		ISubscriptionListener callback;
		int callerUid;
		int events;

		@Override
		public String toString() {
		return "{pkgForDebug=" + pkgForDebug + " callerUid=" + callerUid +
		" events=" + Integer.toHexString(events) + "}";
		}
		}

		// All types of access to both mRemoveList and mRecords must
		// be inside a synchronized(mRecords) block.
		private final ArrayList<IBinder> mRemoveList = new ArrayList<IBinder>();
		private final ArrayList<Record> mRecords = new ArrayList<Record>();

		/**
		* Copied from android.util.LocalLog with flush() adding flush and line number
		* TODO: Update LocalLog
		@@ -215,37 +242,51 @@ public class SubscriptionController extends ISub.Stub {
		}

		/**
		* Broadcast when subinfo settings has chanded
		* @SubId The unique SubInfoRecord index in database
		* @param columnName The column that is updated
		* @param intContent The updated integer value
		* @param stringContent The updated string value
		* Broadcast when SubscriptionInfo has changed
		* FIXME: Hopefully removed if the API council accepts SubscriptionInfoListener
		*/
		private void broadcastSimInfoContentChanged(int subId,
		String columnName, int intContent, String stringContent) {

		private void broadcastSimInfoContentChanged() {
		Intent intent = new Intent(TelephonyIntents.ACTION_SUBINFO_CONTENT_CHANGE);
		intent.putExtra(BaseColumns._ID, subId);
		intent.putExtra(TelephonyIntents.EXTRA_COLUMN_NAME, columnName);
		intent.putExtra(TelephonyIntents.EXTRA_INT_CONTENT, intContent);
		intent.putExtra(TelephonyIntents.EXTRA_STRING_CONTENT, stringContent);
		if (intContent != SubscriptionManager.DEFAULT_INT_VALUE) {
		logd("[broadcastSimInfoContentChanged] subId" + subId
		+ " changed, " + columnName + " -> " + intContent);
		} else {
		logd("[broadcastSimInfoContentChanged] subId" + subId
		+ " changed, " + columnName + " -> " + stringContent);
		}
		mContext.sendBroadcast(intent);
		intent = new Intent(TelephonyIntents.ACTION_SUBINFO_RECORD_UPDATED);
		mContext.sendBroadcast(intent);
		}

		private boolean checkNotifyPermission(String method) {
		if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		== PackageManager.PERMISSION_GRANTED) {
		return true;
		}
		if (DBG) {
		logd("checkNotifyPermission Permission Denial: " + method + " from pid="
		+ Binder.getCallingPid() + ", uid=" + Binder.getCallingUid());
		}
		return false;
		}

		public void notifySubscriptionInfoChanged() {
		if (!checkNotifyPermission("notifySubscriptionInfoChanged")) {
		return;
		}
		ITelephonyRegistry tr = ITelephonyRegistry.Stub.asInterface(ServiceManager.getService(
		"telephony.registry"));
		try {
		if (DBG) logd("notifySubscriptionInfoChanged:");
		tr.notifySubscriptionInfoChanged();
		} catch (RemoteException ex) {
		// Should never happen because its always available.
		}

		// FIXME: Remove if listener technique accepted.
		broadcastSimInfoContentChanged();
		}

		/**
		* New SubInfoRecord instance and fill in detail info
		* @param cursor
		* @return the query result of desired SubInfoRecord
		*/
		private SubInfoRecord getSubInfoRecord(Cursor cursor) {
		private SubscriptionInfo getSubInfoRecord(Cursor cursor) {
		int id = cursor.getInt(cursor.getColumnIndexOrThrow(BaseColumns._ID));
		String iccId = cursor.getString(cursor.getColumnIndexOrThrow(
		SubscriptionManager.ICC_ID));
		@@ -276,7 +317,7 @@ public class SubscriptionController extends ISub.Stub {
		+ " iconTint:" + iconTint + " number:" + number + " dataRoaming:" + dataRoaming
		+ " mcc:" + mcc + " mnc:" + mnc);

		return new SubInfoRecord(id, iccId, simSlotIndex, displayName, carrierName, nameSource,
		return new SubscriptionInfo(id, iccId, simSlotIndex, displayName, carrierName, nameSource,
		iconTint, number, dataRoaming, iconBitmap, mcc, mnc);
		}

		@@ -286,24 +327,24 @@ public class SubscriptionController extends ISub.Stub {
		* @param queryKey query key content
		* @return Array list of queried result from database
		*/
		private List<SubInfoRecord> getSubInfo(String selection, Object queryKey) {
		private List<SubscriptionInfo> getSubInfo(String selection, Object queryKey) {
		logd("selection:" + selection + " " + queryKey);
		String[] selectionArgs = null;
		if (queryKey != null) {
		selectionArgs = new String[] {queryKey.toString()};
		}
		ArrayList<SubInfoRecord> subList = null;
		ArrayList<SubscriptionInfo> subList = null;
		Cursor cursor = mContext.getContentResolver().query(SubscriptionManager.CONTENT_URI,
		null, selection, selectionArgs, null);
		try {
		if (cursor != null) {
		while (cursor.moveToNext()) {
		SubInfoRecord subInfo = getSubInfoRecord(cursor);
		SubscriptionInfo subInfo = getSubInfoRecord(cursor);
		if (subInfo != null)
		{
		if (subList == null)
		{
		subList = new ArrayList<SubInfoRecord>();
		subList = new ArrayList<SubscriptionInfo>();
		}
		subList.add(subInfo);
		}
		@@ -325,8 +366,10 @@ public class SubscriptionController extends ISub.Stub {
		* @return RGB integer value of color
		*/
		private int getUnusedColor() {
		List<SubInfoRecord> availableSubInfos = SubscriptionManager.getActiveSubInfoList();
		List<SubscriptionInfo> availableSubInfos =
		SubscriptionManager.getActiveSubscriptionInfoList();
		colorArr = mContext.getResources().getIntArray(com.android.internal.R.array.sim_colors);

		for (int i = 0; i < colorArr.length; i++) {
		int j;
		for (j = 0; j < availableSubInfos.size(); j++) {
		@@ -347,7 +390,7 @@ public class SubscriptionController extends ISub.Stub {
		* @return SubInfoRecord, maybe null
		*/
		@Override
		public SubInfoRecord getSubInfoForSubscriber(int subId) {
		public SubscriptionInfo getSubInfoForSubscriber(int subId) {
		logd("[getSubInfoForSubscriberx]+ subId:" + subId);
		enforceSubscriptionPermission();

		@@ -383,7 +426,7 @@ public class SubscriptionController extends ISub.Stub {
		* @return SubInfoRecord, maybe null
		*/
		@Override
		public List<SubInfoRecord> getSubInfoUsingIccId(String iccId) {
		public List<SubscriptionInfo> getSubInfoUsingIccId(String iccId) {
		logd("[getSubInfoUsingIccId]+ iccId:" + iccId);
		enforceSubscriptionPermission();

		@@ -393,16 +436,16 @@ public class SubscriptionController extends ISub.Stub {
		}
		Cursor cursor = mContext.getContentResolver().query(SubscriptionManager.CONTENT_URI,
		null, SubscriptionManager.ICC_ID + "=?", new String[] {iccId}, null);
		ArrayList<SubInfoRecord> subList = null;
		ArrayList<SubscriptionInfo> subList = null;
		try {
		if (cursor != null) {
		while (cursor.moveToNext()) {
		SubInfoRecord subInfo = getSubInfoRecord(cursor);
		SubscriptionInfo subInfo = getSubInfoRecord(cursor);
		if (subInfo != null)
		{
		if (subList == null)
		{
		subList = new ArrayList<SubInfoRecord>();
		subList = new ArrayList<SubscriptionInfo>();
		}
		subList.add(subInfo);
		}
		@@ -425,7 +468,7 @@ public class SubscriptionController extends ISub.Stub {
		* @return SubInfoRecord, maybe null
		*/
		@Override
		public List<SubInfoRecord> getSubInfoUsingSlotId(int slotId) {
		public List<SubscriptionInfo> getSubInfoUsingSlotId(int slotId) {
		return getSubInfoUsingSlotIdWithCheck(slotId, true);
		}

		@@ -434,11 +477,11 @@ public class SubscriptionController extends ISub.Stub {
		* @return Array list of all SubInfoRecords in database, include thsoe that were inserted before
		*/
		@Override
		public List<SubInfoRecord> getAllSubInfoList() {
		public List<SubscriptionInfo> getAllSubInfoList() {
		logd("[getAllSubInfoList]+");
		enforceSubscriptionPermission();

		List<SubInfoRecord> subList = null;
		List<SubscriptionInfo> subList = null;
		subList = getSubInfo(null, null);
		if (subList != null) {
		logd("[getAllSubInfoList]- " + subList.size() + " infos return");
		@@ -454,11 +497,11 @@ public class SubscriptionController extends ISub.Stub {
		* @return Array list of currently inserted SubInfoRecord(s)
		*/
		@Override
		public List<SubInfoRecord> getActiveSubInfoList() {
		public List<SubscriptionInfo> getActiveSubInfoList() {
		enforceSubscriptionPermission();
		logdl("[getActiveSubInfoList]+");

		List<SubInfoRecord> subList = null;
		List<SubscriptionInfo> subList = null;

		if (!isSubInfoReady()) {
		logdl("[getActiveSubInfoList] Sub Controller not ready");
		@@ -483,7 +526,7 @@ public class SubscriptionController extends ISub.Stub {
		@Override
		public int getActiveSubInfoCount() {
		logd("[getActiveSubInfoCount]+");
		List<SubInfoRecord> records = getActiveSubInfoList();
		List<SubscriptionInfo> records = getActiveSubInfoList();
		if (records == null) {
		logd("[getActiveSubInfoCount] records null");
		return 0;
		@@ -681,8 +724,7 @@ public class SubscriptionController extends ISub.Stub {

		int result = mContext.getContentResolver().update(SubscriptionManager.CONTENT_URI, value,
		BaseColumns._ID + "=" + Long.toString(subId), null);
		broadcastSimInfoContentChanged(subId, SubscriptionManager.COLOR,
		tint, SubscriptionManager.DEFAULT_STRING_VALUE);
		notifySubscriptionInfoChanged();

		return result;
		}
		@@ -729,8 +771,7 @@ public class SubscriptionController extends ISub.Stub {

		int result = mContext.getContentResolver().update(SubscriptionManager.CONTENT_URI, value,
		BaseColumns._ID + "=" + Long.toString(subId), null);
		broadcastSimInfoContentChanged(subId, SubscriptionManager.DISPLAY_NAME,
		SubscriptionManager.DEFAULT_INT_VALUE, nameToSet);
		notifySubscriptionInfoChanged();

		return result;
		}
		@@ -779,8 +820,7 @@ public class SubscriptionController extends ISub.Stub {
		result = mContext.getContentResolver().update(SubscriptionManager.CONTENT_URI, value,
		BaseColumns._ID + "=" + Long.toString(subId), null);
		logd("[setDisplayNumber]- update result :" + result);
		broadcastSimInfoContentChanged(subId, SubscriptionManager.NUMBER,
		SubscriptionManager.DEFAULT_INT_VALUE, number);
		notifySubscriptionInfoChanged();
		}

		return result;
		@@ -808,8 +848,7 @@ public class SubscriptionController extends ISub.Stub {

		int result = mContext.getContentResolver().update(SubscriptionManager.CONTENT_URI, value,
		BaseColumns._ID + "=" + Long.toString(subId), null);
		broadcastSimInfoContentChanged(subId, SubscriptionManager.DATA_ROAMING,
		roaming, SubscriptionManager.DEFAULT_STRING_VALUE);
		notifySubscriptionInfoChanged();

		return result;
		}
		@@ -836,7 +875,7 @@ public class SubscriptionController extends ISub.Stub {

		int result = mContext.getContentResolver().update(SubscriptionManager.CONTENT_URI, value,
		BaseColumns._ID + "=" + Long.toString(subId), null);
		broadcastSimInfoContentChanged(subId, SubscriptionManager.MCC, mcc, null);
		notifySubscriptionInfoChanged();

		return result;
		}
		@@ -1184,7 +1223,7 @@ public class SubscriptionController extends ISub.Stub {

		@Override
		public void clearDefaultsForInactiveSubIds() {
		final List<SubInfoRecord> records = getActiveSubInfoList();
		final List<SubscriptionInfo> records = getActiveSubInfoList();
		logdl("[clearDefaultsForInactiveSubIds] records: " + records);
		if (shouldDefaultBeCleared(records, getDefaultDataSubId())) {
		logd("[clearDefaultsForInactiveSubIds] clearing default data sub id");
		@@ -1200,18 +1239,18 @@ public class SubscriptionController extends ISub.Stub {
		}
		}

		private boolean shouldDefaultBeCleared(List<SubInfoRecord> records, int subId) {
		private boolean shouldDefaultBeCleared(List<SubscriptionInfo> records, int subId) {
		logdl("[shouldDefaultBeCleared: subId] " + subId);
		if (records == null) {
		logdl("[shouldDefaultBeCleared] return true no records subId=" + subId);
		return true;
		}
		if (subId == SubscriptionManager.ASK_USER_SUB_ID && records.size() > 1) {
		// Only allow ASK_USER_SUB_ID if there is more than 1 subscription.
		if (subId == SubscriptionManager.INVALID_SUB_ID) {
		// If the subId parameter is INVALID_SUB_ID its already cleared so return false.
		logdl("[shouldDefaultBeCleared] return false only one subId, subId=" + subId);
		return false;
		}
		for (SubInfoRecord record : records) {
		for (SubscriptionInfo record : records) {
		int id = record.getSubscriptionId();
		logdl("[shouldDefaultBeCleared] Record.id: " + id);
		if (id == subId) {
		@@ -1237,7 +1276,7 @@ public class SubscriptionController extends ISub.Stub {
		return getSubId(slotId);
		}

		public List<SubInfoRecord> getSubInfoUsingSlotIdWithCheck(int slotId, boolean needCheck) {
		public List<SubscriptionInfo> getSubInfoUsingSlotIdWithCheck(int slotId, boolean needCheck) {
		logd("[getSubInfoUsingSlotIdWithCheck]+ slotId:" + slotId);
		enforceSubscriptionPermission();

		@@ -1256,16 +1295,16 @@ public class SubscriptionController extends ISub.Stub {

		Cursor cursor = mContext.getContentResolver().query(SubscriptionManager.CONTENT_URI,
		null, SubscriptionManager.SIM_ID + "=?", new String[] {String.valueOf(slotId)}, null);
		ArrayList<SubInfoRecord> subList = null;
		ArrayList<SubscriptionInfo> subList = null;
		try {
		if (cursor != null) {
		while (cursor.moveToNext()) {
		SubInfoRecord subInfo = getSubInfoRecord(cursor);
		SubscriptionInfo subInfo = getSubInfoRecord(cursor);
		if (subInfo != null)
		{
		if (subList == null)
		{
		subList = new ArrayList<SubInfoRecord>();
		subList = new ArrayList<SubscriptionInfo>();
		}
		subList.add(subInfo);
		}
		@@ -1349,10 +1388,10 @@ public class SubscriptionController extends ISub.Stub {
		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");

		List<SubInfoRecord> sirl = getActiveSubInfoList();
		List<SubscriptionInfo> sirl = getActiveSubInfoList();
		if (sirl != null) {
		pw.println(" ActiveSubInfoList:");
		for (SubInfoRecord entry : sirl) {
		for (SubscriptionInfo entry : sirl) {
		pw.println(" " + entry.toString());
		}
		} else {
		@@ -1364,7 +1403,7 @@ public class SubscriptionController extends ISub.Stub {
		sirl = getAllSubInfoList();
		if (sirl != null) {
		pw.println(" AllSubInfoList:");
		for (SubInfoRecord entry : sirl) {
		for (SubscriptionInfo entry : sirl) {
		pw.println(" " + entry.toString());
		}
		} else {

src/java/com/android/internal/telephony/SubInfoRecordUpdater.java→src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+32 −104

File changed and moved.

Preview size limit exceeded, changes collapsed.