commit 8c1d5a9aa9509b4f046cc89a44d7df155034782c
author gitbuildkicker <android-build@google.com> Sun Sep 11 00:07:23 2016 -0700
committer gitbuildkicker <android-build@google.com> Sun Sep 11 00:07:23 2016 -0700
tree 3233c9210dc13849ebe0db5756d261486b894ee3
parent 98f11ec49425614b7678b9d184c0e2a74ff28c7d
parent c56f7c18cce50d2c30ed798bf44ffb580708bb36

merge in nyc-mr1-release history after reset to nyc-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 582665a..cc3d6d2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,7 +32,9 @@
         android:label="@string/app_name"
         android:clearTaskOnLaunch="true"
         android:process="com.android.phone"
-        android:taskAffinity="android.task.stk">
+        android:taskAffinity="android.task.stk"
+        android:defaultToDeviceProtectedStorage="true"
+        android:directBootAware="true">
 
         <activity android:name="StkMain"
             android:theme="@android:style/Theme.NoDisplay"