diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-08-13 18:49:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-13 18:49:40 +0000 |
| commit | f75577295765ca13bf3d0d5bffa81b569cb88da2 (patch) | |
| tree | 293f493bc9527ed94907f1f21fbd1c10909ec2f6 | |
| parent | 8d149d7ff278c877bf7ccff7cc428cf7ba1db1e4 (diff) | |
| parent | 901f8071433fd4c5f174a45127cc82a94532f87f (diff) | |
| download | frameworks_base-f75577295765ca13bf3d0d5bffa81b569cb88da2.zip frameworks_base-f75577295765ca13bf3d0d5bffa81b569cb88da2.tar.gz frameworks_base-f75577295765ca13bf3d0d5bffa81b569cb88da2.tar.bz2 | |
Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-sdk-element.jd | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index 3ac87ef..642b820 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -19,7 +19,6 @@ page.tags=api levels,sdk version,minsdkversion,targetsdkversion,maxsdkversion <li><a href="#testing">Testing against higher API Levels</a></li> </ol> </li> - <li><a href="#provisional">Using a Provisional API Level</a></li> <li><a href="#filtering">Filtering the Reference Documentation by API Level</a></li> </ol> </div> @@ -227,6 +226,11 @@ Versions dashboards page</a>.</p> <table> <tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr> + <tr><td>Android 6.0</td> + <td><a href="{@docRoot}sdk/api_diff/23/changes.html" title="Diff Report">23</a></td> + <td>{@link android.os.Build.VERSION_CODES#M}</td> + <td><a href="{@docRoot}preview/api-overview.html">API Changes</a></td></tr> + <tr><td><a href="{@docRoot}about/versions/android-5.1.html">Android 5.1</a></td> <td><a href="{@docRoot}sdk/api_diff/22/changes.html" title="Diff Report">22</a></td> <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</td> @@ -552,29 +556,6 @@ you are using a physical device for testing, ensure that you know the API Level of the Android platform it runs. See the table at the top of this document for a list of platform versions and their API Levels. </p> -<h2 id="provisional">Using a Provisional API Level</h2> - -<p>In some cases, an "Early Look" Android SDK platform may be available. To let -you begin developing on the platform although the APIs may not be final, the -platform's API Level integer will not be specified. You must instead use the -platform's <em>provisional API Level</em> in your application manifest, in order -to build applications against the platform. A provisional API Level is not an -integer, but a string matching the codename of the unreleased platform version. -The provisional API Level will be specified in the release notes for the Early -Look SDK release notes and is case-sensitive.</p> - -<p>The use of a provisional API Level is designed to protect developers and -device users from inadvertently publishing or installing applications based on -the Early Look framework API, which may not run properly on actual devices -running the final system image.</p> - -<p>The provisional API Level will only be valid while using the Early Look SDK -and can only be used to run applications in the emulator. An application using -the provisional API Level can never be installed on an Android device. At the -final release of the platform, you must replace any instances of the provisional -API Level in your application manifest with the final platform's actual API -Level integer.</p> - <h2 id="filtering">Filtering the Reference Documentation by API Level</h2> |