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

Commit 43012e5f authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Use TM SubId in getDataState and getDataActivity" am: 28a7b597 am:... 

Merge "Use TM SubId in getDataState and getDataActivity" am: 28a7b597 am: 08698af5 am: c51d10ea
am: 9620dfc6

Change-Id: Iab8fcc24ce194862170c9c177c43891c1517c6a9
parents 79e59e46 9620dfc6

telephony/java/android/telephony/TelephonyManager.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -4911,7 +4911,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.getDataActivity(

                    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;
@@ -4959,7 +4960,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.getDataState(

                    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;

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

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

     */

     int getCallStateForSlot(int slotIndex);

     int getCallStateForSlot(int slotIndex);





     @UnsupportedAppUsage

    /**

     int getDataActivity();

     * Returns a constant indicating the type of activity on a data connection

     @UnsupportedAppUsage

     * (cellular).

     int getDataState();

     *

     * @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.

     * Returns the current active phone type as integer.