OSDN Git Service

android-x86/frameworks-base.git
6 years agoCatch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565...
Zheng Zhang [Wed, 9 Aug 2017 18:09:48 +0000 (18:09 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565  -s ours
am: 4542686e42

Change-Id: Id140fee89f552999522f3116854761c14265ef04

6 years agoFix Wakelock underlock in GnssLocationProvider. am: 2ed0166808 -s ours
Wei Wang [Wed, 9 Aug 2017 18:08:52 +0000 (18:08 +0000)]
Fix Wakelock underlock in GnssLocationProvider. am: 2ed0166808  -s ours
am: 5d60709dc3

Change-Id: I10a42eee839da98af9434d1f7530335dfa732632

6 years agoCatch (and ignore) any timeout exceptions when releasing WakeLock
Zheng Zhang [Wed, 9 Aug 2017 17:58:18 +0000 (17:58 +0000)]
Catch (and ignore) any timeout exceptions when releasing WakeLock
am: 9468b48565  -s ours

Change-Id: Ia1c10a46771ff4602a1005a3bf0bddaf6f1a70b6

6 years agoFix Wakelock underlock in GnssLocationProvider.
Wei Wang [Wed, 9 Aug 2017 17:57:17 +0000 (17:57 +0000)]
Fix Wakelock underlock in GnssLocationProvider.
am: 2ed0166808  -s ours

Change-Id: I965a5b57ffbc2adcde3a83a95793a3dc29673641

6 years agoClarifies autofill lifecycle.
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

6 years agoCatch (and ignore) any timeout exceptions when releasing WakeLock
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

6 years agoFix Wakelock underlock in GnssLocationProvider.
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

6 years agoMerge "camera2: Fix template requirements" into oc-dev
TreeHugger Robot [Wed, 2 Aug 2017 19:43:31 +0000 (19:43 +0000)]
Merge "camera2: Fix template requirements" into oc-dev

6 years agoMerge "Clarifies how the autofill service should check for signature hashes." into...
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

6 years agoMerge "Cherry-picked some Autofill Javadoc improvements from master." 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

6 years agoMerge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
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

6 years agoClarifies how the autofill service should check for signature hashes.
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev

6 years agoMerge changes I49a76582,Iac4b75bc 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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev
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

6 years agodocs: Noted that JobIntentService is usually a better choice
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

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 agopower: gps: add gps read timeout
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>
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 agoCherry-picked some Autofill Javadoc improvements from master.
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

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 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 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 agocamera2: Fix template requirements
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

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:05:04 +0000 (20:05 +0000)]
Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev

6 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

6 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)

6 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

6 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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
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: 3711961936902662
Change-Id: I49a765826e65c29a1995242290e5e7544112c94e

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: safer locking
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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 years agoMerge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
Ricardo Loo [Wed, 19 Jul 2017 04:36:42 +0000 (04:36 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev

6 years agoMerge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028
Phil Weaver [Wed, 19 Jul 2017 01:10:58 +0000 (01:10 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028
am: 72c56fb84a  -s ours

Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3

6 years agoMerge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d
Phil Weaver [Wed, 19 Jul 2017 01:01:06 +0000 (01:01 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d
am: a84f7a3028

Change-Id: I1fedbee4642373e41c63c36ab83a0f4629c4a3d1

6 years agoMerge "Back-port fixes for b/62196835" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:53:13 +0000 (00:53 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-mr1-dev
am: 4a1dc3458d

Change-Id: Ibc50787c078b4d68de37f12d57d4b14990b5c768

6 years agoMerge "Back-port fixes for b/62196835" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:46:42 +0000 (00:46 +0000)]
Merge "Back-port fixes for b/62196835" into nyc-mr1-dev

6 years agoMerge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714...
Phil Weaver [Wed, 19 Jul 2017 00:42:05 +0000 (00:42 +0000)]
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12  -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a am: 2da30457c5
am: d761dad216

Change-Id: Ib2704ba352764d6f48467c129b2a2d4129408da0

6 years agoMerge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714...
Phil Weaver [Wed, 19 Jul 2017 00:30:58 +0000 (00:30 +0000)]
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12  -s ours am: 9e39e1e548 am: afdcad0df3 am: edbe4bd86a
am: 2da30457c5

Change-Id: If6d698d3d085c8a49a4b58ae5cc5005264558091

6 years agoMerge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714...
Phil Weaver [Wed, 19 Jul 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12  -s ours am: 9e39e1e548 am: afdcad0df3
am: edbe4bd86a

Change-Id: I860d4a27acab50bfebf81e83b3db64f7c396fade

6 years agoMerge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714...
Phil Weaver [Wed, 19 Jul 2017 00:15:34 +0000 (00:15 +0000)]
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12  -s ours am: 9e39e1e548
am: afdcad0df3

Change-Id: Ie777e6351ed8518a4fc785a20772a8e2cb0ef0fe

6 years agoMerge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714...
Phil Weaver [Wed, 19 Jul 2017 00:04:51 +0000 (00:04 +0000)]
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4 am: 996bc6bc12  -s ours
am: 9e39e1e548

Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f

6 years agoMerge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714...
Phil Weaver [Tue, 18 Jul 2017 23:58:28 +0000 (23:58 +0000)]
Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4714 am: 9625d164e4
am: 996bc6bc12  -s ours

Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819