commit ca6d86c5ab02fef5640c093f44d2094b9e0d24a8
author Fan Zhang <zhfan@google.com> Thu Jun 14 12:52:06 2018 -0700
committer Fan Zhang <zhfan@google.com> Fri Jun 15 08:56:14 2018 -0700
tree 497aecc74a471ca3e4153fe0537cccecccd94c20
parent ed3a2bd2c31488ebf56e630719bba3f37f4876bd

Move device admin viewer/adder to specialaccess package.

Bug: 110207366
Test: robo
Change-Id: I51552dcc5ec6525040cfde17087b7f3f6b21b581

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4fa3964..8bd2581 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1382,7 +1382,7 @@
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.DeviceAdminSettings" />
+                android:value="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -1391,10 +1391,10 @@
                 android:exported="true"
                 android:targetActivity="Settings$DeviceAdminSettingsActivity">
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.DeviceAdminSettings" />
+                android:value="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />
         </activity-alias>
 
-        <activity android:name="DeviceAdminAdd"
+        <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"
                 android:label="@string/device_admin_add_title"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -1405,7 +1405,7 @@
 
         <activity-alias android:name="SetProfileOwner"
                         android:label="@string/profile_owner_add_title"
-                        android:targetActivity="DeviceAdminAdd">
+                        android:targetActivity=".applications.specialaccess.deviceadmin.DeviceAdminAdd">
             <intent-filter android:priority="1000">
                 <action android:name="android.app.action.SET_PROFILE_OWNER" />
                 <category android:name="android.intent.category.DEFAULT" />