commit ca12899ce7972b83799fff49c265be2cc30d6b92
author Tony Wickham <twickham@google.com> Wed Apr 18 17:12:06 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 18 17:12:06 2018 +0000
tree 455fc9b5efdfa3f1ba29cb5cf212ba1ec7fc0a63
parent 67b7fabbb839878f9717234bceb4ce0f9b9fc825
parent b48ca51e434111665f718883e648d86900d6a86b

Merge changes from topic "am-ba0d2ef2-dcc6-410d-b951-94125ac33b2c" into ub-launcher3-master

* changes:
  [automerger] Make sure notification listener stays unbound on reboot when badging disabled am: 7aa922c912
  Make sure notification listener stays unbound on reboot when badging disabled

src/com/android/launcher3/BaseActivity.java

diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java
index f197921..a41edc0 100644
--- a/src/com/android/launcher3/BaseActivity.java
+++ b/src/com/android/launcher3/BaseActivity.java
@@ -144,7 +144,7 @@
 
     @Override
     protected void onStop() {
-        mActivityFlags &= ~ACTIVITY_STATE_STARTED;
+        mActivityFlags &= ~ACTIVITY_STATE_STARTED & ~ACTIVITY_STATE_USER_ACTIVE;
         mForceInvisible = 0;
         super.onStop();
     }