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

Commit 1dbdef8c authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Expose methods to enumerate constants" am: ae9309bc am: 03719544 am: 1fd0a64a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470085

Change-Id: Ibac491dcbabb45d3218edac6abd03f93f1db609d
parents 76a3d05a 1fd0a64a

api/module-lib-current.txt

+12 −0
Original line number Original line 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 {

package android.util {





  public final class Log {

  public final class Log {

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

+12 −0
Original line number Original line 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 {

package android.util {





  public final class Log {

  public final class Log {

telephony/java/android/telephony/CellSignalStrength.java

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

package android.telephony;





import android.annotation.IntRange;

import android.annotation.IntRange;

import android.annotation.SystemApi;

import android.os.PersistableBundle;

import android.os.PersistableBundle;





/**

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




    /**

    /**

     * Returns the number of signal strength levels.

     * 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

     * @hide

     */

     */

    public static final int getNumSignalStrengthLevels() {

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static int getNumSignalStrengthLevels() {

        return NUM_SIGNAL_STRENGTH_BINS;

        return NUM_SIGNAL_STRENGTH_BINS;

    }

    }

}
 
}

telephony/java/android/telephony/TelephonyManager.java

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

    };

















    /**







    /**











     * Return a collection of all network types







     * Returns an array of all valid network types.











     * @return network types







     *














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











     *







     *











     * @hide







     * @hide











     */







     */














    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)











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







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











        return NETWORK_TYPES;







        return NETWORK_TYPES;











    }







    }