OSDN Git Service
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
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
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
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
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
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
Ashutosh Joshi [Wed, 27 Apr 2016 18:19:16 +0000 (11:19 -0700)]
Add state for loading/unloading apps
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.
Fix Build Breakage due to uninitalized variables.
Bug:
29193948
Change-Id: Ibebecf704bb3ad2583e110f1fcf05400a53b1b4c
Ashutosh Joshi [Wed, 13 Jul 2016 22:17:36 +0000 (22:17 +0000)]
Merge "Revert "Add state for loading/unloading apps"" into nyc-mr1-dev
Ashutosh Joshi [Wed, 13 Jul 2016 22:15:19 +0000 (22:15 +0000)]
Revert "Add state for loading/unloading apps"
This reverts commit
00b351aeef9c660cf3b1cfb3b24aae82d3fe2b8e.
Change-Id: Iee229adff8fec4f2407aa895886e63953f0d7d32
Cheryl Potter [Wed, 13 Jul 2016 22:13:49 +0000 (22:13 +0000)]
Merge "docs: added placeholder redirect for New Class dialog AS 2.2 b/
30045484" into nyc-dev
Wei Jia [Wed, 13 Jul 2016 22:04:58 +0000 (22:04 +0000)]
Merge "MediaPlayer: fix typo for OnInfoListener." into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 22:00:37 +0000 (22:00 +0000)]
Merge "Fix disabling lockscreen for demo users." into nyc-mr1-dev
Ashutosh Joshi [Wed, 13 Jul 2016 21:57:29 +0000 (21:57 +0000)]
Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev
am:
a980cba4d8
Change-Id: I49333eb66bf8846e370b94b3c0c10c72664b5b2b
Jean-Michel Trivi [Wed, 13 Jul 2016 21:57:24 +0000 (21:57 +0000)]
Merge \"Optimize audio playback restriction check\" into nyc-mr1-dev
am:
69c6166684
Change-Id: If626176f014e65f0248c5ae80d9196dd27076ec4
Selim Cinek [Wed, 13 Jul 2016 21:34:56 +0000 (14:34 -0700)]
Fixed a bug where the headsup would be stuck disappearing
Change-Id: I56d6be69f6e59c1bec647e7e70e50a36b793f895
Fixes:
30120962
Selim Cinek [Sat, 9 Jul 2016 00:14:16 +0000 (17:14 -0700)]
Changed the appearance of phone call notifications
Change-Id: Ibf8f9b266428fdd5374ee824ec4c2df10daeb9a7
Fixes:
28269355
Ashutosh Joshi [Wed, 13 Jul 2016 21:51:30 +0000 (21:51 +0000)]
Merge "Add state for loading/unloading apps" into nyc-mr1-dev
Jean-Michel Trivi [Wed, 13 Jul 2016 21:50:57 +0000 (21:50 +0000)]
Merge "Optimize audio playback restriction check" into nyc-mr1-dev
Adrian Roos [Wed, 13 Jul 2016 21:39:59 +0000 (21:39 +0000)]
Merge \"ApplicationErrorReport: Sanitize stack trace\" into nyc-mr1-dev
am:
a07af1ee35
Change-Id: I26689370456dd424474683fca95950bd229bbe73
Adrian Roos [Wed, 13 Jul 2016 21:34:14 +0000 (21:34 +0000)]
Merge "ApplicationErrorReport: Sanitize stack trace" into nyc-mr1-dev
Phil Weaver [Sat, 25 Jun 2016 01:17:21 +0000 (18:17 -0700)]
Behave if the same view gets a11y focus twice.
In some corner cases, ViewRootImpl#setAccessibilityFocus
can be called twice for the same view. Make sure we're
actually changing views before clearing accessibility focus
to avoid inconsistent state.
Bug:
29637593
Change-Id: I5dc6f05bdeaec55c352417bfca92c11bd03c3c10
(cherry picked from commit
da4692774c74b51818a2df1dc7534d8d13d62634)
Daniel Nishi [Wed, 13 Jul 2016 21:24:31 +0000 (14:24 -0700)]
Give the default storage manager access to the storage permissions.
Bug:
29793168
Change-Id: Iffeb2f7d86103a245b9bc36e637044633e81bef1
Chris Wren [Wed, 13 Jul 2016 21:10:54 +0000 (21:10 +0000)]
Merge \"sync rich comments back from google3\" into nyc-mr1-dev
am:
ad2bf54fda
Change-Id: I0df7c551441fea3dfe4c00fd69ba2942b520dd7e
Fyodor Kupolov [Wed, 13 Jul 2016 18:33:09 +0000 (11:33 -0700)]
Disallow safe boot when in demo mode
Bug:
30038636
Change-Id: I70624bff85f5fb012772422f0fff523dab6e9be1
Winson [Wed, 13 Jul 2016 19:29:48 +0000 (12:29 -0700)]
Ensure we pass correct values into the next transition start bounds.
Bug:
30106779
Change-Id: I081beb1dc437516e0a6361fce2c4c4512f4d5f26
Jason Monk [Wed, 13 Jul 2016 21:06:17 +0000 (21:06 +0000)]
Merge \"QS: Fix emergency calls only layout\" into nyc-mr1-dev
am:
7d4fc00aaa
Change-Id: I2d0981b30bd1e26098523e36176b5acf5d403120
TreeHugger Robot [Wed, 13 Jul 2016 21:02:03 +0000 (21:02 +0000)]
Merge "sync rich comments back from google3" into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 20:58:23 +0000 (20:58 +0000)]
Merge "QS: Fix emergency calls only layout" into nyc-mr1-dev
Suprabh Shukla [Wed, 13 Jul 2016 20:27:46 +0000 (20:27 +0000)]
Merge \"Disallowing bluetooth config for demo users\" into nyc-mr1-dev
am:
0ce03e77bc
Change-Id: I89d396d0450c241fc1314cd8320ed2c6d02b9823
Makoto Onuki [Wed, 13 Jul 2016 20:21:56 +0000 (20:21 +0000)]
Merge \"Revert \"Revert \"Revert \"Handle package broadcasts before apps do\"\"\"\" into nyc-mr1-dev
am:
6eefe67b2c
Change-Id: I514fb0b48c79644f7bc3154b3a18fabfc4c35d15
Todd Kennedy [Wed, 13 Jul 2016 20:20:30 +0000 (13:20 -0700)]
Remove subtle dependencies
There was a very subtle dependency on the method used to allocate a session
id and how that session id was stored. If the session id wasn't stored
in the same synchronized block where the allocation method was called, it
could have been possible to duplicate session ids. Instead of requiring
callers of the allocation method to know that the value must be stored
in a particular way, maintain a separate set of allocated session ids
that is updated by the allocation method and prevents any potential race
conditions.
Change-Id: Ibd793b3851bf1a994e00d86f621180cac598b86e
Fixes:
30089638
TreeHugger Robot [Wed, 13 Jul 2016 20:15:29 +0000 (20:15 +0000)]
Merge "Disallowing bluetooth config for demo users" into nyc-mr1-dev
Makoto Onuki [Wed, 13 Jul 2016 20:13:51 +0000 (20:13 +0000)]
Merge "Revert "Revert "Revert "Handle package broadcasts before apps do"""" into nyc-mr1-dev
Dmitriy Filchenko [Wed, 13 Jul 2016 20:10:01 +0000 (20:10 +0000)]
Merge \\\"Remove calls to set_process_name.\\\" am:
8ee58b3b4e am:
c1a1487057
am:
a21bfb1160
Change-Id: I86f932c6ff09cda9b4161046b691e4ee45d80dd1
OSDN Git Service
