Commit Graph

80963 Commits

Author SHA1 Message Date
Fyodor Kupolov
80e87f97c3 Merge "Fix AddAccountSettings memory leak" am: 104501fa29
am: c17b4e5a14

Change-Id: Ie7dd4310f3937c2c3e0fc9d3590b1a7813c0abee
2017-09-19 18:48:54 +00:00
Fyodor Kupolov
c17b4e5a14 Merge "Fix AddAccountSettings memory leak"
am: 104501fa29

Change-Id: I844d7ce66a162ba1e72a099d429e17de9c72fb86
2017-09-19 18:42:07 +00:00
Fyodor Kupolov
104501fa29 Merge "Fix AddAccountSettings memory leak" 2017-09-19 18:29:14 +00:00
Nicolas Geoffray
836f2fe701 Merge "Special handling of priv-apps in Zygote." am: 46af70cad9
am: 79d4ef6caa

Change-Id: Ice349c6b6160ad89ba1c8543acf3e678a1473a25
2017-09-19 12:03:38 +00:00
Nicolas Geoffray
79d4ef6caa Merge "Special handling of priv-apps in Zygote."
am: 46af70cad9

Change-Id: I1dbf2313c9ee1c014854630eac5f1429548ae7f6
2017-09-19 11:56:05 +00:00
Nicolas Geoffray
46af70cad9 Merge "Special handling of priv-apps in Zygote." 2017-09-19 11:47:58 +00:00
Charles He
01014743c0 Merge changes from topic "always-on-vpn" am: cc15c7f8c1
am: 692b55390f

Change-Id: I3931c053c4daff092b06e3e1d673817708762a62
2017-09-19 08:09:41 +00:00
Charles He
692b55390f Merge changes from topic "always-on-vpn"
am: cc15c7f8c1

Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
2017-09-19 08:01:45 +00:00
Charles He
cc15c7f8c1 Merge changes from topic "always-on-vpn"
* changes:
  Opt-out for always-on VPN: rename API.
  Opt-out for always-on VPN
2017-09-19 07:50:13 +00:00
Hugo Benichi
19625788a1 Merge "Wakeup packet events: addressing a few comments" am: 67d16ec1ab
am: a35bbadeba

Change-Id: I33eeb421cff21efdaa409d27fb130ff4754ac6b0
2017-09-19 07:29:09 +00:00
Hugo Benichi
a35bbadeba Merge "Wakeup packet events: addressing a few comments"
am: 67d16ec1ab

Change-Id: I67b2e54d45a39005e2091a46e8b90d8cc75fe079
2017-09-19 07:21:12 +00:00
Hugo Benichi
175b574e27 Wakeup packet events: addressing a few comments
This patch addresses a few post-submit comment for
commits f562ac34a51dc and 60c9f63b66921.

Bug: 34901696
Bug: 62179647
Test: runtest frameworks-net
Change-Id: I4abec57e0c6bc869dc57b5eb54582dd977b64c30
2017-09-19 14:07:47 +09:00
Ruina Liu
311d031d22 Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes" am: ac421b8f44
am: 8c65620d31

Change-Id: I70ded26f7487e0cf0cbb2f3fa1184c85ed00b765
2017-09-18 18:00:58 +00:00
Ruina Liu
8c65620d31 Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
am: ac421b8f44

Change-Id: I9c6b453e0ef71a70cd972a47763d042943fe3f36
2017-09-18 17:53:31 +00:00
Ruina Liu
044e0fe5c5 Fix extracting 32-bit uuid error via calling method uuidToBytes
A new defined method of uuidToBytes is used to convert
Bluetooth uuid to bytes in the case of BLE advertising.
But the most significant 16 bits of a 32-bit uuid
will be cleared after the and operations with
0X0000FFFF00000000L in the function of
getServiceIdentifierFromParcelUuid.
0XFFFFFFFF00000000L should be used as bit mask.

