Commit Graph

252839 Commits

Author SHA1 Message Date
Lorenzo Colitti
4af40ef464 Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev am: f45f9d31d3
am: bad422e647

Change-Id: I856e54864e96d5cb6c96c0cd38d73cf4ee5995b9
2016-08-30 10:56:56 +00:00
Lorenzo Colitti
a0a41b1e3d Don't notify on network switch if source network is validated. am: c2e10bb074
am: b301283d57

Change-Id: I5ba45a71369aec6e3ddb771c365512e126bc51c4
2016-08-30 10:56:52 +00:00
Lorenzo Colitti
bad422e647 Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev
am: f45f9d31d3

Change-Id: Ic6ab6d1048a89c12b44c6c33e77c8ead7f641575
2016-08-30 10:51:21 +00:00
Lorenzo Colitti
b301283d57 Don't notify on network switch if source network is validated.
am: c2e10bb074

Change-Id: I85fdb0faf48a54ab63b5b23f1e992bc5e9116194
2016-08-30 10:51:19 +00:00
TreeHugger Robot
f45f9d31d3 Merge "Don't notify on network switch if source network is validated." into nyc-dr1-dev 2016-08-30 10:46:33 +00:00
Erik Kline
833f943d7c Merge "Remove INetd AIDL reference" into nyc-mr1-dev
am: 0a272fcba7

Change-Id: Iba5c0baf7b64db5173f438465d541960438dd205
2016-08-30 07:17:17 +00:00
Erik Kline
6b4c55f54f Remove INetd AIDL reference
am: ee5de9d245

Change-Id: I88ef2f4b1782b6e58578ba1c7928635c54d614f6
2016-08-30 07:17:12 +00:00
TreeHugger Robot
0a272fcba7 Merge "Remove INetd AIDL reference" into nyc-mr1-dev 2016-08-30 07:09:30 +00:00
Paul Jensen
59232bfc0b Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev am: b9d4f91630 am: 79ecffe719
am: d522a6f630

Change-Id: Ie5e641af9d379b86409fbf1e346a9ac004231757
2016-08-30 05:52:49 +00:00
Paul Jensen
17d22a4022 Sanity check ICMP6 router advertisement packets am: a36213867a -s ours am: e39980689e
am: 008c82c10b

Change-Id: I15049d76d8ab742d6cea2b84d7c91bcad474c04f
2016-08-30 05:52:47 +00:00
Paul Jensen
d522a6f630 Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev am: b9d4f91630
am: 79ecffe719

Change-Id: I0a347072ac9dc32013b41209ba6966d6ff4d26a2
2016-08-30 05:47:36 +00:00
Paul Jensen
008c82c10b Sanity check ICMP6 router advertisement packets am: a36213867a -s ours
am: e39980689e

Change-Id: I2a18188cb1b8a1c3fe26c41eea72f4c3cc03a369
2016-08-30 05:47:33 +00:00
Paul Jensen
79ecffe719 Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev
am: b9d4f91630

Change-Id: Ibea7e0328b1f7c74bf2edcc054cad2a54def905b
2016-08-30 05:44:34 +00:00
Paul Jensen
e39980689e Sanity check ICMP6 router advertisement packets
am: a36213867a  -s ours

Change-Id: I8371809758391158effb378fae4b6fc9aaca553c
2016-08-30 05:42:04 +00:00
Pat Tjin
e93bfe1f18 Merge "BootReceiver: Report correct headers for last messages" into nyc-mr1-dev
am: 6c0d81520b

Change-Id: I8341a8f3c37cdb9655a6e163c53f1a2fcdde2e5f
2016-08-30 05:22:52 +00:00
Patrick Tjin
56734f96ec BootReceiver: Report correct headers for last messages
am: 60c17395a6

