commit 0aebaf155634133263aa65a148831feb1a0133a0
author Fan Zhang <zhfan@google.com> Mon Aug 01 13:58:57 2016 -0700
committer Fan Zhang <zhfan@google.com> Mon Aug 01 13:58:57 2016 -0700
tree 37272b8e649f0175c9d148fcf41fa73f466211b8
parent b3e657211d8d3e2ed5e43c39c70e1d36bff3f70c

Set correct flag when enabling listener for conditions.

Bug: 30551655

Without this flag Settings app will close whenever listener is
enabled/disabled.

Change-Id: I99102308ada3897cf44917e96015c71b926e5fb5

src/com/android/settings/dashboard/conditional/Condition.java

diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/dashboard/conditional/Condition.java
index 758632e..0454fe8 100644
--- a/src/com/android/settings/dashboard/conditional/Condition.java
+++ b/src/com/android/settings/dashboard/conditional/Condition.java
@@ -23,6 +23,8 @@
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 
+import static android.content.pm.PackageManager.DONT_KILL_APP;
+
 public abstract class Condition {
 
     private static final String KEY_SILENCE = "silence";
@@ -42,7 +44,7 @@
         if (receiverClass != null && shouldAlwaysListenToBroadcast()) {
             PackageManager pm = mManager.getContext().getPackageManager();
             pm.setComponentEnabledSetting(new ComponentName(mManager.getContext(), receiverClass),
-                    PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0 /* flag */);
+                    PackageManager.COMPONENT_ENABLED_STATE_ENABLED, DONT_KILL_APP);
         }
     }
 
@@ -112,7 +114,7 @@
         pm.setComponentEnabledSetting(new ComponentName(mManager.getContext(), clz),
                 silenced ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
                         : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                PackageManager.DONT_KILL_APP);
+                DONT_KILL_APP);
     }
 
     protected Class<?> getReceiverClass() {