Change-Id: I83e22ffbecd718540e644289fee12bf9c3b66305
Test: Advertise with payload contains 32-bit uuid
2017-09-15 17:08:32 -07:00
Narayan Kamath
dd3f6046b3 Merge changes Id931d441,I83faf974 am: 89c94f67b4
am: 66d7275d39

Change-Id: Ic0d6dba2b5560b335b3be8e27a88c01c960ec0aa
2017-09-15 01:09:04 +00:00
Kevin Hufnagle
531a955dba Merge "docs: updated link on RemoteInput page" into oc-dev am: 6087b990df
am: 91fb9b2a16

Change-Id: Ic808c82a82028169ed7aebd8c6d1b25f9e2b84cf
2017-09-15 00:55:42 +00:00
Kevin Hufnagle
91fb9b2a16 Merge "docs: updated link on RemoteInput page" into oc-dev
am: 6087b990df

Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
2017-09-15 00:42:20 +00:00
Kevin Hufnagle
6087b990df Merge "docs: updated link on RemoteInput page" into oc-dev 2017-09-15 00:12:41 +00:00
Jakub Pawlowski
e22de0f23f Merge changes from topic "incl_svc_parsing_fix" am: fee4546fd6
am: 3aa179fabd

Change-Id: Ic6fe3edff44423031a2abb271bce875c05e71a88
2017-09-15 00:01:54 +00:00
Narayan Kamath
66d7275d39 Merge changes Id931d441,I83faf974
am: 89c94f67b4

Change-Id: Ifc090e141092bcee11704e45d6f97f642040d002
2017-09-14 23:57:14 +00:00
Treehugger Robot
89c94f67b4 Merge changes Id931d441,I83faf974
* changes:
  Zygote: Improve logging and error handling during connections.
  Zygote: Fix race condition on package preloads.
2017-09-14 23:41:34 +00:00
Jakub Pawlowski
3aa179fabd Merge changes from topic "incl_svc_parsing_fix"
am: fee4546fd6

Change-Id: If7ee44287dbec54e49df9fc350b2ebdfcdaeb431
2017-09-14 23:36:00 +00:00
Jakub Pawlowski
dd71df9d41 Merge "Bluetooth: fix parameter name in onConnectionUpdated" am: 1f53eb76e4
am: 8ab1ed1789

Change-Id: I534e04c709f6ee3f74358e9e1b3a30ad6cb64083
2017-09-14 19:41:52 +00:00
Jakub Pawlowski
8dde5e1ce0 Fix included service parsing (3/3)
Bug: 65637368
Test: sl4a GattIncludedServiceTest
Change-Id: Idb967df9d5064b0532db7f5c250f677d1dbbc54c
2017-09-14 19:37:40 +00:00
Jakub Pawlowski
8ab1ed1789 Merge "Bluetooth: fix parameter name in onConnectionUpdated"
am: 1f53eb76e4

Change-Id: I45642dfbb8ed8bb90a1306d066844d18aa1962b3
2017-09-14 19:35:24 +00:00
Jakub Pawlowski
cf733cd020 Bluetooth: fix typo in comment
Test: none
Change-Id: I48c674049df88285268145d4140870eb4ab79a62
2017-09-14 19:24:28 +00:00
Jakub Pawlowski
14a381bc3e Bluetooth: fix parameter name in onConnectionUpdated
Test: compilation
Change-Id: I625e4ca63477b795310ebb42ca5e9a0549523cc5
2017-09-14 19:23:59 +00:00
Hugo Benichi
7d16886c7e Merge changes Ie2676b20,Ie8db6f85 am: 61901ddedd
am: 4188432a7b

Change-Id: I4ad3267304977f9956dc33c179c86118252a55b3
2017-09-14 12:08:22 +00:00
Hugo Benichi
4188432a7b Merge changes Ie2676b20,Ie8db6f85
am: 61901ddedd

Change-Id: Ib4fab32418da8274bd6b5cb9fef85e0db79d866a
2017-09-14 12:01:19 +00:00
Hugo Benichi
61901ddedd Merge changes Ie2676b20,Ie8db6f85
* changes:
  Connectivity metrics: add WakeupStats events
  Connectivity metrics: collect NFLOG wakeup events
