PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8d028a87: Allow wireless charging during encrypt

Browse Source 
* commit '8d028a87e97f9420f9db31a6b8aa80859fe393b3':
  Allow wireless charging during encrypt
This commit is contained in:
Vikram Aggarwal
2012-10-29 15:14:23 -07:00
committed by Android Git Automerger
parent 910fe0479a 8d028a87e9
commit ee2840231c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/CryptKeeperSettings.java
View File

@@ -61,14 +61,14 @@ public class CryptKeeperSettings extends Fragment {
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();
if (action.equals(Intent.ACTION_BATTERY_CHANGED)) { if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0); final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0); final int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
int invalidCharger = intent.getIntExtra(BatteryManager.EXTRA_INVALID_CHARGER, 0); final int invalidCharger = intent.getIntExtra(
BatteryManager.EXTRA_INVALID_CHARGER, 0);
boolean levelOk = level >= MIN_BATTERY_LEVEL; final boolean levelOk = level >= MIN_BATTERY_LEVEL;
boolean pluggedOk = final boolean pluggedOk =
(plugged == BatteryManager.BATTERY_PLUGGED_AC || ((plugged & BatteryManager.BATTERY_PLUGGED_ANY) != 0) &&
plugged == BatteryManager.BATTERY_PLUGGED_USB) &&
invalidCharger == 0; invalidCharger == 0;
// Update UI elements based on power/battery status // Update UI elements based on power/battery status
@@ -204,4 +204,3 @@ public class CryptKeeperSettings extends Fragment {
((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference); ((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference);
} }
} }