)]}' { "log": [ { "commit": "565aa509524c0d3d078f03088ce19aff2c7bee62", "tree": "b5de6af75d20a19a226191045d01f2314f2cae56", "parents": [ "a6b1d730932709aca0f27c2265614d448ac5f57b", "e717e0cb4eb2465c62d31cfd46275484c5a3ad07" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 03 21:15:15 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jul 03 21:15:15 2018 +0000" }, "message": "Merge \"Initial UsageStatsDatabase Perf tests\"" }, { "commit": "e7ece5a69da5070b0fc24d96c368342244788e59", "tree": "b26058683ad09d99d540980157c23d586d4d927c", "parents": [ "0000c05486874aacc096d9a4290adda98f6198b3", "e1c0c2cb8dd5624d4b881f1ecfeef66fc86890f0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 03 17:41:21 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jul 03 17:41:21 2018 +0000" }, "message": "Merge \"Fix leak where system held onto slice providers\"" }, { "commit": "e1c0c2cb8dd5624d4b881f1ecfeef66fc86890f0", "tree": "b174dd76e7b0fa34072324440e6d740ca3728472", "parents": [ "af5753836912a1c76ac35071b8343a6d00782d9e" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Tue Jul 03 11:08:32 2018 -0400" }, "committer": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Tue Jul 03 11:08:32 2018 -0400" }, "message": "Fix leak where system held onto slice providers\n\nTest: uiservicestests\nBug: 110985973\nChange-Id: Ie8fab3c7b8c22d302825fb147d2c3468f9ae7172\n" }, { "commit": "e939d86df92fba473e9a96043156fe0e0f0e741e", "tree": "3c58ae165844aa57054e845732a9059ef70d155a", "parents": [ "9e01f4293c9c8fbec62eb197d8e3f3fee6485872", "0ede70112046b3a48afd81d8e4363cf94812099f" ], "author": { "name": "Carmen Jackson", "email": "carmenjackson@google.com", "time": "Mon Jul 02 19:02:23 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 02 19:02:23 2018 -0700" }, "message": "Merge \"Add in-app tracepoints to TouchLatency app.\" am: 674fd12278 am: b6d12b8bb1\nam: 0ede701120\n\nChange-Id: Iee202f3c645249109a7f27ba393bb41c50b6b9e8\n" }, { "commit": "b6d12b8bb1d2445b74fab21ac5a5f1337bb3194a", "tree": "345faab8cdfcf05a59fdc3ebc474cde854ae6d6f", "parents": [ "0571b04c3a4921e948023c83fe8d194e960a2195", "674fd12278cff52a9a9793b78a84386a1c908ebf" ], "author": { "name": "Carmen Jackson", "email": "carmenjackson@google.com", "time": "Mon Jul 02 17:57:29 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 02 17:57:29 2018 -0700" }, "message": "Merge \"Add in-app tracepoints to TouchLatency app.\"\nam: 674fd12278\n\nChange-Id: I69a89ba6fac90a454a1d8befe9317af25979ccbf\n" }, { "commit": "286cfb1bba198f016660419b0c1f8e5a6d7a7d90", "tree": "b369bb4b658c36bb5e01615421a3ac2373b58761", "parents": [ "ccd6a0f6c29c53ba204ad4f8d7ec29bfc4a8bf14" ], "author": { "name": "Carmen Jackson", "email": "carmenjackson@google.com", "time": "Thu Jun 28 15:15:44 2018 -0700" }, "committer": { "name": "Carmen Jackson", "email": "carmenjackson@google.com", "time": "Mon Jul 02 14:40:23 2018 -0700" }, "message": "Add in-app tracepoints to TouchLatency app.\n\nTest: Traced the TouchLatency app and saw the added tracepoints.\nChange-Id: I72ab8f88731e635f98831f045dddd086a05acc3b\n" }, { "commit": "855f0f03e1168d0e4002b6bc866dd794c0a94b55", "tree": "4b4be4c0ac90fee067a080cb94b8fb48f8a41c02", "parents": [ "36a9fa62be38db3d19cd1cfab5fdc8d14197d912", "9f52c2da2401fb67ae2a6c71246a84da2040f7d2" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri Jun 29 02:15:47 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 29 02:15:47 2018 +0000" }, "message": "Merge \"Disable hidden API checks on unit tests\"" }, { "commit": "fc1bde926188d4183dddb4b80341a2109b91986c", "tree": "9c8d5cb4904e16cdb01a41f14ec5abd1b1f71627", "parents": [ "5ae46260e45be2bf1214ed9e24203ad786181089", "3580a6a9966ee6fcb487e09b49445ac8c318b76a" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 25 06:24:22 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 25 06:24:22 2018 -0700" }, "message": "Merge \"Prefer default Internet network for upstream tethering.\"\nam: 3580a6a996\n\nChange-Id: I0990d077627aed71b03e7aa40a8acc460448a774\n" }, { "commit": "72302908d42d8317b69da68285898d995523a33f", "tree": "0ef3117722824df2e392015bacb579cc2439a56c", "parents": [ "a0b9309ba2724e29c7e204dc84e5c50fe3431d98" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 14 17:36:40 2018 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 25 19:25:17 2018 +0900" }, "message": "Prefer default Internet network for upstream tethering.\n\nRather than use the crufty config.xml list of upstream transport types,\nuse ConnectivityService\u0027s notion of the default network for the upstream.\nIn cases where a DUN network is required and the default network is\ncurrently a mobile network, look for a DUN network (code in Tethering\nis currently responsible for requesting one).\n\nTest: as follows\n - built, flashed, booted\n - runtest frameworks-net\n - tethered via mobile, joined captive portal network, maintained\n laptop access via mobile until captive passed (then used wifi)\n - disabled client mode wifi, disabled mobile data, plugged in\n ethernet adapter, observed connectivity via ethernet\nBug: 32163131\nBug: 62648872\nBug: 63282480\nBug: 109786760\nBug: 110118584\nBug: 110260419\nMerged-In: I9cddf1fb7aa3b8d56bf048c563556244e74808c2\nMerged-In: Icac3e5e20e99093ddb85aae1ca07ed7b5cf309fd\nChange-Id: I925b75994e31df8046f3ef9916a2457b4210485e\n(cherry picked from commit 4080a1bd15572caf149762e45c958627feceb74d)\n" }, { "commit": "e717e0cb4eb2465c62d31cfd46275484c5a3ad07", "tree": "b46f775bde78cc59fb3a28ea6189121b9caec2b7", "parents": [ "f52474bc41e2f58b8b8b8bfabe3c66b9197ff148" ], "author": { "name": "Michael Wachenschwanz", "email": "mwachens@google.com", "time": "Tue Jun 19 14:44:35 2018 -0700" }, "committer": { "name": "Michael Wachenschwanz", "email": "mwachens@google.com", "time": "Thu Jun 21 15:59:49 2018 -0700" }, "message": "Initial UsageStatsDatabase Perf tests\n\nA suite of simple performance test for UsageStatsDatabase. They measure\nthe time it take to write and read UsageEvents to and from a file.\n\nBug: 110428559\nTest: atest UsageStatsPerfTests\nChange-Id: If1558515e1da9e22fb56bc13f8e89c10c51a1625\n" }, { "commit": "ff5f4868b36684d7b100a2abfeb80b50f7901d1b", "tree": "b45d2b4183f480297bb747af4fea410bbcf35304", "parents": [ "a1867d61c3015be1d52e88e41118c27d7f29d6e0", "05778e562c6680347ea70c83da02d9e0deea20d0" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 20 23:23:25 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 20 23:23:25 2018 -0700" }, "message": "Merge \"Add StackedLinkProperties test case\" am: faf31f8638 am: 946957bc32\nam: 05778e562c\n\nChange-Id: I2228d19282a9871c04e2529304c4fd99bd4d01f4\n" }, { "commit": "05778e562c6680347ea70c83da02d9e0deea20d0", "tree": "b1494ad26b6132d6892e5c1de40dd80270a55fb9", "parents": [ "016dff400bd0dce86cd2b394dca475deac27c734", "946957bc324c1edc9b5a85f260d3eaa70b4fe8fb" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 20 21:52:15 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 20 21:52:15 2018 -0700" }, "message": "Merge \"Add StackedLinkProperties test case\" am: faf31f8638\nam: 946957bc32\n\nChange-Id: Idebb0fc4279a059bddecffc563bdf3ddf394002c\n" }, { "commit": "946957bc324c1edc9b5a85f260d3eaa70b4fe8fb", "tree": "5abbfa09f4aafb8c401321a4aba56d7f4233787e", "parents": [ "26f781db62e49e311009fc7a39155f72ab174d94", "faf31f86381122507398624698b7c89273f01ff5" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 20 21:23:17 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 20 21:23:17 2018 -0700" }, "message": "Merge \"Add StackedLinkProperties test case\"\nam: faf31f8638\n\nChange-Id: I33d75bf593708317dca4ba6cec035b7f035cfa86\n" }, { "commit": "94c3e1be78e5cb5843235e35c185e78952613da6", "tree": "9f5b21b3072145c9c96deb67ec724f41bdecac96", "parents": [ "b6528dadf087a2a20ede8d403ee200118060b273", "a2dd9f8578fa90d7dbbdf39b18052a894ab0967d" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 20 01:32:10 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 20 01:32:10 2018 -0700" }, "message": "Merge \"Prefer default Internet network for upstream tethering.\" into pi-dev am: 1e1635a45e\nam: a2dd9f8578\n\nChange-Id: Icac3e5e20e99093ddb85aae1ca07ed7b5cf309fd\n" }, { "commit": "a2dd9f8578fa90d7dbbdf39b18052a894ab0967d", "tree": "932c63d534bcfeef97a7ea388d857d0caa5d4b19", "parents": [ "0418143f6dce2e0203415d87eb7ad133d716f07e", "1e1635a45e5cad1bca08ac71b9a4175fd1d5990b" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 20 01:14:14 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 20 01:14:14 2018 -0700" }, "message": "Merge \"Prefer default Internet network for upstream tethering.\" into pi-dev\nam: 1e1635a45e\n\nChange-Id: I9cddf1fb7aa3b8d56bf048c563556244e74808c2\n" }, { "commit": "4080a1bd15572caf149762e45c958627feceb74d", "tree": "502437ba95ee765c537903adb11d94c0da3ebdbf", "parents": [ "1b65af27d897ccfbfb7b61c7176cb6a670a9519c" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 14 17:36:40 2018 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 19 20:57:21 2018 +0900" }, "message": "Prefer default Internet network for upstream tethering.\n\nRather than use the crufty config.xml list of upstream transport types,\nuse ConnectivityService\u0027s notion of the default network for the upstream.\nIn cases where a DUN network is required and the default network is\ncurrently a mobile network, look for a DUN network (code in Tethering\nis currently responsible for requesting one).\n\nTest: as follows\n - built, flashed, booted\n - runtest frameworks-net\n - tethered via mobile, joined captive portal network, maintained\n laptop access via mobile until captive passed (then used wifi)\n - disabled client mode wifi, disabled mobile data, plugged in\n ethernet adapter, observed connectivity via ethernet\nBug: 32163131\nBug: 62648872\nBug: 63282480\nBug: 109786760\nBug: 110118584\nBug: 110260419\nChange-Id: I925b75994e31df8046f3ef9916a2457b4210485e\n" }, { "commit": "4a192e2bba63b1b13030273b9fcc92932235179f", "tree": "0c8bdaf0c18588adbde0e50b31747b161f59aa91", "parents": [ "a9bf7a881056cda29ee2dc04179ed9a89e5884a0" ], "author": { "name": "junyulai", "email": "junyulai@google.com", "time": "Wed Jun 13 15:00:37 2018 +0800" }, "committer": { "name": "junyulai", "email": "junyulai@google.com", "time": "Tue Jun 19 16:53:08 2018 +0800" }, "message": "Add StackedLinkProperties test case\n\nChange access level of getNetworkAgentInfoForNetwork in ConnectivityService to get\nbetter testability. And add test case to verify clat state transition and make sure\nlinkProperties are updated correctly.\n\nBug: 80261579, 109913107\nTest: runtest frameworks-net -c com.android.server.ConnectivityServiceTest \\\n -m testStackedLinkProperties\nChange-Id: I72fce594d74bd349f65557edca03640e1b86317c\n" }, { "commit": "92f2661ce18d7a847457bf3c33d191807af87121", "tree": "95580b8e0d4a63c764a5db159af3a1dd48ab5c38", "parents": [ "208d21b66d50b124aa30a8a0f54b1d52a4b7ac2a", "a2f5d7481c18ae87e693b2555841ee7601d19534" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Mon Jun 18 01:37:04 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 18 01:37:04 2018 -0700" }, "message": "Merge \"Apf: Avoid constant overflow\" am: 5b99659943 am: 4afe1f957b\nam: a2f5d7481c\n\nChange-Id: I5b33123f2044cc00c5516be8bcbe82591c78b670\n" }, { "commit": "4afe1f957b41727931895c8529f4840ddbc4d8b2", "tree": "8a3b775aa57b96a463edef79ddc093dacf147c8b", "parents": [ "84c9e9a787a7b51ccf958e2449762125ff5f4830", "5b99659943e274252ed9e658b6dddb0e5b13119c" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Mon Jun 18 01:20:28 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 18 01:20:28 2018 -0700" }, "message": "Merge \"Apf: Avoid constant overflow\"\nam: 5b99659943\n\nChange-Id: Iacf849e3739f24cd430e6210a2e6a1c67ae0614f\n" }, { "commit": "5b003117b296346003d511903806f519d8e881cb", "tree": "0a884f72a6233c1bbdd3e78f8212a64f62cadc25", "parents": [ "bfa58946f7b3cdb53f8f188b102864efd8bcf411" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Wed Jun 13 11:35:16 2018 -0700" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Thu Jun 14 08:43:07 2018 -0700" }, "message": "Apf: Avoid constant overflow\n\nThe used constant overflows. This is irrelevant to the test, so\ndecrease test constant.\n\nBug: 110155920\nTest: m javac-check RUN_ERROR_PRONE\u003dtrue\nChange-Id: Idfc7e987ba9c36389a20c7fc01b1161ef89483d8\n" }, { "commit": "04d9cb5f401e74ad2e34baa4e7b20e280590fe02", "tree": "45c3178cb34ca0901e9ff36d02211686203fa5ac", "parents": [ "8bb0cc2f5dd814fbed6ea19870bf0cb9e0fe5c3d" ], "author": { "name": "Wale Ogunwale", "email": "ogunwale@google.com", "time": "Mon Apr 30 13:55:07 2018 -0700" }, "committer": { "name": "Wale Ogunwale", "email": "ogunwale@google.com", "time": "Tue Jun 12 13:38:39 2018 -0700" }, "message": "Moved some activities implementation to ActivityTaskManagerService (2/n)\n\nSecond step in unifying the window hierarchy that is currently split\nwithin AM and WM packages. We move some of the API implementation for\nactivities from ActivityManagerService.java to\nActivityTaskManagerService.java.\n\nTest: Existing tests pass\nTest: go/wm-smoke-auto\nBug: 80414790\n\nChange-Id: I23dcd924493d8ad1e0b6e3a55386fd72b0146605\n" }, { "commit": "5d63f152ba74319e415d1a5fa1fb837e74049bbc", "tree": "890787a50846097faab5f41cd6b57a794bdc0b80", "parents": [ "fc4383389d62f5b65fe9e1328575053b7c397754", "b0df70b6edd13235abde3a0fa526a9938088a267" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Sat Jun 09 09:43:53 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jun 09 09:43:53 2018 -0700" }, "message": "Merge \"Disable the AppOp Restriction for IpSec Tunnels\" into stage-aosp-master am: bda7c96038\nam: b0df70b6ed\n\nChange-Id: Idb6ff2adc72d0a293e1d99c287d0df68df88fe79\n" }, { "commit": "65406494e75a73e38e01a63f0a2f4670bf0ba7be", "tree": "e4bf9be030bc4637a7976a5b491a711a5f2e2555", "parents": [ "401c4b1d00d6f831eb30d1853683ca525d50f192" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Tue May 15 19:18:38 2018 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Fri Jun 08 23:23:04 2018 +0000" }, "message": "Disable the AppOp Restriction for IpSec Tunnels\n\nThis CL temporarily removes the AppOp restriction\nthat disallows creation of IpSec tunnels due to\nthe lack of the appropriate AppOp in AOSP/master.\nWhen the relevant framework merges out to master,\nthis CL should be reverted.\n\nManually merging this due to skipping a merge\nconflict at ef9f2740a790feceaa47a24b1a179e93c4ffb5e6\n\nBug: none\nTest: compilation\nChange-Id: Ic06c193f85f6bcdd0ead4238825c1add78703cde\n" }, { "commit": "b2749539c05cfb296a5729fcba887057b9c94307", "tree": "36926edb1904c481433d0ea52583efe49dfeb90d", "parents": [ "7db23752abfbb31111969ee335a36b42ceeedc5e", "8c69bcbb8f626fee128d8f771568fbc22615a9f5" ], "author": { "name": "nharold", "email": "nharold@google.com", "time": "Fri Jun 08 17:07:11 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 08 17:07:11 2018 +0000" }, "message": "Merge changes from topic \"ipsec-sync-with-pi\"\n\n* changes:\n Disable the AppOp Restriction for IpSec Tunnels\n Rework Exception Handling for IpSecManager\n Update IpSecManager to use InetAddress and prefixLen\n Add AppOps Checks for MANAGE_IPSEC_TUNNELS\n Add MANAGE_IPSEC_TUNNELS Permission\n" }, { "commit": "8c69bcbb8f626fee128d8f771568fbc22615a9f5", "tree": "c47fd972b912fda2029002dd2c43697d9e1ddd2c", "parents": [ "144ce0a2485b061b4ae9090b2b9f558e6e3d0e04" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Tue May 15 19:18:38 2018 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Thu Jun 07 18:44:34 2018 -0700" }, "message": "Disable the AppOp Restriction for IpSec Tunnels\n\nThis CL temporarily removes the AppOp restriction\nthat disallows creation of IpSec tunnels due to\nthe lack of the appropriate AppOp in AOSP/master.\nWhen the relevant framework merges out to master,\nthis CL should be reverted.\n\nBug: none\nTest: compilation\nChange-Id: Ic06c193f85f6bcdd0ead4238825c1add78703cde\n" }, { "commit": "fdda5697d7ccc61b5692a8b2e5116afcb4921c09", "tree": "cb5de16a444bc2ce251adcb193d8700340a06d2e", "parents": [ "21208eeccc0f0b5cffebda5ec972bdc765afe6a8" ], "author": { "name": "Benedict Wong", "email": "benedictwong@google.com", "time": "Tue Apr 03 20:30:54 2018 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Thu Jun 07 18:42:52 2018 -0700" }, "message": "Update IpSecManager to use InetAddress and prefixLen\n\nLinkAddress constructors are currently @hide; this change updates\nIpSecManager to use InetAddress and prefixLen, and then construct a\nLinkAddress internally. LinkAddress is used over the binder interface to\nIpSecService to ensure validity.\n\nBug: 77528639\nTest: CTS, Java unit tests ran on walleye\nMerged-In: I19e124adef6d9f4992d8293db3190bcf74c95848\nChange-Id: I19e124adef6d9f4992d8293db3190bcf74c95848\n(cherry picked from commit 3f2c54b7820c3a568890700479230966fdbcf0a4)\n" }, { "commit": "21208eeccc0f0b5cffebda5ec972bdc765afe6a8", "tree": "27737c9e3731a73e7c0f2ef705769b5415e10f3b", "parents": [ "01b61dbd53e23db6f5a6d52eec39ff2d4c1e5501" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Thu Mar 15 18:06:06 2018 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Thu Jun 07 18:42:52 2018 -0700" }, "message": "Add AppOps Checks for MANAGE_IPSEC_TUNNELS\n\nAdds support for a new AppOp to permit services to\nuse IpSec tunnel mode. The IpSecService now needs\na context so change the service mode to a cached\nservice rather than a static service.\n\nBug: 66955045\nTest: runtest frameworks-net\nMerged-In: I17a4a286225b432c3e15ea1587d946189931b4f4\nChange-Id: I17a4a286225b432c3e15ea1587d946189931b4f4\n(cherry picked from commit 592dadbd43fcb7c5d67e737adb34d07923da90c4)\n" }, { "commit": "b044b885cf51ef350745e9178e763c0b4db8a86a", "tree": "c7619cd158ef8798e3b4ca6f4c96de0024269ab9", "parents": [ "f907578564f4594a05de4b57689c27d1a3e3936c", "b04a511ac41ebef78b7260427968eb7ddba945e5" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 06 08:25:45 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jun 06 08:25:45 2018 +0000" }, "message": "Merge changes Ia764b341,I4e4b41bb,I61b262d8,Ie6ace6bd,I21e866c7, ...\n\n* changes:\n Let tests enumerate all transports/capabilities.\n Destroy networks as soon as they are disconnected.\n Fix a ConcurrentModificationException crash.\n Unify behavior of various cases of \"no underlying networks\"\n Fix: VPNs update caps upon underlying network disconnect.\n Add tests for setUnderlyingNetworks.\n Fix setCapabilities.\n Fix SSID not being logged by the validation logs\n Make sure getActiveNetwork is consistent with default callbacks\n Add tests for getActiveNetwork.\n Guard the SSID with NETWORK_SETTINGS\n Add a new ssid field in NetworkCapabilities.\n Notif manager and captive portal app to read SSID again\n Remove unwanted capability from the java-doc\n Actually @hide unwanted capability methods.\n API council requested tweaks to NetworkRequest.\n Add OEM_PAID capability to system api\n add airplane mode shell commands to connectivity\n Enable cleartext for captive portal apps\n Expose CONNECTIVITY_ACTION to Instant Apps\n fix isActiveNetworkMetered with VPNs\n" }, { "commit": "3bd570585717624c0387a13a5f82bff89d41856d", "tree": "c0ffd70274bfa823582ab9a01de868fd5862a08e", "parents": [ "8d53829ca05f4fe663f6afce65c0831854a92dee" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Mon May 21 15:30:56 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 06 08:25:10 2018 +0000" }, "message": "Unify behavior of various cases of \"no underlying networks\"\n\nBefore this change, VPNs having no underlying networks would be\nmarked as metered as the safe option, but VPNs having only\ndisconnected underlying networks would be marked as unmetered.\nFix this discrepancy.\n\nClean cherry-pick of ag/4113809\n\nBug: 79748782\nTest: runtest frameworks-net\nChange-Id: Ie6ace6bd95139605ffcfa8cd6c15cf28f8fa28c8\nMerged-In: If19b85325e7d684e645470293b3c8a674084c641\nMerged-in: I22f80a6a39d4a19ff74aa61fcbd66f1a041b1003\n" }, { "commit": "8d53829ca05f4fe663f6afce65c0831854a92dee", "tree": "92adb7739486b0107b8e0e23ad7a3c1c8d82b7d4", "parents": [ "f666d0a21a5e57f5a21a6e6346f271725a7dd68f" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri May 18 22:02:56 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 06 08:25:02 2018 +0000" }, "message": "Fix: VPNs update caps upon underlying network disconnect.\n\nClean cherry-pick of ag/4083954\n\nBug: 79748782\nTest: ConnectivityServiceTests still pass\nChange-Id: I21e866c723099e5c3dee54ff13e830d44427fc7a\nMerged-In: I12c948ebeb2b74290908f8320ff77220dc4a9fb9\n" }, { "commit": "f666d0a21a5e57f5a21a6e6346f271725a7dd68f", "tree": "70e53e221d5ad7fbd70d6790db5b8c419478f41f", "parents": [ "d1d8b627dd23b0bda8399a04b04320498271a105" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri May 18 21:47:45 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 06 08:24:51 2018 +0000" }, "message": "Add tests for setUnderlyingNetworks.\n\nFixes come later. This is complex enough as it is.\n\nClean cherry-pick of ag/4083953\n\nBug: 79748782\nTest: new test passes, old tests still pass\nChange-Id: If7276fe1f751be7b9c18f689e97699e566e5bde0\nMerged-In: I12c948ebeb2b74290908f8320ff77220dc4a9fb9\n" }, { "commit": "d1d8b627dd23b0bda8399a04b04320498271a105", "tree": "d7fb197c46f7af13071b16d9e5eca60e6af07d15", "parents": [ "fdd9e2f73a779c54a661d768709c02d699b872ca" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri May 18 23:48:49 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 06 08:24:43 2018 +0000" }, "message": "Fix setCapabilities.\n\nP introduced setSSID, UIDs and unwanted capabilities.\nNone of these exhibit commutative behavior through combineCapabilities\nbecause their semantics don\u0027t allow it. Therefore\nNetworkRequest.setCapabilities() is badly broken around any of\nthese. Look at the comments in the new tests to realize the\nextent of the damage.\n\nClean cherry-pick of ag/4083952\n\nBug: 79748782\nTest: new tests written, old tests pass\nChange-Id: Iafe074126132a82af37f4bf056c4a7b8d56bdc83\nMerged-In: Ia5bebf8a233775367bbf1b788870528934ecbcfb\nMerged-In: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1\n" }, { "commit": "ff8710aec0bdbc93b5f746b1864208e59baa87e7", "tree": "06029919a4284232f350c3c73f8ae0398a5c0a13", "parents": [ "3e2fb66e74b145e091db92a294c83cfc7d0251c4" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Apr 18 20:18:38 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 06 08:24:21 2018 +0000" }, "message": "Make sure getActiveNetwork is consistent with default callbacks\n\nAlmost clean cherry-pick of ag/3889538.\n\nBug: 77737389\nTest: runtest framework-net\n new test don\u0027t pass without the main code change, but they\n do with it\nChange-Id: I0cd83a935ab0b349aa47e065b830e5a43ab9a091\nMerged-In: Iaa0285825735d3f16bba6e4946723a437fd9b0b9\nMerged-In: Ia8f985b448251f911484e6bd63fa562bffc1b0e4\n" }, { "commit": "3e2fb66e74b145e091db92a294c83cfc7d0251c4", "tree": "4a7d35ed24c7c77798fbcacbe630c2ecf6750dde", "parents": [ "7a635d853dc6ea29cff86574cfb9399424034dda" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Apr 18 19:18:58 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 06 08:24:12 2018 +0000" }, "message": "Add tests for getActiveNetwork.\n\nClean cherry-pick of ag/3918295\nOne-line adjustment for ag/3638326 which has not been put in AOSP.\n\nBug: 77737389\nTest: runtest frameworks-net\nChange-Id: I03ae2bbb08559f2cd44979e291c1f5d50eb215da\nMerged-In: Iaa0285825735d3f16bba6e4946723a437fd9b0b9\nMerged-In: Ia8f985b448251f911484e6bd63fa562bffc1b0e4\n" }, { "commit": "6bc18fbb5d4ebe31d7cf1e6677133953710f83f2", "tree": "b765a854b8e4c7efb6da0750de747739b1b1411e", "parents": [ "39620248d785b2219e0aca94ed37db7ca13dff11" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Apr 11 21:09:10 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jun 06 08:23:52 2018 +0000" }, "message": "Add a new ssid field in NetworkCapabilities.\n\nClean cherry-pick of ag/3887737\n\nBug: 77891227\nTest: frameworks-net\nChange-Id: Icefe1657bca52b913a72b56705342a7285769658\nMerged-In: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda\nMerged-In: I6dd1aba6fde5a502b4a9145cf16393d8ce623c89\n" }, { "commit": "6cc8a8464c1399c0de76785710cc16fd30c90740", "tree": "31799fec2c7f071c58cee6cf8cc54753a0a899be", "parents": [ "be0f557e3ad01caef7ff58ff479ed85eaf8dee20", "a5b35c7850eac1e7bec95c786554d360f6f55a8a" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 04 12:23:28 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 04 12:23:28 2018 -0700" }, "message": "Merge \"Send empty LinkProperties when entering StoppedState.\" am: 59ccf1041f am: 48b64fd9f2\nam: a5b35c7850\n\nChange-Id: I01995b2b18154877792a2dffed0a19642264a758\n" }, { "commit": "a5b35c7850eac1e7bec95c786554d360f6f55a8a", "tree": "d914c748650c7796f9e52403c2c8f912ca5bbca4", "parents": [ "9217ae6feb89a48c4e76b00688e73470c6bebb39", "48b64fd9f2745ebf28431965102cfeb6caae44df" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 04 11:49:28 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 04 11:49:28 2018 -0700" }, "message": "Merge \"Send empty LinkProperties when entering StoppedState.\" am: 59ccf1041f\nam: 48b64fd9f2\n\nChange-Id: Ib946351005140d59e6a559610aa7448ab19c2630\n" }, { "commit": "f8bba5bfc76cd06c0527b00fad3abe0828455f29", "tree": "c17faa55f6798c3f595a61dd9667ed77506e1826", "parents": [ "59ccf1041fcb74b495dbbe0b06b8eaf466a4ce29" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri May 18 16:09:24 2018 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 04 18:31:27 2018 +0900" }, "message": "Clear IPv4 address on tethering teardown.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\n - wlan0 in STA mode, wlan1 up/down in AP mode\n no lingering IPv4 mode\n - USB tethering up/down works\n - bluetooth tethering yields:\n05-18 17:50:49.726 719 756 D TetherController: untetherInterface(bt-pan)\n05-18 17:50:49.729 1194 1230 E Tethering: [bt-pan] ERROR Failed to clear IPv4 address on interface bt-pan: java.lang.IllegalStateException: command \u0027224 interface setcfg bt-pan 0.0.0.0 0\u0027 failed with \u0027400 224 Failed to clear address (No such device)\u0027\n which is acceptable (no actual crash, just a log message)\nBug: 79905644\nMerged-In: Ie898adc4efbb7376f0297abacdfe39c8700f0722\nMerged-In: I9eb44eaf4e99fa85fff2909524ee88673bdcf1fd\nMerged-In: Iaf29788a6692d810f3160e3f21d06b7452ecbaa6\n\n(cherry picked from commit 472276a874316b725027098b79e1c9f03c62cad2)\n\nChange-Id: Icb5c4f7971af4715c7662f80194b4c1ce369a135\n" }, { "commit": "59ccf1041fcb74b495dbbe0b06b8eaf466a4ce29", "tree": "fb255658e5a6d92bd195a1bc407fdd0f8f2e7cf6", "parents": [ "bd83ac0ecc1239643f1df3a002fd1ae580734b07", "c8cb0f71d2ad872773cd275e5a8d93190d56ee66" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 04 07:41:51 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 04 07:41:51 2018 +0000" }, "message": "Merge \"Send empty LinkProperties when entering StoppedState.\"" }, { "commit": "796c7b35214a22bd6a5d245b64c7a721cc414d9d", "tree": "8d68b466dd0a53a0c47dcbd33496006e1b4f20cc", "parents": [ "55740b7b1c91c363c21120f4a0be369b68179d66", "91368ac791d9f2a05fb04e3af8c44135667b4bab" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 01 06:31:36 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 01 06:31:36 2018 -0700" }, "message": "Merge \"Clear IPv4 address on tethering teardown.\" into pi-dev am: 36d41793e2\nam: 91368ac791\n\nChange-Id: I9eb44eaf4e99fa85fff2909524ee88673bdcf1fd\n" }, { "commit": "91368ac791d9f2a05fb04e3af8c44135667b4bab", "tree": "167a2534adf992474332a228a3118c4e0ee55fdf", "parents": [ "137f9f65a9481f131fec5dd07538bd6c95edcd2c", "36d41793e2bdf9d9bfaca08f184c82250f7f27e4" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 01 04:51:36 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 01 04:51:36 2018 -0700" }, "message": "Merge \"Clear IPv4 address on tethering teardown.\" into pi-dev\nam: 36d41793e2\n\nChange-Id: Ie898adc4efbb7376f0297abacdfe39c8700f0722\n" }, { "commit": "472276a874316b725027098b79e1c9f03c62cad2", "tree": "5c70367a092d926a342483355e06d904ac0f40e4", "parents": [ "7d2d403a83dcf39a843ab495a6431341d8e54d2a" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri May 18 16:09:24 2018 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 01 14:23:51 2018 +0900" }, "message": "Clear IPv4 address on tethering teardown.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\n - wlan0 in STA mode, wlan1 up/down in AP mode\n no lingering IPv4 mode\n - USB tethering up/down works\n - bluetooth tethering yields:\n05-18 17:50:49.726 719 756 D TetherController: untetherInterface(bt-pan)\n05-18 17:50:49.729 1194 1230 E Tethering: [bt-pan] ERROR Failed to clear IPv4 address on interface bt-pan: java.lang.IllegalStateException: command \u0027224 interface setcfg bt-pan 0.0.0.0 0\u0027 failed with \u0027400 224 Failed to clear address (No such device)\u0027\n which is acceptable (no actual crash, just a log message)\nBug: 79905644\nChange-Id: Iaf29788a6692d810f3160e3f21d06b7452ecbaa6\n" }, { "commit": "41c279655ae3ca2500e99f96875d327e0d9a886b", "tree": "b87aca6fb3d4e5886dcc00ef77a60bd796d70c74", "parents": [ "a2897b5c9873bc2696bdf03fbfc6d970ebefdb72", "e6657a0ccaee9aa384e3bc3375a740aa7379c53f" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu May 31 12:29:56 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 31 12:29:56 2018 -0700" }, "message": "Merge \"Add missing dependencies for libdexfile\" am: 286aa939af am: e78185076c\nam: e6657a0cca\n\nChange-Id: Iffd8c3a616771ad43d0189f2d5726f53d64475e5\n" }, { "commit": "e6657a0ccaee9aa384e3bc3375a740aa7379c53f", "tree": "2b9ae517ea84ecfe3dfa2010cd161ba53f240523", "parents": [ "d955cdf88938b9af74c85fc511a589ec6a9c46d8", "e78185076cba1a9c7de581943b2e15b49af9ae8b" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu May 31 11:25:40 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 31 11:25:40 2018 -0700" }, "message": "Merge \"Add missing dependencies for libdexfile\" am: 286aa939af\nam: e78185076c\n\nChange-Id: Icc5446f1ecfb88a292ac63058f7c4f44922e9a89\n" }, { "commit": "286aa939afaa12a57a4a78bdccd1e8ff2dce2087", "tree": "c72ec73eb605dc170d98e6d952947ec6c4124e53", "parents": [ "39ac9ffe271df436435cc422456f706d6770f6f9", "76be372bac89003d1ec68470a571b67e3efb5526" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu May 31 02:23:17 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu May 31 02:23:17 2018 +0000" }, "message": "Merge \"Add missing dependencies for libdexfile\"" }, { "commit": "836bfe5f74be7e46caf84ea7b3e7ad3006b3284a", "tree": "68335c241a37e9c567adbdecddcdb07d95ff5427", "parents": [ "2f5bf3386b1f893ca862d22c5d899cd27654ee23", "4cdb2b7ece44e0c688fc2a6e085a5eec2ad462b5" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu May 31 00:05:53 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 31 00:05:53 2018 +0000" }, "message": "Merge \"Fix testRegisterUsageCallback failure in setUp\"" }, { "commit": "8f2cd87fc03d1d15b76dc6840eda781bcc65b291", "tree": "6f497dc89adb05906c17a6411f307b7066722b31", "parents": [ "f6af5cade7de7a26c8f5b3e8ea053126ede6379f", "872accd1e04901f6fe2ed1fcec8048350aa1d36e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 29 23:41:52 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 29 23:41:52 2018 -0700" }, "message": "Merge \"Use AAPT2 for more modules with manifest validation errors\" am: ce1979d707 am: da6fcd1f9a\nam: 872accd1e0\n\nChange-Id: I36ca83766ab9d5c0d54c9acdefb31838686028f8\n" }, { "commit": "872accd1e04901f6fe2ed1fcec8048350aa1d36e", "tree": "49931e7f6ee24c9abbd3bde52a27d7e5a5d72ab9", "parents": [ "59e792baebd23551138e0e7895f5b85fbffb29bf", "da6fcd1f9af15168964086ec9c4a4a1c8bfadf5a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 29 23:31:12 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 29 23:31:12 2018 -0700" }, "message": "Merge \"Use AAPT2 for more modules with manifest validation errors\" am: ce1979d707\nam: da6fcd1f9a\n\nChange-Id: Ib73e574214064ba0c4112e901d9997724ecd7cb8\n" }, { "commit": "ce1979d70769e7bc42a06baaab217b3a2c4d4b6d", "tree": "0ca646de26ac830dd79885ee85c84f32a02d18d8", "parents": [ "ad769993a96c55d5570b73e1d2e0eb9b093d3236", "2f4bf5423d742ca6df4488d9df61f794ea2e82f1" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed May 30 05:01:08 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed May 30 05:01:08 2018 +0000" }, "message": "Merge \"Use AAPT2 for more modules with manifest validation errors\"" }, { "commit": "76be372bac89003d1ec68470a571b67e3efb5526", "tree": "ab9572f5ef64fe4ede608515680e8f75c9b0cf08", "parents": [ "f98f8a4c6c70ed459d04874796c5c0744100c8e8" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 30 13:52:08 2018 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 30 13:55:51 2018 +0900" }, "message": "Add missing dependencies for libdexfile\n\nSince a dependency was added to libartbase from libdexfile, this test\nhas been failing because of the missing deps. As discussed both\nlibartbase and its non-NDK dependencies need to be added.\n\nBug: b/79785496\nBug: b/80082746\nTest: ApfTest and UidRangeTest now pass in master, still pass in aosp\nChange-Id: Ia2c140514d7405d701c3ec520b77663abe2b34d5\n" }, { "commit": "9f52c2da2401fb67ae2a6c71246a84da2040f7d2", "tree": "fc285b9de0372fc548661c31665d3c7a10006b45", "parents": [ "f98f8a4c6c70ed459d04874796c5c0744100c8e8" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 29 17:28:22 2018 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 30 10:23:59 2018 +0900" }, "message": "Disable hidden API checks on unit tests\n\nTests still fail with NoSuchMethodError / NoSuchFieldError but it would\nbe expected without this option.\n\nTest: tests build, although they fail as much as previously\nMerged-In: I0e4517312cac9b37537eee55eafd811aff531ea8\nMerged-In: I012a1ce8483f5fdddf60cfd33ea4303d72455fca\nChange-Id: I25e225212fb3b3bb90ddfb66d9bd92b3efd1a4cd\n" }, { "commit": "25e2f562285585e4533ab554bbe5f2b6d889cbe9", "tree": "224e493cf91da3a26c0f176eddaff23801ee5841", "parents": [ "fa0c303d1a697035012a44b902a239072f54efcd", "1a9156978f74b6169502532e49959e044917c36f" ], "author": { "name": "Nicolas Geoffray", "email": "ngeoffray@google.com", "time": "Tue May 29 10:56:00 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 29 10:56:00 2018 +0000" }, "message": "Merge \"Escape \"$\" in script generated when simpleperf_app is true.\"" }, { "commit": "1a9156978f74b6169502532e49959e044917c36f", "tree": "fa794e6032b7d7373a21a45766606fb40ec222f4", "parents": [ "5cbad094828b5e563f8960c811f2f2f1f1329e1e" ], "author": { "name": "Nicolas Geoffray", "email": "ngeoffray@google.com", "time": "Fri May 25 11:20:01 2018 +0100" }, "committer": { "name": "Nicolas Geoffray", "email": "ngeoffray@google.com", "time": "Tue May 29 10:48:16 2018 +0100" }, "message": "Escape \"$\" in script generated when simpleperf_app is true.\n\nbug: 80265465\nTest: adb shell \"am instrument -e simpleperf_app true -e apps com.google.android.youtube^Youtube -e launch_directory /data/local/tmp -w com.android.tests.applaunch com.android.tests.applaunch/android.test.InstrumentationTestRunner\"\n\nChange-Id: I6d0113019c019dac856bf613408d278713ca8585\n" }, { "commit": "bf58e7646031887706dd97f71c7aaba68ea4d25a", "tree": "17af6f4723b5aa986986d4931d4313f8ed66775a", "parents": [ "6229f47d7d151277bd74175a59f2636e3b79a4ba", "b1883f9abbbf939fe719849134173ba83e974976" ], "author": { "name": "Bernie Innocenti", "email": "codewiz@google.com", "time": "Mon May 28 21:40:37 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 28 21:40:37 2018 -0700" }, "message": "Merge \"apf: Increase test coverage of LDDW / STDW\" am: e03b8ee7e0 am: 0bf54f4a2e\nam: b1883f9abb\n\nChange-Id: Iada367d6083c7dd2724e748bba09a0819c3d0285\n" }, { "commit": "b1883f9abbbf939fe719849134173ba83e974976", "tree": "dfdd336ea8febdfd675032295235041ee3ca7696", "parents": [ "d181b01ce325ba5c329c1e9585bdde8fec9d8850", "0bf54f4a2e92dd0da35851b9e2e69a1825b5d6dc" ], "author": { "name": "Bernie Innocenti", "email": "codewiz@google.com", "time": "Mon May 28 21:29:32 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 28 21:29:32 2018 -0700" }, "message": "Merge \"apf: Increase test coverage of LDDW / STDW\" am: e03b8ee7e0\nam: 0bf54f4a2e\n\nChange-Id: Ifa016ce8a4fcb3a43a03d0f1126c01638cbf21ef\n" }, { "commit": "e03b8ee7e0bc1a585f4847f5ab1d564bdc56e3f6", "tree": "d1bbf5aa734a9dc07bf791b16f7f7d1808ca1bf1", "parents": [ "8a984b9f08058531a480acf5b9bda7e40a31fb98", "3d479d9ad89c966755a323331cad3e5fbc1c15ad" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 29 02:33:22 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue May 29 02:33:22 2018 +0000" }, "message": "Merge \"apf: Increase test coverage of LDDW / STDW\"" }, { "commit": "c8cb0f71d2ad872773cd275e5a8d93190d56ee66", "tree": "51f525001ed5ac796075dbec6709dbffd71de986", "parents": [ "f98f8a4c6c70ed459d04874796c5c0744100c8e8" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Dec 11 14:24:08 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon May 28 17:51:24 2018 +0900" }, "message": "Send empty LinkProperties when entering StoppedState.\n\nAdditionally, no longer try to transition from within a State\u0027s\nenter() method (this can encounter Log.wtf()s). Introduce some\nCMD_JUMP_* commands and use deferMessage().\n\nTest: as follows\n - built, flashed, booted\n - runtest -x IpClientTest passes\n - basic DHCP wifi association works\nBug: 69800563\nBug: 70394432\nBug: 80284937\nChange-Id: I7ed6e1a994a3556af345e8a4dfb51c383f6d5478\n(cherry picked from commit ffacb517d40df8ebb52d5906fa844b20c6520cd8)\n" }, { "commit": "2f4bf5423d742ca6df4488d9df61f794ea2e82f1", "tree": "8c465ddf0fa0a58ef9fb4e5b4798701531a4e804", "parents": [ "daff857ffd12e7df74b162714ef58dcc5071592e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri May 18 09:50:29 2018 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sat May 26 10:32:26 2018 -0700" }, "message": "Use AAPT2 for more modules with manifest validation errors\n\nAdd LOCAL_AAPT_FLAGS +\u003d --warn-manifest-validation to the modules\nthat have manifests that AAPT2 can\u0027t parse.\n\nBug: 79755007\nTest: m checkbuild\nChange-Id: I5f20ca582e481f7dac7b6a236662a2d1f47ea9fa\n" }, { "commit": "96dbac0c5cf4088d1b71ff4ff432bcc61f270087", "tree": "415555123d0cca1826fb5025b6178b71ca567c8b", "parents": [ "d01890df3ce3ee71b752fbeb15686d6c8740a10d", "fe530062ff99ffa61061fd2d66da0c41649df3c9" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri May 25 03:27:39 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri May 25 03:27:39 2018 +0000" }, "message": "Merge \"Migrating remaining core networking tests to Junit4\"" }, { "commit": "7b0935509d0d894084cda8cd1f516108433ec620", "tree": "996dabfd063bdc48aa26abc71c165273a06b3ebc", "parents": [ "a7183b92c41d4c595b20323e5a3e153d7bf9c014", "9f85505432aa1e4b17a4bb938cf529bfe38c564e" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu May 24 07:53:00 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu May 24 07:53:00 2018 +0000" }, "message": "Merge changes I3b3bcbbd,I18b3f263,I3c416c1a\n\n* changes:\n Use CaptivePortalProbeSpec method in portal app\n Add configurable captive portal probes\n Move CaptivePortalProbeResult to its own file\n" }, { "commit": "fe530062ff99ffa61061fd2d66da0c41649df3c9", "tree": "b9864479412d732666eb7081437c7a721d1dd819", "parents": [ "6fa8d06c78d21d455015e19691d5d6f2e6bd258b" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Oct 12 13:04:54 2017 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu May 24 16:24:47 2018 +0900" }, "message": "Migrating remaining core networking tests to Junit4\n\nBug: 62918393\nTest: runtest frameworks-net\nMerged-In: I30f7eaa0307b8fad5a8de7a0da235a4f76c18677\n(clean cherry-pick of I30f7eaa0307b8fad5a8de7a0da235a4f76c18677)\n\nChange-Id: I272fea0bb4a9e7f6252bb3bd14a6b769a082039e\n" }, { "commit": "13e6e21db9f6362041bd0d7f835d2ed247b9158f", "tree": "d90dc8458b24066d5672add17720fc081af04152", "parents": [ "d57329d8537add164833a58af436d1d059b08fab" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 22 10:01:53 2018 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu May 24 12:08:36 2018 +0900" }, "message": "Add configurable captive portal probes\n\nThe probes allow testing for a configurable status code and location\nheader (regexes). They are disabled by default, so this CL is a\nno-op unless the probe configurations are pushed.\n\nBug: b/79499239\nTest: tests in CL pass, manual: captive portal login works\nMerged-In: Iec7a74bbf2569a91e958c497200d77e8451cbf7b\nMerged-In: Ia958815325d1466345e9626efc8f62fc9d08d774\n(clean cherry-pick of pi-dev I785723aaed06054b9aa8ebff77803f23d7836db9)\n\nChange-Id: I18b3f263fed08fa4fee20d5e88f3ec8647d7f835\n" }, { "commit": "d57329d8537add164833a58af436d1d059b08fab", "tree": "c763fc2eaedf86621793f202733a2fdc4347a811", "parents": [ "6fa8d06c78d21d455015e19691d5d6f2e6bd258b" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 22 09:58:19 2018 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu May 24 12:04:27 2018 +0900" }, "message": "Move CaptivePortalProbeResult to its own file\n\nThis is necessary to resolve visibility issues for the next change.\n\nBug: b/79499239\nTest: runtest frameworks-net\nMerged-In: Ia48b32307a51a66f2672d7112f71166dd6db41b1\nMerged-In: I5df7ee9f16bc6be4f02353d40a843a383dd4cbd9\n(Clean cherry-pick of pi-dev I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299)\n\nChange-Id: I3c416c1a91ebfdf914fd528ff8ab73e3eb490562\n" }, { "commit": "7bea387500da0a49b0d8892442ef5e2c93a4017e", "tree": "2bd07675b18da9b3b256124a58099c90da1d4b1a", "parents": [ "dd194d2e20811a217134b8c681d76f44416841a6", "23d3487caaad1bd20ad50251311018cb852802f4" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 23 17:15:44 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 23 17:15:44 2018 -0700" }, "message": "Merge \"Add configurable captive portal probes\" into pi-dev am: 1f8f21af60\nam: 23d3487caa\n\nChange-Id: Ia958815325d1466345e9626efc8f62fc9d08d774\n" }, { "commit": "23d3487caaad1bd20ad50251311018cb852802f4", "tree": "9bf3b63731eadd812e0de5e1bdf3ce7c217286f2", "parents": [ "8c4a97a2f8944c6ad9e77951dd7a85dcd3b249e4", "1f8f21af607b6a8449a509d8482f92a194fc1c99" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 23 15:22:24 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 23 15:22:24 2018 -0700" }, "message": "Merge \"Add configurable captive portal probes\" into pi-dev\nam: 1f8f21af60\n\nChange-Id: Iec7a74bbf2569a91e958c497200d77e8451cbf7b\n" }, { "commit": "1f8f21af607b6a8449a509d8482f92a194fc1c99", "tree": "f203d17467c1248c2de61c68d73d4b14f5029f6d", "parents": [ "c8494ab0d7e0692b38d8702f798a6f011f7c7734", "8255c2d6c27363daa8bd92f7fcb3302682b9950a" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 23 14:26:39 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 23 14:26:39 2018 +0000" }, "message": "Merge \"Add configurable captive portal probes\" into pi-dev" }, { "commit": "8255c2d6c27363daa8bd92f7fcb3302682b9950a", "tree": "0bd119bed0c5ee5f87c46a69f3993f3d800a1cda", "parents": [ "d63c119101d20ff364dab3ead021e7c5a9149350" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 22 10:01:53 2018 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 23 20:48:46 2018 +0900" }, "message": "Add configurable captive portal probes\n\nThe probes allow testing for a configurable status code and location\nheader (regexes). They are disabled by default, so this CL is a\nno-op unless the probe configurations are pushed.\n\nBug: b/79499239\nTest: tests in CL pass, manual: captive portal login works\nChange-Id: I785723aaed06054b9aa8ebff77803f23d7836db9\n" }, { "commit": "4cdb2b7ece44e0c688fc2a6e085a5eec2ad462b5", "tree": "7035b68a51798740cbba74fb80a060a5792c05cc", "parents": [ "4aca62556b5baf3a4a369c7c5a265815e187953a" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu Apr 26 17:52:03 2018 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 23 13:19:57 2018 +0900" }, "message": "Fix testRegisterUsageCallback failure in setUp\n\nLocalServices.addService in NetworkStatsService is currently failing\nwith IllegalStateException \"Overriding service registration\". Setting up\nLocalServices in the test to avoid this issue might be possible, but\nmoving the registration to the only non-test caller of that constructor\nas done here solves the issue and avoids side-effects from a constructor.\n\nTest: this test passes in master through runtest frameworks-net\nBug: b/78487385\nBug: b/80082746\nChange-Id: I884a7a8bd7db3fcd220b785ba9914ac8c77720f0\n" }, { "commit": "97ad6f5234b20c4865f23737b3bee620e15f7c39", "tree": "b95d6fcb5b900b8b346d60731921ab6b876dd162", "parents": [ "54cfd42974222157a913b5961e41a10987e65638", "989d72cefcfc279c65041bc42b2b1d8c75767745" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Tue May 22 13:40:54 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 22 13:40:54 2018 -0700" }, "message": "Merge \"Remove unnecessary references to libunwind.\" am: 10e3fdd263\nam: 989d72cefc\n\nChange-Id: I0e0d26f1e00a10a1ebe1390f67525965910a36e3\n" }, { "commit": "b03aaa836d46a3d20b0ea8c85e514b01d856f208", "tree": "1b7f023ab6797533b5c2b1640daf22b2693eca1a", "parents": [ "2c9ec43bd7e6df6e81a0b86a4750de2eceb064db", "d829e18d9acc9d5cc022bde7734de928bda1ab90" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 05:27:35 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 22 05:27:35 2018 -0700" }, "message": "Merge \"Unify behavior of various cases of \"no underlying networks\"\" into pi-dev am: 468fdc3dd2\nam: d829e18d9a\n\nChange-Id: If19b85325e7d684e645470293b3c8a674084c641\n" }, { "commit": "d829e18d9acc9d5cc022bde7734de928bda1ab90", "tree": "8b4580933d6e0dcc74cff52bb133b3fe35270c50", "parents": [ "3fa9bdb193341344164eb9958e3c53ffcbb26153", "468fdc3dd29f87e2959696d21b37e58aa1663bfd" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 05:19:52 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 22 05:19:52 2018 -0700" }, "message": "Merge \"Unify behavior of various cases of \"no underlying networks\"\" into pi-dev\nam: 468fdc3dd2\n\nChange-Id: I22f80a6a39d4a19ff74aa61fcbd66f1a041b1003\n" }, { "commit": "688e384218abe72dbcba43cb5619c3d03b4c94ab", "tree": "41042b10490e8a7e6d25767ae8156979db4d1b7f", "parents": [ "0e4f3bf2431740dbff0b63c695644ba811f2c129", "53fa1d854297f4d6720e99b322311e564464eb12" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 04:14:02 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 22 04:14:02 2018 -0700" }, "message": "Merge changes Ic8231b18,I30009f88 into pi-dev am: 200cad09c7\nam: 53fa1d8542\n\nChange-Id: I89208f224b43102a8fd27c84f02ea11a134885c6\n" }, { "commit": "53fa1d854297f4d6720e99b322311e564464eb12", "tree": "b01f3b0f0f81cc262061b41733a4940e99eda34a", "parents": [ "0b653bc5e493551a143073f63fa7b28329838811", "200cad09c706a8b80673e07af4314399fb596c66" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 04:06:35 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 22 04:06:35 2018 -0700" }, "message": "Merge changes Ic8231b18,I30009f88 into pi-dev\nam: 200cad09c7\n\nChange-Id: I12c948ebeb2b74290908f8320ff77220dc4a9fb9\n" }, { "commit": "b3ab0d1e63fbbad007bb2a7da2fd4e1206d86c40", "tree": "6d6ac1206815781d2d30be28ec77cec9b79dafe1", "parents": [ "6b65ec77568de5d794e7cc451a0b2a3c021b287e" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Mon May 21 15:30:56 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 18:50:00 2018 +0900" }, "message": "Unify behavior of various cases of \"no underlying networks\"\n\nBefore this change, VPNs having no underlying networks would be\nmarked as metered as the safe option, but VPNs having only\ndisconnected underlying networks would be marked as unmetered.\nFix this discrepancy.\n\nBug: 79748782\nTest: runtest frameworks-net\nChange-Id: I51c3badde29f43f692f383553bd98327d2da8dd1\n" }, { "commit": "6b65ec77568de5d794e7cc451a0b2a3c021b287e", "tree": "f56946a9c9e927d7af3aa33ad6956bcd72f74e33", "parents": [ "f89e8dacf1387cdddecea42e780739e39a45a992" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri May 18 22:02:56 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 18:49:58 2018 +0900" }, "message": "Fix: VPNs update caps upon underlying network disconnect.\n\nBug: 79748782\nTest: ConnectivityServiceTests still pass\nChange-Id: Ic8231b18a17e6feb5ebafe8d5688fb59f9d4d58e\n" }, { "commit": "f89e8dacf1387cdddecea42e780739e39a45a992", "tree": "72bfe2a252fbd052f3013a07fa4d931b2d310848", "parents": [ "fd12af848a65bee56cb763ee1ab59c88c1fda471" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri May 18 21:47:45 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 18:25:33 2018 +0900" }, "message": "Add tests for setUnderlyingNetworks.\n\nFixes come later. This is complex enough as it is.\n\nBug: 79748782\nTest: new test passes, old tests still pass\nChange-Id: I30009f88e68a534c332ca88bae517cacc39a60bb\n" }, { "commit": "b5c3b2be8a88fd9c7dbecc59ef6828664373a319", "tree": "84df7725df966a9090e55756b55e0fe70043e9df", "parents": [ "c93ed402b0918d2377d7810cf44cee147d99e8f6", "adfb78afdcb9c4102f35de332435319151128721" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 22 01:14:13 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 22 01:14:13 2018 -0700" }, "message": "Merge \"Move CaptivePortalProbeResult to its own file\" into pi-dev am: fd12af848a\nam: adfb78afdc\n\nChange-Id: I5df7ee9f16bc6be4f02353d40a843a383dd4cbd9\n" }, { "commit": "c93ed402b0918d2377d7810cf44cee147d99e8f6", "tree": "60e9be5b210e6a85113ced007c9a28d185775234", "parents": [ "1535914d3025c185e3fcd6c32dd71ab3cb9f79cb", "c60a252b870b4772177645335f5b7d81bb7b18a3" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 01:09:11 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 22 01:09:11 2018 -0700" }, "message": "Merge \"Fix setCapabilities.\" into pi-dev am: d1d4cc94ba\nam: c60a252b87\n\nChange-Id: Ia5bebf8a233775367bbf1b788870528934ecbcfb\n" }, { "commit": "adfb78afdcb9c4102f35de332435319151128721", "tree": "9c3f0907dd93572ee216978ec74c1f2b5698f492", "parents": [ "c60a252b870b4772177645335f5b7d81bb7b18a3", "fd12af848a65bee56cb763ee1ab59c88c1fda471" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 22 01:09:08 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 22 01:09:08 2018 -0700" }, "message": "Merge \"Move CaptivePortalProbeResult to its own file\" into pi-dev\nam: fd12af848a\n\nChange-Id: Ia48b32307a51a66f2672d7112f71166dd6db41b1\n" }, { "commit": "c60a252b870b4772177645335f5b7d81bb7b18a3", "tree": "3e8708bb608e0369617b9e997b011677fcf7e91d", "parents": [ "7425f704eaac600c4ee6ed22be62d719c353307b", "d1d4cc94ba7f4f1b83aded29e7634cb6b88b011b" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 01:01:39 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 22 01:01:39 2018 -0700" }, "message": "Merge \"Fix setCapabilities.\" into pi-dev\nam: d1d4cc94ba\n\nChange-Id: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1\n" }, { "commit": "fd12af848a65bee56cb763ee1ab59c88c1fda471", "tree": "74abc2ba246d6b1032b47512a27bd48996bbf231", "parents": [ "d1d4cc94ba7f4f1b83aded29e7634cb6b88b011b", "d63c119101d20ff364dab3ead021e7c5a9149350" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 22 08:00:56 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 22 08:00:56 2018 +0000" }, "message": "Merge \"Move CaptivePortalProbeResult to its own file\" into pi-dev" }, { "commit": "d1d4cc94ba7f4f1b83aded29e7634cb6b88b011b", "tree": "2f2e4246f6fa3f8289286e6bd271f8f09d9605e9", "parents": [ "7b8ac80db59176d7601d9c9eda4879b62571c439", "4c4bc93b5eb1d830a9be22658baea5628f8aa477" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Tue May 22 07:51:09 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 22 07:51:09 2018 +0000" }, "message": "Merge \"Fix setCapabilities.\" into pi-dev" }, { "commit": "d63c119101d20ff364dab3ead021e7c5a9149350", "tree": "350c881002a3de3ad75dd5551325d8d243e0daaa", "parents": [ "167b451daa1893ee9b15cb25bfba627a7254acd3" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 22 09:58:19 2018 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue May 22 10:00:28 2018 +0900" }, "message": "Move CaptivePortalProbeResult to its own file\n\nThis is necessary to resolve visibility issues for the next change.\n\nBug: b/79499239\nTest: runtest frameworks-net\nChange-Id: I50bc96afe6ae88c8f58a693f0a4e821f1f9b3299\n" }, { "commit": "41fa069e522fc6b548d44337964d0821570269ba", "tree": "accfbf6d953404ae8df022eb5641ed9f2c423388", "parents": [ "59fa1bcf69bd821e25cbb04ca91ab326c9cdf344" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Mon May 07 13:49:34 2018 -0700" }, "committer": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Mon May 21 14:19:06 2018 -0700" }, "message": "Remove unnecessary references to libunwind.\n\nBug: 79209464\n\nTest: Builds.\nChange-Id: Ica58edd0d11b54c45b0af8e75eed67936f4309c2\nMerged-In: Ica58edd0d11b54c45b0af8e75eed67936f4309c2\n(cherry picked from commit 2197eebc6421cc98ee024b195915a97c037f7670)\n" }, { "commit": "1bf88170494d53f29e5b35af44538bc57cc9e63f", "tree": "46c33e2fdd84f7543a5851372b0399b0c4fee516", "parents": [ "57c89786e9cb1e47863d829f13cbd90d183acfb3", "2197eebc6421cc98ee024b195915a97c037f7670" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Mon May 21 21:14:10 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 21 21:14:10 2018 +0000" }, "message": "Merge \"Remove unnecessary references to libunwind.\"" }, { "commit": "4c4bc93b5eb1d830a9be22658baea5628f8aa477", "tree": "93f36a57d1c72adbc016a72f9ef6170746b6a1fd", "parents": [ "86b2581c16935d3eea6a012ab8812bfb78238e69" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri May 18 23:48:49 2018 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Mon May 21 14:46:40 2018 +0900" }, "message": "Fix setCapabilities.\n\nP introduced setSSID, UIDs and unwanted capabilities.\nNone of these exhibit commutative behavior through combineCapabilities\nbecause their semantics don\u0027t allow it. Therefore\nNetworkRequest.setCapabilities() is badly broken around any of\nthese. Look at the comments in the new tests to realize the\nextent of the damage.\n\nBug: 79748782\nTest: new tests written, old tests pass\nChange-Id: Ie46581bdaf9ecc2f14aab44788bbdb27a3fec8c1\n" }, { "commit": "b1b864cee20ebe34c2ec7638b51da1318f4f5984", "tree": "179117747972828b76443ea32004813bc00537be", "parents": [ "54bd56d6c55fa6c1ec8e66bcb3940e22463e65b5", "84dad9565fd054280f057819e0f62bfe1537edbc" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Sat May 19 00:13:15 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat May 19 00:13:15 2018 +0000" }, "message": "Merge \"Require READ_CALL_LOG permission to see phone numbers in phone state.\"" }, { "commit": "84dad9565fd054280f057819e0f62bfe1537edbc", "tree": "5aaae43dde03f85eefa56cf9bbd91b51d247f3a2", "parents": [ "d27a9f4465c7159b046a3087b7c4d1fad3c2a7c5" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Thu Apr 26 14:43:31 2018 -0700" }, "committer": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Fri May 18 14:37:43 2018 -0700" }, "message": "Require READ_CALL_LOG permission to see phone numbers in phone state.\n\nIncoming and outgoing call phone numbers are visible in the phone state\nbroadcast and via the PhoneStateListener. To enhance user privacy, change\nto require the READ_CALL_LOG permission in order to receive the call\nphone numbers.\n\nThis means to see phone numbers:\n1. android.intent.action.PHONE_STATE - requires READ_PHONE_STATE and\nREAD_CALL_LOG permission.\n2. PhoneStateListener#onCallStateChanged - now required READ_CALL_LOG\npermission.\n\nTo support this new behavior, added sendBroadcastAsUserMultiplePermissions\nmethod to context to allow sending the broadcast to all users while\nrequiring the two permissions.\n\nBug: 78650469\nTest: Created PHONE_STATE broadcast receiver in test app and verified that\nwhen no permissions are granted, the phone number is empty for incoming\nand outgoing calls.\nTest: Granted Phone state permission to test app and verified that phone\nnumber is not populated.\nTest: Granted test app read call log permission and verified that phone\nnumber is populated.\nTest: Created PhoneStateListener in test app and verified that when no\npermissions are granted, phone number is empty for incoming and outgoing.\ncalls.\nTest: Granted read call log permission to test app and verified that both\nthe incoming and outgoing numbers are populated.\n\nChange-Id: I857ea00cc58a0abbb77960643f361dd6dd9c8b56\n" }, { "commit": "bdc41e2dd2c9e926eb06e1e97506e79ad1d6df13", "tree": "56af69f344b57ae0f408ea8a88bc9c71069cb166", "parents": [ "6f380221f9fa786a89f22a2239223f94b0b2683a", "413d00c1c031b467920d64233c7de430040fd567" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri May 18 01:16:38 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 18 01:16:38 2018 -0700" }, "message": "Merge \"Add explicit override for default Private DNS mode\" into pi-dev am: 2b3c858296\nam: 413d00c1c0\n\nChange-Id: Ifbb9922c4226c5a8a7ef9422dc4bd0e5b83a56b9\n" }, { "commit": "413d00c1c031b467920d64233c7de430040fd567", "tree": "9dc055b96c8caf6e42abbc5f14a334a4933e3563", "parents": [ "d3c97f9ab40df74964be4e9f0d7b8887f18f2587", "2b3c858296d34741e32c03b144b14f9532b19bb2" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri May 18 01:08:26 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri May 18 01:08:26 2018 -0700" }, "message": "Merge \"Add explicit override for default Private DNS mode\" into pi-dev\nam: 2b3c858296\n\nChange-Id: If480ab40c7cf9ab75c52feafc28338a049cbceef\n" }, { "commit": "646dfc77039404a52e51d44df78fc819cfb263dd", "tree": "e679d255e6410a86fa041c7f9fea94b61b90647b", "parents": [ "71c11daaf581679fa419c7343d0c14b612af6197", "6657d42602a25264ccbf70ce2eb36f3974518139" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri May 18 01:44:44 2018 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri May 18 01:44:44 2018 +0000" }, "message": "Merge changes Ieb0a5d24,I44df6668\n\n* changes:\n Fix SntpClientTest failures with no active network\n Allow specifying a network for SNTP time sync\n" }, { "commit": "19841794096e7c9f7112ba25af9bfda04403f791", "tree": "fe14b0c6b68426e8b7feac5b836d12001cd5c850", "parents": [ "7f91c59b3ea96916b1f69fa64f30856231ca4c39" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed May 16 16:41:57 2018 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu May 17 17:41:12 2018 +0900" }, "message": "Add explicit override for default Private DNS mode\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 79719289\nChange-Id: I943c5476666e47d04690626e2133f501cb875b46\n" }, { "commit": "ca9dce8eca2246061543f2d78bfbc3fe24740dd4", "tree": "fab5594dad2b1c7edd51c381e257779a760c60d9", "parents": [ "7a69489d3743419d101b9e78905099e3b03dcdf7", "3667bf48761c9f6f716c42f681b7ca002115dfa2" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed May 16 14:31:31 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 16 14:31:31 2018 -0700" }, "message": "Merge \"Disable AAPT2 for modules that use missing features\" am: 87dc8d6576 am: 1d9a9610ae\nam: 3667bf4876\n\nChange-Id: Id5dd5513af0a84616e34dd3303561b8dee4c12ad\n" }, { "commit": "3667bf48761c9f6f716c42f681b7ca002115dfa2", "tree": "513cbfce11faee958be4d47d910459831c5cfead", "parents": [ "dbe6d50990ec7e85f64b8db0d96db08205eeebb7", "1d9a9610ae1fe77cdb7364d5c1a741d1d1c48e1a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed May 16 14:14:27 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 16 14:14:27 2018 -0700" }, "message": "Merge \"Disable AAPT2 for modules that use missing features\" am: 87dc8d6576\nam: 1d9a9610ae\n\nChange-Id: Iba6ee4996c11d66fa7e6f510b0213b2e61f30524\n" }, { "commit": "940b98ee4e4eabee452d8d28ba7d59e330f99866", "tree": "735ab754b6005466f46bc62eab1ef8d813fdad65", "parents": [ "001d2aed314f92c96db5b7d2023bfc7cdd061413" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed May 16 09:21:18 2018 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed May 16 09:34:26 2018 -0700" }, "message": "Disable AAPT2 for modules that use missing features\n\nUse LOCAL_USE_AAPT2 :\u003d false to disable AAPT2 for modules that\nuse features that are not implemented in AAPT2.\n\nFixes:\nframeworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:46: error: unexpected element \u003cpackage\u003e found in \u003cmanifest\u003e.\nframeworks/base/core/tests/coretests/apks/install_multi_package/AndroidManifest.xml:82: error: unexpected element \u003cpackage\u003e found in \u003cmanifest\u003e.\nframeworks/base/core/tests/coretests/apks/install_verifier_bad/AndroidManifest.xml:19: error: unexpected element \u003cpackage-verifier\u003e found in \u003cmanifest\u003e.\nframeworks/base/core/tests/coretests/apks/install_verifier_good/AndroidManifest.xml:19: error: unexpected element \u003cpackage-verifier\u003e found in \u003cmanifest\u003e.\nframeworks/base/packages/CtsShim/build/shim/AndroidManifest.xml:25: error: unexpected element \u003crestrict-update\u003e found in \u003cmanifest\u003e.\nframeworks/base/tests/ActivityTests/AndroidManifest.xml:42: error: unexpected element \u003cpreferred\u003e found in \u003cmanifest\u003e\u003capplication\u003e\u003cactivity\u003e.\nout/target/common/obj/APPS/CtsShimPriv_intermediates/AndroidManifest.xml:25: error: unexpected element \u003crestrict-update\u003e found in \u003cmanifest\u003e.\nframeworks/base/core/tests/coretests/AndroidManifest.xml:26: error: unexpected element \u003cmeta-data\u003e found in \u003cmanifest\u003e\u003cpermission\u003e.\n...\n\nBug: 79755007\nTest: m FORCE_AAPT2\u003dtrue java\nChange-Id: I393b697c521ab2a4fbc00b29a43aed6b4729b9a8\n" }, { "commit": "159f13f17e47f4bff8f8d6e31c2c49a51a2447ff", "tree": "469577076fa617e5b2867b76fa86ece118336b44", "parents": [ "24e959cc6b50a03481b60852d0c04c00d5bf8772", "6a308e1800d34364987db7628c7630eee229014e" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Wed May 16 08:55:30 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 16 08:55:30 2018 -0700" }, "message": "Merge \"Merge \"Fix testable looper threading\" into pi-dev am: 5a36c134b7\" into pi-dev-plus-aosp\nam: 6a308e1800\n\nChange-Id: I33d57e7867bde221b53f6710d6c984aed58707b6\n" }, { "commit": "7182a22dbb6a1db9d5377707eb647d7798441239", "tree": "2321f0c84ab651510e55707c2b87917246ad9e81", "parents": [ "a3cb0ae74a4f5c7e840ff6d7e245bd9c9632d35f", "5a36c134b736cc587fcd05b6d5cf94f3bbb62377" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Wed May 16 08:29:42 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 16 08:29:42 2018 -0700" }, "message": "Merge \"Fix testable looper threading\" into pi-dev\nam: 5a36c134b7\n\nChange-Id: I63b58decc71d46ae35351273551174d6fb646dab\n" }, { "commit": "1e352f4c34534864306a79f20a1af9d73b7cbd5f", "tree": "357c2149f6531aae760d8dea75019f5bb6d78d6d", "parents": [ "e5c8e375e1fb3ce2f9f2531a5926d4136186824d" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Wed May 16 10:15:33 2018 -0400" }, "committer": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Wed May 16 10:15:33 2018 -0400" }, "message": "Fix testable looper threading\n\nIn the case where an annotation was not used and the TestableLooper\nwas manually created, then the messages would be executed on the wrong\nthread.\n\nAlso switch some handlers over to async, might save us a little time.\n\nTest: runtest --path frameworks/base/tests/testables\nBug: 79550837\nChange-Id: I70a36449ae08eb5799e2dad41a5d258bb51a3fd3\n" }, { "commit": "7a4ff6447df79de973ff13751bea3bde689cfcd0", "tree": "c8350bf52459c5a2e529293b902465bd57d48a68", "parents": [ "6fa8d06c78d21d455015e19691d5d6f2e6bd258b" ], "author": { "name": "Kurt Marcinkiewicz", "email": "kurdt@google.com", "time": "Mon Mar 05 14:45:04 2018 -0800" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed May 16 16:43:43 2018 +0900" }, "message": "Allow specifying a network for SNTP time sync\n\nPermits syncing over a specific network instead of the default for\nthe process. This was causing an issue with Android Wear devices\npaired with iOS where the default network is bluetooth\n(see b/32663274).\n\nThis CL is in support of ag/3776564\n\nBug: 32663274\n\nTest: adb shell am instrument -e class android.net.SntpClientTest -w \\\ncom.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner\n(cherry-pick of pi-dev Ic9fc169cf75457810d4992121d85d7642e350b90)\nMerged-In: I339c77063c72a9d76a5c4cb17052e20fb6e045a6\nMerged-In: I8dfd1cad99c63efdc14c174c19f094a61cdfc44f\n\nChange-Id: I44df66688292b144ec7dfcdd9ae5d82489f82774\n" }, { "commit": "0f4bf2acbd236a28dc186d8d21be0c1e90579d36", "tree": "78c7f49cd7a77e1f138b229526fbd9e4922b3c13", "parents": [ "bf9670bcdfe43c34b5c3da3e886e759748fc4895", "3bc01b208270eb224deffb68441dfc3d212cde98" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 15 17:34:33 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 15 17:34:33 2018 -0700" }, "message": "Merge \"Fix errors caught by aapt2\" am: 6d78fe0385 am: ef9db6bfb6\nam: 3bc01b2082\n\nChange-Id: If646b8963365c3b45344439b01c14b41c6379a4b\n" } ], "next": "3bc01b208270eb224deffb68441dfc3d212cde98" }