summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-08-12 01:07:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-12 01:07:24 +0000
commitdb7dca3c9a22e60e03aa2888b3aa4a7436a6f8b5 (patch)
treea57021fc1baf419891cc6906093d879ccd57992b
parentb4a22d0b1b3f03f2ad98c6d8572cf9d131b1dab2 (diff)
parent2b18cbc8decdf99ee4c07ad215bdd4f28ce536fd (diff)
downloadDialer-db7dca3c9a22e60e03aa2888b3aa4a7436a6f8b5.tar.gz
Merge "Make the Dialer direct boot aware." into oc-mr1-dev
-rw-r--r--AndroidManifest.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 32e2d7da..25063986 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,7 +28,10 @@
<uses-permission android:name="android.permission.CALL_PHONE"/>
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
+ <!-- The Dialer needs to be directBootAware so that it can reflect the correct call state
+ when the system boots up. -->
<application
+ android:directBootAware="true"
android:label="@string/phone_app_name"
android:icon="@drawable/ic_app_icon">