OSDN Git Service
Jeff Sharkey [Fri, 2 Dec 2016 01:48:50 +0000 (01:48 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d
am:
90efb1a88d
Change-Id: I7dd6a4396691429ba66cefb136c6176db62da010
Jeff Sharkey [Fri, 2 Dec 2016 01:47:37 +0000 (01:47 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b am:
40b4b1f774
am:
ced9dde8c0
Change-Id: I00217abf1fb1f9f772547250d24dc30ea78c6683
Jeff Sharkey [Fri, 2 Dec 2016 01:37:36 +0000 (01:37 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334
am:
2436f1e49d
Change-Id: I0dd664960ca4b08b1a21ccb0139c9354c56c7cd5
Jeff Sharkey [Fri, 2 Dec 2016 01:36:30 +0000 (01:36 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b
am:
40b4b1f774
Change-Id: If2dc11e8db8deb1f432f853aeed013d9d554c8f5
Jeff Sharkey [Fri, 2 Dec 2016 01:26:32 +0000 (01:26 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours
am:
d9a7f11334
Change-Id: I8b47e258124e4be1b4067712a7cbabb9b7c82a8a
Jeff Sharkey [Fri, 2 Dec 2016 01:25:28 +0000 (01:25 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours
am:
e94d76436b
Change-Id: Ice97dfb650bafe8fff720db26fcdc6f1db60037e
Jeff Sharkey [Fri, 2 Dec 2016 01:24:41 +0000 (01:24 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours am:
a24a33490a am:
dd32a67b33
am:
a898d9f6ca
Change-Id: Ia3add5aa2d68c32b293e82712d59dc439121fb01
Jeff Sharkey [Fri, 2 Dec 2016 01:18:32 +0000 (01:18 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours am:
a24a33490a
am:
dd32a67b33
Change-Id: I2d8b2894d07f7f6173e979d7eb656e9ac860f06a
Jeff Sharkey [Fri, 2 Dec 2016 01:14:23 +0000 (01:14 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
f084ccd48d -s ours
Change-Id: I9b4630b18d52ad503b88380c1a853bf3c0b46a10
Jeff Sharkey [Fri, 2 Dec 2016 01:13:18 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4
am:
50102e63da -s ours
Change-Id: I3a587cb124b30ef5062600e7ba870da58213a094
Jeff Sharkey [Fri, 2 Dec 2016 01:13:09 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours
am:
a24a33490a
Change-Id: I8564b110d58f63aeee8afeab87773e97b7301a60
Jeff Sharkey [Fri, 2 Dec 2016 01:07:07 +0000 (01:07 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be
am:
b981c3be70 -s ours
Change-Id: I22fe97ae93c6e665288d46c29429ca7690352fb3
Jeff Sharkey [Fri, 2 Dec 2016 01:06:56 +0000 (01:06 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b
am:
061e7313b4
Change-Id: If0723e8cb1484263a3b96b37d21132d2ebc9b1b5
Jeff Sharkey [Fri, 2 Dec 2016 01:01:49 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220
am:
2d549764be
Change-Id: Iad255e684d36524388a659181da0535bd15e37dc
Jeff Sharkey [Fri, 2 Dec 2016 01:01:49 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3
am:
3e0d93036b
Change-Id: Ice0b80b96cdd7ad1a7691919982d98266a37f8bf
Jeff Sharkey [Fri, 2 Dec 2016 00:56:31 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
3b0aa060a3
Change-Id: I3ba9a8dedfda4d878b99cc7de8a41418d424495c
Jeff Sharkey [Fri, 2 Dec 2016 00:56:26 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
fbf395c220
Change-Id: I453445723ea9f6124d876dc32c6defab42432351
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Julius D'souza [Thu, 1 Dec 2016 22:26:02 +0000 (22:26 +0000)]
Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev
TreeHugger Robot [Thu, 1 Dec 2016 02:43:32 +0000 (02:43 +0000)]
Merge "Change exit animation to use normal z-order." into cw-f-dev
Michael Kwan [Wed, 30 Nov 2016 21:53:37 +0000 (13:53 -0800)]
Change exit animation to use normal z-order.
Bug:
33198426
Change-Id: I57f2f6360c165fbea25adf9b43f052e09261364b
Mark Renouf [Thu, 1 Dec 2016 01:16:53 +0000 (01:16 +0000)]
Merge "Allow power button to close an input method" into cw-f-dev
TreeHugger Robot [Wed, 30 Nov 2016 22:39:02 +0000 (22:39 +0000)]
Merge "Change activity dismiss animation to move left to right." into cw-f-dev
TreeHugger Robot [Wed, 30 Nov 2016 21:43:34 +0000 (21:43 +0000)]
Merge "Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"" into cw-f-dev
Mark Renouf [Tue, 29 Nov 2016 19:41:50 +0000 (14:41 -0500)]
Allow power button to close an input method
BUG:
33038203
Change-Id: I5c44dc49db6b960b4e3e42545bfbbab62f357f08
Michael Kwan [Wed, 30 Nov 2016 20:19:36 +0000 (12:19 -0800)]
Change activity dismiss animation to move left to right.
Bug:
33041168
Change-Id: Idf3d512debead3b3c70bc2bb8b38b133f2ad1723
vinodkrishnan [Wed, 30 Nov 2016 20:09:59 +0000 (20:09 +0000)]
Revert "DO NOT MERGE Wear Fwk: Disable Animations for A11y"
This reverts commit
8500f26d51e2ba0de7b6cd18bec5f85e5ca40e1d.
Change-Id: I6408fa3f307d7611443e26b24d3876c1a1f92fdc
TreeHugger Robot [Wed, 30 Nov 2016 03:09:20 +0000 (03:09 +0000)]
Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev
Anthony Hugh [Tue, 22 Nov 2016 23:13:35 +0000 (15:13 -0800)]
DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback
It looks like there was a regression where #onNewIntent() was called
before the FLAG_ACTIVITY_BROUGHT_TO_FRONT flag was set. This
change updates the code so we set the flag properly.
BUG:
33034247
Change-Id: I61959a289dc5af14ee9d3d7bfa213191238efc88
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 [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 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: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 [Fri, 18 Nov 2016 23:02:43 +0000 (15:02 -0800)]
Fix default dialog background colour for watch devices.
Bug:
33008587
Change-Id: I0fe4f9a7244958406d2a3466393476f7775ae995
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
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
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
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 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 [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)
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
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: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
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
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: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: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: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
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
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
Narayan Kamath [Mon, 14 Nov 2016 13:20:05 +0000 (13:20 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229 am:
6bf96c1192 am:
22e45fa247 am:
d98e75feca am:
87dc13f249
am:
c50c43667f
Change-Id: I11f57941eb00efafb14e0505131e66bc22fc68c6
Hugo Benichi [Mon, 14 Nov 2016 13:19:50 +0000 (13:19 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev am:
476da32d86 -s ours am:
bdf4d8a93c
am:
1d61b01a5d
Change-Id: Ie4a49408157b5de6dc0003b148e0d1042c87d515
Narayan Kamath [Mon, 14 Nov 2016 13:18:23 +0000 (13:18 +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
Change-Id: Iaba405222437a1a6df61c2de1b55d46110b7baac
Narayan Kamath [Mon, 14 Nov 2016 13:17:13 +0000 (13:17 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59 am:
2f8ce5f5cb am:
5515b415aa am:
d212aa9d13
am:
3b89a68a08
Change-Id: I7eb37e002025b94267846d45680f24c3901fada9
Narayan Kamath [Mon, 14 Nov 2016 13:15:59 +0000 (13:15 +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
Change-Id: I016ca17b09b2aa1ca3286f21ab6a534933482d1b
Narayan Kamath [Mon, 14 Nov 2016 13:15:47 +0000 (13:15 +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
Change-Id: I3aa51cf70829614ffcc3598e20eba6e9036d6790
Narayan Kamath [Mon, 14 Nov 2016 13:14:47 +0000 (13:14 +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
Change-Id: Ic51bd970889a267e911f6171bd56e955b8ecac63
neo.chae [Mon, 14 Nov 2016 13:13:48 +0000 (13:13 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b am:
85afb42c16 am:
b4b2203c5e am:
fb74b8773a am:
c58ec27e1c am:
7489336fed
am:
0212d4f3fa
Change-Id: I9ea05d641c04178d067c35ae5d2f87ee35c86924
Xin Li [Mon, 14 Nov 2016 13:12:42 +0000 (13:12 +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
Change-Id: I114b678f9a47837a97758693f4c0e64e8eb17298
Xin Li [Mon, 14 Nov 2016 13:11:30 +0000 (13:11 +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
Change-Id: I45d14e29bd7791cd3bd8fcca887478d8ac88d37a
Narayan Kamath [Mon, 14 Nov 2016 13:10:53 +0000 (13:10 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b am:
59e6dccb4c
am:
53af5fe3f7
Change-Id: If824016f0535d121404b08c36b43a1ce0f168d13
Narayan Kamath [Mon, 14 Nov 2016 13:10:17 +0000 (13:10 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am:
75c6b8c324 am:
9958eb7180 am:
5e92ece8c2 am:
77decadefe
am:
11b3161c41
Change-Id: Ia63281de50ffd23664671780c2d75155dbc66260
OSDN Git Service