Change-Id: Ib938941dc0cdc066a476964732fc6ce7ee3daac9
2016-08-30 05:22:48 +00:00
TreeHugger Robot
b9d4f91630 Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev 2016-08-30 05:20:12 +00:00
Pat Tjin
6c0d81520b Merge "BootReceiver: Report correct headers for last messages" into nyc-mr1-dev 2016-08-30 05:18:35 +00:00
TreeHugger Robot
aa09263379 Merge "Add rotary encoder support to scrolling containers" into cw-f-dev 2016-08-30 03:10:48 +00:00
Erik Kline
ee5de9d245 Remove INetd AIDL reference
Change-Id: I29dfee480a4706213b36766724b6211dbc74dbac
2016-08-30 11:40:20 +09:00
Svetoslav Ganov
fe2462f3a6 Properly close fd backing a MemoryIntArray
Use ParcelFileDescriptor only as an IPC transport
to make sure MemoryIntArray manges its backing fd.

Bug:30310689

Change-Id: Ib3cc13ef4ae2a744e5f7a96099570e0431847bce
2016-08-30 02:26:19 +00:00
Todd Kennedy
c49e7c06a8 Merge "update shared libraries for system apps" into nyc-dev am: 689c92db9d am: 69b47a2010
am: 92b70b4b07

Change-Id: Ic0eeac452f07b6f2ce70eaa701b03146d85a4c1e
2016-08-30 02:03:20 +00:00
Todd Kennedy
ca4e5fd30a update shared libraries for system apps am: 85a91def5c am: 7c23d3f837
am: 8da2996820

Change-Id: I73805b7a0357f2e5322c7c278605bff8de026004
2016-08-30 02:03:17 +00:00
Todd Kennedy
92b70b4b07 Merge "update shared libraries for system apps" into nyc-dev am: 689c92db9d
am: 69b47a2010

Change-Id: I73da3e3a7ffe88f69e9af28d65e5d695ffc1a1bb
2016-08-30 01:57:48 +00:00
Todd Kennedy
8da2996820 update shared libraries for system apps am: 85a91def5c
am: 7c23d3f837

Change-Id: Idcd5040fbabafb79a7f847514d7d808a336109a9
2016-08-30 01:57:46 +00:00
Paul Jensen
a36213867a Sanity check ICMP6 router advertisement packets
There is a chance a packet can slip by before we install the filter
on our socket listening for RAs, so add some basic sanity checking
to make sure we've recieved an RA.

Change-Id: I14cf84a0814896a41e00f50af376dfc4988d36cb
Fixes: 29586253
2016-08-30 10:57:30 +09:00
Todd Kennedy
69b47a2010 Merge "update shared libraries for system apps" into nyc-dev
am: 689c92db9d

Change-Id: Iea85964ca4ee5557599858572864b51ea7dd53f3
2016-08-30 01:48:47 +00:00
Todd Kennedy
7c23d3f837 update shared libraries for system apps
am: 85a91def5c

Change-Id: Iea6f0e3809bc5e4c77a1d5d83be67d6c285bea65
2016-08-30 01:48:45 +00:00
TreeHugger Robot
689c92db9d Merge "update shared libraries for system apps" into nyc-dev 2016-08-30 01:44:31 +00:00
Eino-Ville Talvala
f005f5ed88 android.view.Surface: Add parceling warning
Surface is parcelled partly in java, partly in native, and any fields
added in java have to be accounted for in the native side as well.

Add a warning to avoid issues in the future

Bug: 31162160
Change-Id: I48ca1bc3eea29f1ac3d3065f6defb6ed2be4052a
2016-08-29 17:51:23 -07:00
Jorim Jaggi
354a22f6a5 Merge "Add animation when unoccluding windows (1/2)" into nyc-mr1-dev
am: 92a8a4a6e2

Change-Id: I390ba7ef3da26693f499fdc61a30e61ad4355038
2016-08-30 00:26:26 +00:00
Jorim Jaggi
314c05db45 Add animation when unoccluding windows (1/2)
am: 6626f54e65

Change-Id: I09be1e1b7d830067c354c6cdfd940deafa027a22
2016-08-30 00:25:52 +00:00
TreeHugger Robot
92a8a4a6e2 Merge "Add animation when unoccluding windows (1/2)" into nyc-mr1-dev 2016-08-30 00:20:41 +00:00
Ned Burns
20ad073581 Add rotary encoder support to scrolling containers
Change-Id: I1b7a2a60ac9864f2639af81fff810db601b2fbd4
2016-08-29 20:09:23 -04:00
John Reck
8960d573f2 Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867 am: 25c6b37613
am: 24a082cd49

