git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:07 +0000 (21:56 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199
am: a9d64326ad -s ours

Change-Id: I786402375e6a75936d097c82a0221a3c8db94268

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 21:53:24 +0000 (21:53 +0000)]

Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev
am: bcf3392856

Change-Id: Ic06a49e43f4f5e1ebc4aef0f66f0ecc1296eb843

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 21:52:14 +0000 (21:52 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707
am: d7b199be9a -s ours

Change-Id: I7aa21a0d4310323f666a5326a019555d15e006ff

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 21:49:42 +0000 (21:49 +0000)]

Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev
am: f310c792d4

Change-Id: Ifc8e1838bea63b3401dbd41e2d1dd04ca67b1eb2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 21:48:48 +0000 (21:48 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd
am: 8eb39fb0f4 -s ours

Change-Id: Iadcf60e51485dc0952c6f7800a996e91585854a5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 21:46:22 +0000 (21:46 +0000)]

Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev
am: 806b4573aa

Change-Id: I1cfe38aa5a80dd142ef80375957766ce6b8daf99

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 21:45:31 +0000 (21:45 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb
am: 0a09cd4b21 -s ours

Change-Id: I939c7d74e9c575b6ed205dc5713579bb03cb31d5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:52 +0000 (19:09 +0000)]

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev
am: 41ae4b7eae

Change-Id: Ic40433dd8e426ee0b13cfd04c218e84d5a089bef

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:05 +0000 (19:09 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
am: 77243e2d28 -s ours

Change-Id: I51635f606e53d517a340e656fd28bf3be58e7acd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 19:04:31 +0000 (19:04 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93
am: 19f08130b1 -s ours

Change-Id: I8a06155e0f3d7e4d50f295712ef4ab120ec6d92c

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:48:29 +0000 (18:48 +0000)]

Merge changes from topic "am-37557a04-fa85-46fe-a499-4a0280811f3e" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707
  [automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]

Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]

Merge changes from topic "am-459a2298-9d91-42be-bcee-e19446619a42" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]

Merge changes from topic "am-3ca94091-64c7-4524-a9e7-1438a5fc6599" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0
  [automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 14:29:03 +0000 (14:29 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707

Change-Id: I6f98cfa7f1bc12306c8e28a234d2b0d011068674

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 14:28:57 +0000 (14:28 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb

Change-Id: I817002a824ff75c6764d45d3738518c1603a00ba

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 14:28:41 +0000 (06:28 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 14:23:13 +0000 (14:23 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb skipped: 10f8c984c0

Change-Id: I4a8b6d977c11f57303700d60526707b632a7c403

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 14:23:07 +0000 (14:23 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 9a738cccdb

Change-Id: Iae0ea1e87448360321f506ca698d19b5b7812498

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 14:22:37 +0000 (06:22 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:30:52 +0000 (13:30 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7 skipped: e0e084e199

Change-Id: I13d150895e8888b73cedb9e78e430609bb13bef0

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:30:47 +0000 (13:30 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 816ddbdba7

Change-Id: I7914f49de4bd92832326b43b8f87b684bb5df85a

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 13:30:32 +0000 (05:30 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:13:09 +0000 (13:13 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01 skipped: 03130e4fbb

Change-Id: Id7171c69c55a042c6ac6cad743a23960591b9e86

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 13:13:01 +0000 (13:13 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4cd0777c01

Change-Id: I697689c9d02095934f558b3b2ce3786170b25305

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 13:12:24 +0000 (05:12 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 12:22:34 +0000 (12:22 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd

Change-Id: Iad2457215210dc2eb9dfbe4224fdf532da6595e2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 12:22:28 +0000 (12:22 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18

Change-Id: Ie0d7a9db0c88eec27035f319b7ea47f9416caec7

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 12:22:07 +0000 (04:22 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 12:17:01 +0000 (12:17 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93

Change-Id: I93cffeeef1826f04ff75bd61c9fcacbfcfc8668c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 Jan 2018 12:16:54 +0000 (12:16 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486

Change-Id: I45a61272bb4c3ca3a67210778f6fd7ff65553f99

commit | commitdiff | tree

Bill Yi [Thu, 25 Jan 2018 12:16:22 +0000 (04:16 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 16 Jan 2018 23:42:24 +0000 (23:42 +0000)]

[automerger skipped] RESTRICT AUTOMERGE Preventing recursive referrence in drawables skipped: cee125012a

Change-Id: Ie180da5d659b106e1c5299b0a46b6cbf24548ae0

commit | commitdiff | tree

Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]

RESTRICT AUTOMERGE Preventing recursive referrence in drawables

Bug: 68706673
Bug: 66498711
Test: Added CTS tests

Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
(cherry picked from commit I8034f49d16f9a7bc1749714fd6d6231bba5088d0)
Merged-In: I8034f49d16f9a7bc1749714fd6d6231bba5088d0

commit | commitdiff | tree

Hyunyoung Song [Fri, 12 Jan 2018 05:31:38 +0000 (05:31 +0000)]

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
am: 48df033607

Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465

commit | commitdiff | tree

TreeHugger Robot [Fri, 12 Jan 2018 05:23:45 +0000 (05:23 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 22 Dec 2017 17:57:02 +0000 (17:57 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Dec 2017 18:04:34 +0000 (18:04 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 23:45:59 +0000 (23:45 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 23:44:55 +0000 (23:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 23:44:18 +0000 (23:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 23:44:11 +0000 (23:44 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 19:07:04 +0000 (19:07 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 19:05:04 +0000 (19:05 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 19:04:41 +0000 (19:04 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 18:59:40 +0000 (18:59 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Dec 2017 18:59:10 +0000 (18:59 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Felipe Leme [Fri, 1 Dec 2017 01:41:57 +0000 (17:41 -0800)]

Make sure apps cannot forge package name on AssistStructure used for Autofill.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.VirtualContainerActivityTest#testAppCannotFakePackageName
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Bug: 69981710

Change-Id: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Merged-In: Id6036cddb51dd8dd0c9128b7212d573f630d693f

commit | commitdiff | tree

Rubin Xu [Mon, 4 Dec 2017 11:32:48 +0000 (11:32 +0000)]

resolve merge conflicts of 2ff6320d773c to oc-dr1-dev

Change-Id: I3711119a6cbba1b697ad379a8520b73023c27edb

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help