OSDN Git Service
Joseph Pirozzo [Wed, 2 Nov 2016 01:11:04 +0000 (01:11 +0000)]
MAP MCE am:
b8fc0679e8
am:
b13240028b
Change-Id: I62a9a758bc46fbb1174fbce4d50f488932d65113
Joseph Pirozzo [Wed, 2 Nov 2016 01:10:02 +0000 (01:10 +0000)]
Pbap disconnect durring connect am:
a4f0127fbb
am:
a31933abc3
Change-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5
Joseph Pirozzo [Wed, 2 Nov 2016 01:09:14 +0000 (01:09 +0000)]
MAP MCE am:
631768d814
am:
d94c280a7f
Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5
Joseph Pirozzo [Wed, 2 Nov 2016 01:05:14 +0000 (01:05 +0000)]
MAP MCE
am:
b8fc0679e8
Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f
Joseph Pirozzo [Wed, 2 Nov 2016 01:04:33 +0000 (01:04 +0000)]
Pbap disconnect durring connect
am:
a4f0127fbb
Change-Id: Ib2f65418dee82893a377b780647d823cfa274dd6
Joseph Pirozzo [Wed, 2 Nov 2016 01:03:51 +0000 (01:03 +0000)]
MAP MCE
am:
631768d814
Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:39:45 +0000 (00:39 +0000)]
Merge "Add support for opening JAR/ZIP files via FD." am:
7f64c195f7
am:
4c65d49a92
Change-Id: I534e70f5218e0f9be73d919a4c9dd509211729f8
Joseph Pirozzo [Thu, 6 Oct 2016 18:44:53 +0000 (11:44 -0700)]
MAP MCE
Fix @LINK to @link in javadoc.
Bug:
30467210
Change-Id: Icac176947bee971c3f5d11fd4166cf8ceb0a437e
(cherry picked from commit
f5fba751d360bbe8294c4640f5ad12a990f13122)
Joseph Pirozzo [Mon, 2 May 2016 14:30:21 +0000 (07:30 -0700)]
Pbap disconnect durring connect
Durring a connect call disconnect from all other pbap devices rather
than from the device you are trying to connect to.
bug:
28406739
Change-Id: Ic0b651f32a0da18950fbc190b1d4503d69ebd203
(cherry picked from commit
bdd24942e47811ffe6bb9814934e6b08a8190e7e)
Joseph Pirozzo [Thu, 1 Sep 2016 21:19:28 +0000 (14:19 -0700)]
MAP MCE
Add MAP client code into packages/apps/Bluetooth. Changes here are to
define the MAP MCE interface and enable its selection when running on a
device that is also running a PBAP client (Car Kitt).
Bug:
30467210
Change-Id: Ifa2cdea7d67f63a2b5f3d971df8ec6d321dc5fee
(cherry picked from commit
433b3054847951e8e7b3864d11990604a66b8651)
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:34:47 +0000 (00:34 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
am:
7f64c195f7
Change-Id: I88af6f42ccd5e6edafa57fd0f147f676da8aa096
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:24:06 +0000 (00:24 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
Bryce Lee [Tue, 1 Nov 2016 23:24:42 +0000 (23:24 +0000)]
Merge "Add a way to query for supported Bluetooth profiles." am:
0a86c936a6
am:
6f84631d8d
Change-Id: I8d9bce44587a1740f0acbd09552baf7d8b6990a5
Bryce Lee [Tue, 1 Nov 2016 23:20:16 +0000 (23:20 +0000)]
Merge "Add a way to query for supported Bluetooth profiles."
am:
0a86c936a6
Change-Id: Id10ad10a5dbcab92e390a7a245772d2b551ad30c
Treehugger Robot [Tue, 1 Nov 2016 23:12:21 +0000 (23:12 +0000)]
Merge "Add a way to query for supported Bluetooth profiles."
Bryce Lee [Sun, 9 Oct 2016 19:54:42 +0000 (12:54 -0700)]
Add a way to query for supported Bluetooth profiles.
Currently there is no way to get the profiles supported by the Bluetooth
adapter. Asking for a profile proxy of an unsupported profile does not
fail and can lead to code indefinitely waiting for the proxy response. This
new code will allow for checking the supported profiles before asking for
the proxies.
Bug:
26451648
Change-Id: I4b48e7151f5ca53851aa3b967c143fae140ecd34
(cherry picked from commit
b1301fa2849bafd6daa422281dc5200863bc761e)
Andreas Gampe [Tue, 1 Nov 2016 17:24:19 +0000 (17:24 +0000)]
Merge "Zygote: Avoid string concatentation for systrace" am:
8bcd159234
am:
fdfc79a878
Change-Id: I105f07f2b2ca925139da6fc78641ee486eb68410
Andreas Gampe [Tue, 1 Nov 2016 17:19:44 +0000 (17:19 +0000)]
Merge "Zygote: Avoid string concatentation for systrace"
am:
8bcd159234
Change-Id: I484e5a56b790f57d097970f727959438debafafb
Treehugger Robot [Tue, 1 Nov 2016 15:38:49 +0000 (15:38 +0000)]
Merge "Zygote: Avoid string concatentation for systrace"
Tomasz Mikolajewski [Thu, 20 Oct 2016 01:49:53 +0000 (10:49 +0900)]
Add support for opening JAR/ZIP files via FD.
Test: Upcoming change in DocumentsUI uses this feature.
Bug:
31783726
Change-Id: Ia74e9bdb66722dfb2855380375a99cc94d288b2e
(cherry picked from commit
5a5c44a2e30a55843802b472f2f8be81496bbd25)
Sanket Agarwal [Mon, 31 Oct 2016 19:25:34 +0000 (19:25 +0000)]
Merge "Configuration for priority/auto-connection for PAN." am:
ba63f32ed5
am:
50cc13cc18
Change-Id: I6725098623dba530db325f6b12d5193f9f2629e7
Sanket Agarwal [Mon, 31 Oct 2016 19:19:30 +0000 (19:19 +0000)]
Merge "Configuration for priority/auto-connection for PAN."
am:
ba63f32ed5
Change-Id: I00ecde6e7f1c64f704341c7a96e476f1a11bdaea
Sanket Agarwal [Mon, 31 Oct 2016 19:08:53 +0000 (19:08 +0000)]
Merge "Configuration for priority/auto-connection for PAN."
Marie Janssen [Mon, 31 Oct 2016 18:47:52 +0000 (18:47 +0000)]
resolve merge conflicts of
6a31a5c to stage-aosp-master
am:
879a5169ec
Change-Id: Ib6321dee7357920c73b135fbe465998dc4469e66
Marie Janssen [Mon, 31 Oct 2016 18:00:06 +0000 (11:00 -0700)]
resolve merge conflicts of
6a31a5c to stage-aosp-master
Change-Id: I29f2085f4656b0b57896ef505ef6a50cdbd1b194
Sanket Agarwal [Thu, 4 Aug 2016 23:16:20 +0000 (16:16 -0700)]
Configuration for priority/auto-connection for PAN.
We protect the auto-connection via a flag so that it is only enabled on
some devices.
Bug: b/
30679978
Change-Id: I5b7f273e09a659b561913d5c6f3a76feb245e6ce
(cherry picked from commit
1f09d5f255980488cabd55a5c44a5737e24541d8)
Treehugger Robot [Mon, 31 Oct 2016 17:20:39 +0000 (17:20 +0000)]
Merge "Bluetooth: prevent enabling BLE in airplane mode"
Brad Ebinger [Mon, 31 Oct 2016 17:17:57 +0000 (17:17 +0000)]
Merge "Modify AIDLs to include Session.Info" am:
78a63c1cf0
am:
9e4d4ee484
Change-Id: I9da7f4106bfec8ebba4515223a9dba40ffdaef20
Brad Ebinger [Mon, 31 Oct 2016 17:12:26 +0000 (17:12 +0000)]
Merge "Modify AIDLs to include Session.Info"
am:
78a63c1cf0
Change-Id: I0549ace3cc383bebac86a8b49cb87f631aecb552
Brad Ebinger [Mon, 31 Oct 2016 17:04:50 +0000 (17:04 +0000)]
Merge "Modify AIDLs to include Session.Info"
Marie Janssen [Tue, 25 Oct 2016 17:47:51 +0000 (10:47 -0700)]
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
Andreas Gampe [Sat, 29 Oct 2016 01:19:30 +0000 (18:19 -0700)]
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
Sanket Agarwal [Fri, 28 Oct 2016 20:19:14 +0000 (20:19 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am:
678ba24533
am:
958dab93cd
Change-Id: Ie21c9be4b7177179ea4588d2832d0bbf72e7a3c1
Brad Ebinger [Fri, 28 Oct 2016 20:17:15 +0000 (20:17 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
am:
aacbdf59d6
Change-Id: I272539ea7124fa18e42ee6f06c89d3ffca449934
Brad Ebinger [Fri, 28 Oct 2016 20:17:03 +0000 (20:17 +0000)]
Modify AIDLs to include Session.Info
am:
b32d4f8b5c
Change-Id: Ibbac4c74b5a0c4fcd5524c97acef5fc078d80cb7
Sanket Agarwal [Fri, 28 Oct 2016 20:13:57 +0000 (20:13 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
am:
678ba24533
Change-Id: I77553f45f3d5de04e9b443e425f15afb8946e237
Brad Ebinger [Fri, 28 Oct 2016 20:09:53 +0000 (20:09 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
Sanket Agarwal [Fri, 28 Oct 2016 20:01:58 +0000 (20:01 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
Brad Ebinger [Mon, 24 Oct 2016 23:40:49 +0000 (16:40 -0700)]
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
Sanket Agarwal [Tue, 28 Jun 2016 03:13:54 +0000 (20:13 -0700)]
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)
Igor Murashkin [Fri, 28 Oct 2016 17:55:12 +0000 (17:55 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am:
4a4a8f1555
am:
d0d99d8a3d
Change-Id: Ia7bea2370daeb77ab23a797546f8f7c437902516
Igor Murashkin [Fri, 28 Oct 2016 17:48:15 +0000 (17:48 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
am:
4a4a8f1555
Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747
Treehugger Robot [Fri, 28 Oct 2016 17:34:46 +0000 (17:34 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:15:19 +0000 (12:15 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88
am:
29d6af7fe7
Change-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:05:56 +0000 (12:05 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9"
am:
ec3e884e88
Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 11:57:07 +0000 (11:57 +0000)]
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Fri, 28 Oct 2016 04:58:50 +0000 (04:58 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
77281bbaf4 -s ours
Change-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Jakub Pawlowski [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21
am:
81d5ecb7a6
Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
Marie Janssen [Fri, 28 Oct 2016 02:52:00 +0000 (02:52 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours
am:
98f664b903
Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7
Jakub Pawlowski [Fri, 28 Oct 2016 02:50:54 +0000 (02:50 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
am:
87c997ca21
Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
Marie Janssen [Fri, 28 Oct 2016 02:45:26 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
am:
a062ce698b -s ours
Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
Jakub Pawlowski [Thu, 27 Oct 2016 23:18:53 +0000 (23:18 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
Brad Ebinger [Mon, 24 Oct 2016 23:40:49 +0000 (16:40 -0700)]
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
Jakub Pawlowski [Wed, 26 Oct 2016 20:05:30 +0000 (13:05 -0700)]
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
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
Svetoslav Ganov [Thu, 30 Jun 2016 00:31:44 +0000 (17:31 -0700)]
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)
Leonard Mosescu [Thu, 27 Oct 2016 17:29:24 +0000 (17:29 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master
am:
258790a2ea
Change-Id: I82e68dd1ad007b8962f8ee73de2429dbe3e23959
Leonard Mosescu [Thu, 27 Oct 2016 17:29:19 +0000 (17:29 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours
am:
d73688521c
Change-Id: I67fdb8dcceb791b5984bba37395a73c3be36a992
Michal Karpinski [Thu, 27 Oct 2016 17:28:15 +0000 (17:28 +0000)]
Extending DNS event reporting
am:
6e54239e50
Change-Id: I64e6a48fbbaa734447069b073c3499ef71af907c
Android Build Merger (Role) [Thu, 27 Oct 2016 17:24:53 +0000 (17:24 +0000)]
Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am:
bd2688f4c3 -s ours" into stage-aosp-master
Leonard Mosescu [Thu, 27 Oct 2016 17:24:17 +0000 (17:24 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
am:
bd2688f4c3 -s ours
Change-Id: If1e48ecf5e75452c85e7a36f4be0d817234043c9
Leonard Mosescu [Thu, 27 Oct 2016 17:04:57 +0000 (17:04 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"
Leonard Mosescu [Fri, 7 Oct 2016 00:32:05 +0000 (17:32 -0700)]
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
Michal Karpinski [Tue, 27 Sep 2016 16:13:57 +0000 (17:13 +0100)]
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)
Lorenzo Colitti [Thu, 27 Oct 2016 13:30:02 +0000 (13:30 +0000)]
Merge changes from topic 'netd_aosp' am:
d19524f4f2
am:
853427a30a
Change-Id: I91cce5b10d49573a37504b6664b3ef0d13ae0d77
Michal Karpinski [Thu, 27 Oct 2016 13:21:37 +0000 (13:21 +0000)]
Add connect event reporting am:
265494a0f8
am:
17be4d6c85
Change-Id: I042fdb187af2de08374864867dbd75d8c92c56c9
Lorenzo Colitti [Thu, 27 Oct 2016 13:20:34 +0000 (13:20 +0000)]
Merge changes from topic 'netd_aosp'
am:
d19524f4f2
Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70
Michal Karpinski [Thu, 27 Oct 2016 13:20:31 +0000 (13:20 +0000)]
Extending DNS event reporting am:
f82d1596ce
am:
3156b53fbe
Change-Id: I14dfa7508c7115b0e60836b3788c421068b70946
Michal Karpinski [Thu, 27 Oct 2016 13:13:56 +0000 (13:13 +0000)]
Add connect event reporting
am:
265494a0f8
Change-Id: I258d348355ac182cdd0c0698d5dbbb66668dcdd8
Michal Karpinski [Thu, 27 Oct 2016 13:12:29 +0000 (13:12 +0000)]
Extending DNS event reporting
am:
f82d1596ce
Change-Id: I2e39caad0074be519640b561201f75d6685c01ef
Lorenzo Colitti [Thu, 27 Oct 2016 13:05:25 +0000 (13:05 +0000)]
Merge changes from topic 'netd_aosp'
* changes:
Add connect event reporting
Extending DNS event reporting
Michal Karpinski [Wed, 28 Sep 2016 15:06:16 +0000 (16:06 +0100)]
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
Michal Karpinski [Tue, 27 Sep 2016 16:13:57 +0000 (17:13 +0100)]
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
Peter Qiu [Wed, 26 Oct 2016 22:44:44 +0000 (22:44 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am:
ef0cc62058
am:
bb8f3a3bbf
Change-Id: I935c4b34c1f40e2bba1983161f7900ec9511f8da
Peter Qiu [Wed, 26 Oct 2016 22:43:23 +0000 (22:43 +0000)]
Merge changes I69c1931b,I6b08f52d am:
1a5da2b533
am:
fe4f473fb8
Change-Id: I54e73a4e4f336fc8d4fc5eae55d138a46aee9626
Peter Qiu [Wed, 26 Oct 2016 22:41:48 +0000 (22:41 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am:
bae4becf69
am:
2fb7775d2a
Change-Id: Ie6cc6911d6ec49a55f467cfe5e59f218df18455b
Peter Qiu [Wed, 26 Oct 2016 22:40:43 +0000 (22:40 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration am:
e557c35d95
am:
6f426e3b17
Change-Id: Icb7497670a7137810ed4def6e6b087c56f1c6de9
Peter Qiu [Wed, 26 Oct 2016 22:30:37 +0000 (22:30 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
am:
ef0cc62058
Change-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08
Peter Qiu [Wed, 26 Oct 2016 22:29:01 +0000 (22:29 +0000)]
Merge changes I69c1931b,I6b08f52d
am:
1a5da2b533
Change-Id: I43b0ddd456cfd9d3988c504266e868a637bb43c4
Peter Qiu [Wed, 26 Oct 2016 22:28:55 +0000 (22:28 +0000)]
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
am:
bae4becf69
Change-Id: I2b8510cc8dc6fad443f0507a86f960ce1ae9a0d6
Peter Qiu [Wed, 26 Oct 2016 22:27:56 +0000 (22:27 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration
am:
e557c35d95
Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9
Treehugger Robot [Wed, 26 Oct 2016 22:14:15 +0000 (22:14 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
Treehugger Robot [Wed, 26 Oct 2016 22:13:57 +0000 (22:13 +0000)]
Merge changes I69c1931b,I6b08f52d
* changes:
wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
wifi: hotspot2: initial implementation of PasspointConfiguration
Dimitry Ivanov [Wed, 26 Oct 2016 20:18:08 +0000 (20:18 +0000)]
Merge "Always call into native loader when load a native library" am:
e266c37559
am:
808bd1765f
Change-Id: I63495e45a1eafe2dd92c30f315289f5ca2d17070
Dimitry Ivanov [Wed, 26 Oct 2016 20:16:38 +0000 (20:16 +0000)]
Always call into native loader when load a native library am:
569834d861
am:
3512d092dd
Change-Id: I73a52349387cad474da6cb0d6c664cfb0879e2a6
Jordan Liu [Wed, 26 Oct 2016 20:12:56 +0000 (20:12 +0000)]
resolve merge conflicts of
ab00546 to stage-aosp-master
am:
bc2af49c21
Change-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:33 +0000 (20:11 +0000)]
Merge "Always call into native loader when load a native library"
am:
e266c37559
Change-Id: I4d220cde19ac85b16396070f493395227a85d82c
Dimitry Ivanov [Wed, 26 Oct 2016 20:11:01 +0000 (20:11 +0000)]
Always call into native loader when load a native library
am:
569834d861
Change-Id: I35ce58423aefceb541542e0ef9408e0b7ef9b104
Jordan Liu [Wed, 26 Oct 2016 18:24:54 +0000 (11:24 -0700)]
resolve merge conflicts of
ab00546 to stage-aosp-master
Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49
Peter Qiu [Tue, 18 Oct 2016 19:04:23 +0000 (12:04 -0700)]
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
Peter Qiu [Fri, 14 Oct 2016 21:26:46 +0000 (14:26 -0700)]
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
Dimitry Ivanov [Wed, 26 Oct 2016 18:27:37 +0000 (18:27 +0000)]
Merge "Always call into native loader when load a native library"
Jordan Liu [Wed, 26 Oct 2016 17:50:44 +0000 (17:50 +0000)]
Merge "Add key to CarrierConfigManager"
Jorim Jaggi [Wed, 26 Oct 2016 17:36:55 +0000 (17:36 +0000)]
Merge "Fix animation sequence for upload tasks" am:
7f2676a3d9
am:
b5fed003cc
Change-Id: I2b7e8e684aa449d317db9f1b85d8d768bbf8e7ec
Jorim Jaggi [Wed, 26 Oct 2016 17:32:54 +0000 (17:32 +0000)]
Merge "Fix animation sequence for upload tasks"
am:
7f2676a3d9
Change-Id: Id281265f87e4670ec322d33384422b02ca7fd50b
Jorim Jaggi [Wed, 26 Oct 2016 17:25:02 +0000 (17:25 +0000)]
Merge "Fix animation sequence for upload tasks"
Peter Qiu [Thu, 29 Sep 2016 17:44:15 +0000 (10:44 -0700)]
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
Przemyslaw Szczepaniak [Wed, 26 Oct 2016 16:57:33 +0000 (17:57 +0100)]
Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9
Test: cts run of CtsLibcoreTestCases
Bug:
29935305
Change-Id: I01465dd11d8ef13d6d47f2dec73100af988edfa1
OSDN Git Service
