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

Use the SubId in the TM.getNetworkType if Valid

Browse Source 
If the TM instance has a specific subid that was
added using TM.createForSubscriptionId(), honor that
subId in getNetworkType().

Bug: 132466954
Test: compilation + manual
Merged-In: Ice4f673750ab3b374644750113e5b9b2a4f5ba63
Change-Id: Ice4f673750ab3b374644750113e5b9b2a4f5ba63
(cherry picked from commit 0aca431313)
This commit is contained in:
Nathan Harold
2019-05-16 19:39:12 -07:00
parent a9607b296a
commit f36fee3cf7
1 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2446,21 +2446,7 @@ public class TelephonyManager {
* @return the NETWORK_TYPE_xxxx for current data connection. * @return the NETWORK_TYPE_xxxx for current data connection.
*/ */
public @NetworkType int getNetworkType() { public @NetworkType int getNetworkType() {
try { return getDataNetworkType();
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getNetworkType();
} else {
// This can happen when the ITelephony interface is not up yet.
return NETWORK_TYPE_UNKNOWN;
}
} catch(RemoteException ex) {
// This shouldn't happen in the normal case
return NETWORK_TYPE_UNKNOWN;
} catch (NullPointerException ex) {
// This could happen before phone restarts due to crashing
return NETWORK_TYPE_UNKNOWN;
}
} }
/** /**
@@ -2491,23 +2477,9 @@ public class TelephonyManager {
* @hide * @hide
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public int getNetworkType(int subId) { public int getNetworkType(int subId) {
try { return getDataNetworkType(subId);
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getNetworkTypeForSubscriber(subId, getOpPackageName());
} else {
// This can happen when the ITelephony interface is not up yet.
return NETWORK_TYPE_UNKNOWN;
}
} catch (RemoteException ex) {
// This shouldn't happen in the normal case
return NETWORK_TYPE_UNKNOWN;
} catch (NullPointerException ex) {
// This could happen before phone restarts due to crashing
return NETWORK_TYPE_UNKNOWN;
}
} }
/** /**