OSDN Git Service
Felipe Leme [Mon, 31 Jul 2017 18:34:14 +0000 (11:34 -0700)]
Clarifies autofill lifecycle.
Test: m update-api
Bug:
64125551
Bug:
64114048
Change-Id: I17c5bc2e2e64fa27e877301dbcb983ac8497209e
Zheng Zhang [Mon, 7 Aug 2017 20:51:23 +0000 (13:51 -0700)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
Bug:
64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb
Wei Wang [Tue, 2 May 2017 03:24:19 +0000 (20:24 -0700)]
Fix Wakelock underlock in GnssLocationProvider.
Added a separate wakelock for xtra download so it won't
interfer with any wakelocks.
Test: manual
Bug:
37545729
Change-Id: I0867166f03802d1ed133437bcd85b0062db69947
TreeHugger Robot [Wed, 2 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Merge "camera2: Fix template requirements" into oc-dev
Felipe Leme [Wed, 2 Aug 2017 15:52:05 +0000 (15:52 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
TreeHugger Robot [Wed, 2 Aug 2017 00:08:15 +0000 (00:08 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
Andrew Solovay [Tue, 1 Aug 2017 21:20:59 +0000 (21:20 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: I348e71eac5076b37ca50fa1d4cf87afd9890eb2a
Andrew Solovay [Tue, 1 Aug 2017 21:07:18 +0000 (21:07 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Felipe Leme [Mon, 31 Jul 2017 18:34:14 +0000 (11:34 -0700)]
Clarifies how the autofill service should check for signature hashes.
Test: m update-api
Bug:
64125551
Fixes:
63991811
Change-Id: I1ba66787ef91c0fc5fab20b5e9e9fd47aee46412
Maggie Lee [Tue, 1 Aug 2017 15:03:25 +0000 (15:03 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276
am:
d88f4b723d
Change-Id: I3ab78b1e1ca41f6736f7b51f0bf7f603dda1dc8e
Andriy Naborskyy [Tue, 1 Aug 2017 14:56:17 +0000 (14:56 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26
am:
502986f72a
Change-Id: I261e7478acd0e1e8330536b2694ff164d5e51db9
Hugo Benichi [Tue, 1 Aug 2017 14:55:23 +0000 (14:55 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours
am:
17e2448c26 -s ours
Change-Id: Ic8e234914839f9e98fed944638d85c2e795c0c9d
Maggie Lee [Tue, 1 Aug 2017 14:47:57 +0000 (14:47 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd
am:
b5da08a276
Change-Id: I5d96dd73affe79880583347e32a95be8510a5462
Andriy Naborskyy [Tue, 1 Aug 2017 14:38:26 +0000 (14:38 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b
am:
9295f58d26
Change-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7
Maggie Lee [Tue, 1 Aug 2017 14:37:40 +0000 (14:37 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
am:
33676dddbd
Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29
Hugo Benichi [Tue, 1 Aug 2017 14:37:06 +0000 (14:37 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours
am:
ff55799950 -s ours
Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
Andriy Naborskyy [Tue, 1 Aug 2017 14:30:05 +0000 (14:30 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
am:
f18599a15b
Change-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f
Hugo Benichi [Tue, 1 Aug 2017 14:30:02 +0000 (14:30 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am:
456b91561d -s ours
Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad
Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
DO NOT MERGE ANYWHERE ConnectivityService: safer locking
Andrew Solovay [Tue, 1 Aug 2017 02:13:38 +0000 (19:13 -0700)]
docs: Noted that JobIntentService is usually a better choice
Since IntentService is subject to the O background restrictions,
most devs are better off switching to the new JobIntentService.
(I assume IntentService is not actually deprecated; if it is, tell
me and I'll change this to a @deprecated tag!)
See first comment for doc stage location.
Test: make ds-docs
Bug:
64159987
Change-Id: I83a53d1e6336c2134bf4c61bedd2ae42cd80493a
Tyler Freeman [Tue, 1 Aug 2017 01:44:16 +0000 (01:44 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours
am:
6b2d37ca25 -s ours
Change-Id: I42768a60dd38d276cc013a66c5af9aecd06b755d
Tyler Freeman [Tue, 1 Aug 2017 01:33:44 +0000 (01:33 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours
am:
65d806d043 -s ours
Change-Id: Ie89e28aae64abfc833ed97748654d509cd52c07b
Tyler Freeman [Tue, 1 Aug 2017 01:24:08 +0000 (01:24 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
am:
a053eaa841 -s ours
Change-Id: If8383edac561ad83edf182ee1c6e9687b180a1c2
Tyler Freeman [Tue, 1 Aug 2017 01:10:44 +0000 (01:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
z00208928 [Fri, 21 Jul 2017 14:26:29 +0000 (22:26 +0800)]
power: gps: add gps read timeout
During download gps file, if network is disconnected, it do not release wakelock
to prevent system to sleep and consume more power until network is connected.
So set gps read tiemout.
Bug:
33469278
Change-Id: I41adf137559d88f76d9da6f63585bfdefc3117b1
Signed-off-by: z00208928 <zhangwei519@huawei.com>
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Merged-In: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit
ad4d1d8e28618546953e75d4983335631feb6f2a)
Change-Id: Ifae3adf6e2aad1f0811c03d3114d1bd0452e7c23
Felipe Leme [Fri, 28 Jul 2017 16:14:38 +0000 (09:14 -0700)]
Cherry-picked some Autofill Javadoc improvements from
Test: m update-api
Bug:
64125551
Bug:
63669555
Bug:
63985284
Merged-in: Iba4817f682670e9fd6d891ae221e1fa415252e99
Change-Id: I82cbb54a522b2cf1dfb11aacc9735c932aa9af90
Jeff Sharkey [Sat, 29 Jul 2017 16:03:59 +0000 (16:03 +0000)]
Merge "Add a missing null check" into oc-dev
am:
101fca656d
Change-Id: Ibbad678396e7fc3c80d2c3a5cd2c70cb2868e49c
Jeff Sharkey [Sat, 29 Jul 2017 15:56:14 +0000 (15:56 +0000)]
Merge "Add a missing null check" into oc-dev
Wei Wang [Sat, 29 Jul 2017 03:00:04 +0000 (03:00 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours am:
452b8f2bd3 -s ours
am:
f173b2a4c3 -s ours
Change-Id: I85c55b966a64ae3a8ee8a4d19b6d0b8f81a689f1
Wei Wang [Sat, 29 Jul 2017 02:52:46 +0000 (02:52 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am:
a763fdba09 -s ours
am:
452b8f2bd3 -s ours
Change-Id: Iaee8bab95acf6490e468d1a0df66b6aea6e61398
Wei Wang [Sat, 29 Jul 2017 02:46:12 +0000 (02:46 +0000)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
am:
a763fdba09 -s ours
Change-Id: Id38ed8a73decbf2dc3ce4e657e69fe838acb50c1
Wei Wang [Tue, 18 Apr 2017 18:26:26 +0000 (11:26 -0700)]
DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
Test: manual
Bug:
36973866
Change-Id: Ia7168f313abebbf3c5c4fc26567ed914f1987a91
(cherry picked from commit
c5706f651a0462e9ae5a91c9a026d44710b1f8ea)
TreeHugger Robot [Fri, 28 Jul 2017 23:28:44 +0000 (23:28 +0000)]
Merge "DO NOT MERGE JobInfo experiment" into oc-wear-dev
Erik Wolsheimer [Fri, 28 Jul 2017 21:02:46 +0000 (14:02 -0700)]
DO NOT MERGE JobInfo experiment
Bug:
28696194
Change-Id: I26c5ae4a16109d5febd6e80459801ba97b3adfb1
Svet Ganov [Fri, 28 Jul 2017 22:35:06 +0000 (15:35 -0700)]
Add a missing null check
Test: manual
bug::
62755026
Change-Id: Icf719d0e62986febd4d31f22be3e59d83c8e6e09
Chien-Yu Chen [Fri, 28 Jul 2017 21:52:05 +0000 (14:52 -0700)]
camera2: Fix template requirements
STILL_CAPTURE, RECORD, and VIDEO_SNAPSHOT templates are not
guaranteed on depth only devices.
Test: make docs
Bug:
64157646
Change-Id: I1b2db9d919e136d640be0ca04f63b71e4603e542
Svet Ganov [Fri, 28 Jul 2017 21:23:02 +0000 (21:23 +0000)]
Handle case for missing permissions - fix NPE
am:
39cc33f192
Change-Id: I8e67bb497cb40e092454c4baa0cfc61e641d0f50
Svet Ganov [Fri, 28 Jul 2017 20:10:33 +0000 (13:10 -0700)]
Handle case for missing permissions - fix NPE
Test: manual
Bug:
62755026
Change-Id: Ie4dddffdb055f6084d9420ae94d0de2a61574bd8
Andrew Solovay [Fri, 28 Jul 2017 20:25:21 +0000 (20:25 +0000)]
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am:
04d43a6a7b
Change-Id: I00c6c7ee7e50594392c94d7947b2347b4d27d600
Andrew Solovay [Fri, 28 Jul 2017 20:05:04 +0000 (20:05 +0000)]
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
Benjamin Miller [Fri, 28 Jul 2017 17:30:06 +0000 (17:30 +0000)]
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am:
91f16ace4f
Change-Id: I93ba6b5f960798344c3abd44caf7db16b1d894a9
TreeHugger Robot [Fri, 28 Jul 2017 17:11:28 +0000 (17:11 +0000)]
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
Svetoslav Ganov [Fri, 28 Jul 2017 16:42:08 +0000 (16:42 +0000)]
Report permission flags for all protections based on SDK
am:
adb8c522a8
Change-Id: I91357a83b04abce402b0384ee9d362a351b0cb1c
Esteban Talavera [Fri, 14 Jul 2017 15:14:07 +0000 (16:14 +0100)]
Enforce policy for camera gesture in keyguard
If the admin has disabled the camera for secure
keyguards, in addition to removing the bottom-right hand
corner camera button do not allow the camera to be opened
via the camera gesture either.
Bug:
63334090
Merged-In: I104688eaad719528376e2851f837d5956a6a1169
Test: Manually tested launching the camera on secure and non-secure keyguard and non-keyguard, both via camera icon and gesture
Change-Id: I104688eaad719528376e2851f837d5956a6a1169
Tony Mak [Fri, 28 Jul 2017 10:53:56 +0000 (11:53 +0100)]
Enforce policy for camera gesture in keyguard
Test:
1. Set lock screen, set keyguard policy. Lock the device.
Observe that double tap is not showing camera
2. Set lock screen, unset the keyguard policy. Lock the device.
Observe that double tap is showing camera
3. Unset lock screen (swipe), set the keyguard policy. Lock the device.
Observe that double tap is showing camera.
4. Unset lock screen (swipe), unset the keyguard policy. Lock the device.
Observe that double tap is showing camera.
Bug:
63787722
Merged-In: I104688eaad719528376e2851f837d5956a6a1169
Change-Id: I42e6d9015682998176fe41971356bde22e1b37b2
Benjamin Miller [Mon, 24 Jul 2017 08:11:39 +0000 (10:11 +0200)]
Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting
VPNs don't start except a DPC's configured always-on VPN. Clarified version behaviors.
Staged at: go/dac-stage/reference/android/os/UserManager.html#DISALLOW_CONFIG_VPN
Test: make ds-docs and output staged UserManager page
Bug:
63582789
Change-Id: I83c0c6cc580b9d1d224a94e073f559f23cf4d672
(cherry picked from commit
1f83e4d498f4a4f2c8796cdefe330a4caf258424)
Svetoslav Ganov [Fri, 28 Jul 2017 05:46:53 +0000 (05:46 +0000)]
Report permission flags for all protections based on SDK
We added a couple of protection flags that also apply to
normal and dangerous permissions. These flags are folded
in the protection level breaking apps that directly and
compare against the protection constants. Apps that target
older than O SDK don't get protection flags folded into
the protection level.
Test: All permission tests pass
Added a new test to ensure no protection flags reported
for normal and dangerous permissions
Change-Id: I87b10a7695d8ecfa7156525d6f3d101fc0639513
bug:
62755026
Bart Sears [Fri, 28 Jul 2017 05:17:46 +0000 (05:17 +0000)]
Revert "Report permission flags for all protections based on SDK"
am:
784b56e1e6
Change-Id: I552f6a02c12b13825d829cd86f987502b71b0f2f
Bart Sears [Fri, 28 Jul 2017 05:05:38 +0000 (05:05 +0000)]
Revert "Report permission flags for all protections based on SDK"
This reverts commit
852cf98cb8a4b9b56da84a96708c087996e119d2.
Change-Id: I62763bf85ec95a02a245c6b503aa34bb0e9d997a
Siarhei Vishniakou [Fri, 28 Jul 2017 01:24:01 +0000 (18:24 -0700)]
DO NOT MERGE Remove window obscurement information.
If ACTION_OUTSIDE_EVENTS contain information about whether the touch is
obscured, then a pattern of invisible, untouchable, unfocusable
SYSTEM_ALERT_WINDOWS can be placed across the screen to determine
approximate locations of touch events without the user knowing.
Bug:
31097064
Test: cts-tradefed run cts --class android.security.cts.MotionEventTest
Change-Id: I081a483c491dd384e252f0b615affee96038fdda
Hugo Benichi [Thu, 6 Apr 2017 08:22:18 +0000 (17:22 +0900)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
This patch moves reportNetworkConnectivity onto the handler of
ConnectivityService.
This allows:
- to inspect NetworkAgentInfo on the ConnectivityService handler,
which is always more correct than doing so on a Binder thread.
- to improve locking policies around NetworkAgentInfo.
Test: $ runtest frameworks-net
Bug:
37119619,
36902662
Change-Id: I49a765826e65c29a1995242290e5e7544112c94e
Hugo Benichi [Thu, 6 Apr 2017 07:01:44 +0000 (16:01 +0900)]
DO NOT MERGE ANYWHERE ConnectivityService: safer locking
This path changes a dangerous lock path in reportNetworkConnectivity().
This methods is called outside of the main ConnectivityService handler
and takes a lock on a specific NetworkAgentInfo whose connectivity
status is being reported.
While this lock is held, reportNetworkConnectivity() goes on and query
the network policy state for that network, which may ends into
NetworkPolicyManagerService.
Instead, the lock on NetworkAgentInfo is only held long enough to make a
copy of LinkProperties, which is then passed to
NetworkPolicyManagerService without that lock.
Bug:
36902662
Test: could not repro b/
36902662, reportNetworkConnectivity() works.
$ runtest frameworks-net
Change-Id: Iac4b75bcecbdddb0ac695c8b1a87ae755f62f47f
Svetoslav Ganov [Fri, 28 Jul 2017 02:48:37 +0000 (02:48 +0000)]
Report permission flags for all protections based on SDK
am:
852cf98cb8
Change-Id: I01b89051e10932c7926a6fe4f6c3225543a8ae4d
Svetoslav Ganov [Thu, 27 Jul 2017 19:53:18 +0000 (12:53 -0700)]
Report permission flags for all protections based on SDK
We added a couple of protection flags that also apply to
normal and dangerous permissions. These flags are folded
in the protection level breaking apps that directly and
compare against the protection constants. Apps that target
older than O SDK don't get protection flags folded into
the protection level.
Test: All permission tests pass
Added a new test to ensure no protection flags reproted
for normal and dangerous permissions
bug:
62755026
Change-Id: I72547b0146e6b6919803e33ff64b7208c4a255ad
Dirk Dougherty [Fri, 9 Jun 2017 21:43:32 +0000 (14:43 -0700)]
Cherry-pick from master Doc change: Add API 26 to @since list
Add API 26 to @since list and turn off preview watermarking.
Fix has been successfully submitted in master and affects doc files
only.
Bug:
62087404
Bug:
64123587
Test: make ds-docs
Original change-Id: Idcf84882a1a1fe0864ee6ff3d0af6cd857c73a06
Change-Id: I28700ad15d931256d9dfc1016df546bd2f0e718f
TreeHugger Robot [Thu, 27 Jul 2017 18:24:15 +0000 (18:24 +0000)]
Merge "[AsyncChannel] Fix race in handling of sync result" into oc-wear-dev
Bill Yi [Thu, 27 Jul 2017 00:23:43 +0000 (00:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours am:
603a43e5c3 -s ours
am:
81a1d589ba -s ours
Change-Id: I35dabc711bb79a363d6ae8d322360cb17f0d16f0
Bill Yi [Thu, 27 Jul 2017 00:14:48 +0000 (00:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours
am:
e2f2fbaea1 -s ours
Change-Id: I72067911325923a5ea3ed104c0559c0fe58898b5
Bill Yi [Wed, 26 Jul 2017 23:49:10 +0000 (23:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours am:
8080362358 -s ours
am:
0ceb3853e8 -s ours
Change-Id: I500081c76d35c78144548567beb26701b0606015
Bill Yi [Wed, 26 Jul 2017 23:44:12 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3875d1a103 -s ours
am:
995029b529 -s ours
Change-Id: I8fcea60d72018c6862df946aa3f23003c7a1e2e3
Bill Yi [Wed, 26 Jul 2017 23:26:03 +0000 (23:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c2b08ca602 -s ours
am:
aec51f497c -s ours
Change-Id: Id1e3d6bf1b8ee10ae0f3e23d685f50c311fd9c5f
Bill Yi [Wed, 26 Jul 2017 23:10:06 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours
am:
603a43e5c3 -s ours
Change-Id: I57e366359829001bd92fa0b77d8068cb30c18456
Bill Yi [Wed, 26 Jul 2017 23:07:26 +0000 (23:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours
am:
9cf9d294ef -s ours
Change-Id: I559573199120374e303bfaae5d5c18660dbb369e
Bill Yi [Wed, 26 Jul 2017 23:07:15 +0000 (23:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9724569903 -s ours
am:
18b818e2dd -s ours
Change-Id: I2e44c8c1280d8b4d7cdb894d6d1affdf79e08955
Bill Yi [Wed, 26 Jul 2017 22:58:37 +0000 (22:58 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev am:
cd955ca6e5 -s ours
am:
f66ddc099a -s ours
Change-Id: I7b1e4d157af0263064fc7de6e717c8804616f216
Bill Yi [Wed, 26 Jul 2017 22:56:00 +0000 (22:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
581a166ae1 -s ours
Change-Id: If1bba4f6237b39c86fc5fa998376683d78cd483e
Bill Yi [Wed, 26 Jul 2017 22:55:38 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours
am:
8080362358 -s ours
Change-Id: I8243f6ee311cd730ace4f9bca4693ccdabfa7523
Bill Yi [Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
3875d1a103 -s ours
Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d
Bill Yi [Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev am:
3bcdbff889 -s ours
am:
6f24c015ef -s ours
Change-Id: I110aa51c9c6539e6e5682478258335071b8f5d91
Bill Yi [Wed, 26 Jul 2017 22:49:37 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c2b08ca602 -s ours
Change-Id: I0c8c1cc35fa6560dd1a40b22544ecd25dc7af0b2
Bill Yi [Wed, 26 Jul 2017 22:46:32 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fb02073a66 -s ours
Change-Id: I497f27dc7f50f9914b5157a4846c05ef4091abfd
Bill Yi [Wed, 26 Jul 2017 22:44:26 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9724569903 -s ours
Change-Id: I8bcfd139861eb4ca6a0943e321b8032245e27a42
Bill Yi [Wed, 26 Jul 2017 22:41:39 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
a1bde91384 -s ours
am:
cccb304acf -s ours
Change-Id: Id2a950d1ed41f79392e7c3292a0e87f7f1fad267
TreeHugger Robot [Wed, 26 Jul 2017 22:40:12 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:39:47 +0000 (22:39 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
am:
cd955ca6e5 -s ours
Change-Id: I643ac51ad7d162527ee4aa73da6568d94156083b
Bill Yi [Wed, 26 Jul 2017 22:39:36 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
9bc30ce545 -s ours
am:
611a6ffe29 -s ours
Change-Id: I75b98556e45e2dfa5834d11c4c7a96e447d7d134
TreeHugger Robot [Wed, 26 Jul 2017 22:39:30 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:37:13 +0000 (22:37 +0000)]
Import translations. DO NOT MERGE am:
495d4ce1b9 -s ours
am:
120c3e9874 -s ours
Change-Id: Ie39ae7739ca7defdb6b7e6f8a992c36ede26e90f
Bill Yi [Wed, 26 Jul 2017 22:35:23 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
am:
3bcdbff889 -s ours
Change-Id: Id70f146241685a88bc2ba075d8e78745fd826878
Bill Yi [Wed, 26 Jul 2017 22:28:59 +0000 (22:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a1bde91384 -s ours
Change-Id: Ic47dfa6fc6cad6123552c0493f40d3ac9a63822c
Bill Yi [Wed, 26 Jul 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9bc30ce545 -s ours
Change-Id: I8676942d8e77918837208d400a2e87a0b4e3d935
Bill Yi [Wed, 26 Jul 2017 22:21:36 +0000 (22:21 +0000)]
Import translations. DO NOT MERGE
am:
495d4ce1b9 -s ours
Change-Id: I1294580d3e9485f0367aca366054336d0dc3b9ed
Bill Yi [Wed, 26 Jul 2017 22:21:32 +0000 (22:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
4ba2bc4d32 -s ours
Change-Id: Ib331eb4cf8882b271b11b756c43818a5b38c1664
TreeHugger Robot [Wed, 26 Jul 2017 22:16:34 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:14:51 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:13:05 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 26 Jul 2017 22:04:23 +0000 (22:04 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 22:01:57 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fbfd283125 -s ours
Change-Id: I39f298c62ae870a0a764a1cb60d766e8e03f692b
Android Build Merger (Role) [Wed, 26 Jul 2017 22:01:37 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:59:35 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 21:58:32 +0000 (21:58 +0000)]
Import translations. DO NOT MERGE
am:
69d0838208 -s ours
Change-Id: I25641bf4fbc60d8e40887a43965a602000bc8377
TreeHugger Robot [Wed, 26 Jul 2017 21:50:54 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:48:22 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Michael Plass [Thu, 13 Jul 2017 17:09:07 +0000 (10:09 -0700)]
[AsyncChannel] Fix race in handling of sync result
Bug:
62866191
Bug:
63074860
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit
56e46134d364f7f293158979765336721a6c752c)
TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 20:37:49 +0000 (20:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-wear-dev
TreeHugger Robot [Wed, 26 Jul 2017 20:24:09 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-wear-dev
TreeHugger Robot [Wed, 26 Jul 2017 20:21:59 +0000 (20:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-wear-dev