SetupWizard: Fix status bar managing workflow

StatusBarManager uses tokens in binder connections to identify
disable records and queue each of them accordingly. New record creates
each time an application connects to StatusBarManager and tries to change
the state. New records don't activate until previous ones are destroyed.
Records can be destroyed either when app binder dies, or when the same
binder ticket reverts its previous changes.
To accomodate this behavior, StatusBarManager was moved to a static class
that initializes first when status bar gets disabled, and then gets destroyed
when status bar is re-enabled.
While we're at it, also fix race condition between main and exit activites
by moving status bar disabling code to the application class.

Change-Id: I3b33e628da1e1881181cbe665e6aaccee3dd19ef

3 files changed, 28 insertions, 33 deletions

diff --git a/src/com/aicp/setupwizard/BaseSetupWizardActivity.java b/src/com/aicp/setupwizard/BaseSetupWizardActivity.java
index 345492d..8c9815c 100644
--- a/src/com/aicp/setupwizard/BaseSetupWizardActivity.java
+++ b/src/com/aicp/setupwizard/BaseSetupWizardActivity.java
@@ -49,7 +49,6 @@ import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewTreeObserver;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
@@ -64,8 +63,7 @@ import com.aicp.setupwizard.util.SetupWizardUtils;
 
 import java.util.List;
 
-public abstract class BaseSetupWizardActivity extends Activity implements NavigationBarListener,
-        ViewTreeObserver.OnPreDrawListener {
+public abstract class BaseSetupWizardActivity extends Activity implements NavigationBarListener {
 
     public static final String TAG = BaseSetupWizardActivity.class.getSimpleName();
 
@@ -81,10 +79,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
     protected static final int BIOMETRIC_ACTIVITY_REQUEST = 10101;
     protected static final int SCREENLOCK_ACTIVITY_REQUEST = 10102;
 
-    private static final int IMMERSIVE_FLAGS = View.STATUS_BAR_DISABLE_HOME
-            | View.STATUS_BAR_DISABLE_RECENT;
-    private int mSystemUiFlags = IMMERSIVE_FLAGS;
-
     private NavigationLayout mNavigationBar;
 
     protected boolean mIsActivityVisible = false;
@@ -120,11 +114,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
         mNavigationBar = getNavigationBar();
         if (mNavigationBar != null) {
             mNavigationBar.setNavigationBarListener(this);
-            mNavigationBar.setSystemUiVisibility(mSystemUiFlags);
-            // Set the UI flags before draw because the visibility might change in unexpected /
-            // undetectable times, like transitioning from a finishing activity that had a keyboard
-            ViewTreeObserver viewTreeObserver = mNavigationBar.getViewTreeObserver();
-            viewTreeObserver.addOnPreDrawListener(this);
         }
     }
 
@@ -219,14 +208,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
         }
     }
 
-    @Override
-    public boolean onPreDraw() {
-        // View.setSystemUiVisibility checks if the visibility changes before applying them
-        // so the performance impact is contained
-        mNavigationBar.setSystemUiVisibility(mSystemUiFlags);
-        return true;
-    }
-
     /**
      * @return The navigation bar instance in the layout, or null if the layout does not have a
      *     navigation bar.
@@ -315,7 +296,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
 
     protected void onSetupStart() {
         SetupWizardUtils.disableCaptivePortalDetection(getApplicationContext());
-        SetupWizardUtils.disableStatusBar(getApplicationContext());
         tryEnablingWifi();
     }
 
diff --git a/src/com/aicp/setupwizard/SetupWizardApp.java b/src/com/aicp/setupwizard/SetupWizardApp.java
index 2b28364..8230450 100644
--- a/src/com/aicp/setupwizard/SetupWizardApp.java
+++ b/src/com/aicp/setupwizard/SetupWizardApp.java
@@ -19,6 +19,7 @@ package com.aicp.setupwizard;
 
 
 import android.app.Application;
+import android.app.StatusBarManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
@@ -67,6 +68,8 @@ public class SetupWizardApp extends Application {
 
     public static final int RADIO_READY_TIMEOUT = 10 * 1000;
 
+    private static StatusBarManager sStatusBarManager;
+
     private boolean mIsRadioReady = false;
     private boolean mIgnoreSimLocale = false;
 
@@ -85,9 +88,14 @@ public class SetupWizardApp extends Application {
         PhoneMonitor.initInstance(this);
         SetupWizardUtils.disableComponentsForMissingFeatures(this);
         SetupWizardUtils.setMobileDataEnabled(this, false);
+        sStatusBarManager = SetupWizardUtils.disableStatusBar(this);
         mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
     }
 
+    public static StatusBarManager getStatusBarManager() {
+        return sStatusBarManager;
+    }
+
     public boolean isRadioReady() {
         return mIsRadioReady;
     }
diff --git a/src/com/aicp/setupwizard/util/SetupWizardUtils.java b/src/com/aicp/setupwizard/util/SetupWizardUtils.java
index ba6af6a..0fec7ad 100644
--- a/src/com/aicp/setupwizard/util/SetupWizardUtils.java
+++ b/src/com/aicp/setupwizard/util/SetupWizardUtils.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,6 @@
 
 package com.aicp.setupwizard.util;
 
-import static android.app.StatusBarManager.DISABLE_NONE;
-import static android.app.StatusBarManager.DISABLE_NOTIFICATION_ALERTS;
-import static android.app.StatusBarManager.DISABLE_SEARCH;
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
 import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
@@ -166,24 +163,34 @@ public class SetupWizardUtils {
         Settings.Global.putInt(context.getContentResolver(), KEY_DETECT_CAPTIVE_PORTAL, 1);
     }
 
-    public static void disableStatusBar(Context context) {
+    public static StatusBarManager disableStatusBar(Context context) {
         StatusBarManager statusBarManager = context.getSystemService(StatusBarManager.class);
         if (statusBarManager != null) {
-            statusBarManager.disable(DISABLE_NOTIFICATION_ALERTS | DISABLE_SEARCH
-            );
+            if (LOGV) {
+                Log.v(SetupWizardApp.TAG, "Disabling status bar");
+            }
+            statusBarManager.setDisabledForSetup(true);
         } else {
             Log.w(SetupWizardApp.TAG,
-                    "Skip disabling notfications - could not get StatusBarManager");
+                    "Skip disabling status bar - could not get StatusBarManager");
         }
+        return statusBarManager;
     }
 
     public static void enableStatusBar(Context context) {
-        StatusBarManager statusBarManager = context.getSystemService(StatusBarManager.class);
+        final SetupWizardApp setupWizardApp = (SetupWizardApp)context.getApplicationContext();
+        StatusBarManager statusBarManager = setupWizardApp.getStatusBarManager();
         if (statusBarManager != null) {
-            Log.i(SetupWizardApp.TAG, "Enabling notfications - StatusBarManager");
-            statusBarManager.disable(DISABLE_NONE);
+            if (LOGV) {
+                Log.v(SetupWizardApp.TAG, "Enabling status bar");
+            }
+            statusBarManager.setDisabledForSetup(false);
+
+            // Session must be destroyed if it's not used anymore
+            statusBarManager = null;
         } else {
-            Log.i(SetupWizardApp.TAG, "Skip enabling notfications - StatusBarManager is null");
+            Log.w(SetupWizardApp.TAG,
+                    "Skip enabling status bar - could not get StatusBarManager");
         }
     }