Merge "Make some telephony methods available under Ravenwood" into main
diff --git a/ravenwood/ravenwood-annotation-allowed-classes.txt b/ravenwood/ravenwood-annotation-allowed-classes.txt
index a5ecd20..75c5a49 100644
--- a/ravenwood/ravenwood-annotation-allowed-classes.txt
+++ b/ravenwood/ravenwood-annotation-allowed-classes.txt
@@ -155,6 +155,11 @@
android.view.Display$Mode
android.view.DisplayInfo
+android.telephony.ActivityStatsTechSpecificInfo
+android.telephony.CellSignalStrength
+android.telephony.ModemActivityInfo
+android.telephony.ServiceState
+
com.android.server.LocalServices
com.android.server.power.stats.BatteryStatsImpl
diff --git a/telephony/java/android/telephony/ActivityStatsTechSpecificInfo.java b/telephony/java/android/telephony/ActivityStatsTechSpecificInfo.java
index e5a20ea..bed9c45 100644
--- a/telephony/java/android/telephony/ActivityStatsTechSpecificInfo.java
+++ b/telephony/java/android/telephony/ActivityStatsTechSpecificInfo.java
@@ -32,6 +32,7 @@
*
* @hide
*/
+@android.ravenwood.annotation.RavenwoodKeepWholeClass
public final class ActivityStatsTechSpecificInfo implements Parcelable {
private static final int TX_POWER_LEVELS = 5;
diff --git a/telephony/java/android/telephony/CellSignalStrength.java b/telephony/java/android/telephony/CellSignalStrength.java
index 9727ab7..b9b9680 100644
--- a/telephony/java/android/telephony/CellSignalStrength.java
+++ b/telephony/java/android/telephony/CellSignalStrength.java
@@ -23,6 +23,7 @@
/**
* Abstract base class for cell phone signal strength related information.
*/
+@android.ravenwood.annotation.RavenwoodKeepWholeClass
public abstract class CellSignalStrength {
public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN =
diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java
index 64b3c0a..3d3c2e8 100644
--- a/telephony/java/android/telephony/ModemActivityInfo.java
+++ b/telephony/java/android/telephony/ModemActivityInfo.java
@@ -37,6 +37,7 @@
* Contains information about the modem's activity. May be useful for power stats reporting.
* @hide
*/
+@android.ravenwood.annotation.RavenwoodKeepWholeClass
@SystemApi
public final class ModemActivityInfo implements Parcelable {
private static final int TX_POWER_LEVELS = 5;
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 85a85c6..db167c0 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -63,6 +63,7 @@
* For historical reasons this class is not declared as final; however,
* it should be treated as though it were final.
*/
+@android.ravenwood.annotation.RavenwoodKeepPartialClass
public class ServiceState implements Parcelable {
static final String LOG_TAG = "PHONE";
@@ -1140,6 +1141,7 @@
*
* @hide
*/
+ @android.ravenwood.annotation.RavenwoodKeep
public static @NonNull String frequencyRangeToString(@FrequencyRange int range) {
switch (range) {
case FREQUENCY_RANGE_UNKNOWN: return "UNKNOWN";