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

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Neil Fuller [Thu, 5 Jul 2018 12:24:39 +0000 (05:24 -0700)]

Merge "Remove unusual static method call"
am: cbe9c295a3

Change-Id: I3ae602232226ef3a1e482dd5a34e1025118c30b7

commit | commitdiff | tree

Erik Kline [Thu, 5 Jul 2018 12:20:25 +0000 (05:20 -0700)]

Merge "Always close file descriptors"
am: 26025a06ec

Change-Id: Ib1d8f74832b8b649dc83de39f8f16651a9924e69

commit | commitdiff | tree

Neil Fuller [Thu, 5 Jul 2018 12:14:26 +0000 (05:14 -0700)]

Merge "Track constructor changes in libcore/"
am: f94eb29500

Change-Id: I344d9210bd173f78651318366c852f65afe969d6

commit | commitdiff | tree

Treehugger Robot [Thu, 5 Jul 2018 11:12:35 +0000 (11:12 +0000)]

Merge "Remove unusual static method call"

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 5 Jul 2018 09:07:21 +0000 (09:07 +0000)]

Merge "Always close file descriptors"

commit | commitdiff | tree

Neil Fuller [Thu, 5 Jul 2018 08:57:13 +0000 (08:57 +0000)]

Merge "Track constructor changes in libcore/"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 4 Jul 2018 22:45:16 +0000 (22:45 +0000)]

Merge "Fix the logic to get tv_pip_settings_class_name"

commit | commitdiff | tree

Lucas Dupin [Wed, 4 Jul 2018 02:45:44 +0000 (19:45 -0700)]

Merge "DO NOT MERGE: Delay brightness change" into pi-dev
am: 0937d1807b

Change-Id: Ib280983ca722add1f89f7a640a4f19c761239de9

commit | commitdiff | tree

TreeHugger Robot [Wed, 4 Jul 2018 02:34:42 +0000 (02:34 +0000)]

Merge "DO NOT MERGE: Delay brightness change" into pi-dev

commit | commitdiff | tree

Lucas Dupin [Mon, 2 Jul 2018 18:17:14 +0000 (11:17 -0700)]

DO NOT MERGE: Delay brightness change

During a fingerprint wake-up, the display state changes bumping up
the display brightness. This means that the screen will flash
bright if the scrims couldn't draw and blank the screen yet.

The fix updates the state of the keyguard, waits for the frame to be
pushed to the display (can take up to 2 frames since we're using
triple buffers), when then asks PowerManager to wake-up the device.

Fixes: 80415238
Test: fp unlock with AOD on and off on devices with displays from
multiple vendors
Change-Id: I60f0e265c4af87cc1cb4fcf31e89558a330a4b71
Merged-In: I752f9bd5ffd754166ffee7dc15960909dd3f1a81

commit | commitdiff | tree

Tyler Gunn [Tue, 3 Jul 2018 23:36:52 +0000 (16:36 -0700)]

Merge "ImsMultiEndPoint - Sip Notify Change" am: bc103bdf18
am: 4a319c85bd

Change-Id: I6516ead9bfb3aa6b7c2d460fdab8de076cd07876

commit | commitdiff | tree

Tyler Gunn [Tue, 3 Jul 2018 23:27:56 +0000 (16:27 -0700)]

Merge "ImsMultiEndPoint - Sip Notify Change"
am: bc103bdf18

Change-Id: I2dbc17af8694cdb92e189202e0786fc39573b0d1

commit | commitdiff | tree

Tor Norbye [Tue, 3 Jul 2018 23:25:22 +0000 (16:25 -0700)]

[automerger skipped] Merge "Include annotations in metalava stubs" into pi-dev
am: 9654ecebd7 -s ours

Change-Id: I7513067846f13da2189a46f270a3a4ca0dbe0504

commit | commitdiff | tree

Tor Norbye [Tue, 3 Jul 2018 23:11:25 +0000 (23:11 +0000)]

Merge "Include annotations in metalava stubs" into pi-dev

commit | commitdiff | tree

Tyler Gunn [Tue, 3 Jul 2018 22:15:21 +0000 (22:15 +0000)]

Merge "ImsMultiEndPoint - Sip Notify Change"

commit | commitdiff | tree

Sumit Das [Sat, 30 Jun 2018 00:12:01 +0000 (17:12 -0700)]

ImsMultiEndPoint - Sip Notify Change

-Added log message, getter method and set/read from parcel

Change-Id: I832bd2cf51382bb0919ab0ea1b5c7fcba8b2b136

