Merge "Add new API for acessing DB associated with Subscription." into mnc-dev (73159fe8) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/CellBroadcastMessage.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@ public class CellBroadcastMessage implements Parcelable {
		mSmsCbMessage = new SmsCbMessage(in);
		mDeliveryTime = in.readLong();
		mIsRead = (in.readInt() != 0);
		mSubId = in.readInt();
		}

		/** Parcelable: no special flags. */
		@@ -103,6 +104,7 @@ public class CellBroadcastMessage implements Parcelable {
		mSmsCbMessage.writeToParcel(out, flags);
		out.writeLong(mDeliveryTime);
		out.writeInt(mIsRead ? 1 : 0);
		out.writeInt(mSubId);
		}

		public static final Parcelable.Creator<CellBroadcastMessage> CREATOR

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

+95 −0

Original line number	Diff line number	Diff line
		@@ -1686,6 +1686,101 @@ public class SubscriptionController extends ISub.Stub {
		return simState.ordinal();
		}

		/**
		* Store properties associated with SubscriptionInfo in database
		* @param subId Subscription Id of Subscription
		* @param propKey Column name in database associated with SubscriptionInfo
		* @param propValue Value to store in DB for particular subId & column name
		* @hide
		*/
		@Override
		public void setSubscriptionProperty(int subId, String propKey, String propValue) {
		enforceModifyPhoneState("setSubscriptionProperty");
		final long token = Binder.clearCallingIdentity();
		ContentResolver resolver = mContext.getContentResolver();
		ContentValues value = new ContentValues();
		switch (propKey) {
		case SubscriptionManager.CB_EXTREME_THREAT_ALERT:
		case SubscriptionManager.CB_SEVERE_THREAT_ALERT:
		case SubscriptionManager.CB_AMBER_ALERT:
		case SubscriptionManager.CB_EMERGENCY_ALERT:
		case SubscriptionManager.CB_ALERT_SOUND_DURATION:
		case SubscriptionManager.CB_ALERT_REMINDER_INTERVAL:
		case SubscriptionManager.CB_ALERT_VIBRATE:
		case SubscriptionManager.CB_ALERT_SPEECH:
		case SubscriptionManager.CB_ETWS_TEST_ALERT:
		case SubscriptionManager.CB_CHANNEL_50_ALERT:
		case SubscriptionManager.CB_CMAS_TEST_ALERT:
		case SubscriptionManager.CB_OPT_OUT_DIALOG:
		value.put(propKey, Integer.parseInt(propValue));
		break;
		default:
		if(DBG) logd("Invalid column name");
		break;
		}

		resolver.update(SubscriptionManager.CONTENT_URI, value,
		SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID +
		"=" + Integer.toString(subId), null);
		Binder.restoreCallingIdentity(token);
		}

		/**
		* Store properties associated with SubscriptionInfo in database
		* @param subId Subscription Id of Subscription
		* @param propKey Column name in SubscriptionInfo database
		* @return Value associated with subId and propKey column in database
		* @hide
		*/
		@Override
		public String getSubscriptionProperty(int subId, String propKey, String callingPackage) {
		if (!canReadPhoneState(callingPackage, "getSubInfoUsingSlotIdWithCheck")) {
		return null;
		}
		String resultValue = null;
		ContentResolver resolver = mContext.getContentResolver();
		Cursor cursor = resolver.query(SubscriptionManager.CONTENT_URI,
		new String[]{propKey},
		SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID + "=?",
		new String[]{subId + ""}, null);

		try {
		if (cursor != null) {
		if (cursor.moveToFirst()) {
		switch (propKey) {
		case SubscriptionManager.CB_EXTREME_THREAT_ALERT:
		case SubscriptionManager.CB_SEVERE_THREAT_ALERT:
		case SubscriptionManager.CB_AMBER_ALERT:
		case SubscriptionManager.CB_EMERGENCY_ALERT:
		case SubscriptionManager.CB_ALERT_SOUND_DURATION:
		case SubscriptionManager.CB_ALERT_REMINDER_INTERVAL:
		case SubscriptionManager.CB_ALERT_VIBRATE:
		case SubscriptionManager.CB_ALERT_SPEECH:
		case SubscriptionManager.CB_ETWS_TEST_ALERT:
		case SubscriptionManager.CB_CHANNEL_50_ALERT:
		case SubscriptionManager.CB_CMAS_TEST_ALERT:
		case SubscriptionManager.CB_OPT_OUT_DIALOG:
		resultValue = cursor.getInt(0) + "";
		break;
		default:
		if(DBG) logd("Invalid column name");
		break;
		}
		} else {
		if(DBG) logd("Valid row not present in db");
		}
		} else {
		if(DBG) logd("Query failed");
		}
		} finally {
		if (cursor != null) {
		cursor.close();
		}
		}
		if (DBG) logd("getSubscriptionProperty Query value = " + resultValue);
		return resultValue;
		}

		private static void printStackTrace(String msg) {
		RuntimeException re = new RuntimeException();
		slogd("StackTrace - " + msg);