2017-09-14 11:53:02 +00:00
Hugo Benichi
60c9f63b66 Connectivity metrics: add WakeupStats events
This patch defines a new WakeupStats event in ipconnectivity.proto and
populates these events from the NFLOG wakeup events stored in
NetdEventListenerService.

There is one WakeupStats object per known interface on which ingress
packets arrive and may wake the system up.

Example from $ adb shell dumpsys connmetrics list:

UPDATEME
...
WakeupStats(wlan0, total: 58, root: 0, system: 3, apps: 38, non-apps: 0, unrouted: 17, 6111s)
WakeupEvent(13:36:31.686, iface wlan0, uid -1)
WakeupEvent(13:38:50.846, iface wlan0, uid -1)
WakeupEvent(13:39:16.676, iface wlan0, uid 10065)
WakeupEvent(13:40:32.144, iface wlan0, uid 1000)
WakeupEvent(13:40:35.827, iface wlan0, uid 1000)
WakeupEvent(13:40:47.913, iface wlan0, uid 10004)
WakeupEvent(13:40:52.622, iface wlan0, uid 10014)
WakeupEvent(13:41:06.036, iface wlan0, uid 10004)
...

Bug: 34901696
Bug: 62179647
Test: runtest frameworks-net
Change-Id: Ie2676b20bfb411a1902f4942643df0c20e268d99
2017-09-14 13:29:56 +09:00
Narayan Kamath
ac0b4be198 Zygote: Improve logging and error handling during connections.
Before this change, we were throwing a checked exception on success
and returning on failure. This made it hard to figure out where / when
something was going wrong. This change switches things around to throw
a RuntimeException when something goes wrong and to return a Runnable
on success. This lets us make stronger assertions in both the parent
and the child process about their state and expected return values.

This change also upgrades the severity of several errors that we would
earlier just ignore. We will now reject the command and terminate the
connection to the client when we encounter these errors such as:

- Malformed arguments
- Any ZygoteSecurityException, such as thown thrown by
  applyUidSecurityPolicy and applyInvokeWithSecurityPolicy.
- Any error in setting up pipes etc. to facilitate communication
  with child processes.

(cherry picked from commit bf99d06003)

Bug: 13618569
Test: Manual
Merged-In: Id931d44135ae2e4ede1bbac6a4b187f6c139e1fd
Change-Id: Id931d44135ae2e4ede1bbac6a4b187f6c139e1fd
2017-09-13 18:40:59 -07:00
Narayan Kamath
a3d4230b92 Zygote: Fix race condition on package preloads.
Before this change, ZygoteProcess.preloadPackageForAbi returned
as soon as the command was written to the zygote socket and not
after the preload completed. This meant that there was a small
window of time before the server side of the socket polled its FDs
where a second command could be written to the zygote socket. This
would lead to only one of the commands being processed and the
other being dropped. The client side of that socket would then wait
forever for a response and bring down the system once the watchdog
timeout was hit.

Example failure case :
--------------
system_server:send command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(preloadPackage)  // the fork command is dropped.

Example of normal operation :
------------------
system_server:send command(preloadPackage)
zygote:poll & process command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(fork)

This change makes preloadPackageForAbi synchronous, which ensures
that each POLLIN event corresponds to precisely one command.

(cherry picked from commit 24a3306c32)

Bug: 62886909
Bug: 13618569
Test: Manual
Contributed-By: yuqianyu@huawei.com

Merged-In: I83faf974c9a70a6ab18323f692c1981784e4c56a
Change-Id: I83faf974c9a70a6ab18323f692c1981784e4c56a
2017-09-13 18:37:05 -07:00
Dave Friedman
1bfd76caf7 Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718 am: 4b3a4b58ed
am: d1412d3d60

Change-Id: I89c089697a431a21d120561fcd54ead30320751c
2017-09-14 00:11:54 +00:00
Dave Friedman
d1412d3d60 Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718
am: 4b3a4b58ed

