)]}' { "log": [ { "commit": "d596928a68a9d195ae02fd70087b04919c9d075e", "tree": "3584ad784921be2176b346cbf000ec1781aa39a0", "parents": [ "b2067cf8e9c9cdc08d159ee222d0e209a977d354" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Tue Jan 07 16:23:18 2020 -0800" }, "committer": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Wed Jan 08 19:36:15 2020 +0000" }, "message": "SurfaceFlinger: migrate capabilities to surfaceflinger.rc\n\nSurfaceFlinger requires CAP_SYS_NICE which is set in\nlibcutils/fs_config.cpp. This is the old way of setting capabilities\nand new the way is to set it directly on surfaceflnger.rc\n\nTest: adb shell /data/nativetest64/SurfaceFlinger_test/SurfaceFlinger_test\nTest: adb shell stop surfaceflinger \u0026\u0026 adb shell start surfaceflinger\nBug: 147271477\nChange-Id: I680509a385928a9c929d4fe4857118af219e2b13\n" }, { "commit": "4d15954900fc71eb2672c8e68309e1d081c7d448", "tree": "51e5c4c453e4b713c876e71a83fbd4636ebebfb2", "parents": [ "53a1d3b0f0ea963a9113f68f4683479576ef4924", "945fa5c957ebcd5461abee409fc5c1a6f6de6e42" ], "author": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Sun Nov 24 17:08:12 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Nov 24 17:08:12 2019 -0800" }, "message": "Merge \"Update SurfaceFlingerProperties scope\"\nam: 945fa5c957\n\nChange-Id: I5223ee4a53b15abe13d62c6020bde4f275015e9c\n" }, { "commit": "45e529320d1cfae5157adf45a4860c825723841e", "tree": "bda16e793dd0f0e3da3d950ba38fa830c3d7e35c", "parents": [ "f4dca6bc7c6e51046135bd70fceea795296d6c20" ], "author": { "name": "Luca Stefani", "email": "luca.stefani.ge1@gmail.com", "time": "Sat Nov 16 14:58:17 2019 +0100" }, "committer": { "name": "Luca Stefani", "email": "luca.stefani.ge1@gmail.com", "time": "Sat Nov 16 14:58:17 2019 +0100" }, "message": "Update SurfaceFlingerProperties scope\n\nSystem scope is deprecated\n\nTest: manual, no build warnings\nChange-Id: I2db77a7cea19b5d9e9393bc5709b60608d696023\n" }, { "commit": "fbbbd1b3a7999629c4727fff6496a65e81928549", "tree": "a795c3341193d388ed9b4a04b93b231940b47ca1", "parents": [ "921a39fececc48e6b91b5afe498223c02553e25f", "f4dca6bc7c6e51046135bd70fceea795296d6c20" ], "author": { "name": "Josh Gao", "email": "jmgao@google.com", "time": "Fri Nov 15 14:25:34 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Nov 15 14:25:34 2019 -0800" }, "message": "Merge \"surfaceflinger: initialize ActiveConfigInfo fields.\"\nam: f4dca6bc7c\n\nChange-Id: Ibe6a054af026d5a4f0ec79538a7e7e28c9ce0499\n" }, { "commit": "f4dca6bc7c6e51046135bd70fceea795296d6c20", "tree": "47e3a959c6fe795387c79499ed8f94005a097e94", "parents": [ "0d83872951243cc6f3dcd3c65f33b23a1f2c8374", "a052071b719c5fe933892dcc96e8fc1cbe791269" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Nov 15 22:05:28 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Nov 15 22:05:28 2019 +0000" }, "message": "Merge \"surfaceflinger: initialize ActiveConfigInfo fields.\"" }, { "commit": "a052071b719c5fe933892dcc96e8fc1cbe791269", "tree": "bd9beda1a7a2f03e9669c1e6e4454b9a3ebcfb05", "parents": [ "19143968d70f10f72327d0eca4152758268dcdad" ], "author": { "name": "Josh Gao", "email": "jmgao@google.com", "time": "Thu Nov 14 15:38:04 2019 -0800" }, "committer": { "name": "Josh Gao", "email": "jmgao@google.com", "time": "Thu Nov 14 18:37:55 2019 -0800" }, "message": "surfaceflinger: initialize ActiveConfigInfo fields.\n\nPreviously, the two ActiveConfigInfo fields in SurfaceFlinger are\nuninitialized upon construction, and when run with debugging code that\nslows down open, we reliably hit a case where setRefreshRateType is\ncalled on an uninitialized RefreshRateType, leading to explosion.\n\nTest: booted with libfdtrack\nChange-Id: I14520775f8660fee6545d8a354a04ed3674a1597\n" }, { "commit": "9d2bdf25354e7dda4185f48afa01b289b48b59d8", "tree": "9a96eed3bc604441d61ffc1e8d4d0e455993ae44", "parents": [ "baf843bde5f39ec884956fb5cc51bb474f567714", "104972e936878217d011a974c0e4a90280531a2d" ], "author": { "name": "Jorim Jaggi", "email": "jjaggi@google.com", "time": "Wed Nov 13 04:09:18 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 13 04:09:18 2019 -0800" }, "message": "Merge \"[DO NOT MERGE] Log Winscope tracing with the frame composition time\"\nam: 104972e936\n\nChange-Id: I2f80936a8daffacf73363b6d338f27a16f30a3de\n" }, { "commit": "c4def15ae32be3949d3cf40a4314c165c6be76f5", "tree": "5d88f0044daff1d44b2dca96308d7613881c69cd", "parents": [ "7618ed32d33610761b14083866d34eaa4540fd9b" ], "author": { "name": "Nataniel Borges", "email": "natanieljr@google.com", "time": "Thu Sep 26 15:20:00 2019 +0200" }, "committer": { "name": "Nataniel Borges", "email": "natanieljr@google.com", "time": "Tue Nov 12 16:01:19 2019 +0100" }, "message": "[DO NOT MERGE] Log Winscope tracing with the frame composition time\n\nCurrently the tracing log takes the current timestamp for the log entry.\nHowever, the tracing start after the frame is composed. On winscope\nthis result in the trace entry being linked to the incorrect video\nframe (screenrecord). Now we obtain the frame composition time (before\nthe frame is send to the video recorder) and use this time for the log\nentry.\n\nTest: Log a SF trace and screen recording. Open both on winscope.\nChange-Id: I81a88ef7a81a084f2ecf75bf5574a1118301a48e\n" }, { "commit": "3206a42d841e51b39cc640711a2f3944d75b12f2", "tree": "eef6316175157e38a2fce4754e3a15878053c4ae", "parents": [ "6c437f1058c32be62197e3f582551a8c6555030a", "19143968d70f10f72327d0eca4152758268dcdad" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Wed Nov 06 10:21:50 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 06 10:21:50 2019 -0800" }, "message": "Merge \"SurfaceFlinger: prevent division by 0 in Layer::fillInputInfo\"\nam: 19143968d7\n\nChange-Id: I2744f279869623fe3c9d77972853179f13993fb5\n" }, { "commit": "6c437f1058c32be62197e3f582551a8c6555030a", "tree": "6f44d4dd40445a3515e0f15100ba6d21e91f2bee", "parents": [ "6d108dd5f96a72d8a62d9c4116cc908f7a2324bd", "bfe7d2873a397557a19fb5495127e25084316e24" ], "author": { "name": "Nick Desaulniers", "email": "ndesaulniers@google.com", "time": "Wed Nov 06 10:21:24 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 06 10:21:24 2019 -0800" }, "message": "Merge \"Revert \"SurfaceFlinger: debug layer bounds inset\"\"\nam: bfe7d2873a\n\nChange-Id: I2dfe076a5dcb0df4b2511a834414bd380b25ab5c\n" }, { "commit": "5b47bbc7da3ee6f50e75eaf443176ff1bc4384d6", "tree": "2aae7c31b0d55a5386a5248f42b36a3e3922986c", "parents": [ "968fc9aa0577dd7cd97cd3416803d2eba4ae021f" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Wed Jul 24 18:05:56 2019 -0700" }, "committer": { "name": "Nick Desaulniers", "email": "ndesaulniers@google.com", "time": "Tue Nov 05 15:50:19 2019 -0800" }, "message": "SurfaceFlinger: prevent division by 0 in Layer::fillInputInfo\n\nCheck if scale is 0 before trying to apply it on the window scale.\n\nBug: 137560795\nBug: 139945549\nTest: Set Window Scale Animation to off from developer options menu\nChange-Id: Id372d75de5787f62a9cce7c22699216e135bd0f6\nMerged-in: I7ae84e2838b1562ff62cdd94484bedba954e1f33\nSigned-off-by: Nick Desaulniers \u003cndesaulniers@google.com\u003e\n" }, { "commit": "968fc9aa0577dd7cd97cd3416803d2eba4ae021f", "tree": "78ec8af4d1e6726381f482e2771782684a91f5d2", "parents": [ "d7ed6b5f34ac9b30be6aff15694e1365d50e6f0a" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Wed Jul 24 18:09:29 2019 -0700" }, "committer": { "name": "Nick Desaulniers", "email": "ndesaulniers@google.com", "time": "Tue Nov 05 15:50:03 2019 -0800" }, "message": "Revert \"SurfaceFlinger: debug layer bounds inset\"\n\nRevert the debug patch as layer seems to ve valid.\nInstead validate the input to avoid an overflow.\n\nBug: 137560795\nBug: 139945549\nTest: boot\n\nThis reverts commit 38172ad8cf4a3dc3ee801cb295de891050993438.\nMerged-in: Ia1687bca84361dc8f665b9c0f893b8f40c5362e1\nChange-Id: I07905d1e69b8c0a7dd23e620252fc7c133ed666e\nSigned-off-by: Nick Desaulniers \u003cndesaulniers@google.com\u003e\n" }, { "commit": "63b283ef4878d0f1fd70ed74905d5602371b2f81", "tree": "c69ae3fdc6a293b57cc4c8048bc522a086e6995e", "parents": [ "32182bdb750fbff9a4068fda75889693eb4a0b82", "07ebc757902d9ef1f11c6615c36f4093f409f6bb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:49:17 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:49:17 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\n\nBug: 142003500\nChange-Id: Ib12000b6a4897169d6035cb6f41c225014524e6f\n" }, { "commit": "efad7639c003cc9dc6fce992402eacff5559c510", "tree": "ada6643022bca72677e5c55c34c6dbe5907ea631", "parents": [ "1f39e870d250cd91ba960058438ea6bdf94d1412", "8ba0cadc7de8f7c65d58eac5878ca0a18d363c96" ], "author": { "name": "Yiwei Zhang", "email": "zzyiwei@google.com", "time": "Mon Oct 21 15:50:26 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 21 15:50:26 2019 -0700" }, "message": "Merge \"Update the OWNERS file for TimeStats\"\nam: 8ba0cadc7d\n\nChange-Id: Iad9cdbd9a44e045eecbba3d9c74f769466e7a705\n" }, { "commit": "8ba0cadc7de8f7c65d58eac5878ca0a18d363c96", "tree": "293da65ffcfafb6b62bfdf58af2c594e4b32ed6e", "parents": [ "f6dd948369a04f40be0f7acb278fa7d1730ee80c", "a5a8bbd1ab6462951bcc3688995cc1ca4872dc4d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 21 22:20:03 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 21 22:20:03 2019 +0000" }, "message": "Merge \"Update the OWNERS file for TimeStats\"" }, { "commit": "a5a8bbd1ab6462951bcc3688995cc1ca4872dc4d", "tree": "33bcf3a0df835cb987b33934cc623942c7c0b2a4", "parents": [ "95e8de25761a8c5f5bdf7054dfdf0df38d483d65" ], "author": { "name": "Yiwei Zhang", "email": "zzyiwei@google.com", "time": "Mon Oct 21 13:53:24 2019 -0700" }, "committer": { "name": "Yiwei Zhang", "email": "zzyiwei@google.com", "time": "Mon Oct 21 13:53:24 2019 -0700" }, "message": "Update the OWNERS file for TimeStats\n\nBug: 140266250\nTest: build\nChange-Id: I9129634d362ca9168feeb8afb277fc05c7210649\n" }, { "commit": "eb013d0f82d5017e3e7ded97f4f5aeaf5ac98470", "tree": "247a17814c87389efcb8f128a93310649e128e0c", "parents": [ "87a62c74712069211a7122c9db15c775fc2fa620", "c932e4472f235e69e569862b8a34ebb713cb6822" ], "author": { "name": "Nick Desaulniers", "email": "ndesaulniers@google.com", "time": "Wed Oct 16 21:19:23 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 16 21:19:23 2019 -0700" }, "message": "Merge \"[inputflinger] fix -Wreorder-init-list\"\nam: c932e4472f\n\nChange-Id: I0b4ff44b05079ad33c61b42225e08f88853d4229\n" }, { "commit": "21834485e33408ec08bdfd2a1f622fa273d36a4b", "tree": "be040186ea797d519f3603119dbd853cfe997f6c", "parents": [ "1ed80f45a6622256906b29c8e0468d1ece527ee8" ], "author": { "name": "Nick Desaulniers", "email": "ndesaulniers@google.com", "time": "Tue Oct 15 19:09:46 2019 -0700" }, "committer": { "name": "Nick Desaulniers", "email": "ndesaulniers@google.com", "time": "Tue Oct 15 19:09:46 2019 -0700" }, "message": "[inputflinger] fix -Wreorder-init-list\n\nC++20 is stricter about member ordering in designated initializers than\nC99.\n\nBug: 139945549\nTest: mm\nChange-Id: I2eda816418d1accac614cbfba07bac511c5d622c\nSigned-off-by: Nick Desaulniers \u003cndesaulniers@google.com\u003e\n" }, { "commit": "c6efd3d7ccacdad2fa7b0c18e09dc04bd579c263", "tree": "742fc103de682a2fe606818a9156978832dab5ba", "parents": [ "a82dbe9d1791af06421bb6bd5a3349e8feec2a04", "048084804b76d2c9f66af301f9ac902f1d369da2" ], "author": { "name": "Yiwei Zhang", "email": "zzyiwei@google.com", "time": "Fri Sep 27 15:53:55 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 27 15:53:55 2019 -0700" }, "message": "GpuStats: refactor single stats pieces into a uniform way am: b1c1a377a8\nam: 048084804b\n\nChange-Id: I927c13f7f887734636904aed980daa4456e79677\n" }, { "commit": "048084804b76d2c9f66af301f9ac902f1d369da2", "tree": "f540fca456ed8d5d10725becf9680f7470e3fdd2", "parents": [ "16b5af0daa5e6506b93b920d929ae488d05125fb", "b1c1a377a84e06dd8ad17ddebbe30ddd1efa983f" ], "author": { "name": "Yiwei Zhang", "email": "zzyiwei@google.com", "time": "Fri Sep 27 15:47:25 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 27 15:47:25 2019 -0700" }, "message": "GpuStats: refactor single stats pieces into a uniform way\nam: b1c1a377a8\n\nChange-Id: I623d5249f785ac75403314943fd8ec715999b33a\n" }, { "commit": "5598f51899d5493a353653fec5635adbea6b9fbd", "tree": "cd8ee82fd283be8ce10575337ce83b882a680eec", "parents": [ "b2d4bf452125ec8a4996e14462d41e468553a067", "f39f7c8fe6f75a9e94ab078fc79849f579fc167d" ], "author": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Thu Sep 26 13:27:47 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 13:27:47 2019 -0700" }, "message": "Merge changes from topics \"inputdispatcher-split-aosp\", \"inputreader-split-aosp\" am: 0c1abd12f9 am: c46722cd3f\nam: f39f7c8fe6\n\nChange-Id: If887f5db78e18c43a283728db38b1447f313ed8d\n" }, { "commit": "f39f7c8fe6f75a9e94ab078fc79849f579fc167d", "tree": "338c770b620671d526273874796a6199058892b5", "parents": [ "ec6297ee7d3522768f1962b49fc08d1ce3788e80", "c46722cd3fbf34149a9127f719dc5f002de9e3bf" ], "author": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Thu Sep 26 13:22:18 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 13:22:18 2019 -0700" }, "message": "Merge changes from topics \"inputdispatcher-split-aosp\", \"inputreader-split-aosp\" am: 0c1abd12f9\nam: c46722cd3f\n\nChange-Id: I57eac3b1b9be66efdbd3195488ec027e3b77ed0c\n" }, { "commit": "c46722cd3fbf34149a9127f719dc5f002de9e3bf", "tree": "e5552ad3eeeb5c1c0ff8c05cbefb4dea85a44995", "parents": [ "a4b171610faa71620c8a434a8ceb5bc1f1a77450", "0c1abd12f9b032e9150a0c12ee40d546cc314bec" ], "author": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Thu Sep 26 13:14:56 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 13:14:56 2019 -0700" }, "message": "Merge changes from topics \"inputdispatcher-split-aosp\", \"inputreader-split-aosp\"\nam: 0c1abd12f9\n\nChange-Id: Iba37a69eb4dc96bb5bce4395a3831c23ad03bee4\n" }, { "commit": "394eed0255ffa1802375686d9fa78999b04e1753", "tree": "6c0b0120b5edb87fbe7ab3f94350b4cf28c44fc6", "parents": [ "186d5b57e8320df20e7bc861ee7bba66692619c0" ], "author": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Mon Sep 02 18:07:11 2019 -0700" }, "committer": { "name": "Garfield Tan", "email": "xutan@google.com", "time": "Thu Sep 26 11:03:16 2019 -0700" }, "message": "Create inputmappers and accumulators directories\n\nInside the \u0027inputreader\u0027 directory, we create an \u0027mapper\u0027 directory\nto hold the InputMappers and a \u0027mapper/accumulator\u0027 directory to\nhold the Accumulators.\n\nBug: 140139676\nTest: atest inputflinger_tests\nTest: Touch, keyboard, trackpad, and mouse works on crosshatch\nChange-Id: I4966919cd5b42353dd8c1e7cc7663f6c83765542\nMerged-In: I4966919cd5b42353dd8c1e7cc7663f6c83765542\n" }, { "commit": "186d5b57e8320df20e7bc861ee7bba66692619c0", "tree": "112a463dd776b0df4945d3b86346ca053b768d3f", "parents": [ "2b28181859294c2b4d962779ea651cde9a6d55a9" ], "author": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Fri Aug 30 15:27:05 2019 -0700" }, "committer": { "name": "Garfield Tan", "email": "xutan@google.com", "time": "Thu Sep 26 11:03:00 2019 -0700" }, "message": "Split InputReader into multiple files\n\nThis CL:\n1) Moves commonly used macros and shared definitions into Macros.h,\nwhich is included as the first #include statement in the files that\nrequire it.\n2) Creates InputReaderContext.h and moves the context definition outside\nthe InputReader.h file.\n3) Moves InputDevice, InputMapper, StylusState, and all of the\nindividual InputMappers into their own header and cpp file combinations.\n4) Moves all Accumulator classes that are shared between multiple\nInputMappers into their own header and cpp file combinations. The\ndefinitions of Accumulators that are unique to a mapper are kept in the\nheader file of the mapper.\n5) Moves constants and static methods that were shared between the\nTouchInputMapper and CursorInputMapper to\nTouchCursorInputMapperCommon.h.\n6) Creates an \u0027include\u0027 directory, as well as a header library build rule,\nto hold all the header files required by InputReader_test.cpp.\n7) Runs clang-format on the newly create files to fix formatting\ninconsistencies.\n\nBug: 140139676\nTest: atest inputflinger_tests\nTest: Touch, keyboard, trackpad, and mouse works on crosshatch\nChange-Id: Ib1ac871c7f4199729bf6d0e6a53ed907af318986\nMerged-In: Ib1ac871c7f4199729bf6d0e6a53ed907af318986\n" }, { "commit": "2b28181859294c2b4d962779ea651cde9a6d55a9", "tree": "85ed4be8d7fa94ce8e10ab0122a5762d99d11460", "parents": [ "73007b64aa670cc15f031c60c88587b675f47680" ], "author": { "name": "Prabir Pradhan", "email": "prabirmsp@google.com", "time": "Thu Aug 29 14:12:42 2019 -0700" }, "committer": { "name": "Garfield Tan", "email": "xutan@google.com", "time": "Thu Sep 26 10:54:13 2019 -0700" }, "message": "Create inputreader directory\n\nIn order to start the work to split InputReader.cpp into multiple files,\nwe first create a reader directory to hold the source files for\nlibinputreader.\n\nThe affected files are also reformatted with clang-format.\n\nBug: 140139676\nTest: libinputflinger and libinputflinger_tests builds successfully for\n crosshatch\n\nChange-Id: I62b6b873e2a03e61655eb6214183c984306dcfdb\nMerged-In: I62b6b873e2a03e61655eb6214183c984306dcfdb\n" }, { "commit": "73007b64aa670cc15f031c60c88587b675f47680", "tree": "606ce10e53e8b9015189c52a3d2cfc5deeff2d63", "parents": [ "e4fc01079d1e452e80f43852402c0343ba7359d2" ], "author": { "name": "Garfield Tan", "email": "xutan@google.com", "time": "Thu Aug 29 17:28:41 2019 -0700" }, "committer": { "name": "Garfield Tan", "email": "xutan@google.com", "time": "Thu Sep 26 10:53:55 2019 -0700" }, "message": "Divide InputDispatcher into several files.\n\nThis CL does:\n1) Isolate implementation details of InputDispatcher from outside and\nonly expose necessary header files;\n2) Move implementation details into android::inputdispatcher namespace;\n3) Make input dispatcher a static library for inputflinger to link\nagainst;\n4) Add InputDispatcherFactory.{h,cpp} to isolate implementation details\nin InputDispatcher.h from InputManager.\n\nBug: 140139676\nTest: Mouse clicks can be dispatched to right windows.\nChange-Id: Ib61c16fd41f3f76f538a3de9b54f31ac304e03a5\nMerged-In: Ib61c16fd41f3f76f538a3de9b54f31ac304e03a5\n" }, { "commit": "e4fc01079d1e452e80f43852402c0343ba7359d2", "tree": "c6c03329ce77e31087fbd55f22e1cb86d43a2ef7", "parents": [ "4f330b8eca915554e9f59c4f8f98ebddbcb81203" ], "author": { "name": "Garfield Tan", "email": "xutan@google.com", "time": "Wed Sep 11 13:16:25 2019 -0700" }, "committer": { "name": "Garfield Tan", "email": "xutan@google.com", "time": "Thu Sep 26 10:53:50 2019 -0700" }, "message": "Move InputDispatcher code into a folder.\n\nNote this is an intermediate stage so that the following change won\u0027t\nruin git history. Should never let the HEAD be this commit.\n\nBug: 140139676\nTest: Builds.\nChange-Id: I263929e2d2dd17858eaea69121564335bcc2ef1c\nMerged-In: I263929e2d2dd17858eaea69121564335bcc2ef1c\n" }, { "commit": "374c7cf305c80d99af464a0de22357576bcb9546", "tree": "ceac0eda883b889b9b5241f4179db16dc9bcd8a8", "parents": [ "11be885d99750131cecf5e8d8c854fda145e30e8", "03068f48f2ef13d1ebd9af01044c766b54dd9cb8" ], "author": { "name": "LuK1337", "email": "priv.luk@gmail.com", "time": "Wed Sep 25 23:05:54 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 25 23:05:54 2019 -0700" }, "message": "Merge \"surfaceflinger: Pass proper transform orientation to setProjection()\" am: ac5b759433 am: 0883f45f03\nam: 03068f48f2\n\nChange-Id: I11eb7cc14cbe84b7ce9b0df98b6c9ebc2678661e\n" }, { "commit": "03068f48f2ef13d1ebd9af01044c766b54dd9cb8", "tree": "9026bf21f1fa4bbeffd0d7ce33de4b497ee73d2c", "parents": [ "401da584c63288d7bec0f1a7cffe7bd95f026032", "0883f45f03defad3146090c4e3c0482afe7d3d5a" ], "author": { "name": "LuK1337", "email": "priv.luk@gmail.com", "time": "Wed Sep 25 22:59:50 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 25 22:59:50 2019 -0700" }, "message": "Merge \"surfaceflinger: Pass proper transform orientation to setProjection()\" am: ac5b759433\nam: 0883f45f03\n\nChange-Id: I57e174e5e5bec9251faf99e8cd040ab2aeb8f9b7\n" }, { "commit": "0883f45f03defad3146090c4e3c0482afe7d3d5a", "tree": "e768571bd536fd162f81b9382a5dd50db1f354c9", "parents": [ "0f74c737d10f9b0381b035e0620ff2fd06f92522", "ac5b759433eb5f8667e9c5330233b95bb30855fc" ], "author": { "name": "LuK1337", "email": "priv.luk@gmail.com", "time": "Wed Sep 25 22:52:56 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 25 22:52:56 2019 -0700" }, "message": "Merge \"surfaceflinger: Pass proper transform orientation to setProjection()\"\nam: ac5b759433\n\nChange-Id: Ia239410c281e62195951d55514a5aa9b2c03d693\n" }, { "commit": "ac5b759433eb5f8667e9c5330233b95bb30855fc", "tree": "a948a72d12024c890b1c77a4bd2b13b75dd7bb69", "parents": [ "6f30b0626e353b6c486c6cc367b59d0c72359281", "a4adfb19df934fd1e5f4f4b1a1c815ee209f02e0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 26 05:32:50 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 26 05:32:50 2019 +0000" }, "message": "Merge \"surfaceflinger: Pass proper transform orientation to setProjection()\"" }, { "commit": "6f30b0626e353b6c486c6cc367b59d0c72359281", "tree": "2bca2f567c8653e50b6c4b62edeecd29989be4fa", "parents": [ "5dd4cec081ffbbd39b50510c055c784e4968e3bc", "54de25d696cd592a515ae49b110f196b9f53c7d7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 25 21:21:49 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 25 21:21:49 2019 +0000" }, "message": "Merge changes from topic \"b/138397514\"\n\n* changes:\n SurfaceFlinger: get present time from SF and not from Scheduler\n [SurfaceFlinger] correct present time for negative phase offsets\n [SurfaceFlinger] Some dispsync fixes for early event firing\n [SurfaceFlinger] fix permanently enabling early offsets.\n" }, { "commit": "8e9b0aa01b70f339722ec5282e5f52d7e74ad3d1", "tree": "67803c56fe8fda6ef81b15a70d2209c459680497", "parents": [ "d47dc2eca90c868ab4fe483856e6f98b7254162a", "cbc94dba27f828dfe9ea7249f99ea73cc16b359d" ], "author": { "name": "Jorim Jaggi", "email": "jjaggi@google.com", "time": "Wed Sep 25 06:43:05 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 25 06:43:05 2019 -0700" }, "message": "Merge changes from topic \"flicker-move\" am: 3289d4616b am: a533b92720\nam: cbc94dba27\n\nChange-Id: I80226ff003f4fed703305f74699d95531d04945b\n" }, { "commit": "d47dc2eca90c868ab4fe483856e6f98b7254162a", "tree": "baba47f849c39eedd4c0f630a71c54f023ede4e3", "parents": [ "a8a732fd9cbbb0233d8c79c16e8db610edd76363", "e0cc72f3ce1c6fba89eddf3884845667cce6f365" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Wed Sep 25 06:42:55 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 25 06:42:55 2019 -0700" }, "message": "Fix locking issues with proto dumps am: b57b01e59d am: 52d123c960\nam: e0cc72f3ce\n\nChange-Id: I6aef28686c50d32a461ad666ac7cef3dcc3982ee\n" }, { "commit": "cbc94dba27f828dfe9ea7249f99ea73cc16b359d", "tree": "12e824a39ed2a88d207259f2d2da40fb297824a0", "parents": [ "e0cc72f3ce1c6fba89eddf3884845667cce6f365", "a533b92720c7504fff3ee9010078b6567c7b54fb" ], "author": { "name": "Jorim Jaggi", "email": "jjaggi@google.com", "time": "Wed Sep 25 06:29:30 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 25 06:29:30 2019 -0700" }, "message": "Merge changes from topic \"flicker-move\" am: 3289d4616b\nam: a533b92720\n\nChange-Id: Id9670a6706aa7254ede01872cfcdce526aed7b63\n" }, { "commit": "e0cc72f3ce1c6fba89eddf3884845667cce6f365", "tree": "a994392e2c267bd9a9492fd887e56829a99be66b", "parents": [ "7bd320116e8324b3aac3bbe3d0db9cc2e7c91c69", "52d123c9603550ab46845ad22c85cd633dc0218e" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Wed Sep 25 06:29:20 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 25 06:29:20 2019 -0700" }, "message": "Fix locking issues with proto dumps am: b57b01e59d\nam: 52d123c960\n\nChange-Id: Idddd5b6ce1ee32021da51b41c7e3b02d250958b8\n" }, { "commit": "a533b92720c7504fff3ee9010078b6567c7b54fb", "tree": "5db1f9e24d689a1a0ed85baa97c68c675e9e90e6", "parents": [ "52d123c9603550ab46845ad22c85cd633dc0218e", "3289d4616b1910c23f5e7c32fb42951b7d3a3ff6" ], "author": { "name": "Jorim Jaggi", "email": "jjaggi@google.com", "time": "Wed Sep 25 06:19:06 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 25 06:19:06 2019 -0700" }, "message": "Merge changes from topic \"flicker-move\"\nam: 3289d4616b\n\nChange-Id: I0012d9529835ac4dc00b90df36e38631cd00b40b\n" }, { "commit": "52d123c9603550ab46845ad22c85cd633dc0218e", "tree": "59c9872806ebb119946231d9870e3419e98a8913", "parents": [ "175ae231cf4762f86445563d3f7ae9b3b890eb70", "b57b01e59d10f943a2ea6039a7c097bdbbcf02e7" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Wed Sep 25 06:18:53 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 25 06:18:53 2019 -0700" }, "message": "Fix locking issues with proto dumps\nam: b57b01e59d\n\nChange-Id: I7a3e71d68b394357da98de6a9705f0d4cc180791\n" }, { "commit": "54de25d696cd592a515ae49b110f196b9f53c7d7", "tree": "f75cafdc10336e91ef73abcdbfea7d9f4845f93e", "parents": [ "2b2bbd3975f8931d7d79c7ef4cb4f28deef46588" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Wed Jun 12 17:11:12 2019 -0700" }, "committer": { "name": "Ana Krulec", "email": "akrulec@google.com", "time": "Tue Sep 24 10:56:48 2019 -0700" }, "message": "SurfaceFlinger: get present time from SF and not from Scheduler\n\nSF hold the most accurate expected present time as it also knows\nwhether we are operating at negative offset and which vsync\nwe are targeting.\n\nBug: 133241520\nBug: 134589085\nTest: systrace when scrolling\nChange-Id: I934df3a8bf807b0e52555765a6861f252b69c0d1\nMerged-In: I934df3a8bf807b0e52555765a6861f252b69c0d1\n" }, { "commit": "2b2bbd3975f8931d7d79c7ef4cb4f28deef46588", "tree": "692818af9f5f475a164401ac4ab8b5ee4fefa1be", "parents": [ "1265a9060ea431cc815fbf7b39b17dbc61f6fa71" ], "author": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Thu Jun 06 13:28:34 2019 -0700" }, "committer": { "name": "Ana Krulec", "email": "akrulec@google.com", "time": "Tue Sep 24 10:56:35 2019 -0700" }, "message": "[SurfaceFlinger] correct present time for negative phase offsets\n\nDispSync::expectedPresentTime returns the expected presentation time for\nthe current frame, but when we\u0027re in negative offsets we are targetting\nthe following frame instead.\n\nBug: 133241520\nBug: 134589085\nTest: systrace when flinging through news\nChange-Id: I7cc05a0b9e8e9b5c3e8d0c4b1d59b0a7dabd43d4\nMerged-In: I7cc05a0b9e8e9b5c3e8d0c4b1d59b0a7dabd43d4\n" }, { "commit": "1265a9060ea431cc815fbf7b39b17dbc61f6fa71", "tree": "1f8f4affdcb0764d92b8ea558845171e1505a678", "parents": [ "2e11af0bd0954a422cfdff375951d775d87621d4" ], "author": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Tue May 21 00:51:01 2019 -0700" }, "committer": { "name": "Ana Krulec", "email": "akrulec@google.com", "time": "Tue Sep 24 10:56:21 2019 -0700" }, "message": "[SurfaceFlinger] Some dispsync fixes for early event firing\n\n* Fix lastEventTime for listeners so that they don\u0027t fire early.\n* Properly set mHasFired for listeners so that if the dispsync model\nis currently being updated that mHasFired is always set to true\nif lastEventTime is after the most recent vsync reference.\n\nBug: 132678707\nBug: 130684082\nTest: systrace\nChange-Id: I5b860336f12b742cc67665776290939b61e7e3af\nMerged-In: I5b860336f12b742cc67665776290939b61e7e3af\n" }, { "commit": "2e11af0bd0954a422cfdff375951d775d87621d4", "tree": "86b8efda369f9b88f2b9d37d4e2d544fdfba889c", "parents": [ "b5f8331e88468625a58fa161935acd083ffa9c85" ], "author": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Mon May 20 18:32:22 2019 -0700" }, "committer": { "name": "Ana Krulec", "email": "akrulec@google.com", "time": "Tue Sep 24 10:56:05 2019 -0700" }, "message": "[SurfaceFlinger] fix permanently enabling early offsets.\n\n* Add notion of intended period in DispSync, and use that to detect\nwhether the simulated period will be changed.\n* Propagate that signal to setDesiredActiveConfig, so that we don\u0027t fall\ninto early offsets unnecessarily, which can cause early offsets to\nalways be enabled.\n\nBug: 132678707\nTest: systrace\nTest: swappy test app\nTest: scrolling through google news\nChange-Id: I18df1b9d949cd534ecbf1c8891b6f88eab8be399\nMerged-In: I18df1b9d949cd534ecbf1c8891b6f88eab8be399\n" }, { "commit": "6bfe2640a1bf832041f8dbde266b0384e018846e", "tree": "a3477bdd95e3a2a3b010a3f3475f630890c28c67", "parents": [ "b57b01e59d10f943a2ea6039a7c097bdbbcf02e7" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Fri Jun 07 14:53:14 2019 -0700" }, "committer": { "name": "Nataniel Borges", "email": "natanieljr@google.com", "time": "Tue Sep 24 12:27:48 2019 +0200" }, "message": "Fix surface tracing thread sync issues\n\nTracing thread was incorrectly reading the drawing state while it was being\nupdated by the surface flinger main thread. Move the notify to after\ncomposition.\n\nFixes: 134752356\nTest: capture surface flinger trace\nChange-Id: I2d77334f616cb4c34e6a57c84ca97425f7983152\nMerged-In: I32a59475ced80d7eaa062181c732ce0f9a81cca5\n" }, { "commit": "b57b01e59d10f943a2ea6039a7c097bdbbcf02e7", "tree": "5c18cce838420723205bea90921e0ce5b200c0fc", "parents": [ "b5f8331e88468625a58fa161935acd083ffa9c85" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Mon Sep 16 18:22:19 2019 +0200" }, "committer": { "name": "Nataniel Borges", "email": "natanieljr@google.com", "time": "Tue Sep 24 12:27:28 2019 +0200" }, "message": "Fix locking issues with proto dumps\n\nProto dumps are generated from:\n - binder threads when generating bugreports or triggering dumpstate\n - main thread when mLayerStats is enabled\n - tracing thread when winscope tracing is enabled.\n\nThe binder thread reads current state while the other threads reads drawing state.\n\nThe writeToProto function accesses a mix of current and drawing states. mPendingState should\nonly be accessed with the mStateLock held and the visible regions should be read from the main\nor tracing threads. This causes some invalid access issues.\n\nTo make the locking requirements clear, this change\n1. moves drawing specific data to a new function\n2. copies mPendingState so we can dump the copy safely in main thread\n3. dumps drawing data from binder threads by posting a message onto the main thread\n\nBug: 138318680\nTest: adb shell dumpsys SurfaceFlinger, winscope\n\nChange-Id: Ib2b49aedf06ee5a262d3162366ddf75d08432e05\nMerged-In: I8bb93e9b9f81faec59585b770eb7ba0fbcd9b51b\n" }, { "commit": "a4adfb19df934fd1e5f4f4b1a1c815ee209f02e0", "tree": "12f61db99bfeb94bf6092fd94c5907c5a4096770", "parents": [ "b5f8331e88468625a58fa161935acd083ffa9c85" ], "author": { "name": "LuK1337", "email": "priv.luk@gmail.com", "time": "Wed Sep 18 18:44:49 2019 +0200" }, "committer": { "name": "LuK1337", "email": "priv.luk@gmail.com", "time": "Mon Sep 23 01:59:51 2019 +0200" }, "message": "surfaceflinger: Pass proper transform orientation to setProjection()\n\n* Without adding display install orientation,\n the orientation passed to setProjection()\n is incorrect thus screen contents aren\u0027t\n rendered properly.\n\nChange-Id: Ieba6992bd6148c0480a2cae681c85bed75de30f1\n" }, { "commit": "dd08ee7cdbc9f5632419db670388d0c959fb0bbf", "tree": "30a3a787955bc847d67da3f418368af1688979a4", "parents": [ "fe187361397939edaed0f6c020222f237e55704b", "fcf2c201ad8d353f6268a6c6f0363c7751f34a7c" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Fri Sep 20 15:56:31 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 20 15:56:31 2019 -0700" }, "message": "Merge \"SurfaceFlinger: tune number of buffers for low activity layers\" into qt-qpr1-dev\nam: fcf2c201ad\n\nChange-Id: I69b5666c05e2111a356ab43de033ecfabeb1dba1\n" }, { "commit": "fcf2c201ad8d353f6268a6c6f0363c7751f34a7c", "tree": "5f4e6e1e97a162958415a0a931f223b3660fff92", "parents": [ "8f8c3ef0ef4112f1f5957ae9204936d8a2167f2c", "0d772e2642ede5ae36542de4eecfe87b6fe21dad" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Sep 20 22:39:47 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 20 22:39:47 2019 +0000" }, "message": "Merge \"SurfaceFlinger: tune number of buffers for low activity layers\" into qt-qpr1-dev" }, { "commit": "b1c1a377a84e06dd8ad17ddebbe30ddd1efa983f", "tree": "7448e0cb38970a19efe2c465c570fca110bb9ddd", "parents": [ "c27d3ddd2f8796963144666aa7d3d006ddcad35e" ], "author": { "name": "Yiwei Zhang", "email": "zzyiwei@google.com", "time": "Wed Jul 03 13:39:32 2019 -0700" }, "committer": { "name": "Yiwei Zhang", "email": "zzyiwei@google.com", "time": "Fri Sep 20 13:57:24 2019 -0700" }, "message": "GpuStats: refactor single stats pieces into a uniform way\n\nThis change makes it easy for adding single stats pieces into GpuService without\nadding or modifying the binder interface each time.\n\nBug: 141003796\nTest: adb shell dumpsys gpu\nChange-Id: I2907065a55d03a6c1494737e6f0a77f6e94272eb\nMerged-In: I2907065a55d03a6c1494737e6f0a77f6e94272eb\n" }, { "commit": "1aa9e023dd483698f35c06dc9caaefe53e005be4", "tree": "39f58b8831f5e3bcb5db253cad3fbe1cbfde74a7", "parents": [ "f1c22a3a6348d800884f7f7b45bb21da480ab33f", "8f8c3ef0ef4112f1f5957ae9204936d8a2167f2c" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Thu Sep 19 22:02:34 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 19 22:02:34 2019 -0700" }, "message": "Merge \"SurfaceFlinger: add grace time for present fence to signal\" into qt-qpr1-dev\nam: 8f8c3ef0ef\n\nChange-Id: I85b033c02d092fafc5c9b99f9d18eee79f7ca6dc\n" }, { "commit": "8f8c3ef0ef4112f1f5957ae9204936d8a2167f2c", "tree": "e68287cd85acf75ebb9bd7c0092a5e7591877750", "parents": [ "e3d94279a8ecb16dac14ece2a419b69805cdca74", "b40b0269dfbd4a259bc604e84392c3984c300932" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Fri Sep 20 04:44:54 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 20 04:44:54 2019 +0000" }, "message": "Merge \"SurfaceFlinger: add grace time for present fence to signal\" into qt-qpr1-dev" }, { "commit": "073933cc728e8181702c911dcfce4d54f407e33d", "tree": "87ce06820b1db17258585cee9a891a9955481916", "parents": [ "af6c02881ecb74b4eb4f096bb9418df125cb3f09", "e3d94279a8ecb16dac14ece2a419b69805cdca74" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Thu Sep 19 18:52:55 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 19 18:52:55 2019 -0700" }, "message": "Merge \"Revert \"Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\"\" into qt-dev am: 3f646b05fc am: c27d3ddd2f\nam: e3d94279a8\n\nChange-Id: I042a545af6b33f5b8cd41af0bcbeed071ea56ec7\n" }, { "commit": "e3d94279a8ecb16dac14ece2a419b69805cdca74", "tree": "7015f0ee2b90880e3e7002d498807a493703d554", "parents": [ "5726d926a9eb0ccbe00236ff9e1303f4ea542396", "c27d3ddd2f8796963144666aa7d3d006ddcad35e" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Thu Sep 19 18:46:54 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 19 18:46:54 2019 -0700" }, "message": "Merge \"Revert \"Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\"\" into qt-dev am: 3f646b05fc\nam: c27d3ddd2f\n\nChange-Id: I27fae67b9d8d243680b592caf64326dbbfd17acb\n" }, { "commit": "cf0a72660b736bde319bd18dbb58540bca081892", "tree": "5024f71ee6e2192dac563c100f86cadd8571c260", "parents": [ "80d67a54bce9da258b05f9c795f9a481be739be0", "c27d3ddd2f8796963144666aa7d3d006ddcad35e" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Thu Sep 19 18:46:54 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 19 18:46:54 2019 -0700" }, "message": "Merge \"Revert \"Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\"\" into qt-dev am: 3f646b05fc\nam: c27d3ddd2f\n\nChange-Id: I839c15d2631b6708a0d56bdda1482fd17808eef6\n" }, { "commit": "c27d3ddd2f8796963144666aa7d3d006ddcad35e", "tree": "696b345d3f64b408e688eb84e7f33a61ac73e34c", "parents": [ "bdd785a4eadc89095975aac57643896cadf2c95f", "3f646b05fc9e1cdad59852b860e064762029d362" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Thu Sep 19 18:40:41 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 19 18:40:41 2019 -0700" }, "message": "Merge \"Revert \"Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\"\" into qt-dev\nam: 3f646b05fc\n\nChange-Id: I08185c54e1d88303c96e6c6fe96aded119d04024\n" }, { "commit": "adb9a99ddc90a593463fac604b3cbeb946ec36b3", "tree": "ddabdb04e6b80e520598ceeb4279e163c7ce2b7b", "parents": [ "cc1ce6476e4deb8877c10b2a59afd27556ec72e9" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Thu Sep 19 21:21:55 2019 +0000" }, "committer": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Thu Sep 19 21:21:55 2019 +0000" }, "message": "Revert \"Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\"\n\nThis reverts commit cc1ce6476e4deb8877c10b2a59afd27556ec72e9.\n\nReason for revert: This change is needed to fix b/138083790. The underlying issue causing the first revert is now resolved.\n\nChange-Id: I82eeec5f5e66570e03f37294d7bbe15c41fec86e\n" }, { "commit": "b40b0269dfbd4a259bc604e84392c3984c300932", "tree": "974492d524b9d0463ef5e92e2981806a1b268eaa", "parents": [ "5726d926a9eb0ccbe00236ff9e1303f4ea542396" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Thu Sep 19 11:32:43 2019 -0700" }, "committer": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Thu Sep 19 19:47:07 2019 +0000" }, "message": "SurfaceFlinger: add grace time for present fence to signal\n\nTo avoid racing with HWVsync when SF wakeup at a small offset from vsync,\nwe want to give a small grace period for the present fence to fire\ninstead of just giving up on this frame.\n\nBug: 141312250\nTest: Set SF offset to 0 and observe systrace\nChange-Id: I713fad164fa2f4e0f00a2b4efaae063ac8f4a2b7\nMerged-In: I713fad164fa2f4e0f00a2b4efaae063ac8f4a2b7\n" }, { "commit": "c78cc277c21888f0bd0959b231514fa7751d8ba3", "tree": "fdd8c1ba3859528a13b31a6fb42cdee1158ad29e", "parents": [ "c60494ab985bc9a3f52136f11b08c104e709c561", "0eb1c75dcf31a8e8c31ddf53abe45b4308fe9707" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Thu Sep 19 04:47:03 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 19 04:47:03 2019 -0700" }, "message": "Merge \"Remove unnecessary dependencies on libsigchain.\" am: 52c9985c8d am: 994ab60292\nam: 0eb1c75dcf\n\nChange-Id: I4db6b16c327324e220011f9512e067e6c6015c9d\n" }, { "commit": "0eb1c75dcf31a8e8c31ddf53abe45b4308fe9707", "tree": "cf4f0973868f6550aecff43d62ca6a1b0392dcf2", "parents": [ "cd28044ff4698c40a318de00ec3c71a17eea71ce", "994ab60292103797de37f59f8aacdf846dbba5a6" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Thu Sep 19 04:41:40 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 19 04:41:40 2019 -0700" }, "message": "Merge \"Remove unnecessary dependencies on libsigchain.\" am: 52c9985c8d\nam: 994ab60292\n\nChange-Id: Id979ce9096fd8c34b4d296575c9930177ac0b174\n" }, { "commit": "994ab60292103797de37f59f8aacdf846dbba5a6", "tree": "9602c1e7a8bfcbe14eeec1b66dd76eea7110c4d9", "parents": [ "a741edcd861d0fd627005702a97992095d69f398", "52c9985c8d0b29d37002b544b191ecfbd386023f" ], "author": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Thu Sep 19 04:36:10 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 19 04:36:10 2019 -0700" }, "message": "Merge \"Remove unnecessary dependencies on libsigchain.\"\nam: 52c9985c8d\n\nChange-Id: I17026c3df4817e9509a88d1bcc9cfdf2cf1fe98e\n" }, { "commit": "0d772e2642ede5ae36542de4eecfe87b6fe21dad", "tree": "487bf6ff7f50deb8eb72625d6d1cc1bdee59810e", "parents": [ "d6536aa908a82d909b99d81012fd3b258faf0d84" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Wed Sep 18 16:44:02 2019 -0700" }, "committer": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Wed Sep 18 16:48:11 2019 -0700" }, "message": "SurfaceFlinger: tune number of buffers for low activity layers\n\nTune number of buffers indicating whether a layer is low activity\nor not to 2 accommodate more cases of low activity layers.\n\nBug: 140948091\nTest: 1) Set the static wallpaper\n2) Go to Settings-\u003eAbout Phone -\u003e scroll all the way down\n3) Move device to Zone1 and launch settings page\n4) Move device to Non Zone1 without touch and wait for 1-2 secs and observe\n\nChange-Id: I6a06fa4945843a8d991463c30cb0e6db68f99365\n" }, { "commit": "26d90cb819697e898c113850fa4ca8d2211d32e9", "tree": "a4855060efd0d2122418131b581420877468850f", "parents": [ "343ac1d4bc4eae042c61bdf33e75d906264a9633" ], "author": { "name": "Josh Gao", "email": "jmgao@google.com", "time": "Thu Jul 18 12:54:28 2019 -0700" }, "committer": { "name": "Martin Stjernholm", "email": "mast@google.com", "time": "Wed Sep 18 22:25:05 2019 +0100" }, "message": "Remove unnecessary dependencies on libsigchain.\n\nsurfaceflinger was required to link against libsigchain to dlopen\nlibart.so for a debugging option that was removed in change\nIb9a129329f7bd8d67b954e58810807c683b20b48. gpuservice accidentally\nlinked against it, presumably due to copy/paste from the surfaceflinger\nAndroid.bp file.\n\nBug: http://b/120782499\nBug: http://b/135284876\nTest: treehugger\nChange-Id: I593c5483c8c096ac95f310c68f53000e06621d8b\nMerged-In: I593c5483c8c096ac95f310c68f53000e06621d8b\n" }, { "commit": "b69a5c39b540ff3a5566351513bf0902c6011048", "tree": "04c18ed915b0f721147dfaaa6d14716c1017839f", "parents": [ "9d3110837714a82051fddc670fab83704b16c4db", "436f8421ed1c3ad10db3e5889a2beedad98defcf" ], "author": { "name": "Pierre Couillaud", "email": "pierre.couillaud@broadcom.com", "time": "Mon Sep 16 12:54:34 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 16 12:54:34 2019 -0700" }, "message": "Merge \"SurfaceFlinger: retain the sideband layer information for composition\" am: 13286c3b51 am: 8d5eb54030\nam: 436f8421ed\n\nChange-Id: I5986acc1763572143fd475101b065c946662e34e\n" }, { "commit": "436f8421ed1c3ad10db3e5889a2beedad98defcf", "tree": "aff48969d848d1943f96683a41529f1cf9ed441f", "parents": [ "d61cf646251204eef25a9c04c808bdbefdab3de1", "8d5eb54030fde43bdceca1929534a67881a8c129" ], "author": { "name": "Pierre Couillaud", "email": "pierre.couillaud@broadcom.com", "time": "Mon Sep 16 12:48:32 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 16 12:48:32 2019 -0700" }, "message": "Merge \"SurfaceFlinger: retain the sideband layer information for composition\" am: 13286c3b51\nam: 8d5eb54030\n\nChange-Id: I89f1e3173c085c9c46def09d07e6c3e7719437cf\n" }, { "commit": "8d5eb54030fde43bdceca1929534a67881a8c129", "tree": "dfc682111300e77f2c171e90f6166994e4a2f5b7", "parents": [ "7a46cda5f50b0948a4fd66070d661617fe7ee59e", "13286c3b510661eb5f1ffbdad5e5a6881a1dbb5e" ], "author": { "name": "Pierre Couillaud", "email": "pierre.couillaud@broadcom.com", "time": "Mon Sep 16 12:42:33 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 16 12:42:33 2019 -0700" }, "message": "Merge \"SurfaceFlinger: retain the sideband layer information for composition\"\nam: 13286c3b51\n\nChange-Id: I1f6da21a5e3401e05cb5be3c87d56503f7d6de98\n" }, { "commit": "dae83cfcff5c581b8f143432ca0c27e6cb2cc24e", "tree": "b449b3e01225be7ab3dc01dfc78bff05ca4bc7a6", "parents": [ "b99cafae0f5a32e0a8a24efe130f45767c275146" ], "author": { "name": "Ian Kasprzak", "email": "iankaz@google.com", "time": "Thu Sep 12 20:27:58 2019 -0700" }, "committer": { "name": "Ian Kasprzak", "email": "iankaz@google.com", "time": "Thu Sep 12 20:30:08 2019 -0700" }, "message": "[DO NOT MERGE] Fix aosp_arm64-eng (checkbuild).\n\nUpdate SurfaceFlingerProperties-current.txt to be compatible.\n\nBUG: 140906153\nTest: Local build with checkbuild\nChange-Id: Ia25c7546bab0abb05c6189e9f7b8d5e0ae7d9b92\n" }, { "commit": "eae0ae9cd0e724e5c4815857328b6a19b9bcd0a5", "tree": "ce79c347a35bc6b563e1e3a0dc3fc8fb514b9ae1", "parents": [ "7fbf4b52f052e3b7ba88928a1975721df1836145", "adf3724aeb737fa88e0e0213de7f30cf50dcae31" ], "author": { "name": "Long Ling", "email": "longling@google.com", "time": "Thu Sep 12 18:41:45 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 12 18:41:45 2019 -0700" }, "message": "Merge \"Update the minimum interval to resync to HWVsync\" into qt-r1-dev am: bdd785a4ea\nam: adf3724aeb\n\nChange-Id: Id2e4030c8cb2881ead6f1b149f95922daa1ee136\n" }, { "commit": "a8cd85f4c80b943a79aab56278ae8c9b7f9dab54", "tree": "619e38b09fd5f884891e339409c3a9a20cf27b5c", "parents": [ "045eb2a5b065cb7622cd49c428096c3a0827f84b", "bdd785a4eadc89095975aac57643896cadf2c95f" ], "author": { "name": "Long Ling", "email": "longling@google.com", "time": "Thu Sep 12 18:34:46 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 12 18:34:46 2019 -0700" }, "message": "Merge \"Update the minimum interval to resync to HWVsync\" into qt-r1-dev\nam: bdd785a4ea\n\nChange-Id: I6c5e3fff1c2d14b270630f4b86534b21077f93b7\n" }, { "commit": "adf3724aeb737fa88e0e0213de7f30cf50dcae31", "tree": "2e8759027863b52cb0032e73102b313112957cf0", "parents": [ "63bbbb4ed7008f02d67782c6dae1bc91e62479db", "bdd785a4eadc89095975aac57643896cadf2c95f" ], "author": { "name": "Long Ling", "email": "longling@google.com", "time": "Thu Sep 12 18:34:45 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 12 18:34:45 2019 -0700" }, "message": "Merge \"Update the minimum interval to resync to HWVsync\" into qt-r1-dev\nam: bdd785a4ea\n\nChange-Id: I73c0ca25db37a37b688fe5125f7e4614848dcac9\n" }, { "commit": "bdd785a4eadc89095975aac57643896cadf2c95f", "tree": "4cf03d448f25c48efd1642baebb09769e5fdbfd4", "parents": [ "65dc300533dc764168a0dc729b7f917edda22508", "457bef9139e9e756aa487703d75ee5e0844d9076" ], "author": { "name": "Long Ling", "email": "longling@google.com", "time": "Fri Sep 13 01:15:36 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 13 01:15:36 2019 +0000" }, "message": "Merge \"Update the minimum interval to resync to HWVsync\" into qt-r1-dev" }, { "commit": "d66b6c2f0355573456be65905407da92d79205c7", "tree": "7033d62be29f9c44a2f5730ca724ad5eeb333173", "parents": [ "ebbe2c45fb7b98868411f58b31cb5f9e791a24de" ], "author": { "name": "Pierre Couillaud", "email": "pierre.couillaud@broadcom.com", "time": "Tue Aug 27 13:43:22 2019 -0700" }, "committer": { "name": "Pierre Couillaud", "email": "pierre@broadcom.com", "time": "Thu Sep 12 13:29:04 2019 -0700" }, "message": "SurfaceFlinger: retain the sideband layer information for composition\n\nwhen present, the sideband layer stream information is not saved into\nthe BufferQueueLayer::mSidebandStream, during \"latchSidebandStream\".\n\nthis subsequently leads to such layer being marked as non visible in the\ncomposition stack and to be drop from advertisement to hardware composer\neven though a sideband layer is defined in the rest of the framework.\n\nthis seems to be a regression introduced during android 9 to android 10\nrevamp of the SurfaceFlinger for buffer latching. latching a sideband layer is actually harmless since there is no buffer associated with it that need to be waited on from the gpu side.\n\nthe fix proposed here allows to maintain the knowledge of the sideband\nlayer and make it visible in the composition stack for hardware composer to handle adequately.\n\nfor illustration purposes, the relevant snippet of the layer composition\nstack are posted here from \"dumpsys SurfaceFlinger\", highlighting the\nissue with \"\u003e\u003e\u003e\".\n\n[before]:\n\n* compositionengine::Layer 0xa959b34c (SurfaceView - \u003ctruncated\u003e)\n frontend:\n isSecure\u003dfalse geomUsesSourceCrop\u003dfalse geomBufferUsesDisplayInverseTransform\u003dfalse\n geomLayerTransform 0x00000000 (ROT_0 ) 0x00 (IDENTITY )\n 1.0000 0.0000 0.0000\n 0.0000 1.0000 0.0000\n 0.0000 0.0000 1.0000\n\n geomBufferSize\u003d[0 0 -1 -1] geomContentCrop\u003d[0 0 -1 -1] geomCrop\u003d[0 0 -1 -1] geomBufferTransform\u003d0\n Region geomActiveTransparentRegion (this\u003d0xa959b3f8, count\u003d1)\n [ 0, 0, 0, 0]\n geomLayerBounds\u003d[0.000000 0.000000 0.000000 0.000000]\n blend\u003dINVALID (0) alpha\u003d1.000000\n\u003e\u003e\u003e type\u003d0 appId\u003d0 composition type\u003dINVALID (0)\n buffer: buffer\u003d0x0 slot\u003d-1\n\u003e\u003e\u003e sideband stream\u003d0x9b509900\n color\u003d[0 0 0]\n dataspace\u003dUNKNOWN (0) hdr metadata types\u003d0 colorTransform\u003d\u003ctruncated\u003e\n\n[after]:\n\n* compositionengine::Layer 0xa9a5034c (SurfaceView - \u003ctruncated\u003e)\n frontend:\n isSecure\u003dfalse geomUsesSourceCrop\u003dtrue geomBufferUsesDisplayInverseTransform\u003dfalse\n geomLayerTransform 0x00000000 (ROT_0 ) 0x00 (IDENTITY )\n 1.0000 0.0000 0.0000\n 0.0000 1.0000 0.0000\n 0.0000 0.0000 1.0000\n\n geomBufferSize\u003d[0 0 -1 -1] geomContentCrop\u003d[0 0 -1 -1] geomCrop\u003d[0 0 1920 1080] geomBufferTransform\u003d0\n Region geomActiveTransparentRegion (this\u003d0xa9a503f8, count\u003d1)\n [ 0, 0, 0, 0]\n geomLayerBounds\u003d[0.000000 0.000000 1920.000000 1080.000000]\n blend\u003dNONE (1) alpha\u003d1.000000\n\u003e\u003e\u003e type\u003d1 appId\u003d10064 composition type\u003dSIDEBAND (5)\n buffer: buffer\u003d0x0 slot\u003d-1\n\u003e\u003e\u003e sideband stream\u003d0x9a1472b0\n color\u003d[0 0 0]\n dataspace\u003dUNKNOWN (0) hdr metadata types\u003d0 colorTransform\u003d\u003ctruncated\u003e\n\nBug: 140128098\nrefs #SWANDROID-6178\n\nSigned-off-by: Pierre Couillaud \u003cpierre.couillaud@broadcom.com\u003e\n" }, { "commit": "457bef9139e9e756aa487703d75ee5e0844d9076", "tree": "2016ca2bc3bffd762c7bcdcc39fe3980ddf5604b", "parents": [ "ab6ef6c8871506317dc7ada75707c19963daabe4" ], "author": { "name": "Long Ling", "email": "longling@google.com", "time": "Wed Sep 11 14:43:11 2019 -0700" }, "committer": { "name": "Long Ling", "email": "longling@google.com", "time": "Thu Sep 12 18:27:48 2019 +0000" }, "message": "Update the minimum interval to resync to HWVsync\n\nBug: 140823887\nTest: Manual test with Calculator apps\nChange-Id: I705c16534a616bc1a3af4402ba999eeb68871a3f\n" }, { "commit": "41fdfa84f629eeea14ae769838b7714dd7a7be35", "tree": "e10452193dccb6119e22c6575a76a32bbfb42027", "parents": [ "589367525095b4b2b2eef8ffbea338349c0e006e", "045eb2a5b065cb7622cd49c428096c3a0827f84b" ], "author": { "name": "Pete Bentley", "email": "prb@google.com", "time": "Thu Sep 12 05:13:24 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 12 05:13:24 2019 -0700" }, "message": "Merge \"Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\" into qt-dev am: de17b13a2f am: 65dc300533\nam: 045eb2a5b0\n\nChange-Id: I787784b8e7248d8ae0f7e93249715b7e7ab149f4\n" }, { "commit": "045eb2a5b065cb7622cd49c428096c3a0827f84b", "tree": "91bfe7eadda71123a39061061263d984c447c7c5", "parents": [ "a4c6b11d8f647fae4a77d442e214d552c9978421", "65dc300533dc764168a0dc729b7f917edda22508" ], "author": { "name": "Pete Bentley", "email": "prb@google.com", "time": "Thu Sep 12 05:06:24 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 12 05:06:24 2019 -0700" }, "message": "Merge \"Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\" into qt-dev am: de17b13a2f\nam: 65dc300533\n\nChange-Id: Idcbc2f5580e8b4a69f490e2f7f3b143be81406e4\n" }, { "commit": "63bbbb4ed7008f02d67782c6dae1bc91e62479db", "tree": "80378279c67c957dc4ad7d10e00c4b57118ea479", "parents": [ "e0aedc2e744cb983dd2a3373d8bd114a4e1061f3", "65dc300533dc764168a0dc729b7f917edda22508" ], "author": { "name": "Pete Bentley", "email": "prb@google.com", "time": "Thu Sep 12 05:06:24 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 12 05:06:24 2019 -0700" }, "message": "Merge \"Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\" into qt-dev am: de17b13a2f\nam: 65dc300533\n\nChange-Id: If20d660de54c22de9bbd7cd1a0c7c6bb7fcc2d7f\n" }, { "commit": "65dc300533dc764168a0dc729b7f917edda22508", "tree": "1b14a591d651a9d35244246dd6055295b0499aa5", "parents": [ "d916d941d89ec8fdcbc2bbe0bfdf0b0db1ad08b5", "de17b13a2f502c0336a19fcf00c66607295df4cb" ], "author": { "name": "Pete Bentley", "email": "prb@google.com", "time": "Thu Sep 12 04:55:00 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 12 04:55:00 2019 -0700" }, "message": "Merge \"Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\" into qt-dev\nam: de17b13a2f\n\nChange-Id: Icd0cd182c6399ff768a715e8ab04a5eb56d41152\n" }, { "commit": "cc1ce6476e4deb8877c10b2a59afd27556ec72e9", "tree": "837337ecd52c40811f5af4ee8b2e41bab8766f13", "parents": [ "4658e11cbe1abae691454ddcf93a06763d1bf828" ], "author": { "name": "Pete Bentley", "email": "prb@google.com", "time": "Thu Sep 12 11:36:29 2019 +0000" }, "committer": { "name": "Pete Bentley", "email": "prb@google.com", "time": "Thu Sep 12 11:36:29 2019 +0000" }, "message": "Revert \"SurfaceFlinger: add a sysprop for GL backpressure\"\n\nThis reverts commit 4658e11cbe1abae691454ddcf93a06763d1bf828.\n\nReason for revert: Seems to be responsible for breaking git_stage-aosp-master on aosp_arm64-eng, see b/140906153\n\nChange-Id: I8968ca1bf95988b453bc33cd78a6389d6cb38a4f\n" }, { "commit": "6a5fab707b47d2e2390973c1c59d2666380fe8b8", "tree": "8274871db2580e4008678444dc66dca7a910e519", "parents": [ "ed8a1acbc129c8641b92df4c85be6d9580d9d7df", "76cc73e91c8be1be49ca7264d21178b0c60ccec8" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 11 20:31:36 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 11 20:31:36 2019 +0000" }, "message": "Merge \"Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master\" into stage-aosp-master" }, { "commit": "38ec9e4340b5835966470f93870d7c734bfe7b4f", "tree": "c71d3f34304739a68d836f380e283b0d26ca8389", "parents": [ "d65d71b0763eab5a2825c664c0ac3b9c31ec56ce", "291ac48c3b5e829f61c6694b6e030e4c47d135c0" ], "author": { "name": "Brian Duddie", "email": "bduddie@google.com", "time": "Mon Sep 09 19:06:08 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 09 19:06:08 2019 -0700" }, "message": "Merge \"Update sensorservice OWNERS\" am: eb5512ebab am: 5f0353e087\nam: 291ac48c3b\n\nChange-Id: I11bd418cf34534f6b09cba866b42277a299a1f29\n" }, { "commit": "d65d71b0763eab5a2825c664c0ac3b9c31ec56ce", "tree": "00c9f9c13c33e1a508d7cae4acdeba4e4a1a0c8b", "parents": [ "6ff913b04000b23cf2d08902e69440d0115185af", "f425ab1e9cdb7b5239b894a20556acdd9e0af39d" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Sep 09 19:03:43 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 09 19:03:43 2019 -0700" }, "message": "Merge \"Remove libhwbinder/libhidltransport deps\" am: 0b2cf30522 am: b19d15b55c\nam: f425ab1e9c\n\nChange-Id: I603f6556a80102f2b74eb4e8f7503f1894e8b643\n" }, { "commit": "291ac48c3b5e829f61c6694b6e030e4c47d135c0", "tree": "663d05171eb31b970800d21e665303a0425282dc", "parents": [ "f425ab1e9cdb7b5239b894a20556acdd9e0af39d", "5f0353e08764e7759b3e7a390b16c42571f37ed3" ], "author": { "name": "Brian Duddie", "email": "bduddie@google.com", "time": "Mon Sep 09 18:58:35 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 09 18:58:35 2019 -0700" }, "message": "Merge \"Update sensorservice OWNERS\" am: eb5512ebab\nam: 5f0353e087\n\nChange-Id: I7363d71c010df36da4f95ce233b8d85c6cd74c71\n" }, { "commit": "f425ab1e9cdb7b5239b894a20556acdd9e0af39d", "tree": "1f8be9b9a172a20d0f1a5e692ee7566fc1b78cd3", "parents": [ "f9cc446fd7c3b505698eb1bfeb835ff5a4117aec", "b19d15b55c4ff4f44fdad3e3993025eb18d90bb1" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Sep 09 18:56:39 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 09 18:56:39 2019 -0700" }, "message": "Merge \"Remove libhwbinder/libhidltransport deps\" am: 0b2cf30522\nam: b19d15b55c\n\nChange-Id: I299ed6788163b57cfd9cdcb65e1a61842d335289\n" }, { "commit": "eb5512ebabff39c0abae0f80c239b9c08fa31f91", "tree": "6534107f788e61478b7143a4ff78eb21644dae11", "parents": [ "0b2cf305224ff4b0cd8aaf832510accd044e58a7", "f63a5b7f52597e423aaff6f469422308cd7fed70" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 10 01:34:27 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 10 01:34:27 2019 +0000" }, "message": "Merge \"Update sensorservice OWNERS\"" }, { "commit": "e0aedc2e744cb983dd2a3373d8bd114a4e1061f3", "tree": "af2230311e0f0e0c8424402d76519f3aac7331da", "parents": [ "b419fa8686633b112b3fa153e29528cb8821ee6c", "d916d941d89ec8fdcbc2bbe0bfdf0b0db1ad08b5" ], "author": { "name": "Adrian Salido", "email": "salidoa@google.com", "time": "Mon Sep 09 16:15:58 2019 -0700" }, "committer": { "name": "Adrian Salido", "email": "salidoa@google.com", "time": "Tue Sep 10 01:07:02 2019 +0000" }, "message": "resolve merge conflicts of d916d941d89ec8fdcbc2bbe0bfdf0b0db1ad08b5 to qt-qpr1-dev\n\nTest: I solemnly swear I tested this conflict resolution.\nBug: 139557239\nChange-Id: I4966f630b0e980e17cbbbcf9b280e034eaeb651e\nMerged-In: Ia85a60fde55afaed5106462942e0bb77652ec737\n" }, { "commit": "f9cc446fd7c3b505698eb1bfeb835ff5a4117aec", "tree": "5766e76882f25df4c7084c29e64fe5b50e968f13", "parents": [ "be9c62877bd82719d6f62a38989e0dec780853aa", "d916d941d89ec8fdcbc2bbe0bfdf0b0db1ad08b5" ], "author": { "name": "Daniel Solomon", "email": "solomondaniel@google.com", "time": "Mon Sep 09 15:49:09 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 09 15:49:09 2019 -0700" }, "message": "SurfaceFlinger: Query Scheduler when updating allowed display configs\nam: d916d941d8\n\nChange-Id: I279ecd4fbacd6d7860e2d09c87cd10a40ccb416a\n" }, { "commit": "f63a5b7f52597e423aaff6f469422308cd7fed70", "tree": "62108d1900bd49736bcd17924f74333b089125ce", "parents": [ "5a99fe853e773984bba3061b80002b8c60555df1" ], "author": { "name": "Brian Duddie", "email": "bduddie@google.com", "time": "Mon Sep 09 14:38:47 2019 -0700" }, "committer": { "name": "Brian Duddie", "email": "bduddie@google.com", "time": "Mon Sep 09 14:47:43 2019 -0700" }, "message": "Update sensorservice OWNERS\n\nTest: n/a\nChange-Id: I828c4dfd833ca2bfa61aff3bce892db5f94fa5f4\n" }, { "commit": "256d76fb588efddcdad7ba240b7be480d46ca7ba", "tree": "41797fe3dc2a38bae5a0fcd1e3ad9f07568c2147", "parents": [ "43e2309351093869fb927e2e0ece2ad6452ab476", "b419fa8686633b112b3fa153e29528cb8821ee6c" ], "author": { "name": "Chavi Weingarten", "email": "chaviw@google.com", "time": "Mon Sep 09 13:54:53 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 09 13:54:53 2019 -0700" }, "message": "Merge \"Use getLayerStack() instead of layerStack for input info\" into qt-qpr1-dev\nam: b419fa8686\n\nChange-Id: I19ab690b24f61dc529495f65bd8f49076d84dbc2\n" }, { "commit": "b419fa8686633b112b3fa153e29528cb8821ee6c", "tree": "40407a7071a23f2da520ceff92ecbb421d766896", "parents": [ "7e5db1d14650b8901e6e9c5157c6dd4a6711023f", "b34c911a8bd37e773290261dc7e9969dbe8dabef" ], "author": { "name": "Chavi Weingarten", "email": "chaviw@google.com", "time": "Mon Sep 09 20:33:58 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 09 20:33:58 2019 +0000" }, "message": "Merge \"Use getLayerStack() instead of layerStack for input info\" into qt-qpr1-dev" }, { "commit": "7a10a4f54357031d076e30601432ea1b1553b098", "tree": "7b0d021e7b1182bfc9cf778d6597ad6fcc9f90fe", "parents": [ "c3ba3a0019615cb3c2b52f2f125b87b0154ee052" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Sep 06 12:09:08 2019 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Sep 09 10:46:17 2019 -0700" }, "message": "Remove libhwbinder/libhidltransport deps\n\nSince these were combined into libhidlbase.\n\nBug: 135686713\nTest: build only (libhwbinder/libhidltransport are empty)\nChange-Id: Iec1802ce9226570d3a02cc5242f7ca72e1370635\n" }, { "commit": "43e2309351093869fb927e2e0ece2ad6452ab476", "tree": "bedc17df6993b37e00ddfe7487ec862aa249923e", "parents": [ "1d177631d6ac1724d34f6dc5a1a70c60794c38c5", "7e5db1d14650b8901e6e9c5157c6dd4a6711023f" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Mon Sep 09 10:32:22 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 09 10:32:22 2019 -0700" }, "message": "SurfaceFlinger: do not choose POWER_SAVING as refresh rate\nam: 7e5db1d146\n\nChange-Id: Ic5285d3a8ae62034146c2ca2c0d652781c5fca05\n" }, { "commit": "76cc73e91c8be1be49ca7264d21178b0c60ccec8", "tree": "0a7fa5c19d5d29d40aab5181e0ee02e4f73f0362", "parents": [ "b9a4f9efdd42eaaf495b9433db2fc5db3a813b94", "5d5329644df97df2718a63c29345fdc17a75b9b5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Sep 08 22:07:47 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Sep 08 22:07:47 2019 -0700" }, "message": "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master\n\nBug: 135460123\nChange-Id: I02a643052e3023ac029cdec76ee24dfa99d82b29\nMerged-In: Ied9a812f235e2a5146381b0ac8c602db1c6035f5\n" }, { "commit": "7e5db1d14650b8901e6e9c5157c6dd4a6711023f", "tree": "d5dd7ddefbbb57c73da7bb34b1ce96936e349041", "parents": [ "d6536aa908a82d909b99d81012fd3b258faf0d84" ], "author": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Fri Sep 06 13:05:40 2019 -0700" }, "committer": { "name": "Ady Abraham", "email": "adyabr@google.com", "time": "Sat Sep 07 00:05:36 2019 +0000" }, "message": "SurfaceFlinger: do not choose POWER_SAVING as refresh rate\n\nSkip POWER_SAVING when looking for a content based refresh rate\nas it is not a real config.\n\nTest: Play 29fps video\nBug: 140374873\nChange-Id: Ia1be8b849e4ad3c59fdff084f2394e52bdb3828c\nMerged-In: Ia1be8b849e4ad3c59fdff084f2394e52bdb3828c\n" }, { "commit": "b34c911a8bd37e773290261dc7e9969dbe8dabef", "tree": "a4d323f333634ea7a88e3faecb755a6ed800420b", "parents": [ "d6536aa908a82d909b99d81012fd3b258faf0d84" ], "author": { "name": "chaviw", "email": "chaviw@google.com", "time": "Tue Sep 03 12:40:22 2019 -0700" }, "committer": { "name": "chaviw", "email": "chaviw@google.com", "time": "Fri Sep 06 16:42:13 2019 -0700" }, "message": "Use getLayerStack() instead of layerStack for input info\n\nWhen there\u0027s no displayId, the layerStack should be used. The current\ncode was using mDrawingState.layerStack which is incorrect because only\nthe layerStack for the root of the tree is correct. Instead, use\ngetLayerStack() which traverses the hierarchy to find the root\u0027s\nlayerStack.\n\nTest: Uses correct layerStack instead of 0 for input with unset displayIds\nFixes: 140312942\nChange-Id: Ic8a06c562e970b0f328c539edfa51e206734934f\nMerged-in: Ic8a06c562e970b0f328c539edfa51e206734934f\n" }, { "commit": "d916d941d89ec8fdcbc2bbe0bfdf0b0db1ad08b5", "tree": "6003dddab62e66df29afb767bdc088d10f6d09b1", "parents": [ "c14f23093e62ca75dae66d1b0918a72fb916b285" ], "author": { "name": "Daniel Solomon", "email": "solomondaniel@google.com", "time": "Mon Aug 19 19:31:09 2019 -0700" }, "committer": { "name": "Daniel Solomon", "email": "solomondaniel@google.com", "time": "Thu Sep 05 14:41:48 2019 -0700" }, "message": "SurfaceFlinger: Query Scheduler when updating allowed display configs\n\nCurrently two entities in SurfaceFlinger can set a new display refresh\nrate: (1) SurfaceFlinger core, and (2) Scheduler. It\u0027s possible for\nthese two entities to get out of sync in the following way:\n1) Scheduler updates the refresh rate to some rate\n2) Upper layers call into SurfaceFlinger to update allowed display\nconfigs\n3) SurfaceFlinger always sets display rate to max\n\nIf the refresh rate from #1 and #3 don\u0027t match, it can leave the system\nin an inconsistent state, potentially causing visual and power issues.\n\nThis change fixes this problem by changing step #3: Instead of always\nchoosing the max refresh rate, SurfaceFlinger queries the optimal\nrefresh rate from Scheduler. If that rate isn\u0027t available, only then\ndoes SurfaceFlinger default to the maximum rate.\n\nBug: 139557239\nTest: atest libsurfaceflinger_unittest\nTest: Manual:\n 1) Start with SurfaceFlinger idling (Scheduler selected\n RefreshRateType::DEFAULT)\n 2) Trigger a change in allowed display configs from\n DisplayModeDirector\n 3) Make sure the RefreshRateType SurfaceFlinger sets is DEFAULT\n instead of PERFORMANCE\nChange-Id: Ia85a60fde55afaed5106462942e0bb77652ec737\nMerged-In: Ia85a60fde55afaed5106462942e0bb77652ec737\n" }, { "commit": "687fca9fdd45b5d7425ce9ed906dbf14e39ecd6d", "tree": "b5bd63fc34518eac45d56c447f71b141ab8a903e", "parents": [ "c122d611fd09e9ead0d3b90c20cd507251238332", "c69fa8bbdd8251bf1ffab911024568763a81588e" ], "author": { "name": "Adrian Salido", "email": "salidoa@google.com", "time": "Tue Sep 03 14:41:27 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 03 14:41:27 2019 -0700" }, "message": "SurfaceFlinger: send config event changed on allowed modes change am: ab6ef6c887\nam: c69fa8bbdd\n\nChange-Id: Id427c493c186f8e227070fd8199b9a5e9946da26\n" }, { "commit": "bd1285cfc9ae0f4f7d356607180ec03bd299c554", "tree": "c2b7a88af9f4f965fd4466922782630552ae56b1", "parents": [ "997a9135c10fc141310650f38928048438515070", "ab6ef6c8871506317dc7ada75707c19963daabe4" ], "author": { "name": "Adrian Salido", "email": "salidoa@google.com", "time": "Tue Sep 03 14:41:19 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 03 14:41:19 2019 -0700" }, "message": "SurfaceFlinger: send config event changed on allowed modes change\nam: ab6ef6c887\n\nChange-Id: Ia8460b87510608cc00d37420d55fb19c1d109764\n" }, { "commit": "c69fa8bbdd8251bf1ffab911024568763a81588e", "tree": "6071ed03f6c26c99dd8e2af73d518cc78867ff0e", "parents": [ "c41f708e75f04f0593634c858a16f7fc3f8ffb50", "ab6ef6c8871506317dc7ada75707c19963daabe4" ], "author": { "name": "Adrian Salido", "email": "salidoa@google.com", "time": "Fri Aug 30 16:50:31 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 30 16:50:31 2019 -0700" }, "message": "SurfaceFlinger: send config event changed on allowed modes change\nam: ab6ef6c887\n\nChange-Id: I17b05d75424e714a037a8d602d9c08a249e6c209\n" }, { "commit": "ab6ef6c8871506317dc7ada75707c19963daabe4", "tree": "bc0d72669b1aaf315701aa8a19bbed4da0983635", "parents": [ "575149f8f04136759e34d298966dd5e9a84b1cde" ], "author": { "name": "Adrian Salido", "email": "salidoa@google.com", "time": "Wed Aug 28 10:02:49 2019 -0700" }, "committer": { "name": "Adrian Salido", "email": "salidoa@google.com", "time": "Wed Aug 28 18:02:32 2019 -0700" }, "message": "SurfaceFlinger: send config event changed on allowed modes change\n\nProvide a notification whenever allowed display configurations have\nchanged, this allows Display Event Receivers to be aware of a change in\nallowed configs.\n\nBug: 139487676\nChange-Id: Ida73391c350989be595f55ff8e1d9d2cc70c0276\n" }, { "commit": "6df83350eaa760656fa0f1ec8da63dd9cd784c79", "tree": "330e9021f9e0f2f7885ca714d5bc269fa8f65110", "parents": [ "da35e5b4ac533f17ee9d78e2a756508ae50ed0c7", "fdba62be3cf8dec7b1430bd623c115942be04585" ], "author": { "name": "Inseob Kim", "email": "inseob@google.com", "time": "Fri Aug 23 20:10:14 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 23 20:10:14 2019 -0700" }, "message": "resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp\nam: fdba62be3c\n\nChange-Id: I5c07825fd010b65fe5e1e0158f4b18506f02b8ef\n" }, { "commit": "8d4c2137300c18c7eabeb829d2ae88f6f197f977", "tree": "b2ea27c336bbb3912235ca6d162c8994a07e675f", "parents": [ "d483db1fba2bb59bcda91d6375e367dceabf4032", "2173449d9dccb15b87c9df5d373dc32e1dcabed6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 23 06:45:15 2019 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 23 06:45:15 2019 +0000" }, "message": "DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master\n\nBug: 139893257\nChange-Id: I760b21ca5c15067de39e3d9963041c05ce7121db\n" } ], "next": "fdba62be3cf8dec7b1430bd623c115942be04585" }