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

Merge "Fix crash when silencing condition." into oc-dev am: ba2f3ee3ba

Browse Source 
am: ce5e0c3dc6

Change-Id: I9e5c4f0f9f8ee4cdced52bf1f9d79b28912bb154
This commit is contained in:
Doris Ling
2017-05-10 03:18:21 +00:00
committed by android-build-merger
parent 95e60e9816 ce5e0c3dc6
commit f4cd59a5b1
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ public abstract class Condition {
protected final ConditionManager mManager;
protected final MetricsFeatureProvider mMetricsFeatureProvider;
protected boolean mReceiverRegistered;
private boolean mIsSilenced;
private boolean mIsActive;
@@ -110,9 +111,15 @@ public abstract class Condition {
return;
}
if (silenced) {
mManager.getContext().registerReceiver(receiver, getIntentFilter());
if (!mReceiverRegistered) {
mManager.getContext().registerReceiver(receiver, getIntentFilter());
mReceiverRegistered = true;
}
} else {
mManager.getContext().unregisterReceiver(receiver);
if (mReceiverRegistered) {
mManager.getContext().unregisterReceiver(receiver);
mReceiverRegistered = false;
}
}
}