Merge changes from topic "cbrs_tethering_failed" am: f604f16727 (cc0a45a6) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -1301,6 +1301,13 @@ public class PhoneSwitcher extends Handler {
		}
		}

		/**
		* @return The active data subscription id
		*/
		public int getActiveDataSubId() {
		return mPreferredDataSubId;
		}

		public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
		final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
		pw.println("PhoneSwitcher:");

+27 −0

Original line number	Diff line number	Diff line
		@@ -3688,4 +3688,31 @@ public class SubscriptionController extends ISub.Stub {
		return TextUtils.emptyIfNull(getSubscriptionProperty(subId,
		SubscriptionManager.DATA_ENABLED_OVERRIDE_RULES));
		}

		/**
		* Get active data subscription id.
		*
		* @return Active data subscription id
		*
		* @hide
		*/
		@Override
		public int getActiveDataSubscriptionId() {
		final long token = Binder.clearCallingIdentity();

		try {
		PhoneSwitcher phoneSwitcher = PhoneSwitcher.getInstance();
		if (phoneSwitcher != null) {
		int activeDataSubId = phoneSwitcher.getActiveDataSubId();
		if (SubscriptionManager.isUsableSubscriptionId(activeDataSubId)) {
		return activeDataSubId;
		}
		}
		// If phone switcher isn't ready, or active data sub id is not available, use default
		// sub id from settings.
		return getDefaultDataSubId();
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		}