From d1749cfbabb61a77f8c0f26959d94400239a85a6 Mon Sep 17 00:00:00 2001
From: Nate Myren <ntmyren@google.com>
Date: Fri, 22 Apr 2022 13:58:50 -0700
Subject: [PATCH] Allow intent into Privacy Controls page

Test: manual
Bug: 222127397
Change-Id: If98ce8b89332eaaaa9be70885afe9d8465c191dd
---
 AndroidManifest.xml                                  | 12 ++++++++++++
 src/com/android/settings/Settings.java               |  1 +
 .../settings/core/gateway/SettingsGateway.java       |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4d3b6d0e3f9..762d84da36e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1789,6 +1789,18 @@
                        android:value="true" />
         </activity>
 
+        <activity android:name="Settings$PrivacyControlsActivity"
+                  android:label="@string/privacy_controls_title"
+                  android:exported="true"
+                  android:icon="@drawable/ic_settings_privacy">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.PRIVACY_CONTROLS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.privacy.PrivacyControlsFragment" />
+        </activity>
+
         <activity android:name=".development.tare.TareHomePage"
                   android:label="@string/tare_settings"
                   android:exported="false" />
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index c7375a36088..9f191f61cc1 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -224,6 +224,7 @@ public class Settings extends SettingsActivity {
             }
         }
     }
+    public static class PrivacyControlsActivity extends SettingsActivity { /* empty */ }
     public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
     public static class FactoryResetActivity extends SettingsActivity {
         @Override
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 81de7565af1..11ceeaf67b7 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -152,6 +152,7 @@ import com.android.settings.password.ChooseLockPassword;
 import com.android.settings.password.ChooseLockPattern;
 import com.android.settings.print.PrintJobSettingsFragment;
 import com.android.settings.print.PrintSettingsFragment;
+import com.android.settings.privacy.PrivacyControlsFragment;
 import com.android.settings.privacy.PrivacyDashboardFragment;
 import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.security.SecurityAdvancedSettings;
@@ -218,6 +219,7 @@ public class SettingsGateway {
             LocationSettings.class.getName(),
             WifiScanningFragment.class.getName(),
             PrivacyDashboardFragment.class.getName(),
+            PrivacyControlsFragment.class.getName(),
             LocationServices.class.getName(),
             SecuritySettings.class.getName(),
             SecurityAdvancedSettings.class.getName(),