Provide stub intent filters for CTSandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r52android-7.1.1_r50android-7.1.1_r48android-7.1.1_r45android-7.1.1_r42android-7.1.1_r40android-7.1.1_r4android-7.1.1_r38android-7.1.1_r35android-7.1.1_r28android-7.1.1_r26android-7.1.1_r25android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r17android-7.1.1_r13nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-cts-release

b/32307358
Test: adb shell am start -a .. -d ..

Change-Id: I89ccacd7cb2b4433c95b4aa1b4f16eea03ff9675
(cherry picked from commit 92adc442b0efc42691a0be4c9fb9229edb5b0b30)

2 files changed, 23 insertions, 8 deletions

diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index 882b561d5..fbade5f6d 100644
--- a/Settings/AndroidManifest.xml
+++ b/Settings/AndroidManifest.xml
@@ -560,9 +560,8 @@
             </intent-filter>
         </activity>
 
-        <!-- Dummy activity for CTS
-         TODO: implement something useful -->
-        <activity android:name=".system.WebViewImplementation"
+        <!-- Dummy intent filters for CTS TODO: implement something useful -->
+        <activity android:name=".EmptyStubActivity"
                   android:exported="true"
                   android:excludeFromRecents="true"
                   android:theme="@android:style/Theme.NoDisplay">
@@ -570,8 +569,25 @@
                 <action android:name="android.settings.WEBVIEW_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
+                <action android:name="android.settings.HOME_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
     </application>
 
diff --git a/Settings/src/com/android/tv/settings/system/WebViewImplementation.java b/Settings/src/com/android/tv/settings/EmptyStubActivity.java
index 8853b4188..ce6a69915 100644
--- a/Settings/src/com/android/tv/settings/system/WebViewImplementation.java
+++ b/Settings/src/com/android/tv/settings/EmptyStubActivity.java
@@ -14,14 +14,13 @@
  * limitations under the License
  */
 
-package com.android.tv.settings.system;
+package com.android.tv.settings;
 
 import android.annotation.Nullable;
 import android.app.Activity;
 import android.os.Bundle;
 
-// TODO: implement a webview choice screen here. See WebViewImplementation in mobile Settings
-public class WebViewImplementation extends Activity {
+public class EmptyStubActivity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);