diff options
| author | 2021-02-25 00:32:22 +0000 | |
|---|---|---|
| committer | 2021-02-25 00:32:22 +0000 | |
| commit | 3c1c7a32dc3d343b3a3ad9762adb8d814573c69c (patch) | |
| tree | 5a4555cbb7c6e200792323a2f9de0ee9e9ca40ba | |
| parent | dd81ed70c79e45b25df4cd6b3b04559098764b9c (diff) | |
| parent | 0dd3627b725c4110c2c16c4337d7ebc4886e1701 (diff) | |
Merge "SignalStrengthUpdateRequest#getLiveToken should not be in current.txt" am: 0dd3627b72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605216
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f6268679321190c0581b5bfe95fac933160b837
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SignalStrengthUpdateRequest.java | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index bc0272fc4432..80c555bd15b9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40972,7 +40972,6 @@ package android.telephony { public final class SignalStrengthUpdateRequest implements android.os.Parcelable { method public int describeContents(); - method @NonNull public android.os.IBinder getLiveToken(); method @NonNull public java.util.Collection<android.telephony.SignalThresholdInfo> getSignalThresholdInfos(); method public boolean isReportingRequestedWhileIdle(); method public void writeToParcel(@NonNull android.os.Parcel, int); diff --git a/telephony/java/android/telephony/SignalStrengthUpdateRequest.java b/telephony/java/android/telephony/SignalStrengthUpdateRequest.java index af67ed279fab..fe7e5976b132 100644 --- a/telephony/java/android/telephony/SignalStrengthUpdateRequest.java +++ b/telephony/java/android/telephony/SignalStrengthUpdateRequest.java @@ -187,7 +187,7 @@ public final class SignalStrengthUpdateRequest implements Parcelable { return mIsSystemThresholdReportingRequestedWhileIdle; } - /* + /** * @return the live token of the request * * @hide |