OSDN Git Service
Jeff Sharkey [Thu, 14 Jul 2016 01:36:21 +0000 (01:36 +0000)]
Merge \\"Preemptively add string for possible toast.\\" into nyc-mr1-dev am:
ec2ea47ead
am:
53a160fa30
Change-Id: I68bd4aac7f1766152fbb976233340737e6e02ee4
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
Wei Jia [Thu, 14 Jul 2016 01:30:55 +0000 (01:30 +0000)]
Merge \"Merge \\\"MediaDataSource: add DrmInitialization for IDataSource.\\\" into nyc-dev am:
9604b3803c am:
27a1e97ae4\" into nyc-mr1-dev-plus-aosp
am:
ed9e4272ae
Change-Id: Ic61addb058963765d23711eb20dba1e556965897
Wei Jia [Thu, 14 Jul 2016 01:29:37 +0000 (01:29 +0000)]
Merge \\\"MediaDataSource: add DrmInitialization for IDataSource.\\\" into nyc-dev am:
9604b3803c am:
44d76c7a72
am:
b249bd886e
Change-Id: Ie96308895c2dd56f309a8c98847f38d19d903977
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
Android Build Merger (Role) [Thu, 14 Jul 2016 00:37:05 +0000 (00:37 +0000)]
Merge "[NAN] Provide inteface MAC address to app. am:
d097f8a4e5"
Etan Cohen [Thu, 14 Jul 2016 00:36:30 +0000 (00:36 +0000)]
[NAN] Provide inteface MAC address to app.
am:
d097f8a4e5
Change-Id: I62b0b2cfd4a95c23b89c938cef1118ab81c304ce
Daniel Nishi [Thu, 14 Jul 2016 00:36:20 +0000 (00:36 +0000)]
Merge \\"Give the default storage manager access to the storage permissions.\\" into nyc-mr1-dev am:
0e5ac11d30
am:
dc327ee129
Change-Id: I764e9138b6517452719a91018f50cccb614e24ac
TreeHugger Robot [Thu, 14 Jul 2016 00:31:02 +0000 (00:31 +0000)]
Merge "Follow up changes from ag/
1190582."
Tim Murray [Thu, 14 Jul 2016 00:27:07 +0000 (00:27 +0000)]
Merge \"Merge \\\"Don\\\'t dump stack traces for background ANRs.\\\" into nyc-dev am:
b2b203ae13 am:
d14f678120\" into nyc-mr1-dev-plus-aosp
am:
b95b0641b5
Change-Id: Ib066814d0430d64c0b396ddeab98dd84554c8e7c
Tim Murray [Thu, 14 Jul 2016 00:27:03 +0000 (00:27 +0000)]
Merge \\\"Don\\\'t dump stack traces for background ANRs.\\\" into nyc-dev am:
b2b203ae13 am:
a7a3427425
am:
40d4e97da7
Change-Id: I570941b6e1bca80d8e3f6d8e3596ad2e04ab7fc3
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
Evan Rosky [Thu, 14 Jul 2016 00:19:07 +0000 (00:19 +0000)]
Merge "Add a flag that prevents resuming previous user after guest logout"
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
Andrew Sapperstein [Thu, 14 Jul 2016 00:15:39 +0000 (00:15 +0000)]
Merge \\"Use colorControlHighlight for print button ripple.\\" into nyc-mr1-dev am:
4e5008c4c5
am:
69bee9bbcc
Change-Id: Ief89eaba89b1aea04b96a5e3b864c385f74388f3
Wei Liu [Thu, 14 Jul 2016 00:15:25 +0000 (00:15 +0000)]
Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\\" into nyc-mr1-dev am:
6e8630307a
am:
05c2c22a80
Change-Id: I8af1193d4af465f234c8ba08ff0eeefa7279e029
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
Fyodor Kupolov [Thu, 14 Jul 2016 00:15:15 +0000 (00:15 +0000)]
Merge \\"Disallow safe boot when in demo mode\\" into nyc-mr1-dev am:
f61eb922f9
am:
71d286a45d
Change-Id: I75374581e5bf4f14eccb581b0895ea204223fa1a
Annie Chin [Thu, 14 Jul 2016 00:15:10 +0000 (00:15 +0000)]
Merge \\"Set mContext scope to protected.\\" into nyc-mr1-dev am:
8709d0fce8
am:
e4747b39f0
Change-Id: If9d00d81152583305c6d526bf5c9e72281edc19c
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
Doris Liu [Wed, 13 Jul 2016 23:58:31 +0000 (23:58 +0000)]
Merge \\"Fix use-after-free in vector drawable animation\\" into nyc-mr1-dev am:
133ab10464
am:
7628ae28d5
Change-Id: I908b552335f10a8570a367d017741c0b76622948
Annie Chin [Wed, 13 Jul 2016 23:58:24 +0000 (23:58 +0000)]
Merge \\"Add setLandscape() method to ButtonInterface\\" into nyc-mr1-dev am:
3372c90cd7
am:
6de0295b30
Change-Id: I0621d0ddadb0f054e096c3dc2a941276be90e3b7
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
David Friedman [Wed, 13 Jul 2016 23:49:17 +0000 (23:49 +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
am:
81d835b902
Change-Id: Iaccee7f89656032d351f7024f585b5c663575900
Chris Craik [Wed, 13 Jul 2016 23:49:14 +0000 (23:49 +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
am:
04fd0ab1c4
Change-Id: If57d409bb6cdd86fd8ba613857e0e34034abc2ee
Ashutosh Joshi [Wed, 13 Jul 2016 23:46:22 +0000 (23:46 +0000)]
Merge \"Merge \\"Add state for loading/unloading apps\\" into nyc-mr1-dev am:
2e42020eab\" into nyc-mr1-dev-plus-aosp
am:
5c99851d23
Change-Id: I0f52f1406840b9ddcfe9dd30c19c5ea01755039f
Winson [Wed, 13 Jul 2016 23:46:18 +0000 (23:46 +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
am:
51649da59b
Change-Id: I36a82119ee7e7aace1e42d44a208432a91b68610
Todd Kennedy [Wed, 13 Jul 2016 23:46:15 +0000 (23:46 +0000)]
Merge \"Merge \\"Remove subtle dependencies\\" into nyc-mr1-dev am:
c8daad4290\" into nyc-mr1-dev-plus-aosp
am:
d49214900b
Change-Id: Ic6c7a96df4013ddd6b3844ba8cb9fc99ff7a483c
David Friedman [Wed, 13 Jul 2016 23:46:11 +0000 (23:46 +0000)]
Merge \\\"Doc: Minor fixes following launch of Performance section on DAC.\\\" into nyc-dev am:
419dbdb538 am:
2d03a0c9c4
am:
cc3108d937
Change-Id: Iad773758f0d4da12a9f6a0363055ef245459d8ca
Chris Craik [Wed, 13 Jul 2016 23:46:07 +0000 (23:46 +0000)]
Merge \\\"Avoid throwing when 0 size layer requested\\\" into nyc-dev am:
807989facd am:
9014be18b3
am:
f7b3896358
Change-Id: I2569f151a34fd5ca62a1b70c041b17603920ed27
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
Cheryl Potter [Wed, 13 Jul 2016 23:31:23 +0000 (23:31 +0000)]
Merge \\"Fix QS gear metrics\\" into nyc-mr1-dev am:
f90128c68d
am:
ba3cd6d662
Change-Id: Id2a3ebc8ba2b9c12db758da3d30683b5281df8dc
Jason Monk [Wed, 13 Jul 2016 23:31:20 +0000 (23:31 +0000)]
Merge \\"Make Recents button work in demo mode\\" into nyc-mr1-dev am:
9f311f6827
am:
06da9f8b54
Change-Id: Ibdf19d559d4485ec4d0084470290f1f8fe4f841f
Amith Yamasani [Wed, 13 Jul 2016 23:31:17 +0000 (23:31 +0000)]
Merge \\"Revert \\"Add state for loading/unloading apps\\"\\" into nyc-mr1-dev am:
0aee1b4163
am:
c1262d4505
Change-Id: Ica31492eb5cb8839483854f9ca075b39756759be
Ashutosh Joshi [Wed, 13 Jul 2016 23:31:13 +0000 (23:31 +0000)]
Merge \\"MediaPlayer: fix typo for OnInfoListener.\\" into nyc-mr1-dev am:
ebc3c9ca3f
am:
3ed59e2fda
Change-Id: Ib10558712b5e7abe1b0a853eceb4c20beacd6153
Wei Jia [Wed, 13 Jul 2016 23:31:10 +0000 (23:31 +0000)]
Merge \\"Fix disabling lockscreen for demo users.\\" into nyc-mr1-dev am:
407fd1ea62
am:
3b098778c6
Change-Id: I66a5393837e3ec0286be28f766a603da844ce6fc
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
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
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
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)
Sudheer Shanka [Wed, 13 Jul 2016 23:23:58 +0000 (23:23 +0000)]
Merge \"Merge \\"Fix disabling lockscreen for demo users.\\" into nyc-mr1-dev am:
55c7c9c2d4\" into nyc-mr1-dev-plus-aosp
am:
cacf91e466
Change-Id: I9f3a9dcfdf89343446b9dd2a63ec256459fbf9f7
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
Jason Monk [Wed, 13 Jul 2016 23:15:27 +0000 (23:15 +0000)]
Merge \"Fix QS gear metrics\" into nyc-mr1-dev
am:
f90128c68d
Change-Id: I393964bb34fd9b318590ea135d05fa1220c569fa
Amith Yamasani [Wed, 13 Jul 2016 23:15:21 +0000 (23:15 +0000)]
Merge \"Make Recents button work in demo mode\" into nyc-mr1-dev
am:
9f311f6827
Change-Id: Ife4a233149a90678d2ac55d473ae32a05020666c
Ashutosh Joshi [Wed, 13 Jul 2016 23:15:16 +0000 (23:15 +0000)]
Merge \"Revert \"Add state for loading/unloading apps\"\" into nyc-mr1-dev
am:
0aee1b4163
Change-Id: Ifef46e91e84046aee792b14c36b42edd613406e1
Wei Jia [Wed, 13 Jul 2016 23:15:10 +0000 (23:15 +0000)]
Merge \"MediaPlayer: fix typo for OnInfoListener.\" into nyc-mr1-dev
am:
ebc3c9ca3f
Change-Id: I768ec161cc5350d6014127269c9b1f0901a1a923
Sudheer Shanka [Wed, 13 Jul 2016 23:15:03 +0000 (23:15 +0000)]
Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev
am:
407fd1ea62
Change-Id: I5625a9ef9fd35ee0cbf6cad7651f7a39eee8f059
Cheryl Potter [Wed, 13 Jul 2016 23:13:54 +0000 (23:13 +0000)]
Merge \\\"docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484\\\" into nyc-dev am:
e820803172 am:
cdbf1ec394
am:
0357ea4076
Change-Id: Iae774a00eee113d9f54c225fd0a3da30e6d49d97
Etan Cohen [Wed, 13 Jul 2016 23:06:49 +0000 (23:06 +0000)]
[NAN] Add (T)LV validation testing
am:
c13b9f6b7d
Change-Id: I45f0ebc14c06fd869309b569adb2e5fd87c5cc28
Android Build Merger (Role) [Wed, 13 Jul 2016 23:06:25 +0000 (23:06 +0000)]
Merge "Merge \"Doc: Minor fixes following launch of Performance section on DAC.\" into nyc-dev am:
419dbdb538" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 13 Jul 2016 23:06:16 +0000 (23:06 +0000)]
Merge "Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev am:
807989facd" into nyc-mr1-dev
David Friedman [Wed, 13 Jul 2016 23:05:56 +0000 (23:05 +0000)]
Merge \"Doc: Minor fixes following launch of Performance section on DAC.\" into nyc-dev
am:
419dbdb538
Change-Id: I2540f9ddfe0bd3e8fb1e18ad019276369d76f83b
Chris Craik [Wed, 13 Jul 2016 23:05:53 +0000 (23:05 +0000)]
Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev
am:
807989facd
Change-Id: Ie5ed67db841478cb6bbc6b90f768521d049833e6
Ashutosh Joshi [Wed, 13 Jul 2016 23:04:46 +0000 (23:04 +0000)]
Merge "Add state for loading/unloading apps" into nyc-mr1-dev
Tim Murray [Wed, 13 Jul 2016 20:33:28 +0000 (13:33 -0700)]
Don't dump stack traces for background ANRs.
Dumping stack traces can be extremely expensive, and doing so for
background applications often has extremely negative side effects for
foreground applications. This can be exacerbated by resource-intensive
applications, because those may exhibit thermal throttling in the first
place. For such applications, the additional performance hit caused by
stack dumps may be catastrophic.
Instead, don't dump stack traces for background ANRs except for the app
that actually ANR'd.
bug
30112521
Change-Id: I8a05059343254861c436a193690cd1c50a95d674
Joe Fernandez [Wed, 13 Jul 2016 23:00:26 +0000 (23:00 +0000)]
Merge "Doc: Minor fixes following launch of Performance section on DAC." into nyc-dev
Winson Chung [Wed, 13 Jul 2016 22:56:50 +0000 (22:56 +0000)]
Merge "Ensure we pass correct values into the next transition start bounds." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 22:55:35 +0000 (22:55 +0000)]
Merge "Remove subtle dependencies" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 13 Jul 2016 22:51:40 +0000 (22:51 +0000)]
Merge "Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev am:
55c7c9c2d4" into nyc-mr1-dev-plus-aosp
Sudheer Shanka [Wed, 13 Jul 2016 22:51:14 +0000 (22:51 +0000)]
Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev
am:
55c7c9c2d4
Change-Id: I2b8d701ead03df661a98679cd4ad743b4a964ea1
Cheryl Potter [Wed, 13 Jul 2016 22:50:23 +0000 (22:50 +0000)]
Merge \\"docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484\\" into nyc-dev am:
e820803172
am:
cdbf1ec394
Change-Id: I823b7ad870632c26a9ef9d8ab71d1be18b6ca0d8
Chris Craik [Wed, 13 Jul 2016 22:49:19 +0000 (22:49 +0000)]
Merge "Avoid throwing when 0 size layer requested" into nyc-dev
Cheryl Potter [Wed, 13 Jul 2016 22:44:28 +0000 (22:44 +0000)]
Merge \"docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484\" into nyc-dev
am:
e820803172
Change-Id: Ib3f7b1971925f8cfd2cf29bf156021bfe43ff264
Android Build Merger (Role) [Wed, 13 Jul 2016 22:40:08 +0000 (22:40 +0000)]
Merge "Merge \"docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484\" into nyc-dev am:
e820803172" into nyc-mr1-dev
Cheryl Potter [Wed, 13 Jul 2016 22:39:46 +0000 (22:39 +0000)]
Merge \"docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484\" into nyc-dev
am:
e820803172
Change-Id: I2f0c8e31b9a4e2427166e170f55c2e1c8729cd82
TreeHugger Robot [Wed, 13 Jul 2016 22:39:34 +0000 (22:39 +0000)]
Merge "Fix QS gear metrics" into nyc-mr1-dev
Jeff Sharkey [Wed, 13 Jul 2016 22:32:25 +0000 (16:32 -0600)]
Preemptively add string for possible toast.
Bug:
30033319
Change-Id: I4daf4d35656514a835bed1b255dd48f3a0eeb845
TreeHugger Robot [Wed, 13 Jul 2016 22:37:30 +0000 (22:37 +0000)]
Merge "Make Recents button work in demo mode" into nyc-mr1-dev
Evan Rosky [Fri, 1 Jul 2016 00:59:39 +0000 (17:59 -0700)]
Add a flag that prevents resuming previous user after guest logout
Bug:
27502832
Change-Id: I0db289c6391761ff104da823cc2693bdb4258294
(cherry picked from commit
2742c98097c6433044d3b7e858bd977ff3513ebf)