Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Redirect Value Source of SignalStrength Constants" am: d1db62d59e

Browse Source 
am: a7381e9af0

Change-Id: I2b909a24dc2bfe49379a6899c3f7c29cb1d20f78
This commit is contained in:
Nathan Harold
2018-11-16 12:47:54 -08:00
committed by android-build-merger
parent 661f548304 a7381e9af0
commit 6a759eb646
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/android/telephony/CellSignalStrength.java
View File

@@ -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;

32
telephony/java/android/telephony/SignalStrength.java
View File

@@ -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;