diff options
| author | Jason parks <jparks@google.com> | 2011-06-28 09:10:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-28 09:10:06 -0700 |
| commit | fadc3974cee6418b87683d05ab34c5dd989bcdf4 (patch) | |
| tree | 8a7141eb16cf734ecae6ad57d034f7e77ce2a3a7 | |
| parent | 8cb0982982af39d2f80a0d94b5e6b2f7bf70bd0d (diff) | |
| parent | 4548cdf3a9131a8bcb13ce6d98dcf4a2feca9988 (diff) | |
| download | packages_apps_settings-fadc3974cee6418b87683d05ab34c5dd989bcdf4.zip packages_apps_settings-fadc3974cee6418b87683d05ab34c5dd989bcdf4.tar.gz packages_apps_settings-fadc3974cee6418b87683d05ab34c5dd989bcdf4.tar.bz2 | |
Merge "Check to see if the power source is a valid charger."
| -rw-r--r-- | src/com/android/settings/CryptKeeperSettings.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java index a9002fa..41a4be5 100644 --- a/src/com/android/settings/CryptKeeperSettings.java +++ b/src/com/android/settings/CryptKeeperSettings.java @@ -63,8 +63,14 @@ public class CryptKeeperSettings extends Fragment { if (action.equals(Intent.ACTION_BATTERY_CHANGED)) { int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0); int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0); + int invalidCharger = intent.getIntExtra(BatteryManager.EXTRA_INVALID_CHARGER, 0); + boolean levelOk = level >= MIN_BATTERY_LEVEL; - boolean pluggedOk = plugged == BatteryManager.BATTERY_PLUGGED_AC; + boolean pluggedOk = + (plugged == BatteryManager.BATTERY_PLUGGED_AC || + plugged == BatteryManager.BATTERY_PLUGGED_USB) && + invalidCharger == 0; + // Update UI elements based on power/battery status mInitiateButton.setEnabled(levelOk && pluggedOk); mPowerWarning.setVisibility(pluggedOk ? View.GONE : View.VISIBLE ); |