OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 07:58:10 +0000 (00:58 -0700)]
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 am: e2a7c24f03 am: d91868aee5
am: 539952c444

Change-Id: Icac62977b9436b668d92698523a0973a44576a73

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped...
Bill Yi [Fri, 6 Jul 2018 07:47:24 +0000 (00:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134  -s ours am: f2ea6f55d9  -s ours am: 9bf5cb9b7f  -s ours am: 8dfe2e787c  -s ours
am: dff3f6a527  -s ours

Change-Id: I4d4913306c013728d1018e40485eef6318825607

6 years agoMerge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 07:42:28 +0000 (00:42 -0700)]
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783 am: e2a7c24f03
am: d91868aee5

Change-Id: Id7a9ce4822a524a29a0aafbdb99304c258414439

6 years agoMerge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 07:39:40 +0000 (00:39 -0700)]
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 am: 086abb7a59 am: cd74671aa7
am: 5b29095f7d

Change-Id: Id8ce3de87039e57f84e6bdcdc24642ec72f221e6

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped...
Bill Yi [Fri, 6 Jul 2018 07:33:24 +0000 (00:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134  -s ours am: f2ea6f55d9  -s ours am: 9bf5cb9b7f  -s ours
am: 8dfe2e787c  -s ours

Change-Id: I0ec5b6c4975d95cb806d98e99d950de77a953f8e

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped...
Bill Yi [Fri, 6 Jul 2018 07:29:19 +0000 (00:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb  -s ours am: 67f18d810a  -s ours am: d635022d93  -s ours am: 84729fca53  -s ours
am: 87829f5f24  -s ours

Change-Id: Ic012413a6e55e25133735406afc86c9d603db0b0

6 years agoMerge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 07:27:06 +0000 (00:27 -0700)]
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169 am: 086abb7a59
am: cd74671aa7

Change-Id: I319b9c8b5898be896d4c2b1a0f25542d6fde1145

6 years agoMerge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 07:19:04 +0000 (00:19 -0700)]
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 am: c3ff91a225 am: 12835665f3
am: 3fab85bffd

Change-Id: Ibc6404d2b900f9f70b38c152a62d4609aeeb4d96

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped...
Bill Yi [Fri, 6 Jul 2018 07:18:14 +0000 (00:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb  -s ours am: 67f18d810a  -s ours am: d635022d93  -s ours
am: 84729fca53  -s ours

Change-Id: I42ba97e9889d62b3a82252b534a3bdae1d81452c

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped...
Bill Yi [Fri, 6 Jul 2018 07:08:45 +0000 (00:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5  -s ours am: fcca5bb731  -s ours am: d18e450922  -s ours am: 8944491476  -s ours
am: 9969f29b47  -s ours

Change-Id: I2014ae9c9458f39ccabac064fc1c06bdaaf7dfa1

6 years agoMerge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 06:12:01 +0000 (23:12 -0700)]
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2 am: 851e826783
am: e2a7c24f03

Change-Id: Ie4e2d6c9fe04adc0d26dc2d7a4d9e7c8ef89fb74

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped...
Bill Yi [Fri, 6 Jul 2018 06:04:17 +0000 (23:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134  -s ours am: f2ea6f55d9  -s ours
am: 9bf5cb9b7f  -s ours

Change-Id: I92f228dd4920d493591d44e4ab6e7e6b731d9e8a

6 years agoMerge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 05:38:26 +0000 (22:38 -0700)]
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81 am: b434b0c169
am: 086abb7a59

Change-Id: I50abf9cc8aeb4c0086c9f2b4d3f7620853d7d0cc

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped...
Bill Yi [Fri, 6 Jul 2018 05:30:53 +0000 (22:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb  -s ours am: 67f18d810a  -s ours
am: d635022d93  -s ours

Change-Id: I21b5b66696cb1f6c6683e46c82ee71a7d8751c24

6 years agoMerge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 05:23:02 +0000 (22:23 -0700)]
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 am: c3ff91a225
am: 12835665f3

Change-Id: Ie2ae1dfe4d816b85fa47d77188cdc654eaa9b3dd

6 years agoMerge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 05:12:53 +0000 (22:12 -0700)]
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev am: 6005492cb2
am: 851e826783

Change-Id: I1b866e81f48a4d642657cd963fd8e04faa3c1537

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped...
Bill Yi [Fri, 6 Jul 2018 05:12:52 +0000 (22:12 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5  -s ours am: fcca5bb731  -s ours am: d18e450922  -s ours
am: 8944491476  -s ours

Change-Id: I9a04d7182cab26789a590f9a37b9c636a2a1406c

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped...
Bill Yi [Fri, 6 Jul 2018 05:05:37 +0000 (22:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56 am: 8700285134  -s ours
am: f2ea6f55d9  -s ours

Change-Id: Ic88b3b3dcc9ed3148c6e3d150705e7f40b36c8d0

6 years agoMerge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 05:02:12 +0000 (22:02 -0700)]
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14
am: c3ff91a225

Change-Id: I69dc7a8329df67e668addcd07d288709230cf48e

6 years agoMerge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 05:00:12 +0000 (22:00 -0700)]
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev am: 37d9749e81
am: b434b0c169

Change-Id: I817b45781ecea994292c346d9e3bd4584e0f2d1f

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped...
Bill Yi [Fri, 6 Jul 2018 04:53:48 +0000 (21:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5  -s ours am: fcca5bb731  -s ours
am: d18e450922  -s ours

Change-Id: Icb43cc60577ca81ada301f283b9e3e1bf4cf6ccc

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped...
Bill Yi [Fri, 6 Jul 2018 04:53:26 +0000 (21:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6 am: eacf5ffefb  -s ours
am: 67f18d810a  -s ours

Change-Id: Ifaeaf651a92fd5bd261180f0aaa68bb2da521fc0

6 years agoMerge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 04:48:16 +0000 (21:48 -0700)]
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861
am: 812ec62a14

Change-Id: I66ce801571d91b5e3791a57cebfe9b56715515b7

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 04:43:38 +0000 (21:43 -0700)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554 am: 5d61a6618b am: 402176177c
am: b263a1a09e

Change-Id: I0a2d432593a5e184df6af1e302268e9ed1d24098

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped...
Bill Yi [Fri, 6 Jul 2018 04:41:17 +0000 (21:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1 am: 998f40e6c5  -s ours
am: fcca5bb731  -s ours

Change-Id: Ib39dfb279c982016f6102a4ee6d26e6e5f925d91

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Bill Yi [Fri, 6 Jul 2018 04:32:40 +0000 (21:32 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4  -s ours am: e45b804b65  -s ours am: d9d9d1daca  -s ours am: 9f950537e4  -s ours
am: 64b9fb51ec  -s ours

Change-Id: Iac6d352d8c07dcb03b62bde0ff7b6f917ad30780

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 04:21:38 +0000 (21:21 -0700)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554 am: 5d61a6618b
am: 402176177c

Change-Id: I1a6a0df3694acd7bc47cde041b94f7a1902a25f3

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Bill Yi [Fri, 6 Jul 2018 04:11:50 +0000 (21:11 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4  -s ours am: e45b804b65  -s ours am: d9d9d1daca  -s ours
am: 9f950537e4  -s ours

Change-Id: I14c71ce82a5d857ef9bdabb7015c582db1dcb3f0

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Bill Yi [Fri, 6 Jul 2018 04:05:33 +0000 (21:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5  -s ours am: 4065ce8773  -s ours am: 03e1c5f227  -s ours am: 05968703a2  -s ours
am: 4a4b554061  -s ours

Change-Id: I91b22ce4464a7af4f3184a2ab47b89c318272b76

6 years agoMerge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev
Bill Yi [Fri, 6 Jul 2018 03:58:16 +0000 (20:58 -0700)]
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev
am: 6005492cb2

Change-Id: I71789a270fc86b5fc9c74c0de2cd122f1ac26c5e

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 03:57:24 +0000 (20:57 -0700)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554
am: 5d61a6618b

Change-Id: I0eeeb695d9125b05d136700b3e03157c25a302fc

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped...
Bill Yi [Fri, 6 Jul 2018 03:56:04 +0000 (20:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56
am: 8700285134  -s ours

Change-Id: Ice563d38360e1be62c5f6b869dc69f1ce5dfff24

6 years agoMerge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev
Bill Yi [Fri, 6 Jul 2018 03:51:41 +0000 (20:51 -0700)]
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev
am: 37d9749e81

Change-Id: I6258da69f13a1ea21b50d0756315619ef190a526

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped...
Bill Yi [Fri, 6 Jul 2018 03:49:13 +0000 (20:49 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6
am: eacf5ffefb  -s ours

Change-Id: I034e3f1a5916c01dc643cde92bd6f42187b5c480

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Bill Yi [Fri, 6 Jul 2018 03:48:58 +0000 (20:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4  -s ours am: e45b804b65  -s ours
am: d9d9d1daca  -s ours

Change-Id: Id13c67950da4a13f9035c0e35b903237948f61a5

6 years agoMerge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev
Bill Yi [Fri, 6 Jul 2018 03:44:43 +0000 (20:44 -0700)]
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev
am: c1dc805861

Change-Id: I3a40076fd344300ac6dd812ea2c96012f88e36b0

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped...
Bill Yi [Fri, 6 Jul 2018 03:42:12 +0000 (20:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
am: 998f40e6c5  -s ours

Change-Id: Ifdbc60e6748887feedc47eb60843d231dae46146

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Bill Yi [Fri, 6 Jul 2018 03:34:56 +0000 (20:34 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5  -s ours am: 4065ce8773  -s ours am: 03e1c5f227  -s ours
am: 05968703a2  -s ours

Change-Id: Iaaa67b162ee173f0b3ddb22c1b22d8997c3d6bc7

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am...
Bill Yi [Fri, 6 Jul 2018 03:23:45 +0000 (20:23 -0700)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f
am: f051b28554

Change-Id: Ia57f2327964435888de185ed3cd461f6299daa62

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Bill Yi [Fri, 6 Jul 2018 03:16:48 +0000 (20:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc am: 9204ce40e4  -s ours
am: e45b804b65  -s ours

Change-Id: Iae41c56e1a5007b66a1a880d1ef5e4a351a5ca63

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Bill Yi [Fri, 6 Jul 2018 03:07:47 +0000 (20:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5  -s ours am: 4065ce8773  -s ours
am: 03e1c5f227  -s ours

Change-Id: Iddcf2126b4c25970d87e3f90a66033a9a09c5ace

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev
Bill Yi [Fri, 6 Jul 2018 03:03:49 +0000 (20:03 -0700)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev
am: ec4d649d8f

Change-Id: I874acb53e25065d4a9a8018f2f0e69d6d041fa8b

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Bill Yi [Fri, 6 Jul 2018 03:02:41 +0000 (20:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab am: b3bf111bd5  -s ours
am: 4065ce8773  -s ours

Change-Id: I2f05f7f47f5e7aed365bee09afc30b019cb73993

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Bill Yi [Fri, 6 Jul 2018 03:01:40 +0000 (20:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
am: 9204ce40e4  -s ours

Change-Id: Ic798dfd5e7b85f7341d2c929519aa227a95e6f18

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Bill Yi [Fri, 6 Jul 2018 02:57:42 +0000 (19:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab
am: b3bf111bd5  -s ours

Change-Id: Ice5c1a283c59a8640868cdc3a8acc4afb97e5468

6 years agoMerge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:46:51 +0000 (02:46 +0000)]
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56
  [automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:46:29 +0000 (02:46 +0000)]
Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6
  [automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:45:57 +0000 (02:45 +0000)]
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
  [automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
  Import translations. DO NOT MERGE

6 years agoMerge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev
TreeHugger Robot [Fri, 6 Jul 2018 02:45:27 +0000 (02:45 +0000)]
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
  [automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
  Import translations. DO NOT MERGE

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 6 Jul 2018 02:17:24 +0000 (02:17 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Fix GraphicBuffer creation not to use 0 usage flag"
TreeHugger Robot [Fri, 6 Jul 2018 02:06:10 +0000 (02:06 +0000)]
Merge "Fix GraphicBuffer creation not to use 0 usage flag"

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped...
Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:40 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc

Change-Id: I5c0a1faf8d1dc7bf5d6fc831b61ab40697a422d5

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
Android Build Merger (Role) [Thu, 5 Jul 2018 21:45:32 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6

Change-Id: I8ba42b65a49ff3e9c30e56dc8664bc8a942b4d25

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 21:45:03 +0000 (14:45 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped...
Android Build Merger (Role) [Thu, 5 Jul 2018 21:38:44 +0000 (21:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1

Change-Id: I99aab27eecf8e8d5d092cabc316b0d3b68a97b2c

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
Android Build Merger (Role) [Thu, 5 Jul 2018 21:38:36 +0000 (21:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec

Change-Id: I09e334aa2acf3c0d32b27b9d18193450db041c6a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 21:38:05 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped...
Android Build Merger (Role) [Thu, 5 Jul 2018 21:26:20 +0000 (21:26 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d skipped: ace44c1ee6

Change-Id: I264d10bc17ca14d813f7626ea8c7f3fc48b7d2b7

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d
Android Build Merger (Role) [Thu, 5 Jul 2018 21:26:12 +0000 (21:26 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f02d29629d

Change-Id: I19af9b73c3da999252d25aa656b2ee5898b75662

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 21:25:39 +0000 (14:25 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped...
Android Build Merger (Role) [Thu, 5 Jul 2018 20:56:37 +0000 (20:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56

Change-Id: I2021f802764dc2314c721ba918c587f235b0f575

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
Android Build Merger (Role) [Thu, 5 Jul 2018 20:56:29 +0000 (20:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557

Change-Id: Ia499ffa8340bfbf0f2b1ec7dd515ee5cf65f7fb8

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 20:55:54 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE

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

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped...
Android Build Merger (Role) [Thu, 5 Jul 2018 20:32:02 +0000 (20:32 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228 skipped: b586d4e9ab

Change-Id: Idb16f83382ec0d792c15733b46fe31a99e89552a

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228
Android Build Merger (Role) [Thu, 5 Jul 2018 20:31:54 +0000 (20:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: f8ecf21228

Change-Id: Ie556d4be250c4d6f4ade238bb905455aa0454b73

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 20:31:17 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE

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

6 years agoMerge "Move displayId into InputEvent"
TreeHugger Robot [Thu, 5 Jul 2018 18:28:56 +0000 (18:28 +0000)]
Merge "Move displayId into InputEvent"

6 years agoMove displayId into InputEvent
Siarhei Vishniakou [Fri, 8 Jun 2018 21:49:30 +0000 (22:49 +0100)]
Move displayId into InputEvent

Now both KeyEvent and MotionEvent will contain displayId. This will help
with dispatching input events to specific displays. There are use cases
where a particular input device is used for a specific display only, and
it sends key events to the system. This will help with those usages.

Test: atest view.MotionEventTest view.KeyEventTest
Bug: 64258305
Change-Id: I75891037617ed60820d60736216a0d615ab5e3b0

6 years agoMerge "Remove unusual static method call" am: cbe9c295a3 am: 36beeefc84
Neil Fuller [Thu, 5 Jul 2018 12:55:40 +0000 (05:55 -0700)]
Merge "Remove unusual static method call" am: cbe9c295a3 am: 36beeefc84
am: ee2bfdd54b

Change-Id: I6133c2bbd1b85515a316b10d93d998f9997118f3

6 years agoMerge "Remove unusual static method call" am: cbe9c295a3
Neil Fuller [Thu, 5 Jul 2018 12:46:04 +0000 (05:46 -0700)]
Merge "Remove unusual static method call" am: cbe9c295a3
am: 36beeefc84

Change-Id: I6ecfb33be300b88a9308102595f0e79cf2f18ae4

6 years agoMerge "Always close file descriptors" am: 26025a06ec am: de8eac9ae1
Erik Kline [Thu, 5 Jul 2018 12:44:45 +0000 (05:44 -0700)]
Merge "Always close file descriptors" am: 26025a06ec am: de8eac9ae1
am: ed6cc299f4

Change-Id: I212cbbe134bba4580a6e73de9bb77e712d25c9a6

6 years agoMerge "Track constructor changes in libcore/" am: f94eb29500 am: 67dcf6da3c
Neil Fuller [Thu, 5 Jul 2018 12:34:45 +0000 (05:34 -0700)]
Merge "Track constructor changes in libcore/" am: f94eb29500 am: 67dcf6da3c
am: 9ca5d6f0a0

Change-Id: I7e7115799180d17e4ad6468e155aed79fc8600cb

6 years agoMerge "Always close file descriptors" am: 26025a06ec
Erik Kline [Thu, 5 Jul 2018 12:32:16 +0000 (05:32 -0700)]
Merge "Always close file descriptors" am: 26025a06ec
am: de8eac9ae1

Change-Id: Id25f948b6b4d25ac033d9b608ab4a6b474f2c606

6 years agoMerge "Track constructor changes in libcore/" am: f94eb29500
Neil Fuller [Thu, 5 Jul 2018 12:25:35 +0000 (05:25 -0700)]
Merge "Track constructor changes in libcore/" am: f94eb29500
am: 67dcf6da3c

Change-Id: I1205219e1fead95ecdb8f9ce5d503ec416baf4c2

6 years agoMerge "Remove unusual static method call"
Neil Fuller [Thu, 5 Jul 2018 12:24:39 +0000 (05:24 -0700)]
Merge "Remove unusual static method call"
am: cbe9c295a3

Change-Id: I3ae602232226ef3a1e482dd5a34e1025118c30b7

6 years agoMerge "Always close file descriptors"
Erik Kline [Thu, 5 Jul 2018 12:20:25 +0000 (05:20 -0700)]
Merge "Always close file descriptors"
am: 26025a06ec

Change-Id: Ib1d8f74832b8b649dc83de39f8f16651a9924e69

6 years agoMerge "Track constructor changes in libcore/"
Neil Fuller [Thu, 5 Jul 2018 12:14:26 +0000 (05:14 -0700)]
Merge "Track constructor changes in libcore/"
am: f94eb29500

Change-Id: I344d9210bd173f78651318366c852f65afe969d6

6 years agoMerge "Remove unusual static method call"
Treehugger Robot [Thu, 5 Jul 2018 11:12:35 +0000 (11:12 +0000)]
Merge "Remove unusual static method call"

6 years agoMerge "Track changes in libcore to remove a constructor"
Neil Fuller [Thu, 5 Jul 2018 10:27:40 +0000 (10:27 +0000)]
Merge "Track changes in libcore to remove a constructor"

6 years agoRemove unusual static method call
Neil Fuller [Wed, 4 Jul 2018 15:41:14 +0000 (16:41 +0100)]
Remove unusual static method call

The code is using static method Calendar.getInstance() but via a
subclass of Calendar. It works, and getInstance() returns a
GregorianCalendar on Android, but it's odd and was probably unintended.

Noticed during static analysis of SystemUI bytecode.

Bug: 111055375
Test: build / boot
Change-Id: I1762cbeb2cc7882868f84ec11100815671cd29ec

6 years agoMerge "Always close file descriptors"
Treehugger Robot [Thu, 5 Jul 2018 09:07:21 +0000 (09:07 +0000)]
Merge "Always close file descriptors"

6 years agoMerge "Track constructor changes in libcore/"
Neil Fuller [Thu, 5 Jul 2018 08:57:13 +0000 (08:57 +0000)]
Merge "Track constructor changes in libcore/"

6 years agoFix GraphicBuffer creation not to use 0 usage flag
Tadashi G. Takaoka [Thu, 5 Jul 2018 07:47:47 +0000 (16:47 +0900)]
Fix GraphicBuffer creation not to use 0 usage flag

(This is a cherry-pick of Ibd477a335e from pi-arc-dev)

Fixes: 110907362
Test: atest FrameworksServicesTests:com.android.server.wm.TaskSnapshotSurfaceTest
Change-Id: Ibd477a335e82f92bc39ec214c01bbeeead802ab0

6 years agoAlways close file descriptors
Erik Kline [Wed, 4 Jul 2018 08:57:51 +0000 (17:57 +0900)]
Always close file descriptors

Every error thrown leaked a netlink NETFILTER socket.

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - enabled tethering and tried to cause conntrack updates to sessions
      that had expired (which causes ErrnoExceptions to be thrown)
      while monitoring lsof for system_server's NETFILTER sockets

Bug: 32163131
Bug: 64976634
Bug: 110122306

Change-Id: Ib52b812e8434c27ad9f2596666400c13e03c2216

6 years ago[automerger skipped] Import translations. DO NOT MERGE am: 3f4b3c946d -s ours
Bill Yi [Thu, 5 Jul 2018 04:33:46 +0000 (21:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am: 3f4b3c946d  -s ours
am: 2fd79e4f04  -s ours

Change-Id: I750f7031dce2023f2b586af1c18e75ed4895090b

6 years ago[automerger skipped] Import translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 04:25:49 +0000 (21:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am: 3f4b3c946d  -s ours

Change-Id: Ifa2e1f1e6a4ad161737403167925f8f7721a6542

6 years agoMerge changes from topic "q_dark_theme"
TreeHugger Robot [Thu, 5 Jul 2018 03:46:24 +0000 (03:46 +0000)]
Merge changes from topic "q_dark_theme"

* changes:
  Migrate SysUI theme to UiMode
  Revert "Add theme mode design let user can choose theme self"
  Revert "Activate dark theme when the UiMode is UI_MODE_NIGHT_YES."

6 years agoMigrate SysUI theme to UiMode
Lucas Dupin [Wed, 6 Jun 2018 02:07:16 +0000 (19:07 -0700)]
Migrate SysUI theme to UiMode

Legacy RRO was deleted and resources migrated to DeviceDefault theme.
Theming via overlays is still possible, but the overlay should provide
both themes: day and night.

Test: adb shell service call uimode 4 i32 1
Test: adb shell service call uimode 4 i32 2
Change-Id: I5dee2f94764c5c2f4e11cfabfff97656b3822e8a

6 years agoMerge "Fix the logic to get tv_pip_settings_class_name" am: d004710e0e am: 08923b73f4
Shuichi.Noguchi [Thu, 5 Jul 2018 00:25:09 +0000 (17:25 -0700)]
Merge "Fix the logic to get tv_pip_settings_class_name" am: d004710e0e am: 08923b73f4
am: 06cec22f3e

Change-Id: I9a46b6a07dcc063d539e3cf28f182f0bf7cfd64e

6 years agoMerge "Fix the logic to get tv_pip_settings_class_name" am: d004710e0e
Shuichi.Noguchi [Thu, 5 Jul 2018 00:17:04 +0000 (17:17 -0700)]
Merge "Fix the logic to get tv_pip_settings_class_name" am: d004710e0e
am: 08923b73f4

Change-Id: I5b4b6a208cb6fde4ba806f5aec3782244b772b94

6 years agoMerge "Fix the logic to get tv_pip_settings_class_name"
Shuichi.Noguchi [Thu, 5 Jul 2018 00:07:32 +0000 (17:07 -0700)]
Merge "Fix the logic to get tv_pip_settings_class_name"
am: d004710e0e

Change-Id: Ieecde6f75fd7788835fa34300f1fbec5eb963862

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 4 Jul 2018 23:58:23 +0000 (16:58 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I28cf7af28a854687af1b92930a9e79e02d685c35

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 4 Jul 2018 23:38:13 +0000 (16:38 -0700)]
Import translations. DO NOT MERGE

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

6 years agoMerge "Fix the logic to get tv_pip_settings_class_name"
Treehugger Robot [Wed, 4 Jul 2018 22:45:16 +0000 (22:45 +0000)]
Merge "Fix the logic to get tv_pip_settings_class_name"

6 years agoRevert "Add theme mode design let user can choose theme self"
Lucas Dupin [Mon, 25 Jun 2018 01:22:10 +0000 (18:22 -0700)]
Revert "Add theme mode design let user can choose theme self"

The CL was intended only for P as a temporary solution.
This reverts commit f0800fa3bd6d5279df3a183cc35ca5489112d73e.

Test: switch wallpapers, observe theme
Bug: 110758454
Change-Id: If10e4d87b6ddac10063b2671abd99e0baccdf92e

6 years agoRevert "Activate dark theme when the UiMode is UI_MODE_NIGHT_YES."
Lucas Dupin [Thu, 28 Jun 2018 20:23:48 +0000 (13:23 -0700)]
Revert "Activate dark theme when the UiMode is UI_MODE_NIGHT_YES."

This reverts commit a5c846c3fa74d680eddca6b994b7cf8449d301ef.
Test: switch wallpapers, observe theme
Bug: 110758454
Reason: Obsolete in Q. UiMode is the only flag that drives
        the dark ui.

Change-Id: Ie0307336b8c3896e3ecf934e073f51382c26364e

6 years agoMerge "Delay brightness change"
TreeHugger Robot [Wed, 4 Jul 2018 18:13:53 +0000 (18:13 +0000)]
Merge "Delay brightness change"

6 years agoTrack changes in libcore to remove a constructor
Neil Fuller [Tue, 3 Jul 2018 17:46:10 +0000 (18:46 +0100)]
Track changes in libcore to remove a constructor

Track changes in libcore to remove a constructor + lint
import order changes. Instead of the constructor a utility
method is introduced.

Test: Build / boot
Bug: 111055375
Change-Id: Id683a9d9d6e27d4c8df623dae189da9e74a6d410

6 years agoMerge "Don't flash system bars while showing an immersive app on lockscreen"
Tiger Huang [Wed, 4 Jul 2018 03:06:31 +0000 (03:06 +0000)]
Merge "Don't flash system bars while showing an immersive app on lockscreen"

6 years agoMerge "Allow UiAutomation to adopt the shell permission indentity"
TreeHugger Robot [Wed, 4 Jul 2018 03:00:14 +0000 (03:00 +0000)]
Merge "Allow UiAutomation to adopt the shell permission indentity"