commit e994d4665d15afb8375ad5f4c024da53f6bae84c
author Fan Zhang <zhfan@google.com> Tue Dec 04 12:43:14 2018 -0800
committer Fan Zhang <zhfan@google.com> Tue Dec 04 13:05:47 2018 -0800
tree 86f63916ddd8d2249f68fc4d574f76eeeb2b9d7c
parent 282a0d9222cd76b769373382bfe806ad8f4ad67b

Fix crash when dynamic_homepage flag is off.

This partially rolls back ag/5650901. We should revert this change when
dynamic_homepage flag is permanently on.

Change-Id: I5e340421d04bc20c77dd30395fd8522693807954
Fixes: 118444000
Test: manual

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a08d028..c5e512e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -114,6 +114,14 @@
         <uses-library android:name="org.apache.http.legacy" />
         <!-- Settings -->
 
+        <!-- TODO(b/118444000): Remove this. -->
+        <activity android:name="SettingsActivity"
+                  android:label="@string/settings_label_launcher"
+                  android:launchMode="singleTask">
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
         <activity android:name=".homepage.SettingsHomepageActivity"
                   android:label="@string/settings_label_launcher"
                   android:theme="@style/Theme.Settings.Home"