Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96483f31 authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Make get/setSystemThresholdReportingRequestedWhileIdle @SystemApi" am:...

Merge "Make get/setSystemThresholdReportingRequestedWhileIdle @SystemApi" am: 1f8d32dc am: 356872f8 am: 254a335d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1884688

Change-Id: I69a299273afeae5a1081f070c61aaf7dbc93eede
parents 4dde6487 254a335d
Loading
Loading
Loading
Loading
+8 −0
Original line number Original line Diff line number Diff line
@@ -11746,6 +11746,14 @@ package android.telephony {
    field public static final int ROAMING_TYPE_UNKNOWN = 1; // 0x1
    field public static final int ROAMING_TYPE_UNKNOWN = 1; // 0x1
  }
  }
  public final class SignalStrengthUpdateRequest implements android.os.Parcelable {
    method public boolean isSystemThresholdReportingRequestedWhileIdle();
  }
  public static final class SignalStrengthUpdateRequest.Builder {
    method @NonNull @RequiresPermission("android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH") public android.telephony.SignalStrengthUpdateRequest.Builder setSystemThresholdReportingRequestedWhileIdle(boolean);
  }
  public final class SmsCbCmasInfo implements android.os.Parcelable {
  public final class SmsCbCmasInfo implements android.os.Parcelable {
    ctor public SmsCbCmasInfo(int, int, int, int, int, int);
    ctor public SmsCbCmasInfo(int, int, int, int, int, int);
    method public int describeContents();
    method public int describeContents();
+7 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package android.telephony;
import android.annotation.NonNull;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.os.Binder;
import android.os.Binder;
import android.os.IBinder;
import android.os.IBinder;
import android.os.Parcel;
import android.os.Parcel;
@@ -130,7 +131,10 @@ public final class SignalStrengthUpdateRequest implements Parcelable {
        /**
        /**
         * Set the builder object if require reporting on the system thresholds when device is idle.
         * Set the builder object if require reporting on the system thresholds when device is idle.
         *
         *
         * <p>This can only used by the system caller. Requires permission
         * <p>This is intended to be used by the system privileged caller only. When setting to
         * {@code true}, signal strength update request through
         * {@link TelephonyManager#setSignalStrengthUpdateRequest(SignalStrengthUpdateRequest)}
         * will require permission
         * {@link android.Manifest.permission#LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH}.
         * {@link android.Manifest.permission#LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH}.
         *
         *
         * @param isSystemThresholdReportingRequestedWhileIdle true if request reporting on the
         * @param isSystemThresholdReportingRequestedWhileIdle true if request reporting on the
@@ -138,6 +142,7 @@ public final class SignalStrengthUpdateRequest implements Parcelable {
         * @return the builder to facilitate the chaining
         * @return the builder to facilitate the chaining
         * @hide
         * @hide
         */
         */
        @SystemApi
        @RequiresPermission(android.Manifest.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH)
        @RequiresPermission(android.Manifest.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH)
        public @NonNull Builder setSystemThresholdReportingRequestedWhileIdle(
        public @NonNull Builder setSystemThresholdReportingRequestedWhileIdle(
                boolean isSystemThresholdReportingRequestedWhileIdle) {
                boolean isSystemThresholdReportingRequestedWhileIdle) {
@@ -191,6 +196,7 @@ public final class SignalStrengthUpdateRequest implements Parcelable {
     *
     *
     * @hide
     * @hide
     */
     */
    @SystemApi
    public boolean isSystemThresholdReportingRequestedWhileIdle() {
    public boolean isSystemThresholdReportingRequestedWhileIdle() {
        return mIsSystemThresholdReportingRequestedWhileIdle;
        return mIsSystemThresholdReportingRequestedWhileIdle;
    }
    }