276553 Commits

Author SHA1 Message Date
Brad Ebinger
9e4d4ee484 Merge "Modify AIDLs to include Session.Info"
am: 78a63c1cf0

Change-Id: I0549ace3cc383bebac86a8b49cb87f631aecb552
2016-10-31 17:12:26 +00:00
Brad Ebinger
78a63c1cf0 Merge "Modify AIDLs to include Session.Info" 2016-10-31 17:04:50 +00:00
Marie Janssen
6a383a7d32 Bluetooth: prevent enabling BLE in airplane mode
Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.

Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.

Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble

Bug: 32140251
Bug: 32140271
Bug: 32369494

Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835
2016-10-31 09:06:36 -07:00
Robert Sesek
8a3a6ffa86 In MountEmulatedStorage() don't create a mount namespace unless actually mounting.
When the zygote starts, it creates its own mount namespace in
nativeUnmountStorageOnInit(). When the zygote forks a new process, unless the
new process actually has permission to access emulated storage (and thus it
needs to be mounted), there is no reason to create another new mount namespace
in the child.

This supports the WebView zygote, which does not have CAP_SYS_ADMIN to perform
mount operations. But since it only forks isolated_app processes, which do not
have access to storage, it does not need to handle mounting.

Test: m checkbuild
Test: angler boots

Bug: 21643067
Change-Id: Ieb75cc3009ed26b7366213409d5fad836f597084
2016-10-31 11:25:10 -04:00
Andreas Gampe
c425362049 Zygote: Avoid string concatentation for systrace
Avoid the allocation of an unneeded string. With more than 4000
classes being preloaded, this adds up.

Test: m
Test: device boots
Change-Id: I61f10f61ebdd08d17e09aaedd8bf54cc40c41838
2016-10-28 18:19:30 -07:00
Sanket Agarwal
958dab93cd Merge "Use UUIDs for call management in Headset Client (HF)"
am: 678ba24533

Change-Id: I77553f45f3d5de04e9b443e425f15afb8946e237
2016-10-28 20:13:57 +00:00
Brad Ebinger
aacbdf59d6 Merge "Modify AIDLs to include Session.Info" into stage-aosp-master 2016-10-28 20:09:55 +00:00
Sanket Agarwal
678ba24533 Merge "Use UUIDs for call management in Headset Client (HF)" 2016-10-28 20:01:59 +00:00
Brad Ebinger
b32d4f8b5c Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
2016-10-28 12:14:24 -07:00
Sanket Agarwal
52a04e4467 Use UUIDs for call management in Headset Client (HF)
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.

Bug: b/29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit dbeab2c6e12693fe9b06b6a680677da5325c9230)
(cherry picked from commit 40bb6f3f8fc02600fe24301c11e804196ced3531)
2016-10-28 18:16:53 +00:00
Igor Murashkin
d0d99d8a3d Merge "app_process: Forward -cp/-classpath to ART."
am: 4a4a8f1555

Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747
2016-10-28 17:48:15 +00:00
Treehugger Robot
4a4a8f1555 Merge "app_process: Forward -cp/-classpath to ART." 2016-10-28 17:34:47 +00:00
Przemyslaw Szczepaniak
29d6af7fe7 Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9"
am: ec3e884e88

Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651
2016-10-28 12:05:56 +00:00
Przemyslaw Szczepaniak
ec3e884e88 Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" 2016-10-28 11:57:07 +00:00
Mitchell Wills
77281bbaf4 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit 6a80a4b05acacd3fd07583a3bb6185e9770215eb.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128bb9878971f8b5a85b90b3f303fec0ba)
2016-10-28 03:52:58 +00:00
Jakub Pawlowski
81d5ecb7a6 Merge "Separate LE scanner from GATT client (1/4)"
am: 87c997ca21

Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
2016-10-28 02:50:54 +00:00
Marie Janssen
98f664b903 Merge "Add Bluetooth toggle prompts - framework"
am: a062ce698b  -s ours

Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
2016-10-28 02:45:26 +00:00
Jakub Pawlowski
87c997ca21 Merge "Separate LE scanner from GATT client (1/4)" 2016-10-27 23:18:54 +00:00
Brad Ebinger
3445f82907 Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
2016-10-27 16:11:18 -07:00
Jakub Pawlowski
1b49e6eb04 Separate LE scanner from GATT client (1/4)
Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.

