Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
263,092 Commits 3 Branches 0 Tags
40d4e97da7bb462edbc855f1fbe167fc3f8e6f0b
Commit Graph

263092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Murray
40d4e97da7 Merge \\"Don\\'t dump stack traces for background ANRs.\\" into nyc-dev am: b2b203ae13 
am: a7a3427425

Change-Id: Iba6c0ba7dfbdddb51b0259524def8a5ebc26ff31
 2016-07-14 00:14:54 +00:00
Andrew Sapperstein
69bee9bbcc Merge \"Use colorControlHighlight for print button ripple.\" into nyc-mr1-dev 
am: 4e5008c4c5

Change-Id: Ide94360486909773a55734140efd3d29adfdd239
 2016-07-14 00:08:21 +00:00
Wei Liu
05c2c22a80 Merge \"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\" into nyc-mr1-dev 
am: 6e8630307a

Change-Id: I7e381d5d62f9c79b0c604518ff6ea2d1d9c38dc4
 2016-07-14 00:08:07 +00:00
Tim Murray
a7a3427425 Merge \"Don\'t dump stack traces for background ANRs.\" into nyc-dev 
am: b2b203ae13

Change-Id: I0777b4d28be2601425b6fe7f51f3ec7dc5635c6e
 2016-07-14 00:07:51 +00:00
Tim Murray
b2b203ae13 Merge "Don't dump stack traces for background ANRs." into nyc-dev 2016-07-14 00:00:30 +00:00
Andrew Sapperstein
4e5008c4c5 Merge "Use colorControlHighlight for print button ripple." into nyc-mr1-dev 2016-07-14 00:00:26 +00:00
Wei Liu
6e8630307a Merge "Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting." into nyc-mr1-dev 2016-07-13 23:59:28 +00:00
Fyodor Kupolov
71d286a45d Merge \"Disallow safe boot when in demo mode\" into nyc-mr1-dev 
am: f61eb922f9

Change-Id: I2a8afd796453633cab0fbb0803c4c34a61ac3657
 2016-07-13 23:53:47 +00:00
Annie Chin
e4747b39f0 Merge \"Set mContext scope to protected.\" into nyc-mr1-dev 
am: 8709d0fce8

Change-Id: I23720c8a6f577da910a45bbbc4373f1ad9256ce8
 2016-07-13 23:53:42 +00:00
Doris Liu
7628ae28d5 Merge \"Fix use-after-free in vector drawable animation\" into nyc-mr1-dev 
am: 133ab10464

Change-Id: Ice990efd5e8a2554c8a57b191e4d288971270919
 2016-07-13 23:45:53 +00:00
Annie Chin
6de0295b30 Merge \"Add setLandscape() method to ButtonInterface\" into nyc-mr1-dev 
am: 3372c90cd7

Change-Id: I13122883867f1af0a9b74d196f569230525a1a9b
 2016-07-13 23:45:46 +00:00
TreeHugger Robot
f61eb922f9 Merge "Disallow safe boot when in demo mode" into nyc-mr1-dev 2016-07-13 23:45:39 +00:00
Annie Chin
8709d0fce8 Merge "Set mContext scope to protected." into nyc-mr1-dev 2016-07-13 23:42:04 +00:00
Annie Chin
4c249ff7a0 Set mContext scope to protected. 
Bug: 29582254
Change-Id: I5c9861373b712a4bd9e5f1fba1e638d1ff6be170
 2016-07-13 16:39:14 -07:00
Doris Liu
133ab10464 Merge "Fix use-after-free in vector drawable animation" into nyc-mr1-dev 2016-07-13 23:38:12 +00:00
Annie Chin
3372c90cd7 Merge "Add setLandscape() method to ButtonInterface" into nyc-mr1-dev 2016-07-13 23:35:09 +00:00
Android Build Merger (Role)
81d835b902 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 2016-07-13 23:27:18 +00:00
Android Build Merger (Role)
04fd0ab1c4 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 2016-07-13 23:27:08 +00:00
Android Build Merger (Role)
5c99851d23 Merge "Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev am: 2e42020eab" into nyc-mr1-dev-plus-aosp 2016-07-13 23:26:57 +00:00
Android Build Merger (Role)
51649da59b 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 2016-07-13 23:26:47 +00:00
Android Build Merger (Role)
d49214900b Merge "Merge \"Remove subtle dependencies\" into nyc-mr1-dev am: c8daad4290" into nyc-mr1-dev-plus-aosp 2016-07-13 23:26:37 +00:00
David Friedman
2dfd8d02bd 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
 2016-07-13 23:25:55 +00:00
Chris Craik
82a0932278 Merge \"Merge \\"Avoid throwing when 0 size layer requested\\" into nyc-dev am: 807989facd\" into nyc-mr1-dev 
am: eaeee37417

Change-Id: I2830b891fcce6f3d55922c8fc42ec4d6ab77798b
 2016-07-13 23:25:51 +00:00
Ashutosh Joshi
d9a081e27a Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev 
am: 2e42020eab

Change-Id: Ie2899e0eb301fd33ca2546fe854a5109a24906b2
 2016-07-13 23:25:48 +00:00
Winson
82b1cae7e3 Merge \"Ensure we pass correct values into the next transition start bounds.\" into nyc-mr1-dev 
am: 7a07477cff

Change-Id: Ic9e75c9baa9eeaad5c870f8d9a9da843eeb96371
 2016-07-13 23:25:42 +00:00
Joe Fernandez
cc3108d937 Merge \\"Doc: Minor fixes following launch of Performance section on DAC.\\" into nyc-dev am: 419dbdb538 
am: 2d03a0c9c4

