Merge "Add entry point to Enterprise Privacy page"

2016-12-06 15:09:28 +00:00
parent f5c1577609 0e4a1e5142
commit 3e15627f17
1 changed files with 5 additions and 1 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1590,7 +1590,11 @@
            android:icon="@drawable/ic_settings_about"
            android:taskAffinity="com.android.settings"
            android:parentActivityName="Settings">
-            <intent-filter android:priority="-1">
+            <intent-filter>
+                <action android:name="android.settings.ENTERPRISE_PRIVACY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
                <action android:name="com.android.settings.action.SETTINGS" />
            </intent-filter>
            <meta-data android:name="com.android.settings.category"