Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove @ModemCount enum definitions."

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2020-04-07 23:45:33 +00:00
committed by Gerrit Code Review
parent beccb937dd 4c96811356
commit 349a19d904
4 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -46050,10 +46050,6 @@ package android.telephony {
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 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_NOT_SUPPORTED_BY_CARRIER = 2; // 0x2
field public static final int MULTISIM_NOT_SUPPORTED_BY_HARDWARE = 1; // 0x1

3
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -29,7 +29,6 @@ import static android.os.BatteryManager.EXTRA_MAX_CHARGING_VOLTAGE;
import static android.os.BatteryManager.EXTRA_PLUGGED;
import static android.os.BatteryManager.EXTRA_STATUS;
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_DPM_LOCK_NOW;
@@ -527,7 +526,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
*/
public List<SubscriptionInfo> getFilteredSubscriptionInfo(boolean forceReload) {
List<SubscriptionInfo> subscriptions = getSubscriptionInfo(false);
if (subscriptions.size() == MODEM_COUNT_DUAL_MODEM) {
if (subscriptions.size() == 2) {
SubscriptionInfo info1 = subscriptions.get(0);
SubscriptionInfo info2 = subscriptions.get(1);
if (info1.getGroupUuid() != null && info1.getGroupUuid().equals(info2.getGroupUuid())) {

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

@@ -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_OUT;
import static android.telephony.PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE;
import static android.telephony.TelephonyManager.MODEM_COUNT_DUAL_MODEM;
import static com.android.systemui.Dependency.BG_LOOPER_NAME;
@@ -607,7 +606,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
}
private void filterMobileSubscriptionInSameGroup(List<SubscriptionInfo> subscriptions) {
if (subscriptions.size() == MODEM_COUNT_DUAL_MODEM) {
if (subscriptions.size() == 2) {
SubscriptionInfo info1 = subscriptions.get(0);
SubscriptionInfo info2 = subscriptions.get(1);
if (info1.getGroupUuid() != null && info1.getGroupUuid().equals(info2.getGroupUuid())) {

27
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -315,21 +315,6 @@ public class TelephonyManager {
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 */
@UnsupportedAppUsage
public TelephonyManager(Context context) {
@@ -438,22 +423,22 @@ public class TelephonyManager {
* Returns 2 for Dual standby mode (Dual SIM functionality).
* Returns 3 for Tri standby mode (Tri SIM functionality).
*/
public @ModemCount int getActiveModemCount() {
public int getActiveModemCount() {
int modemCount = 1;
switch (getMultiSimConfiguration()) {
case UNKNOWN:
modemCount = MODEM_COUNT_SINGLE_MODEM;
modemCount = 1;
// check for voice and data support, 0 if not supported
if (!isVoiceCapable() && !isSmsCapable() && !isDataCapable()) {
modemCount = MODEM_COUNT_NO_MODEM;
modemCount = 0;
}
break;
case DSDS:
case DSDA:
modemCount = MODEM_COUNT_DUAL_MODEM;
modemCount = 2;
break;
case TSTS:
modemCount = MODEM_COUNT_TRI_MODEM;
modemCount = 3;
break;
}
return modemCount;
@@ -466,7 +451,7 @@ public class TelephonyManager {
* 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.
*/
public @ModemCount int getSupportedModemCount() {
public int getSupportedModemCount() {
return TelephonyProperties.max_active_modems().orElse(getActiveModemCount());
}