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"

Browse Source
This commit is contained in:
Jordan Liu
2019-07-12 01:08:11 +00:00
committed by Gerrit Code Review
parent f0d921c41a af984d0d4e
commit 3968a18c27
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

@@ -68,6 +68,8 @@ Lcom/android/internal/R$styleable;->MenuView:[I
Lcom/android/internal/R$styleable;->Searchable:[I Lcom/android/internal/R$styleable;->Searchable:[I
Lcom/android/internal/R$styleable;->SearchableActionKey:[I Lcom/android/internal/R$styleable;->SearchableActionKey:[I
Lcom/android/internal/telephony/IPhoneSubInfo$Stub;-><init>()V 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;->notifyCallForwardingChanged(Z)V
Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCellLocation(Landroid/os/Bundle;)V
Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataActivity(I)V Lcom/android/internal/telephony/ITelephonyRegistry;->notifyDataActivity(I)V

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

@@ -4777,7 +4777,8 @@ 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.getDataActivityForSubId(
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;
@@ -4825,7 +4826,8 @@ 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.getDataStateForSubId(
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;

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

@@ -316,11 +316,39 @@ interface ITelephony {
*/ */
int getCallStateForSlot(int slotIndex); int getCallStateForSlot(int slotIndex);
@UnsupportedAppUsage /**
* Replaced by getDataActivityForSubId.
*/
int getDataActivity(); int getDataActivity();
@UnsupportedAppUsage
/**
* 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(); 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. * Returns the current active phone type as integer.
* Returns TelephonyManager.PHONE_TYPE_CDMA if RILConstants.CDMA_PHONE * Returns TelephonyManager.PHONE_TYPE_CDMA if RILConstants.CDMA_PHONE