diff options
author | Joe Fernandez <joefernandez@google.com> | 2011-05-19 10:53:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-19 10:53:04 -0700 |
commit | 146a0b4522db2d782953a464fe63adcd7e1569c2 (patch) | |
tree | 1c5b1c9be158eb330d191553543f7141cac99cde /docs | |
parent | a88b42d569a91290477d8f5731a2ee43931271da (diff) | |
parent | fde9ac72668ced2e473ad247cacc8a4bdd05996f (diff) | |
download | frameworks_base-146a0b4522db2d782953a464fe63adcd7e1569c2.zip frameworks_base-146a0b4522db2d782953a464fe63adcd7e1569c2.tar.gz frameworks_base-146a0b4522db2d782953a464fe63adcd7e1569c2.tar.bz2 |
am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/guide/appendix/install-location.jd | 5 | ||||
-rw-r--r-- | docs/html/guide/publishing/licensing.jd | 6 | ||||
-rw-r--r-- | docs/html/guide/topics/manifest/manifest-element.jd | 9 |
3 files changed, 15 insertions, 5 deletions
diff --git a/docs/html/guide/appendix/install-location.jd b/docs/html/guide/appendix/install-location.jd index 7f96809..617f4fc 100644 --- a/docs/html/guide/appendix/install-location.jd +++ b/docs/html/guide/appendix/install-location.jd @@ -171,6 +171,11 @@ persist after external storage is remounted.</dd> <dd>The system delivers the {@link android.content.Intent#ACTION_BOOT_COMPLETED} broadcast before the external storage is mounted to the device. If your application is installed on the external storage, it can never receive this broadcast.</dd> + <dt>Copy Protection</dt> + <dd>Your application cannot be installed to a device's SD card if it uses Android Market's + Copy Protection feature. However, if you use Android Market's + <a href="{@docRoot}guide/publishing/licensing.html">Application Licensing</a> instead, your + application <em>can</em> be installed to internal or external storage, including SD cards.</dd> </dl> <p>If your application uses any of the features listed above, you <strong>should not</strong> allow diff --git a/docs/html/guide/publishing/licensing.jd b/docs/html/guide/publishing/licensing.jd index a9b182e..d89a8ca 100644 --- a/docs/html/guide/publishing/licensing.jd +++ b/docs/html/guide/publishing/licensing.jd @@ -263,15 +263,15 @@ licensed for all users. If your application is already published as free, you won't be able to upload a new version that uses licensing.</li> </ul> -<h4>Replacement for copy protection</h4> +<h4>Replacement for Copy Protection</h4> <p>Android Market Licensing is a flexible, secure mechanism for controlling -access to your applications. It effectively replaces the copy-protection +access to your applications. It effectively replaces the Copy Protection mechanism offered on Android Market and gives you wider distribution potential for your applications. </p> <ul> -<li>A limitation of the legacy copy-protection mechanism on Android Market is +<li>A limitation of the legacy Copy Protection mechanism on Android Market is that applications using it can be installed only on compatible devices that provide a secure internal storage environment. For example, a copy-protected application cannot be downloaded from Market to a device that provides root diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd index a8125b3..598e88f 100644 --- a/docs/html/guide/topics/manifest/manifest-element.jd +++ b/docs/html/guide/topics/manifest/manifest-element.jd @@ -141,9 +141,14 @@ either internal or external storage through the system settings.</td> </tr> </table> +<p class="caution"><strong>Caution:</strong> If your application uses the Android Market's Copy + Protection feature, it cannot be installed to a device's SD card. However, if you use Android + Market's <a href="{@docRoot}guide/publishing/licensing.html">Application Licensing</a> instead, + your application <em>can</em> be installed to internal or external storage, including SD cards.</p> + <p class="note"><strong>Note:</strong> By default, your application will be installed on the -internal storage and cannot be installed on the external storage unless you define this attribute -to be either "{@code auto}" or "{@code preferExternal}".</p> + internal storage and cannot be installed on the external storage unless you define this attribute + to be either "{@code auto}" or "{@code preferExternal}".</p> <p>When an application is installed on the external storage:</p> <ul> |