commit | commitdiff | tree

Lei Yu [Tue, 3 Jul 2018 20:41:34 +0000 (13:41 -0700)]

Merge "Add active admin app to power white list." into pi-dev
am: a14e1b3950

Change-Id: I06229f8ee9fb72d579773c566f93ba447d18f4e5

commit | commitdiff | tree

TreeHugger Robot [Tue, 3 Jul 2018 20:24:58 +0000 (20:24 +0000)]

Merge "Add active admin app to power white list." into pi-dev

commit | commitdiff | tree

Neil Fuller [Tue, 3 Jul 2018 20:17:31 +0000 (13:17 -0700)]

Merge "Make Half class use public APIs" am: 7e957e57b7
am: 04c66489bc

Change-Id: I35fa0a22465885a47612601d541afb366b5953ec

commit | commitdiff | tree

Neil Fuller [Tue, 3 Jul 2018 20:08:26 +0000 (13:08 -0700)]

Merge "Make Half class use public APIs"
am: 7e957e57b7

Change-Id: I7f41f07ed5d35a0c538c90b49b4500ba9952f74d

commit | commitdiff | tree

Lucas Dupin [Tue, 3 Jul 2018 19:20:31 +0000 (12:20 -0700)]

Merge "Cross fade wake-up from pulsing" into pi-dev
am: 42e713d7a3

Change-Id: Ieb0607ff1abf36ca56565b49aeb2f565a115bc55

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 3 Jul 2018 19:11:10 +0000 (12:11 -0700)]

Merge "AudioService: history of A2DP commands" into pi-dev
am: cd64600ba8

Change-Id: Ibc294825a942fd0f4b5fbe6c09eafac43ed2cccc

commit | commitdiff | tree

Minchan Kim [Tue, 3 Jul 2018 19:05:38 +0000 (12:05 -0700)]

Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev
am: fb11e4c9b1

Change-Id: Icc9d0bb40515a87ddb0c8c0b28d0715a3f6bb0fe

commit | commitdiff | tree

Eran Messeri [Tue, 3 Jul 2018 18:59:13 +0000 (11:59 -0700)]

Merge "Correctly preserve key generation parameters" into pi-dev
am: 6f7cfb0627

Change-Id: Id7fb68a441e873f7ae844bfc87f7f60798ecd57c

commit | commitdiff | tree

Lucas Dupin [Tue, 3 Jul 2018 18:52:23 +0000 (18:52 +0000)]

Merge "Cross fade wake-up from pulsing" into pi-dev

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 3 Jul 2018 18:49:33 +0000 (18:49 +0000)]

Merge "AudioService: history of A2DP commands" into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 3 Jul 2018 18:39:18 +0000 (18:39 +0000)]

Merge "Add system_server to system group only if per_app_memcg is true" into pi-dev

commit | commitdiff | tree

Neil Fuller [Tue, 3 Jul 2018 18:32:27 +0000 (18:32 +0000)]

Merge "Make Half class use public APIs"

commit | commitdiff | tree

TreeHugger Robot [Tue, 3 Jul 2018 18:31:06 +0000 (18:31 +0000)]

Merge "Correctly preserve key generation parameters" into pi-dev

commit | commitdiff | tree

Neil Fuller [Tue, 3 Jul 2018 18:22:45 +0000 (19:22 +0100)]

Track constructor changes in libcore/

The 2-arg constructor is being removed.

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

commit | commitdiff | tree

Erik Kline [Tue, 3 Jul 2018 10:19:32 +0000 (03:19 -0700)]

Merge "Push DNS configuration on network validation" am: ef941e192a
am: e3f76635f7

Change-Id: Ic2046e053faf58e2edf2824e01145c61a9f2991f

commit | commitdiff | tree

Erik Kline [Tue, 3 Jul 2018 10:09:16 +0000 (03:09 -0700)]

Merge "Push DNS configuration on network validation"
am: ef941e192a

Change-Id: I5907831e5f5f1f3659580cc56e2e081cbe88b1cc

commit | commitdiff | tree

Treehugger Robot [Tue, 3 Jul 2018 09:03:35 +0000 (09:03 +0000)]

Merge "Push DNS configuration on network validation"

commit | commitdiff | tree

Jack Yu [Tue, 3 Jul 2018 08:21:06 +0000 (01:21 -0700)]

[automerger skipped] Merge "Reordered the params for network registration" am: 38f7576297 -s ours
am: d111501e8c

