Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af984d0d authored by Nathan Harold's avatar Nathan Harold Committed by Jordan Liu
Browse files

Use TM SubId in getDataState and getDataActivity 

-Update getDataState() API to use the SubId specified
 by the TelephonyManager instance.

-Update the getDataActivity() API to use the SubId
 specified by the TelephonyManager instance.

(This CL is an un-revert of aosp/984377)

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: I035f2c44a7955e88608b1c336acb72fb68c3e450
parent 79a2b521

config/hiddenapi-greylist-max-p.txt

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,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

telephony/java/android/telephony/TelephonyManager.java

+4 −2
Original line number Diff line number Diff line
@@ -4777,7 +4777,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;
@@ -4825,7 +4826,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;

telephony/java/com/android/internal/telephony/ITelephony.aidl

+35 −7
Original line number Diff line number Diff line
@@ -316,11 +316,39 @@ interface ITelephony { 
     */

    int getCallStateForSlot(int slotIndex);



     @UnsupportedAppUsage

    /**

     * Replaced by getDataActivityForSubId.

     */

    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();



    /**

     * 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 TelephonyManager.PHONE_TYPE_CDMA if RILConstants.CDMA_PHONE