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

Browse Source 
am: ba2f3ee3ba

Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1
This commit is contained in:
Doris Ling
2017-05-10 01:45:17 +00:00
committed by android-build-merger
parent ec6cfe32fd ba2f3ee3ba
commit ce5e0c3dc6
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;
}
}
}