Merge "Prevent ringing updates" into pi-dev am: dbffb1812d

am: 8176af9610 Change-Id: I880b80215cfec3897b18200b18bedbb6c899e241
2018-04-10 16:15:11 -07:00
parent 3b3e951b6f 8176af9610
commit a660cf1176
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