Paul Duffin
290274df0d
Merge "Fix problem with JavaDoc" am: 8f33fcdc4b
...
am: 4929aafc1d
Change-Id: I08c9f20c34a2952105854d107b442884dba220b1
2017-02-08 11:35:19 +00:00
Paul Duffin
4929aafc1d
Merge "Fix problem with JavaDoc"
...
am: 8f33fcdc4b
Change-Id: I25fd01b35a2c1299304401a1333f737ee9252317
2017-02-08 11:31:15 +00:00
Treehugger Robot
8f33fcdc4b
Merge "Fix problem with JavaDoc"
2017-02-08 11:21:29 +00:00
Paul Duffin
b5c09b5487
Fix problem with JavaDoc
...
Test: make checkbuild
Change-Id: Ia321e0a57ff63aa62adee16d611c063a22807176
2017-02-08 09:16:18 +00:00
Peter Qiu
1c8845c6b0
Merge changes from topic 'Passpoint API Rename' am: 93d66c83cf
...
am: 322c9a9ec5
Change-Id: I91231f6c6ad804997071f81f0d3998f1d8231a73
2017-02-07 23:47:46 +00:00
Peter Qiu
1a8cb5dfec
hotspot2: expose Passpoint APIs as public am: bffe405e1f
...
am: b898025e8c
Change-Id: I10d77f87722d5b21004df1394b1b5d9e82b78976
2017-02-07 23:40:45 +00:00
Peter Qiu
57375308dc
hotspot2: fix class/function/variable names to comply with API guideline am: da8a67e8a6
...
am: 7fec249699
Change-Id: Ib37832f30b5174f52e71ef2e3f796c669ba7bda9
2017-02-07 23:39:50 +00:00
Peter Qiu
9bddb8ccd8
hotspot2: rename classes to comply with API guideline am: a77809766c
...
am: c4f4a1ac9e
Change-Id: I00cda97fa573cb7dcb3ac8501ead6b34b91f1b1e
2017-02-07 23:38:36 +00:00
Peter Qiu
322c9a9ec5
Merge changes from topic 'Passpoint API Rename'
...
am: 93d66c83cf
Change-Id: Ibff6d79c8ca51b760932909e89b21e8c843acc89
2017-02-07 23:38:35 +00:00
Peter Qiu
b898025e8c
hotspot2: expose Passpoint APIs as public
...
am: bffe405e1f
Change-Id: I86065439f5902b6ce7b0ceec3f295e14f0dff47f
2017-02-07 23:32:08 +00:00
Peter Qiu
7fec249699
hotspot2: fix class/function/variable names to comply with API guideline
...
am: da8a67e8a6
Change-Id: I48f7b3ab747c0323aec5208c7a0afa123ff68729
2017-02-07 23:31:02 +00:00
Peter Qiu
c4f4a1ac9e
hotspot2: rename classes to comply with API guideline
...
am: a77809766c
Change-Id: Iaaf34a5ec744775e472d1b3eb8673ebf610b1c61
2017-02-07 23:30:19 +00:00
Treehugger Robot
93d66c83cf
Merge changes from topic 'Passpoint API Rename'
...
* changes:
hotspot2: expose Passpoint APIs as public
hotspot2: fix class/function/variable names to comply with API guideline
hotspot2: rename classes to comply with API guideline
2017-02-07 23:25:04 +00:00
Paul Lawrence
53e6c94c0b
Merge "Expand seccomp whitelist" am: 10e7aed13f
...
am: 0ab0d47516
Change-Id: Id7512df1f0df56f73352c82a3ad55eb5360ebd91
2017-02-07 23:03:32 +00:00
Paul Lawrence
0ab0d47516
Merge "Expand seccomp whitelist"
...
am: 10e7aed13f
Change-Id: I8060b31a8ac20ddd77b7139c5a3bbd8d146dbc27
2017-02-07 22:59:34 +00:00
Paul Lawrence
10e7aed13f
Merge "Expand seccomp whitelist"
2017-02-07 22:50:44 +00:00
Brad Ebinger
ac3f482f15
Merge "Perform camera permission and app ops check when setting camera for VT." am: ed5c217fc0
...
am: 3d6f878b75
Change-Id: I0ed577718d9ffd72ec7668889d4da4db0060cb5f
2017-02-07 22:37:31 +00:00
Brad Ebinger
3d6f878b75
Merge "Perform camera permission and app ops check when setting camera for VT."
...
am: ed5c217fc0
Change-Id: I0fd4ed2260a9654e2889121022192f62f86a3d0c
2017-02-07 22:33:05 +00:00
Brad Ebinger
ed5c217fc0
Merge "Perform camera permission and app ops check when setting camera for VT."
2017-02-07 22:26:44 +00:00
Peter Qiu
bffe405e1f
hotspot2: expose Passpoint APIs as public
...
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1
2017-02-07 13:34:47 -08:00
Peter Qiu
da8a67e8a6
hotspot2: fix class/function/variable names to comply with API guideline
...
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworsk/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ide425c06be46bc41c8f601e732dca0543de096b1
2017-02-07 13:34:46 -08:00
Peter Qiu
a77809766c
hotspot2: rename classes to comply with API guideline
...
This is purely a file rename operation.
Bug: 34862444
Test: None
Change-Id: I297a228f3ee7e09c9cce5ca9f677eb1db478fd46
2017-02-07 13:34:46 -08:00
Paul Lawrence
c47dd7cf0c
Expand seccomp whitelist
...
Bug: 34979910
Test: System boots, app runs
Change-Id: I8b60a24ac855679251e73edcdec57eb4af4a5610
2017-02-07 08:21:29 -08:00
Andreas Huber
0e686542e6
Merge "Fixes Treble marshaling of strings embedded in structures from Java" am: 97fca8c035
...
am: 0bae9b1406
Change-Id: I0eb29e3e80243a958aa2520924ea9ad859034cdf
2017-02-07 00:12:13 +00:00
Pavlin Radoslavov
b7067e2b6c
Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62
...
am: cd6e0ee19d
Change-Id: I6fb8a3a35451cf2d1e228466ef4a4d4e89d1d4ca
2017-02-07 00:10:21 +00:00
Jason Monk
55345f5c30
Merge "Hotspot Tile: longclick should open Tethering settings" am: 96c4f1a21e
...
am: 4e82bf6c51
Change-Id: I39d311e1b455a7a3e53ac8c1b12d1d67b07972ee
2017-02-07 00:09:14 +00:00
Miao Wang
558e5dac4d
Merge "Remove uncessary dependency of libhwui" am: df36be5f17
...
am: eebd7d7970
Change-Id: I3e7b282340259eaad71569e8a15f5028852852ee
2017-02-07 00:08:05 +00:00
Jack Yu
84e84a73b7
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: 84f97e21b2
...
am: 7eac8ec7c1
Change-Id: I8fdb5f13a50a0965cb2fbfd15212bc26e076054c
2017-02-07 00:04:04 +00:00
Tyler Gunn
6a643c3a60
Merge "Self managed CS implementation." am: d736a6b2c2
...
am: 6bd991b3d2
Change-Id: Id406ceb476573d3cebc12ce27652d814dd679733
2017-02-07 00:01:04 +00:00
Andreas Huber
0bae9b1406
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
...
am: 97fca8c035
Change-Id: Iac2492ccc736b83d6ae46022b643fd229c2c307e
2017-02-06 23:45:53 +00:00
Treehugger Robot
97fca8c035
Merge "Fixes Treble marshaling of strings embedded in structures from Java"
2017-02-06 23:41:28 +00:00
Pavlin Radoslavov
cd6e0ee19d
Merge "Add a mechanism to configure the default A2DP codec priorities"
...
am: acf34d8b62
Change-Id: I8a97b344bb09f4bded076ea81875b3b78dc50bea
2017-02-06 23:12:23 +00:00
Jason Monk
4e82bf6c51
Merge "Hotspot Tile: longclick should open Tethering settings"
...
am: 96c4f1a21e
Change-Id: I42b701c8d390333f6d121bea2ee6c3284e646e9c
2017-02-06 23:03:24 +00:00
Treehugger Robot
acf34d8b62
Merge "Add a mechanism to configure the default A2DP codec priorities"
2017-02-06 22:59:51 +00:00
Aaron Whyte
567cfb01b4
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
...
am: 50fa8ad424
Change-Id: I3306d389c19a42130bda31cb61bc846207b76c35
2017-02-06 22:57:30 +00:00
Ying Wai (Daniel) Fan
63f3dbae3c
Prevent division-by-zero error when calculating battery capacity.
...
am: 415f8b32e8
Change-Id: I1337db6391a9511df52560e8edb8a09260e27c5f
2017-02-06 22:57:23 +00:00
Miao Wang
eebd7d7970
Merge "Remove uncessary dependency of libhwui"
...
am: df36be5f17
Change-Id: I5ccce1f195a43ff00b9bd7fc350d7ae915c566d7
2017-02-06 22:56:58 +00:00
Jason Monk
96c4f1a21e
Merge "Hotspot Tile: longclick should open Tethering settings"
2017-02-06 22:53:59 +00:00
Aaron Whyte
50fa8ad424
Merge "Prevent division-by-zero error when calculating battery capacity." into cw-f-dev
2017-02-06 22:49:35 +00:00
Tyler Gunn
bf9c6fdb43
Perform camera permission and app ops check when setting camera for VT.
...
When a calling InCallService attempts to use the setCamera API on the
VideoCall, Telecom will perform a permission check to ensure that the
caller has the correct camera permission and passes the app-ops camera
check. A failure to set the camera will result in a callback via the
call session event API.
This got a little messy as the app ops package name needs to come from the
InCallService, and handler usage in the VideoProvider API means we had to
pass around the uid/pid of the caller, obtained before we trampoline onto
the handler.
Test: Unit tests added, manual testing performed.
Bug: 32747443
Change-Id: I555a04f9c3fb45e60bb811f64ba855ccf2e3b0e2
2017-02-06 14:49:03 -08:00
Miao Wang
df36be5f17
Merge "Remove uncessary dependency of libhwui"
2017-02-06 22:47:17 +00:00
Jack Yu
7eac8ec7c1
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
...
am: 84f97e21b2
Change-Id: Ib35393c60b0800d21507bd5d8ffe35345e6e6926
2017-02-06 22:47:05 +00:00
Treehugger Robot
84f97e21b2
Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
2017-02-06 22:41:11 +00:00
Tyler Gunn
6bd991b3d2
Merge "Self managed CS implementation."
...
am: d736a6b2c2
Change-Id: I9c1a84cade87a208f2e509fb0f32457c64014147
2017-02-06 22:40:39 +00:00
Tyler Gunn
d736a6b2c2
Merge "Self managed CS implementation."
2017-02-06 22:32:14 +00:00
Brad Ebinger
661689ffb1
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." am: ed839943e0
...
am: b9f4a2d6c1
Change-Id: I0b1850f074b1a014277c485b1ee6b5b5577fb9cd
2017-02-06 22:15:07 +00:00
Brad Ebinger
b9f4a2d6c1
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
...
am: ed839943e0
Change-Id: Ib8ed5dbf927300503aba1d97af25703b380c56a4
2017-02-06 22:10:26 +00:00
Jack Yu
4dfa6d3630
Renamed voiceNetworkStateChanged and dataNetworkStateChanged
...
The misleading voiceNetworkStateChanged should be renamed
to networkStateChanged to reflect either voice or data
network changes will trigger this indication.
And dataNetworkStateChanged should be renamed to
dataCallListChanged as well.
Test: Build
Merged-In: Icf20ceb3718794f7aa62650816714ac8679d101a
Change-Id: Icf20ceb3718794f7aa62650816714ac8679d101a
2017-02-06 14:05:26 -08:00
Brad Ebinger
ed839943e0
Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices."
2017-02-06 22:03:29 +00:00
Pavlin Radoslavov
2199339c39
Add a mechanism to configure the default A2DP codec priorities
...
Previously, the relative codec priorities were hard-codec internally.
The new mechanism uses the following configurable resources in
packages/apps/Bluetooth/res/values/config.xml to re-assign the
default codec priorities per device, or to explicitly disable a codec.
- a2dp_source_codec_priority_sbc
- a2dp_source_codec_priority_aac
- a2dp_source_codec_priority_aptx
- a2dp_source_codec_priority_aptx_hd
- a2dp_source_codec_priority_ldac
Those values are assigned on startup.
Also, they can be changed per device by using an overlay:
device/<VENDOR>/<DEVICE>/overlay/packages/apps/Bluetooth/res/values/config.xml
Test: Manually streaming to a headset
Change-Id: Ic4da3a51ac73f00cbae731156cb7878c8fadee06
2017-02-06 13:07:23 -08:00