aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2016-06-14 15:42:02 -0700
committerTrevor Johns <trevorjohns@google.com>2016-06-14 15:42:02 -0700
commitad6207ddee99b79907b587c63e5ad3f9f6e82eea (patch)
tree4bae27453a3004638e5cc6a9f87aae3109c99c39 /security
parentbcc4aec8529bb9b05b342acc83beb090456d63b3 (diff)
downloadandroid-ad6207ddee99b79907b587c63e5ad3f9f6e82eea.tar.gz
Update sample dependency versions for Android DP4
Change-Id: If1b85f39acf088a1e2c8b7e019d3bea490af407b
Diffstat (limited to 'security')
-rw-r--r--security/DirectBoot/template-params.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/security/DirectBoot/template-params.xml b/security/DirectBoot/template-params.xml
index b27ada9b..536cb522 100644
--- a/security/DirectBoot/template-params.xml
+++ b/security/DirectBoot/template-params.xml
@@ -28,11 +28,11 @@
<!-- Include additional dependencies here.-->
<!-- dependency>com.google.android.gms:play-services:5.0.+</dependency -->
- <dependency>com.android.support:appcompat-v7:24.0.0-alpha1</dependency>
- <dependency>com.android.support:support-v4:24.0.0-alpha1</dependency>
- <dependency>com.android.support:support-v13:24.0.0-alpha1</dependency>
- <dependency>com.android.support:recyclerview-v7:24.0.0-alpha1</dependency>
- <dependency>com.android.support:design:24.0.0-alpha1</dependency>
+ <dependency>com.android.support:appcompat-v7:24.0.0-beta1</dependency>
+ <dependency>com.android.support:support-v4:24.0.0-beta1</dependency>
+ <dependency>com.android.support:support-v13:24.0.0-beta1</dependency>
+ <dependency>com.android.support:recyclerview-v7:24.0.0-beta1</dependency>
+ <dependency>com.android.support:design:24.0.0-beta1</dependency>
<template src="base" />
@@ -99,7 +99,7 @@ Starting from Android N, the system provides two storage locations for user data
- A new storage location which is always available while the device is booted, both before and after any user credentials are entered
Apps can mark individual components as being direct boot aware which indicates to the system that they can safely run when
-Credential protected storage is unavailable (an direct boot aware component primarily relies on data stored in the new Device protected storage area,
+Credential protected storage is unavailable (an direct boot aware component primarily relies on data stored in the new Device protected storage area,
but they may access Credential protected data when unlocked) by adding `directBootAware="true"` in the manifest.
```
<activity|provider|receiver|service ...