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

Commit 4d4e2474 authored by Nathan Harold's avatar Nathan Harold Committed by Gerrit Code Review
Browse files

Merge "Revert "Use TM SubId in getDataState and getDataActivity""

parents 874b481c 44173ee7

telephony/java/android/telephony/TelephonyManager.java

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

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

     */

     int getCallStateForSlot(int slotIndex);

     int getCallStateForSlot(int slotIndex);





    /**

     @UnsupportedAppUsage

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

     int getDataActivity();

     * (cellular).

     @UnsupportedAppUsage

     *

     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.