From 0023100e7f3319e6ed953fad52183868b28aeaec Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Thu, 11 Mar 2021 01:18:13 +0800
Subject: [PATCH] Declare activities for factory reset pages

When trying to trigger factory reset from Settings app, it's unexpected
that Settings will get a fatal ActivityNotFoundException, causing
Settings crash. The factory reset pages have changed their launching
way from by SubSettingsLauncher to by startActivity directly. These
activities haven't been declared in AndroidManifest.xml, which caused
this issue.

Fixes: 182144129
Test: rebuild and manual
1) Flash the device with aosp build
2) Navigate to Reset options (Settings -> System -> Reset options)
3) Observe and check if Settings gets crashed

Change-Id: Ia99f269e237d7c84153d4b903cbca14c33835dc1
---
 AndroidManifest.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6ac1ac9d1b1..c42f06478f9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3751,6 +3751,25 @@
             android:launchMode="singleTask">
         </activity>
 
+        <activity android:name="Settings$FactoryResetActivity"
+                  android:permission="android.permission.BACKUP"
+                  android:label="@string/main_clear_title"
+                  android:exported="true"
+                  android:theme="@style/SudThemeGlif.Light">
+            <intent-filter>
+                <action android:name="com.android.settings.action.FACTORY_RESET"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.MainClear"/>
+        </activity>
+
+        <activity android:name="Settings$FactoryResetConfirmActivity"
+                  android:label="@string/main_clear_confirm_title"
+                  android:exported="false"
+                  android:theme="@style/SudThemeGlif.Light">
+        </activity>
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>