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

Merge "Use TM SubId in getDataState and getDataActivity" am: 3968a18c27

Browse Source 
am: 6ef6ff9ca1

Change-Id: I547a76c5da5f1ce58ed77853591ec1d4ba8f9318
This commit is contained in:
Jordan Liu
2019-07-11 18:39:58 -07:00
committed by android-build-merger
parent 37a91339ea 6ef6ff9ca1
commit 853c565de9
3 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/hiddenapi-greylist-max-p.txt
View File

@@ -70,6 +70,8 @@ Lcom/android/internal/R$styleable;->MenuView:[I
Lcom/android/internal/R$styleable;->Searchable:[I
Lcom/android/internal/R$styleable;->SearchableActionKey:[I
Lcom/android/internal/telephony/IPhoneSubInfo$Stub;-><init>()V
Lcom/android/internal/telephony/ITelephony;->getDataActivity()I
Lcom/android/internal/telephony/ITelephony;->getDataState()I
Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallForwardingChanged(Z)V
Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V
Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataActivity(I)V

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

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

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

@@ -308,18 +308,46 @@ interface ITelephony {
*/
List<NeighboringCellInfo> getNeighboringCellInfo(String callingPkg);
@UnsupportedAppUsage
int getCallState();
@UnsupportedAppUsage
int getCallState();
/**
* Returns the call state for a slot.
*/
int getCallStateForSlot(int slotIndex);
int getCallStateForSlot(int slotIndex);
@UnsupportedAppUsage
int getDataActivity();
@UnsupportedAppUsage
int getDataState();
/**
* Replaced by getDataActivityForSubId.
*/
int getDataActivity();
/**
* 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 getDataActivityForSubId(int subId);
/**
* Replaced by getDataStateForSubId.
*/
int getDataState();
/**
* Returns a constant indicating the current data connection state
* (cellular).
*
* @see #DATA_DISCONNECTED
* @see #DATA_CONNECTING
* @see #DATA_CONNECTED
* @see #DATA_SUSPENDED
*/
int getDataStateForSubId(int subId);
/**
* Returns the current active phone type as integer.