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
This commit is contained in:
TreeHugger Robot
2017-05-10 01:40:34 +00:00
committed by Android (Google) Code Review
parent 120ec5d1eb b72163b9d0
commit ba2f3ee3ba
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

19
tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
View File

@@ -29,11 +29,14 @@ import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.RuntimeEnvironment;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -45,14 +48,14 @@ public class ConditionTest {
private ConditionManager mConditionManager; private ConditionManager mConditionManager;
@Mock @Mock
private MetricsFeatureProvider mMetricsFeatureProvider; private MetricsFeatureProvider mMetricsFeatureProvider;
@Mock
private Context mContext;
private Context mContext;
private TestCondition mCondition; private TestCondition mCondition;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mCondition = new TestCondition(mConditionManager, mMetricsFeatureProvider); mCondition = new TestCondition(mConditionManager, mMetricsFeatureProvider);
when(mConditionManager.getContext()).thenReturn(mContext); when(mConditionManager.getContext()).thenReturn(mContext);
} }
@@ -82,12 +85,22 @@ public class ConditionTest {
} }
@Test @Test
public void onSilenceChanged_notSilenced_shouldUnregisterReceiver() { public void onSilenceChanged_notSilenced_registered_shouldUnregisterReceiver() {
mCondition.onSilenceChanged(true);
mCondition.onSilenceChanged(false); mCondition.onSilenceChanged(false);
verify(mContext).unregisterReceiver(TestCondition.mReceiver); verify(mContext).unregisterReceiver(TestCondition.mReceiver);
} }
@Test
public void onSilenceChanged_notSilenced_notRegistered_shouldNotCrash() {
mCondition.onSilenceChanged(false);
verify(mContext, never()).unregisterReceiver(TestCondition.mReceiver);
// no crash
}
private static final class TestCondition extends Condition { private static final class TestCondition extends Condition {
private static final int TEST_METRIC_CONSTANT = 1234; private static final int TEST_METRIC_CONSTANT = 1234;