Merge tag 'android-7.1.1_r6' of https://android.googlesource.com/platform/packages/apps/TvSettings into cm-14.1staging/cm-14.1-cafrebase

Android 7.1.1 release 6

2 files changed, 23 insertions, 8 deletions

diff --git a/Settings/AndroidManifest.xml b/Settings/AndroidManifest.xml
index 882b561d..fbade5f6 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 8853b418..ce6a6991 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);