OSDN Git Service
Sergio Giro [Thu, 14 Jul 2016 18:15:36 +0000 (18:15 +0000)]
Add bound checks to utf16_to_utf8 am:
1deedbacc3
am:
6feeeabd20
Change-Id: Idd7b5480cefc915dcd68aaa200571fa0d13b8007
Sergio Giro [Thu, 14 Jul 2016 18:07:33 +0000 (18:07 +0000)]
Add bound checks to utf16_to_utf8
am:
1deedbacc3
Change-Id: I05847ae2c26a266b3c05324230062757e6978fd2
Makoto Onuki [Thu, 14 Jul 2016 18:03:00 +0000 (18:03 +0000)]
Merge \"Don\'t allow shortcuts with non-main activities\" into nyc-mr1-dev
am:
e5b46f3bd5
Change-Id: I1b2e721e0bb44c35c49d8d983bc6b5a3e7a73d3d
Makoto Onuki [Thu, 14 Jul 2016 17:50:21 +0000 (17:50 +0000)]
Merge "Don't allow shortcuts with non-main activities" into nyc-mr1-dev
Makoto Onuki [Thu, 14 Jul 2016 01:03:13 +0000 (18:03 -0700)]
Don't allow shortcuts with non-main activities
Bug
30122758
Change-Id: Id9ead6706d5460fec3d68c7457e3097f30a9a080
Philip P. Moltmann [Thu, 14 Jul 2016 17:28:56 +0000 (17:28 +0000)]
Merge \"Always trigger a write if no pages are written\" into nyc-mr1-dev
am:
965a706282
Change-Id: Id046f9aef66e0217644116fe8221d05fe5e960a3
Philip P. Moltmann [Thu, 14 Jul 2016 16:21:10 +0000 (16:21 +0000)]
Merge "Always trigger a write if no pages are written" into nyc-mr1-dev
Dan Sandler [Thu, 14 Jul 2016 14:57:21 +0000 (14:57 +0000)]
WIP debugging.
am:
f3a1f2c7b0
Change-Id: Ia35ee28ca88c06630c6c5b21481c600ec0271db5
Dan Sandler [Sun, 26 Jun 2016 19:59:13 +0000 (15:59 -0400)]
WIP debugging.
Bug:
28524184
Change-Id: I0126b1db0c2346ca8d7511b80464c0239f06eeba
Geoffrey Pitsch [Thu, 14 Jul 2016 14:31:39 +0000 (14:31 +0000)]
Merge \"Fixes delay when playing first sound in BootAnimation\" into nyc-mr1-dev
am:
ebfa6df9a0
Change-Id: Id8b55b666ddd21f5ad767635ff68c2e82edfa2f8
Geoffrey Pitsch [Thu, 14 Jul 2016 14:14:57 +0000 (14:14 +0000)]
Merge "Fixes delay when playing first sound in BootAnimation" into nyc-mr1-dev
Sergio Giro [Tue, 28 Jun 2016 17:26:10 +0000 (18:26 +0100)]
Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug:
29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit
4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
Jason Monk [Thu, 14 Jul 2016 13:22:40 +0000 (13:22 +0000)]
Merge \"QS Detail: Remove up arrow\" into nyc-mr1-dev
am:
cc6e8c4611
Change-Id: Ib943c16d72ec46d053d4160ce581e7ccca7491df
Jason Monk [Thu, 14 Jul 2016 13:08:45 +0000 (13:08 +0000)]
Merge "QS Detail: Remove up arrow" into nyc-mr1-dev
Rubin Xu [Thu, 14 Jul 2016 09:55:48 +0000 (09:55 +0000)]
Merge \"Fix typo in DevicePolicyManager\" into nyc-mr1-dev
am:
74eb4a5226
Change-Id: I790597626c960f2e9cb3ffcac20f77fc2e001075
Rubin Xu [Thu, 14 Jul 2016 09:46:21 +0000 (09:46 +0000)]
Merge "Fix typo in DevicePolicyManager" into nyc-mr1-dev
Chris Banes [Thu, 14 Jul 2016 09:21:17 +0000 (09:21 +0000)]
Merge \"Read translation and elevation attributes as floats\" into nyc-mr1-dev
am:
6487312544
Change-Id: I22bdfa3abbc85ffb8de7bef62fae0e2e68e2368a
Chris Banes [Thu, 14 Jul 2016 09:11:03 +0000 (09:11 +0000)]
Merge "Read translation and elevation attributes as floats" into nyc-mr1-dev
Calin Juravle [Thu, 14 Jul 2016 08:39:22 +0000 (08:39 +0000)]
Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
am:
7366e8c16a
Change-Id: I4f54b1b9c45294b2c3c43e0027ece1e8b38e335f
Nicolas Geoffray [Thu, 14 Jul 2016 08:32:51 +0000 (08:32 +0000)]
Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
* changes:
[RFC] Special case system apps for profile optimizations
Compile core-apps according to their own "reason" for A/B
Calin Juravle [Tue, 12 Jul 2016 14:56:41 +0000 (15:56 +0100)]
[RFC] Special case system apps for profile optimizations
If the OTA updates a system app which was previously preopted to a non-
preopted state the app might end up being verified at runtime. That's
because by default the apps are verify-profile but for preopted apps
there's no profile.
Do a hacky check to ensure that if we have no profiles (a reasonable
indication that before the OTA the app was preopted) system apps get
compiled with a non-profile filter (by default interpret-only).
Bug:
30032273
Test: Andreas "has verified that Calin's change to A/B works as expected
and promotes things like SystemUI to speed. From my side, that's
ready to be merged"
Change-Id: I7a052a8ea76cab7f649dc993237ea05534d6c4b9
Justin Klaassen [Thu, 14 Jul 2016 05:15:00 +0000 (05:15 +0000)]
Merge \"Make Night display off by default\" into nyc-mr1-dev
am:
acef1eb7c6
Change-Id: Ic7de47c6ad8417ab91f2fcf981ba2f7a7828db98
Philip P. Moltmann [Thu, 14 Jul 2016 00:05:03 +0000 (17:05 -0700)]
Always trigger a write if no pages are written
If a previous write was canceled we can end up in the situation where
the layout reports "not changes since layout" but no pages have been
written.
In this case we have to trigger a write even if the layout reports that
nothing changed.
Fixes:
24110832
Change-Id: I4b3f69581e63f4084cd3712861288ded7d9c9249
Jack Yu [Thu, 14 Jul 2016 05:07:47 +0000 (05:07 +0000)]
Merge \"Disable VT when users turn off data or hit data limit\" into nyc-mr1-dev
am:
92a07ae79d
Change-Id: Ia53f350beda8d9671cb67c2a01ed0071b65c4b76
TreeHugger Robot [Thu, 14 Jul 2016 05:04:38 +0000 (05:04 +0000)]
Merge "Make Night display off by default" into nyc-mr1-dev
Jack Yu [Thu, 14 Jul 2016 04:58:53 +0000 (04:58 +0000)]
Merge "Disable VT when users turn off data or hit data limit" into nyc-mr1-dev
Michael Kwan [Thu, 14 Jul 2016 03:40:46 +0000 (03:40 +0000)]
Merge \"Update theme colours for watch type devices.\" into nyc-mr1-dev
am:
36bc5d5862
Change-Id: I885db69dcb088dd9df2418cae7b575ac00e90b3b
Michael Kwan [Thu, 14 Jul 2016 03:32:26 +0000 (03:32 +0000)]
Merge "Update theme colours for watch type devices." into nyc-mr1-dev
Erik Kline [Thu, 14 Jul 2016 03:21:57 +0000 (03:21 +0000)]
Merge \"More correctly track upstream network properties.\" into nyc-mr1-dev
am:
5cbbc02a0f
Change-Id: I8d6cbd8bb65b5c9f9701a76a34c3734db66edb27
Tomasz Mikolajewski [Thu, 14 Jul 2016 03:21:51 +0000 (03:21 +0000)]
Merge \"Fix javadoc broken links in DocumentsContract.\" into nyc-mr1-dev
am:
0e7bb571fd
Change-Id: I45a178f0897fd837307131007529286ca4af0025
TreeHugger Robot [Thu, 14 Jul 2016 03:17:04 +0000 (03:17 +0000)]
Merge "More correctly track upstream network properties." into nyc-mr1-dev
Tomasz Mikolajewski [Thu, 14 Jul 2016 03:16:40 +0000 (03:16 +0000)]
Merge "Fix javadoc broken links in DocumentsContract." into nyc-mr1-dev
Justin Klaassen [Wed, 13 Jul 2016 23:34:28 +0000 (16:34 -0700)]
Make Night display off by default
Bug:
30042357
Change-Id: Id7528ee56e162e3e2865a61273e8380ce299c0d7
Chris Craik [Thu, 14 Jul 2016 02:18:58 +0000 (02:18 +0000)]
Merge \"Fix ShadowGrid in UiBench\" into nyc-mr1-dev
am:
0c05a3dd1c
Change-Id: Ib0bdaa1f80e05f6409cbeb643e0708fac684b097
Andrew Solovay [Thu, 14 Jul 2016 02:18:51 +0000 (02:18 +0000)]
Merge \\"docs: Added link to API diff between M and N\\" into nyc-dev am:
17b221792a
am:
47912a55ac
Change-Id: I24d5a25c2fc81189a6a570381df6bff7246ade0a
Andrew Solovay [Thu, 14 Jul 2016 02:12:04 +0000 (02:12 +0000)]
Merge \\"docs: Added link to API diff between M and N\\" into nyc-dev am:
17b221792a
am:
73228f754d
Change-Id: Ib6b3d7ab22795944df5661334e8c742d6c8fe0bf
TreeHugger Robot [Thu, 14 Jul 2016 02:09:04 +0000 (02:09 +0000)]
Merge "Fix ShadowGrid in UiBench" into nyc-mr1-dev
Justin Klaassen [Thu, 14 Jul 2016 02:06:29 +0000 (02:06 +0000)]
Merge \"Add Night display QSTile\" into nyc-mr1-dev
am:
558393740d
Change-Id: I96c1a26498ae84bfc5128e2ff9fc7bf376d51d89
Andrew Solovay [Thu, 14 Jul 2016 02:05:50 +0000 (02:05 +0000)]
Merge \"docs: Added link to API diff between M and N\" into nyc-dev
am:
17b221792a
Change-Id: I96dbdbdf051b891c91421eb0bfe2080a06a006cd
Andrew Solovay [Thu, 14 Jul 2016 02:03:59 +0000 (02:03 +0000)]
Merge \"docs: Added link to API diff between M and N\" into nyc-dev
am:
17b221792a
Change-Id: I435a52f4bbf224a1f64ca2c34ea17c1e6ac779d0
Android Build Merger (Role) [Thu, 14 Jul 2016 01:59:36 +0000 (01:59 +0000)]
Merge "Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am:
f8e99e72e7 am:
ce9cf64eb3" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 14 Jul 2016 01:59:24 +0000 (01:59 +0000)]
Merge "Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am:
a7ebd4f4bb" into nyc-mr1-dev-plus-aosp
Adam Lesinski [Thu, 14 Jul 2016 01:58:58 +0000 (01:58 +0000)]
Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am:
f8e99e72e7
am:
ce9cf64eb3
Change-Id: Ie197ed068d094a6cc7a67b751ffde488d88f604b
Selim Cinek [Thu, 14 Jul 2016 01:58:52 +0000 (01:58 +0000)]
Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
am:
a7ebd4f4bb
Change-Id: Id3ffe5addb5e036eeda993d8dd6603b88c785804
Adam Lesinski [Thu, 14 Jul 2016 01:57:52 +0000 (01:57 +0000)]
Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am:
f8e99e72e7
am:
165e9d92b2
Change-Id: I184f3508fd602409d01f105500693b5d02ab37a3
TreeHugger Robot [Thu, 14 Jul 2016 01:57:09 +0000 (01:57 +0000)]
Merge "Add Night display QSTile" into nyc-mr1-dev
Andrew Solovay [Thu, 14 Jul 2016 01:52:18 +0000 (01:52 +0000)]
Merge "docs: Added link to API diff between M and N" into nyc-dev
Adam Lesinski [Thu, 14 Jul 2016 01:50:52 +0000 (01:50 +0000)]
Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am:
f8e99e72e7
Change-Id: Id29ae90fd336657d428a15fa0730b95d717386db
Adam Lesinski [Thu, 14 Jul 2016 01:50:52 +0000 (01:50 +0000)]
Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am:
f8e99e72e7
Change-Id: I71b7499c6399ecbf1d8e8d93bf410aabbb2a1044
Adam Lesinski [Thu, 14 Jul 2016 01:40:34 +0000 (01:40 +0000)]
Merge "Don't hold on to AssetManager instances" into nyc-dev
TreeHugger Robot [Thu, 14 Jul 2016 01:38:52 +0000 (01:38 +0000)]
Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
* changes:
Fixed a bug where the headsup would be stuck disappearing
Changed the appearance of phone call notifications
Phil Weaver [Thu, 14 Jul 2016 01:31:25 +0000 (01:31 +0000)]
Merge \"Behave if the same view gets a11y focus twice.\" into nyc-mr1-dev
am:
93d51af336
Change-Id: I7ea7779f5f8735d6c10743eb3e7199b5a1d6c85d
Jeff Sharkey [Thu, 14 Jul 2016 01:31:20 +0000 (01:31 +0000)]
Merge \"Preemptively add string for possible toast.\" into nyc-mr1-dev
am:
ec2ea47ead
Change-Id: I1f2578e51ae244de2a68ea72bf0bd0dd8f7e4b11
Phil Weaver [Thu, 14 Jul 2016 01:25:04 +0000 (01:25 +0000)]
Merge "Behave if the same view gets a11y focus twice." into nyc-mr1-dev
Android Build Merger (Role) [Thu, 14 Jul 2016 01:23:25 +0000 (01:23 +0000)]
Merge "Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-dev am:
9604b3803c am:
27a1e97ae4" into nyc-mr1-dev-plus-aosp
Wei Jia [Thu, 14 Jul 2016 01:22:43 +0000 (01:22 +0000)]
Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-dev am:
9604b3803c
am:
27a1e97ae4
Change-Id: I4ef412061dc509c0deee145cdeb09afeb3032df2
Wei Jia [Thu, 14 Jul 2016 01:22:26 +0000 (01:22 +0000)]
Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-dev am:
9604b3803c
am:
44d76c7a72
Change-Id: I633e9505a0a7a733ebc7432b23987b513a6fd655
TreeHugger Robot [Thu, 14 Jul 2016 01:16:37 +0000 (01:16 +0000)]
Merge "Preemptively add string for possible toast." into nyc-mr1-dev
Wei Jia [Thu, 14 Jul 2016 01:14:42 +0000 (01:14 +0000)]
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-dev
am:
9604b3803c
Change-Id: Ibbb2272be91fb6c79795566cb9928bfb8adde002
Wei Jia [Thu, 14 Jul 2016 01:14:40 +0000 (01:14 +0000)]
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-dev
am:
9604b3803c
Change-Id: I080b409a7f73cfadd5103efbbe563184d57f63d7
TreeHugger Robot [Thu, 14 Jul 2016 01:07:13 +0000 (01:07 +0000)]
Merge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-dev
Michael Kwan [Thu, 14 Jul 2016 00:41:29 +0000 (17:41 -0700)]
Update theme colours for watch type devices.
Bug:
26914376
Change-Id: I127a9404fa8dea2db6c3196742566f8d12ccb113
Adam Lesinski [Wed, 13 Jul 2016 19:09:24 +0000 (12:09 -0700)]
Don't hold on to AssetManager instances
If we enter multi-window mode or load WebView
assets into a Resources object, then the underlying
AssetManager instance may change.
crbug.com/627586
Bug:
30118654
Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
Daniel Nishi [Thu, 14 Jul 2016 00:20:25 +0000 (00:20 +0000)]
Merge \"Give the default storage manager access to the storage permissions.\" into nyc-mr1-dev
am:
0e5ac11d30
Change-Id: I15b7c3b9b2a2c4d4f62480effafd063d79a92dd2
Android Build Merger (Role) [Thu, 14 Jul 2016 00:15:42 +0000 (00:15 +0000)]
Merge "Merge \\"Don\\'t dump stack traces for background ANRs.\\" into nyc-dev am:
b2b203ae13 am:
d14f678120" into nyc-mr1-dev-plus-aosp
Tim Murray [Thu, 14 Jul 2016 00:15:19 +0000 (00:15 +0000)]
Merge \\"Don\\'t dump stack traces for background ANRs.\\" into nyc-dev am:
b2b203ae13
am:
d14f678120
Change-Id: Iccd496d03aa1b3ea545d75e87576e9de90825f90
Tim Murray [Thu, 14 Jul 2016 00:14:54 +0000 (00:14 +0000)]
Merge \\"Don\\'t dump stack traces for background ANRs.\\" into nyc-dev am:
b2b203ae13
am:
a7a3427425
Change-Id: Iba6c0ba7dfbdddb51b0259524def8a5ebc26ff31
TreeHugger Robot [Thu, 14 Jul 2016 00:13:46 +0000 (00:13 +0000)]
Merge "Give the default storage manager access to the storage permissions." into nyc-mr1-dev
Andrew Sapperstein [Thu, 14 Jul 2016 00:08:21 +0000 (00:08 +0000)]
Merge \"Use colorControlHighlight for print button ripple.\" into nyc-mr1-dev
am:
4e5008c4c5
Change-Id: Ide94360486909773a55734140efd3d29adfdd239
Wei Liu [Thu, 14 Jul 2016 00:08:07 +0000 (00:08 +0000)]
Merge \"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\" into nyc-mr1-dev
am:
6e8630307a
Change-Id: I7e381d5d62f9c79b0c604518ff6ea2d1d9c38dc4
Tim Murray [Thu, 14 Jul 2016 00:07:51 +0000 (00:07 +0000)]
Merge \"Don\'t dump stack traces for background ANRs.\" into nyc-dev
am:
b2b203ae13
Change-Id: I0777b4d28be2601425b6fe7f51f3ec7dc5635c6e
Tim Murray [Thu, 14 Jul 2016 00:07:49 +0000 (00:07 +0000)]
Merge \"Don\'t dump stack traces for background ANRs.\" into nyc-dev
am:
b2b203ae13
Change-Id: Iea2c941636c829b687470244cff22a03ea51d9f7
Tim Murray [Thu, 14 Jul 2016 00:00:29 +0000 (00:00 +0000)]
Merge "Don't dump stack traces for background ANRs." into nyc-dev
Andrew Sapperstein [Thu, 14 Jul 2016 00:00:25 +0000 (00:00 +0000)]
Merge "Use colorControlHighlight for print button ripple." into nyc-mr1-dev
Wei Liu [Wed, 13 Jul 2016 23:59:27 +0000 (23:59 +0000)]
Merge "Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting." into nyc-mr1-dev
Fyodor Kupolov [Wed, 13 Jul 2016 23:53:47 +0000 (23:53 +0000)]
Merge \"Disallow safe boot when in demo mode\" into nyc-mr1-dev
am:
f61eb922f9
Change-Id: I2a8afd796453633cab0fbb0803c4c34a61ac3657
Annie Chin [Wed, 13 Jul 2016 23:53:42 +0000 (23:53 +0000)]
Merge \"Set mContext scope to protected.\" into nyc-mr1-dev
am:
8709d0fce8
Change-Id: I23720c8a6f577da910a45bbbc4373f1ad9256ce8
Doris Liu [Wed, 13 Jul 2016 23:45:53 +0000 (23:45 +0000)]
Merge \"Fix use-after-free in vector drawable animation\" into nyc-mr1-dev
am:
133ab10464
Change-Id: Ice990efd5e8a2554c8a57b191e4d288971270919
Annie Chin [Wed, 13 Jul 2016 23:45:46 +0000 (23:45 +0000)]
Merge \"Add setLandscape() method to ButtonInterface\" into nyc-mr1-dev
am:
3372c90cd7
Change-Id: I13122883867f1af0a9b74d196f569230525a1a9b
TreeHugger Robot [Wed, 13 Jul 2016 23:45:38 +0000 (23:45 +0000)]
Merge "Disallow safe boot when in demo mode" into nyc-mr1-dev
Annie Chin [Wed, 13 Jul 2016 23:42:03 +0000 (23:42 +0000)]
Merge "Set mContext scope to protected." into nyc-mr1-dev
Annie Chin [Fri, 8 Jul 2016 21:52:00 +0000 (14:52 -0700)]
Set mContext scope to protected.
Bug:
29582254
Change-Id: I5c9861373b712a4bd9e5f1fba1e638d1ff6be170
Doris Liu [Wed, 13 Jul 2016 23:38:10 +0000 (23:38 +0000)]
Merge "Fix use-after-free in vector drawable animation" into nyc-mr1-dev
Annie Chin [Wed, 13 Jul 2016 23:35:08 +0000 (23:35 +0000)]
Merge "Add setLandscape() method to ButtonInterface" into nyc-mr1-dev
Jack Yu [Fri, 8 Jul 2016 21:28:51 +0000 (14:28 -0700)]
Disable VT when users turn off data or hit data limit
Disable VT when users turn off data or hit data limit. If
there are ongoing VT calls, we'll need to downgrade them
to VoLTE calls.
bug:
27316521
Change-Id: I89fe42f6cf6c419c21c4f2006e9cb43cf7e13503
Android Build Merger (Role) [Wed, 13 Jul 2016 23:27:16 +0000 (23:27 +0000)]
Merge "Merge \"Merge \\"Doc: Minor fixes following launch of Performance section on DAC.\\" into nyc-dev am:
419dbdb538\" into nyc-mr1-dev am:
30c4050703" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 13 Jul 2016 23:27:06 +0000 (23:27 +0000)]
Merge "Merge \"Merge \\"Avoid throwing when 0 size layer requested\\" into nyc-dev am:
807989facd\" into nyc-mr1-dev am:
eaeee37417" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 13 Jul 2016 23:26:56 +0000 (23:26 +0000)]
Merge "Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev am:
2e42020eab" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 13 Jul 2016 23:26:46 +0000 (23:26 +0000)]
Merge "Merge \"Ensure we pass correct values into the next transition start bounds.\" into nyc-mr1-dev am:
7a07477cff" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 13 Jul 2016 23:26:36 +0000 (23:26 +0000)]
Merge "Merge \"Remove subtle dependencies\" into nyc-mr1-dev am:
c8daad4290" into nyc-mr1-dev-plus-aosp
David Friedman [Wed, 13 Jul 2016 23:25:55 +0000 (23:25 +0000)]
Merge \"Merge \\"Doc: Minor fixes following launch of Performance section on DAC.\\" into nyc-dev am:
419dbdb538\" into nyc-mr1-dev
am:
30c4050703
Change-Id: I53264f1eb42982c23d96f34277d03d166e6bd156
Chris Craik [Wed, 13 Jul 2016 23:25:51 +0000 (23:25 +0000)]
Merge \"Merge \\"Avoid throwing when 0 size layer requested\\" into nyc-dev am:
807989facd\" into nyc-mr1-dev
am:
eaeee37417
Change-Id: I2830b891fcce6f3d55922c8fc42ec4d6ab77798b
Ashutosh Joshi [Wed, 13 Jul 2016 23:25:48 +0000 (23:25 +0000)]
Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev
am:
2e42020eab
Change-Id: Ie2899e0eb301fd33ca2546fe854a5109a24906b2
Winson [Wed, 13 Jul 2016 23:25:42 +0000 (23:25 +0000)]
Merge \"Ensure we pass correct values into the next transition start bounds.\" into nyc-mr1-dev
am:
7a07477cff
Change-Id: Ic9e75c9baa9eeaad5c870f8d9a9da843eeb96371
Joe Fernandez [Wed, 13 Jul 2016 23:25:41 +0000 (23:25 +0000)]
Merge \\"Doc: Minor fixes following launch of Performance section on DAC.\\" into nyc-dev am:
419dbdb538
am:
2d03a0c9c4
Change-Id: I9dcec2bc2907c66cbe99b9e2798db048f01eb57d
Todd Kennedy [Wed, 13 Jul 2016 23:25:38 +0000 (23:25 +0000)]
Merge \"Remove subtle dependencies\" into nyc-mr1-dev
am:
c8daad4290
Change-Id: Ifd04d3076a1bd1564c58f525275b6f4e51e2abdc
Chris Craik [Wed, 13 Jul 2016 23:25:38 +0000 (23:25 +0000)]
Merge \\"Avoid throwing when 0 size layer requested\\" into nyc-dev am:
807989facd
am:
9014be18b3
Change-Id: I71d6bc566e061f1bce5075ca9f09119623b230f3
Wei Jia [Thu, 7 Jul 2016 23:08:30 +0000 (16:08 -0700)]
MediaDataSource: add DrmInitialization for IDataSource.
Bug:
29342399
Bug:
28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
(cherry picked from commit
a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4)
David Friedman [Wed, 13 Jul 2016 23:15:39 +0000 (23:15 +0000)]
Merge \"Doc: Minor fixes following launch of Performance section on DAC.\" into nyc-dev
am:
419dbdb538
Change-Id: I619eefcc177dfd980ed5005e9df7a428b75f0418
Chris Craik [Wed, 13 Jul 2016 23:15:35 +0000 (23:15 +0000)]
Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev
am:
807989facd
Change-Id: I09c2114b0ff2aa1badb414da9b3b5cd2bbd63669
OSDN Git Service
