OSDN Git Service
Deepanshu Gupta [Mon, 18 May 2015 22:04:22 +0000 (22:04 +0000)]
Merge "Show better error message for color attr not found." into mnc-dev
Jose Lima [Mon, 18 May 2015 21:50:23 +0000 (14:50 -0700)]
Make all icon fields & extras sent to listeners backward-compatible.
This also had to be done for when retrieving existing notifications.
For final release, we will only be doing this for
notification listeners targeting older SDKs.
Bug:
21207612
Change-Id: I351f9e13cd052410e7355c956c750c3859f972cb
Chris Wren [Mon, 18 May 2015 21:51:11 +0000 (21:51 +0000)]
Merge "log notification longevity and freshness" into mnc-dev
Deepanshu Gupta [Mon, 18 May 2015 21:39:03 +0000 (14:39 -0700)]
Show better error message for color attr not found.
Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
Adam Powell [Mon, 18 May 2015 21:30:15 +0000 (21:30 +0000)]
Merge "Add Configuration data for round displays" into mnc-dev
Adam Powell [Mon, 18 May 2015 21:30:15 +0000 (21:30 +0000)]
Merge "Add -round and -notround qualifier to android runtime/aapt" into mnc-dev
Dirk Dougherty [Mon, 18 May 2015 21:22:24 +0000 (21:22 +0000)]
am
905bc335: am
bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs
* commit '
905bc335a5f5e180ef52361d72a608bde4657b03':
Doc change: edits and image updates.
Rich Slogar [Mon, 18 May 2015 21:22:19 +0000 (21:22 +0000)]
am
54f2ca6e: am
348d105e: am
4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '
54f2ca6ed4c8c224da932f2f63fdf2fbe03eea64':
docs: build-cmd-line-updates
Dirk Dougherty [Mon, 18 May 2015 21:17:51 +0000 (14:17 -0700)]
resolved conflicts for merge of
ab6d5376 to mnc-dev
Change-Id: Ice8e511bffa6a0bc3aec9e44c059a7dfde91d65f
Adam Powell [Thu, 14 May 2015 23:18:53 +0000 (16:18 -0700)]
Add Configuration data for round displays
Add round values to the screenLayout field for Configuration
and a convenience method to check roundness.
Plumb this through the DisplayManager, making roundness the property
of a DisplayAdapter. The built-in main display will read the
configuration resource config_mainBuiltInDisplayIsRound to determine
its roundness. Device-specific resource overlays should set this to
true for devices with round primary displays.
By default, this config resource inherits from the existing
config_windowIsRound value currently used by some Android Wear
device configurations.
This change awaits another for aapt/native resources code to make the
resource filtering system aware of this property.
Change-Id: I1daced7ca6d6e172789e7c32bebfd43753bfa2ae
Zhijun He [Mon, 18 May 2015 20:42:11 +0000 (20:42 +0000)]
Merge "Camera2: stop log spamming when closing a closed camera" into mnc-dev
Glenn Kasten [Mon, 18 May 2015 20:38:30 +0000 (20:38 +0000)]
Merge "Minor cleanup of comments and code" into mnc-dev
Daniel Sandler [Mon, 18 May 2015 20:21:23 +0000 (20:21 +0000)]
Merge "Make all icon fields & extras sent to listeners backward-compatible." into mnc-dev
Dan Sandler [Mon, 18 May 2015 20:11:23 +0000 (20:11 +0000)]
Merge "Remove references to nonexistant @android:string/ellipsis." into mnc-dev
Zhijun He [Mon, 18 May 2015 20:04:34 +0000 (13:04 -0700)]
Camera2: stop log spamming when closing a closed camera
Bug:
21268174
Change-Id: I711380c52f5ce9829a660c6e1b999b0377ea6c7b
Riley Andrews [Mon, 11 May 2015 23:11:01 +0000 (16:11 -0700)]
Make recents use immutable ashmem bitmaps for things it frequently passes across binder.
Bug
21037890
Change-Id: Ieb29be3ff68f3db3f07df02f171325ed77915fdf
Riley Andrews [Thu, 13 Nov 2014 00:33:52 +0000 (16:33 -0800)]
Make return of screenshotApplications an ashmem immutable bitmap.
Bug
21037890
Change-Id: I47a2ba11d26ec03a6e2e847f5af61b44efa2aa69
Riley Andrews [Mon, 11 May 2015 23:08:22 +0000 (16:08 -0700)]
Add internal bitmap api for creating immutable ashmem backed bitmaps.
Bug
21037890
Change-Id: I827e83dd75e301e7d93ead5efdd744f0d8435ae5
Riley Andrews [Fri, 14 Nov 2014 01:43:25 +0000 (17:43 -0800)]
Use ashmem to optimize all bitmap copies.
Bug
21037890
Change-Id: Ie32ca3a0c527755f1a1b77db7548cb9629e2001b
Olawale Ogunwale [Mon, 18 May 2015 19:52:37 +0000 (19:52 +0000)]
Merge "Use the correct parent size to initialize animations" into mnc-dev
Paul Jensen [Mon, 18 May 2015 19:41:08 +0000 (19:41 +0000)]
Merge "Don't leak NetworkListens in captive portal app." into mnc-dev
Deepanshu Gupta [Mon, 18 May 2015 19:30:57 +0000 (19:30 +0000)]
Merge "Fix nav bar spacing for tablets." into mnc-dev
Deepanshu Gupta [Mon, 18 May 2015 18:58:31 +0000 (11:58 -0700)]
Fix nav bar spacing for tablets.
Change-Id: Ieee2c2174a3041a0f967cc75bbe74d8bf882ced7
Joe Fernandez [Mon, 18 May 2015 18:49:31 +0000 (18:49 +0000)]
am
71bbd81f: am
a06ac3a0: docs: M Preview Content Sync #1
* commit '
71bbd81f54f19eab99dd97f955e3de37e3f8e0a3':
docs: M Preview Content Sync #1
Luan Nguyen [Mon, 18 May 2015 18:49:24 +0000 (18:49 +0000)]
am
304ed716: am
e14ffac6: am
193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs
* commit '
304ed7162de489cd1393b770460fe58a0ae91beb':
docs: Add tag heuer logo to wear landing page
Joe Fernandez [Mon, 18 May 2015 18:49:04 +0000 (18:49 +0000)]
am
14ba009a: am
6b4c3fed: docs: Refactor Google Services pages for site redesign
* commit '
14ba009a51cede3f3f4b0ae1d1e701939e3dd1dc':
docs: Refactor Google Services pages for site redesign
Dirk Dougherty [Mon, 18 May 2015 18:44:23 +0000 (18:44 +0000)]
am
bd5cf5de: Merge "Doc change: edits and image updates." into mnc-preview-docs
* commit '
bd5cf5de84d802d7858371cf1f06b47c7f7b56cf':
Doc change: edits and image updates.
Dirk Dougherty [Mon, 18 May 2015 18:33:16 +0000 (18:33 +0000)]
Merge "Doc change: edits and image updates." into mnc-preview-docs
Dirk Dougherty [Mon, 18 May 2015 18:32:09 +0000 (11:32 -0700)]
Doc change: edits and image updates.
Change-Id: Ic09da0c7cab676aa8ad4da9eae22e9c631fc288e
Jae Seo [Mon, 18 May 2015 18:10:29 +0000 (18:10 +0000)]
Merge "TIF: Pass the playback params as a whole" into mnc-dev
Jae Seo [Mon, 18 May 2015 18:05:33 +0000 (18:05 +0000)]
Merge "Make PlaybackParams parcelable" into mnc-dev
Jae Seo [Sat, 16 May 2015 00:15:48 +0000 (17:15 -0700)]
Make PlaybackParams parcelable
Bug:
21170699
Change-Id: I31b446e0b772bdfb65166564e48aa93cf73b74ae
Rich Slogar [Mon, 18 May 2015 17:39:00 +0000 (17:39 +0000)]
am
348d105e: am
4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '
348d105e3590b167330356d2ae98d341d98cb18e':
docs: build-cmd-line-updates
Derek Sollenberger [Mon, 18 May 2015 17:37:06 +0000 (17:37 +0000)]
Merge "Ensure that unparcelling Region only reads the expected number of bytes" into mnc-dev
Lajos Molnar [Mon, 18 May 2015 17:32:14 +0000 (17:32 +0000)]
Merge "media: clarify valid values in PlaybackParams and SyncParams" into mnc-dev
Rich Slogar [Mon, 18 May 2015 17:24:50 +0000 (17:24 +0000)]
am
4e793fba: Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
* commit '
4e793fba568950ee2b3758e1482006661430440e':
docs: build-cmd-line-updates
Eric Laurent [Mon, 18 May 2015 17:20:11 +0000 (17:20 +0000)]
Merge "AudioService: add missing audio becoming noisy intent" into mnc-dev
Rich Slogar [Mon, 18 May 2015 17:12:22 +0000 (17:12 +0000)]
Merge "docs: build-cmd-line-updates" into lmp-mr1-ub-docs
Abodunrinwa Toki [Mon, 18 May 2015 17:12:18 +0000 (17:12 +0000)]
Merge "Hide the floating toolbar faster." into mnc-dev
Jason Monk [Mon, 18 May 2015 17:07:31 +0000 (17:07 +0000)]
Merge "Show data icon when appropriate." into mnc-dev
Abodunrinwa Toki [Mon, 18 May 2015 16:56:53 +0000 (16:56 +0000)]
Merge "Support min/max height for FloatingToolbar overflow." into mnc-dev
Paul Jensen [Mon, 18 May 2015 16:48:28 +0000 (12:48 -0400)]
Don't leak NetworkListens in captive portal app.
Bug:
21146632
Change-Id: I934044a2eec89a47185add881a74de5669cd0f89
Robert Shih [Mon, 18 May 2015 15:56:28 +0000 (15:56 +0000)]
Merge "MediaPlayer: persistent track indices" into mnc-dev
Daniel Sandler [Sat, 16 May 2015 03:59:36 +0000 (23:59 -0400)]
Make all icon fields & extras sent to listeners backward-compatible.
For final release, we will only be doing this for
notification listeners targeting older SDKs.
Bug:
21207612
Change-Id: I28fdaa5666698150ab455f9bfb63251b9418519e
Jason Monk [Fri, 8 May 2015 14:45:15 +0000 (10:45 -0400)]
Show data icon when appropriate.
Show it in the status bar when its a default network, but always show
it in QS when its connected, so that users can know its connected.
Also fix the tests.
Bug:
18776546
Change-Id: I553588fc6850b0c2ef6e6015b313222bf4c786e7
Jason Monk [Mon, 18 May 2015 15:35:22 +0000 (15:35 +0000)]
Merge "Move NetworkController broadcasts/listeners to BG" into mnc-dev
Jason Monk [Thu, 14 May 2015 20:47:03 +0000 (16:47 -0400)]
Move NetworkController broadcasts/listeners to BG
Also do some refactoring to avoid having to sets of callback interfaces
with 75% of the same data.
Bug:
19520495
Change-Id: Ife1c71174c0d6a21f924f7de3cb2f97a04c3d5a1
Dan Sandler [Tue, 12 May 2015 19:15:08 +0000 (15:15 -0400)]
Remove references to nonexistant @android:string/ellipsis.
Also remove the symbol so nobody else accidentally depends
on it. (See change I51a6cb90 for reasons.)
Bug:
21071408
Change-Id: I2f4e5fcf859772fe636cee8be385590f54836ef7
John Spurlock [Mon, 18 May 2015 15:19:19 +0000 (15:19 +0000)]
Merge "DND: Fix locale and rtl issues in QS detail panel." into mnc-dev
John Spurlock [Mon, 18 May 2015 15:16:38 +0000 (11:16 -0400)]
DND: Fix locale and rtl issues in QS detail panel.
Bug:
21206470
Change-Id: Id84a36bf60b56ebacdf4098d0229e8fcd66aec56
Simon Baldwin [Mon, 18 May 2015 14:57:21 +0000 (14:57 +0000)]
Merge "Handle load from APK correctly for shared relro" into mnc-dev
Simon Baldwin [Fri, 15 May 2015 11:56:50 +0000 (12:56 +0100)]
Handle load from APK correctly for shared relro
Update WebViewFactory's shared relro handling so that it operates
correctly where libraries are loaded directly from APK files.
Bug: http://b/
20810492
Bug: http://b/
8076853
Change-Id: I7887c7c0f235388d6a40c366693563b4876de992
John Spurlock [Thu, 14 May 2015 20:33:59 +0000 (16:33 -0400)]
SysUI Demo Mode: Ensure we have plenty of sims.
And update some docs.
Bug:
21157785
Change-Id: I8e44e160377e66f15c6348a87326998c98cea787
Keisuke Kuroyanagi [Mon, 18 May 2015 04:57:07 +0000 (04:57 +0000)]
Merge "Fix: Drag handle isn't updated after crossing bidi boundary." into mnc-dev
Keisuke Kuroyanagi [Thu, 14 May 2015 11:10:57 +0000 (20:10 +0900)]
Fix: Drag handle isn't updated after crossing bidi boundary.
mDrawable is updated, but it was not re-drawn properly.
postInvalidate() should be called when the drawable is
updated.
Bug:
21141841
Change-Id: Icb3ddf18d05285ffa8758a9be256482d594ab8ed
Dirk Dougherty [Mon, 18 May 2015 03:48:35 +0000 (03:48 +0000)]
am
74709453: Doc change: adjust distribute and preview card grids and styles.
* commit '
747094539612e565f512e42ca9a750cb316ed573':
Doc change: adjust distribute and preview card grids and styles.
Dirk Dougherty [Fri, 15 May 2015 07:51:24 +0000 (00:51 -0700)]
Doc change: adjust distribute and preview card grids and styles.
Change-Id: I0b0fd5688c5efdb881d677173afdfb5f63d2fa73
Chris Wren [Fri, 15 May 2015 21:19:25 +0000 (17:19 -0400)]
log notification longevity and freshness
Split out monolithic visibility notifications into individual logs for
each visibility change with longevity and freshness.
Add exposure time to cancelation logs.
Bug:
20122735
Change-Id: I56c112cdb54fb65b41cfbef4c36ce8706729c5cb
Svet Ganov [Sun, 17 May 2015 07:48:57 +0000 (00:48 -0700)]
Revert a deleted file.
Change-Id: I48067da4316762e8a8a4562977c4b84655fdf0f4
Svet Ganov [Sun, 17 May 2015 05:51:50 +0000 (22:51 -0700)]
Hide platform platform legacy permissions behind a menu option - framework.
bug:
21195624
Change-Id: I563c448e2abd7d33070ed2d8f62ba1b60a3744e8
Jae Seo [Sat, 16 May 2015 00:29:39 +0000 (17:29 -0700)]
TIF: Pass the playback params as a whole
Bug:
21172914
Change-Id: I2d89f267d8d83b14b5d436304aa0ff82490211d8
Roozbeh Pournader [Sat, 16 May 2015 18:52:28 +0000 (18:52 +0000)]
Merge "Make unicodeWrap() return null if the input string is null." into mnc-dev
Roozbeh Pournader [Sat, 16 May 2015 00:34:59 +0000 (17:34 -0700)]
Make unicodeWrap() return null if the input string is null.
Previously, a NullPointerException was raised if the input was null.
Bug:
12894042
Change-Id: I5c5db484e5659659c1da91079adcba773ba7d83d
Andy Hung [Sat, 16 May 2015 04:11:07 +0000 (04:11 +0000)]
Merge "Fix SoundPool.unload() return value" into mnc-dev
Dan Sandler [Sat, 16 May 2015 03:11:52 +0000 (03:11 +0000)]
Merge "Mmm mmm mmm mmm." into mnc-dev
Glenn Kasten [Sat, 16 May 2015 02:11:55 +0000 (02:11 +0000)]
Merge "Rename mChannels to mChannelMask" into mnc-dev
Jérôme Poichet [Sat, 16 May 2015 02:05:09 +0000 (02:05 +0000)]
Merge "SkScalarDiv and its variants are deprecated" into mnc-dev
Adam Lesinski [Sat, 16 May 2015 01:47:07 +0000 (01:47 +0000)]
Merge "AAPT2: Fix layout versioning" into mnc-dev
Andy Hung [Sat, 16 May 2015 01:39:09 +0000 (18:39 -0700)]
Fix SoundPool.unload() return value
Bug:
21209627
Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53
Lajos Molnar [Sat, 16 May 2015 01:31:52 +0000 (18:31 -0700)]
media: clarify valid values in PlaybackParams and SyncParams
Bug:
21134712
Change-Id: I42182733013d70e11d8c59bf4f5daa7eeb374597
Hemant Gupta [Fri, 30 May 2014 16:55:20 +0000 (22:25 +0530)]
OBEX: Handle GET operation properly
This change handles GET operation properly whenever the
Input stream is getting aborted in between. Without this
patch it was observed that GET request was being sent by
DUT even when abort has been sent/received resulting
in IOT issues with some remote devices including PTS.
Change-Id: Idcb4ea04abb57353af5ab1fef050b3a36579892e
Robert Shih [Sat, 16 May 2015 01:08:50 +0000 (01:08 +0000)]
Merge "MediaPlayer: clean up subtitle controller log spam" into mnc-dev
Fyodor Kupolov [Sat, 16 May 2015 00:26:07 +0000 (00:26 +0000)]
Merge "Hold wakelock while dexopting" into mnc-dev
Robert Shih [Thu, 29 Jan 2015 01:50:16 +0000 (17:50 -0800)]
MediaPlayer: persistent track indices
Maintain inband (from native extractor) and out-of-band tracks (added by
client) in a single append only vector. This ensures that the same track
corresponds to the same index through out playback.
Bug:
10373268
Change-Id: I87b3ca2d2c710ee9087f7686f82ab0e018f55fd0
Robert Shih [Fri, 15 May 2015 23:56:51 +0000 (16:56 -0700)]
MediaPlayer: clean up subtitle controller log spam
- create a default SubtitleController if not set explicitly
- log warning instead of error
Bug:
17594306
Change-Id: Ie7084205b3555bdfec0a2940d0e56398f778585a
Eric Laurent [Fri, 15 May 2015 23:41:15 +0000 (16:41 -0700)]
AudioService: add missing audio becoming noisy intent
Add missing audio becoming noisy intent when the bluetooth
service is disconnected.
Bug:
21160886.
Change-Id: Idd96610a0ff824bd6337c37df60fa13f5bc6e54b
Joe Fernandez [Fri, 15 May 2015 22:59:03 +0000 (22:59 +0000)]
am
a06ac3a0: docs: M Preview Content Sync #1
* commit '
a06ac3a0d8f5e9da99107803586533503a11f60a':
docs: M Preview Content Sync #1
Adam Lesinski [Fri, 15 May 2015 22:57:01 +0000 (22:57 +0000)]
Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev
Adam Lesinski [Fri, 15 May 2015 22:49:24 +0000 (15:49 -0700)]
BatteryStats: Enable bluetooth energy collection
Device firmware has been fixed and bluetooth energy values
should be correct now.
Change-Id: I9b9eff378d81e8de4a3f475c071a4ef26cc97f21
Luan Nguyen [Fri, 15 May 2015 22:47:47 +0000 (22:47 +0000)]
am
e14ffac6: am
193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs
* commit '
e14ffac62eca9656fc552a2e4d914eaecba86b7f':
docs: Add tag heuer logo to wear landing page
Joe Fernandez [Fri, 15 May 2015 22:42:17 +0000 (15:42 -0700)]
docs: M Preview Content Sync #1
This change list is a snapshot of work in progress on other change
lists. If you have conflicts with this change, you should prefer your
own changes over what is contained in this change.
Change-Id: Ied44713d5078c938fab10d29a3b6e720559144b4
Zach Johnson [Fri, 15 May 2015 22:40:26 +0000 (22:40 +0000)]
Merge "Create unified BIND_CARRIER_SERVICES permission" into mnc-dev
Luan Nguyen [Fri, 15 May 2015 22:34:58 +0000 (22:34 +0000)]
am
193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs
* commit '
193841bebf6be4efa4e0c3a0e5e4a44ceef24f6e':
docs: Add tag heuer logo to wear landing page
Paul Mclean [Fri, 15 May 2015 22:28:31 +0000 (22:28 +0000)]
Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev
Paul Mclean [Fri, 15 May 2015 22:28:07 +0000 (22:28 +0000)]
Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"
This reverts commit
34f5e042904c22643f96d4466caa003073708b62.
Change-Id: Ie2a00ef26b20a662fb0e801925a3721804e427ba
Alan Viverette [Fri, 15 May 2015 22:25:39 +0000 (22:25 +0000)]
Merge "Return correct year in DayPickerPagerAdapter.getYearForPosition()" into mnc-dev
Alan Viverette [Fri, 15 May 2015 22:25:25 +0000 (22:25 +0000)]
Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev
Luan Nguyen [Fri, 15 May 2015 22:22:48 +0000 (22:22 +0000)]
Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs
Paul Lawrence [Fri, 15 May 2015 22:22:18 +0000 (22:22 +0000)]
Merge "DOn't save encryption settings when not encrypted" into mnc-dev
Adam Lesinski [Fri, 15 May 2015 22:18:58 +0000 (22:18 +0000)]
Merge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev
Adam Lesinski [Thu, 14 May 2015 20:57:08 +0000 (13:57 -0700)]
BatteryStatsHelper: Bluetooth wasn't being included in usage list
Bug:
20892246
Change-Id: I6eaf204a2cd970ff75704be22c9006fe4dc696cd
Jeff Tinker [Fri, 15 May 2015 22:13:32 +0000 (22:13 +0000)]
Merge "MediaDrm API Updates per api council review" into mnc-dev
Adam Lesinski [Thu, 14 May 2015 21:25:36 +0000 (14:25 -0700)]
Add -round and -notround qualifier to android runtime/aapt
The round qualifier denotes a device with a screen shape that
is round. The qualifier shows up after the 'long/notlong' qualifier
and before the orientation 'port/land/square' qualifiers.
Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
Paul McLean [Fri, 15 May 2015 22:09:07 +0000 (22:09 +0000)]
Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev
Paul McLean [Fri, 15 May 2015 20:57:03 +0000 (13:57 -0700)]
Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java
Not the cause of, but related to...
Bug:
19082426
Change-Id: I296c67989debc932838b39d63fdb57396448c50c
Jeff Sharkey [Fri, 15 May 2015 21:55:51 +0000 (21:55 +0000)]
Merge changes from topic 'bench' into mnc-dev
* changes:
Command to change force adoptable state.
Initial pass at storage benchmarks.
Alan Viverette [Fri, 15 May 2015 21:53:03 +0000 (14:53 -0700)]
Allow getChangingConfigurations() on DrawableWrapper with null drawable
Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a
Adam Lesinski [Fri, 15 May 2015 21:24:59 +0000 (21:24 +0000)]
Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev
Adam Lesinski [Fri, 15 May 2015 21:23:07 +0000 (21:23 +0000)]
Merge "Parse uid_cputime proc file" into mnc-dev
Alan Viverette [Fri, 15 May 2015 21:18:44 +0000 (14:18 -0700)]
Return correct year in DayPickerPagerAdapter.getYearForPosition()
Previously it wasn't offsetting the position by the min date's month,
so it would be off by a year if the min date wasn't in January. Also
now updates button visibility whenever the ViewPager's range changes.
Bug:
21203303
Change-Id: Id7a41a4fa48843943c744fb0fecd4bebb798cee5