diff options
| author | Rambo Wang <rambowang@google.com> | 2021-02-25 00:18:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-25 00:18:22 +0000 |
| commit | 0dd3627b725c4110c2c16c4337d7ebc4886e1701 (patch) | |
| tree | aa895faec4b632102e190f90ce0aa42b02a9dd27 | |
| parent | 43a9a8089f2526ccbf054a1ad37fe7929d29cf41 (diff) | |
| parent | 6dd150461bb4003cfada92e2b7f43ecb7ae658fa (diff) | |
Merge "SignalStrengthUpdateRequest#getLiveToken should not be in current.txt"
| -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 |