diff options
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2020-04-29 19:47:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-29 19:47:31 +0000 |
| commit | 9d3d7bd000a66d7ad94442797122787479ae9527 (patch) | |
| tree | 427765772a9d6a7798cae8709ff4a8fa8cfc5f40 | |
| parent | f2af0a08a02e901d169fd532f37e6cde6f603035 (diff) | |
| parent | af242fb7e09871161b1bc356fb8dbcb4ff7f6bfe (diff) | |
Merge "Add two ServiceState APIs back to @Unsupported list." into rvc-dev am: af242fb7e0
Change-Id: I60e055fae6228e139abb9100c01e95836548fdcd
| -rw-r--r-- | config/boot-image-profile.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ServiceState.java | 2 |
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. |