diff options
| author | 2018-11-16 13:53:32 -0800 | |
|---|---|---|
| committer | 2018-11-16 13:53:32 -0800 | |
| commit | 757048b72f526be5ab3371cd25f3d87de3e64545 (patch) | |
| tree | c1ff0736a29c65be4390d5d2f243e21244d6409a | |
| parent | faa155d5d3f2d590234a3741523ae04dfc58f9ad (diff) | |
| parent | 6a759eb64621bd21093fc3a0e8c17d59c86eb714 (diff) | |
Merge "Redirect Value Source of SignalStrength Constants" am: d1db62d59e am: a7381e9af0
am: 6a759eb646
Change-Id: I6a222e0371e973f0f98419e15e6c4b38aff7409c
| -rw-r--r-- | telephony/java/android/telephony/CellSignalStrength.java | 15 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SignalStrength.java | 32 |
2 files changed, 26 insertions, 21 deletions
diff --git a/telephony/java/android/telephony/CellSignalStrength.java b/telephony/java/android/telephony/CellSignalStrength.java index 6090d5c7b555..fd21d42b1e9b 100644 --- a/telephony/java/android/telephony/CellSignalStrength.java +++ b/telephony/java/android/telephony/CellSignalStrength.java @@ -21,15 +21,20 @@ package android.telephony; */ public abstract class CellSignalStrength { - public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0; + public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = + TelephonyProtoEnums.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; // 0 - public static final int SIGNAL_STRENGTH_POOR = 1; + public static final int SIGNAL_STRENGTH_POOR = + TelephonyProtoEnums.SIGNAL_STRENGTH_POOR; // 1 - public static final int SIGNAL_STRENGTH_MODERATE = 2; + public static final int SIGNAL_STRENGTH_MODERATE = + TelephonyProtoEnums.SIGNAL_STRENGTH_MODERATE; // 2 - public static final int SIGNAL_STRENGTH_GOOD = 3; + public static final int SIGNAL_STRENGTH_GOOD = + TelephonyProtoEnums.SIGNAL_STRENGTH_GOOD; // 3 - public static final int SIGNAL_STRENGTH_GREAT = 4; + public static final int SIGNAL_STRENGTH_GREAT = + TelephonyProtoEnums.SIGNAL_STRENGTH_GREAT; // 4 /** @hide */ public static final int NUM_SIGNAL_STRENGTH_BINS = 5; diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java index bc832c3fbfa5..240b8a981e70 100644 --- a/telephony/java/android/telephony/SignalStrength.java +++ b/telephony/java/android/telephony/SignalStrength.java @@ -17,12 +17,12 @@ package android.telephony; import android.annotation.UnsupportedAppUsage; +import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; import android.telephony.CarrierConfigManager; import android.util.Log; -import android.content.res.Resources; import java.util.ArrayList; import java.util.Arrays; @@ -37,25 +37,25 @@ public class SignalStrength implements Parcelable { private static final boolean DBG = false; /** @hide */ - @UnsupportedAppUsage - public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN - = TelephonyProtoEnums.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; // = 0 + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = + CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; // = 0 /** @hide */ - @UnsupportedAppUsage - public static final int SIGNAL_STRENGTH_POOR - = TelephonyProtoEnums.SIGNAL_STRENGTH_POOR; // = 1 + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public static final int SIGNAL_STRENGTH_POOR = + CellSignalStrength.SIGNAL_STRENGTH_POOR; // = 1 /** @hide */ - @UnsupportedAppUsage - public static final int SIGNAL_STRENGTH_MODERATE - = TelephonyProtoEnums.SIGNAL_STRENGTH_MODERATE; // = 2 + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public static final int SIGNAL_STRENGTH_MODERATE = + CellSignalStrength.SIGNAL_STRENGTH_MODERATE; // = 2 /** @hide */ - @UnsupportedAppUsage - public static final int SIGNAL_STRENGTH_GOOD - = TelephonyProtoEnums.SIGNAL_STRENGTH_GOOD; // = 3 + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public static final int SIGNAL_STRENGTH_GOOD = + CellSignalStrength.SIGNAL_STRENGTH_GOOD; // = 3 /** @hide */ - @UnsupportedAppUsage - public static final int SIGNAL_STRENGTH_GREAT - = TelephonyProtoEnums.SIGNAL_STRENGTH_GREAT; // = 4 + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P) + public static final int SIGNAL_STRENGTH_GREAT = + CellSignalStrength.SIGNAL_STRENGTH_GREAT; // = 4 /** @hide */ @UnsupportedAppUsage public static final int NUM_SIGNAL_STRENGTH_BINS = 5; |