Merge "SystemUI: Add dock battery icon styles" into cm-10.1

1 files changed, 0 insertions, 80 deletions

diff --git a/services/jni/com_android_server_BatteryService.cpp b/services/jni/com_android_server_BatteryService.cpp
index c6fe620..c7e931e 100644
--- a/services/jni/com_android_server_BatteryService.cpp
+++ b/services/jni/com_android_server_BatteryService.cpp
@@ -50,11 +50,6 @@ struct FieldIds {
     jfieldID mBatteryVoltage;
     jfieldID mBatteryTemperature;
     jfieldID mBatteryTechnology;
-#ifdef HAS_DOCK_BATTERY
-    jfieldID mDockBatteryStatus;
-    jfieldID mDockBatteryLevel;
-    jfieldID mDockBatteryPresent;
-#endif
 };
 static FieldIds gFieldIds;
 
@@ -71,11 +66,6 @@ struct BatteryManagerConstants {
     jint healthOverVoltage;
     jint healthUnspecifiedFailure;
     jint healthCold;
-#ifdef HAS_DOCK_BATTERY
-    jint dockStatusUnknown;
-    jint dockStatusCharging;
-    jint dockStatusNotCharging;
-#endif
 };
 static BatteryManagerConstants gConstants;
 
@@ -90,11 +80,6 @@ struct PowerSupplyPaths {
     char* batteryVoltagePath;
     char* batteryTemperaturePath;
     char* batteryTechnologyPath;
-#ifdef HAS_DOCK_BATTERY
-    char* dockBatteryStatusPath;
-    char* dockBatteryCapacityPath;
-    char* dockBatteryPresentPath;
-#endif
 };
 static PowerSupplyPaths gPaths;
 
@@ -116,21 +101,6 @@ static jint getBatteryStatus(const char* status)
     }
 }
 
-#ifdef HAS_DOCK_BATTERY
-static jint getDockBatteryStatus(const char* status)
-{
-    switch (status[0]) {
-        case 'C': return gConstants.dockStatusCharging;         // Charging
-        case 'N': return gConstants.dockStatusNotCharging;      // Not charging
-
-        default: {
-            ALOGW("Unknown dock battery status '%s'", status);
-            return gConstants.dockStatusUnknown;
-        }
-    }
-}
-#endif
-
 static jint getBatteryHealth(const char* status)
 {
     switch (status[0]) {
@@ -251,26 +221,6 @@ static void android_server_BatteryService_update(JNIEnv* env, jobject obj)
 
     if (readFromFile(gPaths.batteryTechnologyPath, buf, SIZE) > 0)
         env->SetObjectField(obj, gFieldIds.mBatteryTechnology, env->NewStringUTF(buf));
-
-#ifdef HAS_DOCK_BATTERY
-    jboolean present = false;
-    if (readFromFile(gPaths.dockBatteryPresentPath, buf, SIZE) >= 15) {
-        // should return "dock detect = 1"
-        if (buf[14] == '1') {
-            present = true;
-        }
-    }
-    env->SetBooleanField(obj, gFieldIds.mDockBatteryPresent, present);
-
-    setIntField(env, obj, gPaths.dockBatteryCapacityPath, gFieldIds.mDockBatteryLevel);
-
-    if (readFromFile(gPaths.dockBatteryStatusPath, buf, SIZE) > 0)
-        env->SetIntField(obj, gFieldIds.mDockBatteryStatus,
-                         getDockBatteryStatus(buf));
-    else
-        env->SetIntField(obj, gFieldIds.mDockBatteryStatus,
-                         gConstants.dockStatusUnknown);
-#endif
 }
 
 static JNINativeMethod sMethods[] = {
@@ -356,19 +306,6 @@ int register_android_server_BatteryService(JNIEnv* env)
                     if (access(path, R_OK) == 0)
                         gPaths.batteryTechnologyPath = strdup(path);
                 }
-#ifdef HAS_DOCK_BATTERY
-                else if(strcmp(buf, "DockBattery") == 0) {
-                    snprintf(path, sizeof(path), "%s/%s/status", POWER_SUPPLY_PATH, name);
-                    if (access(path, R_OK) == 0)
-                        gPaths.dockBatteryStatusPath = strdup(path);
-                    snprintf(path, sizeof(path), "%s/%s/capacity", POWER_SUPPLY_PATH, name);
-                    if (access(path, R_OK) == 0)
-                        gPaths.dockBatteryCapacityPath = strdup(path);
-                    snprintf(path, sizeof(path), "%s/%s/device/ec_dock", POWER_SUPPLY_PATH, name);
-                    if (access(path, R_OK) == 0)
-                        gPaths.dockBatteryPresentPath = strdup(path);
-                }
-#endif
             }
         }
         closedir(dir);
@@ -413,12 +350,6 @@ int register_android_server_BatteryService(JNIEnv* env)
     gFieldIds.mBatteryVoltage = env->GetFieldID(clazz, "mBatteryVoltage", "I");
     gFieldIds.mBatteryTemperature = env->GetFieldID(clazz, "mBatteryTemperature", "I");
 
-#ifdef HAS_DOCK_BATTERY
-    gFieldIds.mDockBatteryStatus = env->GetFieldID(clazz, "mDockBatteryStatus", "I");
-    gFieldIds.mDockBatteryLevel = env->GetFieldID(clazz, "mDockBatteryLevel", "I");
-    gFieldIds.mDockBatteryPresent = env->GetFieldID(clazz, "mDockBatteryPresent", "Z");
-#endif
-
     LOG_FATAL_IF(gFieldIds.mAcOnline == NULL, "Unable to find BatteryService.AC_ONLINE_PATH");
     LOG_FATAL_IF(gFieldIds.mUsbOnline == NULL, "Unable to find BatteryService.USB_ONLINE_PATH");
     LOG_FATAL_IF(gFieldIds.mWirelessOnline == NULL, "Unable to find BatteryService.WIRELESS_ONLINE_PATH");
@@ -473,17 +404,6 @@ int register_android_server_BatteryService(JNIEnv* env)
     gConstants.healthCold = env->GetStaticIntField(clazz,
             env->GetStaticFieldID(clazz, "BATTERY_HEALTH_COLD", "I"));
 
-#ifdef HAS_DOCK_BATTERY
-    gConstants.dockStatusUnknown = env->GetStaticIntField(clazz,
-            env->GetStaticFieldID(clazz, "DOCK_BATTERY_STATUS_UNKNOWN", "I"));
-
-    gConstants.dockStatusCharging = env->GetStaticIntField(clazz,
-            env->GetStaticFieldID(clazz, "DOCK_BATTERY_STATUS_CHARGING", "I"));
-
-    gConstants.dockStatusNotCharging = env->GetStaticIntField(clazz,
-            env->GetStaticFieldID(clazz, "DOCK_BATTERY_STATUS_NOT_CHARGING", "I"));
-#endif
-
     return jniRegisterNativeMethods(env, "com/android/server/BatteryService", sMethods, NELEM(sMethods));
 }