Alain Vongsouvanh
577d218d81
colors: add missing accent_material_{700,50} resources. am: fade1235e5
...
am: 8da11f44ef
2016-11-11 00:03:24 +00:00
Alain Vongsouvanh
8da11f44ef
colors: add missing accent_material_{700,50} resources.
...
am: fade1235e5
2016-11-10 23:55:48 +00:00
Alain Vongsouvanh
fade1235e5
colors: add missing accent_material_{700,50} resources.
...
Those two resources were only defined for watches and had no default
counterparts.
BUG: 32786346
Change-Id: I0868d34d1df55c6dfd26d13c3a7d468866603a97
2016-11-10 22:28:28 +00:00
Peter Qiu
6405b98114
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38 am: 5451f8279e
...
am: 8e07f4a86e
2016-11-10 22:26:22 +00:00
Ta-wei Yen
e1ae654041
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd am: 969a6eb2b8
...
am: c9698a5cff
2016-11-10 22:20:29 +00:00
Peter Qiu
8e07f4a86e
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38
...
am: 5451f8279e
2016-11-10 22:13:48 +00:00
Ta-wei Yen
c9698a5cff
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am: 0a3b6b70dd
...
am: 969a6eb2b8
2016-11-10 22:08:35 +00:00
Peter Qiu
5451f8279e
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"
...
am: 0295d7bd38
2016-11-10 22:07:11 +00:00
Ta-wei Yen
969a6eb2b8
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"
...
am: 0a3b6b70dd
2016-11-10 22:02:17 +00:00
Treehugger Robot
0295d7bd38
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"
2016-11-10 21:56:56 +00:00
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
e0ebb9ce31
Merge "wifi: hotspot2: add support for parsing Release 1 installation file" am: 44e817fdcf am: 861e99e815
...
am: 861619e782
2016-11-10 20:36:08 +00:00
Jakub Pawlowski
196fe3597c
Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f am: c3cfff6ef6
...
am: f59ad8bd68
2016-11-10 20:24:10 +00:00
Peter Qiu
861619e782
Merge "wifi: hotspot2: add support for parsing Release 1 installation file" am: 44e817fdcf
...
am: 861e99e815
2016-11-10 20:24:06 +00:00
Peter Qiu
861e99e815
Merge "wifi: hotspot2: add support for parsing Release 1 installation file"
...
am: 44e817fdcf
2016-11-10 20:19:51 +00:00
Akira Oshimi
c49702e4c0
Merge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3 am: 08978cd0fd
...
am: 88ab92ce4c
2016-11-10 20:18:09 +00:00
Jakub Pawlowski
f59ad8bd68
Merge "BLE OOB Pairing - parse address type (5/5)" am: 97d9fe0a2f
...
am: c3cfff6ef6
2016-11-10 20:14:24 +00:00
Akira Oshimi
88ab92ce4c
Merge "Add null check before finish SystemUI Tuner's activity" am: 5bb91bacc3
...
am: 08978cd0fd
2016-11-10 20:12:34 +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
2016-11-10 20:07:39 +00:00
Akira Oshimi
08978cd0fd
Merge "Add null check before finish SystemUI Tuner's activity"
...
am: 5bb91bacc3
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
90efd7bbb2
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am: df3d68c9b2 am: fbb980e57b
...
am: fdaf348734
2016-11-10 19:27:07 +00:00
Andreas Huber
fdaf348734
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am: df3d68c9b2
...
am: fbb980e57b
2016-11-10 19:14:30 +00:00
Andreas Huber
fbb980e57b
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
...
am: df3d68c9b2
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
Chris Elliott
d3dd8e99fa
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours am: 0e11e0d961 -s ours am: 69246f0565 -s ours am: a8a116b001 -s ours am: 8409d50122 -s ours am: c07d8aa52d -s ours
...
am: e2dd105af2
2016-11-10 18:57:02 +00:00
Hugo Benichi
01d86c0902
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e -s ours am: da695f5fdb -s ours am: 69d565b12d -s ours am: 37779485b7 -s ours am: 986c684fb0 -s ours am: 5c10f1e552 -s ours
...
am: 8fe310892b
2016-11-10 18:55:34 +00:00
Chris Elliott
e2dd105af2
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours am: 0e11e0d961 -s ours am: 69246f0565 -s ours am: a8a116b001 -s ours am: 8409d50122 -s ours
...
am: c07d8aa52d
2016-11-10 18:50:28 +00:00
Hugo Benichi
8fe310892b
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e -s ours am: da695f5fdb -s ours am: 69d565b12d -s ours am: 37779485b7 -s ours am: 986c684fb0 -s ours
...
am: 5c10f1e552
2016-11-10 18:49:18 +00:00
Chris Elliott
c07d8aa52d
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours am: 0e11e0d961 -s ours am: 69246f0565 -s ours am: a8a116b001 -s ours
...
am: 8409d50122
2016-11-10 18:44:06 +00:00
Hugo Benichi
5c10f1e552
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e -s ours am: da695f5fdb -s ours am: 69d565b12d -s ours am: 37779485b7 -s ours
...
am: 986c684fb0
2016-11-10 18:42:57 +00:00
Chris Elliott
8409d50122
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours am: 0e11e0d961 -s ours am: 69246f0565 -s ours
...
am: a8a116b001
2016-11-10 18:37:44 +00:00
Hugo Benichi
986c684fb0
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e -s ours am: da695f5fdb -s ours am: 69d565b12d -s ours
...
am: 37779485b7
2016-11-10 18:36:30 +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
Chris Elliott
a8a116b001
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours am: 0e11e0d961 -s ours
...
am: 69246f0565
2016-11-10 18:25:11 +00:00
Hugo Benichi
37779485b7
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e -s ours am: da695f5fdb -s ours
...
am: 69d565b12d
2016-11-10 18:23:58 +00:00
Chris Elliott
69246f0565
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours
...
am: 0e11e0d961
2016-11-10 18:12:17 +00:00
Hugo Benichi
69d565b12d
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e -s ours
...
am: da695f5fdb
2016-11-10 18:11:02 +00:00
Chris Elliott
0e11e0d961
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
...
am: 06a55fb553
2016-11-10 18:04:28 +00:00
Hugo Benichi
da695f5fdb
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
...
am: f88508bd3e
2016-11-10 18:04:26 +00:00
Chris Elliott
06a55fb553
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
2016-11-10 17:48:24 +00:00
Randy Pan
6332104fbc
Merge "Wifi Tx/Rx rate computation" am: bccf93311c am: 33600a3d38
...
am: e929425a9e
2016-11-10 16:32:56 +00:00
Randy Pan
e929425a9e
Merge "Wifi Tx/Rx rate computation" am: bccf93311c
...
am: 33600a3d38
2016-11-10 16:26:23 +00:00
Randy Pan
33600a3d38
Merge "Wifi Tx/Rx rate computation"
...
am: bccf93311c
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
