OSDN Git Service
Treehugger Robot [Thu, 17 Nov 2016 06:58:42 +0000 (06:58 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device"
Pavlin Radoslavov [Thu, 17 Nov 2016 04:51:06 +0000 (20:51 -0800)]
Don't disconnect an A2DP device when connecting to same device
When processing a connect request for an A2DP device, Settings
would trigger a disconnect request for all A2DP devices that
have state of CONNECTED, CONNECTING or DISCONNECTING, including
eventually the device we are connecting to.
This could create timing-related issues, and is not necessary.
Now we explicitly check to avoid disconnecting the device we are
connecting to.
Test: Manual A2DP testing with a phone and wireless headsets
Bug:
32688022
Change-Id: I572dd87c071829b734513c4b928a4d65fe539520
Treehugger Robot [Thu, 17 Nov 2016 02:10:23 +0000 (02:10 +0000)]
Merge "wifi: add constant definition for EAP types"
Jerry Zhang [Wed, 16 Nov 2016 23:59:32 +0000 (23:59 +0000)]
Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
* changes:
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
Clean up persistent usb state on boot.
Fixed handling of usb state during adb changes.
Treehugger Robot [Wed, 16 Nov 2016 23:42:24 +0000 (23:42 +0000)]
Merge "Add security capabilities enums to ScanResult"
Peter Qiu [Fri, 11 Nov 2016 17:18:26 +0000 (09:18 -0800)]
wifi: add constant definition for EAP types
Bug:
32810711
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ia62f2674e8cdf975d1380f733a8687bdb15ed197
Ningyuan Wang [Tue, 1 Nov 2016 22:36:10 +0000 (15:36 -0700)]
Add security capabilities enums to ScanResult
This adds enums of security parameters, including
protocol, key management, and cipher suites.
Bug:
32512793
Test: compile
Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
Yifan Hong [Wed, 16 Nov 2016 19:01:00 +0000 (19:01 +0000)]
Merge "Fix include after spliting HidlSupport.h"
Treehugger Robot [Wed, 16 Nov 2016 18:15:05 +0000 (18:15 +0000)]
Merge "Preload2: Fix dependencies"
Martijn Coenen [Wed, 16 Nov 2016 09:48:30 +0000 (09:48 +0000)]
Merge "Fix deprecated range_x calls."
Treehugger Robot [Wed, 16 Nov 2016 07:55:26 +0000 (07:55 +0000)]
Merge "CountDownTimer: not skip onTick()"
Treehugger Robot [Wed, 16 Nov 2016 02:54:25 +0000 (02:54 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
Yifan Hong [Wed, 16 Nov 2016 00:02:40 +0000 (16:02 -0800)]
Fix include after spliting HidlSupport.h
Test: mma
Bug:
32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4
Treehugger Robot [Tue, 15 Nov 2016 23:50:16 +0000 (23:50 +0000)]
Merge changes from topic 'HS2 API Cleanup'
* changes:
wifi: remove unused hidden Hotspot 2.0 Release 1 API
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
Jerry Zhang [Wed, 12 Oct 2016 22:49:32 +0000 (15:49 -0700)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.
It also simplifies some of the code.
Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit
7a396be6d5ba8914933a54b5bfac25e118db0e9f)
Jerry Zhang [Tue, 18 Oct 2016 00:37:13 +0000 (17:37 -0700)]
Clean up persistent usb state on boot.
b/
31814300 was fixed, but mtp can still stick around in the
persistent config even after flashing. This block of code
will only run once, but will ensure that mtp is not in
the config after the update.
Bug:
31814300
Test: Manual
Change-Id: Icf02be38c9e1f769412ac963ed6afc14e6092bfb
(cherry-picked from commit
a45dac0e83f4f907b6b42f453181a7d5c01f65f3)
Jerry Zhang [Thu, 13 Oct 2016 01:04:03 +0000 (18:04 -0700)]
Fixed handling of usb state during adb changes.
When changing state to adb from mtp (charging), we want to disable
the old mtp function. Similarly when change to away from adb to
charging, enable the mtp function.
Also the mtp function should never be persisted.
Bug:
31818377
Bug:
31814300
Test: Manually verify that the correct usb configuration is displayed.
Test: Manually verify that logcat is not kicked during boot.
Change-Id: Idcb7f53be39ea38712d5de45b323d8daeb552129
(cherry-picked from commit
58018d01a3c384b954275d15bee7f9c52a1c7c0a)
Neil Fuller [Tue, 15 Nov 2016 16:39:42 +0000 (16:39 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting"
Martijn Coenen [Mon, 14 Nov 2016 13:56:03 +0000 (14:56 +0100)]
Fix deprecated range_x calls.
Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb
Treehugger Robot [Tue, 15 Nov 2016 03:59:57 +0000 (03:59 +0000)]
Merge "osu: remove calls to deprecated APIs"
Andreas Gampe [Tue, 15 Nov 2016 03:08:22 +0000 (19:08 -0800)]
Preload2: Fix dependencies
Also depend on and package tools-common.
Test: m
Test: preload-tool
Change-Id: I19a8844f87417f2292e50ffaaebb5fa24a2eca24
Treehugger Robot [Tue, 15 Nov 2016 02:59:51 +0000 (02:59 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
Peter Qiu [Mon, 14 Nov 2016 23:18:09 +0000 (15:18 -0800)]
osu: remove calls to deprecated APIs
The hidden APIs WifiManager#addPasspointManagmentObject and
WifiManager#addPasspointManagementObject will removed, so remove
all callsites.
The OSU app is still under developement and is not included
in any device builds. However, it is being built by the Treehugger
for generic AOSP builds.
So fix it to allow the API removal CLs to be submitted.
Bug:
32509661
Test: None
Merged-In: Ic405695ee8edfd0c08b831834797f163fe445595
Change-Id: If418c64e69f1836575257b9d5b2f5c4373050a31
Peter Qiu [Mon, 31 Oct 2016 22:55:15 +0000 (15:55 -0700)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API
WifiManager#buildWifiConfig was used by the Hotspot 2.0 Release 1
app (WifiInstaller) for parsing Release 1 installation data into
a WifiConfiguration object. WifiInstaller will be updated to use
the new framework API (android.net.wifi.hotspot2.ConfigBuilder)
instead. So this API is no longer needed.
Bug:
32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iacee739a9ed12ea00b1b7457e22e790ef4a177da
Peter Qiu [Mon, 31 Oct 2016 22:13:35 +0000 (15:13 -0700)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
These APIs are used for installing/modifying the PerProviderSubscription
Management Object tree in XML string representation and are used only by
the unreleased Hotspot 2.0 Release 2 app (OSU app). The OSU app will be
updated to use the new APIs which uses Parcelable objects to represent
provider configuration.
Bug:
32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iff6b6e4b95b76d48201eeeb47f441b7c94f359bb
Sohani Rao [Mon, 14 Nov 2016 20:59:35 +0000 (20:59 +0000)]
Merge "Add WiFi toggle prompts - framework"
Sohani Rao [Mon, 14 Nov 2016 19:21:57 +0000 (19:21 +0000)]
Merge "Permissions check for Wifi Display configuration"
Svetoslav Ganov [Wed, 27 Jul 2016 01:23:01 +0000 (18:23 -0700)]
Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Bug:
28715749
Test: Unit Tests
Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Merged-In: I020601e208c0736005bcabc7b7b77b96eee45b03
Sohani Rao [Thu, 29 Sep 2016 23:20:45 +0000 (16:20 -0700)]
Permissions check for Wifi Display configuration
Wifi Display is configured using the AIDL call setMiracastMode()
and using a message over the async channel SET_WFD_INFO.
Enforce permissions on the calling uid before updating the config
Bug:
18668877
Test: Unit tests
Change-Id: I0be2d2af49070aad759f24bd31331f7df39a0422
Merged-In: I0be2d2af49070aad759f24bd31331f7df39a0422
Tyler Gunn [Mon, 14 Nov 2016 16:23:42 +0000 (16:23 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
Neil Fuller [Mon, 14 Nov 2016 16:06:42 +0000 (16:06 +0000)]
Correctly handle when the user has no explicit time_12_24 setting
The code would previously interpret "null" (meaning the user
hasn't touched the setting in the Settings app) as meaning
"use 12 hour format". The actual meaning of "null" is
generally accepted in the platform as
"use the locale default". For example, the Settings app does
this, as does the code in libcore.icu.LocaleData. For
locales where the default is "use 12 hour format" anyway
this wasn't obvious. However, locales like Germany should
default to 24 hour, and then the setting is displayed
incorrectly in the Settings app.
Also, German devices boot for the first time with 12 hour SHORT
and MEDIUM time formats too. After the user had explicitly set
the format the setting would be correct.
There appear to be no tests for this behavior, presumably
because of the difficulty in forcing the setting to "unset"
which would have to have to happen before the app was launched,
and the fact that CTS tests run in the US locale.
Bug:
32868036
Test: Manual testing with a device set to German
Change-Id: Ifd2e8d345f6afee467d7525d6793fc8fda37c900
Treehugger Robot [Mon, 14 Nov 2016 15:03:31 +0000 (15:03 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *."
Yifan Hong [Sat, 12 Nov 2016 01:20:54 +0000 (17:20 -0800)]
Update for removing read/writeEmbeddedFrom/ToParcel methods.
Test: mma
Bug:
32756130
Change-Id: I179a1fbd4962e9b3be383cc25d95a6d492ef6a1f
Jakub Pawlowski [Fri, 11 Nov 2016 23:33:14 +0000 (23:33 +0000)]
Merge "Bluetooth: advertising improvements"
Jakub Pawlowski [Fri, 4 Nov 2016 22:25:57 +0000 (15:25 -0700)]
Bluetooth: advertising improvements
This patch removes isPeripheralModeSupported(), hidden public method
which is always returning true. It also modify the BluetoothLeAdvertiser
to be able to use advertising instance with instance id equal 0.
Bug:
30622771
Bug:
24099160
Change-Id: Id31582621dbe56d5c3a8d4ee5cd296af66a5f026
Treehugger Robot [Fri, 11 Nov 2016 23:25:43 +0000 (23:25 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()."
Treehugger Robot [Fri, 11 Nov 2016 23:22:55 +0000 (23:22 +0000)]
Merge "Bluetooth: BLE app tracking fixes"
Marie Janssen [Wed, 9 Nov 2016 20:01:24 +0000 (12:01 -0800)]
Bluetooth: BLE app tracking fixes
Simplify tracking registered BLE Apps and clear the state when we
try to recover bluetooth from starting to ON.
Test: enable and disable bluetooth an LE-only app running
Bug:
32609235
Change-Id: I3233bf8402a3c8fc4886ef21b1e9411bc78d4e2c
Steven Moreland [Fri, 11 Nov 2016 20:33:41 +0000 (12:33 -0800)]
hidl: Update for IFoo::descriptor -> const char *.
Test: hidl_test, hidl_test_java
Bug:
32745840
Change-Id: I9e4dcaaf7365d03cb53a2e1e8cd6336fbc08417d
Treehugger Robot [Fri, 11 Nov 2016 19:54:38 +0000 (19:54 +0000)]
Merge "Make AmrInputStream use MediaCodec"
Tyler Gunn [Fri, 11 Nov 2016 19:31:28 +0000 (11:31 -0800)]
Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount.
Adding companion PhoneAccount capability which is used to indicate when a
PhoneAccount supports video calling. That is, whether it can potentially
make video calls, but not necessarily at the current time.
This is an often requested OEM enhancement which is used to drive UX (e.g.
imagine a video calling icon showing up if the device supports video, but
only being enabled when the device is in range of a VT capable tower).
See bug for reference to design doc.
Merged-Id: I38379a3a1cf1be04c6136b89b93ee95193ee7b6f
Bug:
27328615
Test: Manual
Change-Id: I08fc18950e6d35a8a7df47ce37aa2326624b9fd3
Jack Yu [Fri, 11 Nov 2016 19:41:46 +0000 (19:41 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API"
Marco Nelissen [Thu, 13 Oct 2016 21:38:40 +0000 (14:38 -0700)]
Make AmrInputStream use MediaCodec
Bug:
32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
Treehugger Robot [Fri, 11 Nov 2016 03:16:42 +0000 (03:16 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null"
Robert Sesek [Fri, 11 Nov 2016 02:50:04 +0000 (21:50 -0500)]
Respect force_mount_namespace in MountEmulatedStorage().
In Ieb75cc3009ed26b7366213409d5fad836f597084, the unshare step was
skipped if no storage is required. But the change failed to take the force
parameter into account
Test: m
Test: angler boots
Test: fugu boots
Bug:
21643067
Change-Id: I52447f02fd25f553628564733fd6bf2523c07f7c
Treehugger Robot [Fri, 11 Nov 2016 00:02:45 +0000 (00:02 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting."
Treehugger Robot [Thu, 10 Nov 2016 21:56:55 +0000 (21:56 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"
Ta-wei Yen [Thu, 10 Nov 2016 21:46:34 +0000 (21:46 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"
Ta-wei Yen [Thu, 10 Nov 2016 20:11:56 +0000 (12:11 -0800)]
Add createForPhoneAccountHandle() and getServicetate()
Respect TelephonyManager's subId when listening to phone state
TelecomManager perfers to use a PhoneAccountHandle to represent a
account but TelephonyManager prefers subscription IDs.
This CL added createForPhoneAccountHandle() in TelephonyManager so
telephony values can be queried from it.
Currently the ServiceState can be retrieved through registering a
PhoneStatelistener, but it is a callback which the handler cannot be
specified.
getServiceState() is added to allow the ServiceState to be polled.
While TelphonyManager has createForSubscriptionId(), listen() does not
respect the subId on the manager created from it, and will always use
the hidden subId on the listener, which is always the default subId
through public API.
After this CL, the default subId on the listener will null.
TelephonyManager use its' own subId if the listener does not set the
subId to something else.
Bug:
32637799
Bug:
32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Change-Id: I9995e4da1573cf1f6b6e4acf2daf7a538fb60d5f
Treehugger Robot [Thu, 10 Nov 2016 20:06:06 +0000 (20:06 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file"
Treehugger Robot [Thu, 10 Nov 2016 20:00:50 +0000 (20:00 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)"
Treehugger Robot [Thu, 10 Nov 2016 19:54:16 +0000 (19:54 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity"
Jakub Pawlowski [Thu, 10 Nov 2016 00:51:09 +0000 (16:51 -0800)]
BLE OOB Pairing - parse address type (5/5)
When address type is not parsed, creating bond to devices not using
random address is impossible.
Bug:
32780409
Test: try pairing with nRF52DK using random address
Change-Id: Ie6cc1f8c008d43b2acd021b47f9bbfb1f63472e8
Treehugger Robot [Thu, 10 Nov 2016 18:58:28 +0000 (18:58 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
Peter Qiu [Tue, 25 Oct 2016 18:38:01 +0000 (11:38 -0700)]
wifi: hotspot2: add Passpoint APIs to WifiManager
Add dedicated APIs for managing Passpoint configurations, since
Passpoint configurations are different from WiFi network
configurations. A Passpoint configuration provides a credential for
authenticating to one or more WiFi networks that are operated
by the "same" service provider.
Bug:
32282711
Test: make -j32
Change-Id: I52822ab3074e2f2a3d986e3c0a24d024f2c06dca
Peter Qiu [Mon, 24 Oct 2016 16:59:43 +0000 (09:59 -0700)]
wifi: hotspot2: add support for parsing Release 1 installation file
Bug:
32277793
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I526c5e88e504c9c843d517a1a8208bc35d8655e9
Randy Pan [Thu, 10 Nov 2016 16:02:58 +0000 (16:02 +0000)]
Merge "Wifi Tx/Rx rate computation"
Akira Oshimi [Thu, 29 Sep 2016 03:17:24 +0000 (12:17 +0900)]
Add null check before finish SystemUI Tuner's activity
SystemUI Tuner's activity changes to null when Multi-window's state is
changed after confirmation dialog about removing SystemUI Tuner is
shown. Then NullPointerException occurs by trying to finish the
activity to tap "REMOVE" button on the confirmation dialog.
So add null check before finish the activity.
Bug:
32786029
Test: manual - remove System UI Tuner on Multi-Window mode
Change-Id: I455d17c0c600eeb05c9dfb7d609d40307de2f855
Kevin Su [Wed, 9 Nov 2016 01:59:19 +0000 (17:59 -0800)]
Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte.
Regenerate api accordingly.
BUG:
32609966
Test: CTS Testing new API
Change-Id: I2603fc0001f31ff23f02f4fdf2a72b33f2750a4c
Sohani Rao [Wed, 9 Nov 2016 19:15:43 +0000 (19:15 +0000)]
Merge "Update REQUEST_PEERS message with calling package"
Andreas Huber [Thu, 3 Nov 2016 22:46:04 +0000 (15:46 -0700)]
Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections.
Test: make, hidl_test_java
Bug:
32670143
Change-Id: Ia987a26fceab41cfc18fbae7c83e01dff1d9d11a
liangweikang [Thu, 3 Nov 2016 08:12:08 +0000 (16:12 +0800)]
fixed applyConfigurationToResourcesLocked WeakReference is null
https://code.google.com/p/android/issues/detail?id=226956
Test: compile anr monkey test
Signed-off-by: liangweikang <liangweikang900911@gmail.com>
Randy Pan [Wed, 2 Nov 2016 23:51:01 +0000 (16:51 -0700)]
Wifi Tx/Rx rate computation
Factor in the timestamp when computing the Tx/Rx rates. The
reported rate is a combination of current and previous rates
with a heavier weight from the current rate.
Bug:
30982272
Test: Ran the new image and compared the results against the
old algorithm.
Change-Id: I485b7002416f382993353d9f6240ea63cb08ddae
Treehugger Robot [Tue, 8 Nov 2016 21:10:06 +0000 (21:10 +0000)]
Merge "Update for namespaced services in hwservicemanager."
Sohani Rao [Mon, 19 Sep 2016 20:36:13 +0000 (13:36 -0700)]
Update REQUEST_PEERS message with calling package
The service enforces location permissions on the caller,
verifies the calling package is registered with the uid.
BUG:
30760540
Test: Unit tests, P2p scan to get peer list and
establishing a Wifi Direct connection
Change-Id: Ia0eb466a370a00c0264944871ce348841a17abc3
Merged-In: Ia0eb466a370a00c0264944871ce348841a17abc3
Tyler Gunn [Tue, 8 Nov 2016 18:27:50 +0000 (18:27 +0000)]
Merge "Add voip audio mode configuration for ims call"
Steven Moreland [Thu, 3 Nov 2016 22:17:04 +0000 (15:17 -0700)]
Update for namespaced services in hwservicemanager.
Test: end to end, hidl_test_java
Bug:
31861268
Change-Id: I3e91cf8a87f9345d4ae0650e521414407c7fc780
Jimmy Wu [Wed, 2 Nov 2016 18:12:19 +0000 (02:12 +0800)]
Add voip audio mode configuration for ims call
Add config_use_voip_mode_for_ims key. Set to false if ims
audio routing is via modem; set to true if it is via rtp
stream.
Change-Id: I539d24d1d666b2d61a4a92d5b1e3fb762a2766dc
Etan Cohen [Mon, 7 Nov 2016 23:19:01 +0000 (23:19 +0000)]
Merge "[AWARE] Fix visibility of Aware Characteristics API"
Etan Cohen [Mon, 7 Nov 2016 17:14:46 +0000 (09:14 -0800)]
[AWARE] Fix visibility of Aware Characteristics API
Hide the get characteristics API - since the underlying characteristics
class is (still hidden). Will be opened in a separate phase from the parent
class.
Bug:
31912101
Test: update-api succeeded when opening the parent class
Change-Id: Ibe2f282027cd4b1c03bfb2b1e151551c34314541
Marco Nelissen [Mon, 7 Nov 2016 17:14:24 +0000 (17:14 +0000)]
Merge "Use libaudioclient"
Etan Cohen [Sun, 6 Nov 2016 03:05:39 +0000 (03:05 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
Etan Cohen [Wed, 26 Oct 2016 18:22:06 +0000 (11:22 -0700)]
[NAN-AWARE] Rename NAN to Aware
~Rename only (and any reformatting needed to pass lint) - no
functional changes!
Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.
(cherry-pick of commit
a61b9fb569153917a650f1d48efa20ba8846a9f3)
Bug:
32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
Marco Nelissen [Thu, 3 Nov 2016 17:58:33 +0000 (10:58 -0700)]
Use libaudioclient
Test: build/boot
Change-Id: I7c730bfd47297f311e00798b5927888ddc3f5062
Colin Cross [Sat, 5 Nov 2016 00:05:38 +0000 (00:05 +0000)]
Merge "Move one more libandroidfw header"
Colin Cross [Fri, 4 Nov 2016 22:48:13 +0000 (15:48 -0700)]
Move one more libandroidfw header
The libandroidfw headers were moved into the library directory, move one
more that did not exist in the original patch.
Test: builds
Change-Id: Ic74a41558e1bc3984d98dd766f69d081edd8fc08
Treehugger Robot [Fri, 4 Nov 2016 21:41:01 +0000 (21:41 +0000)]
Merge "Re-unite sources with their headers"
John Reck [Thu, 3 Nov 2016 23:16:47 +0000 (16:16 -0700)]
Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.
Also fixes -Werror issues that resulted in
no longer being -isystem.
Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit
f6113af2d6f6eebee68d3ac510fe96d38a7a39e9)
Andre Eisenbach [Thu, 3 Nov 2016 23:13:17 +0000 (23:13 +0000)]
Merge "BT: Don't switch devices when one of the connected BT headsets disconnects"
Satish Kodishala [Mon, 18 Jan 2016 08:53:12 +0000 (14:23 +0530)]
BT: Don't switch devices when one of the connected BT headsets disconnects
Usecase:
1. Enable multi-hf.
2. Connect to HS1.
3. Connect to HS2.
4. Make a call on AG. Here call audio is present on HS2.
5. Now disconnect HS1 from AG.
Failure:
When HS1 is disconnected, call audio is routed to handset/speaker.
Root cause:
When hs1 disconnection intent is received, SCO path is cleared
and audio is routed to handset/speaker.
Fix:
Check if the device being disconnected is same as the device
call audio is present before clearing SCO path.
Change-Id: If83325679b70b5893e44e8d844000ee028d0246c
Etan Cohen [Thu, 3 Nov 2016 20:18:53 +0000 (20:18 +0000)]
Merge "Update service test runner to allow test args"
Richard Coles [Thu, 3 Nov 2016 14:34:49 +0000 (14:34 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
Treehugger Robot [Wed, 2 Nov 2016 22:17:24 +0000 (22:17 +0000)]
Merge "Update for hidlized hwservicemanager."
Treehugger Robot [Wed, 2 Nov 2016 21:09:02 +0000 (21:09 +0000)]
Merge "Fix idmap leak in zygote process"
Steven Moreland [Mon, 24 Oct 2016 20:44:41 +0000 (13:44 -0700)]
Update for hidlized hwservicemanager.
Bug:
32313592
Test: pass (end to end for others in topic).
Change-Id: I7ac6bbe8b8de5e1cb86759cbe6f31fac642cec28
Brad Ebinger [Wed, 2 Nov 2016 20:39:40 +0000 (20:39 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session"
Treehugger Robot [Wed, 2 Nov 2016 18:14:49 +0000 (18:14 +0000)]
Merge "Fix 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>
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
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:24:06 +0000 (00:24 +0000)]
Merge "Add support for opening JAR/ZIP files via FD."
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)
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
Treehugger Robot [Tue, 1 Nov 2016 15:38:49 +0000 (15:38 +0000)]
Merge "Zygote: Avoid string concatentation for systrace"
Gustav Sennton [Mon, 24 Oct 2016 15:49:32 +0000 (16:49 +0100)]
Fix WebViewUpdateServiceTest failures when using Thread without Looper.
Add some more methods to SystemInterface to avoid calling into the rest
of the framework from WebViewUpdateServiceTests.
Also convert WebViewUpdateServiceTest to use non-deprecated test
utilities.
Test: make sure tests in WebViewUpdateServiceTest pass.
Bug:
32364900
Change-Id: I8cf67568bb7e551e1c011028e0bb4e15c0e9f2bb
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)
neo.chae [Mon, 31 Oct 2016 15:02:38 +0000 (00:02 +0900)]
Fix idmap leak in zygote process
Fix a idmap leak in AssetManager::addSystemOverlays.
And, The fix could also prevent fd leak of idmap.
Test: none
Change-Id: Iff8831e1951a1ca103821f64a612a8b28d2c14e7
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>