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

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

Dan Willemsen [Fri, 20 Oct 2017 18:56:24 +0000 (18:56 +0000)]

Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours am: 3130b4e146 -s ours am: d857569fda -s ours
am: c2f710ed1f -s ours

Change-Id: I7d5ac6aff948f6ff8677e54d159eed17e0d2a9a5

commit | commitdiff | tree

Dan Willemsen [Fri, 20 Oct 2017 18:45:25 +0000 (18:45 +0000)]

Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours am: 3130b4e146 -s ours
am: d857569fda -s ours

Change-Id: Ide90033b38ba2d75a5fb08e3078310dda5fec9ac

commit | commitdiff | tree

Dan Willemsen [Fri, 20 Oct 2017 18:36:10 +0000 (18:36 +0000)]

Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours
am: 3130b4e146 -s ours

Change-Id: I8c22645a4148dcbc80f30b6d54ccd4926d4194c1

commit | commitdiff | tree

Dan Willemsen [Fri, 20 Oct 2017 18:27:58 +0000 (18:27 +0000)]

Merge "Add link_type for temp_layoutlib"
am: d0b0e8cc86 -s ours

Change-Id: Ic84faa1292e8e52abff9ce62e992e7d00b7cb5e2

commit | commitdiff | tree

Niranjan Pendharkar [Fri, 20 Oct 2017 18:26:29 +0000 (18:26 +0000)]

Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev am: 6575d483cc -s ours
am: 9c798025dd -s ours

Change-Id: Iac0d7d3c5d44f68d1b6de8bf45621bbd464c30da

commit | commitdiff | tree

Dan Willemsen [Fri, 20 Oct 2017 18:14:56 +0000 (18:14 +0000)]

Merge "Add link_type for temp_layoutlib"

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 18:08:36 +0000 (18:08 +0000)]

Merge "Update package name for ExtServices to whitelist permissions."

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 17:58:47 +0000 (17:58 +0000)]

Merge "AssetManager2: Improve Theme performance"

commit | commitdiff | tree

Niranjan Pendharkar [Fri, 20 Oct 2017 17:58:30 +0000 (17:58 +0000)]

Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev
am: 6575d483cc -s ours