Change-Id: I9dcec2bc2907c66cbe99b9e2798db048f01eb57d
 2016-07-13 23:25:41 +00:00
Todd Kennedy
7de21af675 Merge \"Remove subtle dependencies\" into nyc-mr1-dev 
am: c8daad4290

Change-Id: Ifd04d3076a1bd1564c58f525275b6f4e51e2abdc
 2016-07-13 23:25:38 +00:00
Chris Craik
f7b3896358 Merge \\"Avoid throwing when 0 size layer requested\\" into nyc-dev am: 807989facd 
am: 9014be18b3

Change-Id: I71d6bc566e061f1bce5075ca9f09119623b230f3
 2016-07-13 23:25:38 +00:00
David Friedman
2d03a0c9c4 Merge \"Doc: Minor fixes following launch of Performance section on DAC.\" into nyc-dev 
am: 419dbdb538

Change-Id: I619eefcc177dfd980ed5005e9df7a428b75f0418
 2016-07-13 23:15:39 +00:00
Chris Craik
9014be18b3 Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev 
am: 807989facd

Change-Id: I09c2114b0ff2aa1badb414da9b3b5cd2bbd63669
 2016-07-13 23:15:35 +00:00
Jason Monk
ba3cd6d662 Merge \"Fix QS gear metrics\" into nyc-mr1-dev 
am: f90128c68d

Change-Id: I393964bb34fd9b318590ea135d05fa1220c569fa
 2016-07-13 23:15:27 +00:00
Amith Yamasani
06da9f8b54 Merge \"Make Recents button work in demo mode\" into nyc-mr1-dev 
am: 9f311f6827

Change-Id: Ife4a233149a90678d2ac55d473ae32a05020666c
 2016-07-13 23:15:21 +00:00
Ashutosh Joshi
c1262d4505 Merge \"Revert \"Add state for loading/unloading apps\"\" into nyc-mr1-dev 
am: 0aee1b4163

Change-Id: Ifef46e91e84046aee792b14c36b42edd613406e1
 2016-07-13 23:15:16 +00:00
Wei Jia
3ed59e2fda Merge \"MediaPlayer: fix typo for OnInfoListener.\" into nyc-mr1-dev 
am: ebc3c9ca3f

Change-Id: I768ec161cc5350d6014127269c9b1f0901a1a923
 2016-07-13 23:15:10 +00:00
Sudheer Shanka
3b098778c6 Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev 
am: 407fd1ea62

Change-Id: I5625a9ef9fd35ee0cbf6cad7651f7a39eee8f059
 2016-07-13 23:15:03 +00:00
Android Build Merger (Role)
30c4050703 Merge "Merge \"Doc: Minor fixes following launch of Performance section on DAC.\" into nyc-dev am: 419dbdb538" into nyc-mr1-dev 2016-07-13 23:06:26 +00:00
Android Build Merger (Role)
eaeee37417 Merge "Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev am: 807989facd" into nyc-mr1-dev 2016-07-13 23:06:17 +00:00
David Friedman
b925c8242f Merge \"Doc: Minor fixes following launch of Performance section on DAC.\" into nyc-dev 
am: 419dbdb538

Change-Id: I2540f9ddfe0bd3e8fb1e18ad019276369d76f83b
 2016-07-13 23:05:56 +00:00
Chris Craik
c5762d3cdf Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev 
am: 807989facd

Change-Id: Ie5ed67db841478cb6bbc6b90f768521d049833e6
 2016-07-13 23:05:53 +00:00
Ashutosh Joshi
2e42020eab Merge "Add state for loading/unloading apps" into nyc-mr1-dev 2016-07-13 23:04:47 +00:00
Tim Murray
f0f9a82981 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
 2016-07-13 16:02:43 -07:00
Joe Fernandez
419dbdb538 Merge "Doc: Minor fixes following launch of Performance section on DAC." into nyc-dev 2016-07-13 23:00:27 +00:00
Winson Chung
7a07477cff Merge "Ensure we pass correct values into the next transition start bounds." into nyc-mr1-dev 2016-07-13 22:56:53 +00:00
TreeHugger Robot
c8daad4290 Merge "Remove subtle dependencies" into nyc-mr1-dev 2016-07-13 22:55:37 +00:00
Android Build Merger (Role)
cacf91e466 Merge "Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev am: 55c7c9c2d4" into nyc-mr1-dev-plus-aosp 2016-07-13 22:51:41 +00:00
Sudheer Shanka
a5a732e8af Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev 
am: 55c7c9c2d4

Change-Id: I2b8d701ead03df661a98679cd4ad743b4a964ea1
 2016-07-13 22:51:14 +00:00
Cheryl Potter
0357ea4076 Merge \\"docs: added placeholder redirect for New Class dialog AS 2.2 b/30045484\\" into nyc-dev am: e820803172 
am: cdbf1ec394

Change-Id: I823b7ad870632c26a9ef9d8ab71d1be18b6ca0d8
 2016-07-13 22:50:23 +00:00
Chris Craik
807989facd Merge "Avoid throwing when 0 size layer requested" into nyc-dev 2016-07-13 22:49:20 +00:00
Cheryl Potter
cdbf1ec394 Merge \"docs: added placeholder redirect for New Class dialog AS 2.2 b/30045484\" into nyc-dev 
am: e820803172

Change-Id: Ib3f7b1971925f8cfd2cf29bf156021bfe43ff264
 2016-07-13 22:44:28 +00:00
Android Build Merger (Role)
f90128c68d Merge "Merge \"docs: added placeholder redirect for New Class dialog AS 2.2 b/30045484\" into nyc-dev am: e820803172" into nyc-mr1-dev 2016-07-13 22:40:09 +00:00