Change-Id: I2925d1d3bf70cebfb8d830a28a977208138d91af
2017-09-13 23:42:48 +00:00
Jakub Pawlowski
eef8920a9f Merge "Bluetooth: thread-safe callback invocation" am: f8c7572b8f
am: c416035448

Change-Id: I232f18596d1fd64aa64f44fd726df32d2f61ce83
2017-09-13 22:36:14 +00:00
Jakub Pawlowski
79ce33fc96 Merge "Bluetooth: fix GATT race conditions when using Handler" am: 06b29a87d7
am: 9054e03cf4

Change-Id: Ib31912b6f39b5cc3ef9623e9daeddfcd3d732fbe
2017-09-13 22:32:37 +00:00
Rubin Xu
c345562746 Merge "Refactor CompareResult<> class and its call sites" am: 60eae6e621
am: 89deab16f3

Change-Id: I17c4597faeebebf4bbf5c13e2628520ab99c4261
2017-09-13 22:26:02 +00:00
Jakub Pawlowski
c416035448 Merge "Bluetooth: thread-safe callback invocation"
am: f8c7572b8f

Change-Id: Iac79926b7131949367b1dad2565b6d0b405ef832
2017-09-13 22:12:16 +00:00
Jakub Pawlowski
9054e03cf4 Merge "Bluetooth: fix GATT race conditions when using Handler"
am: 06b29a87d7

Change-Id: I2760ebf88cb96e29a754a65d1ce3f5ae879d7ccc
2017-09-13 22:08:00 +00:00
Rubin Xu
89deab16f3 Merge "Refactor CompareResult<> class and its call sites"
am: 60eae6e621

Change-Id: I3d463e29d8ba806d69596bee64234a28d0c6f34d
2017-09-13 21:59:11 +00:00
Nicolas Geoffray
ef35bd57d5 Missed these renames in last commit.
am: 1bf40f63b3

Change-Id: Id65109bacdcb5ad4506063bd71c45a40a5e57503
2017-09-13 20:38:27 +00:00
Nicolas Geoffray
eb8a4ef5d3 resolve merge conflicts of e017dae587 to stage-aosp-master
am: 8dbb5e51c8

Change-Id: Ice59291f15100c280e2e9cb6cfbfeff0afbdfdef
2017-09-13 20:22:55 +00:00
Jakub Pawlowski
3eb569fc72 Bluetooth: thread-safe callback invocation
Bug: 65596701
Test: manual
Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7
2017-09-13 17:31:43 +00:00
Jakub Pawlowski
eb6b3da4fc Bluetooth: fix GATT race conditions when using Handler
Bug: 65596701
Test: manual
Change-Id: Id703cea0543626bdd5a583da95615b650bbcc331
2017-09-13 17:31:24 +00:00
Dave Friedman
4b3a4b58ed Docs: Updating ANDROID_ID information to reflect Android O changes.
Bug: 38270718

Test: Verified on local build.

Change-Id: If4f86d261ae950cc14579aeba65c36a289cdf56c
2017-09-13 08:47:46 -07:00
Nicolas Geoffray
1f88ad66e1 Special handling of priv-apps in Zygote.
If pm.dexopt.priv-apps is set to false, disable verifier and
only allow loading oat files from system.

bug: 30972906
bug: 63920015

Test: works as expected when pm.dexopt.priv-apps is true or false
Change-Id: Ib9e80c9b7b4106e82c0b9d1c7fbb8065c190ac1f
2017-09-13 14:21:00 +01:00
Nicolas Geoffray
1bf40f63b3 Missed these renames in last commit.
Test: builds
Change-Id: I6c2d03accc55aef8381f38f9b182f2367e25a915
2017-09-13 12:59:21 +01:00
Nicolas Geoffray
8dbb5e51c8 resolve merge conflicts of e017dae587 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7008986501028ec9bee0505d41aae3ff27872b50
2017-09-13 11:08:36 +01:00