OSDN Git Service

Set correct flag when enabling listener for conditions.
authorFan Zhang <zhfan@google.com>
Mon, 1 Aug 2016 20:58:57 +0000 (13:58 -0700)
committerFan Zhang <zhfan@google.com>
Mon, 1 Aug 2016 20:58:57 +0000 (13:58 -0700)
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

index 758632e..0454fe8 100644 (file)
@@ -23,6 +23,8 @@ import android.os.PersistableBundle;
 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 @@ public abstract class Condition {
         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 @@ public abstract class Condition {
         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() {