Test: sl4a BleScanApiTest ConcurrentBleScanTest
Change-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621
2016-10-27 23:09:35 +00:00
Marie Janssen
a062ce698b Merge "Add Bluetooth toggle prompts - framework" 2016-10-27 23:07:32 +00:00
Svetoslav Ganov
f9e2ad0b3c Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.

bug:28715749

Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
(cherry picked from commit ac69be543f89ea6e9a27204492e0a170d9b3450e)
2016-10-27 22:49:11 +00:00
Etan Cohen
31dc3db9a4 Update service test runner to allow test args
Change order of arguments - runner must be last argument.

Test: executed test with arguments
Change-Id: I9e69246281bce9814300fadc7e5d97ecf1a2bad2
2016-10-27 10:34:47 -07:00
Android Build Merger (Role)
258790a2ea Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours" into stage-aosp-master 2016-10-27 17:24:56 +00:00
Leonard Mosescu
d73688521c Merge "Adding "attach-agent" to ActivityManagerShellCommand"
am: bd2688f4c3  -s ours

Change-Id: If1e48ecf5e75452c85e7a36f4be0d817234043c9
2016-10-27 17:24:17 +00:00
Leonard Mosescu
bd2688f4c3 Merge "Adding "attach-agent" to ActivityManagerShellCommand" 2016-10-27 17:04:57 +00:00
Leonard Mosescu
1ab879be90 Adding "attach-agent" to ActivityManagerShellCommand
This new command is used to attach runtime agents to a running application:

attach-agent <PROCESS> <FILE>
   Attach an agent to the specified <PROCESS>,
   which may be either a process name or a PID.

Test: m test-art-host, manual testing:
    . invalid syntax, missing arguments
    . invalid syntax, extra arguments
    . invalid numeric PID
    . invalid process name
    . valid process, not debuggable
    . valid process, missing agent
    . valid process, valid agent

Bug: 31682382

Change-Id: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6

Merged-In: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6
2016-10-27 17:03:57 +00:00
Michal Karpinski
6e54239e50 Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future unit and CTS

Bug: 29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
(cherry picked from commit 14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)
2016-10-27 16:39:21 +00:00
Lorenzo Colitti
853427a30a Merge changes from topic 'netd_aosp'
am: d19524f4f2

Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70
2016-10-27 13:20:34 +00:00
Michal Karpinski
17be4d6c85 Add connect event reporting
am: 265494a0f8

Change-Id: I258d348355ac182cdd0c0698d5dbbb66668dcdd8
2016-10-27 13:13:56 +00:00
Michal Karpinski
3156b53fbe Extending DNS event reporting
am: f82d1596ce

Change-Id: I2e39caad0074be519640b561201f75d6685c01ef
2016-10-27 13:12:29 +00:00
Lorenzo Colitti
d19524f4f2 Merge changes from topic 'netd_aosp'
* changes:
  Add connect event reporting
  Extending DNS event reporting
2016-10-27 13:05:26 +00:00
Michal Karpinski
265494a0f8 Add connect event reporting
Adds reporting of connect events including netId, destination IP address,
destination port, uid and connect latency.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future CTS

Bug: 29748723

(cherry picked from commit 965894eeb90c13255b5559b925d13fd22528f8cb)

Change-Id: I0c563f26ac39a7e1870153f30d073fc7d0006abc
2016-10-27 18:23:21 +09:00
Michal Karpinski
f82d1596ce Extending DNS event reporting
This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future unit and CTS

