commit 2d77b0192af0e7be6d6231ac7e6348aacc66a798
author Fan Zhang <zhfan@google.com> Tue Feb 05 15:23:39 2019 -0800
committer Fan Zhang <zhfan@google.com> Tue Feb 05 15:58:35 2019 -0800
tree d905785b5aaa4898ef96e56d83f83191955ac8a2
parent 0e96dcc2a0d613163365b6cc65e7722f61656140

Move android.settings.PRIVACY_SETTINGS to PrivacySettings.

Bug: 123878762
Test: manual
Change-Id: I9312c8455b0325f7c582523938a1fde21fbd81ce

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dccd1d0..a007f99 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1236,6 +1236,10 @@
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings">
             <intent-filter>
+                <action android:name="android.settings.PRIVACY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
@@ -2792,10 +2796,6 @@
         <activity android:name=".backup.UserBackupSettingsActivity"
                   android:label="@string/privacy_settings_title"
                   android:icon="@drawable/ic_settings_backup">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.PRIVACY_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />