OSDN Git Service
Rubin Xu [Fri, 25 Nov 2016 18:24:55 +0000 (18:24 +0000)]
Fix boot loop when upgrading direclty from L to N am:
bfc7faaf35
am:
492f5263a4
Change-Id: I62f538737c1946aae3fb64555d425c379340bef1
Rubin Xu [Fri, 25 Nov 2016 18:20:48 +0000 (18:20 +0000)]
Fix boot loop when upgrading direclty from L to N
am:
bfc7faaf35
Change-Id: Iaaf32f1c6fd70dd394252f963d87897899fb2e55
Mark Renouf [Wed, 23 Nov 2016 19:33:44 +0000 (19:33 +0000)]
Disables swipe-to-dismiss windows for input methods on Wear
am:
5514d77e7d
Change-Id: I75954a8a10bd5c18446bc38a742e3a6175c26df3
Mark Renouf [Tue, 22 Nov 2016 22:48:59 +0000 (17:48 -0500)]
Disables swipe-to-dismiss windows for input methods on Wear
BUG:
33086263
Change-Id: I77ed17602cee2cf08f5265a60a1d7654e6e23960
Rubin Xu [Tue, 22 Nov 2016 15:18:32 +0000 (15:18 +0000)]
Fix boot loop when upgrading direclty from L to N
A second attempt to fix the upgrade problem due to SID == 0
in the above upgrade path. The previous fix contains a bug
where it would cause future attempts to unify work challenge
to silently fail, and crash SystemUi when unlocking.
This fix adds a check for non-zero SID before doing the initial work
profile unification (which caused the upgrade crash when SID == 0).
This means the initial work profile unification would only happen when
the user has unlocked the lockscreen and SID is generated.
Bug:
32490092
Bug:
33050562
Change-Id: Ib28951b2ec26b4f091df7763d9902f55616fcb5c
Zach Jang [Tue, 22 Nov 2016 18:04:13 +0000 (18:04 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev am:
d427da8a24
am:
466bb400bb
Change-Id: I49c4ed53cb2341d34855d53f5e66a95a7c0130af
Zach Jang [Tue, 22 Nov 2016 18:03:27 +0000 (18:03 +0000)]
Revert "Catch KeyStoreException for setting profile lock" am:
e61672ab08
am:
fe3b0b2cc1
Change-Id: Iba7288ba01872f804a22814f4615b202010d7194
Zach Jang [Tue, 22 Nov 2016 17:59:02 +0000 (17:59 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev
am:
d427da8a24
Change-Id: I8a4f01466e4b93782478e94240f2c8f2d74972ad
Zach Jang [Tue, 22 Nov 2016 17:58:58 +0000 (17:58 +0000)]
Revert "Catch KeyStoreException for setting profile lock"
am:
e61672ab08
Change-Id: Ie1a720181bf542bbf213af8b6b83eff0ecd84a98
Zach Jang [Tue, 22 Nov 2016 17:51:57 +0000 (17:51 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev
Zach Jang [Tue, 22 Nov 2016 17:47:18 +0000 (17:47 +0000)]
Revert "Catch KeyStoreException for setting profile lock"
This reverts commit
c8fa5ed8f2d492aa5e005fcdb5991c3f980de045.
Change-Id: Ia1425e649e102cb79280d75e5f49db670214cec3
Nancy Zheng [Mon, 21 Nov 2016 18:19:53 +0000 (18:19 +0000)]
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
am:
f9154e923b
Change-Id: I554442be467ad618d02e5f8f3199d57c45d7b972
Nancy Zheng [Mon, 21 Nov 2016 18:19:48 +0000 (18:19 +0000)]
Fix createConfirmDeviceCredentialIntent for wear for CTS.
am:
43f166dfb4
Change-Id: Icda6d5182ff20c4db150ae3f0351e559682184de
Nancy Zheng [Mon, 21 Nov 2016 18:13:03 +0000 (18:13 +0000)]
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
Nancy Zheng [Sat, 19 Nov 2016 02:15:09 +0000 (18:15 -0800)]
Fix createConfirmDeviceCredentialIntent for wear for CTS.
Bug:
33000237
Change-Id: I1fdb5a518c41ab005f12d3142763e374b38d7553
Michael Kwan [Sat, 19 Nov 2016 00:12:12 +0000 (00:12 +0000)]
Fix default dialog background colour for watch devices.
am:
56c25af274
Change-Id: I5020e61d35adf3327f4b0e39e5e3e74188392330
Michael Kwan [Fri, 18 Nov 2016 23:02:43 +0000 (15:02 -0800)]
Fix default dialog background colour for watch devices.
Bug:
33008587
Change-Id: I0fe4f9a7244958406d2a3466393476f7775ae995
Marie Janssen [Wed, 9 Nov 2016 20:01:24 +0000 (12:01 -0800)]
Bluetooth: BLE app tracking fixes
Simplify tracking registered BLE Apps and clear the state when we
try to recover bluetooth from starting to ON.
Test: enable and disable bluetooth an LE-only app running
Bug:
32609235
Change-Id: I3233bf8402a3c8fc4886ef21b1e9411bc78d4e2c
TreeHugger Robot [Fri, 18 Nov 2016 19:59:40 +0000 (19:59 +0000)]
Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr2-dev
Erik Wolsheimer [Fri, 18 Nov 2016 19:24:32 +0000 (19:24 +0000)]
Merge "Enable swipe to dismiss for watch devices." into cw-f-dev
am:
d841ee9c81
Change-Id: Ic2bd153e8ba12b6e4aff380c20c7ecf5dea09791
Michael Kwan [Fri, 18 Nov 2016 19:24:27 +0000 (19:24 +0000)]
Enable swipe to dismiss for watch devices.
am:
686de42711
Change-Id: I3f9b9dcf8f7094bcf59eec643a5f87922486371e
Erik Wolsheimer [Fri, 18 Nov 2016 19:17:53 +0000 (19:17 +0000)]
Merge "Enable swipe to dismiss for watch devices." into cw-f-dev
Felipe Leme [Wed, 17 Aug 2016 20:39:10 +0000 (13:39 -0700)]
DO NOT MERGE ANYWHERE - Clear preferences when package is removed.
(cherry pick of commits
2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).
Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Bug:
30900628
Bug:
28722556
Fixes:
32972310
(cherry picked from commit
20488d97cdc9aa7e98f6fd75c2890ba18781654a)
Scott Main [Fri, 18 Nov 2016 15:42:08 +0000 (15:42 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb am:
192a8c4973 am:
97be8864e5
am:
ec9f41356c
Change-Id: I7cd3a82a73707b1f61c82897c0e7fbc63f33d226
Scott Main [Fri, 18 Nov 2016 15:36:33 +0000 (15:36 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb am:
192a8c4973
am:
97be8864e5
Change-Id: I340207420e0811c74751a96dc30e929a411ea207
Scott Main [Fri, 18 Nov 2016 15:30:06 +0000 (15:30 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb
am:
192a8c4973
Change-Id: Ib54b2bafcf87a4f27e6a541a4cde0b01c41780b0
Scott Main [Fri, 18 Nov 2016 15:24:18 +0000 (15:24 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359
am:
c8b11fb7cb
Change-Id: I6db78aa2008d2bdd675a87daeae132e5f5c09371
Scott Main [Fri, 18 Nov 2016 15:17:06 +0000 (15:17 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600
am:
3fef783359
Change-Id: I7a7e25c37fcd7863f51ea116f624d0bdc2d0c5c6
TreeHugger Robot [Fri, 18 Nov 2016 06:04:56 +0000 (06:04 +0000)]
Merge "Added configuration for VT downgrade/tear down when data disabled" into nyc-mr2-dev
Ricky Wai [Fri, 18 Nov 2016 01:43:01 +0000 (01:43 +0000)]
Catch KeyStoreException for setting profile lock am:
c8fa5ed8f2
am:
3b546019dc
Change-Id: Id668766a96473ae2f68e83dae1ecb547b26de6fc
Ricky Wai [Fri, 18 Nov 2016 01:38:04 +0000 (01:38 +0000)]
Catch KeyStoreException for setting profile lock
am:
c8fa5ed8f2
Change-Id: I28777d9d80ba13df463e05b95dd2524633554c9d
Ricky Wai [Thu, 17 Nov 2016 18:49:17 +0000 (18:49 +0000)]
Catch KeyStoreException for setting profile lock
When device upgrades from L->N, sid(in gatekeeper) could be 0
even primary profile screenlock is set.
We are now trying to catch the exception so when sid==0 happens,
it will try to tie profile lock again when primary profile is unlocked.
Bug:
32490092
Change-Id: I73011d872ac15e7e09be9bda0165cf7f6a75493a
Michael Kwan [Thu, 3 Nov 2016 08:04:24 +0000 (01:04 -0700)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.
Bug:
30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
Jack Yu [Wed, 16 Nov 2016 00:16:21 +0000 (16:16 -0800)]
Added configuration for VT downgrade/tear down when data disabled
Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.
bug:
32880745
Merged-In: Idd33a022b5a31cbc58592587bcb496bd78923ae7
Change-Id: I5c71fc9336b39f114a924861a766ca5cb93d4c69
Fei Wu [Wed, 16 Nov 2016 21:15:41 +0000 (21:15 +0000)]
Merge "Update colorPrimary in watch" into cw-f-dev
am:
447fff8589
Change-Id: I0e021db6fe386b0ca7a05db97add2e7f36e85b05
FEI WU [Wed, 16 Nov 2016 21:15:38 +0000 (21:15 +0000)]
Update colorPrimary in watch
am:
9072dcd82c
Change-Id: I3a869e0acddb6d0494e352bfb7e926e897105f08
Fei Wu [Wed, 16 Nov 2016 21:05:24 +0000 (21:05 +0000)]
Merge "Update colorPrimary in watch" into cw-f-dev
Scott Main [Tue, 15 Nov 2016 23:22:32 +0000 (15:22 -0800)]
Add cross-links between FINE and COARSE location permissions.
bug:
25371600
Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0
(cherry picked from commit
b18745616f9dd6b79202168b648edcef382ea967)
Selim Gurun [Tue, 15 Nov 2016 19:57:38 +0000 (19:57 +0000)]
Merge "Fix WebViewDatabase javadoc." into nyc-mr2-dev
Julia Reynolds [Tue, 15 Nov 2016 14:06:35 +0000 (14:06 +0000)]
Merge "Remove 'until next alarm'." into nyc-mr2-dev
Selim Cinek [Tue, 15 Nov 2016 01:24:32 +0000 (01:24 +0000)]
Fixed a bug with the emergency affordance in multi user am:
b8a7f78d24
am:
6cc0b517ba
Change-Id: If537b10c1838a47e7662ef56ae08b806fe5d669f
Selim Cinek [Tue, 15 Nov 2016 01:18:35 +0000 (01:18 +0000)]
Fixed a bug with the emergency affordance in multi user
am:
b8a7f78d24
Change-Id: I68fa35dbedb3740eff1c83d03c9c9b5080d3ea81
Selim Cinek [Thu, 3 Nov 2016 21:55:40 +0000 (14:55 -0700)]
Fixed a bug with the emergency affordance in multi user
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.
Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes:
32424103
Test: manual: switch to secondary user and launch emergency affordance
Narayan Kamath [Mon, 14 Nov 2016 18:56:09 +0000 (18:56 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
d9a8ee7598
Change-Id: Ie7c2ec8ec358ce403a0c8afe6305d3164d3892e8
Julia Reynolds [Fri, 11 Nov 2016 19:30:51 +0000 (14:30 -0500)]
Remove 'until next alarm'.
Test: manual
Bug:
32773368
Change-Id: I03db93d9371327a8e32929ce7fda66729cfe4a82
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
(cherry picked from commit
9087f331a85790d49d1095e1eaf0305b7863e0ba)
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit
25cd01cc69fcad34756b00e52a79c0c54178f2e6)
Andriy Naborskyy [Mon, 14 Nov 2016 14:11:10 +0000 (14:11 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am:
11da2b5de3 -s ours am:
3f39609cff -s ours am:
fb4beac069 -s ours am:
18305d920e -s ours am:
0a2ac837d1 -s ours
am:
415ec85fdb -s ours
Change-Id: I3fe6e41b3a2b6119a7d980227756054a2267b797
Andriy Naborskyy [Mon, 14 Nov 2016 14:09:55 +0000 (14:09 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am:
c5bf8bc74d -s ours am:
f380f53752 -s ours am:
dbbde14239 -s ours am:
f566a1d4bf -s ours am:
e26d15582b -s ours
am:
bb1dfdc660 -s ours
Change-Id: I230967ab2be77179282d37ea186906adabfafde5
Brian Carlstrom [Mon, 14 Nov 2016 14:08:51 +0000 (14:08 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362 am:
58612638d1 am:
d9ea80d009
am:
46abcdd83f
Change-Id: Ie195e5ab259ed009a311dc5f17522c2d6599fe32
Narayan Kamath [Mon, 14 Nov 2016 14:03:02 +0000 (14:03 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3 am:
5f70cb0898 am:
df3e599c7d
am:
19ee3109e1
Change-Id: Ib1b9d1acfe8a689d50334c2107af66b8f2a54513
Narayan Kamath [Mon, 14 Nov 2016 14:01:54 +0000 (14:01 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338 am:
14bd75fa79 am:
50b0c3be57 -s ours am:
e1e735bcb9 am:
072b70bae3 am:
ba6d5ee377 am:
f3f784853d am:
8ea47824fa am:
2f2611636b
am:
86e1929551
Change-Id: Ic1a9c733b811ab04cc0024956998137a39edeee5
Narayan Kamath [Mon, 14 Nov 2016 14:00:45 +0000 (14:00 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2 am:
846f64c6fc am:
83b46a1590 am:
330d0ebf48 am:
21c1e58090 am:
81fd9e618c am:
2c13554c18 am:
fb207962aa am:
44e645e59a
am:
f2a94f71fb
Change-Id: Ie17b51e1d33668cf8a8566a65ec9182c17cace16
Andriy Naborskyy [Mon, 14 Nov 2016 14:00:26 +0000 (14:00 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am:
11da2b5de3 -s ours am:
3f39609cff -s ours am:
fb4beac069 -s ours am:
18305d920e -s ours
am:
0a2ac837d1 -s ours
Change-Id: I0ba7195818a50a4f5260022370aa3a26e5dbd40d
Narayan Kamath [Mon, 14 Nov 2016 13:59:40 +0000 (13:59 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59 am:
2f8ce5f5cb am:
5515b415aa am:
d212aa9d13 am:
3b89a68a08 am:
146a0f86a6 am:
327edfeba2
am:
51930580bf
Change-Id: I7dfa706aab6051e0b25c976f187091c2d8927c45
Narayan Kamath [Mon, 14 Nov 2016 13:58:30 +0000 (13:58 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6 am:
fd23b9d509 am:
b0a7831375 am:
5594cfc2c3 am:
6ca924b884 am:
ae457e03b7 am:
0c8da8aa05 am:
1f9abe310f am:
f45a1a0fe6 am:
58d1705c64
am:
1886232f48
Change-Id: I52ea7397d96eebbec543a584c2372e44a7a00ca4
Andriy Naborskyy [Mon, 14 Nov 2016 13:56:46 +0000 (13:56 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am:
c5bf8bc74d -s ours am:
f380f53752 -s ours am:
dbbde14239 -s ours am:
f566a1d4bf -s ours
am:
e26d15582b -s ours
Change-Id: I6e1c029f57f69785b9a7070ec6e8c35673b65cc2
Brian Carlstrom [Mon, 14 Nov 2016 13:55:41 +0000 (13:55 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362 am:
58612638d1
am:
d9ea80d009
Change-Id: I086d525fa3cdfd34d1b1ad5089662ea7eb57a418
Narayan Kamath [Mon, 14 Nov 2016 13:54:35 +0000 (13:54 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3 am:
5f70cb0898
am:
df3e599c7d
Change-Id: Ida0d973df74c0636e6b93df4af296cd74c3103cb
Narayan Kamath [Mon, 14 Nov 2016 13:53:28 +0000 (13:53 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338 am:
14bd75fa79 am:
50b0c3be57 -s ours am:
e1e735bcb9 am:
072b70bae3 am:
ba6d5ee377 am:
f3f784853d am:
8ea47824fa
am:
2f2611636b
Change-Id: Ie36e3041b72422b78a7335198671fc893c763614
Narayan Kamath [Mon, 14 Nov 2016 13:52:23 +0000 (13:52 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6 am:
1e6a5d11a6 am:
f0cd32619e -s ours am:
4c26a969e9 am:
b7884e5a9f am:
da65c74c54 am:
24b2a54a84 am:
4a204149eb am:
e58ee798c1 am:
83be5fdebb
am:
4c5dc7e622
Change-Id: I0b9b598150782a50f8a2e6c3f93acf9fed969c4e
Narayan Kamath [Mon, 14 Nov 2016 13:52:18 +0000 (13:52 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2 am:
846f64c6fc am:
83b46a1590 am:
330d0ebf48 am:
21c1e58090 am:
81fd9e618c am:
2c13554c18 am:
fb207962aa
am:
44e645e59a
Change-Id: I950358108a9df60418e9d1370f55fdc81a2046f5
neo.chae [Mon, 14 Nov 2016 13:51:14 +0000 (13:51 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b am:
85afb42c16 am:
b4b2203c5e am:
fb74b8773a am:
c58ec27e1c am:
7489336fed am:
0212d4f3fa am:
aaf785c827 am:
4b72904585
am:
7530ea7ec0
Change-Id: I887d0fa23e82fad83759b47aa9b3cb7c0ab5dea0
Narayan Kamath [Mon, 14 Nov 2016 13:51:05 +0000 (13:51 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59 am:
2f8ce5f5cb am:
5515b415aa am:
d212aa9d13 am:
3b89a68a08 am:
146a0f86a6
am:
327edfeba2
Change-Id: Ibe4a93c42a9594dce74b76a9ae6e2e32cb11b1e5
Narayan Kamath [Mon, 14 Nov 2016 13:50:00 +0000 (13:50 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6 am:
fd23b9d509 am:
b0a7831375 am:
5594cfc2c3 am:
6ca924b884 am:
ae457e03b7 am:
0c8da8aa05 am:
1f9abe310f am:
f45a1a0fe6
am:
58d1705c64
Change-Id: Ia768dae225459af1d7bcea6a7aa78bc2df170199
Xin Li [Mon, 14 Nov 2016 13:49:59 +0000 (13:49 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am:
78f15948fb am:
34de2a2d45 -s ours am:
a5c82e7dd9 am:
ca2abc5b71 am:
ae5db8a6dc am:
db984f917c -s ours am:
ee6b51a05b am:
20def2e75f am:
6e8fef24d9
am:
eb4de1706e
Change-Id: I1a405d53ae83b3e227f258d8aded7c9e1c0d6e88
Xin Li [Mon, 14 Nov 2016 13:45:53 +0000 (13:45 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am:
7e0483fcec -s ours am:
16090c6177 -s ours am:
0a568ae56e am:
9788dd5bd2 am:
6ec8dd10bb am:
921dd6a5fd -s ours am:
05a61276c6 am:
23270f1311 am:
5386c74a44
am:
f3e0e13b54
Change-Id: I3bd3b1405acac465f3974f3cd9ff231a1800aa16
Narayan Kamath [Mon, 14 Nov 2016 13:44:35 +0000 (13:44 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am:
75c6b8c324 am:
9958eb7180 am:
5e92ece8c2 am:
77decadefe am:
11b3161c41 am:
5cbd448348 am:
a9fae33c11
am:
05f59b1f1d
Change-Id: I5382ba916ec72d4ecb519dac5a89bce35947738f
Andriy Naborskyy [Mon, 14 Nov 2016 13:42:21 +0000 (13:42 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am:
11da2b5de3 -s ours am:
3f39609cff -s ours am:
fb4beac069 -s ours
am:
18305d920e -s ours
Change-Id: I7cc54b33bc5a37f5ff7f23ba3a33cb477932eb8e
Narayan Kamath [Mon, 14 Nov 2016 13:41:49 +0000 (13:41 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6 am:
1e6a5d11a6 am:
f0cd32619e -s ours am:
4c26a969e9 am:
b7884e5a9f am:
da65c74c54 am:
24b2a54a84 am:
4a204149eb am:
e58ee798c1
am:
83be5fdebb
Change-Id: I31fd20827d22d0b8cb3b8df8db99e1b0aad6fa85
Andriy Naborskyy [Mon, 14 Nov 2016 13:41:20 +0000 (13:41 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am:
c5bf8bc74d -s ours am:
f380f53752 -s ours am:
dbbde14239 -s ours
am:
f566a1d4bf -s ours
Change-Id: I6323c0bc2a591cd3b50dd44b0ea519730f703b15
neo.chae [Mon, 14 Nov 2016 13:40:37 +0000 (13:40 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b am:
85afb42c16 am:
b4b2203c5e am:
fb74b8773a am:
c58ec27e1c am:
7489336fed am:
0212d4f3fa am:
aaf785c827
am:
4b72904585
Change-Id: I365cdb2764ffb15f233cfeb43339e6acbc369e49
Brian Carlstrom [Mon, 14 Nov 2016 13:40:16 +0000 (13:40 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362
am:
58612638d1
Change-Id: If03a724c633b1ba97bfd7797f61d0f706654f923
Xin Li [Mon, 14 Nov 2016 13:39:25 +0000 (13:39 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am:
78f15948fb am:
34de2a2d45 -s ours am:
a5c82e7dd9 am:
ca2abc5b71 am:
ae5db8a6dc am:
db984f917c -s ours am:
ee6b51a05b am:
20def2e75f
am:
6e8fef24d9
Change-Id: I43f556df4700c9470a0df500eadddcbcd8146cf7
Narayan Kamath [Mon, 14 Nov 2016 13:39:05 +0000 (13:39 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3
am:
5f70cb0898
Change-Id: I16da70d1722e16ca61e31fff092ca778a5d66339
Narayan Kamath [Mon, 14 Nov 2016 13:38:01 +0000 (13:38 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338 am:
14bd75fa79 am:
50b0c3be57 -s ours am:
e1e735bcb9 am:
072b70bae3 am:
ba6d5ee377 am:
f3f784853d
am:
8ea47824fa
Change-Id: I6d31e839b51896830ae42ddad01581743fd4bd28
Narayan Kamath [Mon, 14 Nov 2016 13:37:08 +0000 (13:37 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192 am:
22e45fa247 am:
d98e75feca am:
87dc13f249 am:
c50c43667f am:
a5ff6c84a2
am:
9efaadccc0
Change-Id: I8a47806998957121f0de14e7e5bdb4d8e39944de
Narayan Kamath [Mon, 14 Nov 2016 13:36:53 +0000 (13:36 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2 am:
846f64c6fc am:
83b46a1590 am:
330d0ebf48 am:
21c1e58090 am:
81fd9e618c am:
2c13554c18
am:
fb207962aa
Change-Id: Ifad8cb21043c498097bcd7c459773cdfdcc98560
Narayan Kamath [Mon, 14 Nov 2016 13:36:02 +0000 (13:36 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b am:
65abe1066d am:
a13068a1c8 am:
3e85db46bc
am:
5ad1a52678
Change-Id: I0e6cfed1a3fac9ba0cf45c4148fbb7fe077fd624
Narayan Kamath [Mon, 14 Nov 2016 13:35:51 +0000 (13:35 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59 am:
2f8ce5f5cb am:
5515b415aa am:
d212aa9d13 am:
3b89a68a08
am:
146a0f86a6
Change-Id: Ie77008fd0fcab39404ae817413096a0c10f88c6d
Narayan Kamath [Mon, 14 Nov 2016 13:35:02 +0000 (13:35 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c am:
53af5fe3f7 am:
56294db4d4
am:
8fecc8687b
Change-Id: Ie17f7a15e86b88d9fef7edc43919bc3669ba5acf
Narayan Kamath [Mon, 14 Nov 2016 13:34:42 +0000 (13:34 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6 am:
fd23b9d509 am:
b0a7831375 am:
5594cfc2c3 am:
6ca924b884 am:
ae457e03b7 am:
0c8da8aa05 am:
1f9abe310f
am:
f45a1a0fe6
Change-Id: Ie1cabf78ed27b3110e9b89c45c4fd02a4985231d
Hugo Benichi [Mon, 14 Nov 2016 13:33:55 +0000 (13:33 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9 am:
37cacc77ce am:
4bdf37c204 am:
fd3e6e8d25
am:
bfa2fed779
Change-Id: I7c2d9158c7395a35b92ad74535cff704e6b897f4
Narayan Kamath [Mon, 14 Nov 2016 13:33:24 +0000 (13:33 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6 am:
1e6a5d11a6 am:
f0cd32619e -s ours am:
4c26a969e9 am:
b7884e5a9f am:
da65c74c54 am:
24b2a54a84 am:
4a204149eb
am:
e58ee798c1
Change-Id: Ia1e984acaff549a83d4ab6373a9becc89bfd66ce
Hugo Benichi [Mon, 14 Nov 2016 13:32:50 +0000 (13:32 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev am:
476da32d86 -s ours am:
bdf4d8a93c am:
1d61b01a5d
am:
9a6f65608a
Change-Id: I91630e0cdfff69cfcea1e680fae1db34541cc8de
Xin Li [Mon, 14 Nov 2016 13:30:19 +0000 (13:30 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am:
7e0483fcec -s ours am:
16090c6177 -s ours am:
0a568ae56e am:
9788dd5bd2 am:
6ec8dd10bb am:
921dd6a5fd -s ours am:
05a61276c6 am:
23270f1311
am:
5386c74a44
Change-Id: I122525c6a85e1542370835d88e83cad30f747bff
Narayan Kamath [Mon, 14 Nov 2016 13:29:01 +0000 (13:29 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am:
75c6b8c324 am:
9958eb7180 am:
5e92ece8c2 am:
77decadefe am:
11b3161c41 am:
5cbd448348
am:
a9fae33c11
Change-Id: Idb4874c1c84d894bb20ac24dfc2c2035f9e1c10a
Narayan Kamath [Mon, 14 Nov 2016 13:27:51 +0000 (13:27 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192 am:
22e45fa247 am:
d98e75feca am:
87dc13f249 am:
c50c43667f
am:
a5ff6c84a2
Change-Id: I62e2180c0a3b2d9e2a11b3ad4d93288bed1ccef6
Andriy Naborskyy [Mon, 14 Nov 2016 13:26:16 +0000 (13:26 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am:
11da2b5de3 -s ours am:
3f39609cff -s ours
am:
fb4beac069 -s ours
Change-Id: Id30081863fc467acb09bcc087596e3ec43aa3528
Andriy Naborskyy [Mon, 14 Nov 2016 13:25:11 +0000 (13:25 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am:
c5bf8bc74d -s ours am:
f380f53752 -s ours
am:
dbbde14239 -s ours
Change-Id: I83f374c3a369b616009bc1381a317c21952698c8
neo.chae [Mon, 14 Nov 2016 13:25:11 +0000 (13:25 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b am:
85afb42c16 am:
b4b2203c5e am:
fb74b8773a am:
c58ec27e1c am:
7489336fed am:
0212d4f3fa
am:
aaf785c827
Change-Id: I34d0175499e1a47e3e6c9aecd2ac2805a6b4ad51
Brian Carlstrom [Mon, 14 Nov 2016 13:24:01 +0000 (13:24 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13
am:
f9150bf362
Change-Id: I647f570452982cdf7202dccad793032305e61a9a
Xin Li [Mon, 14 Nov 2016 13:24:00 +0000 (13:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am:
78f15948fb am:
34de2a2d45 -s ours am:
a5c82e7dd9 am:
ca2abc5b71 am:
ae5db8a6dc am:
db984f917c -s ours am:
ee6b51a05b
am:
20def2e75f
Change-Id: If0d5a1c14c181a8a476a00b66c9f8ba279f597e8
Narayan Kamath [Mon, 14 Nov 2016 13:23:48 +0000 (13:23 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b am:
65abe1066d am:
a13068a1c8
am:
3e85db46bc
Change-Id: I880788deb83685b523641097bf336d3233faad96
Narayan Kamath [Mon, 14 Nov 2016 13:22:52 +0000 (13:22 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4
am:
479385b6b3
Change-Id: Ia0c1b9e495a4bf78b3b12821a7a106a940c12e87
Xin Li [Mon, 14 Nov 2016 13:22:41 +0000 (13:22 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am:
7e0483fcec -s ours am:
16090c6177 -s ours am:
0a568ae56e am:
9788dd5bd2 am:
6ec8dd10bb am:
921dd6a5fd -s ours am:
05a61276c6
am:
23270f1311
Change-Id: I242883361ff06daefe80686314e8869a3b6733f4
Narayan Kamath [Mon, 14 Nov 2016 13:22:32 +0000 (13:22 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c am:
53af5fe3f7
am:
56294db4d4
Change-Id: Icc973e244e150d786c21a22ce63ae85232a115c2
Narayan Kamath [Mon, 14 Nov 2016 13:21:40 +0000 (13:21 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338 am:
14bd75fa79 am:
50b0c3be57 -s ours am:
e1e735bcb9 am:
072b70bae3 am:
ba6d5ee377
am:
f3f784853d
Change-Id: Ia7aa7669db2bce172e325cb2c70facb3ca149974
Hugo Benichi [Mon, 14 Nov 2016 13:21:26 +0000 (13:21 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9 am:
37cacc77ce am:
4bdf37c204
am:
fd3e6e8d25
Change-Id: I154015353cdab13732d82e02e277139511f797f4
Narayan Kamath [Mon, 14 Nov 2016 13:21:23 +0000 (13:21 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am:
75c6b8c324 am:
9958eb7180 am:
5e92ece8c2 am:
77decadefe am:
11b3161c41
am:
5cbd448348
Change-Id: I8c2fd9f5e060fabe7fe5bc4e628f62d9de2f4769
OSDN Git Service
