PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set correct flag when enabling listener for conditions.

Browse Source 
Bug: 30551655

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

Change-Id: I99102308ada3897cf44917e96015c71b926e5fb5
This commit is contained in:
Fan Zhang
2016-08-01 13:58:57 -07:00
parent b3e657211d
commit 0aebaf1556
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/dashboard/conditional/Condition.java
View File

@@ -23,6 +23,8 @@ import android.os.PersistableBundle;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import static android.content.pm.PackageManager.DONT_KILL_APP;
public abstract class Condition { public abstract class Condition {
private static final String KEY_SILENCE = "silence"; private static final String KEY_SILENCE = "silence";
@@ -42,7 +44,7 @@ public abstract class Condition {
if (receiverClass != null && shouldAlwaysListenToBroadcast()) { if (receiverClass != null && shouldAlwaysListenToBroadcast()) {
PackageManager pm = mManager.getContext().getPackageManager(); PackageManager pm = mManager.getContext().getPackageManager();
pm.setComponentEnabledSetting(new ComponentName(mManager.getContext(), receiverClass), 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), pm.setComponentEnabledSetting(new ComponentName(mManager.getContext(), clz),
silenced ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED silenced ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DISABLED, : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP); DONT_KILL_APP);
} }
protected Class<?> getReceiverClass() { protected Class<?> getReceiverClass() {