commit 7a9a1b2a6db8c8051a5a60a64418bd571fc1f5e0
author Jonathan Koo <jonathankoo@google.com> Mon Apr 22 08:12:46 2019 -0700
committer Jonathan Koo <jonathankoo@google.com> Tue Apr 23 10:37:53 2019 -0700
tree 28dc23c55828a8ad64b7b6cb973db82da0142913
parent 9cb4a63c2e0ac219c2af88e8c8191899de70c77c

DO NOT MERGE Add Regulatory Label Dialog to "settings > About". Enable OEMs to add a
Regulatory Labels for the device either based on text/html or an image.

bug: 127298041
Test: Manual. Robolectric.
Change-Id: I436731cf06197b7270af87b2652adf9af279f8ce

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7c6dc05..8b599f5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -272,6 +272,16 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".system.RegulatoryInfoDisplayActivity"
+            android:label="@string/regulatory_labels"
+            android:enabled="@bool/config_show_regulatory_info">
+            <intent-filter>
+                <action android:name="android.settings.SHOW_REGULATORY_INFO" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- This logic is copied from phone.-->
         <!-- Ensures there's lightweight fallback activity when no other MAIN/HOME activity is present.-->
         <activity android:name=".FallbackHome"