276486 Commits

Author SHA1 Message Date
Ta-wei Yen
0a3b6b70dd Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" 2016-11-10 21:46:34 +00:00
Peter Qiu
861e99e815 Merge "wifi: hotspot2: add support for parsing Release 1 installation file"
am: 44e817fdcf

Change-Id: If165cadffd0ae93fb94d1883f41851f1d92d50f6
2016-11-10 20:19:51 +00:00
Ta-wei Yen
05f9112d15 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
2016-11-10 12:11:56 -08:00
Jakub Pawlowski
c3cfff6ef6 Merge "BLE OOB Pairing - parse address type (5/5)"
am: 97d9fe0a2f

Change-Id: I935cc35d9f7f1eea5459f0091ad14dc8b200bc02
2016-11-10 20:07:39 +00:00
Akira Oshimi
08978cd0fd Merge "Add null check before finish SystemUI Tuner's activity"
am: 5bb91bacc3

Change-Id: I0e9d19f297c158ff0c6acd1aa6665e3459fa416b
2016-11-10 20:06:34 +00:00
Treehugger Robot
44e817fdcf Merge "wifi: hotspot2: add support for parsing Release 1 installation file" 2016-11-10 20:06:07 +00:00
Treehugger Robot
97d9fe0a2f Merge "BLE OOB Pairing - parse address type (5/5)" 2016-11-10 20:00:52 +00:00
Treehugger Robot
5bb91bacc3 Merge "Add null check before finish SystemUI Tuner's activity" 2016-11-10 19:54:17 +00:00
Jakub Pawlowski
f465823f6d 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
2016-11-10 19:51:49 +00:00
Andreas Huber
fbb980e57b Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
am: df3d68c9b2

Change-Id: I56e293d16dee7503f717f3cca4902720307a2024
2016-11-10 19:08:28 +00:00
Treehugger Robot
df3d68c9b2 Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." 2016-11-10 18:58:29 +00:00
Peter Qiu
01894d8f6b 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
2016-11-10 10:35:19 -08:00
Peter Qiu
057714d1b9 wifi: hotspot2: add support for parsing Release 1 installation file
Bug: 32277793
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I526c5e88e504c9c843d517a1a8208bc35d8655e9
2016-11-10 10:35:13 -08:00
Randy Pan
33600a3d38 Merge "Wifi Tx/Rx rate computation"
am: bccf93311c

Change-Id: I8b564af08155dcb49cf5f71d283b21091b80d3e0
2016-11-10 16:15:52 +00:00
Randy Pan
bccf93311c Merge "Wifi Tx/Rx rate computation" 2016-11-10 16:02:58 +00:00
Akira Oshimi
8fbcb7630a 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
2016-11-10 09:09:25 +00:00
Kevin Su
211c1c2ca8 Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte.
Regenerate api accordingly.
BUG: 32609966
Test: CTS Testing new API

Change-Id: I2603fc0001f31ff23f02f4fdf2a72b33f2750a4c
2016-11-09 13:27:20 -08:00
Sohani Rao
e8431a09ca Merge "Update REQUEST_PEERS message with calling package"
am: 836e74052e

Change-Id: Ib22ae41f991ce68d47e2f7437984c7fa248dd235
2016-11-09 19:26:51 +00:00
Sohani Rao
836e74052e Merge "Update REQUEST_PEERS message with calling package" 2016-11-09 19:15:44 +00:00
Andreas Huber
9f0268695c Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections.
Test: make, hidl_test_java
Bug: 32670143
Change-Id: Ia987a26fceab41cfc18fbae7c83e01dff1d9d11a
2016-11-09 09:59:26 -08:00
liangweikang
a9c9bf5106 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>
2016-11-09 01:40:33 +00:00
Randy Pan
7872f39869 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
2016-11-09 00:39:39 +00:00
Steven Moreland
3dcee9882d Merge "Update for namespaced services in hwservicemanager."
am: 605df82c9e

Change-Id: I38d861ca107665f1f865f19eebd1be368a8c77a4
2016-11-08 21:20:57 +00:00
Treehugger Robot
605df82c9e Merge "Update for namespaced services in hwservicemanager." 2016-11-08 21:10:07 +00:00
Sohani Rao
72d6dca09e 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
2016-11-08 11:02:52 -08:00
Tyler Gunn
06c65cc2a0 Merge "Add voip audio mode configuration for ims call"
am: 4296aa3b2b

