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

Commit 592ae5cb authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Add TransportType in AccessNetworkConstants.java" am: afd65d9d am: dae9a8e8 

am: c240b8c2

Change-Id: Ie866867f99c8699703b6d12d0af78fbff5d5f59b
parents 277ff087 c240b8c2

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -4390,6 +4390,12 @@ package android.telecom { 


package android.telephony {



  public static final class AccessNetworkConstants.TransportType {

    ctor public AccessNetworkConstants.TransportType();

    field public static final int WLAN = 2; // 0x2

    field public static final int WWAN = 1; // 0x1

  }



  public class CarrierConfigManager {

    method public static android.os.PersistableBundle getDefaultConfig();

    method public void updateConfigForPhoneId(int, java.lang.String);

telephony/java/android/telephony/AccessNetworkConstants.java

+14 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.telephony;



import android.annotation.SystemApi;



/**

 * Contains access network related constants.

 */
@@ -29,6 +31,18 @@ public final class AccessNetworkConstants { 
        public static final int IWLAN = 5;

    }



    /**

     * Wireless transportation type

     * @hide

     */

    @SystemApi

    public static final class TransportType {

        /** Wireless Wide Area Networks (i.e. Cellular) */

        public static final int WWAN = 1;

        /** Wireless Local Area Networks (i.e. Wifi) */

        public static final int WLAN = 2;

    }



    /**

     * Frenquency bands for GERAN.

     * http://www.etsi.org/deliver/etsi_ts/145000_145099/145005/14.00.00_60/ts_145005v140000p.pdf