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

Commit ae9309bc authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Expose methods to enumerate constants"

parents 3e7b21c1 644532e7

api/module-lib-current.txt

+12 −0
Original line number Diff line number Diff line
@@ -71,6 +71,18 @@ package android.os { 


}



package android.telephony {



  public abstract class CellSignalStrength {

    method public static int getNumSignalStrengthLevels();

  }



  public class TelephonyManager {

    method @NonNull public static int[] getAllNetworkTypes();

  }



}



package android.util {



  public final class Log {

non-updatable-api/module-lib-current.txt

+12 −0
Original line number Diff line number Diff line
@@ -26,6 +26,18 @@ package android.os { 


}



package android.telephony {



  public abstract class CellSignalStrength {

    method public static int getNumSignalStrengthLevels();

  }



  public class TelephonyManager {

    method @NonNull public static int[] getAllNetworkTypes();

  }



}



package android.util {



  public final class Log {

telephony/java/android/telephony/CellSignalStrength.java

+4 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.telephony;



import android.annotation.IntRange;

import android.annotation.SystemApi;

import android.os.PersistableBundle;



/**
@@ -155,11 +156,12 @@ public abstract class CellSignalStrength { 


    /**

     * Returns the number of signal strength levels.

     * @return Number of signal strength levels, enforced to be 5

     * @return Number of signal strength levels, currently defined in the HAL as 5.

     *

     * @hide

     */

    public static final int getNumSignalStrengthLevels() {

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static int getNumSignalStrengthLevels() {

        return NUM_SIGNAL_STRENGTH_BINS;

    }

}

telephony/java/android/telephony/TelephonyManager.java

+4 −2
Original line number Diff line number Diff line
@@ -2829,11 +2829,13 @@ public class TelephonyManager { 
    };















    /**













     * Return a collection of all network types













     * @return network types













     * Returns an array of all valid network types.













     *













     * @return An integer array containing all valid network types in no particular order.















     *















     * @hide















     */













    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)















    public static @NonNull @NetworkType int[] getAllNetworkTypes() {















        return NETWORK_TYPES;















    }