am becddea6: Merge "Unhide signal strength constants used by getLevel." into mnc-dev (766f3108) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30690,6 +30690,11 @@ package android.telephony {
	method public abstract int getDbm();		method public abstract int getDbm();
	method public abstract int getLevel();		method public abstract int getLevel();
	method public abstract int hashCode();		method public abstract int hashCode();
			field public static final int SIGNAL_STRENGTH_GOOD = 3; // 0x3
			field public static final int SIGNAL_STRENGTH_GREAT = 4; // 0x4
			field public static final int SIGNAL_STRENGTH_MODERATE = 2; // 0x2
			field public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0; // 0x0
			field public static final int SIGNAL_STRENGTH_POOR = 1; // 0x1
	}		}

	public final class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {		public final class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32922,6 +32922,11 @@ package android.telephony {
	method public abstract int getDbm();		method public abstract int getDbm();
	method public abstract int getLevel();		method public abstract int getLevel();
	method public abstract int hashCode();		method public abstract int hashCode();
			field public static final int SIGNAL_STRENGTH_GOOD = 3; // 0x3
			field public static final int SIGNAL_STRENGTH_GREAT = 4; // 0x4
			field public static final int SIGNAL_STRENGTH_MODERATE = 2; // 0x2
			field public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0; // 0x0
			field public static final int SIGNAL_STRENGTH_POOR = 1; // 0x1
	}		}

	public final class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {		public final class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {

+12 −5

Original line number	Original line	Diff line number	Diff line
	@@ -21,18 +21,19 @@ package android.telephony;
	*/		*/
	public abstract class CellSignalStrength {		public abstract class CellSignalStrength {

	/** @hide */
	public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0;		public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0;
	/** @hide */
	public static final int SIGNAL_STRENGTH_POOR = 1;		public static final int SIGNAL_STRENGTH_POOR = 1;
	/** @hide */
	public static final int SIGNAL_STRENGTH_MODERATE = 2;		public static final int SIGNAL_STRENGTH_MODERATE = 2;
	/** @hide */
	public static final int SIGNAL_STRENGTH_GOOD = 3;		public static final int SIGNAL_STRENGTH_GOOD = 3;
	/** @hide */
	public static final int SIGNAL_STRENGTH_GREAT = 4;		public static final int SIGNAL_STRENGTH_GREAT = 4;

	/** @hide */		/** @hide */
	public static final int NUM_SIGNAL_STRENGTH_BINS = 5;		public static final int NUM_SIGNAL_STRENGTH_BINS = 5;

	/** @hide */		/** @hide */
	public static final String[] SIGNAL_STRENGTH_NAMES = {		public static final String[] SIGNAL_STRENGTH_NAMES = {
	"none", "poor", "moderate", "good", "great"		"none", "poor", "moderate", "good", "great"
	@@ -47,6 +48,12 @@ public abstract class CellSignalStrength {

	/**		/**
	* Get signal level as an int from 0..4		* Get signal level as an int from 0..4
			* <p>
			* @see SIGNAL_STRENGTH_NONE_OR_UNKNOWN
			* @see SIGNAL_STRENGTH_POOR
			* @see SIGNAL_STRENGTH_MODERATE
			* @see SIGNAL_STRENGTH_GOOD
			* @see SIGNAL_STRENGTH_GREAT
	*/		*/
	public abstract int getLevel();		public abstract int getLevel();