Change-Id: If6a1ad186ce66d68fb79a2a5c0dc217c7161cac8
2016-08-30 00:02:15 +00:00
Chris Craik
726728d148 Cherry pick TextureView fixes am: 2e8a8a2432 am: 05cb60846c
am: 2e5e9feaef

Change-Id: I69af118cf8e8718fba5c7de1e3913e224a9983c7
2016-08-30 00:02:12 +00:00
John Reck
24a082cd49 Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867
am: 25c6b37613

Change-Id: I36308a0b1beb391a31fdad836ec6194cb048de4e
2016-08-29 23:53:24 +00:00
Chris Craik
2e5e9feaef Cherry pick TextureView fixes am: 2e8a8a2432
am: 05cb60846c

Change-Id: I63d23f6b28b40154952cee408e42115657e6a3e3
2016-08-29 23:53:22 +00:00
John Reck
25c6b37613 Merge "Cherry pick TextureView fixes" into nyc-dev
am: 8eaa65b867

Change-Id: Iaf8ab16f6a1421ff6a19bf81a54b82111f6747f4
2016-08-29 23:41:44 +00:00
Chris Craik
05cb60846c Cherry pick TextureView fixes
am: 2e8a8a2432

Change-Id: I1ae3cdc7181e9bef40e38204ede002de973dee98
2016-08-29 23:41:42 +00:00
Pankaj Kanwar
ce53fb13c8 Merge "Allow getResponseCode to block if response hasn't been received from remote" into nyc-mr1-dev
am: 8a4db04893

Change-Id: I7e2f30316d15d8f66fffcb140522d75c65d29eeb
2016-08-29 23:40:32 +00:00
Ajay Panicker
ffabe1cf7d Allow getResponseCode to block if response hasn't been received from remote
am: c3ae4db069

Change-Id: I0ecd11fd14ee416d2ffb8503ccc12b61d3583d12
2016-08-29 23:40:28 +00:00
Pankaj Kanwar
8a4db04893 Merge "Allow getResponseCode to block if response hasn't been received from remote" into nyc-mr1-dev 2016-08-29 23:35:11 +00:00
John Reck
8eaa65b867 Merge "Cherry pick TextureView fixes" into nyc-dev 2016-08-29 23:33:57 +00:00
Philip P. Moltmann
da2ea93dbe Merge "Hold no locks when calling RemotePrintSpooler" into nyc-mr1-dev
am: 23f6f13eab

Change-Id: Id0cd5e2e1ed575fc77838b3f997e1dd7004c95fd
2016-08-29 23:26:34 +00:00
Philip P. Moltmann
684aa472cd Hold no locks when calling RemotePrintSpooler
am: 1d6e7cc536

Change-Id: I9765689a63eb7a3426feee43b970aa0a9f2fb441
2016-08-29 23:26:32 +00:00
TreeHugger Robot
23f6f13eab Merge "Hold no locks when calling RemotePrintSpooler" into nyc-mr1-dev 2016-08-29 23:14:26 +00:00
Yohei Yukawa
7dd5f81c42 Merge "Make sure IME focus is synced to View focus" into nyc-dev am: b7efddfc41 am: 15946bd93c
am: 04e7bc8ea4

Change-Id: I8cb332d0bbd356f4c72e5d0cc3f6ba20a811fae7
2016-08-29 23:13:46 +00:00
Yohei Yukawa
e79b052f51 Make sure IME focus is synced to View focus am: 8eb07090a4 -s ours am: ef53c0f5ec
am: 74e5244fde

Change-Id: I9e36e35c0431bc50651f02ee1dfefe8e230dfbdc
2016-08-29 23:13:42 +00:00
Ben Lin
993f368dc5 Merge "Push delete notification when Bug reports are deleted." into nyc-mr1-dev
am: cd97d925c0

Change-Id: I50e3fb2eadfb13aae76a484e8b23e282c2ac4d43
2016-08-29 23:01:37 +00:00