From bbc79a2e1e723a6e78e9643e00b068ddf688a25c Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Mon, 11 Dec 2017 11:18:10 -0800
Subject: [PATCH 1/2] Update package name for PictureAndPictureSettings

- the settings have been moved into the appinfo package, but the path
has not been updated properly in the android manifest.

Change-Id: I3a00a187bd2fdbeb926e2bb8cc1c4ab720ccd72a
Fixes: 70491786
Test: manual
(cherry picked from commit ebf884384073e96754d6bea5ee6e611f293a65f5)
---
 AndroidManifest.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8eaf761d478..6ccb8d1b08d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2573,7 +2573,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.PictureInPictureSettings" />
+                android:value="com.android.settings.applications.appinfo.PictureInPictureSettings" />
         </activity>
 
         <activity android:name="Settings$AppPictureInPictureSettingsActivity"
@@ -2585,7 +2585,7 @@
                 <data android:scheme="package" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.PictureInPictureDetails" />
+                android:value="com.android.settings.applications.appinfo.PictureInPictureDetails" />
         </activity>
 
         <activity android:name="Settings$ZenAccessSettingsActivity"
@@ -2939,7 +2939,7 @@
                 <data android:scheme="package" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.applications.DrawOverlayDetails" />
+                android:value="com.android.settings.applications.appinfo.DrawOverlayDetails" />
         </activity>
 
         <activity android:name="Settings$WriteSettingsActivity"
@@ -2963,7 +2963,7 @@
                 <data android:scheme="package" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.WriteSettingsDetails" />
+                       android:value="com.android.settings.applications.appinfo.WriteSettingsDetails" />
         </activity>
 
         <activity android:name="Settings$ManageExternalSourcesActivity"
@@ -2986,7 +2986,7 @@
                 <data android:scheme="package" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.applications.ExternalSourcesDetails" />
+                       android:value="com.android.settings.applications.appinfo.ExternalSourcesDetails" />
         </activity>
 
         <activity android:name="ShowAdminSupportDetailsDialog"

From cddb308efed2b79292cf611097be843a509c6dbb Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Mon, 11 Dec 2017 13:45:40 -0800
Subject: [PATCH 2/2] Update package name for PictureAndPictureSettings

- also need to update the reference in the special app access xml page.

Change-Id: I1199f70adf18d3f0e21a946848239526d9c8b3c8
Fixes: 70491786
Test: make SettingsUnitTests
(cherry picked from commit a8472007a7d195410c030146361122de63a07e6a)
---
 res/xml/special_access.xml                    |  2 +-
 .../SpecialAppAccessSettingsTest.java         | 89 +++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/src/com/android/settings/applications/SpecialAppAccessSettingsTest.java

diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 6adfc933fb4..829bc53c6c1 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -68,7 +68,7 @@
     <Preference
         android:key="picture_in_picture"
         android:title="@string/picture_in_picture_title"
-        android:fragment="com.android.settings.applications.PictureInPictureSettings"
+        android:fragment="com.android.settings.applications.appinfo.PictureInPictureSettings"
         settings:keywords="@string/picture_in_picture_keywords" />
 
     <Preference
diff --git a/tests/unit/src/com/android/settings/applications/SpecialAppAccessSettingsTest.java b/tests/unit/src/com/android/settings/applications/SpecialAppAccessSettingsTest.java
new file mode 100644
index 00000000000..4d92cf98a06
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/SpecialAppAccessSettingsTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.filters.SmallTest;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiScrollable;
+import android.support.test.uiautomator.UiSelector;
+import android.test.InstrumentationTestCase;
+import android.widget.TextView;
+
+import com.android.settings.R;
+
+import org.junit.Test;
+
+/**
+ * Test for Special App Access preferences.
+ */
+@SmallTest
+public class SpecialAppAccessSettingsTest extends InstrumentationTestCase {
+
+    private UiDevice mDevice;
+    private Context mTargetContext;
+    private String mTargetPackage;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mTargetContext = getInstrumentation().getTargetContext();
+        mTargetPackage = mTargetContext.getPackageName();
+    }
+
+    @Test
+    public void testSelectPictureInPicture_shouldNotCrash() throws Exception {
+        launchSpecialApps();
+        final String titlePictureInPictureApp =
+                mTargetContext.getResources().getString(R.string.picture_in_picture_title);
+
+        // select Picture-in-Picture
+        mDevice.findObject(new UiSelector().text(titlePictureInPictureApp)).click();
+
+        // Picture-in-picture settings page should launch and no crash
+        final UiObject actionBar = mDevice.findObject(new UiSelector().resourceId(
+            "com.android.settings:id/action_bar"));
+        final UiObject title = actionBar.getChild(
+            new UiSelector().className(TextView.class.getName()));
+        assertEquals(titlePictureInPictureApp, title.getText());
+    }
+
+    private void launchSpecialApps() throws Exception  {
+        final Intent settingsIntent = new Intent(Intent.ACTION_MAIN)
+            .addCategory(Intent.CATEGORY_LAUNCHER)
+            .setPackage(mTargetPackage)
+            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getInstrumentation().getContext().startActivity(settingsIntent);
+        final String titleApps = mTargetContext.getResources().getString(
+            R.string.app_and_notification_dashboard_title);
+        mDevice.findObject(new UiSelector().text(titleApps)).click();
+        final String titleAdvance = mTargetContext.getResources().getString(
+                R.string.advanced_section_header);
+        mDevice.findObject(new UiSelector().text(titleAdvance)).click();
+        final String titleSpecialApps = mTargetContext.getResources().getString(
+            R.string.special_access);
+
+        final UiScrollable settings = new UiScrollable(
+                new UiSelector().packageName(mTargetContext.getPackageName()).scrollable(true));
+        settings.scrollTextIntoView(titleSpecialApps);
+
+        mDevice.findObject(new UiSelector().text(titleSpecialApps)).click();
+    }
+
+}