commit 12fd732b557077cc2f57a3730146efd9e145e1f8
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 01 18:24:51 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 01 18:24:51 2018 +0000
tree 3bfb4b2de8462c90d05cd7ef385fa603692448ff
parent 3d8e2c44cbd54b69d6e8a0c2b4d0eecebee4d9d5
parent 41af55eb457534d605eb8bb87ce7c13d360cc651

Merge "Handle the Settings.DEVICE_NAME_SETTINGS intent."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d964534..c526d6f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1013,6 +1013,7 @@
                   android:parentActivityName="Settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
+                <action android:name="android.settings.DEVICE_NAME" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>