base: properly check that quickboot is enabled

Change-Id: I0c9e54ee2cdf4efb5097cd101a0fa274f493d816 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Mahdi-Rom · Jun 22, 2014 · a55a1a7 · a55a1a7
1 parent a31ff00
commit a55a1a7
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java
@@ -328,27 +328,28 @@ public boolean showBeforeProvisioning() {
         final ContentResolver cr = mContext.getContentResolver();
         mItems = new ArrayList<Action>();
 
-        int quickbootAvailable = 1;
-        final PackageManager pm = mContext.getPackageManager();
-        try {
-            pm.getPackageInfo("com.qapp.quickboot", PackageManager.GET_META_DATA);
-        } catch (NameNotFoundException e) {
-            quickbootAvailable = 0;
-        }
-
-        final boolean quickbootEnabled = Settings.Global.getInt(
-                mContext.getContentResolver(), Settings.Global.ENABLE_QUICKBOOT,
-                quickbootAvailable) == 1;
-
         // first: power off
         mItems.add(
             new SinglePressAction(
                     com.android.internal.R.drawable.ic_lock_power_off,
                     R.string.global_action_power_off) {
 
                 public void onPress() {
+                    // Check quickboot status
+                    boolean quickbootAvailable = false;
+                    final PackageManager pm = mContext.getPackageManager();
+                    try {
+                        pm.getPackageInfo("com.qapp.quickboot", PackageManager.GET_META_DATA);
+                        quickbootAvailable = true;
+                    } catch (NameNotFoundException e) {
+                        // Ignore
+                    }
+                    final boolean quickbootEnabled = Settings.Global.getInt(
+                            mContext.getContentResolver(), Settings.Global.ENABLE_QUICKBOOT,
+                            1) == 1;
+
                     // goto quickboot mode
-                    if (quickbootEnabled) {
+                    if (quickbootAvailable && quickbootEnabled) {
                         startQuickBoot();
                         return;
                     }