OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Add support for notification of LTE to WIFI handover for video calls." into...
Tyler Gunn [Thu, 11 Jan 2018 19:43:12 +0000 (19:43 +0000)]
Merge "Add support for notification of LTE to WIFI handover for video calls." into oc-mr1-dev

6 years agoMerged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of...
Kevin Hufnagle [Tue, 9 Jan 2018 23:51:10 +0000 (23:51 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services. am: d195a9972b
am: 800e061359

Change-Id: I3854641ab4f80f4bbeae9acd67522fcd8b8484c0

6 years agoMerged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of...
Kevin Hufnagle [Tue, 9 Jan 2018 23:44:04 +0000 (23:44 +0000)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services.
am: d195a9972b

Change-Id: I7a59a3b8c18492961aea7f480276a401ab8bb6ae

6 years agoMerged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
Kevin Hufnagle [Thu, 29 Jun 2017 22:58:48 +0000 (15:58 -0700)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
docs: Revised descriptions of binding and connecting to services.

Clarified that Context.bindService() returning true only indicates
that the system has found a service to bind to the client and that
ServiceConnection.onServiceConnected() might not be called if the
service encounters an error, such as crashing during startup.

Test: make ds-docs

Bug: 63118511
Change-Id: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e

6 years agodocs: Adding file to support staging reference docs
Andrew Solovay [Mon, 8 Jan 2018 23:57:29 +0000 (15:57 -0800)]
docs: Adding file to support staging reference docs

We use the devsite tool to stage reference docs for review (to
go/dac-stage). That tool is currently broken, because it's expecting
to find a _reference-head-tags.html file which currently exists in
Piper but not in Gerrit. Copying that file into Gerrit lets us
build the Javadocs and stage them. (Files in p/f/b/docs don't
generally affect anything outside of the doc builds.)

Tested by building docs and staging Adapter.html to:
go/dac-stage/reference/android/widget/Adapter.html

Test: make ds-docs
Bug: 71717397
Change-Id: I05430f2d9f23e62b4423b2d6f304c4be1c43b880

6 years agoTurn default gradient into solid black
Lucas Dupin [Mon, 30 Oct 2017 18:09:25 +0000 (11:09 -0700)]
Turn default gradient into solid black

Test: visual
Bug: 66957450
Change-Id: I6a34a35912e4dd4594565f88636ce89689d26f2f
(cherry picked from commit e7476addecb4fec6abd08cfb7aa27c473ce5c1f0)

6 years agoMerge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc...
Pankaj Kanwar [Thu, 4 Jan 2018 01:03:27 +0000 (01:03 +0000)]
Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Fri, 22 Dec 2017 18:02:46 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 3a8be1ae39  -s ours

Change-Id: I2bfbaa9cc6b920112bc71a0b76b1382eb9d68e95

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 22 Dec 2017 17:57:02 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Dec 2017 22:41:15 +0000 (22:41 +0000)]
Merge "DO NOT MERGE docs: Removing spurious end </pre> tag" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Dec 2017 21:08:50 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:28:46 +0000 (19:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f  -s ours am: 0a1948e515  -s ours am: 7cb6513f6d  -s ours
am: f0687d1201  -s ours

Change-Id: Ia6678879fac5025f54f6d40b8dbc8ef7a1b9832d

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:26:54 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09  -s ours am: ea2e302eff  -s ours am: b6dab6b3ee  -s ours
am: 1f9ae3b912  -s ours

Change-Id: I74c034b1c5247fb0ce7ace539014f9052092413e

6 years agoDO NOT MERGE docs: Removing spurious end </pre> tag
Andrew Solovay [Thu, 21 Dec 2017 01:22:54 +0000 (17:22 -0800)]
DO NOT MERGE docs: Removing spurious end </pre> tag

Owing to a merge mixup, ended up adding a spurious </pre> where it
had no effect. Removing it just for hygiene's sake.

This doc error is only in oc-mr1-dev, not in master, so the fix
doesn't need to be merged.

Test: make ds-docs
Bug: 70812346
Change-Id: I5b54ed8fb1f068698d4dd4536383b52165b4d81f

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:25:25 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01  -s ours am: d21211470c  -s ours am: f1c75d66ec  -s ours
am: b7a560fb10  -s ours

Change-Id: I612fa092984c77c735a27c0da5998890c518ffd4

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:22:55 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours am: d5a7faea83  -s ours am: bd14c44fd8  -s ours
am: f6c335b353  -s ours

Change-Id: I7b218e76069fce17d24c3bc12fa28af797ee69d4

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:20:42 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941  -s ours am: 51fc07ad61  -s ours am: c344f9b1c7  -s ours
am: 39d480e67c  -s ours

Change-Id: I521cbe71ba8abbaa04deb8e4ae232764687a29d2

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:19:10 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea  -s ours am: 5943ef281a  -s ours am: 2c97ca3b62  -s ours
am: 934729c535  -s ours

Change-Id: Id05ac1fc16e2e054febc631943424b85008d34b2

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:17:16 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c  -s ours am: a683975c54  -s ours am: 0bfcd7eef7  -s ours
am: f123f221db  -s ours

Change-Id: Iaa7ea701db9f070098ae53d98b8e019a865bb704

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:15:41 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955  -s ours am: 7244723549  -s ours am: 05e41d0531  -s ours
am: 7baaa51e62  -s ours

Change-Id: I6ae9f1fbaa5335f0906dc4af678226dd101c8cd2

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:13:50 +0000 (19:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931  -s ours am: 2d00ab621a  -s ours am: e135a35edf  -s ours
am: 301dfae698  -s ours

Change-Id: I47dc0cc519fd0707c83e3aab976934b3b3ce2150

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours am...
Bill Yi [Thu, 21 Dec 2017 19:12:14 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f  -s ours am: c81e5ae281  -s ours am: 13062c93e5  -s ours
am: 25d7b576ec  -s ours

Change-Id: Iaf6c344263bc6d3e32f0df8d14cc27327a30b3ec

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours am...
Bill Yi [Thu, 21 Dec 2017 18:18:04 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f  -s ours am: 0a1948e515  -s ours
am: 7cb6513f6d  -s ours

Change-Id: I9cf46be95cd8d62bd8380b63740e4d97b68fa958

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f -s ours
Bill Yi [Thu, 21 Dec 2017 18:15:02 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 45d962274f  -s ours
am: 0a1948e515  -s ours

Change-Id: If6c330da79edb94911ec1fb076a29e8c485ca725

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 21 Dec 2017 18:11:27 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 45d962274f  -s ours

Change-Id: I43d3d8e14417f7aed30a470191386753c9957701

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 21 Dec 2017 18:04:34 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours am...
Bill Yi [Thu, 21 Dec 2017 18:01:15 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09  -s ours am: ea2e302eff  -s ours
am: b6dab6b3ee  -s ours

Change-Id: Ic796115ab4b86083a0823a4ace631c8a3a15ba66

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09 -s ours
Bill Yi [Thu, 21 Dec 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 81b98ffb09  -s ours
am: ea2e302eff  -s ours

Change-Id: I9d23c6267a38545927029782293ef8a15961cca7

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours am...
Bill Yi [Thu, 21 Dec 2017 17:57:33 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01  -s ours am: d21211470c  -s ours
am: f1c75d66ec  -s ours

Change-Id: Iaae57c91c09a4b1780c0c8e474700c56133b264e

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours am...
Bill Yi [Thu, 21 Dec 2017 17:55:45 +0000 (17:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours am: d5a7faea83  -s ours
am: bd14c44fd8  -s ours

Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours am...
Bill Yi [Thu, 21 Dec 2017 17:52:15 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941  -s ours am: 51fc07ad61  -s ours
am: c344f9b1c7  -s ours

Change-Id: I0f33f5e6ba5168e27ed60cb36b762708b641d34a

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours
Bill Yi [Thu, 21 Dec 2017 17:51:21 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01  -s ours
am: d21211470c  -s ours

Change-Id: Ife7d7f70c599c556abebf10eee525072a127b34d

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours am...
Bill Yi [Thu, 21 Dec 2017 17:50:54 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea  -s ours am: 5943ef281a  -s ours
am: 2c97ca3b62  -s ours

Change-Id: Ia71bb418e6bf22e2347436d883e1bcd1c9937d61

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7 -s ours
Bill Yi [Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours
am: d5a7faea83  -s ours

Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941 -s ours
Bill Yi [Thu, 21 Dec 2017 17:48:29 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7ce772e941  -s ours
am: 51fc07ad61  -s ours

Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 21 Dec 2017 17:46:04 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 81b98ffb09  -s ours

Change-Id: I6369ce728c37d066932736566e465f73e7843eb5

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 21 Dec 2017 17:44:40 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 599fb37c01  -s ours

Change-Id: Icc605bca96905c647601df651186850c874b5442

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours am...
Bill Yi [Thu, 21 Dec 2017 17:44:38 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c  -s ours am: a683975c54  -s ours
am: 0bfcd7eef7  -s ours

Change-Id: I30395fbf54d028c4f2e8bd21aa362e9d8e993195

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 21 Dec 2017 17:42:25 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: e1ca34b5c7  -s ours

Change-Id: Ie97a72b89d17e982dbe499c26c956dafffe5effa

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours
Bill Yi [Thu, 21 Dec 2017 17:42:12 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea  -s ours
am: 5943ef281a  -s ours

Change-Id: I9758d713fb9328b7f2218dae49e334f16a703476

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours am...
Bill Yi [Thu, 21 Dec 2017 17:42:08 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955  -s ours am: 7244723549  -s ours
am: 05e41d0531  -s ours

Change-Id: I730f5dcee5ea85c408f7cf21dafab011e869d66d

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 21 Dec 2017 17:41:01 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 7ce772e941  -s ours

Change-Id: I0a8e327692fb18d67b9e724ce3254f3c342206b9

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c -s ours
Bill Yi [Thu, 21 Dec 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 970261b46c  -s ours
am: a683975c54  -s ours

Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours am...
Bill Yi [Thu, 21 Dec 2017 17:35:51 +0000 (17:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931  -s ours am: 2d00ab621a  -s ours
am: e135a35edf  -s ours

Change-Id: Ib75ec7b79501a31cab373f919c06a791a7ad9a4a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Dec 2017 09:42:20 +0000 (01:42 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ib6ac723de671ad98410e531aeeceb643f8eb0209

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Dec 2017 01:23:17 +0000 (17:23 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I38c81359b80048ce33a01f85d18de21e51c623fe

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:45:59 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:55 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:18 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:11 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev
Andrew Solovay [Wed, 20 Dec 2017 21:34:26 +0000 (21:34 +0000)]
Merge "doc: Fixing Javadoc formatting problems." into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:29:47 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 1f204cd1ea  -s ours

Change-Id: I0f8053bf3d65cd451e704ad682cd54b29953e944

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955 -s ours
Bill Yi [Wed, 20 Dec 2017 19:26:37 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 9593ca1955  -s ours
am: 7244723549  -s ours

Change-Id: Id717ceb76ced6f3fb2b10689efd916e7e7cc5cfe

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours am...
Bill Yi [Wed, 20 Dec 2017 19:25:28 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f  -s ours am: c81e5ae281  -s ours
am: 13062c93e5  -s ours

Change-Id: I524e2276bb358a4373036c7943b1b00f53ebaa17

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:22:02 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 970261b46c  -s ours

Change-Id: I1f37c148c9d2086d198443c596880fbc57cbad4b

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931 -s ours
Bill Yi [Wed, 20 Dec 2017 19:19:15 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0c1f4c2931  -s ours
am: 2d00ab621a  -s ours

Change-Id: Ib3d980494cfeb7ddc621e1185429635cc5b3ab8d

6 years agoImport translations. DO NOT MERGE am: 406659b709 -s ours am: 1fccf167ff -s ours...
Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]
Import translations. DO NOT MERGE am: 406659b709  -s ours am: 1fccf167ff  -s ours am: daa1d87e50  -s ours
am: 0e62ea2f4c  -s ours

Change-Id: Ia89c48363a381a246f132a2d8619d7b650ed19ab

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:17:58 +0000 (19:17 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 9593ca1955  -s ours

Change-Id: Ie8c5ea32885dc3c6ee7b688beaf13f179dc95475

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f -s ours
Bill Yi [Wed, 20 Dec 2017 19:16:46 +0000 (19:16 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 496af8623f  -s ours
am: c81e5ae281  -s ours

Change-Id: I90e825b5d0b540318f8a75f10bac95323e110cfa

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:12:46 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 0c1f4c2931  -s ours

Change-Id: Ib2fcf638c1433c444796d90fa8578c035c60b3df

6 years agoImport translations. DO NOT MERGE am: 406659b709 -s ours am: 1fccf167ff -s ours
Bill Yi [Wed, 20 Dec 2017 19:12:00 +0000 (19:12 +0000)]
Import translations. DO NOT MERGE am: 406659b709  -s ours am: 1fccf167ff  -s ours
am: daa1d87e50  -s ours

Change-Id: Ieeaf1281b3ef3256264850f8910c7075e07eabe6

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:10:42 +0000 (19:10 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 496af8623f  -s ours

Change-Id: I3acd580690e2bca34b21d600225f53ac7b467185

6 years agoImport translations. DO NOT MERGE am: 406659b709 -s ours
Bill Yi [Wed, 20 Dec 2017 19:07:26 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE am: 406659b709  -s ours
am: 1fccf167ff  -s ours

Change-Id: I295d71779c2361915f61c3b1f76ca90103b716ea

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 19:07:04 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 19:05:04 +0000 (19:05 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 19:04:41 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 19:03:39 +0000 (19:03 +0000)]
Import translations. DO NOT MERGE
am: 406659b709  -s ours

Change-Id: Ida0956b8a3ba81a7a5f78753236c0cac001c2b1a

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 18:59:40 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 18:59:10 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

6 years agodoc: Fixing Javadoc formatting problems.
Andrew Solovay [Tue, 19 Dec 2017 01:23:35 +0000 (17:23 -0800)]
doc: Fixing Javadoc formatting problems.

No code changes, just fixing typos in the doc comments.

Doc is staged to:

http://go/dac-stage/reference/android/service/autofill/AutofillService.html
http://go/dac-stage/reference/android/service/autofill/FillRequest.html

Test: make ds-docs
Bug: 70812346
Merged-In: Ia76121c60197275c6be1717c8003fe1c4baf5f97
Change-Id: I5ee04bb96234441c5740665540b5e803fcf9710f

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 13:29:48 +0000 (05:29 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ie04afa32da40ba59ba9e9c9964fee8b597f00d1e
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 13:24:54 +0000 (05:24 -0800)]
Import translations. DO NOT MERGE

Change-Id: If89c7f1e2e96a2922b4cce9c446109b8d085b091
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 12:39:09 +0000 (04:39 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6891787af9011c1559364b4966808a907949b07e
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 12:34:13 +0000 (04:34 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia6fe335e23b77c14a731eb8e9e00bf1000c9600c
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 12:29:19 +0000 (04:29 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia614e1fe986931cbc5bb2dee16c9fb5c69e6c4b7
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 12:24:18 +0000 (04:24 -0800)]
Import translations. DO NOT MERGE

Change-Id: I1a406cd61d89311ba4c903078452f46cb1e46870
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 12:10:52 +0000 (04:10 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ifd1b4a854360927ae4479ca8d1bf0637c98aa5e5
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 11:56:50 +0000 (03:56 -0800)]
Import translations. DO NOT MERGE

Change-Id: I4246a775e430d1db88a7c64144a4dca6824be297
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 11:43:02 +0000 (03:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: I7c5bfc2833a1fa01d3f1cabd451fa88ce8535094
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 11:38:01 +0000 (03:38 -0800)]
Import translations. DO NOT MERGE

Change-Id: I200b939582ec1b2a016f83f62ebb586da842bfae
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Dec 2017 11:32:57 +0000 (03:32 -0800)]
Import translations. DO NOT MERGE

Change-Id: I63d54555e4cb7071f114b81d17b1364475a4380f
Auto-generated-cl: translation import

6 years agodocs: Touch-up edits to ShortcutManager class reference.
Kevin Hufnagle [Mon, 18 Dec 2017 17:57:39 +0000 (09:57 -0800)]
docs: Touch-up edits to ShortcutManager class reference.

Test: make ds-docs -j16

Bug: 64727234
Change-Id: Ieb2c2f6ee6706f206e2cc0d5be8bc3a5cdd9f345

6 years agoMerge "docs: Revised wording, section order for ShortcutManager API ref." into oc...
Kevin Hufnagle [Mon, 18 Dec 2017 17:42:48 +0000 (17:42 +0000)]
Merge "docs: Revised wording, section order for ShortcutManager API ref." into oc-mr1-dev

6 years agodocs: Revised wording, section order for ShortcutManager API ref.
Kevin Hufnagle [Sat, 2 Dec 2017 00:01:36 +0000 (16:01 -0800)]
docs: Revised wording, section order for ShortcutManager API ref.

Provided more thorough description of static shortcut options,
integrated shortcut limits section with the "updating shortcuts"
example, added more links to narrative documentation.

Test: make ds-docs -j8

Bug: 64727234
Change-Id: I70c16082e3e85a31b501c8e313d93200d827c7f4

6 years agodocs: Added code tag to meta-data name and fixed some @see tags
Ricardo Loo Foronda [Fri, 27 Oct 2017 00:02:31 +0000 (17:02 -0700)]
docs: Added code tag to meta-data name and fixed some @see tags

Status: Ready for review.

Changes:
* Surrounded android.service.carrier.LONG_LIVED_BINDING with code tags
  in CarrierService class.
* Prefixed @see tags with # in CarrierConfigManager#KEY_FORCE_HOME_NETWORK_BOOL.
* Prefixed @see tag with class name in
  CarrierConfigManager#notifyConfigChangedForSubId.

Test: make ds-docs

Staged content:
*
https://android-dot-devsite.googleplex.com/reference/android/service/carrier/CarrierService.html
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#KEY_FORCE_HOME_NETWORK_BOOL
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#notifyConfigChangedForSubId(int)

Bug: 23289716
Change-Id: I3b5be3ecc45bfb83e3fe0ae9bc76dc7761557e08

6 years agoAdd support for notification of LTE to WIFI handover for video calls.
Tyler Gunn [Thu, 14 Dec 2017 22:06:15 +0000 (14:06 -0800)]
Add support for notification of LTE to WIFI handover for video calls.

Test: Manual, added new unit tests.
Bug: 65490850
Change-Id: I7afbd2d1e783aae425ac3fe640a6e92d1600b9a5

6 years agoProper autofill fix to let phone process autofill Settings activity. am: 2f58b03ea1
Felipe Leme [Thu, 14 Dec 2017 02:00:35 +0000 (02:00 +0000)]
Proper autofill fix to let phone process autofill Settings activity. am: 2f58b03ea1
am: 4a8d9b628f  -s ours

Change-Id: Idecee1722d2f0cb504fb591caa0dc1609361e392

6 years agoProper autofill fix to let phone process autofill Settings activity.
Felipe Leme [Thu, 14 Dec 2017 01:49:36 +0000 (01:49 +0000)]
Proper autofill fix to let phone process autofill Settings activity.
am: 2f58b03ea1

Change-Id: Ia167badcdb5fee60a62c9cf0932150b54180ba0b

6 years agoMerge "Proper autofill fix to let phone process autofill Settings activity." into...
TreeHugger Robot [Thu, 14 Dec 2017 01:15:51 +0000 (01:15 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity." into oc-mr1-dev

6 years agoMerge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev
TreeHugger Robot [Tue, 12 Dec 2017 21:48:11 +0000 (21:48 +0000)]
Merge "OMS: Only allow trusted overlays to be registered." into oc-mr1-dev

6 years agoProper autofill fix to let phone process autofill Settings activity.
Felipe Leme [Mon, 11 Dec 2017 22:37:35 +0000 (14:37 -0800)]
Proper autofill fix to let phone process autofill Settings activity.

Test: adb shell am start com.android.settings/.RadioInfo
Bug: 69981710
Fixes: 70506888

Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d
(cherry picked from commit 97f16a76db29269619d9a1b45d4cea49026a5b6a)

6 years agoProper autofill fix to let phone process autofill Settings activity.
Felipe Leme [Mon, 11 Dec 2017 22:37:35 +0000 (14:37 -0800)]
Proper autofill fix to let phone process autofill Settings activity.

Test: adb shell am start com.android.settings/.RadioInfo
Bug: 69981710
Fixes: 70506888

Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d

6 years agoMerge "Make sure apps cannot forge package name on AssistStructure used for Autofill...
Felipe Leme [Fri, 8 Dec 2017 18:53:17 +0000 (18:53 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev am: bd355dbf58
am: d62d68785e  -s ours

Change-Id: I7f5471c6329e54669c2926779a26536a9dc6e51d

6 years agoMerge "Make sure apps cannot forge package name on AssistStructure used for Autofill...
Felipe Leme [Fri, 8 Dec 2017 18:39:01 +0000 (18:39 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
am: bd355dbf58

Change-Id: I922cbe5c9b1e71569e09241564faf537fb923604

6 years agoMerge "Make sure apps cannot forge package name on AssistStructure used for Autofill...
TreeHugger Robot [Fri, 8 Dec 2017 18:16:24 +0000 (18:16 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev

6 years agoMerge "Make sure apps cannot forge package name on AssistStructure used for Autofill...
TreeHugger Robot [Fri, 8 Dec 2017 18:05:59 +0000 (18:05 +0000)]
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-mr1-dev

6 years agoMerge "Add assisted dialing properties to the framework." into oc-mr1-dev
TreeHugger Robot [Fri, 8 Dec 2017 05:02:31 +0000 (05:02 +0000)]
Merge "Add assisted dialing properties to the framework." into oc-mr1-dev

6 years agoMerge "DO NOT MERGE - Backported some Autofill Javadoc improvements from master....
TreeHugger Robot [Thu, 7 Dec 2017 23:07:40 +0000 (23:07 +0000)]
Merge "DO NOT MERGE - Backported some Autofill Javadoc improvements from " into oc-mr1-dev

6 years agoOMS: Only allow trusted overlays to be registered.
Adam Lesinski [Tue, 14 Nov 2017 08:50:18 +0000 (00:50 -0800)]
OMS: Only allow trusted overlays to be registered.

Bug: 69383160
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.OverlayHostTest
Change-Id: I930c11716317cff1ec485a3943d1f22f07a423df
Merged-In: I930c11716317cff1ec485a3943d1f22f07a423df

6 years agoDO NOT MERGE - Backported some Autofill Javadoc improvements from master.
Felipe Leme [Thu, 7 Dec 2017 18:46:26 +0000 (10:46 -0800)]
DO NOT MERGE - Backported some Autofill Javadoc improvements from 

Test: in Tree Hugger we trust!

Bug: 70215975

Change-Id: If679e735f1fe1916457c16d33d09cb47573ee7dd
Merged-In: I8ab3d76983259830fd90867bd2d7f1e3360b3c4e