OSDN Git Service
Yigit Boyar [Fri, 11 Nov 2016 22:53:17 +0000 (22:53 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev am:
7cd6c3a084 am:
4e49a3a008
am:
00ab52e3a2
Change-Id: I135b0f83c5041e5467a808694fc93408d63a75d1
Yigit Boyar [Fri, 11 Nov 2016 22:52:01 +0000 (22:52 +0000)]
List all methods that change data in the docs am:
42c69b9ce4 am:
7e6fdaab69
am:
93f130e232
Change-Id: Id95fff602b22d376cfd81fbafdc22fac376a644c
Yigit Boyar [Fri, 11 Nov 2016 22:46:32 +0000 (22:46 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev am:
7cd6c3a084
am:
4e49a3a008
Change-Id: I8b40b32c181ceab9b53e3593c11f5f716b27c1d7
Yigit Boyar [Fri, 11 Nov 2016 22:39:25 +0000 (22:39 +0000)]
List all methods that change data in the docs am:
42c69b9ce4
am:
7e6fdaab69
Change-Id: Ife360d719384d958b6022f29f928a5bbae2ed6ef
Yigit Boyar [Fri, 11 Nov 2016 22:31:21 +0000 (22:31 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev
am:
7cd6c3a084
Change-Id: I1eb87e80c76d7229dab716a3c3e7bf35104f59c5
Yigit Boyar [Fri, 11 Nov 2016 22:31:15 +0000 (22:31 +0000)]
List all methods that change data in the docs
am:
42c69b9ce4
Change-Id: I0808918c44981da63ace801c486d442ff1a99700
Yigit Boyar [Fri, 11 Nov 2016 22:14:11 +0000 (22:14 +0000)]
Merge "List all methods that change data in the docs" into nyc-mr1-dev
Marco Nelissen [Fri, 11 Nov 2016 20:22:58 +0000 (20:22 +0000)]
Merge "Make AmrInputStream use MediaCodec" am:
866658261f am:
618c1a9ae6
am:
fd91fcc970
Change-Id: Ib32029cce0ce9b7d6b0c51ad9a5e141b40a34304
Marco Nelissen [Fri, 11 Nov 2016 20:16:00 +0000 (20:16 +0000)]
Merge "Make AmrInputStream use MediaCodec" am:
866658261f
am:
618c1a9ae6
Change-Id: Ic6723d4e2ce7ab401908ca955a785463612509bb
Jack Yu [Fri, 11 Nov 2016 20:11:02 +0000 (20:11 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API" am:
4469e48d5c am:
3cfa510779
am:
d517ea753f
Change-Id: Iaa642d19d006133a8d378a43253aaa35053db564
Marco Nelissen [Fri, 11 Nov 2016 20:10:00 +0000 (20:10 +0000)]
Merge "Make AmrInputStream use MediaCodec"
am:
866658261f
Change-Id: Id25833efb8baa54e729bdc823e5849819c53cd64
Jack Yu [Fri, 11 Nov 2016 19:57:55 +0000 (19:57 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API" am:
4469e48d5c
am:
3cfa510779
Change-Id: I65746e4959851eb4662881db4fd8d9665070da71
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
Bill Yi [Fri, 11 Nov 2016 19:45:44 +0000 (19:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
11ea7e4283 -s ours
am:
5e123b336a -s ours
Change-Id: Ia7407399c911d052bc2086646d275767b094e21c
Bill Yi [Fri, 11 Nov 2016 19:44:30 +0000 (19:44 +0000)]
Import translations. DO NOT MERGE am:
b8aaaa8949 -s ours
am:
c967ede5c8 -s ours
Change-Id: I8ebb662bfa9ad1a4e1b3ef14d9f221e5aadf6c69
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"
Bill Yi [Fri, 11 Nov 2016 19:37:55 +0000 (19:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
11ea7e4283 -s ours
Change-Id: I51ee786f03d8ad92dcfc740c5a55914bc7f16c4a
Bill Yi [Fri, 11 Nov 2016 19:37:53 +0000 (19:37 +0000)]
Import translations. DO NOT MERGE
am:
b8aaaa8949 -s ours
Change-Id: I5b120c2d816f8ba20ad443c9dbbdf5797e85923a
Bill Yi [Fri, 11 Nov 2016 19:33:17 +0000 (19:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
3cf37c7dc3 -s ours
am:
500e07de70 -s ours
Change-Id: I2d593fdb256d9e4284e36b0f729b778742cb172f
Bill Yi [Fri, 11 Nov 2016 19:31:56 +0000 (19:31 +0000)]
Import translations. DO NOT MERGE am:
e65092639f -s ours
am:
5d51ac0da1 -s ours
Change-Id: I47f1c79b28a752a33d536a3f8af6849bd94b3980
TreeHugger Robot [Fri, 11 Nov 2016 19:29:57 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:25:23 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
3cf37c7dc3 -s ours
Change-Id: I4593fb756b4ef79571712e707fcaeadd7da14968
Bill Yi [Fri, 11 Nov 2016 19:25:22 +0000 (19:25 +0000)]
Import translations. DO NOT MERGE
am:
e65092639f -s ours
Change-Id: I6d7024e618d7092b283d52e068d0f1a2646e8a46
Bill Yi [Fri, 11 Nov 2016 19:24:52 +0000 (19:24 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d9c8da1283 -s ours
am:
f2790ac31d -s ours
Change-Id: I7ed9d9242eaa1ceed6a939315151c0b708f5cf0b
Bill Yi [Fri, 11 Nov 2016 19:23:45 +0000 (19:23 +0000)]
Import translations. DO NOT MERGE am:
05a48e2a3d -s ours
am:
edbd698183 -s ours
Change-Id: Ia21b544c178b56f1d45c674c34ae4407d5cf123c
Bill Yi [Fri, 11 Nov 2016 19:20:01 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
c6c0d901bf -s ours
am:
8c8e6ef26a -s ours
Change-Id: I664949ebf418b8d9a8d3a5e80b13caa184ab7df8
Bill Yi [Fri, 11 Nov 2016 19:20:00 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
d9c8da1283 -s ours
Change-Id: I9514e9874725fe1dab83d32869ea6a3ef83248f7
Bill Yi [Fri, 11 Nov 2016 19:19:59 +0000 (19:19 +0000)]
Import translations. DO NOT MERGE
am:
05a48e2a3d -s ours
Change-Id: I952a728c521909efc873b2050ffd98afc5fc4103
Bill Yi [Fri, 11 Nov 2016 19:18:58 +0000 (19:18 +0000)]
Import translations. DO NOT MERGE am:
f5ffd25c53 -s ours
am:
846acc7a07 -s ours
Change-Id: Id9a8158b8cb4cdb4e959717bff1cb899fa7477f0
TreeHugger Robot [Fri, 11 Nov 2016 19:18:06 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:17:46 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1741524a82 -s ours
am:
6a6db79a4c -s ours
Change-Id: I3e9d8e78708a11a28be6c177e0785d6a5b1af97a
Bill Yi [Fri, 11 Nov 2016 19:12:48 +0000 (19:12 +0000)]
Import translations. DO NOT MERGE am:
3bd78c2416 -s ours
am:
2f5e9c695c -s ours
Change-Id: I2e53af5616982fb5efd83e8c2804fe38506c15f4
Bill Yi [Fri, 11 Nov 2016 19:11:27 +0000 (19:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
8f278a7e06 -s ours
am:
f331a01a15 -s ours
Change-Id: I39e1c813b42a2f15c77f88a955a0c692363cbf37
Bill Yi [Fri, 11 Nov 2016 19:10:17 +0000 (19:10 +0000)]
Import translations. DO NOT MERGE am:
c51dd09193 -s ours
am:
0966a9085d -s ours
Change-Id: I6affa4a46e570fd94da1bd21b67ebe2dcc01ee40
TreeHugger Robot [Fri, 11 Nov 2016 19:09:35 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 19:09:02 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
47e6925d54 -s ours
am:
933403af15 -s ours
Change-Id: I386412764c908235063aac8dbcd23d8a911a0950
Bill Yi [Fri, 11 Nov 2016 19:07:55 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE am:
1b9fbcf993 -s ours
am:
fd9d6dc79f -s ours
Change-Id: I9a760e75c93edd7b2c4a2affc8a455746edd9935
Bill Yi [Fri, 11 Nov 2016 19:03:03 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
c6c0d901bf -s ours
Change-Id: I1e65c727225c0c7ff2dfa6b6c5a70b8b94290eee
Bill Yi [Fri, 11 Nov 2016 19:03:01 +0000 (19:03 +0000)]
Import translations. DO NOT MERGE
am:
f5ffd25c53 -s ours
Change-Id: I775ecf81410882762047d8355d6aaea8dfff41e8
Bill Yi [Fri, 11 Nov 2016 19:01:25 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
1741524a82 -s ours
Change-Id: I2340e89591f6c4f2f11a67493dcfff9c9ff15d42
Bill Yi [Fri, 11 Nov 2016 19:01:23 +0000 (19:01 +0000)]
Import translations. DO NOT MERGE
am:
3bd78c2416 -s ours
Change-Id: I8838c95d0f6e688d70769939b2a4f5987fea5250
TreeHugger Robot [Fri, 11 Nov 2016 18:58:52 +0000 (18:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 11 Nov 2016 18:58:15 +0000 (18:58 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 18:56:31 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
8f278a7e06 -s ours
Change-Id: Id255f1ceb395e545f87ed91bd31f619ea9bcb06f
Bill Yi [Fri, 11 Nov 2016 18:56:29 +0000 (18:56 +0000)]
Import translations. DO NOT MERGE
am:
c51dd09193 -s ours
Change-Id: I903c542b1d66b15e87993b37afe752055fcaac5a
Bill Yi [Fri, 11 Nov 2016 18:54:53 +0000 (18:54 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
47e6925d54 -s ours
Change-Id: I752b035661e7457b98242313e9a55e9cc43ebf88
Bill Yi [Fri, 11 Nov 2016 18:54:51 +0000 (18:54 +0000)]
Import translations. DO NOT MERGE
am:
1b9fbcf993 -s ours
Change-Id: I62087ae560d498455ea0c50cdee622475eb31100
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 18:48:44 +0000 (18:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Fri, 11 Nov 2016 18:47:27 +0000 (18:47 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Fri, 11 Nov 2016 05:16:01 +0000 (21:16 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: I9086f7b84b9bcdb6df83033e3d0fac621ec2c6e0
Bill Yi [Fri, 11 Nov 2016 05:12:09 +0000 (21:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: If37bb6852c438a2b3579f4af2045841d30be829e
Bill Yi [Fri, 11 Nov 2016 04:49:23 +0000 (20:49 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Iedf58d553e92d709ee8e7b4c7423d7e5a13a4996
Bill Yi [Fri, 11 Nov 2016 04:46:18 +0000 (20:46 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Iaad4fea006740a06defea8a03fcd070f670e331a
Bill Yi [Fri, 11 Nov 2016 04:43:06 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Iade7d25f2c66d2014fe58640bd66dc953649edf2
Bill Yi [Fri, 11 Nov 2016 04:39:44 +0000 (20:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Ib8d20a325693588125631810c810665922d4191a
Bill Yi [Fri, 11 Nov 2016 04:12:02 +0000 (20:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Ife576e74510d81bdf004e911f46d294a75aba7b5
liangweikang [Fri, 11 Nov 2016 03:39:39 +0000 (03:39 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am:
264d1f12a3 am:
45562df8bb
am:
b95e567919
Change-Id: I2916de2a4c09849e12bff2dea5a4cd34c080b2f9
liangweikang [Fri, 11 Nov 2016 03:32:05 +0000 (03:32 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am:
264d1f12a3
am:
45562df8bb
Change-Id: Ibd3818f9b37ee58c6225a9b6d7cefd486f20bdb9
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 00:25:51 +0000 (00:25 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting." am:
c0aacbe513 am:
ae06fba67a
am:
b82970846b
Change-Id: I02bb609e76bd44130e9d3dd4082e134d935376cd
Robert Sesek [Fri, 11 Nov 2016 00:19:54 +0000 (00:19 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting." am:
c0aacbe513
am:
ae06fba67a
Change-Id: I644fc487b90e4292d3a53f356e92c4ddee856aaa
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
Alain Vongsouvanh [Fri, 11 Nov 2016 00:03:24 +0000 (00:03 +0000)]
colors: add missing accent_material_{700,50} resources. am:
fade1235e5
am:
8da11f44ef
Change-Id: I3e539a08a55bf4e2752f07a57176e1c2ec1a85e3
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."
Alain Vongsouvanh [Thu, 10 Nov 2016 23:55:48 +0000 (23:55 +0000)]
colors: add missing accent_material_{700,50} resources.
am:
fade1235e5
Change-Id: I8d1863ef7803f92ddc4ffe41b02474f0468c88c6
Alain Vongsouvanh [Thu, 10 Nov 2016 21:18:35 +0000 (13:18 -0800)]
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
Peter Qiu [Thu, 10 Nov 2016 22:26:22 +0000 (22:26 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am:
0295d7bd38 am:
5451f8279e
am:
8e07f4a86e
Change-Id: I6ca161fcd10af6c2da26c585f870906284737ccf
Ta-wei Yen [Thu, 10 Nov 2016 22:20:29 +0000 (22:20 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am:
0a3b6b70dd am:
969a6eb2b8
am:
c9698a5cff
Change-Id: I35bbcf29868c1ecddcdbb0e536c6d2a92e4d90ca
Peter Qiu [Thu, 10 Nov 2016 22:13:48 +0000 (22:13 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am:
0295d7bd38
am:
5451f8279e
Change-Id: Ide84930e6d76e9e52716a5b31df31998b95a8a76
Ta-wei Yen [Thu, 10 Nov 2016 22:08:35 +0000 (22:08 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state" am:
0a3b6b70dd
am:
969a6eb2b8
Change-Id: I2a5d31c342efc7e3ca4f29448b24d406253c7b0f
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:36:08 +0000 (20:36 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file" am:
44e817fdcf am:
861e99e815
am:
861619e782
Change-Id: I3f148b1e87f8a4d43f6a48e3af774f7f2b216023
Jakub Pawlowski [Thu, 10 Nov 2016 20:24:10 +0000 (20:24 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)" am:
97d9fe0a2f am:
c3cfff6ef6
am:
f59ad8bd68
Change-Id: I8307894e80bdfc1c260708c7174d294178ffa00b
Peter Qiu [Thu, 10 Nov 2016 20:24:06 +0000 (20:24 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file" am:
44e817fdcf
am:
861e99e815
Change-Id: Idd093095c6c7be414e284092069df1374aad9d38
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
Akira Oshimi [Thu, 10 Nov 2016 20:18:09 +0000 (20:18 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity" am:
5bb91bacc3 am:
08978cd0fd
am:
88ab92ce4c
Change-Id: I6abd73d3ce02dd33dc95c6132b1ff8aa4b13015c
Jakub Pawlowski [Thu, 10 Nov 2016 20:14:24 +0000 (20:14 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)" am:
97d9fe0a2f
am:
c3cfff6ef6
Change-Id: Ia05bccadc06b202cf6ac1039b1e227bd67575bb5
Akira Oshimi [Thu, 10 Nov 2016 20:12:34 +0000 (20:12 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity" am:
5bb91bacc3
am:
08978cd0fd
Change-Id: Ibd1b9ff4be577bf5ea5596342316ea2303d93b75
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
Akira Oshimi [Thu, 10 Nov 2016 20:06:34 +0000 (20:06 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity"
am:
5bb91bacc3
Change-Id: I0e9d19f297c158ff0c6acd1aa6665e3459fa416b
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
Andreas Huber [Thu, 10 Nov 2016 19:27:07 +0000 (19:27 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am:
df3d68c9b2 am:
fbb980e57b
am:
fdaf348734
Change-Id: Icc30767adea1ce61fe3bd87b395268db674ce021
Andreas Huber [Thu, 10 Nov 2016 19:14:30 +0000 (19:14 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am:
df3d68c9b2
am:
fbb980e57b
Change-Id: I7b80bbe5eed3066edfe26d83dd322114d2e4a961
Andreas Huber [Thu, 10 Nov 2016 19:08:28 +0000 (19:08 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
am:
df3d68c9b2
Change-Id: I56e293d16dee7503f717f3cca4902720307a2024
Treehugger Robot [Thu, 10 Nov 2016 18:58:28 +0000 (18:58 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
Chris Elliott [Thu, 10 Nov 2016 18:57:02 +0000 (18:57 +0000)]
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 -s ours
Change-Id: Iab445b20d02e9a501d74f27a59da5047957efc13
Hugo Benichi [Thu, 10 Nov 2016 18:55:34 +0000 (18:55 +0000)]
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 -s ours
Change-Id: I63236413fa5272bbfb8c4fba83879089007694bc
Chris Elliott [Thu, 10 Nov 2016 18:50:28 +0000 (18:50 +0000)]
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
Change-Id: If5a7680ee9de27107bf32138e91f2eb705181ab0
Hugo Benichi [Thu, 10 Nov 2016 18:49:18 +0000 (18:49 +0000)]
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
Change-Id: I9bf86e8adf3a2d6efbce54e3fc6a59ee650daaef
Chris Elliott [Thu, 10 Nov 2016 18:44:06 +0000 (18:44 +0000)]
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
Change-Id: I31d22a167ee7de857ed0403b2d14daa1d90055f0
OSDN Git Service
