Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose methods to enumerate constants" am: ae9309bc05

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

Change-Id: I94962c9e84cf186d9b5af95522a9140b6410341f
This commit is contained in:
Hall Liu
2020-10-23 19:54:57 +00:00
committed by Automerger Merge Worker
parent 2cbc12ba3e ae9309bc05
commit 037195448a
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/module-lib-current.txt
View File

@@ -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 {

12
non-updatable-api/module-lib-current.txt
View File

@@ -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 {

6
telephony/java/android/telephony/CellSignalStrength.java
View File

@@ -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;
}
}

6
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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;
}