Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index 9babf43..48b3c1a 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -240,9 +240,6 @@
* An application implementing a prewarm service should do the absolute minimum amount of work
* to initialize the camera in order to reduce startup time in likely case that shortly after a
* camera launch intent would be sent.
- * <p>
- * If the camera launch intent gets fired shortly after, the service will be unbound
- * asynchronously, without receiving
*/
public static final String META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE =
"android.media.still_image_camera_preview_service";
diff --git a/core/res/res/values-mcc334-mnc020/config.xml b/core/res/res/values-mcc334-mnc020/config.xml
new file mode 100644
index 0000000..0970517
--- /dev/null
+++ b/core/res/res/values-mcc334-mnc020/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <bool name="config_use_sim_language_file">false</bool>
+</resources>
\ No newline at end of file
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index d3aa0d3..4413eff 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -151,16 +151,19 @@
</h3>
<ul>
<li>General
- <ul>
- <li>Final Permissions user interface — the permissions user interface is updated
- and some of the permissions behaviors are enhanced. </li>
- <li>Updates to the Fingerprint API — updated API that enables better error reporting,
- better fingerprint enrollment experience, plus enumeration support for greater
- reliability.</li>
- </ul>
+ <ul>
+ <li>Updated the Fingerprint API to enables better error reporting,
+ better fingerprint enrollment experience, and enumeration support for greater
+ reliability.</li>
+ <li>Modified app access to BLE and Wi-Fi scans to require the location permisssion when they
+ target Android 6.0 (API level 23) or higher. Apps targeting API 22 or earlier can
+ still perform BTLE and WiFi scans, but only when they are in the foreground. While in the background, those apps will get no results from BTLE and WiFi scans.</li>
+ </ul>
</li>
<li>Permission changes
<ul>
+ <li>Updated the user interface for permissions and enhanced some of the permissions
+ behaviors.</li>
<li>The {@link android.Manifest.permission#GET_ACCOUNTS} permission is now a member of the
{@link android.Manifest.permission_group#CONTACTS} permission group and it has a
{@code android:protectionLevel} of {@code dangerous}. This change means that when
@@ -193,6 +196,10 @@
</li>
<li>During Hangouts calls, users may experience distorted or low audio on some devices.
</li>
+ <li>The bundled Google Apps Device Policy app is unable to set up an Android for Work
+ Profile in the MPA44G system images, so you cannot create a new Work Profile with that
+ app. Other apps that provide Android for Work functionality are unaffected.
+ </li>
</ul>
</li>
</ul>
diff --git a/docs/html/tools/support-library/index.jd b/docs/html/tools/support-library/index.jd
index c1c2143..9dc0ed1 100644
--- a/docs/html/tools/support-library/index.jd
+++ b/docs/html/tools/support-library/index.jd
@@ -80,6 +80,11 @@
</dd>
</dl>
+
+ <p>For a complete list of the Support Library changes, see the
+ <a href="{@docRoot}sdk/support_api_diff/23/changes.html">Support
+ Library API Differences Report</a>. </p>
+
</div>
</div> <!-- end of collapsible section -->