commit 0954a38316b90561ff207dcd10b817ec7bbb22a4
author gitbuildkicker <android-build@google.com> Tue Nov 29 16:29:48 2016 -0800
committer gitbuildkicker <android-build@google.com> Tue Nov 29 16:29:48 2016 -0800
tree 696f9a86bfb41205c60a6c1c01114f0da9c1af16
parent 57e7650aeba8eba8923fcab9d68b209dcd794394
parent ca6d9f860c4d0c1388c851c62ac24bfd9bfb82d1

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 95c8cf2..b4f0398 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,7 +30,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"