diff -ur android-1.5r2/frameworks/base/services/java/com/android/server/BatteryService.java android-1.5r2-dummy-battery/frameworks/base/services/java/com/android/server/BatteryService.java --- android-1.5r2/frameworks/base/services/java/com/android/server/BatteryService.java 2009-07-10 02:05:57.000000000 -0700 +++ android-1.5r2-dummy-battery/frameworks/base/services/java/com/android/server/BatteryService.java 2009-07-10 03:57:51.000000000 -0700 @@ -86,6 +86,7 @@ private static final int DUMP_MAX_LENGTH = 24 * 1024; private static final String[] DUMPSYS_ARGS = new String[] { "-c", "-u" }; private static final String BATTERY_STATS_SERVICE_NAME = "batteryinfo"; + private static final String BATTERY_TECHNOLOGY = "dynamo"; private static final String DUMPSYS_DATA_PATH = "/data/system/"; @@ -125,7 +126,7 @@ mContext = context; mBatteryStats = BatteryStatsService.getService(); - mUEventObserver.startObserving("SUBSYSTEM=power_supply"); + // mUEventObserver.startObserving("SUBSYSTEM=power_supply"); // set initial status update(); @@ -174,7 +175,23 @@ private native void native_update(); private synchronized final void update() { - native_update(); + // native_update(); + + mBatteryLevel = BATTERY_SCALE - CRITICAL_BATTERY_LEVEL; + mBatteryLevelCritical = mBatteryLevel <= CRITICAL_BATTERY_LEVEL; + mPlugType = BatteryManager.BATTERY_PLUGGED_AC; + mDischargeStartTime = 0; + + mBatteryStatus = BatteryManager.BATTERY_STATUS_FULL; + mBatteryHealth = BatteryManager.BATTERY_HEALTH_GOOD; + mBatteryPresent = true; + mBatteryVoltage = 5; + mBatteryTemperature = 30; + mBatteryTechnology = BATTERY_TECHNOLOGY; + sendIntent(); + + return; + /* boolean logOutlier = false; long dischargeDuration = 0; @@ -267,6 +284,7 @@ logOutlier(dischargeDuration); } } + */ } private final void sendIntent() { diff -ur android-1.5r2/frameworks/base/services/java/com/android/server/PowerManagerService.java android-1.5r2-dummy-battery/frameworks/base/services/java/com/android/server/PowerManagerService.java --- android-1.5r2/frameworks/base/services/java/com/android/server/PowerManagerService.java 2009-07-10 02:05:57.000000000 -0700 +++ android-1.5r2-dummy-battery/frameworks/base/services/java/com/android/server/PowerManagerService.java 2009-07-10 03:57:51.000000000 -0700 @@ -350,7 +350,7 @@ Power.setLastUserActivityTimeout(7*24*3600*1000); // one week // assume nothing is on yet - mUserState = mPowerState = 0; + mUserState = mPowerState = SCREEN_BRIGHT; // Add ourself to the Watchdog monitors. Watchdog.getInstance().addMonitor(this); diff -ur android-1.5r2/frameworks/base/services/java/com/android/server/SystemServer.java android-1.5r2-dummy-battery/frameworks/base/services/java/com/android/server/SystemServer.java --- android-1.5r2/frameworks/base/services/java/com/android/server/SystemServer.java 2009-07-10 02:05:57.000000000 -0700 +++ android-1.5r2-dummy-battery/frameworks/base/services/java/com/android/server/SystemServer.java 2009-07-10 03:57:51.000000000 -0700 @@ -329,27 +329,53 @@ false, new AdbSettingsObserver()); // It is now time to start up the app processes... - boolean safeMode = wm.detectSafeMode(); + boolean safeMode = false; + try { + safeMode = wm.detectSafeMode(); + } catch (Exception e) { + Log.e(TAG, "Failure detectSafeMode()", e); + } + if (statusBar != null) { - statusBar.systemReady(); + try { + statusBar.systemReady(); + } catch (Exception e) { + Log.e(TAG, "Failure statusBar.systemReady()", e); + } } if (imm != null) { imm.systemReady(); } - wm.systemReady(); - power.systemReady(); + try { + wm.systemReady(); + } catch (Exception e) { + Log.e(TAG, "Failure wm.systemReady()", e); + } + try { + power.systemReady(); + } catch (Exception e) { + Log.e(TAG, "Failure power.systemReady()", e); + } + try { pm.systemReady(); } catch (RemoteException e) { } + if (appWidget != null) { - appWidget.systemReady(safeMode); + try { + appWidget.systemReady(safeMode); + } catch (Exception e) { + Log.e(TAG, "Failure appWidget.systemReady()", e); + } + } // After making the following code, third party code may be running... try { ActivityManagerNative.getDefault().systemReady(); - } catch (RemoteException e) { + } catch (Exception e) { + Log.e(TAG, "Failure ActivityManagerNative.getDefault().systemReady()", e); } Watchdog.getInstance().start(); diff -ur android-1.5r2/frameworks/policies/base/phone/com/android/internal/policy/impl/PhoneWindowManager.java android-1.5r2-dummy-battery/frameworks/policies/base/phone/com/android/internal/policy/impl/PhoneWindowManager.java --- android-1.5r2/frameworks/policies/base/phone/com/android/internal/policy/impl/PhoneWindowManager.java 2009-07-10 02:06:05.000000000 -0700 +++ android-1.5r2-dummy-battery/frameworks/policies/base/phone/com/android/internal/policy/impl/PhoneWindowManager.java 2009-07-10 03:58:55.000000000 -0700 @@ -491,14 +491,7 @@ } void readLidState() { - try { - int sw = mWindowManager.getSwitchState(0); - if (sw >= 0) { - mLidOpen = sw == 0; - } - } catch (RemoteException e) { - // Ignore - } + mLidOpen = false; } /** {@inheritDoc} */