summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2015-08-17 21:58:51 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-17 21:58:51 +0000
commit581fd0fb2ecbd6d9ee049bb08f395ec04709eb74 (patch)
treeed1f676da718b3572190a6d1f5ab6d81cbab9cfb
parent1eb1f7cf9be8e7491d6e676c12ce1fccd31ee479 (diff)
parent757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e (diff)
am 757e2c7f: Merge "Fix documentation issue" into mnc-dev
* commit '757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e': Fix documentation issue
-rw-r--r--core/java/android/provider/MediaStore.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index 9babf4309fab..48b3c1a1b064 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -240,9 +240,6 @@ public final class MediaStore {
* 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";