resolved conflicts for merge of c2894474 to gingerbread-plus-aosp (89fbcd72) · Commits · e / os / android_frameworks_base

api/current.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -124474,6 +124474,17 @@
		visibility="public"
		>
		</constructor>
		<field name="BATTERY_HEALTH_COLD"
		type="int"
		transient="false"
		volatile="false"
		value="7"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="BATTERY_HEALTH_DEAD"
		type="int"
		transient="false"

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ public class BatteryManager {
		public static final int BATTERY_HEALTH_DEAD = 4;
		public static final int BATTERY_HEALTH_OVER_VOLTAGE = 5;
		public static final int BATTERY_HEALTH_UNSPECIFIED_FAILURE = 6;
		public static final int BATTERY_HEALTH_COLD = 7;

		// values of the "plugged" field in the ACTION_BATTERY_CHANGED intent.
		// These must be powers of 2.

+5 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ struct BatteryManagerConstants {
		jint healthDead;
		jint healthOverVoltage;
		jint healthUnspecifiedFailure;
		jint healthCold;
		};
		static BatteryManagerConstants gConstants;

		@@ -104,6 +105,7 @@ static jint getBatteryStatus(const char* status)
		static jint getBatteryHealth(const char* status)
		{
		switch (status[0]) {
		case 'C': return gConstants.healthCold; // Cold
		case 'D': return gConstants.healthDead; // Dead
		case 'G': return gConstants.healthGood; // Good
		case 'O': {
		@@ -390,6 +392,9 @@ int register_android_server_BatteryService(JNIEnv* env)
		gConstants.healthUnspecifiedFailure = env->GetStaticIntField(clazz,
		env->GetStaticFieldID(clazz, "BATTERY_HEALTH_UNSPECIFIED_FAILURE", "I"));

		gConstants.healthCold = env->GetStaticIntField(clazz,
		env->GetStaticFieldID(clazz, "BATTERY_HEALTH_COLD", "I"));

		return jniRegisterNativeMethods(env, "com/android/server/BatteryService", sMethods, NELEM(sMethods));
		}