Change-Id: I4988ab09ac45812352e8a9ef1738f1986427dc91

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 17:44:58 +0000 (17:44 +0000)]

Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 17:31:00 +0000 (17:31 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461 -s ours am: 33b0f435de -s ours am: eed665acfd -s ours"

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 17:28:39 +0000 (17:28 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461 -s ours am: 33b0f435de -s ours
am: eed665acfd -s ours

Change-Id: Icdfc1004381d27021fd9ff5d9f257b575143f07f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 17:26:22 +0000 (17:26 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5d9bd82bd8 -s ours am: 0c1a48ed2e -s ours am: 5993317cf8 -s ours"

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 17:24:52 +0000 (17:24 +0000)]

Merge "Always update the thumbnail layer"

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 17:23:49 +0000 (17:23 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5d9bd82bd8 -s ours am: 0c1a48ed2e -s ours
am: 5993317cf8 -s ours

Change-Id: I19cef82e30d7bf918e22fe69c1d2fc097d23c954

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 17:18:41 +0000 (17:18 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 65fb1c889a -s ours am: 0d729e292e -s ours am: fde55e1062 -s ours"

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 17:16:59 +0000 (17:16 +0000)]

Merge "FloatingToolbar updates"

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 17:15:18 +0000 (17:15 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 65fb1c889a -s ours am: 0d729e292e -s ours
am: fde55e1062 -s ours

Change-Id: I2eb710630bf4c1ddfc3258ee19dfe4652722d7d8

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 17:11:41 +0000 (17:11 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e948fe0769 -s ours am: f6136af68f -s ours
am: 1cee40b172 -s ours

Change-Id: Ie581bd19e8d8aea5a5e9a186b1962b38ff486723

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 17:03:11 +0000 (17:03 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461 -s ours
am: 33b0f435de -s ours

Change-Id: I9506048b61420c3bc9d353631b400200f5535e9a

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 17:01:11 +0000 (17:01 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b -s ours am: 4ad0db127e -s ours
am: 6689d34ffa -s ours

Change-Id: I04e3bfbfba63c7985928c398a2310ec650bd2d01

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:58:15 +0000 (16:58 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c0e7b25f08 -s ours am: 86141467a3 -s ours
am: 0594674ecb -s ours

Change-Id: I63e00487f82e36b20c01c66a8658109072842d40

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:51:53 +0000 (16:51 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5d9bd82bd8 -s ours
am: 0c1a48ed2e -s ours

Change-Id: I4833544baa45feb1525a4ea1260d2c0441a2c13d

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:50:06 +0000 (16:50 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fe4ca37b9 -s ours am: ef30f73d5a -s ours
am: 3898a06ae0 -s ours

Change-Id: I51326d21cb637693dd7da7ef2fc4db56d9144f06

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:48:28 +0000 (16:48 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 65fb1c889a -s ours
am: 0d729e292e -s ours

Change-Id: I1d6c54f9c2ab8035115103772702e4d177a8c3b4

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:44:48 +0000 (16:44 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e948fe0769 -s ours
am: f6136af68f -s ours

Change-Id: I990d05d007ffc2b9a42dcb760fa9d1ffd2ab3db2

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:43:15 +0000 (16:43 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1e829c7f7f -s ours am: ea0e76bc47 -s ours
am: 1265a3d896 -s ours

Change-Id: Id305e354d684c3b11fdb9c4c4f4b0dd2565b8be4

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:41:49 +0000 (16:41 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b -s ours
am: 4ad0db127e -s ours

Change-Id: I22bb3057e7e08bd94e05e028d22746be53698541

commit | commitdiff | tree

Felipe Leme [Fri, 20 Oct 2017 16:38:21 +0000 (16:38 +0000)]

Merge "New Autofill API: TYPE_CONTEXT_COMMITTED events."

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:37:50 +0000 (16:37 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c0e7b25f08 -s ours
am: 86141467a3 -s ours

Change-Id: I6eec541005b9717cb6b79b6eb3acc42ea86a7b65

commit | commitdiff | tree

Sunny Goyal [Fri, 20 Oct 2017 16:36:58 +0000 (16:36 +0000)]

Merge "Optimizing memory for RemoteViewsAdapter caches."

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:34:35 +0000 (16:34 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fe4ca37b9 -s ours
am: ef30f73d5a -s ours

Change-Id: Id60b39fadb55f2a8e38d5c803cb88df5e0def573

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:33:52 +0000 (16:33 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: beda9e81f4 -s ours am: f4c2ddf35f -s ours
am: ac54248825 -s ours

Change-Id: I95e3aad5042acba340a3abb2db6438bc84350fcb

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:29:47 +0000 (16:29 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: f9cf2df461 -s ours

Change-Id: I3a0085c58a6296891879dfa9e3db1a82633cd161

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:28:47 +0000 (16:28 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3f31cfa6cd -s ours am: 682e764e52 -s ours
am: e42a74b86b -s ours

Change-Id: Ibe5c5afa26dcadd1ddea9f8828916b2a812cb753

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:26:37 +0000 (16:26 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1e829c7f7f -s ours
am: ea0e76bc47 -s ours

Change-Id: I04efb209a566cd13e1e06f4e9cc9270a7b886cbc

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:25:39 +0000 (16:25 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 5d9bd82bd8 -s ours

Change-Id: Ic4735df4076debec8f0d9622d6bcf8658a9a0c54

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:24:41 +0000 (16:24 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 639ee5c778 -s ours am: a8c5964576 -s ours
am: 61632b84b6 -s ours

Change-Id: Ia891428b4b5b8c8269b793f85bf67f635f87579c

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:23:17 +0000 (16:23 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: beda9e81f4 -s ours
am: f4c2ddf35f -s ours

Change-Id: I4a31befc5708c063dfcee876db69476aa12157d2

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:22:27 +0000 (16:22 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 65fb1c889a -s ours

Change-Id: I9a432dd63e70c7a2d38784d99c521861f2193539

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:18:33 +0000 (16:18 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: e948fe0769 -s ours

Change-Id: I9b23ed7b98821c73269e1f17421e2321c03c3025

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:18:25 +0000 (16:18 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 422b17438b -s ours am: 49cc0fd2f8 -s ours
am: 5ac591340c -s ours

Change-Id: I2ccca27ed7794200d17ef939493e1042c09514d7

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:17:24 +0000 (16:17 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3f31cfa6cd -s ours
am: 682e764e52 -s ours

Change-Id: Id501722fe47efcfdad4e7af5810e27ba132aab2d

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:15:39 +0000 (16:15 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 6a83510d9b -s ours

Change-Id: Ie37ad318e3dedd1082a6acc63ef155fa604fb0cf

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:11:51 +0000 (16:11 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 639ee5c778 -s ours
am: a8c5964576 -s ours

Change-Id: Ia2ddb89614a8fadf9f91276f883fbd09f44b2066

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:10:57 +0000 (16:10 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c0e7b25f08 -s ours

Change-Id: I70e7bf0f6b2a8ebc372ed3f45fc7ef4ef274cd1c

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:05:43 +0000 (16:05 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 9fe4ca37b9 -s ours

Change-Id: I2f3c973b770186c297e612123ae5cd28997536ac

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 16:04:33 +0000 (16:04 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 422b17438b -s ours
am: 49cc0fd2f8 -s ours

Change-Id: If6132f679d6bd5aa37a1e4645c4494523babda6f

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 16:00:01 +0000 (16:00 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:58:55 +0000 (15:58 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5fdf106b8b -s ours am: b823588836 -s ours
am: e3f60e7f70 -s ours

Change-Id: Ib929a40568f54d28e710d8e71a5fd1f0c0da83ba

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:58:25 +0000 (15:58 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1e829c7f7f -s ours

Change-Id: I3d4c999516a0ae711703e68c48624e03128946e2

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:55:28 +0000 (15:55 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c035f28175 -s ours am: 770e4008b2 -s ours
am: ae6151ecef -s ours

Change-Id: Ie45ce84c781af3e97cc80df0ff81365eb34470a1

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:55:23 +0000 (15:55 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: beda9e81f4 -s ours

Change-Id: I93c24453b6a5820754d048b671ce22cc304fce9b

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:52:08 +0000 (15:52 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 3f31cfa6cd -s ours

Change-Id: I8022a841defd381d9b67088271d088ad559d24e1

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:50:09 +0000 (15:50 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5fdf106b8b -s ours
am: b823588836 -s ours

Change-Id: Ifa87ae57ef423c5ff56e2c59a28ff9fecee549c8

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:48:36 +0000 (15:48 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 639ee5c778 -s ours

Change-Id: Ic0ebba84ca5dfedd88b08c334de5e31de5cedc20

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:46:36 +0000 (15:46 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c035f28175 -s ours
am: 770e4008b2 -s ours

Change-Id: I65c915a26923287d6097a374d48f7d34a892f992

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:45:40 +0000 (15:45 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 422b17438b -s ours

Change-Id: Icdd126fb90cdce54c2bf44e1ef924c8ea19951f0

commit | commitdiff | tree

Ben Schwartz [Fri, 20 Oct 2017 15:45:24 +0000 (15:45 +0000)]

Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b am: 3017ebec8c am: b84582fc96
am: 7e7c472d9a

Change-Id: I0c066afaa0d6d776cac08cbc7bd97dbf5b29a8be

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:40:21 +0000 (15:40 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 5fdf106b8b -s ours

Change-Id: I6da8e75d0ac5544d6524f8a180bc302896f5a93f

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:39:37 +0000 (15:39 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:37:34 +0000 (15:37 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:36:20 +0000 (15:36 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:35:38 +0000 (15:35 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 15:35:36 +0000 (15:35 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c035f28175 -s ours

Change-Id: Id153ec0566031b928d5087c04b03616141ab0568

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:34:59 +0000 (15:34 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:33:25 +0000 (15:33 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Ben Schwartz [Fri, 20 Oct 2017 15:33:17 +0000 (15:33 +0000)]

Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b am: 3017ebec8c
am: b84582fc96

Change-Id: Ia64a8318ad2f57aa3dc58a13d20274b877649fef

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:32:39 +0000 (15:32 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:31:30 +0000 (15:31 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:31:01 +0000 (15:31 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:29:19 +0000 (15:29 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:28:04 +0000 (15:28 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:27:19 +0000 (15:27 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 15:23:26 +0000 (15:23 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Nick Kralevich [Fri, 20 Oct 2017 15:20:34 +0000 (15:20 +0000)]

Merge "more O_CLOEXEC" am: 9f8ed6500a am: 7c27266544 am: db61fce852
am: b8ba9d0236

Change-Id: Idc4c10296fd8887016326bb45764a5ab5feb07a5

commit | commitdiff | tree

Ben Schwartz [Fri, 20 Oct 2017 15:18:38 +0000 (15:18 +0000)]

Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b
am: 3017ebec8c

Change-Id: I94c2f2011bbe29e3d8a39904d19d2b5c606ae0be

commit | commitdiff | tree

Nick Kralevich [Fri, 20 Oct 2017 15:11:42 +0000 (15:11 +0000)]

Merge "more O_CLOEXEC" am: 9f8ed6500a am: 7c27266544
am: db61fce852

Change-Id: I9b53dd6984a3ae3e89b8279551367ac97e8ed7fa

commit | commitdiff | tree

Ben Schwartz [Fri, 20 Oct 2017 15:08:55 +0000 (15:08 +0000)]

Merge "Add a global setting to disable DNS over TLS"
am: 4a906c167b

Change-Id: Ie0f5586342b32c9e7c745ab9697b44158a920233

commit | commitdiff | tree

Nick Kralevich [Fri, 20 Oct 2017 15:02:21 +0000 (15:02 +0000)]

Merge "more O_CLOEXEC" am: 9f8ed6500a
am: 7c27266544

Change-Id: I1b2c3f06bf02e2170f3ffa70d10d37d45da1a0c4

commit | commitdiff | tree

Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]

Merge "Add a global setting to disable DNS over TLS"

commit | commitdiff | tree

Nick Kralevich [Fri, 20 Oct 2017 14:53:14 +0000 (14:53 +0000)]

Merge "more O_CLOEXEC"
am: 9f8ed6500a

Change-Id: I7d07ad29cddeac5f44cc5a918e33b0a9068d29c0

commit | commitdiff | tree

Treehugger Robot [Fri, 20 Oct 2017 14:44:26 +0000 (14:44 +0000)]

Merge "more O_CLOEXEC"

commit | commitdiff | tree

Niranjan Pendharkar [Wed, 18 Oct 2017 23:58:25 +0000 (16:58 -0700)]

Fix netlink group mismatch in fds used for offload

Existing groups used for binding to netlink conntrack events don't
seem to work as expected. Fix this by using exact groups defined
in IOffloadConfig hal.

Test: as follows
      - Compiles and boots on walleye
      - Validated conntrack destroy events are received as expected.
      - Validated offload works as expected.

Bug:68018148
CRs-fixed:2126789

Merged-In: I2dcebec1c08bb7b067621331533d8a65dd7b5083
Merged-In: I96d6d5601aff009879f452975be91b6e7e40bb57
Change-Id: I76178fd7f109b82a4e4961347b8949937813d71d
(cherry picked from commit f10282b830af4c7ea56b2c64e73a7ffd3c006007)

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 09:23:10 +0000 (02:23 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I54b9c45224a393b5724a8964858817e3247ece54

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 09:06:39 +0000 (02:06 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I1786cdac7dae8737ba1f7ea7665a62dfcfc2d7f2

commit | commitdiff | tree

Niranjan Pendharkar [Fri, 20 Oct 2017 08:53:29 +0000 (08:53 +0000)]

Merge "Fix netlink group mismatch in fds used for offload" am: fb7c0e8c91 am: 6d36b2657f am: 9c2576fa9b
am: 5e917d7d79

Change-Id: I96d6d5601aff009879f452975be91b6e7e40bb57

commit | commitdiff | tree

Niranjan Pendharkar [Fri, 20 Oct 2017 08:44:05 +0000 (08:44 +0000)]

Merge "Fix netlink group mismatch in fds used for offload" am: fb7c0e8c91 am: 6d36b2657f
am: 9c2576fa9b

Change-Id: I2dcebec1c08bb7b067621331533d8a65dd7b5083

commit | commitdiff | tree

Niranjan Pendharkar [Fri, 20 Oct 2017 08:35:10 +0000 (08:35 +0000)]

Merge "Fix netlink group mismatch in fds used for offload" am: fb7c0e8c91
am: 6d36b2657f

Change-Id: I44aef861bdc3e3454127fefd024c84eb44d7301b

commit | commitdiff | tree

Niranjan Pendharkar [Fri, 20 Oct 2017 08:25:19 +0000 (08:25 +0000)]

Merge "Fix netlink group mismatch in fds used for offload"
am: fb7c0e8c91

Change-Id: Iaca85d6b06dfc642ffce7c53bb87cd25dabe04c9

commit | commitdiff | tree

Treehugger Robot [Fri, 20 Oct 2017 08:14:40 +0000 (08:14 +0000)]

Merge "Fix netlink group mismatch in fds used for offload"

commit | commitdiff | tree

Pengquan Meng [Fri, 20 Oct 2017 06:23:33 +0000 (06:23 +0000)]

Merge "[framework] Fixed signal strength issue" am: 6d98743048 am: c671962c9a am: af9207272a
am: 00c9323828

Change-Id: I0e0dcfe8c5cf366a27d64d460328b99be184fcc5

commit | commitdiff | tree

Pengquan Meng [Fri, 20 Oct 2017 06:13:15 +0000 (06:13 +0000)]

Merge "[framework] Fixed signal strength issue" am: 6d98743048 am: c671962c9a
am: af9207272a

Change-Id: I86d83b0b51a5a9b73ddd181f4962ac1b9647bb1c

commit | commitdiff | tree

Pengquan Meng [Fri, 20 Oct 2017 06:03:11 +0000 (06:03 +0000)]

Merge "[framework] Fixed signal strength issue" am: 6d98743048
am: c671962c9a

Change-Id: I3065d74ca69f49b97dd64d015d65260671ecf158

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 05:58:04 +0000 (22:58 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I92ebc3587a83fcb69588e4629eac2d8a779c2ebd

commit | commitdiff | tree

Pengquan Meng [Fri, 20 Oct 2017 05:52:43 +0000 (05:52 +0000)]

Merge "[framework] Fixed signal strength issue"
am: 6d98743048

Change-Id: I5d6ff6f0419b658ee9786567087b95ced5e70233

commit | commitdiff | tree

Dan Willemsen [Fri, 20 Oct 2017 05:48:53 +0000 (22:48 -0700)]

Add link_type for temp_layoutlib

So that it can be used by java libraries when we turn on dep
verification for host java libraries.

Test: m nothing
Change-Id: Iaa2acfb585db0a67b449e866883f71691395971e
Merged-In: I69a1a826d0bac8ede1f9a337c9c1d930bbcd04f3

commit | commitdiff | tree

Bill Yi [Fri, 20 Oct 2017 05:50:47 +0000 (22:50 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Ie775264bf5f54adb9239d9a66821164c8db38136

commit | commitdiff | tree

Pengquan Meng [Fri, 20 Oct 2017 05:44:42 +0000 (05:44 +0000)]

Merge "[framework] Fixed signal strength issue"

commit | commitdiff | tree

Niranjan Pendharkar [Wed, 18 Oct 2017 23:58:25 +0000 (16:58 -0700)]

Fix netlink group mismatch in fds used for offload

Existing groups used for binding to netlink conntrack events don't
seem to work as expected. Fix this by using exact groups defined
in IOffloadConfig hal.

Test: as follows
      - Compiles and boots on walleye
      - Validated conntrack destroy events are received as expected.
      - Validated offload works as expected.

Bug:68018148
CRs-fixed:2126789

Change-Id: I76178fd7f109b82a4e4961347b8949937813d71d

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help