Commit Graph

68183 Commits

Author SHA1 Message Date
Chet Haase
1d795210a6 Clean up InputConnection.commitContent() javadocs DO NOT MERGE am: 5c0af88764 am: b76d3363ed
am: e1dd52264b

Change-Id: I1868f4780becfdc74bad885d14e82c27acc83efa
2016-11-01 17:38:51 +00:00
Chet Haase
b76d3363ed Clean up InputConnection.commitContent() javadocs DO NOT MERGE
am: 5c0af88764

Change-Id: I1f0147cbac31a7e68bc89601e1952f5a35971885
2016-11-01 17:30:47 +00:00
Andreas Gampe
f836fec287 Merge "Zygote: Avoid string concatentation for systrace" am: 8bcd159234 am: fdfc79a878
am: 8a8f33416b

Change-Id: Idf1ecf65a9a4d1dc11c37e824ce876543da8efaa
2016-11-01 17:28:47 +00:00
Andreas Gampe
8a8f33416b Merge "Zygote: Avoid string concatentation for systrace" am: 8bcd159234
am: fdfc79a878

Change-Id: I105f07f2b2ca925139da6fc78641ee486eb68410
2016-11-01 17:24:19 +00:00
Andreas Gampe
fdfc79a878 Merge "Zygote: Avoid string concatentation for systrace"
am: 8bcd159234

Change-Id: I484e5a56b790f57d097970f727959438debafafb
2016-11-01 17:19:44 +00:00
Treehugger Robot
8bcd159234 Merge "Zygote: Avoid string concatentation for systrace" 2016-11-01 15:38:50 +00:00
Chet Haase
5c0af88764 Clean up InputConnection.commitContent() javadocs DO NOT MERGE
Test: docs only, no test apart from verifying that it builds
Bug: #32158219 clean up InputConnection.commitContent() javadocs
Change-Id: I9b438d6b14aa8bc868fe41f7e0fe22b0e83800fb
2016-11-01 00:07:13 +00:00
Sanket Agarwal
502e3e53ec Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5 am: 50cc13cc18
am: 9e33f453a3

Change-Id: I509fc113b64e7fac13ff666dd194a118b65b002c
2016-10-31 19:29:56 +00:00
Sanket Agarwal
9e33f453a3 Merge "Configuration for priority/auto-connection for PAN." am: ba63f32ed5
am: 50cc13cc18

Change-Id: I6725098623dba530db325f6b12d5193f9f2629e7
2016-10-31 19:25:34 +00:00
Sanket Agarwal
50cc13cc18 Merge "Configuration for priority/auto-connection for PAN."
am: ba63f32ed5

Change-Id: I00ecde6e7f1c64f704341c7a96e476f1a11bdaea
2016-10-31 19:19:30 +00:00
Marie Janssen
635d528877 resolve merge conflicts of 6a31a5c to stage-aosp-master
am: 879a5169ec

Change-Id: Ib6321dee7357920c73b135fbe465998dc4469e66
2016-10-31 18:47:52 +00:00
Marie Janssen
879a5169ec resolve merge conflicts of 6a31a5c to stage-aosp-master
Change-Id: I29f2085f4656b0b57896ef505ef6a50cdbd1b194
2016-10-31 11:00:06 -07:00
Sanket Agarwal
773297a83e 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)
2016-10-31 17:45:32 +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
Aga Madurska
5a5187edcd Update colors for the round scroll bar. am: 5177264735
am: c78b695126

Change-Id: Iffaab844f7c0fab11cc429f06b450eb190737bc5
2016-10-31 11:59:29 +00:00
Aga Madurska
5177264735 Update colors for the round scroll bar.
Bug:32536003

Change-Id: I35503c089bc918493aab3288580f81d7b780d671
2016-10-31 10:55:07 +00: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
6b2b2a87f9 Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533 am: 958dab93cd
am: 9527a19cbc

Change-Id: I9590f32bad7a3fccaf4479d3ffd004d2b7a91dad
2016-10-28 20:28:50 +00:00
Sanket Agarwal
9527a19cbc Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533
am: 958dab93cd

Change-Id: Ie21c9be4b7177179ea4588d2832d0bbf72e7a3c1
2016-10-28 20:19:14 +00: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
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 40bb6f3f8f)
2016-10-28 18:16:53 +00:00
Jakub Pawlowski
e582ab854d Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 am: 81d5ecb7a6
am: 61d0088923

Change-Id: I83c82b17064ee958fff6a98d90a0b351205ccf54
2016-10-28 03:01:56 +00:00
Jakub Pawlowski
61d0088923 Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21
am: 81d5ecb7a6

Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
2016-10-28 02:56:54 +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
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
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 ac69be543f)
2016-10-27 22:49:11 +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
Marie Janssen
1238daf20d Bluetooth: prevent enabling BLE in airplane mode am: a80d745c65 am: 6affbde556
am: 73bfd25356

Change-Id: Ieb424a2d68058d4171e6c9bd04f8a42cc1f3d7e9
2016-10-27 00:29:51 +00:00
Marie Janssen
6affbde556 Bluetooth: prevent enabling BLE in airplane mode
am: a80d745c65