Change-Id: I86db28ba40fbb73fe0b50f8e751740767d22300f

commit | commitdiff | tree

Jack Yu [Tue, 3 Jul 2018 08:12:03 +0000 (01:12 -0700)]

[automerger skipped] Merge "Reordered the params for network registration"
am: 38f7576297 -s ours

Change-Id: Ibbe9027176ff14eae912c794fb0724cdc32f4926

commit | commitdiff | tree

Erik Kline [Tue, 26 Jun 2018 09:53:43 +0000 (18:53 +0900)]

Push DNS configuration on network validation

Test: as follows
    - built, flashed, booted
    - runtest frameworks-net passes
    - connected to captive portal network,
      saw failed validation attempt (opportunistic),
      passed portal, saw successful revalidation attempt
Bug: 64133961
Bug: 72344805
Bug: 109928338

Change-Id: I0471685c2234af8a8c7f5b2ad3205eb6e36333c5

commit | commitdiff | tree

Carmen Jackson [Tue, 3 Jul 2018 01:52:46 +0000 (18:52 -0700)]

Merge "Add in-app tracepoints to TouchLatency app." am: 674fd12278
am: b6d12b8bb1

Change-Id: I719439a6323ef38f2f39cd578cc4700b9e70850c

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 2 Jul 2018 17:48:04 +0000 (10:48 -0700)]

AudioService: history of A2DP commands

Keep history of command coming from A2dpService in AudioService
logger.

Bug: 110186160
Test: connect/disconnect A2DP device and take bugreport,
or run $ adb shell dumpsys audio

Change-Id: Ice65c20e91aa2675fbacb1c326a53d5b02bba3e5

commit | commitdiff | tree

Lei Yu [Thu, 28 Jun 2018 21:06:29 +0000 (14:06 -0700)]

Add active admin app to power white list.

So user can't restrict it in settings app.

Bug: 110337989
Test: RunSettingsLibTests
Change-Id: Ie32dc8b2204369c9ca8f704436d5c988f76481ae
Merged-In: Ie32dc8b2204369c9ca8f704436d5c988f76481ae

commit | commitdiff | tree

Carmen Jackson [Tue, 3 Jul 2018 00:57:29 +0000 (17:57 -0700)]

Merge "Add in-app tracepoints to TouchLatency app."
am: 674fd12278

Change-Id: I69a89ba6fac90a454a1d8befe9317af25979ccbf

commit | commitdiff | tree

SongFerngWang [Tue, 3 Jul 2018 00:12:49 +0000 (17:12 -0700)]

Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
am: 9ccabdbc45

Change-Id: I7517b64e87b43acff501afc858c8fad433d0ecfc

commit | commitdiff | tree

TreeHugger Robot [Tue, 3 Jul 2018 00:01:52 +0000 (00:01 +0000)]

Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev

commit | commitdiff | tree

Treehugger Robot [Mon, 2 Jul 2018 23:56:11 +0000 (23:56 +0000)]

Merge "Reordered the params for network registration"

commit | commitdiff | tree

Treehugger Robot [Mon, 2 Jul 2018 23:39:21 +0000 (23:39 +0000)]

Merge "Add in-app tracepoints to TouchLatency app."

commit | commitdiff | tree

Nathan Harold [Mon, 2 Jul 2018 23:17:52 +0000 (16:17 -0700)]

Merge "Update Docstrings for CellSignalStrengthLte" am: 5e8a5d4b79
am: 0571b04c3a

Change-Id: I52a3de4f89b3a59cb4f33263cb5838d37fb0a7fb

commit | commitdiff | tree

Nathan Harold [Mon, 2 Jul 2018 23:07:37 +0000 (16:07 -0700)]

Merge "Update Docstrings for CellSignalStrengthLte"
am: 5e8a5d4b79

Change-Id: Id41fb2ccdeaf43fcc62193c78c93f4ca765d2fa2

commit | commitdiff | tree

Jorim Jaggi [Mon, 2 Jul 2018 21:47:09 +0000 (14:47 -0700)]

Merge "Only use simple rects for cutout region" into pi-dev
am: 4764921dcc

Change-Id: Icfb41008189d5c01f90afd4992428433043b4c4e

commit | commitdiff | tree

Carmen Jackson [Thu, 28 Jun 2018 22:15:44 +0000 (15:15 -0700)]

Add in-app tracepoints to TouchLatency app.

Test: Traced the TouchLatency app and saw the added tracepoints.
Change-Id: I72ab8f88731e635f98831f045dddd086a05acc3b

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help