Merge "Remove @ModemCount enum definitions." into rvc-dev am: 2f2742cc80 am:... (f218e972) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -48315,10 +48315,6 @@ package android.telephony {
	field public static final String EXTRA_SUBSCRIPTION_ID = "android.telephony.extra.SUBSCRIPTION_ID";		field public static final String EXTRA_SUBSCRIPTION_ID = "android.telephony.extra.SUBSCRIPTION_ID";
	field public static final String EXTRA_VOICEMAIL_NUMBER = "android.telephony.extra.VOICEMAIL_NUMBER";		field public static final String EXTRA_VOICEMAIL_NUMBER = "android.telephony.extra.VOICEMAIL_NUMBER";
	field public static final String METADATA_HIDE_VOICEMAIL_SETTINGS_MENU = "android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU";		field public static final String METADATA_HIDE_VOICEMAIL_SETTINGS_MENU = "android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU";
	field public static final int MODEM_COUNT_DUAL_MODEM = 2; // 0x2
	field public static final int MODEM_COUNT_NO_MODEM = 0; // 0x0
	field public static final int MODEM_COUNT_SINGLE_MODEM = 1; // 0x1
	field public static final int MODEM_COUNT_TRI_MODEM = 3; // 0x3
	field public static final int MULTISIM_ALLOWED = 0; // 0x0		field public static final int MULTISIM_ALLOWED = 0; // 0x0
	field public static final int MULTISIM_NOT_SUPPORTED_BY_CARRIER = 2; // 0x2		field public static final int MULTISIM_NOT_SUPPORTED_BY_CARRIER = 2; // 0x2
	field public static final int MULTISIM_NOT_SUPPORTED_BY_HARDWARE = 1; // 0x1		field public static final int MULTISIM_NOT_SUPPORTED_BY_HARDWARE = 1; // 0x1

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,6 @@ import static android.content.Intent.ACTION_USER_STOPPED;
	import static android.content.Intent.ACTION_USER_UNLOCKED;		import static android.content.Intent.ACTION_USER_UNLOCKED;
	import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;		import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;
	import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;		import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;
	import static android.telephony.TelephonyManager.MODEM_COUNT_DUAL_MODEM;

	import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT;		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_BOOT;
	import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;
	@@ -455,7 +454,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
	*/		*/
	public List<SubscriptionInfo> getFilteredSubscriptionInfo(boolean forceReload) {		public List<SubscriptionInfo> getFilteredSubscriptionInfo(boolean forceReload) {
	List<SubscriptionInfo> subscriptions = getSubscriptionInfo(false);		List<SubscriptionInfo> subscriptions = getSubscriptionInfo(false);
	if (subscriptions.size() == MODEM_COUNT_DUAL_MODEM) {		if (subscriptions.size() == 2) {
	SubscriptionInfo info1 = subscriptions.get(0);		SubscriptionInfo info1 = subscriptions.get(0);
	SubscriptionInfo info2 = subscriptions.get(1);		SubscriptionInfo info2 = subscriptions.get(1);
	if (info1.getGroupUuid() != null && info1.getGroupUuid().equals(info2.getGroupUuid())) {		if (info1.getGroupUuid() != null && info1.getGroupUuid().equals(info2.getGroupUuid())) {

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,6 @@ import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_IN
	import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE;		import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_NONE;
	import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_OUT;		import static android.net.wifi.WifiManager.TrafficStateCallback.DATA_ACTIVITY_OUT;
	import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;		import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;
	import static android.telephony.TelephonyManager.MODEM_COUNT_DUAL_MODEM;

	import android.content.BroadcastReceiver;		import android.content.BroadcastReceiver;
	import android.content.Context;		import android.content.Context;
	@@ -606,7 +605,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
	}		}

	private void filterMobileSubscriptionInSameGroup(List<SubscriptionInfo> subscriptions) {		private void filterMobileSubscriptionInSameGroup(List<SubscriptionInfo> subscriptions) {
	if (subscriptions.size() == MODEM_COUNT_DUAL_MODEM) {		if (subscriptions.size() == 2) {
	SubscriptionInfo info1 = subscriptions.get(0);		SubscriptionInfo info1 = subscriptions.get(0);
	SubscriptionInfo info2 = subscriptions.get(1);		SubscriptionInfo info2 = subscriptions.get(1);
	if (info1.getGroupUuid() != null && info1.getGroupUuid().equals(info2.getGroupUuid())) {		if (info1.getGroupUuid() != null && info1.getGroupUuid().equals(info2.getGroupUuid())) {

telephony/java/android/telephony/TelephonyManager.java

+6 −21

Original line number	Original line	Diff line number	Diff line
	@@ -332,21 +332,6 @@ public class TelephonyManager {
	UNKNOWN		UNKNOWN
	};		};

	/** @hide */
	@IntDef(prefix = {"MODEM_COUNT_"},
	value = {
	MODEM_COUNT_NO_MODEM,
	MODEM_COUNT_SINGLE_MODEM,
	MODEM_COUNT_DUAL_MODEM,
	MODEM_COUNT_TRI_MODEM
	})
	public @interface ModemCount {}

	public static final int MODEM_COUNT_NO_MODEM = 0;
	public static final int MODEM_COUNT_SINGLE_MODEM = 1;
	public static final int MODEM_COUNT_DUAL_MODEM = 2;
	public static final int MODEM_COUNT_TRI_MODEM = 3;

	/** @hide */		/** @hide */
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public TelephonyManager(Context context) {		public TelephonyManager(Context context) {
	@@ -465,22 +450,22 @@ public class TelephonyManager {
	* Returns 2 for Dual standby mode (Dual SIM functionality).		* Returns 2 for Dual standby mode (Dual SIM functionality).
	* Returns 3 for Tri standby mode (Tri SIM functionality).		* Returns 3 for Tri standby mode (Tri SIM functionality).
	*/		*/
	public @ModemCount int getActiveModemCount() {		public int getActiveModemCount() {
	int modemCount = 1;		int modemCount = 1;
	switch (getMultiSimConfiguration()) {		switch (getMultiSimConfiguration()) {
	case UNKNOWN:		case UNKNOWN:
	modemCount = MODEM_COUNT_SINGLE_MODEM;		modemCount = 1;
	// check for voice and data support, 0 if not supported		// check for voice and data support, 0 if not supported
	if (!isVoiceCapable() && !isSmsCapable() && !isDataCapable()) {		if (!isVoiceCapable() && !isSmsCapable() && !isDataCapable()) {
	modemCount = MODEM_COUNT_NO_MODEM;		modemCount = 0;
	}		}
	break;		break;
	case DSDS:		case DSDS:
	case DSDA:		case DSDA:
	modemCount = MODEM_COUNT_DUAL_MODEM;		modemCount = 2;
	break;		break;
	case TSTS:		case TSTS:
	modemCount = MODEM_COUNT_TRI_MODEM;		modemCount = 3;
	break;		break;
	}		}
	return modemCount;		return modemCount;
	@@ -493,7 +478,7 @@ public class TelephonyManager {
	* dual-SIM capable device operating in single SIM mode (only one logical modem is turned on),		* dual-SIM capable device operating in single SIM mode (only one logical modem is turned on),
	* {@link #getActiveModemCount} returns 1 while this API returns 2.		* {@link #getActiveModemCount} returns 1 while this API returns 2.
	*/		*/
	public @ModemCount int getSupportedModemCount() {		public int getSupportedModemCount() {
	return TelephonyProperties.max_active_modems().orElse(getActiveModemCount());		return TelephonyProperties.max_active_modems().orElse(getActiveModemCount());
	}		}