diff options
| -rw-r--r-- | libs/utils/BackupData.cpp | 15 | ||||
| -rw-r--r-- | services/java/com/android/server/BatteryService.java | 6 |
2 files changed, 19 insertions, 2 deletions
diff --git a/libs/utils/BackupData.cpp b/libs/utils/BackupData.cpp index be04777528ea..c51d989b4c50 100644 --- a/libs/utils/BackupData.cpp +++ b/libs/utils/BackupData.cpp @@ -196,6 +196,7 @@ BackupDataReader::Status() } else { \ m_status = errno; \ } \ + LOGD("CHECK_SIZE failed with at line %d m_status='%s'", __LINE__, strerror(m_status)); \ return m_status; \ } \ } while(0) @@ -203,6 +204,7 @@ BackupDataReader::Status() do { \ status_t err = skip_padding(); \ if (err != NO_ERROR) { \ + LOGD("SKIP_PADDING FAILED at line %d", __LINE__); \ m_status = err; \ return err; \ } \ @@ -218,10 +220,19 @@ BackupDataReader::ReadNextHeader(bool* done, int* type) int amt; - // No error checking here, in case we're at the end of the stream. Just let read() fail. - skip_padding(); + amt = skip_padding(); + if (amt == EIO) { + *done = true; + return NO_ERROR; + } + else if (amt != NO_ERROR) { + return amt; + } amt = read(m_fd, &m_header, sizeof(m_header)); *done = m_done = (amt == 0); + if (*done) { + return NO_ERROR; + } CHECK_SIZE(amt, sizeof(m_header)); m_pos += sizeof(m_header); if (type) { diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java index a682fcb444ba..45c1e5ca4a8c 100644 --- a/services/java/com/android/server/BatteryService.java +++ b/services/java/com/android/server/BatteryService.java @@ -44,6 +44,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; +import com.android.internal.app.ShutdownThread; /** @@ -182,6 +183,11 @@ class BatteryService extends Binder { boolean logOutlier = false; long dischargeDuration = 0; + + // shut down gracefully if our battery is critically low and we are not powered + if (mBatteryLevel == 0 && isPowered(0xffffffff)) { + ShutdownThread.shutdown(mContext, false); + } mBatteryLevelCritical = mBatteryLevel <= CRITICAL_BATTERY_LEVEL; if (mAcOnline) { |