OSDN Git Service
Peter Qiu [Fri, 18 Nov 2016 08:54:11 +0000 (08:54 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration"
am:
ebb722d04a
Change-Id: Ic20a77103961bd9ff61b6af90130c25ad19c451a
Treehugger Robot [Fri, 18 Nov 2016 08:45:15 +0000 (08:45 +0000)]
Merge "wifi: hotspot2: add support for validating passpoint configuration"
Chris Tate [Fri, 18 Nov 2016 01:33:29 +0000 (01:33 +0000)]
Merge "Schedule agentDisconnected() in handler thread"
am:
c02a4a4613
Change-Id: I1e2da0be53678a791dd16be5d00caa5e712fa036
Chris Tate [Fri, 18 Nov 2016 01:23:31 +0000 (01:23 +0000)]
Merge "Schedule agentDisconnected() in handler thread"
John Reck [Fri, 18 Nov 2016 00:14:05 +0000 (00:14 +0000)]
Merge "Avoid starving RT anims"
am:
f77c220aa9
Change-Id: I3d4ba24ae0e6de4683d47163fd8f3bf65b98bd17
Treehugger Robot [Thu, 17 Nov 2016 23:52:59 +0000 (23:52 +0000)]
Merge "Avoid starving RT anims"
John Reck [Tue, 15 Nov 2016 18:22:01 +0000 (10:22 -0800)]
Avoid starving RT anims
Test: Manual, usleep(16000) in DrawFrameTask and tap
on recents
Merged-In: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
Change-Id: I88bb30a2503bc908ec45650c7d36b6fb3cc750d0
Brad Ebinger [Thu, 17 Nov 2016 19:29:17 +0000 (19:29 +0000)]
Merge "Readability improvements in Logging"
am:
d51df736f6
Change-Id: If7bb6955d615b8369ac41d3bb8ba96aa0cc752d2
Brad Ebinger [Thu, 17 Nov 2016 19:18:00 +0000 (19:18 +0000)]
Merge "Readability improvements in Logging"
Dimitry Ivanov [Thu, 17 Nov 2016 18:50:29 +0000 (18:50 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper"
am:
f68cb55cc1
Change-Id: I06e1b8acbe6772ea80bb9c6ab6704e6ce678c3cc
Treehugger Robot [Thu, 17 Nov 2016 18:37:41 +0000 (18:37 +0000)]
Merge "Fix coretests: Remove dependency on libnativehelper"
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:41:57 +0000 (15:41 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
am:
caa816451c
Change-Id: I43c66260714bb312e270bfbae1c74047e6ef01e4
Przemyslaw Szczepaniak [Thu, 17 Nov 2016 15:28:52 +0000 (15:28 +0000)]
Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
Pavlin Radoslavov [Thu, 17 Nov 2016 07:07:20 +0000 (07:07 +0000)]
Merge "Don't disconnect an A2DP device when connecting to same device"
am:
3ebcf1218b
Change-Id: Ibbf94535642bbde6e35ee1dacbd27dd13f400f16
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
Dimitry Ivanov [Thu, 17 Nov 2016 02:28:04 +0000 (18:28 -0800)]
Fix coretests: Remove dependency on libnativehelper
This dependency was never needed and it makes test app
depend on private platform libraries - which is no longer allowed.
This change fixes these problems by removing dependency and renaming
JNI method.
Test: Install the test and start it.
Change-Id: I9878627148917c1b5928b98f3c86f6e6097093d6
Peter Qiu [Thu, 17 Nov 2016 02:21:41 +0000 (02:21 +0000)]
Merge "wifi: add constant definition for EAP types"
am:
a908e65b66
Change-Id: I283fba81ca5246222bda07f7f109d2f359e5e395
Treehugger Robot [Thu, 17 Nov 2016 02:10:23 +0000 (02:10 +0000)]
Merge "wifi: add constant definition for EAP types"
Jerry Zhang [Thu, 17 Nov 2016 00:22:59 +0000 (00:22 +0000)]
Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
am:
b37d826204
Change-Id: Id5e28b59858b16c1cfde16104feb54f2a101e366
Jerry Zhang [Thu, 17 Nov 2016 00:12:50 +0000 (00:12 +0000)]
Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am:
935372bfd6
Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
Jerry Zhang [Thu, 17 Nov 2016 00:11:15 +0000 (00:11 +0000)]
Clean up persistent usb state on boot.
am:
dfacad026d
Change-Id: I762306bc76e304c6491c8af18e82bf2e0c4b433e
Jerry Zhang [Thu, 17 Nov 2016 00:10:25 +0000 (00:10 +0000)]
Fixed handling of usb state during adb changes.
am:
0269ebe0fe
Change-Id: I2fc3674c4d5cc63febe2ebf47576f3cf1bcd1da2
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.
Ningyuan Wang [Wed, 16 Nov 2016 23:54:24 +0000 (23:54 +0000)]
Merge "Add security capabilities enums to ScanResult"
am:
a3c0324824
Change-Id: Iad2aba87155d52343b372b2d7af3e037842c1ca4
Treehugger Robot [Wed, 16 Nov 2016 23:42:24 +0000 (23:42 +0000)]
Merge "Add security capabilities enums to ScanResult"
Peter Qiu [Tue, 1 Nov 2016 21:50:59 +0000 (14:50 -0700)]
wifi: hotspot2: add support for validating passpoint configuration
Bug:
32572199
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I8e649430af54d863dfa5492abc3dfd79c772c765
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:10:20 +0000 (19:10 +0000)]
Merge "Fix include after spliting HidlSupport.h"
am:
efd7b9f57d
Change-Id: I6b0b3482feb169ae89ffa6e20561ad64b42d12d1
Brad Ebinger [Tue, 1 Nov 2016 21:11:38 +0000 (14:11 -0700)]
Readability improvements in Logging
We now truncate Session method paths and IDs based on the Logging level
to improve Session Logging readability in logcat. If another external
session is started off of an existing external Session, the preceding
histories are replaced with "..." so that the Session information is not
overwhelming.
Bug:
26571395
Test: Unit Tests and manual tests pass
Change-Id: I9ffda3d64f1072fa6228a82a86116a5e47d18c96
Yifan Hong [Wed, 16 Nov 2016 19:01:00 +0000 (19:01 +0000)]
Merge "Fix include after spliting HidlSupport.h"
Andreas Gampe [Wed, 16 Nov 2016 18:25:37 +0000 (18:25 +0000)]
Merge "Preload2: Fix dependencies"
am:
3b379ee94e
Change-Id: If3ecad631e5f7deb9b2f348a26d9b41f8a00b4f5
Treehugger Robot [Wed, 16 Nov 2016 18:15:05 +0000 (18:15 +0000)]
Merge "Preload2: Fix dependencies"
Martijn Coenen [Wed, 16 Nov 2016 10:00:23 +0000 (10:00 +0000)]
Merge "Fix deprecated range_x calls."
am:
87cafe8f33
Change-Id: Idfbc4e3475cea7e56b3ac72afd61e1e981ef4e5d
Martijn Coenen [Wed, 16 Nov 2016 09:48:30 +0000 (09:48 +0000)]
Merge "Fix deprecated range_x calls."
Hidenari Koshimae [Wed, 16 Nov 2016 08:10:54 +0000 (08:10 +0000)]
Merge "CountDownTimer: not skip onTick()"
am:
224d9e48fa
Change-Id: I7ade5d057e73f53867747c00fcfc5882a57a2f4c
Treehugger Robot [Wed, 16 Nov 2016 07:55:26 +0000 (07:55 +0000)]
Merge "CountDownTimer: not skip onTick()"
longhai [Wed, 16 Nov 2016 03:04:38 +0000 (03:04 +0000)]
Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA."
am:
1813ae0159
Change-Id: Iae1a0cd25495206d596aed7d68ce7936071f9c6e
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."
Peter Qiu [Wed, 16 Nov 2016 00:04:44 +0000 (00:04 +0000)]
Merge changes from topic 'HS2 API Cleanup'
am:
41fd0f1faf
Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382
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
Peter Qiu [Wed, 16 Nov 2016 00:00:06 +0000 (00:00 +0000)]
wifi: remove unused hidden Hotspot 2.0 Release 1 API
am:
1c3054ea87
Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19
Peter Qiu [Tue, 15 Nov 2016 23:59:20 +0000 (23:59 +0000)]
wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
am:
a38558b539
Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787
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:50:29 +0000 (16:50 +0000)]
Merge "Correctly handle when the user has no explicit time_12_24 setting"
am:
8631e19d38
Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
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
Peter Qiu [Tue, 15 Nov 2016 04:15:59 +0000 (04:15 +0000)]
Merge "osu: remove calls to deprecated APIs"
am:
e9514808d7
Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75
Treehugger Robot [Tue, 15 Nov 2016 03:59:57 +0000 (03:59 +0000)]
Merge "osu: remove calls to deprecated APIs"
TreeHugger Robot [Tue, 15 Nov 2016 03:18:21 +0000 (03:18 +0000)]
Merge "Add WiFi toggle prompts - framework" into stage-aosp-master
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
Yifan Hong [Tue, 15 Nov 2016 03:06:44 +0000 (03:06 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am:
8cc1343724
Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109
Treehugger Robot [Tue, 15 Nov 2016 02:59:51 +0000 (02:59 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
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
Original-Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Change-Id: I3fdc2b02abecaf3166614b0cb9fac3553cb7ab88
(cherry picked from commit
d3663c04a721e0848dd3e9179c84ba585d91839d)
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 21:14:44 +0000 (21:14 +0000)]
Merge "Add WiFi toggle prompts - framework"
am:
584b5cee49 -s ours
Change-Id: I9dd54beb08f771be886c03fa0f8a3335f574c47c
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:33:31 +0000 (19:33 +0000)]
Merge "Permissions check for Wifi Display configuration"
am:
f5c32a411c
Change-Id: I7a1c2d0f48728cd5e056076a2cf1499a7abb2438
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 18:08:11 +0000 (18:08 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
am:
8223dc1ae9
Change-Id: Id8c6077d099f9ef943c09242acb22173b6628c1a
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
Steven Moreland [Mon, 14 Nov 2016 15:15:39 +0000 (15:15 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *."
am:
e17e68f139
Change-Id: Iefe4ae60d8e7f0473f1b417ac09c5e37b082d07b
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:48:51 +0000 (23:48 +0000)]
Merge "Bluetooth: advertising improvements"
am:
82c9ba9c55
Change-Id: I662ba0f326aa204f9f07ce88bc9d48f5b06770cb
Robert Sesek [Fri, 11 Nov 2016 23:44:49 +0000 (23:44 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()."
am:
b828b6bf6c
Change-Id: I9b4d0000c29d5e404f333d8e8c89af2425452a17
Marie Janssen [Fri, 11 Nov 2016 23:41:42 +0000 (23:41 +0000)]
Merge "Bluetooth: BLE app tracking fixes"
am:
2174731449
Change-Id: Id07abb3d5ad76b318d1b7cee6d9fb9351737b141
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
Marco Nelissen [Fri, 11 Nov 2016 20:10:00 +0000 (20:10 +0000)]
Merge "Make AmrInputStream use MediaCodec"
am:
866658261f
Change-Id: Id25833efb8baa54e729bdc823e5849819c53cd64
Treehugger Robot [Fri, 11 Nov 2016 19:54:38 +0000 (19:54 +0000)]
Merge "Make AmrInputStream use MediaCodec"
Jack Yu [Fri, 11 Nov 2016 19:51:23 +0000 (19:51 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API"
am:
4469e48d5c
Change-Id: Id92b8eaeec12885af3748d1e839da1a5560e2619
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
liangweikang [Fri, 11 Nov 2016 03:25:41 +0000 (03:25 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null"
am:
264d1f12a3
Change-Id: Icfaf039b078d7ce43b23bed09cd0102427c6f047
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
Robert Sesek [Fri, 11 Nov 2016 00:13:57 +0000 (00:13 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting."
am:
c0aacbe513
Change-Id: I7199d687e2e67dd4672bcb388053c33db6b693f5
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."
Peter Qiu [Thu, 10 Nov 2016 22:07:11 +0000 (22:07 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"
am:
0295d7bd38
Change-Id: I79279f22bfc9642ed7905d099dd43555714ea815
Ta-wei Yen [Thu, 10 Nov 2016 22:02:17 +0000 (22:02 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"
am:
0a3b6b70dd
Change-Id: I512e68bccda115ad7c58ec1f1fbfbb2c69c86578
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"
Peter Qiu [Thu, 10 Nov 2016 20:19:51 +0000 (20:19 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file"
am:
44e817fdcf
Change-Id: If165cadffd0ae93fb94d1883f41851f1d92d50f6
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
Jakub Pawlowski [Thu, 10 Nov 2016 20:07:39 +0000 (20:07 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)"
am:
97d9fe0a2f
Change-Id: I935cc35d9f7f1eea5459f0091ad14dc8b200bc02