)]}' { "log": [ { "commit": "23626416d058b0a9c482f7456df5a72b804ec932", "tree": "11ad253c21f5198f31c41203b88c622c389eea15", "parents": [ "d9357e7f4748481ef82d4cf434c341bf66d76bf8", "ab618e00b25d12593bcb8d4fd279e4ab78d15a33" ], "author": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Wed Oct 03 09:11:53 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 03 09:11:53 2018 -0700" }, "message": "Merge \"Bugreport: Fix SystemUI service from being dumped twice 1/2\" am: 99c685b0e8\nam: ab618e00b2\n\nChange-Id: I066978bd0150c885f60ced73bdb118038b5c15cf\n" }, { "commit": "ab618e00b25d12593bcb8d4fd279e4ab78d15a33", "tree": "e629567100eee4549b98dccea524d78261325da5", "parents": [ "cfc508530dcc0f9e4d5bcc8af495b37a55a5f393", "99c685b0e8800c6f8ec3eb301bfa70eb0674d8ac" ], "author": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Wed Oct 03 08:54:46 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 03 08:54:46 2018 -0700" }, "message": "Merge \"Bugreport: Fix SystemUI service from being dumped twice 1/2\"\nam: 99c685b0e8\n\nChange-Id: I5d93f3a8bfc1385e629e06848f672b14a2885e6f\n" }, { "commit": "99c685b0e8800c6f8ec3eb301bfa70eb0674d8ac", "tree": "bb912320a4bf8af0195b65d68bf17dacc9b7dd0e", "parents": [ "32fb670a0a023d8caeb571f9d2a581e489dd962d", "5ed09e844b11d00976b6ab30334fbb1fa75669b5" ], "author": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Wed Oct 03 15:35:56 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 03 15:35:56 2018 +0000" }, "message": "Merge \"Bugreport: Fix SystemUI service from being dumped twice 1/2\"" }, { "commit": "176d5e097c68b6ff90426cc79263115078165ba8", "tree": "325369af0f3ff8545d2d44c1f2df55a21ede867b", "parents": [ "200b55a7e3b1e95587ce963f244c95563d2dd1a6", "1f050c6810d2b98457df956ba03e9f9e9b036408" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Tue Oct 02 20:30:40 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 02 20:30:40 2018 -0700" }, "message": "Merge \"docs: bug 117112746, broken link\" into pi-dev\nam: 1f050c6810\n\nChange-Id: I3509903b7ca0fada713b7608a51e7418cb1a651c\n" }, { "commit": "b7042339cf2382a2556aaa24ad4fe3cf63ca5f75", "tree": "59eac45de3413ab190d7572c4bb325e2dd5f6979", "parents": [ "186284734099b6a5c60c50642ae429f929ac6471", "880aba2163ea81e68a193ad3cbd08a8e1be3542b" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Tue Oct 02 17:29:30 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 02 17:29:30 2018 -0700" }, "message": "Merge \"docs: fixing a couple of typos\" into pi-dev\nam: 880aba2163\n\nChange-Id: I3e546080a808181c67fd219aa62bf61511a777cb\n" }, { "commit": "186284734099b6a5c60c50642ae429f929ac6471", "tree": "b5d5e6b3d3d5053dfa1021307b382e90e31cca26", "parents": [ "e353ef0152a311368c57ed8f35f367e0360485ae", "323a915bb320bc20a7746f48b74bf2fa1d21df2c" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Tue Oct 02 17:18:00 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 02 17:18:00 2018 -0700" }, "message": "Merge \"docs: fixing typo, bug 37006473\" into pi-dev\nam: 323a915bb3\n\nChange-Id: I3544307a34da9fc358ed63316fb3212507bd8ef7\n" }, { "commit": "b08f4649c4891f78178156181d28f20e99f198ea", "tree": "c25414d49b450c7cd2ba6bd2132a63326c64a719", "parents": [ "880aba2163ea81e68a193ad3cbd08a8e1be3542b" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Tue Oct 02 16:47:42 2018 -0700" }, "committer": { "name": "kopriva", "email": "kopriva@google.com", "time": "Tue Oct 02 16:47:42 2018 -0700" }, "message": "docs: bug 117112746, broken link\n\nTest: make ds-docs\n\nBug: 117112746\nChange-Id: I7f0f99073edc13a0126fd6002eb254f8583d2655\n" }, { "commit": "b185c37a36feab286df746fc54b3a1868500b061", "tree": "aaeb99b14758c09f7ccfbcde175f7e70ef70e27d", "parents": [ "0c4fad5e92b31d08967dafc24964aaf82af3e499", "919e151bd36850d139e3b5ea6496511ef70b9ca6" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Tue Oct 02 16:31:39 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 02 16:31:39 2018 -0700" }, "message": "Merge \"Dismiss Dialog in post instead of immediately\" am: 9b2c026f10\nam: 919e151bd3\n\nChange-Id: Id214aaf4e7c7f58429f13a5c32b80149be401fbe\n" }, { "commit": "919e151bd36850d139e3b5ea6496511ef70b9ca6", "tree": "c9b81c21a7ae91e6accb1019c1310ebe4286dc10", "parents": [ "a0484ac42fea44cdde0c2b62348a1cc57561beec", "9b2c026f10f98dee726886ea1fadb698c9619456" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Tue Oct 02 15:23:16 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 02 15:23:16 2018 -0700" }, "message": "Merge \"Dismiss Dialog in post instead of immediately\"\nam: 9b2c026f10\n\nChange-Id: Iceb48f0a6f0172a4de2d3da668a38c7977cf20dd\n" }, { "commit": "9b2c026f10f98dee726886ea1fadb698c9619456", "tree": "aaf51ab97c84edcc10f04dfe2c72e1b392d8cff4", "parents": [ "604b0eed1ff3f6f29c52395db8b986e7af181f6d", "5692a8ba5f8ff1ac988cbaf2622cc217d724109d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Oct 02 21:34:07 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 02 21:34:07 2018 +0000" }, "message": "Merge \"Dismiss Dialog in post instead of immediately\"" }, { "commit": "880aba2163ea81e68a193ad3cbd08a8e1be3542b", "tree": "23dfc3be214cbfe60d49927ffa12a45404edd4d8", "parents": [ "323a915bb320bc20a7746f48b74bf2fa1d21df2c", "6e5084164c4a5f005031c6e74e620b497fd7affa" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Oct 02 21:17:21 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 02 21:17:21 2018 +0000" }, "message": "Merge \"docs: fixing a couple of typos\" into pi-dev" }, { "commit": "b0cbd1637bbdf0506ca405c3053437d5772bd360", "tree": "5da9cf0fba876eb26e9d247eabf905257dea0172", "parents": [ "7c5c4d1ca8a0222fbb7bb552bfc641f271191a71" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Tue Oct 02 12:46:55 2018 -0700" }, "committer": { "name": "kopriva", "email": "kopriva@google.com", "time": "Tue Oct 02 12:51:17 2018 -0700" }, "message": "docs: fixing typo, bug 37006473\n\nalso fixing an import statement that was blocking upload at repo hooks:\nremoved unused SystemApi import\n\nTest: make ds-docs\n\nBug: 37006473\n\nChange-Id: I2dec10fad213c4822631ad0f9c518a89d6c0c384\nExempt-From-Owner-Approval: Docs-only change\n" }, { "commit": "bf1f2c455e078262fbae5d23a4bf7b6e1724c361", "tree": "31e1b1b14234172371fb5de137f5cda94dab75cb", "parents": [ "331a589684a5f9b9d2a9608db47a83741bb6c2d2", "1bceeaac8547a5bc3395f3a19351bf4cd84cc2a0" ], "author": { "name": "Leif Hendrik Wilden", "email": "leifhendrik@google.com", "time": "Tue Oct 02 11:06:14 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 02 11:06:14 2018 -0700" }, "message": "Merge \"Allow wifi and ethenet connected at same time.\" am: 54d34fe8a7\nam: 1bceeaac85\n\nChange-Id: I2b180336f74697ff5467c210eabccb4813ce317f\n" }, { "commit": "1bceeaac8547a5bc3395f3a19351bf4cd84cc2a0", "tree": "6bf2e6fc070ffb9a74dc663abc897d9fbbe326e2", "parents": [ "1ae9d0bced051a03dbc2fb1999bd16a6a4396176", "54d34fe8a7ae744c453341f6b1e0a98a18b54d15" ], "author": { "name": "Leif Hendrik Wilden", "email": "leifhendrik@google.com", "time": "Tue Oct 02 10:57:11 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 02 10:57:11 2018 -0700" }, "message": "Merge \"Allow wifi and ethenet connected at same time.\"\nam: 54d34fe8a7\n\nChange-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc\n" }, { "commit": "54d34fe8a7ae744c453341f6b1e0a98a18b54d15", "tree": "cb7200ac018812b24cb8c4c4f1ee898e6b7868b0", "parents": [ "45db25d74238db3bfeb8b3d98ae294ba1b7ce16d", "fd30663181ef3c54436aa45b9f86a2e71db4fe54" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Oct 02 17:09:16 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 02 17:09:16 2018 +0000" }, "message": "Merge \"Allow wifi and ethenet connected at same time.\"" }, { "commit": "5ed09e844b11d00976b6ab30334fbb1fa75669b5", "tree": "a395b03335c2968a2f140820cd42e60c1d83dda1", "parents": [ "6ef0182f07a5a5b53f46ed4d9921cc115ac77e36" ], "author": { "name": "Vishnu Nair", "email": "vishnun@google.com", "time": "Mon Jul 02 14:29:31 2018 -0700" }, "committer": { "name": "Nandana Dutt", "email": "nandana@google.com", "time": "Tue Oct 02 10:10:41 2018 +0100" }, "message": "Bugreport: Fix SystemUI service from being dumped twice 1/2\n\nBug: 110490179\nFix: 110490179\n\nTest: Manual test dumpsys activity\n adb shell dumpsys activity service all-platform-non-critical\n adb shell dumpsys activity service all-platform\n adb shell dumpsys activity service\n Take bugreport and check contents\n\nTest: atest FrameworksCoreTests:DumpUtilsTest\n\nChange-Id: I9173d3fa0cc3aaf42e3ab03e7e2892cf4188b13b\nMerged-In: I9173d3fa0cc3aaf42e3ab03e7e2892cf4188b13b\n(cherry picked from commit c69cd4480ee7dc06de8aacee399e19e99362ecb0)\n" }, { "commit": "a5866c647e8cc5fff695bec2262ea697475409cd", "tree": "1abcfea382c48dda90546375d2ad5ee8db180d13", "parents": [ "07a7250da3a0c08148bbf7efb915eac27e473305" ], "author": { "name": "Stanley Tng", "email": "stng@google.com", "time": "Tue Jun 19 08:48:10 2018 -0700" }, "committer": { "name": "Hansong Zhang", "email": "hsz@google.com", "time": "Mon Oct 01 21:49:13 2018 -0700" }, "message": "Add Feature Flag for Hearing Aid Profile\n\nUsing the Settings App-Developer Options-Feature Flag, allow the user to\nenable or disable the Hearing Aid Profile.\n\nBug: 116317072\nBug: 116044083\nTest: Manual testing using Settings App\nMerged-In: I58a9d339941e235242c443c85b6f4194b5a296c9\n(cherry picked from commit fe8c8337edc5e9d6b61d0942873538912d523db7)\n\nChange-Id: I7d0b6759e7acba3fb2a4d1afdba35d5a95387777\n" }, { "commit": "9c3f60d2f94fa19c1a06e58d3472797346f98677", "tree": "069d03940157934e49172b45aaebfde82bb5152c", "parents": [ "18ee2674092dbb58d9c55abd3b914e0ac9b08792", "c6f5643d966850a023ff9cae8af38b395898839b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Oct 02 00:53:40 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 02 00:53:40 2018 +0000" }, "message": "Merge changes from topic \"hearing-aid\" into pi-dev\n\n* changes:\n Fix missing connection state changes intent for Hearing Aids\n Add Feature Flag for Hearing Aid Profile\n Prevent NPE when profile is null\n Add isConnectedHearingAidDevice function to check if it supports Hearing Aid profile\n" }, { "commit": "6e5084164c4a5f005031c6e74e620b497fd7affa", "tree": "161ceac1a6fb0921b876195d0742c2005593bfb8", "parents": [ "18ee2674092dbb58d9c55abd3b914e0ac9b08792" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Mon Oct 01 15:54:49 2018 -0700" }, "committer": { "name": "kopriva", "email": "kopriva@google.com", "time": "Mon Oct 01 15:54:49 2018 -0700" }, "message": "docs: fixing a couple of typos\n\nTest: make ds-docs\n\nBug: 37130920\n\nChange-Id: Ic3d861624be12fd7967080a09a3f82d941d7e915\nExempt-From-Owner-Approval: Docs-only change\n" }, { "commit": "978a89cfcbcccac740bcf98574c04f0bd1d295df", "tree": "7cb081333f59635952fcbc8d8acdcc3e0c8e3929", "parents": [ "3bc799f6dcaf927c4bf0565e6c236ad1377d6033", "1f86e2f4cac7f0051abb17f3c1ed2d08a12e234f" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Mon Oct 01 12:03:55 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 01 12:03:55 2018 -0700" }, "message": "Merge \"docs: bug 72853855, wrong parameter\" into pi-dev\nam: 1f86e2f4ca\n\nChange-Id: I95b3d8fe6ca585a5dc4168ced763ae1a9a70feb7\n" }, { "commit": "3bc799f6dcaf927c4bf0565e6c236ad1377d6033", "tree": "70543f5512573a4cb553a982abca82ec859ac45b", "parents": [ "bfa9ed00e047c1cb150a40e649e85fc5b98f3126", "21155ef8bcc86adcb0708941b5e2625c41d634a7" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Mon Oct 01 11:58:15 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 01 11:58:15 2018 -0700" }, "message": "Merge \"docs: bug 72929620, nonoteslas typo\" into pi-dev\nam: 21155ef8bc\n\nChange-Id: I3db7fd7f549e0ca4fba7434cfbb6cb529ab9ca1e\n" }, { "commit": "bfa9ed00e047c1cb150a40e649e85fc5b98f3126", "tree": "84922e81ae509859650d432c6868a8b4cbba5d63", "parents": [ "1ecff64006b2f0e40fc2ef2af272ef489b826b77", "6ee6799c03969b94a134de2e64aefd8078c63380" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Mon Oct 01 11:52:43 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 01 11:52:43 2018 -0700" }, "message": "Merge \"docs: bug 112769174, unclosed parentheses\" into pi-dev\nam: 6ee6799c03\n\nChange-Id: I0d2c0adccb751909413f49c87238d12f4355558d\n" }, { "commit": "1ecff64006b2f0e40fc2ef2af272ef489b826b77", "tree": "c45d755821f1fef1cdac592c745a1f928fa118bf", "parents": [ "8fe3754f1a898b023c8e4c3cd9b42337638f7e21", "3e20983509153c2878cfcc5bc06816f129a5e0c1" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Mon Oct 01 18:41:37 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 01 18:41:37 2018 +0000" }, "message": "Merge \"Merge \"docs: fixed broken link\" into pi-dev am: bb2358dace\" into pi-dev-plus-aosp" }, { "commit": "3e20983509153c2878cfcc5bc06816f129a5e0c1", "tree": "6a5af3e7f37b5959181376769440fdaf23cfa4b5", "parents": [ "c182db322e8ad18eee688ada54b42e4633b9758e", "bb2358dacebda5158e51a62dcba7e01f5d61f3e6" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Mon Oct 01 11:40:53 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 01 11:40:53 2018 -0700" }, "message": "Merge \"docs: fixed broken link\" into pi-dev\nam: bb2358dace\n\nChange-Id: I64e84b541345a3bcb2264f5f8f3d88811c725839\n" }, { "commit": "8fe3754f1a898b023c8e4c3cd9b42337638f7e21", "tree": "b0919b6df711cafcc3add221abd3d15c4beed9a9", "parents": [ "c182db322e8ad18eee688ada54b42e4633b9758e", "f8ad474935c93ae3730e3a1b7f385029499e2de4" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Oct 01 11:40:25 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 01 11:40:25 2018 -0700" }, "message": "Merge changes from topic \"bugfix_content_path\" am: aa642187cd\nam: f8ad474935\n\nChange-Id: Ic5bbd68c327e6ad26ba3ddbd19ca5ea277396452\n" }, { "commit": "c182db322e8ad18eee688ada54b42e4633b9758e", "tree": "c202fb6e74403f6c47d69eda6fb4330b8ae1ef5f", "parents": [ "2089527f6057741e36ba4d92e69b5a93cfa0c74c", "53b7ed70b52a94a4951c7bd51c1c9b0f5e17f5cb" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Mon Oct 01 11:35:14 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 01 11:35:14 2018 -0700" }, "message": "Merge \"docs: bug 37113731, correcting flag name\" into pi-dev\nam: 53b7ed70b5\n\nChange-Id: Ib4d55f447b3727e6cb949cb832175686189d179c\n" }, { "commit": "f8ad474935c93ae3730e3a1b7f385029499e2de4", "tree": "dd12d9b7d4df32750b81331467c591f9c2270955", "parents": [ "00a23953a1b271a1ff4db0a81cb89dce038c1d5f", "aa642187cd840f4df33f54b75e6b602060a7904d" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Oct 01 11:25:38 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 01 11:25:38 2018 -0700" }, "message": "Merge changes from topic \"bugfix_content_path\"\nam: aa642187cd\n\nChange-Id: Ice15a2cffcaf96a370f8e73ebe0a25bdea67f1c3\n" }, { "commit": "2089527f6057741e36ba4d92e69b5a93cfa0c74c", "tree": "fa3b77e7a415262b815f9b3679fefb2568252804", "parents": [ "7bed76deaa1ad22a882a792d2e3e561c845066df", "00a23953a1b271a1ff4db0a81cb89dce038c1d5f" ], "author": { "name": "Torne (Richard Coles)", "email": "torne@google.com", "time": "Mon Oct 01 11:24:48 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 01 11:24:48 2018 -0700" }, "message": "Merge \"Check for null socket name in socket_connect_local.\" am: 1781dcc1c8\nam: 00a23953a1\n\nChange-Id: I063cfadb8bc0a6abb054e5c928705414e66594df\n" }, { "commit": "1f86e2f4cac7f0051abb17f3c1ed2d08a12e234f", "tree": "df80981c020b533a50279f912243bfbc59ccfc23", "parents": [ "21155ef8bcc86adcb0708941b5e2625c41d634a7", "b350c7e53ca511e906fc3a12e1ced0fb0401ff07" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 01 18:18:46 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 01 18:18:46 2018 +0000" }, "message": "Merge \"docs: bug 72853855, wrong parameter\" into pi-dev" }, { "commit": "21155ef8bcc86adcb0708941b5e2625c41d634a7", "tree": "d51ca685b12de12593165a931bc5026288c2e5b7", "parents": [ "6ee6799c03969b94a134de2e64aefd8078c63380", "b9cf1a1adabcb793d06450bab7acb4f960e493b9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 01 18:16:22 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 01 18:16:22 2018 +0000" }, "message": "Merge \"docs: bug 72929620, nonoteslas typo\" into pi-dev" }, { "commit": "6ee6799c03969b94a134de2e64aefd8078c63380", "tree": "2dbefa2dc0fdd28107881a3faf46160c97b2742f", "parents": [ "bb2358dacebda5158e51a62dcba7e01f5d61f3e6", "fdb0bffb0b17808db6fa6b5bac48f4405fb0ced2" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 01 18:16:16 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 01 18:16:16 2018 +0000" }, "message": "Merge \"docs: bug 112769174, unclosed parentheses\" into pi-dev" }, { "commit": "bb2358dacebda5158e51a62dcba7e01f5d61f3e6", "tree": "4806081b77ea019253ff370811fa9b274a11dee9", "parents": [ "53b7ed70b52a94a4951c7bd51c1c9b0f5e17f5cb", "4234f150ede16014a7ebbf6e22ac3977035645ca" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 01 18:15:42 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 01 18:15:42 2018 +0000" }, "message": "Merge \"docs: fixed broken link\" into pi-dev" }, { "commit": "aa642187cd840f4df33f54b75e6b602060a7904d", "tree": "9fedc42e171b42fadc3e0eba498ca4fd23ba347f", "parents": [ "1781dcc1c849ea1582ab233801a64cb2fe1098a7", "436b7b5634500690c34cee310247624dfd007006" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Oct 01 17:49:03 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 01 17:49:03 2018 +0000" }, "message": "Merge changes from topic \"bugfix_content_path\"\n\n* changes:\n Add OEM_SOUNDS_DIR variable\n Fix the bug that secondary storage path is judged as internal\n Revert \"MediaStore.Audio.Media.getContentUriForPath() returns unexpected content\"\n" }, { "commit": "00a23953a1b271a1ff4db0a81cb89dce038c1d5f", "tree": "d411ff131ed00a3989f454403625e810bba41af4", "parents": [ "a14f3d070c0f275ac148b1d3c4ce3c9559c12a48", "1781dcc1c849ea1582ab233801a64cb2fe1098a7" ], "author": { "name": "Torne (Richard Coles)", "email": "torne@google.com", "time": "Mon Oct 01 10:43:20 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 01 10:43:20 2018 -0700" }, "message": "Merge \"Check for null socket name in socket_connect_local.\"\nam: 1781dcc1c8\n\nChange-Id: I9cade977c561205e930c0506cabeb72b3c742f99\n" }, { "commit": "1781dcc1c849ea1582ab233801a64cb2fe1098a7", "tree": "f584e0aaceca32801049023d058379daaea3baab", "parents": [ "6bcb5d24e0528bd533845e1eb9dd805a7761f861", "771b187d9b31c6a7a3d4efa1187d5e028310ca0a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 01 17:26:56 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 01 17:26:56 2018 +0000" }, "message": "Merge \"Check for null socket name in socket_connect_local.\"" }, { "commit": "fd30663181ef3c54436aa45b9f86a2e71db4fe54", "tree": "a54c686c09b79020b237b94af9b763c46631943a", "parents": [ "3868fc30eee378979813fdad994e33be9a64e6fa" ], "author": { "name": "Leif Hendrik Wilden", "email": "leifhendrik@google.com", "time": "Wed May 02 12:05:24 2018 -0700" }, "committer": { "name": "Leif Hendrik Wilden", "email": "leifhendrik@google.com", "time": "Mon Oct 01 09:12:10 2018 -0700" }, "message": "Allow wifi and ethenet connected at same time.\n\nThis will improve the user experience on Android TV devices,\nsee bug for details.\n\nIn addition when connecting adb to the device by ethernet\nfor cts, wifi will not connect, causing lots of tests to fail.\nFor example:\n[CTS7.1]android.net.wifi.cts.WifiInfoTest#testWifiInfoProperties\n[CTS7.1]android.net.cts.ConnectivityManagerTest#testConnectivityChanged_\nmanifestRequestOnlyPreN_shouldReceiveIntent\n\nUse command:settings to put global wifi_data_always_on 1 to enable it.\n\nBug: 26102779\nTest: Manual, CTS.\nChange-Id: I711d93061a6bc7164d98a858912f781e1b967406\n" }, { "commit": "b0cac388e4f9dee9bc267b37cc983f52211c717b", "tree": "3064e746e184b07a0e9dc9cdf0da94e82e70ec39", "parents": [ "21c65aa9c43b1e9975906df04660b75e9b35a84a", "07012857ae52f008e20c360a314c5c6fcbff81b8" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sun Sep 30 23:15:42 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Sep 30 23:15:42 2018 -0700" }, "message": "Merge \"Make requestRouteToHost a no-op for system callers.\" am: f1bcfb6014\nam: 07012857ae\n\nChange-Id: Iefddec95271b56007794fa10f7f3a4122c68877e\n" }, { "commit": "07012857ae52f008e20c360a314c5c6fcbff81b8", "tree": "004169e583dd4ef22e1a4f01141b2563a52e5b77", "parents": [ "0d5a9168de63ce847a98c27ec140ca824f62e979", "f1bcfb6014ec1123763bafb437a784067a3fa31b" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sun Sep 30 23:00:08 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Sep 30 23:00:08 2018 -0700" }, "message": "Merge \"Make requestRouteToHost a no-op for system callers.\"\nam: f1bcfb6014\n\nChange-Id: I37ba2ef7ee7d052ec47c2d314f165315a13b06ac\n" }, { "commit": "f1bcfb6014ec1123763bafb437a784067a3fa31b", "tree": "5aa4ea9a9b5718c31a218e998ee7504a7dccec51", "parents": [ "182013682161b69a3a74e063cd89f6333ce2042a", "2e31a7c0044bbb477bcd967f5b13b00b2da085f6" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 01 05:36:28 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 01 05:36:28 2018 +0000" }, "message": "Merge \"Make requestRouteToHost a no-op for system callers.\"" }, { "commit": "2e31a7c0044bbb477bcd967f5b13b00b2da085f6", "tree": "8d51dcbc95aef3b3b117605b5f13ada5f63ab0b6", "parents": [ "5604cc2516c788ab6242aef72f851e8771a31161" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Sep 28 11:31:55 2018 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Mon Oct 01 12:05:42 2018 +0900" }, "message": "Make requestRouteToHost a no-op for system callers.\n\nEverything in the system should now be using proper multinetwork\nAPIs instead of this insecure and error-prone API.\n\nMake this method do nothing when called by the system. For now,\nkeep the code around for backwards compatibility for apps\ntargeting Android releases before M.\n\nBug: 25824776\nBug: 25876485\nTest: FrameworksNetTests pass\nTest: CtsNetTestCasesLegacyApi22 pass\nTest: CtsNetTestCasesLegacyPermission22 pass\nTest: android.net.cts.ConnectivityManagerTest passes\nChange-Id: I9b3557faccccc95c7b954db6a13b853b4c7edea0\n" }, { "commit": "755c78a8dd9d9ddb5e10235cf90cd33214fee660", "tree": "e77d77106af8f2ad6e55a553461e81c5549d8865", "parents": [ "c5f8d911a227a9db04ce7701172cd1db2fd910c9", "bc3c6b13146405b4f01a1a5139856c6e0edf1c0f" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Sun Sep 30 20:00:51 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Sep 30 20:00:51 2018 -0700" }, "message": "Merge changes I0f997d30,I288ba1f4 am: 53f8591789\nam: bc3c6b1314\n\nChange-Id: Icb2c5b89895976263cd713651778061d348ba368\n" }, { "commit": "bc3c6b13146405b4f01a1a5139856c6e0edf1c0f", "tree": "e2a9862074a96c8dfa1f1902bd7b7d2f599e5fa8", "parents": [ "77905523084d2ac7a334aa6bec3d9a1550e01268", "53f8591789fd90ac6678c052082d40b76f874615" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Sun Sep 30 19:53:29 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Sep 30 19:53:29 2018 -0700" }, "message": "Merge changes I0f997d30,I288ba1f4\nam: 53f8591789\n\nChange-Id: I8309074ba0744dee5789a2fe1f3b7e20bb3bc5b9\n" }, { "commit": "53f8591789fd90ac6678c052082d40b76f874615", "tree": "9b8f902540cd1a6e029d62d7ab07aed787261e59", "parents": [ "935f97ade553f95c9e250fdb16468fbda7187682", "e0d8c0e09e6e03c08b9f8ae1f7743de04060fde7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 01 02:18:46 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 01 02:18:46 2018 +0000" }, "message": "Merge changes I0f997d30,I288ba1f4\n\n* changes:\n Enable new DHCP server by default\n Use new DHCP server in TetheringTest\n" }, { "commit": "fdb0bffb0b17808db6fa6b5bac48f4405fb0ced2", "tree": "3a85b84dce743d72a1bcee08dbfc0af377522b73", "parents": [ "0712cf3e18ff0a5d0c82a598e0c1ece06b9820f2" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Sat Sep 29 15:22:41 2018 -0700" }, "committer": { "name": "kopriva", "email": "kopriva@google.com", "time": "Sat Sep 29 15:22:41 2018 -0700" }, "message": "docs: bug 112769174, unclosed parentheses\n\nTest: make ds-docs\n\nBug: 112769174\n\nChange-Id: I3322e06bf3b4624a7ed09dc476bdfe715ea0a27a\nExempt-From-Owner-Approval: Docs-only change\n" }, { "commit": "b9cf1a1adabcb793d06450bab7acb4f960e493b9", "tree": "fe29e09029bd81d7a6aff9cbc8f83264dacaf6e5", "parents": [ "0712cf3e18ff0a5d0c82a598e0c1ece06b9820f2" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Sat Sep 29 14:41:05 2018 -0700" }, "committer": { "name": "kopriva", "email": "kopriva@google.com", "time": "Sat Sep 29 14:41:05 2018 -0700" }, "message": "docs: bug 72929620, nonoteslas typo\n\nTest: make ds-docs\n\nBug: 72929620\n\nChange-Id: Ie6e5d3b8c0770ffb4ffb58b3e484e5cf30a9126f\nExempt-From-Owner-Approval: Docs-only change\n" }, { "commit": "b350c7e53ca511e906fc3a12e1ced0fb0401ff07", "tree": "f91845de044e56394f8bed6fe2e84ca809d492a7", "parents": [ "0712cf3e18ff0a5d0c82a598e0c1ece06b9820f2" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Sat Sep 29 14:22:07 2018 -0700" }, "committer": { "name": "kopriva", "email": "kopriva@google.com", "time": "Sat Sep 29 14:22:07 2018 -0700" }, "message": "docs: bug 72853855, wrong parameter\n\nTest: make ds-docs\n\nBug: 72853855\n\nChange-Id: Id6e64cba2af10488b677daabb5e113f278aa0f95\nExempt-From-Owner-Approval: Docs-only change\n" }, { "commit": "4234f150ede16014a7ebbf6e22ac3977035645ca", "tree": "69113e46942420cd17aa7ae4016ad52b7e2c013e", "parents": [ "0712cf3e18ff0a5d0c82a598e0c1ece06b9820f2" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Sat Sep 29 13:34:24 2018 -0700" }, "committer": { "name": "kopriva", "email": "kopriva@google.com", "time": "Sat Sep 29 13:34:24 2018 -0700" }, "message": "docs: fixed broken link\n\nTest: make ds-docs\n\nBug: 38410771\n\nChange-Id: I382d715b5e8ee62ae4a6a92f49bf39c9d47d2e39\nExempt-From-Owner-Approval: Docs-only change\n" }, { "commit": "50d0caa22e3490258b330c670ef63c1ee9aa693e", "tree": "430b99c9bbf03976595b063c0bc37718c4ac02c0", "parents": [ "5b1976e3389a1f4586309297f72b2bf662f06d64" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Fri Sep 28 18:59:55 2018 -0700" }, "committer": { "name": "kopriva", "email": "kopriva@google.com", "time": "Fri Sep 28 18:59:55 2018 -0700" }, "message": "docs: bug 37113731, correcting flag name\n\nTest: make ds-docs\n\nBug: 37113731\n\nChange-Id: I0679f161dbfd64c04cf0d94b431f60e616cbd757\nExempt-From-Owner-Approval: Docs-only change\n" }, { "commit": "f460471fa226ca424832f761afe86a1c2243d0e5", "tree": "5802338cabde7f3aa6ee9b4f42891008adf9fd5a", "parents": [ "efdd7bc91aceab88a6e97c1f2b87851c567555ba", "83919e0829d825bfddf6051c7dc09e11826ff809" ], "author": { "name": "Chenbo Feng", "email": "fengc@google.com", "time": "Fri Sep 28 12:32:50 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 28 12:32:50 2018 -0700" }, "message": "Merge \"Don\u0027t check qtaguid file unless using them\" am: c8482b39f1\nam: 83919e0829\n\nChange-Id: I6be72bb22da1aeed8dfe5eb4bbb05d8cfd9b4257\n" }, { "commit": "83919e0829d825bfddf6051c7dc09e11826ff809", "tree": "9c4dc3053e5e803db7f51db047329910e1b64cb8", "parents": [ "ee1cde53dec4486e0c9466c2456530eb2992f00a", "c8482b39f10784d123b807cf8c9d6c2633900e8b" ], "author": { "name": "Chenbo Feng", "email": "fengc@google.com", "time": "Fri Sep 28 12:15:54 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 28 12:15:54 2018 -0700" }, "message": "Merge \"Don\u0027t check qtaguid file unless using them\"\nam: c8482b39f1\n\nChange-Id: I53e5746c31bbfe3d660d730fbabcd1d241132221\n" }, { "commit": "c8482b39f10784d123b807cf8c9d6c2633900e8b", "tree": "8b4d2660e33a91d318bc7eb1c4a619404e9764c5", "parents": [ "3868fc30eee378979813fdad994e33be9a64e6fa", "f1ef0a89742d80ccf12c3fcbf1aaf84a643f2ade" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Sep 28 18:35:47 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 28 18:35:47 2018 +0000" }, "message": "Merge \"Don\u0027t check qtaguid file unless using them\"" }, { "commit": "efdd7bc91aceab88a6e97c1f2b87851c567555ba", "tree": "da2faf9d701d5ce4c2eb6bd98d159467949276de", "parents": [ "8217d911cccd0ffd4a045f3c8787df7f009e3191", "1f3c8278e810c0d0b075a0315ea886ba5459bbf7" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Fri Sep 28 10:00:21 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 28 10:00:21 2018 -0700" }, "message": "Merge \"DO NOT MERGE Add notification settings to backup\u0026restore\" into pi-dev\nam: 1f3c8278e8\n\nChange-Id: I505fb77cea4e861acea138c8661d535b752afae9\n" }, { "commit": "1f3c8278e810c0d0b075a0315ea886ba5459bbf7", "tree": "8e589b38efed9c61cf49f00a78effd087c6777c3", "parents": [ "311f0f5da50effd33772c7d43222141e4ce27bff", "95bd7221f6ea5f6aef834f4a71d03108fe1d2bde" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Sep 28 16:38:31 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 28 16:38:31 2018 +0000" }, "message": "Merge \"DO NOT MERGE Add notification settings to backup\u0026restore\" into pi-dev" }, { "commit": "771b187d9b31c6a7a3d4efa1187d5e028310ca0a", "tree": "862068d8c6c93be9a067a7c5698ee43a2d28049e", "parents": [ "3868fc30eee378979813fdad994e33be9a64e6fa" ], "author": { "name": "Torne (Richard Coles)", "email": "torne@google.com", "time": "Thu Mar 16 15:52:46 2017 +0000" }, "committer": { "name": "Torne (Richard Coles)", "email": "torne@google.com", "time": "Fri Sep 28 11:48:34 2018 -0400" }, "message": "Check for null socket name in socket_connect_local.\n\nsocket_bind_local checks if the name is null before using it, but\nsocket_connect_local doesn\u0027t, resulting in a segfault if you pass null\nas the socket name. Check for this and convert it to\nNullPointerException to make the crash more reasonable.\n\nTest: am instrument -w -e class android.net.LocalSocketTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner\nChange-Id: I67dedbe9ca1be6425e047496d0ead92eb7f64691\n" }, { "commit": "e0d8c0e09e6e03c08b9f8ae1f7743de04060fde7", "tree": "5b432c97a56fdc294f9c9d24cdfaf12d5610f456", "parents": [ "f5581f888e29689bcad0eb3366895de5e9e6bfd5" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed Sep 26 18:11:48 2018 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri Sep 28 12:43:47 2018 +0900" }, "message": "Enable new DHCP server by default\n\nRegression tests pass with aosp/764042.\n\nTest: regression automated tests, manual (verified WiFi, bluetooth\n tethering working).\nBug: b/109584964\n\nChange-Id: I0f997d302a1d85930b24139af76e9b9c9a1b5f78\n" }, { "commit": "0631cca3ff31c11abc55ca47a837b52140806848", "tree": "4ad76d75ccd00ac5dcaa8408e6ac18ff47cf6007", "parents": [ "353d7558b9fff104413d059dbab0c44fa956ab81", "311f0f5da50effd33772c7d43222141e4ce27bff" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Thu Sep 27 18:11:46 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 27 18:11:46 2018 -0700" }, "message": "Merge \"Keep app in high memory adjust if moving from TOP to FGS\" into pi-dev\nam: 311f0f5da5\n\nChange-Id: I941f1a8f9b6ee2c65ee289a159146d5b2ee95dcc\n" }, { "commit": "311f0f5da50effd33772c7d43222141e4ce27bff", "tree": "1df0a50b1db5cc303030f966118b31255ab3fe0c", "parents": [ "61a4d351007d85c15cf9085dd0787edfa805d635", "b735830a1e71e72c4e72260d7eab0382b4ee19df" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Sep 28 00:50:39 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 28 00:50:39 2018 +0000" }, "message": "Merge \"Keep app in high memory adjust if moving from TOP to FGS\" into pi-dev" }, { "commit": "e052af447d1c4f7018c538c87514dea7aea11137", "tree": "6c4924a41167ced65225e420095b5db2f9456a4f", "parents": [ "618073510643788668522afcf6e9c492ef096469", "9359f3683c73e03c4a775a2aecddb098e06d3158" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Thu Sep 27 13:24:29 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 27 13:24:29 2018 -0700" }, "message": "Merge \"docs: fix bug 37054309, becuase typo\" into pi-dev\nam: 9359f3683c\n\nChange-Id: I8ba3e3bd1d6aa296f216343d78cc252385ba64ba\n" }, { "commit": "9359f3683c73e03c4a775a2aecddb098e06d3158", "tree": "f7729fe29f423729bbb738d529cd345038d87e95", "parents": [ "3ae3f252b4e6897c98bc764be8a57d3f49f73c37", "7364c11185b474addcdd783a9a3756e99a91d983" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 27 20:03:29 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 27 20:03:29 2018 +0000" }, "message": "Merge \"docs: fix bug 37054309, becuase typo\" into pi-dev" }, { "commit": "7364c11185b474addcdd783a9a3756e99a91d983", "tree": "31a253451f96e1fdfa2e1495adb49e6dad114411", "parents": [ "562f5485d36ada3eddad31ed4ff079c4ab3a5c68" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Thu Sep 27 11:02:07 2018 -0700" }, "committer": { "name": "kopriva", "email": "kopriva@google.com", "time": "Thu Sep 27 11:02:07 2018 -0700" }, "message": "docs: fix bug 37054309, becuase typo\n\nTest: make ds-docs\n\nBug: 37054309\n\nChange-Id: I726ed84d62df4036cc274c48ae2f6968f2b7cc3f\nExempt-From-Owner-Approval: Docs-only change\n" }, { "commit": "81dfe744d643e0a9b4cb6d413d18d10e0a05c515", "tree": "a0e5eb92d6ee2c57110ba247bb9568e39e9dc087", "parents": [ "81462faf058284633b0c37f3e9aff2419013ed5f", "0cb277ef878e9627787c2845e86abb2c99be85b7" ], "author": { "name": "Lalit Maganti", "email": "lalitm@google.com", "time": "Thu Sep 27 16:40:44 2018 +0100" }, "committer": { "name": "Lalit Maganti", "email": "lalitm@google.com", "time": "Thu Sep 27 16:43:27 2018 +0100" }, "message": "resolve merge conflicts of 0cb277ef878e9627787c2845e86abb2c99be85b7 to pi-dev-plus-aosp\n\nBug: None\nTest: I solemnly swear I tested this conflict resolution.\nChange-Id: I7c5ad527cd57659a7ae1d913580bd1f613bee9dd\n" }, { "commit": "0cb277ef878e9627787c2845e86abb2c99be85b7", "tree": "e660e173f89e8f8238363665db0ae151913a86d5", "parents": [ "164774b7bb4581244be763c4d99070e8454e50fc", "ee5fc8831e75d6220d3ed04a676f83545ec8daa8" ], "author": { "name": "Lalit Maganti", "email": "lalitm@google.com", "time": "Thu Sep 27 16:24:42 2018 +0100" }, "committer": { "name": "Lalit Maganti", "email": "lalitm@google.com", "time": "Thu Sep 27 16:28:57 2018 +0100" }, "message": "resolve merge conflicts of ee5fc8831e75d6220d3ed04a676f83545ec8daa8 to stage-aosp-master\n\nChange-Id: Ibb00c2eb1e27914b361398c064715169d38a01fd\n" }, { "commit": "ee5fc8831e75d6220d3ed04a676f83545ec8daa8", "tree": "2a26a970131eb8d70c5edc08c0359aea4b6dc6e1", "parents": [ "4106e419b204c677afc1d9e216953ef4f04b3b73", "85b8c1fcf02ecf14e08408d21efdb125bd5ed8ed" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 27 14:35:13 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 27 14:35:13 2018 +0000" }, "message": "Merge \"Make pre-scale for absolute volume configurable\"" }, { "commit": "95bd7221f6ea5f6aef834f4a71d03108fe1d2bde", "tree": "a7d6c0073d943506c8ffdcd26320ff031a52b3fd", "parents": [ "3ae3f252b4e6897c98bc764be8a57d3f49f73c37" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Thu Jul 12 12:41:34 2018 -0400" }, "committer": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Thu Sep 27 13:54:15 2018 +0000" }, "message": "DO NOT MERGE Add notification settings to backup\u0026restore\n\nChange-Id: I421c7487955ee339f88e3957c973375d0f87e2ff\nFixes: 35655737\nTest: presubmit unit tests\n" }, { "commit": "85b8c1fcf02ecf14e08408d21efdb125bd5ed8ed", "tree": "c348a1ee1721007c4ac970bcf96e1b227c547f27", "parents": [ "473654c377279c16a42661d95ad1fbe80322d918" ], "author": { "name": "Tomoharu Kasahara", "email": "tomoharu.kasahara@sony.com", "time": "Thu Sep 06 20:04:38 2018 +0900" }, "committer": { "name": "Tomoharu Kasahara", "email": "tomoharu.kasahara@sony.com", "time": "Thu Sep 27 08:50:07 2018 +0900" }, "message": "Make pre-scale for absolute volume configurable\n\nAudio gain for lower volume steps are restricted for\nBluetooth Absolute Volume scenario, but it\u0027s better\nnot to use the fixed value.\nThis CL makes it possible to configure the value of\npre-scale.\n\nBug: 114220617\nTest: manual - gain is restricted as per the configuration\n\nChange-Id: I1fd0c77476386ba9518e1819d5ea2c7b0c344a40\nMerged-In: I1fd0c77476386ba9518e1819d5ea2c7b0c344a40\n" }, { "commit": "172efa1ed8dafc7270448a5aeb3155a9dee06e3f", "tree": "f0eab813f44a6935ec3b552535a7a052c21417d1", "parents": [ "c3ea0d3f799ec1ce7b42b159b80a5f5022bd9b07" ], "author": { "name": "Stanley Tng", "email": "stng@google.com", "time": "Tue Jun 19 08:48:10 2018 -0700" }, "committer": { "name": "Hansong Zhang", "email": "hsz@google.com", "time": "Wed Sep 26 14:10:44 2018 -0700" }, "message": "Add Feature Flag for Hearing Aid Profile\n\nUsing the Settings App-Developer Options-Feature Flag, allow the user to\nenable or disable the Hearing Aid Profile.\n\nBug: 116317072\nBug: 116044083\nTest: Manual testing using Settings App\nChange-Id: I58a9d339941e235242c443c85b6f4194b5a296c9\nMerged-In: I58a9d339941e235242c443c85b6f4194b5a296c9\n(cherry picked from commit fe8c8337edc5e9d6b61d0942873538912d523db7)\n" }, { "commit": "5017286aa1bac5ca4cd6a48ea8be0fbcc5e1ae92", "tree": "209a3e69ecb2a2c202732e3dd923ec83d9ca1f39", "parents": [ "3701764e81dc27f1023607e46c40c7a6f995882b", "deb51d84896525596f04a1543557040d8b41b3ff" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Sep 26 09:56:21 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 26 09:56:21 2018 -0700" }, "message": "Merge \"Fix ExternalStorageProvider always throw exception when rename\" am: 8883851c71\nam: deb51d8489\n\nChange-Id: I4411270b371f25d7a245f163db8d1a358426b6f2\n" }, { "commit": "deb51d84896525596f04a1543557040d8b41b3ff", "tree": "3292f830c78abe264fa095357314402c7e5d910e", "parents": [ "1f30b816d87397f75da60c76d34f307c5957f2c8", "8883851c7149879989391e259cb6c24132976c5d" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Sep 26 09:44:52 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 26 09:44:52 2018 -0700" }, "message": "Merge \"Fix ExternalStorageProvider always throw exception when rename\"\nam: 8883851c71\n\nChange-Id: I8c11434930de7f3f51fae6ca4666f1a00a265e64\n" }, { "commit": "7eeb25c5fd9b7f04d7afd1d7d28d516048dbeb7a", "tree": "105acd181bb8b1c228cc536e52f1ec9937699558", "parents": [ "a86151a911726ea293f374f0ee4a80c0992a6647", "33c3ab90e09168f7e781b4e32fa0d2dab5d95b13" ], "author": { "name": "vnori", "email": "vnori@google.com", "time": "Tue Sep 25 16:22:08 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 25 16:22:08 2018 -0700" }, "message": "Merge \"Add hidden API to return \"Uploading\" bit value from SDP record\u0027s MapSupportedFeatures.\" am: 51ec0ebbee\nam: 33c3ab90e0\n\nChange-Id: I05c8550bfece64e52a52f580f73d873a4a9851d8\n" }, { "commit": "ac4559936471ba7d4bc03f4cdc5763b91ed3384e", "tree": "6a33c75c077fab88bf474465314a88ad527c75e8", "parents": [ "e238a19aa5865f9073aab4955de5ab6a50ad09a0" ], "author": { "name": "Tony Huang", "email": "tonyychuang@google.com", "time": "Tue Sep 11 17:09:12 2018 +0800" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Sep 25 17:20:28 2018 -0600" }, "message": "Fix ExternalStorageProvider always throw exception when rename\n\nExternalStorageProvider always throw exception when renameDocument\nbecause it will check file exist when getFileForDocId. However,\nbeforeVisibleFile is not exist after rename, it will throw\nexception. Fix it by put getting beforeVisibleFile before rename.\n\nTest: manual test rename in DocumentsUI\nTest: atest RenameActualProviderUiTest\nFix: 113302685\nFix: 115304092\nChange-Id: I45d60d2f940e3dbc2b121f7cd28acc3c2d085ec4\nMerged-In: I45d60d2f940e3dbc2b121f7cd28acc3c2d085ec4\n" }, { "commit": "33c3ab90e09168f7e781b4e32fa0d2dab5d95b13", "tree": "3b6775b1305ceb2be214f3faaf8a9eda35d86bf9", "parents": [ "b869100b2a5a77c70e8b168a78b3c0792151f7b9", "51ec0ebbeebf79d62de82761ff8f0d5a2e2f56fb" ], "author": { "name": "vnori", "email": "vnori@google.com", "time": "Tue Sep 25 16:14:19 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 25 16:14:19 2018 -0700" }, "message": "Merge \"Add hidden API to return \"Uploading\" bit value from SDP record\u0027s MapSupportedFeatures.\"\nam: 51ec0ebbee\n\nChange-Id: I9df4af670df12ac2cd379c3bbee15e63b95bbf49\n" }, { "commit": "694752d5b9646c308f8b0258d66b249f9555d121", "tree": "8bec6b68690dbe8013a60f32c535ba74d70dbba4", "parents": [ "52a8fdb7bd6a6b2bf200b84ca829eec083f1d9e9" ], "author": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Fri Aug 17 17:25:28 2018 -0700" }, "committer": { "name": "vnori", "email": "vnori@google.com", "time": "Tue Sep 25 21:39:31 2018 +0000" }, "message": "Add hidden API to return \"Uploading\" bit value from SDP record\u0027s MapSupportedFeatures.\n\nBug: 111614861\nTest: tested w/ KitchenSink App\nChange-Id: I43895183d7b315f57257e1d2045f17dedcb0cfcd\n" }, { "commit": "3d54533e5297b089c1b2f53c12009a1506b06bad", "tree": "77ed9e16a9d410eb4f67f041f0d7bc611119cd38", "parents": [ "dd5e4bac4095b8c8049f851539fdb2b241722bf3", "3ae3f252b4e6897c98bc764be8a57d3f49f73c37" ], "author": { "name": "Nicole Borrelli", "email": "borrelli@google.com", "time": "Tue Sep 25 14:06:49 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 25 14:06:49 2018 -0700" }, "message": "Merge \"Fix malformed Javadoc.\" into pi-dev\nam: 3ae3f252b4\n\nChange-Id: Iea60c213e70a8878baeb59b9247ae4bf0eaf5a8d\n" }, { "commit": "3ae3f252b4e6897c98bc764be8a57d3f49f73c37", "tree": "ff9ee82f4e191d16cfcc165b457ff114a82282a2", "parents": [ "0f88f865bdce7cb15dc9872a2728cd593d5ac66e", "8a5f04a6a77bd31bd61ba43602e857cdd10d0b83" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 25 20:42:50 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 25 20:42:50 2018 +0000" }, "message": "Merge \"Fix malformed Javadoc.\" into pi-dev" }, { "commit": "dd5e4bac4095b8c8049f851539fdb2b241722bf3", "tree": "341a8423ae6312407de6dc69844b4f85e20ca706", "parents": [ "ed5362ac73f1ab1f5c81e6cd6110802318e81ce4", "0f88f865bdce7cb15dc9872a2728cd593d5ac66e" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Tue Sep 25 08:27:48 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 25 08:27:48 2018 -0700" }, "message": "Merge \"Truncate(*1) it if WAL file is too big when opening DB\" into pi-dev\nam: 0f88f865bd\n\nChange-Id: Ie14cea16f9cf89793a499a1b7c491ebc2f8a8829\n" }, { "commit": "0f88f865bdce7cb15dc9872a2728cd593d5ac66e", "tree": "17fb4348f68a2355e238f7b0e994fd651c5ed9e7", "parents": [ "45fda272111f43fe570540e9cf75772efa5c6cff", "0939c5a2b313d7fc32ca5e1a6c161b0089e141e9" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Tue Sep 25 15:12:15 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 25 15:12:15 2018 +0000" }, "message": "Merge \"Truncate(*1) it if WAL file is too big when opening DB\" into pi-dev" }, { "commit": "8879ee4a78bec7c12fbfc1a1074a0951197117b6", "tree": "09def46c9b4651c0473d331505575b65b5627bb4", "parents": [ "2abeaddf262459e5ab25afe939d8eb28c9c3e68b", "91d61ea0ed6edb3ff7d0017af120d19c6b75ba36" ], "author": { "name": "Adam Vartanian", "email": "flooey@google.com", "time": "Tue Sep 25 02:20:26 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 25 02:20:26 2018 -0700" }, "message": "Merge \"Inline two short methods from Conscrypt\" am: 9da9b33cc2\nam: 91d61ea0ed\n\nChange-Id: I541ff04bd67780e8920d802a7935c97e0adb535b\n" }, { "commit": "91d61ea0ed6edb3ff7d0017af120d19c6b75ba36", "tree": "2231c48717a3f80b182c5ac0f38777b4fedc4485", "parents": [ "a9fec7e73b4ecf6c8e657f52fa3c092c5f8a4ab6", "9da9b33cc288830e75c8509c60346b253ad3a797" ], "author": { "name": "Adam Vartanian", "email": "flooey@google.com", "time": "Tue Sep 25 02:04:57 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 25 02:04:57 2018 -0700" }, "message": "Merge \"Inline two short methods from Conscrypt\"\nam: 9da9b33cc2\n\nChange-Id: I4c66064ec1a0569f7766282d6dbee5202906ae00\n" }, { "commit": "0939c5a2b313d7fc32ca5e1a6c161b0089e141e9", "tree": "3accc1be6ef98fc2ef481e9ee84789ab0c02a7dc", "parents": [ "f76c383f82437814a8c8dfffc04d85b6c251d5ff" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Fri Aug 24 13:38:40 2018 -0700" }, "committer": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Mon Sep 24 22:47:02 2018 +0000" }, "message": "Truncate(*1) it if WAL file is too big when opening DB\n\n*1 -- not truncate(2) but \"PRAGMA wal_checkpoint(TRUNCATE)\"\n\nOtherwise, depending on how an app operate on a DB, SQLite may not\nhave a chance to \"shrink\" the WAL file.\n\nFixes: 112777941\nBug: 111939259\nTest: atest /android/master/frameworks/base/core/tests/coretests/src/android/database/sqlite/SQLiteCompatibilityWalFlagsTest.java\nTest: Manual test with google dailer:\n1. With normalized_spam.db-wal \u003e 100MB and receive a phone call\n-\u003e WAL file gets truncated to 0 bytes.\n\n2. Restart the dialer process and receive a phone call again\n-\u003e WAL file is already 0 bytes; won\u0027t be truncated.\n\n3. Restart with the WAL file deleted\nSame as #2. WAL file will be created before the added logic, but is 0 bytes,\nso it won\u0027t be truncated.\n\n4. Test with settings put global sqlite_compatibility_wal_flags truncate_size\u003d1024\n-\u003e make sure the threshold is overridden\n\nMerged-in: I2b193603e5dfa493ccccb8123db592f0e9c0e7ae\nChange-Id: I2b193603e5dfa493ccccb8123db592f0e9c0e7ae\n(cherry picked from commit 96e06002edc374511c545d96ae9b2b7c1e8d78ec)\n" }, { "commit": "bc75159db62cb6b7937d6321ff2ff754c8948881", "tree": "43345e56734f84215ce21c4b523071f05e282cec", "parents": [ "450cf9b931aec0735a90011cb7aa553934bf93aa", "45fda272111f43fe570540e9cf75772efa5c6cff" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Sep 24 15:22:37 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 24 15:22:37 2018 -0700" }, "message": "Merge \"Fixed when the CompatibilityBridge is attached to an activity.\" into pi-dev\nam: 45fda27211\n\nChange-Id: I420b0392602e0889862c7d77e62b614e2c5617bf\n" }, { "commit": "45fda272111f43fe570540e9cf75772efa5c6cff", "tree": "53f041e034b35c9e4ce5d6a60914ea329feb89fa", "parents": [ "81099601753f2f5f98f035b067d5c9bac976c263", "5cd660d5e9c56b6a9fdc2be6da7189a94e4d9396" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 24 22:04:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 24 22:04:27 2018 +0000" }, "message": "Merge \"Fixed when the CompatibilityBridge is attached to an activity.\" into pi-dev" }, { "commit": "fef5a7ab318ec6de29939f12063e45e0432ccbf0", "tree": "f04f84fb5d9477a7ef8fa52da4aaac9b75cb8d8b", "parents": [ "6351ab4769a0e5a3b0362287e652aa850016ee09", "f76c383f82437814a8c8dfffc04d85b6c251d5ff" ], "author": { "name": "Mike Ma", "email": "yanmin@google.com", "time": "Mon Sep 24 13:12:23 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 24 13:12:23 2018 -0700" }, "message": "Merge \"More robust read mechanism in KernelCpuProcReader\" into pi-dev\nam: f76c383f82\n\nChange-Id: I6b70fbe607adb37a93d764615decfca243eff347\n" }, { "commit": "f76c383f82437814a8c8dfffc04d85b6c251d5ff", "tree": "6cd11c586b8f66ce6bc43eedfaeb4a4690de7540", "parents": [ "860a3640d4583cda59e0b3b0f5ee343d305dd701", "5371273f02baf54c1b84771ea4a208976f75f114" ], "author": { "name": "Mike Ma", "email": "yanmin@google.com", "time": "Mon Sep 24 19:53:19 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 24 19:53:19 2018 +0000" }, "message": "Merge \"More robust read mechanism in KernelCpuProcReader\" into pi-dev" }, { "commit": "54148c0e572892284e7f72637581bf388c4e4a52", "tree": "923f85d0055a5b42930dd9d22625470846688b80", "parents": [ "f7190b65ab20a153191638c8ab2527994a56872a" ], "author": { "name": "Adam Vartanian", "email": "flooey@google.com", "time": "Thu Sep 20 15:15:56 2018 +0100" }, "committer": { "name": "Adam Vartanian", "email": "flooey@google.com", "time": "Mon Sep 24 15:34:13 2018 +0100" }, "message": "Inline two short methods from Conscrypt\n\nWe\u0027re trying to reduce unnecessary direct dependencies on Conscrypt.\nThese two methods are simple and the implementations can\u0027t change, so\nthey\u0027re good candidates for inlining directly instead of depending on\nthe Conscrypt implementation.\n\nBug: 110404540\nTest: atest NetworkSecurityConfigTests (same failures pre/post)\nChange-Id: I303d955e3f49885326fe75f451c06a52af745053\n" }, { "commit": "d837987639ad6c6816fed9268202b1974589ee7a", "tree": "1adc191327ae46ee894e4d89e5847dd5a147c49b", "parents": [ "522ff2b27b5d66f6883504222034f11cf4fd62e7", "98d747e7f3aefb7cb9376e4c4012cd61a3f88287" ], "author": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Sun Sep 23 02:50:22 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Sep 23 02:50:22 2018 -0700" }, "message": "Merge \"Fix the unresolved link/see tag error for framework docs\" into pi-dev\nam: 98d747e7f3\n\nChange-Id: Idf0fadc2d62c872c9bc82388f4d8fbcd58694e83\n" }, { "commit": "98d747e7f3aefb7cb9376e4c4012cd61a3f88287", "tree": "a4084e0e9ce5ae70a79b91c0e406ffc8e99408c1", "parents": [ "02bc7c222897bef3bae8c30874be06df13c98eae", "99adf3cb76a7800a9392a4c9a92b7a8a23b1cbc5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Sep 23 09:34:23 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Sep 23 09:34:23 2018 +0000" }, "message": "Merge \"Fix the unresolved link/see tag error for framework docs\" into pi-dev" }, { "commit": "99adf3cb76a7800a9392a4c9a92b7a8a23b1cbc5", "tree": "0768697dc36f39dc96d3cf423a2ff334faea6c6d", "parents": [ "562f5485d36ada3eddad31ed4ff079c4ab3a5c68" ], "author": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Fri Sep 21 14:51:38 2018 -0700" }, "committer": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Fri Sep 21 14:58:26 2018 -0700" }, "message": "Fix the unresolved link/see tag error for framework docs\n\nSynced with alanv@ that doc weren\u0027t federated against AndroidX yet, use\nthis v7 reference until they migrate the docs to AndroidX.\n\nTest: m -j offline-sdk-docs\nBug: b/116163454\nChange-Id: Ib5167c4815708d159945ce6db239f8debdf8f865\n" }, { "commit": "904252f7a30a6a89e23518c88b0c5b74c0be799a", "tree": "f6a9e8ed1dd53716d1d3289757537bd8d5b039ae", "parents": [ "8bb6b0a7fcd1d0db862b82fbcc0b1ce444d78362", "6729107f22a55dc46a2d996784dd24ef7209aec6" ], "author": { "name": "Jeffrey Vander Stoep", "email": "jeffv@google.com", "time": "Fri Sep 21 14:48:32 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 21 14:48:32 2018 -0700" }, "message": "Merge \"Add ConnectivityManager.getConnectionOwnerUid()\" am: f8529dc891\nam: 6729107f22\n\nChange-Id: I4ec4b9a8954deec001841566e0722caa1a3fa248\n" }, { "commit": "6729107f22a55dc46a2d996784dd24ef7209aec6", "tree": "98a9fcdef0fd04c17c4371ff02a80a747f6eac0c", "parents": [ "757692ae87818dfbeb7bda47a19932b9c65db2fc", "f8529dc8915f1cc2b03ad851c9b1bbbb8e5089a8" ], "author": { "name": "Jeffrey Vander Stoep", "email": "jeffv@google.com", "time": "Fri Sep 21 14:26:19 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 21 14:26:19 2018 -0700" }, "message": "Merge \"Add ConnectivityManager.getConnectionOwnerUid()\"\nam: f8529dc891\n\nChange-Id: Ib575a2a03c332d0143ed15652cc9c08c9cff694f\n" }, { "commit": "f8529dc8915f1cc2b03ad851c9b1bbbb8e5089a8", "tree": "623de6b3e9dfad65ec1f357aa3579cf0d321e553", "parents": [ "194170e7f7493c828235f325140dd860d31d077d", "0ac2c0945b00d7716319bc5aa86ce0b249f14cea" ], "author": { "name": "Jeffrey Vander Stoep", "email": "jeffv@google.com", "time": "Fri Sep 21 21:04:20 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 21 21:04:20 2018 +0000" }, "message": "Merge \"Add ConnectivityManager.getConnectionOwnerUid()\"" }, { "commit": "8bb6b0a7fcd1d0db862b82fbcc0b1ce444d78362", "tree": "61febf0bac9066a69f3869dc1d89541a47494712", "parents": [ "8c7b9a0847c8c37c9a2a3d4c5755a6a879da1153", "02bc7c222897bef3bae8c30874be06df13c98eae" ], "author": { "name": "David Castro", "email": "logophile@google.com", "time": "Fri Sep 21 12:53:01 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 21 12:53:01 2018 -0700" }, "message": "Merge \"docs: Removes reference to the clock displaying seconds\" into pi-dev\nam: 02bc7c2228\n\nChange-Id: If238e952c1a923f7ac5c251c7e5c2429bf890ddd\n" }, { "commit": "02bc7c222897bef3bae8c30874be06df13c98eae", "tree": "7c8476317d5878657d15c9701985d03d291facf1", "parents": [ "b6c84d1135ccea1e177e181934e7128b4f292496", "3e10355b99078ea2d0913f3daa31a3c517ee022e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Sep 21 19:40:38 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 21 19:40:38 2018 +0000" }, "message": "Merge \"docs: Removes reference to the clock displaying seconds\" into pi-dev" }, { "commit": "0ac2c0945b00d7716319bc5aa86ce0b249f14cea", "tree": "a9a28f0df49dc8748c727b6a0dae3cc01c68c969", "parents": [ "741521940a1b0d0b05b20719a38e3970917dd5ef" ], "author": { "name": "Jeff Vander Stoep", "email": "jeffv@google.com", "time": "Mon Jul 23 10:57:53 2018 -0700" }, "committer": { "name": "Jeffrey Vander Stoep", "email": "jeffv@google.com", "time": "Fri Sep 21 06:16:09 2018 +0000" }, "message": "Add ConnectivityManager.getConnectionOwnerUid()\n\nAllow VPN apps to lookup the UID owner of a network connection.\n\nRequires specifying the:\n - IP address and port for both the source and destination of a TCP\n connection.\n - IP address and port for either source and destination or just\n source for a UDP connection.\nOnly TCP and UDP protocols are supported. Only connections for UIDs\nthat apply to the calling VPN app will be resolved. This is intended\nto replace direct app access to /proc/net/{tcp,tcp6,udp,udp6}.\n\nThe implementation uses netlink inet_diag sockets[1] to perform\nthe lookup on TCP sockets as well as UDP sockets when supported\n(kernel has CONFIG_INET_UDP_DIAG\u003dy).\n\n[1] http://man7.org/linux/man-pages/man7/sock_diag.7.html\n\nBug: 9496886\nBug: 109758967\nTest: atest HostsideVpnTests\nTest: atest InetDiagSocketTest on Taimen with CONFIG_INET_UDP_DIAG\n and on Sailfish without CONFIG_INET_UDP_DIAG.\nChange-Id: I2bbc7072dd091e2e653dadf6dc05024c04180f34\n" }, { "commit": "acae1964ed6c521a622d104137884178743c6031", "tree": "f926f883865b7de0979428fd5818f73e388cceb2", "parents": [ "736571342186932ac6e93bd7b8b4d60901599d9d", "8deaf75cfd0474fc9b65ee6ed5fe2affb419a13e" ], "author": { "name": "Tianjie Xu", "email": "xunchang@google.com", "time": "Thu Sep 20 23:01:09 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 20 23:01:09 2018 -0700" }, "message": "Merge \"Remove the metrics report in recovery system\" am: aff3248507\nam: 8deaf75cfd\n\nChange-Id: Id480a047be0799d6afc7cda472b6d4e00b48ec48\n" }, { "commit": "8deaf75cfd0474fc9b65ee6ed5fe2affb419a13e", "tree": "5d7ff78c2365312b7d5875e29c07b9eb19984802", "parents": [ "3d70baf5ff7d26581766f56407103fbc163cdf7e", "aff3248507376eabb1d6e7090cd9329eadb07e04" ], "author": { "name": "Tianjie Xu", "email": "xunchang@google.com", "time": "Thu Sep 20 22:35:47 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 20 22:35:47 2018 -0700" }, "message": "Merge \"Remove the metrics report in recovery system\"\nam: aff3248507\n\nChange-Id: I62cd28099bb20ba2927f59554c81a2fdf4075626\n" }, { "commit": "f6b27fbff0f7130c704e5a50fa7c98a00855d332", "tree": "e0e8e14cbdc8f230fdf6a615c407368d8ee36f7f", "parents": [ "fc5c86fda8589d325470e403789bf6c60d1a9f66", "82b0d17b393783c5259bf183a7ded118d28e50cc" ], "author": { "name": "kopriva", "email": "kopriva@google.com", "time": "Thu Sep 20 16:55:47 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 20 16:55:47 2018 -0700" }, "message": "Merge \"docs: fixing several minor documentation bugs\" into pi-dev\nam: 82b0d17b39\n\nChange-Id: Ieb1447c0d7cda629338de8d6e03f46670d8ed0b0\n" }, { "commit": "8a5f04a6a77bd31bd61ba43602e857cdd10d0b83", "tree": "13a78601f1bd84748f1d94b300a3e15e14df8431", "parents": [ "82b0d17b393783c5259bf183a7ded118d28e50cc" ], "author": { "name": "Nicole Borrelli", "email": "borrelli@google.com", "time": "Thu Sep 20 14:19:14 2018 -0700" }, "committer": { "name": "Nicole Borrelli", "email": "borrelli@google.com", "time": "Thu Sep 20 23:33:20 2018 +0000" }, "message": "Fix malformed Javadoc.\n\nBug: 114244716\nChange-Id: I316e5fcbe742a57bbf997617f3afe01484f7d8a0\nTest: manual testing\n" }, { "commit": "82b0d17b393783c5259bf183a7ded118d28e50cc", "tree": "3c41bf256516b78a0621a8d8b81da7ff64939256", "parents": [ "679e58a8d30211ddff5470e9f34dc56aba83c642", "f07a46058cee7a23e1dc0676ba9ff264a7adf11f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 20 22:42:48 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 20 22:42:48 2018 +0000" }, "message": "Merge \"docs: fixing several minor documentation bugs\" into pi-dev" }, { "commit": "b735830a1e71e72c4e72260d7eab0382b4ee19df", "tree": "a30529bddb19872315dcbd712214f92a4d29c743", "parents": [ "82b413428e6b10d8d25d00ccb4c3b0b20e05e0a0" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Wed Sep 05 18:52:35 2018 -0700" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Thu Sep 20 22:38:56 2018 +0000" }, "message": "Keep app in high memory adjust if moving from TOP to FGS\n\nIf an app was in the TOP state and immediately moved\nto a foreground service state, then try harder to keep it\nin memory for another 20 seconds before releasing the\nmemory to bound foreground services. Using an oom_adj value\nof 50 which is between \"fore\" and \"vis\". So BFGS apps might\nget killed (\"vis\") before this recently FGS\u0027ed app. That\nway any app that has a lot of state in memory that it needs\nto persist before getting killed has a chance to do so.\n\nAlso bind NotificationListeners with a special bind flag\nto rank them below FGS (perceptible adj) so that they\ncan be killed before any other foreground services or\nbound services get killed.\n\nBug: 110969183\nTest: Manual for now. Take a bunch of portrait\n pictures and hit home, while being under memory\n pressure with a bunch of notification listeners.\nChange-Id: Ie8934c2331afe6450c582b209869aeca7272f58a\nMerged-In: Ie8934c2331afe6450c582b209869aeca7272f58a\n" }, { "commit": "fc5c86fda8589d325470e403789bf6c60d1a9f66", "tree": "8903ccbcddf1e43f497fb25a9faf9dc8a7b17fc9", "parents": [ "f255935dc822feee96655c1ee699795d7c62b1fc", "679e58a8d30211ddff5470e9f34dc56aba83c642" ], "author": { "name": "Nate Fischer", "email": "ntfschr@google.com", "time": "Thu Sep 20 13:30:49 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 20 13:30:49 2018 -0700" }, "message": "Merge \"WebView: fix TracingController example usage\" into pi-dev\nam: 679e58a8d3\n\nChange-Id: I72c29fdc11925668a781bbff355fc1c429c2a888\n" } ], "next": "679e58a8d30211ddff5470e9f34dc56aba83c642" }