Merge changes from topic "141388730" am: 50c4313058 am: cc2d8d495d (a99f27b4) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/CarrierTextController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -173,7 +173,7 @@ public class CarrierTextController {
		mSeparator = separator;
		mWakefulnessLifecycle = Dependency.get(WakefulnessLifecycle.class);
		mSimSlotsNumber = ((TelephonyManager) context.getSystemService(
		Context.TELEPHONY_SERVICE)).getPhoneCount();
		Context.TELEPHONY_SERVICE)).getMaxPhoneCount();
		mSimErrorState = new boolean[mSimSlotsNumber];
		updateDisplayOpportunisticSubscriptionCarrierText(SystemProperties.getBoolean(
		TelephonyProperties.DISPLAY_OPPORTUNISTIC_SUBSCRIPTION_CARRIER_TEXT_PROPERTY_NAME,

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ public class CarrierTextControllerTest extends SysuiTestCase {

		mCarrierTextCallbackInfo = new CarrierTextController.CarrierTextCallbackInfo("",
		new CharSequence[]{}, false, new int[]{});
		when(mTelephonyManager.getPhoneCount()).thenReturn(3);
		when(mTelephonyManager.getMaxPhoneCount()).thenReturn(3);

		mCarrierTextController = new TestCarrierTextController(mContext, SEPARATOR, true, true,
		mKeyguardUpdateMonitor);

+1 −1

Original line number	Diff line number	Diff line
		@@ -382,7 +382,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		mContext = context;
		mBatteryStats = BatteryStatsService.getService();

		int numPhones = TelephonyManager.getDefault().getPhoneCount();
		int numPhones = TelephonyManager.getDefault().getMaxPhoneCount();
		if (DBG) log("TelephonyRegistry: ctor numPhones=" + numPhones);
		mNumPhones = numPhones;
		mCallState = new int[numPhones];

+15 −2

Original line number	Diff line number	Diff line
		@@ -2095,13 +2095,26 @@ public class SubscriptionManager {
		/** @hide */
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
		public static boolean isValidSlotIndex(int slotIndex) {
		return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getSimCount();
		return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getMaxPhoneCount();
		}

		/** @hide */
		@UnsupportedAppUsage
		public static boolean isValidPhoneId(int phoneId) {
		return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getPhoneCount();
		return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getMaxPhoneCount();
		}

		/**
		* When getPhoneCount and getMaxPhoneCount return different value, isValidPhoneId being true
		* doesn't mean the phoneId has a corresponding active slot / logical modem. If a DSDS capable
		* device is in single SIM mode, phoneId=1 is valid but not active.
		*
		* TODO: b/139642279 combine with SubscriptionManager#isValidPhoneId when phone objects
		* are dynamically allocated instead of always based on getMaxPhoneCount.
		* @hide
		*/
		public static boolean isActivePhoneId(int slotIndex) {
		return slotIndex < TelephonyManager.getDefault().getPhoneCount();
		}

		/** @hide */

+3 −3

Original line number	Diff line number	Diff line
		@@ -404,7 +404,7 @@ public class TelephonyManager {
		* TODO: b/139642279 publicize and rename.
		* @hide
		*/
		public static int getMaxPhoneCount() {
		public int getMaxPhoneCount() {
		// TODO: b/139642279 when turning on this feature, remove dependency of
		// PROPERTY_REBOOT_REQUIRED_ON_MODEM_CHANGE and always return result based on
		// PROPERTY_MAX_ACTIVE_MODEMS.
		@@ -413,9 +413,9 @@ public class TelephonyManager {
		if (rebootRequired.equals("false")) {
		// If no reboot is required, return max possible active modems.
		return SystemProperties.getInt(
		TelephonyProperties.PROPERTY_MAX_ACTIVE_MODEMS, getDefault().getPhoneCount());
		TelephonyProperties.PROPERTY_MAX_ACTIVE_MODEMS, getPhoneCount());
		} else {
		return getDefault().getPhoneCount();
		return getPhoneCount();
		}
		}