Merge "Prevent ringing updates" into pi-dev

2018-04-10 22:52:10 +00:00
parent 2c15909bfc 584aba1f2b
commit dbffb1812d
11 changed files with 35 additions and 75 deletions
--- a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java
@@ -68,8 +68,7 @@ public class PreventRingingPreferenceControllerTest {
    @Before
    public void setUp() {
        MockitoAnnotations.initMocks(this);
-        mController = new PreventRingingPreferenceController(
-                mContext, null, 0, KEY_PICK_UP);
+        mController = new PreventRingingPreferenceController(mContext, KEY_PICK_UP);
    }

    @Test