Change-Id: I4b0cdaf7864f4db427b0c1736e51d09618f17b06
2016-11-08 18:37:42 +00:00
Tyler Gunn
4296aa3b2b Merge "Add voip audio mode configuration for ims call" 2016-11-08 18:27:51 +00:00
Steven Moreland
f3c53496c0 Update for namespaced services in hwservicemanager.
Test: end to end, hidl_test_java
Bug: 31861268
Change-Id: I3e91cf8a87f9345d4ae0650e521414407c7fc780
2016-11-08 08:53:16 -08:00
Jimmy Wu
27a88b32c9 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
2016-11-08 11:20:45 +00:00
Etan Cohen
60e6734100 Merge "[AWARE] Fix visibility of Aware Characteristics API"
am: 13c76b77dc

Change-Id: Ie12c01e0d8e29e13e2ebcf1f49c56a1a8f705637
2016-11-07 23:35:37 +00:00
Etan Cohen
13c76b77dc Merge "[AWARE] Fix visibility of Aware Characteristics API" 2016-11-07 23:19:01 +00:00
Marco Nelissen
1d10b88f40 Merge "Use libaudioclient"
am: 0a05c49248

Change-Id: I134c9c5b95e446fcc18e2b35a3eca2a4a794e8c8
2016-11-07 17:22:36 +00:00
Etan Cohen
29b3e79ae2 [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
2016-11-07 09:14:46 -08:00
Marco Nelissen
0a05c49248 Merge "Use libaudioclient" 2016-11-07 17:14:25 +00:00
Etan Cohen
6571007101 Merge "[NAN-AWARE] Rename NAN to Aware"
am: 74b1131cc8

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
2016-11-06 03:13:31 +00:00
Etan Cohen
74b1131cc8 Merge "[NAN-AWARE] Rename NAN to Aware" 2016-11-06 03:05:40 +00:00
Etan Cohen
0849ded008 [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
2016-11-05 09:41:38 -07:00
Marco Nelissen
74abdda6a0 Use libaudioclient
Test: build/boot
Change-Id: I7c730bfd47297f311e00798b5927888ddc3f5062
2016-11-04 19:31:54 -07:00
Colin Cross
e81eb61399 Merge "Move one more libandroidfw header"
am: c5c74f9f49

Change-Id: Ib4d1c81aba13543da2454140548252cf013c95e1
2016-11-05 00:15:01 +00:00
Colin Cross
c5c74f9f49 Merge "Move one more libandroidfw header" 2016-11-05 00:05:38 +00:00
Colin Cross
1d80addee4 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
2016-11-04 15:49:43 -07:00
John Reck
946d11d216 Merge "Re-unite sources with their headers"
am: e43444a00b

Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
2016-11-04 21:47:34 +00:00
Treehugger Robot
e43444a00b Merge "Re-unite sources with their headers" 2016-11-04 21:41:01 +00:00
John Reck
03b5d506bc 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)
2016-11-04 13:27:37 -07:00
Andre Eisenbach
2fe13541ad Merge "BT: Don't switch devices when one of the connected BT headsets disconnects"
am: 0bebfe76fc

Change-Id: Ibd4c4f9defec469bb14a282c53d64932123d4905
2016-11-03 23:22:07 +00:00
Andre Eisenbach
0bebfe76fc Merge "BT: Don't switch devices when one of the connected BT headsets disconnects" 2016-11-03 23:13:18 +00:00
Satish Kodishala
2980980a75 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
2016-11-03 20:57:56 +00:00
Etan Cohen
dde9ea21e4 Merge "Update service test runner to allow test args"
am: 56b92e8191

Change-Id: Ib5f44685228bab61d50dea4c5bd226c4b80c2dd1
2016-11-03 20:26:29 +00:00
Etan Cohen
56b92e8191 Merge "Update service test runner to allow test args" 2016-11-03 20:18:53 +00:00
Richard Coles
9c47f5c87a Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
am: be19fe5e8a

Change-Id: I85e2e13f395dac085616838670c19ddbedc67e9d
2016-11-03 14:42:08 +00:00