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

Commit f809e96f authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection... 

am 1a15b24b: am 012ef92e: Merge "Doc change: Remove refs to Copy Protection and note EOL in GP." into jb-mr1-dev

* commit '1a15b24b':
  Doc change: Remove refs to Copy Protection and note EOL in GP.
parents 1d13e850 1a15b24b

docs/html/distribute/googleplay/about/distribution.jd

+17 −4
Original line number Diff line number Diff line
@@ -125,7 +125,20 @@ download of the files as part of the normal APK installation.</p> 


<h2 id="licensing">Protecting your App</h2>



<p>To help you protect your application against piracy, Google Play offers a

licensing service that you can implement in your app. It’s a network-based

service that lets an application query a trusted Google Play licensing server to

determine whether the application is licensed to the current device user.</p>
 
<p>Google Play provides two key features to help you protect your application

against piracy &mdash; Google Play Licensing and app encryption.</p>



<p> Google Play Licensing is a network-based service that you implement in your

app. The service lets your app query a trusted licensing server at runtime, to

determine whether the app is licensed to the current device user. You can use

the licensing service to protect any app, even apps that you distribute for

free. For an overview of the service, see <a

href="{@docRoot}google/play/licensing/index.html">Application

Licensing</a>.</p>



<p>Additionally, Google Play offers app encryption to help protect your priced

apps. When delivering your priced apps to devices running Android 4.1 or higher,

Google encrypts the app binary so that it can be run only by the user who

downloaded it, on the device to which it was originally downloaded. Your priced

apps benefit from app encryption automatically &mdash; there's no extra

development work or configuration needed.</p>

docs/html/google/play/billing/billing_reference.jd

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ does not include tax.</td> 
  </tr>

  <tr>

    <td>{@code productId}</td>

    <td>The item's product identifier. Every item has a product ID, which you must specify in the application's product list on the Google Play publisher site.</td>

    <td>The item's product identifier. Every item has a product ID, which you must specify in the application's product list on the Google Play Developer Console.</td>

  </tr>

  <tr>

    <td>{@code purchaseTime}</td>

docs/html/google/play/billing/billing_testing.jd

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ parent.link=index.html 
</div>

</div>



<p>The Google Play publisher site provides several tools that help you test your In-app Billing

<p>The Google Play Developer Console provides several tools that help you test your In-app Billing

implementation before it is published. You can use these tools to create test accounts and purchase

special reserved items that send static billing responses to your application.</p>
@@ -53,7 +53,7 @@ product ID android.test.purchased.</p> 


<p>You do not need to list the reserved products in your application's product list. Google Play

already knows about the reserved product IDs. Also, you do not need to upload your application to

the publisher site to perform static response tests with the reserved product IDs. You can simply

the Developer Console to perform static response tests with the reserved product IDs. You can simply

install your application on a device, log into the device, and make billing requests using the

reserved product IDs.</p>
@@ -199,7 +199,7 @@ testing. You only need to upload your application as a draft application to perf 
testing.</p>



<p>To test your In-app Billing implementation with actual in-app purchases, you will need to

register at least one test account on the Google Play publisher site. You cannot use your

register at least one test account on the Google Play Developer Console. You cannot use your

developer account to test the complete in-app purchase process because Google Checkout does not let

you buy items from yourself. If you have not set up test accounts before, see <a

href="{@docRoot}google/play/billing/billing_admin.html#billing-testing-setup">Setting up test
@@ -216,7 +216,7 @@ actual payouts to your merchant account.</p> 
<p>To test your In-app Billing implementation with actual purchases, follow these steps:</p>



<ol>

  <li><strong>Upload your application as a draft application to the publisher site.</strong>

  <li><strong>Upload your application as a draft application to the Developer Console.</strong>

    <p>You do not need to publish your application to perform end-to-end testing with real product

    IDs; you only need to upload your application as a draft application. However, you must sign

    your application with your release key before you upload it as a draft application. Also, the

docs/html/google/play/billing/v2/billing_integrate.jd

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ following:</p> 
<h3>Uploading the sample application</h3>



<p>After you build a release version of the sample application and sign it, you need to upload it as

a draft to the Google Play publisher site. You also need to create a product list for the in-app

a draft to the Google Play Developer Console. You also need to create a product list for the in-app

items that are available for purchase in the sample application. The following instructions show you

how to do this.</p>

<ol>
@@ -263,7 +263,7 @@ onto a device to run it. To run the sample application, do the following:</p> 
 <li><strong>Make one of your test accounts the primary account on your device.</strong>

    <p>The primary account on your device must be one of the <a

    href="{@docRoot}google/play/billing/billing_admin.html#billing-testing-setup">test accounts</a>

    that you registered on the Google Play publisher site. If the primary account on your device is not a

    that you registered on the Google Play Developer Console. If the primary account on your device is not a

    test account, you must do a factory reset of the device and then sign in with one of your test

    accounts. To perform a factory reset, do the following:</p>

    <ol>
@@ -979,7 +979,7 @@ href="{@docRoot}google/play/billing/billing_best_practices.html">Security and De 
<p>To help ensure the integrity of the transaction information that is sent to your application,

Google Play signs the JSON string that is contained in the <code>PURCHASE_STATE_CHANGED</code>

broadcast intent. Google Play uses the private key that is associated with your publisher account

to create this signature. The publisher site generates an RSA key pair for each publisher account.

to create this signature. The Developer Console generates an RSA key pair for each publisher account.

You can find the public key portion of this key pair on your account's profile page. It is the same

public key that is used with Google Play licensing.</p>

docs/html/google/play/billing/v2/billing_reference.jd

+2 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ pairs, which are summarized in table 7.</p> 
  <td>Required for <code>REQUEST_PURCHASE</code> requests.</td>

  <td>The product ID of the item you are making a billing request for. Every in-app item that you

  sell using Google Play's In-app Billing service must have a unique product ID, which you

  specify on the Google Play publisher site.</td>

  specify on the Google Play Developer Console.</td>

</tr>

<tr>

  <td><code>NONCE</code></td>
@@ -380,7 +380,7 @@ a <code>PURCHASE_STATE_CHANGED</code> intent.</p> 
<tr>

  <td>productId</td>

  <td>The item's product identifier. Every item has a product ID, which you must specify in the

  application's product list on the Google Play publisher site.</td>

  application's product list on the Google Play Developer Console.</td>

</tr>

<tr>

  <td>purchaseTime</td>