diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-17 21:51:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-17 21:51:47 +0000 |
| commit | 757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e (patch) | |
| tree | 2331a28de4e7ce4c8551955c2e4d18804215086b /core | |
| parent | 46ae218b2aeab9e92d59b3d074cc43d696be11d5 (diff) | |
| parent | 9b70f44b2a773aa56db9b643ae98b287703c1bd1 (diff) | |
| download | frameworks_base-757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e.zip frameworks_base-757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e.tar.gz frameworks_base-757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e.tar.bz2 | |
Merge "Fix documentation issue" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 3 |
1 files changed, 0 insertions, 3 deletions
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 @@ 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"; |