am 2f11599e: Merge change 1579 into donut (ad8195bb) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+19 −3

Original line number	Diff line number	Diff line
		@@ -2085,14 +2085,30 @@ public final class Settings {
		public static final String CURRENT_ACTIVE_PHONE = "current_active_phone";

		/**
		* The preferred network mode 7 = Global, CDMA default
		* 4 = CDMA only
		* 3 = GSM/UMTS only
		* The preferred network mode 7 = Global
		* 6 = EvDo only
		* 5 = CDMA w/o EvDo
		* 4 = CDMA / EvDo auto
		* 3 = GSM / WCDMA auto
		* 2 = WCDMA only
		* 1 = GSM only
		* 0 = GSM / WCDMA preferred
		* @hide
		*/
		public static final String PREFERRED_NETWORK_MODE =
		"preferred_network_mode";

		/**
		* The preferred TTY mode 0 = TTy Off, CDMA default
		* 1 = TTY Full
		* 2 = TTY HCO
		* 3 = TTY VCO
		* @hide
		*/
		public static final String PREFERRED_TTY_MODE =
		"preferred_tty_mode";


		/**
		* CDMA Cell Broadcast SMS
		* 0 = CDMA Cell Broadcast SMS disabled

core/java/android/webkit/gears/AndroidRadioDataProvider.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ package android.webkit.gears;
		import android.content.Context;
		import android.telephony.CellLocation;
		import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		import android.telephony.gsm.GsmCellLocation;
		import android.telephony.PhoneStateListener;
		import android.telephony.TelephonyManager;
		@@ -54,6 +55,7 @@ public final class AndroidRadioDataProvider extends PhoneStateListener {
		public static final class RadioData {
		public int cellId = -1;
		public int locationAreaCode = -1;
		// TODO: use new SignalStrength instead of asu
		public int signalStrength = -1;
		public int mobileCountryCode = -1;
		public int mobileNetworkCode = -1;
		@@ -179,6 +181,7 @@ public final class AndroidRadioDataProvider extends PhoneStateListener {
		private CellLocation cellLocation = null;

		/** The last known signal strength */
		// TODO: use new SignalStrength instead of asu
		private int signalStrength = -1;

		/** The last known serviceState */
		@@ -207,7 +210,7 @@ public final class AndroidRadioDataProvider extends PhoneStateListener {
		// Register for cell id, signal strength and service state changed
		// notifications.
		telephonyManager.listen(this, PhoneStateListener.LISTEN_CELL_LOCATION
		\| PhoneStateListener.LISTEN_SIGNAL_STRENGTH
		\| PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
		\| PhoneStateListener.LISTEN_SERVICE_STATE);
		}

		@@ -226,8 +229,9 @@ public final class AndroidRadioDataProvider extends PhoneStateListener {
		}

		@Override
		public void onSignalStrengthChanged(int asu) {
		signalStrength = asu;
		public void onSignalStrengthsChanged(SignalStrength ss) {
		int gsmSignalStrength = ss.getGsmSignalStrength();
		signalStrength = (gsmSignalStrength == 99 ? -1 : gsmSignalStrength);
		notifyListeners();
		}

core/java/com/android/internal/app/IBatteryStats.aidl

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ package com.android.internal.app;

		import com.android.internal.os.BatteryStatsImpl;

		import android.telephony.SignalStrength;

		interface IBatteryStats {
		byte[] getStatistics();
		void noteStartWakelock(int uid, String name, int type);
		@@ -33,7 +35,7 @@ interface IBatteryStats {
		void noteUserActivity(int uid, int event);
		void notePhoneOn();
		void notePhoneOff();
		void notePhoneSignalStrength(int asu);
		void notePhoneSignalStrength(in SignalStrength signalStrength);
		void notePhoneDataConnectionState(int dataType, boolean hasData);
		void noteWifiOn(int uid);
		void noteWifiOff(int uid);

core/java/com/android/internal/os/BatteryStatsImpl.java

+18 −6

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.os.ParcelFormatException;
		import android.os.Parcelable;
		import android.os.Process;
		import android.os.SystemClock;
		import android.telephony.SignalStrength;
		import android.telephony.TelephonyManager;
		import android.util.Log;
		import android.util.PrintWriterPrinter;
		@@ -982,14 +983,25 @@ public final class BatteryStatsImpl extends BatteryStats {
		}
		}

		public void notePhoneSignalStrengthLocked(int asu) {
		public void notePhoneSignalStrengthLocked(SignalStrength signalStrength) {
		// Bin the strength.
		int bin;

		if (!signalStrength.isGsm()) {
		int dBm = signalStrength.getCdmaDbm();
		if (dBm >= -75) bin = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
		else if (dBm >= -85) bin = SIGNAL_STRENGTH_GREAT;
		else if (dBm >= -95) bin = SIGNAL_STRENGTH_GOOD;
		else if (dBm >= -100) bin = SIGNAL_STRENGTH_MODERATE;
		else bin = SIGNAL_STRENGTH_POOR;
		} else {
		int asu = signalStrength.getGsmSignalStrength();
		if (asu < 0 \|\| asu >= 99) bin = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
		else if (asu >= 16) bin = SIGNAL_STRENGTH_GREAT;
		else if (asu >= 8) bin = SIGNAL_STRENGTH_GOOD;
		else if (asu >= 4) bin = SIGNAL_STRENGTH_MODERATE;
		else bin = SIGNAL_STRENGTH_POOR;
		}
		if (mPhoneSignalStrengthBin != bin) {
		if (mPhoneSignalStrengthBin >= 0) {
		mPhoneSignalStrengthsTimer[mPhoneSignalStrengthBin].stopRunningLocked(this);

core/res/res/drawable/stat_ecb_mode.png

0 → 100644

+625 B

Loading image diff...