diff options
author | Clay Murphy <claym@google.com> | 2017-07-11 14:46:45 -0700 |
---|---|---|
committer | Clay Murphy <claym@google.com> | 2017-07-11 14:46:45 -0700 |
commit | 97621834cda62dcf3870da248df1a134a302afee (patch) | |
tree | 0cc00e020aeded4bb49bdb0088a9763d0176fd91 /en/devices/storage/adoptable.html | |
parent | e839b247f863ec564ef505aa4451e839511f37aa (diff) | |
parent | bb3e2e8572f4ebac3990869868c036efcd02fb12 (diff) | |
download | source.android.com-97621834cda62dcf3870da248df1a134a302afee.tar.gz |
resolve merge conflicts of bb3e2e85 to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6b11c9ad616712c4571a425af01c7caa97394815
Diffstat (limited to 'en/devices/storage/adoptable.html')
-rw-r--r-- | en/devices/storage/adoptable.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/en/devices/storage/adoptable.html b/en/devices/storage/adoptable.html index 7bef04da..7d167628 100644 --- a/en/devices/storage/adoptable.html +++ b/en/devices/storage/adoptable.html @@ -28,10 +28,16 @@ these accessories were historically limited to simple file storage, due to their expected impermanence and the minimal data protection offered to <a href="/devices/storage/traditional.html">traditional external storage</a>. -Android 6.0 introduces the ability to +Android 6.0 introduced the ability to <a href="http://developer.android.com/about/versions/marshmallow/android-6.0.html#adoptable-storage">adopt</a> external storage media to act like internal storage.</p> +<p class="warning"><strong>Warning:</strong> <a +href="/security/encryption/file-based.html">File-based encryption</a> cannot +currently be used together with adoptable storage. On devices using file-based +encryption, new storage media (such as an SD card) must be used as <a +href="/devices/storage/traditional.html">traditional storage</a>.</p> + <p>When external storage media is adopted, it’s formatted and encrypted to only work with a single Android device at a time. Because the media is strongly tied to the Android device that adopted it, it can safely store both apps and |