Merge "Add sliceUri in broadcast intent"

2018-12-19 01:47:11 +00:00
parent abcfa26bf6 f7a6d94863
commit 03653641a2
11 changed files with 47 additions and 39 deletions
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -201,8 +201,7 @@ public class FakeFeatureFactory extends FeatureFactory {
        return panelFeatureProvider;
    }

-    @Override
-    public ContextualCardFeatureProvider getContextualCardFeatureProvider() {
+    public ContextualCardFeatureProvider getContextualCardFeatureProvider(Context context) {
        return mContextualCardFeatureProvider;
    }