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"" am: 4d4e2474ea am: f5ee9c61be

Browse Source 
am: 22d0ed63cc

Change-Id: Ibb0e9d7f55c8f1ba6179e7afbd63e33c23628822
This commit is contained in:
Nathan Harold
2019-06-27 16:06:15 -07:00
committed by android-build-merger
parent a48ebd1dbc 22d0ed63cc
commit 3b0cf87a5b
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

@@ -4901,8 +4901,7 @@ public class TelephonyManager {
ITelephony telephony = getITelephony();
if (telephony == null)
return DATA_ACTIVITY_NONE;
return telephony.getDataActivity(
getSubId(SubscriptionManager.getActiveDataSubscriptionId()));
return telephony.getDataActivity();
} catch (RemoteException ex) {
// the phone process is restarting.
return DATA_ACTIVITY_NONE;
@@ -4950,8 +4949,7 @@ public class TelephonyManager {
ITelephony telephony = getITelephony();
if (telephony == null)
return DATA_DISCONNECTED;
return telephony.getDataState(
getSubId(SubscriptionManager.getActiveDataSubscriptionId()));
return telephony.getDataState();
} catch (RemoteException ex) {
// the phone process is restarting.
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);
@UnsupportedAppUsage
int getCallState();
@UnsupportedAppUsage
int getCallState();
/**
* Returns the call state for a slot.
*/
int getCallStateForSlot(int slotIndex);
/**
* Returns a constant indicating the type of activity on a data connection
* (cellular).
*
* @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);
@UnsupportedAppUsage
int getDataActivity();
@UnsupportedAppUsage
int getDataState();
/**
* Returns the current active phone type as integer.