OSDN Git Service
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
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
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
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
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
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
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
Jason Monk [Wed, 13 Jul 2016 19:24:32 +0000 (15:24 -0400)]
Fix QS gear metrics
Change-Id: If1eeefa3831010d1567861dd71af6f29833496b3
Fixes:
30117924
Andrew Sapperstein [Wed, 13 Jul 2016 20:04:13 +0000 (13:04 -0700)]
Use colorControlHighlight for print button ripple.
Instead of using #eeff41 (a random shade of yellow), use
the default color for ripples.
Change-Id: I32fc7e9a10a994deb2066941c96457ad8549dd11
Fixes:
30115080
Dmitriy Filchenko [Wed, 13 Jul 2016 20:02:33 +0000 (20:02 +0000)]
Merge \\"Remove calls to set_process_name.\\" am:
8ee58b3b4e
am:
c1a1487057
Change-Id: I3319e3f159c13a5135d6986d7e4a29a1ac88a18b
Dmitriy Filchenko [Wed, 13 Jul 2016 19:57:52 +0000 (19:57 +0000)]
Merge \"Remove calls to set_process_name.\"
am:
8ee58b3b4e
Change-Id: Ia0157f7b7fa1b048ca98b55f5525089046e6cccd
Treehugger Robot [Wed, 13 Jul 2016 19:50:52 +0000 (19:50 +0000)]
Merge "Remove calls to set_process_name."
Chong Zhang [Wed, 13 Jul 2016 19:44:37 +0000 (19:44 +0000)]
Merge \"Revert changes to force layout after insets changes\" into nyc-mr1-dev
am:
185131442b
Change-Id: I7d3eaa1d0337c0ae62ee24169b76f1938b8b9e68
Chong Zhang [Wed, 13 Jul 2016 19:39:07 +0000 (19:39 +0000)]
Merge "Revert changes to force layout after insets changes" into nyc-mr1-dev
Jean-Michel Trivi [Wed, 13 Jul 2016 18:25:21 +0000 (11:25 -0700)]
Optimize audio playback restriction check
Order the playback restriction checks from the most likely
restriction to the least likely.
Bug
30073948
Change-Id: I6431d15a2ed8b5831f937eab8db940d942082b0e
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.
Bug:
29193948
Change-Id: I700f3bdbb8e84413455751dec02a812a639421b3
Chong Zhang [Wed, 13 Jul 2016 02:25:08 +0000 (19:25 -0700)]
Revert changes to force layout after insets changes
Alternative fix for b/
29391054 ag/
1152795 sends an MOVE message to
client which also force a layout, so we no longer need to force
it after the insets change in the traversal.
Reverting the following two related fixes as it does more
measures than necessary.
bug:
29391054
bug:
29533997
bug:
29634368
Revert "Fix layout issue after insets changed"
This reverts commit
76fdbb72c93a431e14357e0ea3d5a83edfa75c5e.
Revert "Do a forceLayout if pending insets is changed after relayout window"
This reverts commit
71f2c31469ed9628d744d20b86eaf188cfdf686d.
Doris Liu [Wed, 13 Jul 2016 01:48:52 +0000 (18:48 -0700)]
Fix use-after-free in vector drawable animation
Added a strong pointer to hold reference to VD in the animation,
so that VD will not be released before animation is finished/destroyed.
BUG:
29438210
Change-Id: I311cd83043f988640de44f637cb474baada9b5ca
Ruben Brunk [Wed, 13 Jul 2016 19:06:21 +0000 (19:06 +0000)]
Merge \"Include all components in VR initialization.\" into nyc-mr1-dev
am:
0b4750165e
Change-Id: I33a82666674e5bbc2d0e85480c60b3bd4595264e
Ruben Brunk [Wed, 13 Jul 2016 19:02:25 +0000 (19:02 +0000)]
Merge "Include all components in VR initialization." into nyc-mr1-dev
Amith Yamasani [Wed, 13 Jul 2016 18:59:16 +0000 (11:59 -0700)]
Make Recents button work in demo mode
Create the UserSwitcherController object so that the broadcasts
are properly handled.
Change-Id: Iadf9588a4ddb7850f0d8ab2b49a0949fb4580893
Fixes:
30000641
Sudheer Shanka [Wed, 13 Jul 2016 18:58:37 +0000 (11:58 -0700)]
Fix disabling lockscreen for demo users.
LockSettingsService cleans up data for an user on receiving
ACTION_USER_ADDED. As a result, the value set by the
RetailDemoModeService was getting lost.
Bug:
29912660
Change-Id: I2414a5586ab0187bc003cd6ee8b9f1645406235f
Julia Reynolds [Wed, 13 Jul 2016 18:47:12 +0000 (18:47 +0000)]
Merge \"Whitelist default apps for DND access.\" into nyc-mr1-dev
am:
5bd9ea82d2
Change-Id: I95d832e2858668cd5b0f6a7686ccda0cd420b726
Chris Wren [Wed, 13 Jul 2016 18:28:40 +0000 (14:28 -0400)]
sync rich comments back from google3
Bug:
30116535
Change-Id: I6e43ffda3d15b331c18752b5ee15770c6cdbfe85
Jason Monk [Wed, 13 Jul 2016 18:45:52 +0000 (14:45 -0400)]
QS: Fix emergency calls only layout
Change-Id: Ic66412b0c46f4436d63168a5e167d4adcad74283
Fixes:
29524397
Victor Chang [Wed, 13 Jul 2016 18:40:49 +0000 (18:40 +0000)]
Merge \"Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set\" into nyc-mr1-dev
am:
e05b35db0d
Change-Id: I0b47bc6184ee3b4b9ac4783decf4c8cd30b70fbd
Julia Reynolds [Wed, 13 Jul 2016 18:40:20 +0000 (18:40 +0000)]
Merge "Whitelist default apps for DND access." into nyc-mr1-dev
Victor Chang [Wed, 13 Jul 2016 18:36:35 +0000 (18:36 +0000)]
Merge "Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user restriction is set" into nyc-mr1-dev
Kevin Hufnagle [Wed, 13 Jul 2016 18:14:59 +0000 (18:14 +0000)]
Merge \\"docs: Added \\"developer stories\\" articles.\\" into nyc-dev am:
686996d2dc
am:
0265530bda
Change-Id: I1768ff2ed66bcdf36382b0a222e7cefb86f7e5fa
Kevin Hufnagle [Wed, 13 Jul 2016 18:12:05 +0000 (18:12 +0000)]
Merge \\"docs: Added \\"developer stories\\" articles.\\" into nyc-dev am:
686996d2dc
am:
7a9e9d5a3e
Change-Id: Iedea98bdb320c9dd6532c447f340de0756b4b69c
Kevin Hufnagle [Wed, 13 Jul 2016 18:06:49 +0000 (18:06 +0000)]
Merge \"docs: Added \"developer stories\" articles.\" into nyc-dev
am:
686996d2dc
Change-Id: Ib6470cf466c655d97000b23bd5f7e6f485152d02
Kevin Hufnagle [Wed, 13 Jul 2016 18:06:44 +0000 (18:06 +0000)]
Merge \"docs: Added \"developer stories\" articles.\" into nyc-dev
am:
686996d2dc
Change-Id: I7a01c6f743c05c36c37eb5b742aaf756d13b9898
Kevin Hufnagle [Wed, 13 Jul 2016 17:52:24 +0000 (17:52 +0000)]
Merge "docs: Added "developer stories" articles." into nyc-dev
Makoto Onuki [Wed, 13 Jul 2016 17:25:25 +0000 (10:25 -0700)]
Revert "Revert "Revert "Handle package broadcasts before apps do"""
This reverts commit
886ba78dfb105eb45416587b73b6c6b336448de5.
With the tests updated.
Change-Id: I162e6ca23c667f90feddc1e9f42b554a416295cf