OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Fix String is empty issue"
pengzhicai [Wed, 2 Nov 2016 18:23:26 +0000 (18:23 +0000)]
Merge "Fix String is empty issue"
am: 80af1ba47b

Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b

7 years agoMerge "Fix String is empty issue"
Treehugger Robot [Wed, 2 Nov 2016 18:14:49 +0000 (18:14 +0000)]
Merge "Fix String is empty issue"

7 years agoMerge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
Brad Ebinger [Wed, 2 Nov 2016 16:59:30 +0000 (16:59 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master

7 years agoModify ConnectionServiceAdapter to include Session
Brad Ebinger [Fri, 28 Oct 2016 19:29:55 +0000 (12:29 -0700)]
Modify ConnectionServiceAdapter to include Session

Modifies the ConnectionServiceAdapter to include Session Information in
the AIDL interface so that external Sessions can be started in Telecom
from Telephony.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: I31bbfe433dd062a50bd05083e1a639dd4cd03403

7 years agoFix String is empty issue
pengzhicai [Wed, 2 Nov 2016 01:27:20 +0000 (09:27 +0800)]
Fix String is empty issue

Maybe the string is empty
https://code.google.com/p/android/issues/detail?id=226739

Change-Id: I645ae05a8cbe316e29d9710de0bbba64c0c2275d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
7 years agoMerge changes Icac17694,Ic0b651f3,Ifa2cdea7
Sanket Agarwal [Wed, 2 Nov 2016 01:05:20 +0000 (01:05 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
am: cf4dc9236e

Change-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401

7 years agoMAP MCE
Joseph Pirozzo [Wed, 2 Nov 2016 01:05:14 +0000 (01:05 +0000)]
MAP MCE
am: b8fc0679e8

Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f

7 years agoPbap disconnect durring connect
Joseph Pirozzo [Wed, 2 Nov 2016 01:04:33 +0000 (01:04 +0000)]
Pbap disconnect durring connect
am: a4f0127fbb

Change-Id: Ib2f65418dee82893a377b780647d823cfa274dd6

7 years agoMAP MCE
Joseph Pirozzo [Wed, 2 Nov 2016 01:03:51 +0000 (01:03 +0000)]
MAP MCE
am: 631768d814

Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9

7 years agoMerge changes Icac17694,Ic0b651f3,Ifa2cdea7
Sanket Agarwal [Wed, 2 Nov 2016 00:55:40 +0000 (00:55 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7

* changes:
  MAP MCE
  Pbap disconnect durring connect
  MAP MCE

7 years agoMAP MCE
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)

7 years agoPbap disconnect durring connect
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)

7 years agoMAP MCE
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)

7 years agoMerge "Add support for opening JAR/ZIP files via FD."
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

7 years agoMerge "Add support for opening JAR/ZIP files via FD."
Tomasz Mikolajewski [Wed, 2 Nov 2016 00:24:06 +0000 (00:24 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."

7 years agoMerge "Add a way to query for supported Bluetooth profiles."
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

7 years agoMerge "Add a way to query for supported Bluetooth profiles."
Treehugger Robot [Tue, 1 Nov 2016 23:12:21 +0000 (23:12 +0000)]
Merge "Add a way to query for supported Bluetooth profiles."

7 years agoAdd 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)

7 years agoMerge "Zygote: Avoid string concatentation for systrace"
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

7 years agoMerge "Zygote: Avoid string concatentation for systrace"
Treehugger Robot [Tue, 1 Nov 2016 15:38:49 +0000 (15:38 +0000)]
Merge "Zygote: Avoid string concatentation for systrace"

7 years agoAdd support for opening JAR/ZIP files via FD.
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)

7 years agoMerge "Configuration for priority/auto-connection for PAN."
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

7 years agoMerge "Configuration for priority/auto-connection for PAN."
Sanket Agarwal [Mon, 31 Oct 2016 19:08:53 +0000 (19:08 +0000)]
Merge "Configuration for priority/auto-connection for PAN."

7 years agoresolve merge conflicts of 6a31a5c to stage-aosp-master
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

7 years agoConfiguration for priority/auto-connection for PAN.
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)

7 years agoMerge "Bluetooth: prevent enabling BLE in airplane mode"
Treehugger Robot [Mon, 31 Oct 2016 17:20:39 +0000 (17:20 +0000)]
Merge "Bluetooth: prevent enabling BLE in airplane mode"

7 years agoMerge "Modify AIDLs to include Session.Info"
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

7 years agoMerge "Modify AIDLs to include Session.Info"
Brad Ebinger [Mon, 31 Oct 2016 17:04:50 +0000 (17:04 +0000)]
Merge "Modify AIDLs to include Session.Info"

7 years agoBluetooth: prevent enabling BLE in airplane mode
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

7 years agoZygote: Avoid string concatentation for systrace
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

7 years agoMerge "Use UUIDs for call management in Headset Client (HF)"
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

7 years agoMerge "Modify AIDLs to include Session.Info" into stage-aosp-master
Brad Ebinger [Fri, 28 Oct 2016 20:09:53 +0000 (20:09 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master

7 years agoMerge "Use UUIDs for call management in Headset Client (HF)"
Sanket Agarwal [Fri, 28 Oct 2016 20:01:58 +0000 (20:01 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"

7 years agoModify AIDLs to include Session.Info
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

7 years agoUse UUIDs for call management in Headset Client (HF)
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)

7 years agoMerge "app_process: Forward -cp/-classpath to ART."
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

7 years agoMerge "app_process: Forward -cp/-classpath to ART."
Treehugger Robot [Fri, 28 Oct 2016 17:34:46 +0000 (17:34 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."

7 years agoMerge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9"
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:05:56 +0000 (12:05 +0000)]
Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9"
am: ec3e884e88

Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651

7 years agoMerge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9"
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 11:57:07 +0000 (11:57 +0000)]
Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9"

7 years agoRevert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
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)

7 years agoMerge "Separate LE scanner from GATT client (1/4)"
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

7 years agoMerge "Add Bluetooth toggle prompts - framework"
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

7 years agoMerge "Separate LE scanner from GATT client (1/4)"
Jakub Pawlowski [Thu, 27 Oct 2016 23:18:53 +0000 (23:18 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"

7 years agoModify AIDLs to include Session.Info
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

7 years agoSeparate LE scanner from GATT client (1/4)
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

7 years agoMerge "Add Bluetooth toggle prompts - framework"
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - framework"

7 years agoAdd 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)

7 years agoMerge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3...
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

7 years agoMerge "Adding "attach-agent" to ActivityManagerShellCommand"
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

7 years agoMerge "Adding "attach-agent" to ActivityManagerShellCommand"
Leonard Mosescu [Thu, 27 Oct 2016 17:04:57 +0000 (17:04 +0000)]
Merge "Adding "attach-agent" to ActivityManagerShellCommand"

7 years agoAdding "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

7 years agoExtending DNS event reporting
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)

7 years agoMerge changes from topic 'netd_aosp'
Lorenzo Colitti [Thu, 27 Oct 2016 13:20:34 +0000 (13:20 +0000)]
Merge changes from topic 'netd_aosp'
am: d19524f4f2

Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70

7 years agoAdd connect event reporting
Michal Karpinski [Thu, 27 Oct 2016 13:13:56 +0000 (13:13 +0000)]
Add connect event reporting
am: 265494a0f8

Change-Id: I258d348355ac182cdd0c0698d5dbbb66668dcdd8

7 years agoExtending DNS event reporting
Michal Karpinski [Thu, 27 Oct 2016 13:12:29 +0000 (13:12 +0000)]
Extending DNS event reporting
am: f82d1596ce

Change-Id: I2e39caad0074be519640b561201f75d6685c01ef

7 years agoMerge changes from topic 'netd_aosp'
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

7 years agoAdd connect 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

7 years agoExtending DNS event reporting
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

7 years agoMerge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
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

7 years agoMerge changes I69c1931b,I6b08f52d
Peter Qiu [Wed, 26 Oct 2016 22:29:01 +0000 (22:29 +0000)]
Merge changes I69c1931b,I6b08f52d
am: 1a5da2b533

Change-Id: I43b0ddd456cfd9d3988c504266e868a637bb43c4

7 years agowifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
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

7 years agowifi: hotspot2: initial implementation of PasspointConfiguration
Peter Qiu [Wed, 26 Oct 2016 22:27:56 +0000 (22:27 +0000)]
wifi: hotspot2: initial implementation of PasspointConfiguration
am: e557c35d95

Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9

7 years agoMerge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"
Treehugger Robot [Wed, 26 Oct 2016 22:14:15 +0000 (22:14 +0000)]
Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree"

7 years agoMerge changes I69c1931b,I6b08f52d
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

7 years agoMerge "Always call into native loader when load a native library"
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

7 years agoAlways call into native loader when load a native library
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

7 years agoresolve merge conflicts of ab00546 to stage-aosp-master
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

7 years agowifi: hotspot2: omadm: add parsing support for PPS MO tree
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

7 years agowifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string
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

7 years agoMerge "Always call into native loader when load a native library"
Dimitry Ivanov [Wed, 26 Oct 2016 18:27:37 +0000 (18:27 +0000)]
Merge "Always call into native loader when load a native library"

7 years agoMerge "Add key to CarrierConfigManager"
Jordan Liu [Wed, 26 Oct 2016 17:50:44 +0000 (17:50 +0000)]
Merge "Add key to CarrierConfigManager"

7 years agoMerge "Fix animation sequence for upload tasks"
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

7 years agoMerge "Fix animation sequence for upload tasks"
Jorim Jaggi [Wed, 26 Oct 2016 17:25:02 +0000 (17:25 +0000)]
Merge "Fix animation sequence for upload tasks"

7 years agowifi: hotspot2: initial implementation of PasspointConfiguration
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

7 years agoTrack libcore change 16fa17012b56e990ced91cd023dee33f96deedf9
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

7 years agoMerge "Add support for starting external Sessions"
Brad Ebinger [Wed, 26 Oct 2016 16:42:15 +0000 (16:42 +0000)]
Merge "Add support for starting external Sessions"
am: 4ce60695f9

Change-Id: I6957c8e2846d216f77f5f6337388e1fc296511de

7 years agoMerge "Add support for starting external Sessions"
Brad Ebinger [Wed, 26 Oct 2016 16:34:31 +0000 (16:34 +0000)]
Merge "Add support for starting external Sessions"

7 years agoMerge "Adds support for specifying the version of a service to register/lookup."
Andreas Huber [Wed, 26 Oct 2016 15:49:52 +0000 (15:49 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."
am: c3d8550cf3

Change-Id: I6b12021c6100f33de7f4b4702bdb4bf1a48c0259

7 years agoMerge "Adds support for specifying the version of a service to register/lookup."
Andreas Huber [Wed, 26 Oct 2016 15:38:44 +0000 (15:38 +0000)]
Merge "Adds support for specifying the version of a service to register/lookup."

7 years agoFix animation sequence for upload tasks
Zhao Wei Liew [Mon, 14 Sep 2015 13:41:57 +0000 (21:41 +0800)]
Fix animation sequence for upload tasks

stat_sys_upload_anim2 and stat_sys_upload_anim1 are reversed,
resulting in an animation that jumps from one frame to the
following frame and back again.

Change-Id: Ibb9c6c4ff992895dce26a283f1ee9a81f7cdee15

7 years agoMerge "Add script to expedite running passing tests"
Christopher Wiley [Tue, 25 Oct 2016 23:06:51 +0000 (23:06 +0000)]
Merge "Add script to expedite running passing tests"
am: 4d1c2922f0

Change-Id: I1b85b8ffd3f6de26d3226f5b1e1475ad87e8def6

7 years agoMerge "Add script to expedite running passing tests"
Treehugger Robot [Tue, 25 Oct 2016 22:58:55 +0000 (22:58 +0000)]
Merge "Add script to expedite running passing tests"

7 years agoMerge "Add helper method to convert Bluetooth UUID to bytes"
Jakub Pawlowski [Tue, 25 Oct 2016 21:47:35 +0000 (21:47 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes"
am: 8a0a58b218

Change-Id: I829135e559a9c3cf3c942258a16acee62c37c3ac

7 years agoMerge "Add helper method to convert Bluetooth UUID to bytes"
Jakub Pawlowski [Tue, 25 Oct 2016 21:36:38 +0000 (21:36 +0000)]
Merge "Add helper method to convert Bluetooth UUID to bytes"

7 years agoAdd support for starting external Sessions
Brad Ebinger [Fri, 21 Oct 2016 16:41:29 +0000 (09:41 -0700)]
Add support for starting external Sessions

This change adds support for parceling Session Information to be
transmitted over AIDLs and starting an external session in the external
process.

Test: Telecom Unit tests and new SessionManager Tests.
Bug: 26571395
Change-Id: Ie27ed88d4a8c344b34568025ddcf150fdcb38d62

7 years agoAdd script to expedite running passing tests
Christopher Wiley [Thu, 20 Oct 2016 19:33:31 +0000 (12:33 -0700)]
Add script to expedite running passing tests

Developers can run this script from within a shell where they have
source'd build/envsetup.sh and lunched a target.  It builds, installs,
and runs whitelisted test packages.

Bug: None
Test: This script is useful for iterating rapidly on unittests.

Change-Id: I44c32a0f75da1be2c69a8b1a67c0080a68def738

7 years agoAdds support for specifying the version of a service to register/lookup.
Andreas Huber [Tue, 25 Oct 2016 20:29:30 +0000 (13:29 -0700)]
Adds support for specifying the version of a service to register/lookup.

Bug: 32405011
Test: hidl_test_java
Change-Id: I91a31cafa68d570c67f9a1aa7efb9d3dcb35e591

7 years agoAdd helper method to convert Bluetooth UUID to bytes
Jakub Pawlowski [Mon, 24 Oct 2016 20:56:54 +0000 (13:56 -0700)]
Add helper method to convert Bluetooth UUID to bytes

Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I7f646d1d357c51b82efc504a0e65d868ad363ddb

7 years agoMerge "Add unit tests for Tethering.isTetherProvisioningRequired"
Christopher Wiley [Tue, 25 Oct 2016 18:23:02 +0000 (18:23 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"
am: 836ffa6e1c

Change-Id: I1dab386e3891c01a2917c32847d2aecdbfa10102

7 years agoMerge "Add unit tests for Tethering.isTetherProvisioningRequired"
Treehugger Robot [Tue, 25 Oct 2016 18:12:42 +0000 (18:12 +0000)]
Merge "Add unit tests for Tethering.isTetherProvisioningRequired"

7 years agoMerge "Update the docstring on getAllCellInfo() for unreported values"
nharold [Tue, 25 Oct 2016 00:57:36 +0000 (00:57 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values"
am: 88d0a95c74

Change-Id: Ib482a5398776473ccb97c4df96115fc3763c782f

7 years agoMerge "Update the docstring on getAllCellInfo() for unreported values"
nharold [Tue, 25 Oct 2016 00:48:40 +0000 (00:48 +0000)]
Merge "Update the docstring on getAllCellInfo() for unreported values"

7 years agoAdd unit tests for Tethering.isTetherProvisioningRequired
Christopher Wiley [Tue, 11 Oct 2016 20:26:03 +0000 (13:26 -0700)]
Add unit tests for Tethering.isTetherProvisioningRequired

Check that we tolerate various dependencies not being available.

Bug: 31946071
Test: These are tests

Change-Id: Ic0a9cd6f255ba9ff4c774dee640df1a0bdf8dc39

7 years agoUpdate the docstring on getAllCellInfo() for unreported values
Nathan Harold [Mon, 24 Oct 2016 18:24:16 +0000 (11:24 -0700)]
Update the docstring on getAllCellInfo() for unreported values

In the event that not all fields are available for a particular
cell information report, those values are set to
Integer.MAX_VALUE. In addition, this docstring clarifies the
minimum expectation for what will be reported in all cases.

Bug: 32364031
Test: none
Change-Id: Ic5df72f69e5917eb495d349a380ced53a80408fa

7 years agoMerge "Allow operator/manufacturer setting to use priority"
Yoshinori Hirano [Mon, 24 Oct 2016 18:32:14 +0000 (18:32 +0000)]
Merge "Allow operator/manufacturer setting to use priority"
am: aef1a557aa

Change-Id: I81ccdc0910ab5298d5b54f3b8e390262d02225ea

7 years agoMerge "Allow operator/manufacturer setting to use priority"
Treehugger Robot [Mon, 24 Oct 2016 18:21:06 +0000 (18:21 +0000)]
Merge "Allow operator/manufacturer setting to use priority"

7 years agoMerge "PdfEditor: define LOG_TAG"
Mark Salyzyn [Mon, 24 Oct 2016 15:53:30 +0000 (15:53 +0000)]
Merge "PdfEditor: define LOG_TAG"
am: a3bb8e3cc7

Change-Id: Ide63ebe4228d7b7af05e20202baafdebf9699150

7 years agoMerge "PdfEditor: define LOG_TAG"
Treehugger Robot [Mon, 24 Oct 2016 15:47:32 +0000 (15:47 +0000)]
Merge "PdfEditor: define LOG_TAG"

7 years agoMerge "Avoid NPE around mReusedTask of ActivityStarter"
Shigeki Yokomichi [Mon, 24 Oct 2016 14:21:25 +0000 (14:21 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter"
am: f741f88284

Change-Id: I64701d06c2e15b0ad11018c233fce32dce1caa52

7 years agoMerge "Avoid NPE around mReusedTask of ActivityStarter"
Treehugger Robot [Mon, 24 Oct 2016 14:09:35 +0000 (14:09 +0000)]
Merge "Avoid NPE around mReusedTask of ActivityStarter"