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

Commit b2ab846c authored by Nathan Harold's avatar Nathan Harold
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.

Bug: 135205433
Test: manual (automated test is infeasible)
Change-Id: Icf27eab40b1f979892123dc4185db2a138c1ffc2
parent 807a82b3

telephony/java/android/telephony/TelephonyManager.java

+4 −2
Original line number Diff line number Diff line
@@ -4733,7 +4733,8 @@ public class TelephonyManager { 
            ITelephony telephony = getITelephony();

            if (telephony == null)

                return DATA_ACTIVITY_NONE;

            return telephony.getDataActivity();

            return telephony.getDataActivity(

                    getSubId(SubscriptionManager.getActiveDataSubscriptionId()));

        } catch (RemoteException ex) {

            // the phone process is restarting.

            return DATA_ACTIVITY_NONE;
@@ -4781,7 +4782,8 @@ public class TelephonyManager { 
            ITelephony telephony = getITelephony();

            if (telephony == null)

                return DATA_DISCONNECTED;

            return telephony.getDataState();

            return telephony.getDataState(

                    getSubId(SubscriptionManager.getActiveDataSubscriptionId()));

        } catch (RemoteException ex) {

            // the phone process is restarting.

            return DATA_DISCONNECTED;

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

+24 −6
Original line number Diff line number Diff line
@@ -316,10 +316,28 @@ interface ITelephony { 
     */

     int getCallStateForSlot(int slotIndex);



     @UnsupportedAppUsage

     int getDataActivity();

     @UnsupportedAppUsage

     int getDataState();

    /**

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



    /**

     * Returns the current active phone type as integer.