OSDN Git Service
Carlos Hernandez [Mon, 24 Mar 2014 20:38:17 +0000 (13:38 -0700)]
let ProcessingServiceManager report if the service is running
Change-Id: Ib706f2446baa12d2b70ff5c5b3d5637214006340
Spike Sprague [Mon, 24 Mar 2014 17:57:25 +0000 (17:57 +0000)]
Merge "moving m*Animator.end() out of onConfigurationChanged" into gb-ub-photos-denali
Sascha Haeberling [Mon, 24 Mar 2014 17:14:16 +0000 (17:14 +0000)]
Merge "Clean up notifications again after the removal of the notifications manager." into gb-ub-photos-denali
Sascha Haeberling [Mon, 24 Mar 2014 16:32:20 +0000 (09:32 -0700)]
Clean up notifications again after the removal of the notifications manager.
Bug:
12972656
Change-Id: I3b16689ae22bbebd61143f84b55657759da2fad5
Sam Judd [Fri, 21 Mar 2014 23:02:12 +0000 (16:02 -0700)]
Decode fullsize bitmap dimensions on a background thread.
Bug:
13587605
Change-Id: Ia40e0799947abae3089e66dfcea339a68ee0d8e4
Sam Judd [Mon, 24 Mar 2014 15:59:04 +0000 (15:59 +0000)]
Merge "Don't render the preview while it's not visible to the user." into gb-ub-photos-denali
Sam Judd [Fri, 21 Mar 2014 23:53:27 +0000 (16:53 -0700)]
Don't render the preview while it's not visible to the user.
Bug:
13586944
Change-Id: Ide777da080ce150cec601b4e6e88cd6c4ea19cda
Sascha Haeberling [Sat, 22 Mar 2014 00:30:39 +0000 (00:30 +0000)]
Merge "Processing service needs to start in foreground." into gb-ub-photos-denali
Sascha Haeberling [Fri, 21 Mar 2014 17:41:04 +0000 (10:41 -0700)]
Processing service needs to start in foreground.
Bug:
13575616
This moves the notification logic into the processing service as we
anyway only have one notification.
Change-Id: I267966a0e34028cb72be373031562e9e9bc89bbb
Spike Sprague [Fri, 21 Mar 2014 19:05:13 +0000 (12:05 -0700)]
moving m*Animator.end() out of onConfigurationChanged
bug:
13436761
Change-Id: Ife53c47d6076a9804dbbe87e4e2ab6344bac22ff
Spike Sprague [Fri, 21 Mar 2014 18:00:41 +0000 (11:00 -0700)]
tablet ui tweaks (hacks?)
bug:
13169908
Change-Id: Ic1fd8031c4112ee3467615cd447cfff8c85639f5
Sam Judd [Fri, 21 Mar 2014 20:20:59 +0000 (20:20 +0000)]
Merge "Best effort fix to prevent stretched videos." into gb-ub-photos-denali
Sam Judd [Mon, 17 Mar 2014 20:07:22 +0000 (13:07 -0700)]
Best effort fix to prevent stretched videos.
To avoid increasing load times, we now only parse video headers asynchronously
while the user scrolls. We make a best effort attempt to prefetch video headers
while we're scrolling to avoid the layout jumping around when we update
dimensions for an item that's visible to the user.
Bug:
13505062
Change-Id: Ib7d7835c39d50f22f45db5673ec4c49d84b81124
Seth Raphael [Fri, 21 Mar 2014 18:37:17 +0000 (18:37 +0000)]
Merge "Fix lookup type" into gb-ub-photos-denali
Seth Raphael [Fri, 21 Mar 2014 18:28:02 +0000 (11:28 -0700)]
Fix lookup type
Bug:
13582743
Change-Id: I16ddf8fbedc1461c05aeadfad27930862aebc4ff
Sascha Häberling [Fri, 21 Mar 2014 16:59:15 +0000 (16:59 +0000)]
Merge "fix the build" into gb-ub-photos-denali
Seth Raphael [Fri, 21 Mar 2014 16:56:11 +0000 (09:56 -0700)]
fix the build
Change-Id: I069ada1529de371e2d17351b9bee53484cac1f5f
Seth Raphael [Fri, 21 Mar 2014 16:37:46 +0000 (16:37 +0000)]
Merge "Avoid race condition when Sessions are finished" into gb-ub-photos-denali
Seth Raphael [Thu, 20 Mar 2014 23:47:53 +0000 (16:47 -0700)]
Avoid race condition when Sessions are finished
Bug:
13550276
Change-Id: I813f601a54708cd291cb0524c7b63724bd9c9fb8
Sascha Haeberling [Fri, 21 Mar 2014 00:58:21 +0000 (00:58 +0000)]
Merge "Update processing API to support pause/resume." into gb-ub-photos-denali
Sascha Haeberling [Thu, 20 Mar 2014 20:27:14 +0000 (13:27 -0700)]
Update processing API to support pause/resume.
Bug:
12080035
BUg:
12211113
This has been ported over from the LightCycle service. We make use of
this to pause processing while new memory-intense captures are going on.
Change-Id: I9c7d8eb4199d290a2f35becce2541661636a26d4
Spike Sprague [Thu, 20 Mar 2014 21:13:09 +0000 (21:13 +0000)]
Merge "video bottom bar stop button tweaking" into gb-ub-photos-denali
Sascha Haeberling [Thu, 20 Mar 2014 18:43:24 +0000 (18:43 +0000)]
Merge "Add ability to add extra settings." into gb-ub-photos-denali
Sascha Haeberling [Thu, 20 Mar 2014 02:48:06 +0000 (19:48 -0700)]
Add ability to add extra settings.
Bug:
13077452
Change-Id: Id1159405d8cbbe3b84b94899b9f6352e64e428fa
Baligh Uddin [Thu, 20 Mar 2014 18:42:01 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Erin Dahlgren [Wed, 19 Mar 2014 22:58:32 +0000 (22:58 +0000)]
Merge "Prevent rapid HDR+ switching from causing illegal state." into gb-ub-photos-denali
Sascha Haeberling [Wed, 19 Mar 2014 22:15:04 +0000 (15:15 -0700)]
Disable lights-out mode.
Bug:
13546760
Change-Id: Ia45d099d991819a2705c715fe3fcac9b0c332208
Baligh Uddin [Wed, 19 Mar 2014 20:41:48 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a272ba8056cd32a6df33a5af4b84133c5b5f999
Auto-generated-cl: translation import
Erin Dahlgren [Wed, 19 Mar 2014 19:48:30 +0000 (12:48 -0700)]
Prevent rapid HDR+ switching from causing illegal state.
Bug:
13524559
Change-Id: Id8b2ebbfcdbf5e9b32a0f580adb6fe4754143396
Sam Judd [Tue, 18 Mar 2014 23:00:32 +0000 (16:00 -0700)]
Dont call requestLoadNewPhotos in secure camera mode.
Bug:
13530796
Change-Id: I6e9bb51ed529bc633511f7c29d3ac9268c617717
Erin Dahlgren [Tue, 18 Mar 2014 16:48:51 +0000 (09:48 -0700)]
Reset startup module index to default on upgrade.
Bug:
13515204
Change-Id: I69370503b9af5a4dad40f0fea7509e616173ce43
Sascha Haeberling [Tue, 18 Mar 2014 01:40:51 +0000 (01:40 +0000)]
Merge "Put resolution settings in a sub-screen." into gb-ub-photos-denali
Sascha Haeberling [Mon, 17 Mar 2014 23:45:15 +0000 (16:45 -0700)]
Put resolution settings in a sub-screen.
Bug:
13512118
Also fixes a crash when going into settings.
Change-Id: I354749e2e4180e46d888b82e2c4d479cc7c06aca
Angus Kong [Mon, 17 Mar 2014 23:32:54 +0000 (23:32 +0000)]
Merge "Refactor data model." into gb-ub-photos-denali
Angus Kong [Thu, 13 Mar 2014 19:53:03 +0000 (12:53 -0700)]
Refactor data model.
bug:
13176987
bug:
13410244
This refactor is to make the relationship between Controller, Model and View
clearer. Now controller (CameraActivity in our case) takes the full
responsibility to add/remove data. The model (CameraDataAdapter, LocalData and
its subclasses) is only responsible to store the data with correct types and
data structures. The view (Filmstrip) is a totally passive component who takes
care of how the data is presented and define how the user can interactive with
it.
The session API should not be exposed to the filmstrip MVC architecture and
instead we should make them as independent as possible. The controller should
maintain the logics of how to interact between these components.
Major changes in this CL:
1. ImageData.getContentUri() -> getUri(). The Uri is no longer a content Uri.
2. LocalDataAdapter: addNewSession() and finishSession() removed. We don't
assume the session concept in data adapters anymore.
3. LocalDataAdapter: addPhotoData() removed.
4. LocalDataAdapter: addData() added (original private in CameraDataAdapter)
5. LocalDataAdapter.Listener: onNewDataAdded() removed (since it's actually
triggered by the caller who is adding the data.)
Session API change:
CaptureSession.onPreviewUpdated() is changed to onPreviewAvailable. The module
now should decide the timing to notify the availability of the preview through
it.
CaptureSession.updatePreview(String path) is added. Not all the module can have
a preview when the session is created. Panorama/PhotoSphere creates the preview
after a background processing. The preview is stored as a file and should be
update to the internal preview storage through CaptureSession.updatePreview().
Change-Id: Id73c8f289bd4b3c13149da1b72c99fc6bab5849e
Erin Dahlgren [Mon, 17 Mar 2014 22:45:17 +0000 (22:45 +0000)]
Merge "Implement an upgrade path between old and new source files." into gb-ub-photos-denali
Sascha Haeberling [Mon, 17 Mar 2014 22:09:47 +0000 (22:09 +0000)]
Merge "New resolution settings. Two for each camera." into gb-ub-photos-denali
Sascha Haeberling [Mon, 17 Mar 2014 21:58:06 +0000 (21:58 +0000)]
Merge "Disable time-lapse as Denali doesn't contain this feature." into gb-ub-photos-denali
Sascha Haeberling [Mon, 17 Mar 2014 20:56:05 +0000 (13:56 -0700)]
Disable time-lapse as Denali doesn't contain this feature.
Bug:
13509556
Change-Id: Iad4b5f821c571627570b0bb85bafb7b5d832c0f4
Geoff Mendal [Mon, 17 Mar 2014 20:37:56 +0000 (20:37 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Geoff Mendal [Mon, 17 Mar 2014 20:06:17 +0000 (13:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93b03eeeb4f0e5f33d75b220bd79509e41cb166f
Auto-generated-cl: translation import
Erin Dahlgren [Mon, 17 Mar 2014 19:39:09 +0000 (12:39 -0700)]
Non-secure capture intents cannot support HDR+.
* We still need to find a way to avoid losing a user's HDR+ preference
when they launch a capture intent (and get booted into photo module).
Bug:
13475212
Change-Id: I9aeed950d0ace060eb2ea2a1822d91da2860fbaf
Erin Dahlgren [Mon, 17 Mar 2014 19:26:48 +0000 (12:26 -0700)]
Implement an upgrade path between old and new source files.
* applies the upgrade path to location, which needs to recovered
from the old setting in both type and source file.
Bug:
13165733
Change-Id: Icaef2c49c46acba57e59f3da3d0bc9c4f153d9cc
Erin Dahlgren [Mon, 17 Mar 2014 17:41:31 +0000 (17:41 +0000)]
Merge "Support HDR+ secure camera is user prefers." into gb-ub-photos-denali
Sascha Haeberling [Tue, 11 Mar 2014 16:44:34 +0000 (09:44 -0700)]
New resolution settings. Two for each camera.
Bug:
13025151
Bug:
13349351
Also fixes the issue of summaries not showing up before
changing a resolution setting.
Change-Id: I63482a79e742c0403ebf556148f7a12d4e6c8b0e
Erin Dahlgren [Fri, 14 Mar 2014 22:57:37 +0000 (22:57 +0000)]
Merge "Respond to menu button key events based on current view." into gb-ub-photos-denali
Erin Dahlgren [Fri, 14 Mar 2014 22:56:22 +0000 (15:56 -0700)]
Support HDR+ secure camera is user prefers.
Bug:
13475212
Change-Id: I2a061256ddc689cd6fdc6a0e9bd22c4f57aca9bb
Erin Dahlgren [Fri, 14 Mar 2014 21:10:57 +0000 (14:10 -0700)]
Respond to menu button key events based on current view.
Bug:
13347834
Change-Id: Id917bb488e7d67a233f65c4d95bdaf6c8facb33b
Spike Sprague [Fri, 14 Mar 2014 21:32:54 +0000 (14:32 -0700)]
video bottom bar stop button tweaking
bug:
13367909
Change-Id: I670350f77a1e86500a0d66f3a3fc5d7e772d0c93
Spike Sprague [Fri, 14 Mar 2014 20:33:49 +0000 (20:33 +0000)]
Merge "mode options buttons animation tweaks" into gb-ub-photos-denali
Spike Sprague [Wed, 12 Mar 2014 01:02:15 +0000 (18:02 -0700)]
mode options buttons animation tweaks
bug:
13327124
Change-Id: Iddf824d0ee9807f179501b8e391540f0e798f920
Sam Judd [Fri, 14 Mar 2014 15:28:55 +0000 (15:28 +0000)]
Merge "Show photos added to camera folder externally in filmstrip promptly." into gb-ub-photos-denali
Sam Judd [Thu, 13 Mar 2014 18:40:10 +0000 (11:40 -0700)]
Show photos added to camera folder externally in filmstrip promptly.
Bug:
13320658
Change-Id: I2f605674fdd23e31bc7567b28ba098fff59802c0
Doris Liu [Fri, 14 Mar 2014 05:58:28 +0000 (05:58 +0000)]
Merge "Mode switcher refactor for better state management" into gb-ub-photos-denali
Doris Liu [Thu, 13 Mar 2014 23:03:43 +0000 (23:03 +0000)]
Merge "Add content description to settings button for accessibility" into gb-ub-photos-denali
Doris Liu [Thu, 13 Mar 2014 22:58:51 +0000 (15:58 -0700)]
Add content description to settings button for accessibility
Bug:
13196135
Change-Id: I5730d6d55dda6658e67098b9fd14c4946ea8ee71
Doris Liu [Wed, 12 Mar 2014 20:48:05 +0000 (13:48 -0700)]
Mode switcher refactor for better state management
Also added support for mode selection during shimmy.
Bug:
13441279
Bug:
13403920
Change-Id: If7093e833b83f093b779df1d497e20ea3054c0c1
Seth Raphael [Thu, 13 Mar 2014 18:01:26 +0000 (11:01 -0700)]
Allow a session to know its content uri
Bug:
13442744
Change-Id: I8ec870ae81cf70dbdf6cab9295a4556cf9f66179
Seth Raphael [Thu, 13 Mar 2014 17:57:20 +0000 (10:57 -0700)]
Don't crash if a placeholder session is not found
When the activity crashes, sessions may still be
in progress in the service. On relaunch of the
activity the service may complete process, and
attempt to update an unknown session (as they
are currently stored in the activity).
Bug:
13421356
Change-Id: I87b1585bff1c46621aed1af18dae105f04e41268
Sascha Haeberling [Thu, 13 Mar 2014 17:38:37 +0000 (17:38 +0000)]
Merge "Make preview visibility logic more robust." into gb-ub-photos-denali
Baligh Uddin [Thu, 13 Mar 2014 16:37:34 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Sascha Haeberling [Thu, 13 Mar 2014 16:04:32 +0000 (09:04 -0700)]
Make preview visibility logic more robust.
Bug:
13213657
Bug:
13403920
Filmstrip and mode switcher are two separate entities so we need to
track their visibilities separately and derive preview visibility
from their joint state.
Change-Id: I24b810b6c2bb0ac4ec60678f92c36172242b7b1c
Erin Dahlgren [Thu, 13 Mar 2014 00:32:55 +0000 (00:32 +0000)]
Merge "Prevent VideoModule from freezing forever without triggering ANR." into gb-ub-photos-denali
Erin Dahlgren [Wed, 12 Mar 2014 23:31:12 +0000 (16:31 -0700)]
Prevent VideoModule from freezing forever without triggering ANR.
Bug:
13330215
Change-Id: I76a2c758c2e16454feebfed8b20fa0c967eda2cf
Sam Judd [Wed, 12 Mar 2014 23:23:18 +0000 (23:23 +0000)]
Merge "Use velocity to allow easier filmstrip delete gestures." into gb-ub-photos-denali
Sam Judd [Wed, 12 Mar 2014 22:48:18 +0000 (15:48 -0700)]
Use velocity to allow easier filmstrip delete gestures.
Bug:
12889007
Change-Id: I049119117a0d84e40dfa402af8cbf6313fc4d1de
Seth Raphael [Wed, 12 Mar 2014 23:05:14 +0000 (23:05 +0000)]
Merge changes Ie0d123f0,I97c1f825 into gb-ub-photos-denali
* changes:
Avoid showing old preview frames on restart.
Support cancel layout for long captures
Sam Judd [Wed, 12 Mar 2014 20:22:37 +0000 (13:22 -0700)]
Ensure the first filmstrip view appears instantly when swiping the filmstrip in.
Bug:
13329039
Change-Id: I97ae14f5a76e261ccef51f673c147297b49bc779
Seth Raphael [Tue, 11 Mar 2014 23:44:25 +0000 (16:44 -0700)]
Avoid showing old preview frames on restart.
We were previously waiting for onResume to
display the mode cover.
Now we do it in onStart if necessary. This
prevents the display of the last preview frame
or the film strip on turning the phone on and off.
Change-Id: Ie0d123f0492cdced89d8479cb511d3e22b96b5c6
Seth Raphael [Tue, 11 Mar 2014 17:52:05 +0000 (10:52 -0700)]
Support cancel layout for long captures
Bug:
12468010
Change-Id: I97c1f8254287b8a3648d21a9dbc54b5b5bc2424a
Baligh Uddin [Wed, 12 Mar 2014 19:29:56 +0000 (12:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I16f8bdb34a31f440c4bfb4581f7fe2b36f545ddf
Auto-generated-cl: translation import
Doris Liu [Wed, 12 Mar 2014 01:21:59 +0000 (01:21 +0000)]
Merge "New arrows for video recording hints" into gb-ub-photos-denali
Doris Liu [Wed, 12 Mar 2014 01:07:33 +0000 (18:07 -0700)]
New arrows for video recording hints
Bug:
13355828
Change-Id: Ibdf4ab4a310672e86b1602e88a8a243578da0386
Doris Liu [Wed, 12 Mar 2014 00:52:13 +0000 (00:52 +0000)]
Merge "Swap order of photo and video in mode drawer" into gb-ub-photos-denali
Doris Liu [Wed, 12 Mar 2014 00:48:56 +0000 (17:48 -0700)]
Swap order of photo and video in mode drawer
Bug:
13419987
Change-Id: Ic96dbb858d34beda38ec533db68ef509cc4e61a0
Erin Dahlgren [Tue, 11 Mar 2014 23:23:29 +0000 (16:23 -0700)]
Implement preview started callbacks.
This is used by RefocusModule to avoid blocking the main
thread after startPreview.
Bug:
13240688
Change-Id: Id9f719f51bb08493d6c736d90372e4dac6de1cac
Seth Raphael [Tue, 11 Mar 2014 22:58:58 +0000 (22:58 +0000)]
Merge "Clear all notifications on relaunch" into gb-ub-photos-denali
Spike Sprague [Tue, 11 Mar 2014 22:25:27 +0000 (15:25 -0700)]
moving assets around to unbreak build (Camera2 / GoogleCamera differences)
Change-Id: I1dfc3963d7d577a5404527317b0cf1813ca7f478
Spike Sprague [Tue, 11 Mar 2014 20:44:01 +0000 (20:44 +0000)]
Merge "capture button disabled states support" into gb-ub-photos-denali
Seth Raphael [Tue, 11 Mar 2014 06:14:01 +0000 (23:14 -0700)]
Clear all notifications on relaunch
Bug:
12972656
Change-Id: Id7d02685e975f12ad92e776168ea2c6728b5dab5
Seth Raphael [Tue, 11 Mar 2014 05:56:21 +0000 (22:56 -0700)]
Only show one notification at a time
Bug:
12211117
Change-Id: I32fc474f4c85ce22106383d9a3ad854c02c8653a
Spike Sprague [Sat, 8 Mar 2014 01:06:13 +0000 (17:06 -0800)]
capture button disabled states support
bug:
13244592
Change-Id: I58b1b3dada9be60ec28be0e0bab81c9dc000511b
Baligh Uddin [Tue, 11 Mar 2014 17:37:31 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
Sascha Haeberling [Tue, 11 Mar 2014 16:14:53 +0000 (09:14 -0700)]
Spring cleaning. Throwing out old cruft.
Change-Id: I99952405a0036c4a518b31e543a72a84dbe07995
Doris Liu [Tue, 11 Mar 2014 01:50:20 +0000 (01:50 +0000)]
Merge "Fix mode drawer not properly hide itself" into gb-ub-photos-denali
Doris Liu [Tue, 11 Mar 2014 01:43:09 +0000 (18:43 -0700)]
Fix mode drawer not properly hide itself
Bug:
13402877
Change-Id: I5c9777ea91fc9101a4d42f0bbf84f40c8e5fd15c
Erin Dahlgren [Tue, 11 Mar 2014 00:14:05 +0000 (00:14 +0000)]
Merge "Handle uncaught runtime exceptions from the framework." into gb-ub-photos-denali
Erin Dahlgren [Mon, 10 Mar 2014 21:40:59 +0000 (14:40 -0700)]
Handle uncaught runtime exceptions from the framework.
Bug:
12529676
Change-Id: I0319b1fa7367076f33853200b8b09a6abe7b0bdf
Seth Raphael [Mon, 10 Mar 2014 23:58:17 +0000 (16:58 -0700)]
bring comment up to date
Change-Id: If9f7d43e2680ac6210cefac30be953fb4f7a8bfb
Seth Raphael [Mon, 10 Mar 2014 23:44:07 +0000 (16:44 -0700)]
Increase opacity of mode switcher
Bug:
13213552
Change-Id: I4b9e710d20804aef68e58d571b4d7d7aab9e8397
Seth Raphael [Mon, 10 Mar 2014 23:35:34 +0000 (23:35 +0000)]
Merge changes I5d7821f8,If58fa121 into gb-ub-photos-denali
* changes:
Remove unused variables
Allow processing tasks to supply their own sessions.
Sascha Haeberling [Mon, 10 Mar 2014 23:33:37 +0000 (23:33 +0000)]
Merge "Support an abstract API for tutorials." into gb-ub-photos-denali
Seth Raphael [Mon, 10 Mar 2014 23:23:31 +0000 (16:23 -0700)]
Remove unused variables
Change-Id: I5d7821f8158438000b813bbba840c3d6fd51ab3a
Seth Raphael [Mon, 10 Mar 2014 23:23:07 +0000 (23:23 +0000)]
Merge "Hold in-progress sessions in mem, not media store" into gb-ub-photos-denali
Seth Raphael [Mon, 10 Mar 2014 23:15:13 +0000 (16:15 -0700)]
Allow processing tasks to supply their own
sessions.
This is part of a fix for
Bug:
13100494
Change-Id: If58fa1212bf666be3f974c35c6be6ef964415405
Angus Kong [Mon, 10 Mar 2014 23:00:14 +0000 (23:00 +0000)]
Merge "Checks the on view size for video preview size." into gb-ub-photos-denali
Baligh Uddin [Mon, 10 Mar 2014 22:56:26 +0000 (15:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id9135fb081b0aab3dbb8753844734dc806fb510e
Auto-generated-cl: translation import
Sascha Haeberling [Mon, 10 Mar 2014 22:35:07 +0000 (15:35 -0700)]
Support an abstract API for tutorials.
Bug:
12440059
Change-Id: I5597c3c2dc28714405bd2e148093831039af1dd2
Doris Liu [Mon, 10 Mar 2014 22:45:44 +0000 (22:45 +0000)]
Merge "Fix shimmy cold start jank" into gb-ub-photos-denali
Doris Liu [Mon, 10 Mar 2014 22:39:01 +0000 (15:39 -0700)]
Fix shimmy cold start jank
Bug:
13392593
Change-Id: I08a45bad9fc93a284a9966fa8aa8c6e13e674ae5