summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Chen <refuhoo@google.com>2020-04-28 16:14:01 -0700
committerMalcolm Chen <refuhoo@google.com>2020-04-28 16:14:01 -0700
commit9993fd6bff7ac3253c84de0b3e0335ed660d2c2b (patch)
tree60a2f52f6738c66ec99b4ff166b1581f51726a95
parent261f1cafc6f971e1c0d7ab0a84708385d218d3ba (diff)
Add two ServiceState APIs back to @Unsupported list.
It was removed from boot-image-profile when we tried to expose them for mainlining. Now it's @hide again, so we should add it back into boot-image-profile otherwise it will break appss. Bug: 153825725 Test: build Change-Id: I7dcce69d3d2b3b2601f98817a4ee4467f7efb47a
-rw-r--r--config/boot-image-profile.txt2
-rw-r--r--telephony/java/android/telephony/ServiceState.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/config/boot-image-profile.txt b/config/boot-image-profile.txt
index 5f45d6932293..95778b5b3648 100644
--- a/config/boot-image-profile.txt
+++ b/config/boot-image-profile.txt
@@ -19208,6 +19208,8 @@ HSPLandroid/telephony/PreciseDataConnectionState;->toString()Ljava/lang/String;
HSPLandroid/telephony/PreciseDataConnectionState;->writeToParcel(Landroid/os/Parcel;I)V
HSPLandroid/telephony/Rlog;->d(Ljava/lang/String;Ljava/lang/String;)I
HSPLandroid/telephony/ServiceState;->createLocationInfoSanitizedCopy(Z)Landroid/telephony/ServiceState;
+HSPLandroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V
+HSPLandroid/telephony/ServiceState;->newFromBundle(Landroid/os/Bundle;)Landroid/telephony/ServiceState;
PLandroid/telephony/SignalStrength;-><init>(Landroid/telephony/SignalStrength;)V
HPLandroid/telephony/SignalStrength;->copyFrom(Landroid/telephony/SignalStrength;)V
HSPLandroid/telephony/SignalStrength;->isGsm()Z
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 0e61efac77ec..07d71d0ad7f9 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -398,6 +398,7 @@ public class ServiceState implements Parcelable {
* @hide
*/
@NonNull
+ @UnsupportedAppUsage
public static ServiceState newFromBundle(@NonNull Bundle m) {
ServiceState ret;
ret = new ServiceState();
@@ -1315,6 +1316,7 @@ public class ServiceState implements Parcelable {
* @hide
*
*/
+ @UnsupportedAppUsage
public void fillInNotifierBundle(@NonNull Bundle m) {
m.putParcelable(EXTRA_SERVICE_STATE, this);
// serviceState already consists of below entries.