OSDN Git Service
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
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 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
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: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:39:44 +0000 (20:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: Ib8d20a325693588125631810c810665922d4191a
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
Hugo Benichi [Thu, 10 Nov 2016 18:42:57 +0000 (18:42 +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
Change-Id: I5bb53669285c0878905f8a2a70ff2dbe06c09ab2
Chris Elliott [Thu, 10 Nov 2016 18:37:44 +0000 (18:37 +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
Change-Id: I02d089dca4dd0ee9808f77dce0957b1cfaf6c87d
Hugo Benichi [Thu, 10 Nov 2016 18:36:30 +0000 (18:36 +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
Change-Id: I42aabc35fa30e242125015eac1b7d32790cc4528
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
Chris Elliott [Thu, 10 Nov 2016 18:25:11 +0000 (18:25 +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
Change-Id: I8181f07829ea7e77986a0f4537a61e4060c1176e
Hugo Benichi [Thu, 10 Nov 2016 18:23:58 +0000 (18:23 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours
am:
69d565b12d -s ours
Change-Id: Ibe074076d22a736394a01d27aa9e1c7ed73458b2
Chris Elliott [Thu, 10 Nov 2016 18:12:17 +0000 (18:12 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours
am:
0e11e0d961 -s ours
Change-Id: I800746b8b1fc8e63eb78a83632d9eaac9abebcd2
Hugo Benichi [Thu, 10 Nov 2016 18:11:02 +0000 (18:11 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours
am:
da695f5fdb -s ours
Change-Id: If1903ace2a31d8ccf3c66916211a07ac342fc360
Chris Elliott [Thu, 10 Nov 2016 18:04:28 +0000 (18:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
am:
06a55fb553 -s ours
Change-Id: I3e0facc6ff6dff0109452fe36f89a4eefe7676e1
Hugo Benichi [Thu, 10 Nov 2016 18:04:26 +0000 (18:04 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
am:
f88508bd3e -s ours
Change-Id: I2ba3b591df623298f41e92e6f0d067a6fcf30533
Chris Elliott [Thu, 10 Nov 2016 17:48:19 +0000 (17:48 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
Randy Pan [Thu, 10 Nov 2016 16:32:56 +0000 (16:32 +0000)]
Merge "Wifi Tx/Rx rate computation" am:
bccf93311c am:
33600a3d38
am:
e929425a9e
Change-Id: Ia38e00d785c56c295007aa19f3fe1e70d6a8b494
Randy Pan [Thu, 10 Nov 2016 16:26:23 +0000 (16:26 +0000)]
Merge "Wifi Tx/Rx rate computation" am:
bccf93311c
am:
33600a3d38
Change-Id: I766decd0d68c9a2cb47d374c9a48c8eac59a6a67
Randy Pan [Thu, 10 Nov 2016 16:15:52 +0000 (16:15 +0000)]
Merge "Wifi Tx/Rx rate computation"
am:
bccf93311c
Change-Id: I8b564af08155dcb49cf5f71d283b21091b80d3e0
Randy Pan [Thu, 10 Nov 2016 16:02:58 +0000 (16:02 +0000)]
Merge "Wifi Tx/Rx rate computation"
Bill Yi [Thu, 10 Nov 2016 14:43:49 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e231af6c88 -s ours
am:
0006905319 -s ours
Change-Id: Ibdf03fc0e8582ef252ee5c922b206685de2b9829
Bill Yi [Thu, 10 Nov 2016 14:42:49 +0000 (14:42 +0000)]
Import translations. DO NOT MERGE am:
377d4af0d0 -s ours
am:
9d6ff72884 -s ours
Change-Id: I89064de048418230fb51e09ceb3d6bfd631101c1
Bill Yi [Thu, 10 Nov 2016 14:41:42 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0bf8ae56ff -s ours
am:
221c05e6d1 -s ours
Change-Id: I15d5908cbf02847651321cea840c10666aa1c245
Bill Yi [Thu, 10 Nov 2016 14:37:50 +0000 (14:37 +0000)]
Import translations. DO NOT MERGE am:
37fa5cbc28 -s ours
am:
35b2ed41ce -s ours
Change-Id: Ibc2fa8caa377cdf5433842929549359ce8e4b71b
Bill Yi [Thu, 10 Nov 2016 14:25:20 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e231af6c88 -s ours
Change-Id: I85b530c1946c4d2da5a4fefb6b343edb75b57697
Bill Yi [Thu, 10 Nov 2016 14:25:17 +0000 (14:25 +0000)]
Import translations. DO NOT MERGE
am:
377d4af0d0 -s ours
Change-Id: Ia88f3c49ca604ef7493bf493ca63becc0a20eb53
Bill Yi [Thu, 10 Nov 2016 14:23:45 +0000 (14:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0bf8ae56ff -s ours
Change-Id: I896a62c6c88343eeba13406ce3ce71e576899762
Bill Yi [Thu, 10 Nov 2016 14:23:42 +0000 (14:23 +0000)]
Import translations. DO NOT MERGE
am:
37fa5cbc28 -s ours
Change-Id: I07c9584f08f6609f55a0af74fc5259f90fdb3285
Bill Yi [Thu, 10 Nov 2016 14:14:39 +0000 (14:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 10 Nov 2016 14:13:43 +0000 (14:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Narayan Kamath [Thu, 10 Nov 2016 10:41:46 +0000 (10:41 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc am:
e9a12d0ac7 am:
f0a65b9a98
am:
532d73cf8c
Change-Id: Id48f0410d3068bb4411d86841bbd476ff612848a
Narayan Kamath [Thu, 10 Nov 2016 10:40:31 +0000 (10:40 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7 am:
c82eb23651 am:
b0c09c0ebe
am:
847d4476a7
Change-Id: I818bc8e1cb3f67fec10edefa527efcdef100f211
Narayan Kamath [Thu, 10 Nov 2016 10:35:03 +0000 (10:35 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc am:
e9a12d0ac7
am:
f0a65b9a98
Change-Id: I0d5469927688fa23290f3b3e136ba50820b0b8d9
Narayan Kamath [Thu, 10 Nov 2016 10:33:57 +0000 (10:33 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7 am:
c82eb23651
am:
b0c09c0ebe
Change-Id: I1c378d684eb07cd20b64b358770fa6fe1dae274c
Narayan Kamath [Thu, 10 Nov 2016 10:29:02 +0000 (10:29 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc
am:
e9a12d0ac7
Change-Id: I9c34dfaf3e2cdbb2560765002926a493d2651708
Narayan Kamath [Thu, 10 Nov 2016 10:27:58 +0000 (10:27 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7
am:
c82eb23651
Change-Id: Iec1e60c29bcaedf030da989aa66488bd87206563
Bill Yi [Thu, 10 Nov 2016 10:24:31 +0000 (02:24 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: I7d27891f4b452f54e6f14d22f37b6b2bcbdefc5b
Narayan Kamath [Thu, 10 Nov 2016 10:23:00 +0000 (10:23 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92
am:
c0df29dfbc
Change-Id: I5a77286ff7758d3c7aaa1a2bd14588e8dd5216d5
Narayan Kamath [Thu, 10 Nov 2016 10:21:57 +0000 (10:21 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e
am:
720fcbc1f7
Change-Id: I18aeb47e1a4f061d5afe55a2aa936ae1d1cc61ff
Narayan Kamath [Thu, 10 Nov 2016 10:15:59 +0000 (10:15 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
am:
a67112ca92
Change-Id: Ib8bef283e74694a415dc73f2c16b4de3b201798e
Narayan Kamath [Thu, 10 Nov 2016 10:15:56 +0000 (10:15 +0000)]
Zygote : Block SIGCHLD during fork.
am:
dfcc79ee8e
Change-Id: I64b380e54d73c777898ece33ba62b838b556921b
Bill Yi [Thu, 10 Nov 2016 10:13:53 +0000 (02:13 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: I3116c8192dcb7e203d6551eaa50e6faf4220cd0e
Narayan Kamath [Thu, 10 Nov 2016 10:04:09 +0000 (10:04 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
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
Hugo Benichi [Tue, 19 Jul 2016 06:59:27 +0000 (15:59 +0900)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
This patch creates a new permission used by ConnectivityService to give
access to restricted networks without the NET_CAPABILITY_NOT_RESTRICTED
capability bit on.
Bug:
24497316
Change-Id: I5b6c8a9ef14395b2f1ab26cb17b24d7876ec79f1
Alain Vongsouvanh [Thu, 10 Nov 2016 02:47:29 +0000 (02:47 +0000)]
colors: Properly set the default accent colors. am:
7b371575e4
am:
e616fa1789
Change-Id: I111e3491c067fe286608c5df73f9d5da90373570
Alain Vongsouvanh [Thu, 10 Nov 2016 02:40:55 +0000 (02:40 +0000)]
colors: Properly set the default accent colors.
am:
7b371575e4
Change-Id: Icff01bd37726c9a77a80f1afb501390bb3ddc629
Alain Vongsouvanh [Wed, 9 Nov 2016 22:52:37 +0000 (14:52 -0800)]
colors: Properly set the default accent colors.
The 700 and 50 variant of the default accent colors were pointing to the
wrong material resources (deep_teal instead of accent).
This CL also update the watch colors to the proper specs.
BUG:
32087183
Change-Id: Ib8a23d9078e79bc0fdf6da893b4dff12954c2cbb
Selim Cinek [Wed, 9 Nov 2016 23:19:25 +0000 (23:19 +0000)]
Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
am:
6a6bc370e9
Change-Id: Iae4342afea01390f6b2567832f863881907dacb0
Selim Cinek [Wed, 9 Nov 2016 23:19:19 +0000 (23:19 +0000)]
Fixed a bug with the emergency affordance in multi user
am:
0294f9e39b
Change-Id: Ib23d37b6ac5cc32aa77aa099c3fa2937ff3570d3
OSDN Git Service