(cherry picked from commit 14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)

Bug: 29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216
2016-10-27 18:23:16 +09:00
Peter Qiu
bb8f3a3bbf Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
am: ef0cc62058

Change-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08
2016-10-26 22:30:37 +00:00
Peter Qiu
fe4f473fb8 Merge changes I69c1931b,I6b08f52d
am: 1a5da2b533

Change-Id: I43b0ddd456cfd9d3988c504266e868a637bb43c4
2016-10-26 22:29:01 +00:00
Peter Qiu
2fb7775d2a wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
am: bae4becf69

Change-Id: I2b8510cc8dc6fad443f0507a86f960ce1ae9a0d6
2016-10-26 22:28:55 +00:00
Peter Qiu
6f426e3b17 wifi: hotspot2: initial implementation of PasspointConfiguration
am: e557c35d95

Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9
2016-10-26 22:27:56 +00:00
Treehugger Robot
ef0cc62058 Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" 2016-10-26 22:14:15 +00:00
Treehugger Robot
1a5da2b533 Merge changes I69c1931b,I6b08f52d
* changes:
  wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
  wifi: hotspot2: initial implementation of PasspointConfiguration
2016-10-26 22:13:57 +00:00
Dimitry Ivanov
808bd1765f Merge "Always call into native loader when load a native library"
am: e266c37559

Change-Id: I4d220cde19ac85b16396070f493395227a85d82c
2016-10-26 20:11:33 +00:00
Dimitry Ivanov
3512d092dd Always call into native loader when load a native library
am: 569834d861

Change-Id: I35ce58423aefceb541542e0ef9408e0b7ef9b104
2016-10-26 20:11:01 +00:00
Jordan Liu
bc2af49c21 resolve merge conflicts of ab00546 to stage-aosp-master
Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49
2016-10-26 12:05:27 -07:00
Peter Qiu
2a658a152a wifi: hotspot2: omadm: add parsing support for PPS MO tree
This parser will convert a PPS MO (PerProviderSubscription Management Object)
tree XML string to a PasspointConfiguration parcelable object.

Bug: 32129686
Change-Id: Ia80b6d73828436ded57a3817f5eca7b79c618de4
Test: frameworks/base/wifi/tests/runtests.sh
2016-10-26 11:52:30 -07:00
Peter Qiu
bae4becf69 wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
The XML parser will parse an XML string into a tree-like structure
represented by XMLNode, which will be used by an object specific parser
(e.g. PerProviderSubscription Management Object tree parser) for further
processing.

Bug: 32129686
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I69c1931b2e8a6f3551e4eba5cffa3d2d0877872a
2016-10-26 11:52:24 -07:00
Dimitry Ivanov
e266c37559 Merge "Always call into native loader when load a native library" 2016-10-26 18:27:38 +00:00
Jordan Liu
ab005465b6 Merge "Add key to CarrierConfigManager" 2016-10-26 17:50:45 +00:00
Jorim Jaggi
b5fed003cc Merge "Fix animation sequence for upload tasks"
am: 7f2676a3d9

Change-Id: Id281265f87e4670ec322d33384422b02ca7fd50b
2016-10-26 17:32:54 +00:00
Jorim Jaggi
7f2676a3d9 Merge "Fix animation sequence for upload tasks" 2016-10-26 17:25:03 +00:00
Peter Qiu
e557c35d95 wifi: hotspot2: initial implementation of PasspointConfiguration
Only support nodes under HomeSP and Credential subtree that are used
by Hotspot 2.0 Release 1.

These classes are used for data exchanges between the app and the system
service (WifiService).  All the business logics and validations will be
done on the service side (WifiService).

Bug: 31813706
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I6b08f52dd7b1a7b337899ab80f11d062c8e2f532
2016-10-26 10:23:09 -07:00