Change-Id: I05a57fa747abedab24e0509c1fb7ab8737b2256a
2016-10-27 00:20:17 +00:00
Marie Janssen
a80d745c65 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
(cherry picked from commit bd93b7b3dc6141cef6236cf0ca7dcc5acf5bfeed)
2016-10-26 14:55:47 -07:00
Andreas Huber
63f0ebc7a8 Merge "Adds support for specifying the version of a service to register/lookup." am: c3d8550cf3
am: 8bd63a39f3

Change-Id: I00c3d6441f15011a6ddbb281169bfcac71aff062
2016-10-26 15:54:20 +00:00
Andreas Huber
8bd63a39f3 Merge "Adds support for specifying the version of a service to register/lookup."
am: c3d8550cf3

Change-Id: I6b12021c6100f33de7f4b4702bdb4bf1a48c0259
2016-10-26 15:49:52 +00:00
Andreas Huber
c3d8550cf3 Merge "Adds support for specifying the version of a service to register/lookup." 2016-10-26 15:38:45 +00:00
Jakub Pawlowski
f68a0c6dec Merge "Add helper method to convert Bluetooth UUID to bytes" am: 8a0a58b218
am: f169ecb76f

Change-Id: I035eb25c9a320b1760221bc5928919a148801488
2016-10-25 21:54:44 +00:00
Jakub Pawlowski
f169ecb76f Merge "Add helper method to convert Bluetooth UUID to bytes"
am: 8a0a58b218

Change-Id: I829135e559a9c3cf3c942258a16acee62c37c3ac
2016-10-25 21:47:35 +00:00
Andreas Huber
35eb7994f8 Adds support for specifying the version of a service to register/lookup.
Bug: 32405011
Test: hidl_test_java
Change-Id: I91a31cafa68d570c67f9a1aa7efb9d3dcb35e591
2016-10-25 13:35:44 -07:00
Jakub Pawlowski
f67ee83a22 Add helper method to convert Bluetooth UUID to bytes
Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I7f646d1d357c51b82efc504a0e65d868ad363ddb
2016-10-25 12:30:24 -07:00
Robert Sesek
aa544e975e Merge "Create the WebViewZygote and implement WebViewZygoteInit." am: 8be2850546
am: f80fab010a

Change-Id: I37d0d62662ee96a9eefe2dfa71670d8e4b724889
2016-10-22 03:17:15 +00:00
Robert Sesek
f80fab010a Merge "Create the WebViewZygote and implement WebViewZygoteInit."
am: 8be2850546

Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
2016-10-22 03:12:18 +00:00
Treehugger Robot
8be2850546 Merge "Create the WebViewZygote and implement WebViewZygoteInit." 2016-10-22 03:03:10 +00:00
Jeremy Joslin
807102d7ff VPN network stat accounting changes. am: 3f0d75afe8
am: 0d309b7a47

Change-Id: I797ac586581f83ada0e94639dd435122c987f1c1
2016-10-21 23:43:06 +00:00
Jeremy Joslin
0d309b7a47 VPN network stat accounting changes.
am: 3f0d75afe8

Change-Id: I1c65db583cdd1d5b519830e521c633cb8dee449f
2016-10-21 23:37:57 +00:00
Yin-Chia Yeh
0eb99d23b4 Merge "Camera2 Legacy: catch more surface abandoned error" am: 03f14bef41
am: 50f9b6e71f

Change-Id: I1da99a15ab8ff08d3f9ccb0e9408990ad60ff279
2016-10-21 21:18:48 +00:00
Vinod Krishnan
ccf3baf6c5 Fwk: Only chime when docked and accessbility is on
am: cf11ceab65

Change-Id: Ief29ef6f325a8248843faa9fbe9ae6ff893a6918
2016-10-21 21:14:19 +00:00
Yin-Chia Yeh
50f9b6e71f Merge "Camera2 Legacy: catch more surface abandoned error"
am: 03f14bef41

Change-Id: If2e05eeb8c7fe24f97fc0c5e20bfe03a6c8c9e23
2016-10-21 21:07:44 +00:00
TreeHugger Robot
088f73a9e9 Merge "Fwk: Only chime when docked and accessbility is on" into cw-f-dev 2016-10-21 20:41:10 +00:00
Yin-Chia Yeh
091661334b Camera2 Legacy: catch more surface abandoned error
Bug: 30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db
2016-10-21 11:40:46 -07:00
Vinod Krishnan
cf11ceab65 Fwk: Only chime when docked and accessbility is on
Bug: 32036947

Change-Id: I5786abe827735cc3a4bc1d52baacaa19bccaae77
2016-10-21 10:28:37 -07:00
Jeremy Joslin
3f0d75afe8 VPN network stat accounting changes.
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.

This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.

BUG: 30557871
Change-Id: I62a75a0c0c0111e052b7903baa9f5d6d94ef57fd
2016-10-21 18:47:57 +09:00
Jacky Cheung
bd12e5c9db Merge "Gradually increase the level of authentication on failed GATT operations." am: 6071abdb92
am: 046a5c3a00

Change-Id: I749b2e4d4a13f099cfdc164f7fec8556d09f8433
2016-10-20 23:11:51 +00:00