From 8d028a87e97f9420f9db31a6b8aa80859fe393b3 Mon Sep 17 00:00:00 2001 From: Vikram Aggarwal Date: Mon, 29 Oct 2012 11:00:01 -0700 Subject: [PATCH] Allow wireless charging during encrypt Bug: 7426476 Cant Encrypt mako device using Charging pad as charging source Change-Id: I6584a9e7a1533e06f0b0d55c1afd42641ee7ac3d --- src/com/android/settings/CryptKeeperSettings.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java index d0043e6e3f8..58d97a82f71 100644 --- a/src/com/android/settings/CryptKeeperSettings.java +++ b/src/com/android/settings/CryptKeeperSettings.java @@ -61,14 +61,14 @@ public class CryptKeeperSettings extends Fragment { public void onReceive(Context context, Intent intent) { String action = intent.getAction(); 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); + final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0); + final int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0); + final int invalidCharger = intent.getIntExtra( + BatteryManager.EXTRA_INVALID_CHARGER, 0); - boolean levelOk = level >= MIN_BATTERY_LEVEL; - boolean pluggedOk = - (plugged == BatteryManager.BATTERY_PLUGGED_AC || - plugged == BatteryManager.BATTERY_PLUGGED_USB) && + final boolean levelOk = level >= MIN_BATTERY_LEVEL; + final boolean pluggedOk = + ((plugged & BatteryManager.BATTERY_PLUGGED_ANY) != 0) && invalidCharger == 0; // Update UI elements based on power/battery status @@ -204,4 +204,3 @@ public class CryptKeeperSettings extends Fragment { ((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference); } } -