Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36cca79c authored by Joe Fernandez's avatar Joe Fernandez Committed by Android Git Automerger
Browse files

am 0a36cec6: am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking... 

am 0a36cec6: am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1

* commit '0a36cec6':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
parents 44bcfcae 0a36cec6

docs/html/guide/appendix/install-location.jd

+5 −0
Original line number Original line Diff line number Diff line
@@ -171,6 +171,11 @@ persist after external storage is remounted.</dd> 
    <dd>The system delivers the {@link android.content.Intent#ACTION_BOOT_COMPLETED} broadcast

    <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

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>

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>

</dl>





<p>If your application uses any of the features listed above, you <strong>should not</strong> allow

<p>If your application uses any of the features listed above, you <strong>should not</strong> allow

docs/html/guide/publishing/licensing.jd

+3 −3
Original line number Original line Diff line number Diff line
@@ -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>

you won't be able to upload a new version that uses licensing.</li>

</ul>

</ul>





<h4>Replacement for copy protection</h4>

<h4>Replacement for Copy Protection</h4>





<p>Android Market Licensing is a flexible, secure mechanism for controlling

<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

mechanism offered on Android Market and gives you wider distribution

potential for your applications. </p>

potential for your applications. </p>





<ul>

<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

that applications using it can be installed only on compatible devices that

provide a secure internal storage environment. For example, a copy-protected

provide a secure internal storage environment. For example, a copy-protected

application cannot be downloaded from Market to a device that provides root

application cannot be downloaded from Market to a device that provides root

docs/html/guide/topics/manifest/manifest-element.jd

+7 −2
Original line number Original line Diff line number Diff line
@@ -141,6 +141,11 @@ either internal or external storage through the system settings.</td> 
</tr>

</tr>

</table>

</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

<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

  internal storage and cannot be installed on the external storage unless you define this attribute

  to be either "{@code auto}" or "{@code preferExternal}".</p>

  to be either "{@code auto}" or "{@code preferExternal}".</p>