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

Merge "Revert "Use TM SubId in getDataState and getDataActivity""

Browse Source
This commit is contained in:
Nathan Harold
2019-06-27 22:11:18 +00:00
committed by Gerrit Code Review
parent 874b481cdf 44173ee7b0
commit 4d4e2474ea
2 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4777,8 +4777,7 @@ public class TelephonyManager {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony == null) if (telephony == null)
return DATA_ACTIVITY_NONE; return DATA_ACTIVITY_NONE;
return telephony.getDataActivity( return telephony.getDataActivity();
getSubId(SubscriptionManager.getActiveDataSubscriptionId()));
} catch (RemoteException ex) { } catch (RemoteException ex) {
// the phone process is restarting. // the phone process is restarting.
return DATA_ACTIVITY_NONE; return DATA_ACTIVITY_NONE;
@@ -4826,8 +4825,7 @@ public class TelephonyManager {
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
if (telephony == null) if (telephony == null)
return DATA_DISCONNECTED; return DATA_DISCONNECTED;
return telephony.getDataState( return telephony.getDataState();
getSubId(SubscriptionManager.getActiveDataSubscriptionId()));
} catch (RemoteException ex) { } catch (RemoteException ex) {
// the phone process is restarting. // the phone process is restarting.
return DATA_DISCONNECTED; return DATA_DISCONNECTED;

30
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -308,36 +308,18 @@ interface ITelephony {
*/ */
List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg); List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg);
@UnsupportedAppUsage @UnsupportedAppUsage
int getCallState(); int getCallState();
/** /**
* Returns the call state for a slot. * Returns the call state for a slot.
*/ */
int getCallStateForSlot(int slotIndex); int getCallStateForSlot(int slotIndex);
/** @UnsupportedAppUsage
* Returns a constant indicating the type of activity on a data connection int getDataActivity();
* (cellular). @UnsupportedAppUsage
* int getDataState();
* @see #DATA_ACTIVITY_NONE
* @see #DATA_ACTIVITY_IN
* @see #DATA_ACTIVITY_OUT
* @see #DATA_ACTIVITY_INOUT
* @see #DATA_ACTIVITY_DORMANT
*/
int getDataActivity(int subId);
/**
* Returns a constant indicating the current data connection state
* (cellular).
*
* @see #DATA_DISCONNECTED
* @see #DATA_CONNECTING
* @see #DATA_CONNECTED
* @see #DATA_SUSPENDED
*/
int getDataState(int subId);
/** /**
* Returns the current active phone type as integer. * Returns the current active phone type as integer.