OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
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

6 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
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

6 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
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

6 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
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

6 years agoDO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously...
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

6 years agoMerge "Add a missing null check" into oc-dev
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

6 years agoMerge "Add a missing null check" into oc-dev
Jeff Sharkey [Sat, 29 Jul 2017 15:56:14 +0000 (15:56 +0000)]
Merge "Add a missing null check" into oc-dev

6 years agoDO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS...
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

6 years agoDO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS...
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

6 years agoDO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
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

6 years agoDO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.
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)

6 years agoMerge "DO NOT MERGE JobInfo experiment" into oc-wear-dev
TreeHugger Robot [Fri, 28 Jul 2017 23:28:44 +0000 (23:28 +0000)]
Merge "DO NOT MERGE JobInfo experiment" into oc-wear-dev

6 years agoDO NOT MERGE JobInfo experiment
Erik Wolsheimer [Fri, 28 Jul 2017 21:02:46 +0000 (14:02 -0700)]
DO NOT MERGE JobInfo experiment

Bug: 28696194
Change-Id: I26c5ae4a16109d5febd6e80459801ba97b3adfb1

6 years agoAdd a missing null check
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

6 years agoHandle case for missing permissions - fix NPE
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

6 years agoHandle case for missing permissions - fix NPE
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

6 years agoMerge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
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

6 years agoMerge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
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

7 years agoMerge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" 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

7 years agoMerge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
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

7 years agoReport permission flags for all protections based on SDK
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

7 years agoDocs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting
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)

7 years agoReport permission flags for all protections based on SDK
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

7 years agoRevert "Report permission flags for all protections based on SDK"
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

7 years agoRevert "Report permission flags for all protections based on SDK"
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

7 years agoReport permission flags for all protections based on SDK
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

7 years agoReport permission flags for all protections based on SDK
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

7 years agoCherry-pick from master Doc change: Add API 26 to @since list
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

7 years agoMerge "[AsyncChannel] Fix race in handling of sync result" into oc-wear-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours am...
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours am...
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours am...
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103 -s ours
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602 -s ours
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 581a166ae1 -s ours
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: fb02073a66 -s ours
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903 -s ours
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

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s...
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 4ba2bc4d32 -s ours
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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

7 years agoMerge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev...
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:40:12 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s...
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545 -s ours
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:39:30 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoImport translations. DO NOT MERGE am: 495d4ce1b9 -s ours
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

7 years agoMerge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:16:34 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "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

7 years agoMerge "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

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125 -s...
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-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

7 years agoMerge "Import translations. DO NOT MERGE am: 69d0838208 -s ours" into nyc-mr2-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" 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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:50:54 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:48:22 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years ago[AsyncChannel] Fix race in handling of sync result
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)

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-wear-dev
TreeHugger Robot [Wed, 26 Jul 2017 20:37:49 +0000 (20:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-wear-dev

7 years agoMerge "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

7 years agoMerge "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

7 years agoMerge "Import translations. DO NOT MERGE" into oc-wear-dev
TreeHugger Robot [Wed, 26 Jul 2017 20:17:32 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-wear-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 18:03:33 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE

Change-Id: I228aaf428e6298a9077e8f277c3e6e26b5ebd7a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 18:02:05 +0000 (11:02 -0700)]
Import translations. DO NOT MERGE

Change-Id: I13f52e0726334b4ff47a780e3d5c41074d96aada
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 18:01:07 +0000 (11:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8b8dd3e35096ba23f1dd7cc01beba7b392167591
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 18:00:00 +0000 (11:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iebfe4076b754c857472076b3aa9d9fd0b491e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:57:20 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9be29c557742c6c1d233376f49088bcb3309bfb3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:54:37 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib4dc70583403c24fd26d0e909577e13c22165482
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:49:37 +0000 (10:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6ff93110716d74d81f968786a331295e110e0168
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:46:30 +0000 (10:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1cfa4e4737d8fe82c6c39d1772d565c56ce186c4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:42:20 +0000 (10:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9273d1c9e96d398653e3846dcdfdf2df5a070a57
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:40:40 +0000 (10:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: If6893b7757cc431a56096d7c708f600d3f2f8575
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:39:26 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I954a10e182672bd56b02906d530f0415a1704160
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:37:56 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8a3ec819ac8f50463c32225f68031c92d9fc8eec
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:36:27 +0000 (10:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: I788dbd4e193bfb2bae69e37fd18becd482a42917
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:23:59 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7a677eabfe97553a7bddecfa88064d5e4edd37b6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 17:22:32 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: I845591a10b25b12451ddb1a6591b8b638630e32c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 26 Jul 2017 08:15:09 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: a7f60741ae  -s ours

Change-Id: I38d271b4cce89a81e555f922210bf1be4829c1ba

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 26 Jul 2017 08:07:09 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: b4e8cad186  -s ours

Change-Id: Idda516628b04350d3a7a11b443dda1b09573c869

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 08:03:37 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE
am: 7c2b27f26f  -s ours

Change-Id: Ica7795281f339697f1c8799cff244ecced0d4f9f

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Jul 2017 08:03:03 +0000 (08:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Jul 2017 07:53:12 +0000 (07:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 04:24:47 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie81e9b6438034399af10f964876f14cb08b8ceb7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 04:17:50 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ifd1d218d134f9871650b17254741c4a0b40a4f0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Jul 2017 04:15:58 +0000 (21:15 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0f6bf766d9d5d91f8b885e4ecc0878cacde1668f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

7 years agoMerge "Docs: Updates guidance about using permissions when accessing OBB expansion...
David Friedman [Fri, 21 Jul 2017 23:11:14 +0000 (23:11 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev
am: e4d0557334

Change-Id: I05093bfc77bbddb959743f3fb8086510e44d8b20

7 years agoMerge "Docs: Updates guidance about using permissions when accessing OBB expansion...
David Friedman [Fri, 21 Jul 2017 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug: 34273998 Test: Ran "make" to verify error-free building." into oc-dev

7 years agoMerge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
Benjamin Miller [Thu, 20 Jul 2017 14:07:01 +0000 (14:07 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
am: baa85250d4

Change-Id: I621c6249c18d9919484b78f3b92e93092870bc22

7 years agoMerge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
Benjamin Miller [Thu, 20 Jul 2017 13:58:15 +0000 (13:58 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev

7 years agoDocs: Updates guidance about using permissions when accessing OBB
Dave Friedman [Wed, 5 Jul 2017 07:40:07 +0000 (00:40 -0700)]
Docs: Updates guidance about using permissions when accessing OBB
expansion files,
Bug: 34273998
Test: Ran "make" to verify error-free building.

Change-Id: Ic2022bd8bd78e2f6077d6ee6807fbbda7214737a