)]}' { "log": [ { "commit": "51ca8f56c54f2cece4a69dc37f6735497efa7828", "tree": "bfe83a9fa19dd0cf22767b50bfb968aa50aaeb23", "parents": [ "9623f122dfda5d66ca761618b375128b49f32f2d", "371cab24540eefbfa4ed2aa29cfb9a4a2217e4a9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 11:14:30 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 10 20:38:57 2020 -0700" }, "message": "Merge ab/6749736 in stage.\n\nBug: 167233921\nMerged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a\nChange-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db\n" }, { "commit": "9623f122dfda5d66ca761618b375128b49f32f2d", "tree": "b90e851120ae0af65d24a9c9204745511f7a4158", "parents": [ "18b5773041e55201fe27a41819acc07572452043", "4cb4ef833397b162b229c135146694cfee85782d" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri Oct 09 00:30:36 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 00:30:36 2020 +0000" }, "message": "Merge \"Move IpUtils to frameworks/libs/net\" am: 4cb4ef8333\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234\n\nChange-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515\n" }, { "commit": "4cb4ef833397b162b229c135146694cfee85782d", "tree": "b90e851120ae0af65d24a9c9204745511f7a4158", "parents": [ "f052e40f79fb823ad8b5ac0e25e46af6b798beef", "2494a06bb394ba08f72489f6d04b3e952d496a3e" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Fri Oct 09 00:13:40 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 09 00:13:40 2020 +0000" }, "message": "Merge \"Move IpUtils to frameworks/libs/net\"" }, { "commit": "18b5773041e55201fe27a41819acc07572452043", "tree": "a45f13ba7cbc1aeb77a5cb843d001cf97e3061de", "parents": [ "adedc24110f2f2261c55404f719ad4508f545596", "f052e40f79fb823ad8b5ac0e25e46af6b798beef" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Wed Oct 07 09:55:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 07 09:55:29 2020 +0000" }, "message": "Merge \"Make the IP subnet persistent till reboot\" am: f052e40f79\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958\n\nChange-Id: I0aaa978e8edd7e8666413fb18352fa83e9fb5469\n" }, { "commit": "f052e40f79fb823ad8b5ac0e25e46af6b798beef", "tree": "a45f13ba7cbc1aeb77a5cb843d001cf97e3061de", "parents": [ "b8a342e4bc30afecbc6dcf10f4fef43a5f9ad4b4", "a2ffad84c7fb99a98c232ee0a55620ed76486cf8" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Wed Oct 07 09:39:29 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 07 09:39:29 2020 +0000" }, "message": "Merge \"Make the IP subnet persistent till reboot\"" }, { "commit": "a2ffad84c7fb99a98c232ee0a55620ed76486cf8", "tree": "2aa0f9def3fccf226579f39011f598c558f9c77f", "parents": [ "0b1e7d895682c1e6b16e163c17b10e6bb8d089cb" ], "author": { "name": "markchien", "email": "markchien@google.com", "time": "Tue Sep 22 15:50:43 2020 +0800" }, "committer": { "name": "markchien", "email": "markchien@google.com", "time": "Tue Oct 06 20:25:19 2020 +0800" }, "message": "Make the IP subnet persistent till reboot\n\nMake the IP subnet persistent if it do not conflict with upstream.\nIt allow client to reuse its IP that usually reduce DHCP procedure.\n\nBug: 168169687\nTest: atest TetheringTests\nChange-Id: Iddc5304730dce7b11c5d124b7eddce057d752bbd\n" }, { "commit": "adedc24110f2f2261c55404f719ad4508f545596", "tree": "1bc36dc9b9b881196a255f90c03b65adfce989b6", "parents": [ "3f85eccfaaa842f011ea14772c50947480f9537b", "b8a342e4bc30afecbc6dcf10f4fef43a5f9ad4b4" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 05 12:56:06 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 05 12:56:06 2020 +0000" }, "message": "Merge \"Explicitly reference framework-wifi app build rule\" am: c29f606cc7\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1448635\n\nChange-Id: I6ef1bfbf4dcd39983e94207ff7f760e152da2a97\n" }, { "commit": "b8a342e4bc30afecbc6dcf10f4fef43a5f9ad4b4", "tree": "1bc36dc9b9b881196a255f90c03b65adfce989b6", "parents": [ "0b1e7d895682c1e6b16e163c17b10e6bb8d089cb" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 02 16:38:21 2020 +0100" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 05 11:43:39 2020 +0100" }, "message": "Explicitly reference framework-wifi app build rule\n\nThis works around a build-system limitation where it does not know\nwhich jars to feed r8 to resolve all classes during proguarding.\n\nBug: 160453030\nBug: 169931783\nTest: build_mainline_modules.sh (with prebuilt sdk)\nChange-Id: I3d9f2049cf898b5e551a5c5764df423abaa5e92d\nMerged-In: I3d9f2049cf898b5e551a5c5764df423abaa5e92d\n" }, { "commit": "2494a06bb394ba08f72489f6d04b3e952d496a3e", "tree": "773f70575769ee23be6b898375b19b71bd4e7438", "parents": [ "c99ef48090943918948c49d5b8febe4274f644c3" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu Sep 24 18:31:55 2020 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Mon Oct 05 14:38:19 2020 +0900" }, "message": "Move IpUtils to frameworks/libs/net\n\nThe utility classes are useful for mainline modules and their tests, for\nexample IpClientIntegrationTest.\n\nBug: 168868607\nTest: m \u0026\u0026 atest NetworkStaticLibTests\nChange-Id: If2b1613aa18a7990391e2d31cc2951ca93f1cf3c\n" }, { "commit": "3f85eccfaaa842f011ea14772c50947480f9537b", "tree": "a95fcf6c2a549cd13b9752452f2f2f64636e88e3", "parents": [ "f593d0eaa26180e15b1c0f20769dc484d7566645", "0b1e7d895682c1e6b16e163c17b10e6bb8d089cb" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 05 04:26:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 05 04:26:10 2020 +0000" }, "message": "Merge \"Make PrivateAddressCoordinator ignore vpn network\" am: 0b1e7d8956\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610\n\nChange-Id: I0a5398513c4572db839e3713109bb326f0261954\n" }, { "commit": "0b1e7d895682c1e6b16e163c17b10e6bb8d089cb", "tree": "a95fcf6c2a549cd13b9752452f2f2f64636e88e3", "parents": [ "c99ef48090943918948c49d5b8febe4274f644c3", "1a2163b972c93d466c367b7b06d649d8f529e52b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 05 04:10:48 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 05 04:10:48 2020 +0000" }, "message": "Merge \"Make PrivateAddressCoordinator ignore vpn network\"" }, { "commit": "f593d0eaa26180e15b1c0f20769dc484d7566645", "tree": "82ee64afefeae7fdada24e1fe11abb7f68fd3767", "parents": [ "9fe2d11c126807ba5c4aaa617f2567a2da7d325d", "c99ef48090943918948c49d5b8febe4274f644c3" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Sep 30 13:14:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 30 13:14:23 2020 +0000" }, "message": "Merge changes I53ca4b98,I1757fdeb am: 3a463815e2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440767\n\nChange-Id: If1d0eb5a1818dd7a9346f8d0d64d5f37ea1b53c2\n" }, { "commit": "c99ef48090943918948c49d5b8febe4274f644c3", "tree": "82ee64afefeae7fdada24e1fe11abb7f68fd3767", "parents": [ "7f70074abcf346c6322e042e07e9e5961c38f171" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Sep 30 15:05:18 2020 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Sep 30 17:04:19 2020 +0900" }, "message": "Fix OffloadHardwareInterfaceTest.\n\nr.android.com/1424920 changed the code but forgot to update the\nunit test.\n\nAlso fix some lint errors.\n\nBug: 149109043\nTest: atest TetheringTests TetheringPrivilegedTests\nChange-Id: I53ca4b9877dcb4a759dee6ec63133653315d826f\n" }, { "commit": "7f70074abcf346c6322e042e07e9e5961c38f171", "tree": "ba9bb2f4583a8fe380829e5a197a470bd0d42612", "parents": [ "18ee591257061d271c6c16d44df87508665cd18a" ], "author": { "name": "Tyler Wear", "email": "twear@quicinc.com", "time": "Fri Sep 11 11:48:48 2020 -0700" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Sep 30 15:07:47 2020 +0900" }, "message": "tethering: offload: Netlink Req NfGen\n\nAdd the netfilter generic message header to\nthe netlink req. This is needed so the kernel\nwon\u0027t ignore the request for invalid params.\n\nBug: 149109043\nTest: ConntrackSocketTest\nChange-Id: I1757fdeb11a0cac5821021a22323cbd74fe22bdc\n" }, { "commit": "9fe2d11c126807ba5c4aaa617f2567a2da7d325d", "tree": "7a9fc885ff38d74e396b9debdc756ce235dceca2", "parents": [ "2162a75d5054cd842ea242804c200f66b6cdd28a", "18ee591257061d271c6c16d44df87508665cd18a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 28 09:25:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 28 09:25:59 2020 +0000" }, "message": "Merge \"Fix TetheredClient callback fail in InProcessTethering\" am: 18ee591257\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273\n\nChange-Id: Ibb30260e9bc558ab0aa6dd8277dfd50efd14258f\n" }, { "commit": "1a2163b972c93d466c367b7b06d649d8f529e52b", "tree": "f0fc9bad593ecfbb82d8b5ba9b780d7b2b00341d", "parents": [ "5db7c0028ce9063ba62e2ded39a697f2857f62b3" ], "author": { "name": "markchien", "email": "markchien@google.com", "time": "Thu Aug 27 21:25:37 2020 +0800" }, "committer": { "name": "markchien", "email": "markchien@google.com", "time": "Mon Sep 28 17:22:19 2020 +0800" }, "message": "Make PrivateAddressCoordinator ignore vpn network\n\nIf vpn app make its netmask as 0, PrivateAddressCoordinator\nwould not able to find suitable address for tethering downstream.\nSince tethering do not support vpn as upstream, just ignore vpn\nin PrivateAddressCoordinator.\n\nBug: 166365863\nTest: atest TetheringTests\n atest CtsTetheringTest\nChange-Id: Iabe265467044fea9fa437674ca29ffc7bcdefe3b\n" }, { "commit": "18ee591257061d271c6c16d44df87508665cd18a", "tree": "7a9fc885ff38d74e396b9debdc756ce235dceca2", "parents": [ "f5096cc1e3e3cf12320b57cd3ca36ae867f5dd5f", "84ec4a397a3deb343b08ed03089e5ff26c3e8e04" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 28 08:53:53 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 28 08:53:53 2020 +0000" }, "message": "Merge \"Fix TetheredClient callback fail in InProcessTethering\"" }, { "commit": "2162a75d5054cd842ea242804c200f66b6cdd28a", "tree": "b6ca51736b57379d095e644b72f234b4aeb848c4", "parents": [ "d8c1f0dc1928c1835d51a229800077a7424790ba", "f5096cc1e3e3cf12320b57cd3ca36ae867f5dd5f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 28 04:54:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 28 04:54:39 2020 +0000" }, "message": "Merge \"Remove double check interface by NetworkInterface\" am: f5096cc1e3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032\n\nChange-Id: Id8904075001709f2c62a55293f835c5a73ad9d79\n" }, { "commit": "f5096cc1e3e3cf12320b57cd3ca36ae867f5dd5f", "tree": "b6ca51736b57379d095e644b72f234b4aeb848c4", "parents": [ "a8e68bb723f204898fffb4c3824174a3baac1be5", "f609923b4b108ca81672f5e5997d5a4d512c57e7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 28 04:21:28 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Sep 28 04:21:28 2020 +0000" }, "message": "Merge \"Remove double check interface by NetworkInterface\"" }, { "commit": "f609923b4b108ca81672f5e5997d5a4d512c57e7", "tree": "339481e25679d5c8455f9cf21d5ccbeca7576580", "parents": [ "5db7c0028ce9063ba62e2ded39a697f2857f62b3" ], "author": { "name": "markchien", "email": "markchien@google.com", "time": "Sun Sep 27 16:56:38 2020 +0800" }, "committer": { "name": "markchien", "email": "markchien@google.com", "time": "Sun Sep 27 17:11:20 2020 +0800" }, "message": "Remove double check interface by NetworkInterface\n\nNetworkInterface#getByName can not get the interface without IP addresses.\nWhen setIncludeTestInterfaces(true) is called, the interface will be\nplaced in client mode, which will delete the link-local address. So calling\nNetworkInterface#getByName to get test interface may not work before\nswitching to server mode.\n\nBug: 168215721\nTest: atest CtsTethering\nChange-Id: Ice8adcce1c4b2c86bd219c701b2afa9ba2339f24\n" }, { "commit": "d8c1f0dc1928c1835d51a229800077a7424790ba", "tree": "290ea712d8ad59dfafa0c7c6840f9c0c91566c7c", "parents": [ "4508ee1e286e6b1ccd0a1c1615464b0e34e734a7", "a8e68bb723f204898fffb4c3824174a3baac1be5" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu Sep 24 08:35:35 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 24 08:35:35 2020 +0000" }, "message": "Merge \"Remove unused testutils lib from tethering tests\" am: a8e68bb723\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924\n\nChange-Id: I30a1542c1fe2056d074402f2b5f7be2a37f15373\n" }, { "commit": "a8e68bb723f204898fffb4c3824174a3baac1be5", "tree": "290ea712d8ad59dfafa0c7c6840f9c0c91566c7c", "parents": [ "72e81859f8b7330482e37686225500b0a51ff074", "8f59ec090de7d7d2c852e8cee72ce49bd17d4ee5" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Thu Sep 24 08:16:21 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 24 08:16:21 2020 +0000" }, "message": "Merge \"Remove unused testutils lib from tethering tests\"" }, { "commit": "84ec4a397a3deb343b08ed03089e5ff26c3e8e04", "tree": "424d8a53ab91dfbb657a43575e17c8297faebce1", "parents": [ "5db7c0028ce9063ba62e2ded39a697f2857f62b3" ], "author": { "name": "markchien", "email": "markchien@google.com", "time": "Thu Sep 24 09:50:55 2020 +0800" }, "committer": { "name": "markchien", "email": "markchien@google.com", "time": "Thu Sep 24 10:11:51 2020 +0800" }, "message": "Fix TetheredClient callback fail in InProcessTethering\n\nTetheredClient callback would additional check whether caller has\nNETWORK_SETTINGS or {MAINLINE_}NETWORK_STACK permission, but it do not\ngrant for self accessing. InProcessTethering run in system server, so\nthe services in system server would fail to call TetheredClient callback.\nGrant permission for self process.\n\nBug: 169231588\nTest: atest CtsTetheringTest\nChange-Id: Ic04e44aef4df772c718ff25ed331bf02f5940c1d\n" }, { "commit": "8f59ec090de7d7d2c852e8cee72ce49bd17d4ee5", "tree": "96a2bc91c234fb623a65c9cade48ddd118f2026a", "parents": [ "3b8bfc4811275503a5ac1ba8510db7bcdff8e18e" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed Sep 23 17:03:33 2020 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed Sep 23 17:10:42 2020 +0900" }, "message": "Remove unused testutils lib from tethering tests\n\nframeworks-base-testutils is unused in tethering integration tests, so\nthe dependency can be removed.\nThat test library also contains test classes, so removing the dependency\nallows tethering tests to stop running the associated tests.\n\nAlso add jarjar rules to the unit tests to zap (remove) the test classes\nfrom the output APK. Ideally the unit tests should stop depending on\nthat library too (TestableLooper can be used instead of TestLooper), or\nthe frameworks-base-testutils library should stop including test\nclasses.\n\nBug: 167968946\nTest: m CtsTetheringTest TetheringTests\nChange-Id: Ie950ce5b6181e388a7f71da430fd2dd8ada32e49\n" }, { "commit": "4508ee1e286e6b1ccd0a1c1615464b0e34e734a7", "tree": "d4384dae513273d473a99af62db36d0d1e92b53a", "parents": [ "6dbeee66e937d1b1df8f6dfc2da071eabf22c7c6", "72e81859f8b7330482e37686225500b0a51ff074" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed Sep 23 05:30:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 23 05:30:55 2020 +0000" }, "message": "Merge \"tethering: DAD Proxy Daemon\" am: 72e81859f8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1258645\n\nChange-Id: Ib3bbe465b698feace1a3ec1f6588cfa7bff0c9fd\n" }, { "commit": "72e81859f8b7330482e37686225500b0a51ff074", "tree": "d4384dae513273d473a99af62db36d0d1e92b53a", "parents": [ "8c7f330e7a8300107fe92038181254efe945f474", "90e4063fd24e5272159242e8ccf9907ce5b83c1c" ], "author": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Wed Sep 23 04:57:42 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 23 04:57:42 2020 +0000" }, "message": "Merge \"tethering: DAD Proxy Daemon\"" }, { "commit": "90e4063fd24e5272159242e8ccf9907ce5b83c1c", "tree": "5dc64454c87369e126f238da3ad7f74a4a38a588", "parents": [ "1ed9e747167e547e6c3e27708b40b014b3700f8c" ], "author": { "name": "Tyler Wear", "email": "twear@quicinc.com", "time": "Fri Mar 13 11:38:38 2020 -0700" }, "committer": { "name": "Tyler Wear", "email": "twear@quicinc.com", "time": "Tue Sep 22 11:58:49 2020 -0700" }, "message": "tethering: DAD Proxy Daemon\n\nDAD proxy daemon responsible for forwarding NS/NA between\ntethered iface and upstream iface.\n\nChange-Id: I2e58e10e7fa7dba6a6f63ad03b000549f3afc37e\n" }, { "commit": "6dbeee66e937d1b1df8f6dfc2da071eabf22c7c6", "tree": "3817ad1a57e41e3f13a11032f2049785b825684c", "parents": [ "1138d178c4b38a725d3ccbab835168ff61e5d808", "8c7f330e7a8300107fe92038181254efe945f474" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Sep 19 05:25:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 19 05:25:29 2020 +0000" }, "message": "Merge \"Merge mainline-release 6664920 to master - DO NOT MERGE\" am: 8c7f330e7a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515\n\nChange-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f\n" }, { "commit": "1138d178c4b38a725d3ccbab835168ff61e5d808", "tree": "3817ad1a57e41e3f13a11032f2049785b825684c", "parents": [ "a0d6f9712b30eaff627c38289af702dee606ed21", "725af62a593dfe1de188de050b38ce5832197f71" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Sep 19 05:22:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 19 05:22:39 2020 +0000" }, "message": "Merge mainline-release 6664920 to master - DO NOT MERGE am: 725af62a59\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515\n\nChange-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e\n" }, { "commit": "8c7f330e7a8300107fe92038181254efe945f474", "tree": "3817ad1a57e41e3f13a11032f2049785b825684c", "parents": [ "56c632caed6dcdec8ae9c99d56d41756f7e3a3f8", "725af62a593dfe1de188de050b38ce5832197f71" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Fri Sep 18 18:47:48 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 18 18:47:48 2020 +0000" }, "message": "Merge \"Merge mainline-release 6664920 to master - DO NOT MERGE\"" }, { "commit": "725af62a593dfe1de188de050b38ce5832197f71", "tree": "3817ad1a57e41e3f13a11032f2049785b825684c", "parents": [ "56c632caed6dcdec8ae9c99d56d41756f7e3a3f8", "8e291dea63e9fa55b8ab60816192e159655045dc" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Sep 17 21:56:59 2020 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Sep 17 21:56:59 2020 -0700" }, "message": "Merge mainline-release 6664920 to master - DO NOT MERGE\n\nMerged-In: Id04ea331831e8b26ba99478848392b40a92548d5\nChange-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4\n" }, { "commit": "a0d6f9712b30eaff627c38289af702dee606ed21", "tree": "3817ad1a57e41e3f13a11032f2049785b825684c", "parents": [ "8780ad918dbdb713f31dc6c1efa249ccd27a7dfe", "56c632caed6dcdec8ae9c99d56d41756f7e3a3f8" ], "author": { "name": "Nucca Chen", "email": "nuccachen@google.com", "time": "Fri Sep 18 04:27:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 18 04:27:28 2020 +0000" }, "message": "Merge \"Move BPF offload program from netd to mainline\" am: c26848e7bd\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189\n\nChange-Id: Ia0b8a185f44dac7db365fcb9fc865a82bd552d62\n" }, { "commit": "56c632caed6dcdec8ae9c99d56d41756f7e3a3f8", "tree": "be621e0ec08ca2253391978b0ae4614c8020748f", "parents": [ "3b8bfc4811275503a5ac1ba8510db7bcdff8e18e" ], "author": { "name": "Hungming Chen", "email": "nuccachen@google.com", "time": "Thu Sep 10 15:42:58 2020 +0800" }, "committer": { "name": "Hungming Chen", "email": "nuccachen@google.com", "time": "Wed Sep 16 20:38:14 2020 +0800" }, "message": "Move BPF offload program from netd to mainline\n\nTest: as the follows.\n$ adb shell ls sys/fs/bpf | grep offload\nmap_offload_tether_ingress_map\nmap_offload_tether_limit_map\nmap_offload_tether_stats_map\nprog_offload_schedcls_ingress_tether_ether\nprog_offload_schedcls_ingress_tether_rawip\n\n$ adb shell dumpsys netd --short\n TetherController\n BPF ingress map: iif(iface) v6addr -\u003e oif(iface) srcmac ..\n 13(rmnet_data3) 2401:e180:8842:6e3:bc6a:2e45:c30:f418 -\u003e ..\n BPF stats (downlink): iif(iface) -\u003e packets bytes errors\n 13(rmnet_data3) -\u003e 7 488 0\n BPF limit: iif(iface) -\u003e bytes\n 13(rmnet_data3) -\u003e 9223372036854775807\n\nLog:\nbpfloader: Loaded object: /apex/com.android.tethering/etc/bpf/offload.o\n\nChange-Id: I71b7efb1f4bd6eb1cd469a0e1e4a56342dc6e579\n" }, { "commit": "8780ad918dbdb713f31dc6c1efa249ccd27a7dfe", "tree": "9eb23ad7cd1f4c17b036bd2490e6a51bfad187c1", "parents": [ "3b8bfc4811275503a5ac1ba8510db7bcdff8e18e", "8e291dea63e9fa55b8ab60816192e159655045dc" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Sep 13 07:58:42 2020 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Sep 13 07:58:42 2020 -0700" }, "message": "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE\n\nMerged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6\nChange-Id: If78e130888b8d4653ef128d747e18cc46844d732\n" }, { "commit": "3b8bfc4811275503a5ac1ba8510db7bcdff8e18e", "tree": "b97bcd88161bf2fa5d5750a8b0f8c0223d2b85ab", "parents": [ "5db7c0028ce9063ba62e2ded39a697f2857f62b3", "f94c8eb54faa2a3f291978ca02d70cf91b78d741" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 09 20:21:10 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 09 20:21:10 2020 -0700" }, "message": "Merge Android R\n\nBug: 168057903\nMerged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67\nChange-Id: I1d85742f594be2007c99841b290e502b6ede624e\n" }, { "commit": "f94c8eb54faa2a3f291978ca02d70cf91b78d741", "tree": "b97bcd88161bf2fa5d5750a8b0f8c0223d2b85ab", "parents": [ "097abd5f983ad2283d6e65ad40ae800039d87628", "9aed13818c6a82f8b1632ea5df53479828f9f704" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Sep 07 08:09:53 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 07 08:09:53 2020 +0000" }, "message": "Merge \"Simplify module visibility post build refactor\" into stage-aosp-master" }, { "commit": "9aed13818c6a82f8b1632ea5df53479828f9f704", "tree": "b97bcd88161bf2fa5d5750a8b0f8c0223d2b85ab", "parents": [ "14d438a337296b965f9510f7eb820d8b04fcec48" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Aug 18 12:52:51 2020 +0100" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Sep 07 07:54:50 2020 +0000" }, "message": "Simplify module visibility post build refactor\n\n//visibility:override is no longer needed for impl_library_visibility\nto override visibility.\n\nRemoving this allows the defaults module to specify better defaults.\n\n- Stub libraries are made publicly visible, via `visibility`\n- Impl libraries are private by default, but visibility is extended\n by the modules\n\nBug: 165017290\nTest: m\nExempt-From-Owner-Approval: build refactor\nChange-Id: Ibf35bfac5c99a21125f89ba10945f3364217b90f\n" }, { "commit": "097abd5f983ad2283d6e65ad40ae800039d87628", "tree": "3e998b5f7f8210a86d4e4b72666d54ad96fe0efe", "parents": [ "44d4d1333c29dd1bbe45753207361cfd05e42b2e", "5db7c0028ce9063ba62e2ded39a697f2857f62b3" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Sep 06 06:40:58 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Sep 06 06:40:58 2020 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" am: 5db7c0028c -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007\n\nChange-Id: I9102a96a0cb816b895ccf93a174dc6e91e59ee5a\n" }, { "commit": "5db7c0028ce9063ba62e2ded39a697f2857f62b3", "tree": "f2720a4964f21a1339dfbf0011cbbff1cec832dc", "parents": [ "6c701f5341ebf5711448ac19bc8e8eab0ef1c513", "2adde431b6898fb22b16c98fdbc4afd0f20b89db" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Sep 06 06:27:36 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sun Sep 06 06:27:36 2020 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\"" }, { "commit": "2adde431b6898fb22b16c98fdbc4afd0f20b89db", "tree": "f2720a4964f21a1339dfbf0011cbbff1cec832dc", "parents": [ "1ed9e747167e547e6c3e27708b40b014b3700f8c" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Sep 05 21:39:23 2020 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Sep 05 21:39:23 2020 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I729ec6ac98a95690838697c28220b11b0f1b0399\n" }, { "commit": "44d4d1333c29dd1bbe45753207361cfd05e42b2e", "tree": "3e998b5f7f8210a86d4e4b72666d54ad96fe0efe", "parents": [ "14d438a337296b965f9510f7eb820d8b04fcec48", "6c701f5341ebf5711448ac19bc8e8eab0ef1c513" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Sep 05 04:33:51 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 05 04:33:51 2020 +0000" }, "message": "[automerger skipped] Merge \"Import translations. DO NOT MERGE ANYWHERE\" am: 5e2016da9a -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263\n\nChange-Id: I65af634549f635e7acf2a1b88213500081d8fde2\n" }, { "commit": "6c701f5341ebf5711448ac19bc8e8eab0ef1c513", "tree": "f2720a4964f21a1339dfbf0011cbbff1cec832dc", "parents": [ "1ed9e747167e547e6c3e27708b40b014b3700f8c" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Sep 05 01:14:22 2020 +0000" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Sep 05 01:14:22 2020 +0000" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: Ibfe7031a80e38ed3fe776e195514e6c7cad418ab\n" }, { "commit": "14d438a337296b965f9510f7eb820d8b04fcec48", "tree": "3e998b5f7f8210a86d4e4b72666d54ad96fe0efe", "parents": [ "31e2400668389ca5adadcc17c3eca18d834366f0", "ac8f65a5443e5315d03d25ce7635966a5be8ed1d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 03 15:17:50 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 03 15:17:50 2020 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into stage-aosp-master" }, { "commit": "ac8f65a5443e5315d03d25ce7635966a5be8ed1d", "tree": "3e998b5f7f8210a86d4e4b72666d54ad96fe0efe", "parents": [ "82a71b8f72b1297f54cf46632b1c86952bd25565" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Sep 03 08:32:04 2020 +0000" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Sep 03 08:32:04 2020 +0000" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I946ba0e5ca40f934bdc7588eb244969103813c4c\n" }, { "commit": "31e2400668389ca5adadcc17c3eca18d834366f0", "tree": "90d8061def99099e464e6d125efd08f3bc13f246", "parents": [ "82a71b8f72b1297f54cf46632b1c86952bd25565", "45670a5265f019a1374d25879bf3fa64cbc5b847" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 02 11:44:54 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Sep 02 11:44:54 2020 -0700" }, "message": "Mark RP1A.200720.001 as merged\n\nBug: 167588565\nMerged-In: I608df7327b8366fd365b11c6bdff9ed28fde99b0\nChange-Id: Ie293ab2bcba5f778a7cac8476e226dc7c15e000f\n" }, { "commit": "82a71b8f72b1297f54cf46632b1c86952bd25565", "tree": "90d8061def99099e464e6d125efd08f3bc13f246", "parents": [ "1ed9e747167e547e6c3e27708b40b014b3700f8c", "c882e8c995527056e5a2d45215b66f2211d18435" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 31 21:21:38 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 31 21:21:38 2020 -0700" }, "message": "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\n\nBug: 166295507\nMerged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27\nChange-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2\n" }, { "commit": "1ed9e747167e547e6c3e27708b40b014b3700f8c", "tree": "bb3a10134ba5579351a5fb1877b1335fb2b035b3", "parents": [ "c5d748e69449509406f6e482f78aa87efca09d30", "3aee2ac91accdd6aa68cbe77ad49b19eb614515a" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Tue Aug 18 09:19:56 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 18 09:19:56 2020 +0000" }, "message": "Merge \"Add usesCleartextTraffic to Tethering\" am: 3aee2ac91a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629\n\nChange-Id: Ia5d7695edf13ac4ae9544c648fa95068809f0ab1\n" }, { "commit": "3aee2ac91accdd6aa68cbe77ad49b19eb614515a", "tree": "bb3a10134ba5579351a5fb1877b1335fb2b035b3", "parents": [ "96924bf201682cd35aada27c0204bc1f89179b32", "c12b03a9352f3996d62b573a0bdede6a6b0019e0" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Tue Aug 18 09:04:59 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 18 09:04:59 2020 +0000" }, "message": "Merge \"Add usesCleartextTraffic to Tethering\"" }, { "commit": "c12b03a9352f3996d62b573a0bdede6a6b0019e0", "tree": "f13e964e6021cc1a2e05b63b47c758cac515cf9d", "parents": [ "d2af4d9e2a8bbdc206253d635190972b56073938" ], "author": { "name": "markchien", "email": "markchien@google.com", "time": "Tue Aug 18 09:52:08 2020 +0800" }, "committer": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Tue Aug 18 09:00:58 2020 +0000" }, "message": "Add usesCleartextTraffic to Tethering\n\nusesCleartextTraffic needs to be true for the networkstack process so\nthat the NetworkStack module can use no-encrypted probes to detect\ncaptive portals.\n\nWhen loaded in the networkstack process, all packages in process must\nset usesCleartextTraffic\u003dtrue, otherwise there may be races causing\nthe flag not to be set for the process.\n\nBug: 161860610\nTest: CtsTetheringTest, TetheringTests\nChange-Id: Ife03ee0c7096ea242eb701b297a69b471e15b436\n" }, { "commit": "c5d748e69449509406f6e482f78aa87efca09d30", "tree": "8f2318d82c2f4f7549d3a020abf36e1ec294cee7", "parents": [ "9caa751767db7f3e62fb6a13f07414ce6761b727", "96924bf201682cd35aada27c0204bc1f89179b32" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Thu Aug 13 04:09:27 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 13 04:09:27 2020 +0000" }, "message": "Merge \"Rename Kotlin util files to not include the Kt suffix\" am: b1a3247ab4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084\n\nChange-Id: I7e1f015c21d54591a1a25b5fa461e751bc707509\n" }, { "commit": "96924bf201682cd35aada27c0204bc1f89179b32", "tree": "8f2318d82c2f4f7549d3a020abf36e1ec294cee7", "parents": [ "346a361e936283a142343bfebdfc62b375949953" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Jun 26 00:41:26 2020 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Aug 12 10:02:50 2020 +0900" }, "message": "Rename Kotlin util files to not include the Kt suffix\n\nCallers don\u0027t care what language the utilities are written in\n\nTest: builds\nChange-Id: Ie212144f36c50db223c05f3fcb6bad745842cb5e\n" }, { "commit": "9caa751767db7f3e62fb6a13f07414ce6761b727", "tree": "9a0bb739f95adc3d517e9511e332ad82c085b977", "parents": [ "5ab9ebb883a85d4325afad52f1e66537dd475d3d", "346a361e936283a142343bfebdfc62b375949953" ], "author": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Mon Aug 10 01:46:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 10 01:46:50 2020 +0000" }, "message": "Merge \"Verify pending intent flags\" am: 346a361e93\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696\n\nChange-Id: I6764ac9bface86d26f395c6a4fd8b63f7a08df6e\n" }, { "commit": "346a361e936283a142343bfebdfc62b375949953", "tree": "9a0bb739f95adc3d517e9511e332ad82c085b977", "parents": [ "88184988773fcbf2e3f3f07cf8227202ba35c397", "f603ed5fb834694ee6b4f7a68f4387fb51052f51" ], "author": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Mon Aug 10 01:32:12 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 10 01:32:12 2020 +0000" }, "message": "Merge \"Verify pending intent flags\"" }, { "commit": "371cab24540eefbfa4ed2aa29cfb9a4a2217e4a9", "tree": "fd7f7affec11be71600991fa3f09d04ca8c5530d", "parents": [ "5a3b172d0b27d144ee6e0f69ee5bfce56d1bb0a2", "f1ac1eddadfc3c137794f50ec52e06695d1bc4e5" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Aug 07 07:26:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 07 07:26:54 2020 +0000" }, "message": "[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours am: f1ac1eddad -s ours\n\nam skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725\n\nChange-Id: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b\n" }, { "commit": "5a3b172d0b27d144ee6e0f69ee5bfce56d1bb0a2", "tree": "fd7f7affec11be71600991fa3f09d04ca8c5530d", "parents": [ "e0e75de37e0eef164044545038211385138fcef7", "ce321cccc3fe1829a65b3a0b56a4376f549701ee" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Aug 07 07:26:47 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 07 07:26:47 2020 +0000" }, "message": "[automerger skipped] Revert \"Revert \"Move Inet[4]AddressUtils to libs/net\"\" am: 78701646dd am: 827a8abfb5 -s ours am: ce321cccc3 -s ours\n\nam skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497\n\nChange-Id: I853068e1d6301fc99466f255e9084a130d122971\n" }, { "commit": "f1ac1eddadfc3c137794f50ec52e06695d1bc4e5", "tree": "fd7f7affec11be71600991fa3f09d04ca8c5530d", "parents": [ "ce321cccc3fe1829a65b3a0b56a4376f549701ee", "5ab9ebb883a85d4325afad52f1e66537dd475d3d" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Aug 07 07:16:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 07 07:16:28 2020 +0000" }, "message": "[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours\n\nam skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725\n\nChange-Id: I462f911d13e7574a0babd6d661c0b569f0265b58\n" }, { "commit": "ce321cccc3fe1829a65b3a0b56a4376f549701ee", "tree": "fd7f7affec11be71600991fa3f09d04ca8c5530d", "parents": [ "04720e79b0d42a3061c50d0e2a9d154d07973f9e", "827a8abfb52c49a8c2b90c7ca3ead53627c225e5" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Aug 07 07:16:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 07 07:16:23 2020 +0000" }, "message": "[automerger skipped] Revert \"Revert \"Move Inet[4]AddressUtils to libs/net\"\" am: 78701646dd am: 827a8abfb5 -s ours\n\nam skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497\n\nChange-Id: I5b15fde5cb76d1dc178a3cb2b1597e0c27aa7af2\n" }, { "commit": "5ab9ebb883a85d4325afad52f1e66537dd475d3d", "tree": "225941a72522eaff978a1bc350e0da669e229e23", "parents": [ "827a8abfb52c49a8c2b90c7ca3ead53627c225e5", "88184988773fcbf2e3f3f07cf8227202ba35c397" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Aug 07 06:59:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 07 06:59:30 2020 +0000" }, "message": "Merge changes I33b70b0a,I1074eedb am: 8818498877\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725\n\nChange-Id: I18869fe6bddd51f77068a91034b524f12c5a3450\n" }, { "commit": "827a8abfb52c49a8c2b90c7ca3ead53627c225e5", "tree": "225941a72522eaff978a1bc350e0da669e229e23", "parents": [ "b537c256850ca7d60860350c6b81d522bbf8eae0", "78701646dddb61bef6ea35c6ba56275a80fe7ba5" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Aug 07 06:59:26 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 07 06:59:26 2020 +0000" }, "message": "Revert \"Revert \"Move Inet[4]AddressUtils to libs/net\"\" am: 78701646dd\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497\n\nChange-Id: Ia5e7e926bc3a9af8b03f8970738e6abe4c6d15b6\n" }, { "commit": "88184988773fcbf2e3f3f07cf8227202ba35c397", "tree": "225941a72522eaff978a1bc350e0da669e229e23", "parents": [ "d2af4d9e2a8bbdc206253d635190972b56073938", "78701646dddb61bef6ea35c6ba56275a80fe7ba5" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Aug 07 06:45:15 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 07 06:45:15 2020 +0000" }, "message": "Merge changes I33b70b0a,I1074eedb\n\n* changes:\n Remove the services.net-module-wifi module target.\n Revert \"Revert \"Move Inet[4]AddressUtils to libs/net\"\"\n" }, { "commit": "78701646dddb61bef6ea35c6ba56275a80fe7ba5", "tree": "bb3ddc7c32ce546e48f54bdb792fc34734632e09", "parents": [ "f97ac209c2dc8c69706ad0995b605c9d82f6ddb5" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Jul 31 20:00:30 2020 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Aug 07 03:31:04 2020 +0000" }, "message": "Revert \"Revert \"Move Inet[4]AddressUtils to libs/net\"\"\n\nThis patch is still needed and should go in now that the\nerror is fixed.\nThe patch was submitted into rvc-dev and is already in\nrvc-dev-plus-aosp (patch in in ag/11923559, revert\nskipped in ag/12072199). A follow-up will remove the\nunused services.net-module-wifi target.\n\nTest: originally tested in aosp/1324109\nTest: m; manual: flashed, wifi and telephony working\nTest: atest NetworkStackCoverageTests\nChange-Id: I1074eedb0b0f156a1135e11210ec102de15ea674\nMerged-In: Icd141a992c46290c74929785e261a1cd57bc001b\n" }, { "commit": "e0e75de37e0eef164044545038211385138fcef7", "tree": "fd7f7affec11be71600991fa3f09d04ca8c5530d", "parents": [ "4a4a60da0cb25398102183157ef6c44374dc60ad", "04720e79b0d42a3061c50d0e2a9d154d07973f9e" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Wed Aug 05 06:54:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 05 06:54:40 2020 +0000" }, "message": "Merge \"Allow wifi p2p to use legacy dedicated address\" am: d2af4d9e2a am: b537c25685 am: 04720e79b0\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398\n\nChange-Id: I209007d8742ac5a331b2b19af164944f38ac36ca\n" }, { "commit": "04720e79b0d42a3061c50d0e2a9d154d07973f9e", "tree": "fd7f7affec11be71600991fa3f09d04ca8c5530d", "parents": [ "493f8b7b69efffdb0c6d36a71d0c40cda3788fbd", "b537c256850ca7d60860350c6b81d522bbf8eae0" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Wed Aug 05 06:36:36 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 05 06:36:36 2020 +0000" }, "message": "Merge \"Allow wifi p2p to use legacy dedicated address\" am: d2af4d9e2a am: b537c25685\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398\n\nChange-Id: Ica17499f82135bc96b87ca4071b603bb8cc23053\n" }, { "commit": "b537c256850ca7d60860350c6b81d522bbf8eae0", "tree": "56e942729a1dcc8ccf17baacb659f42f4e3cbfdb", "parents": [ "d96c6835952e2cad497f252aa7012fa09ac5fe0d", "d2af4d9e2a8bbdc206253d635190972b56073938" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Wed Aug 05 06:22:38 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 05 06:22:38 2020 +0000" }, "message": "Merge \"Allow wifi p2p to use legacy dedicated address\" am: d2af4d9e2a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398\n\nChange-Id: I8977ef203c363d68c1c43ecd70f530a4924f01b9\n" }, { "commit": "d2af4d9e2a8bbdc206253d635190972b56073938", "tree": "56e942729a1dcc8ccf17baacb659f42f4e3cbfdb", "parents": [ "f97ac209c2dc8c69706ad0995b605c9d82f6ddb5", "eb8fec21114b40f2f02ee0bee3ef04823d0e496f" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Wed Aug 05 06:01:37 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 05 06:01:37 2020 +0000" }, "message": "Merge \"Allow wifi p2p to use legacy dedicated address\"" }, { "commit": "eb8fec21114b40f2f02ee0bee3ef04823d0e496f", "tree": "4db0c39aba259f6298d4c235a5e0b344dc5cdea9", "parents": [ "af9ec640c93e9bf73695df7ff841887a3655c788" ], "author": { "name": "markchien", "email": "markchien@google.com", "time": "Mon Aug 03 12:01:59 2020 +0800" }, "committer": { "name": "markchien", "email": "markchien@google.com", "time": "Wed Aug 05 11:03:46 2020 +0800" }, "message": "Allow wifi p2p to use legacy dedicated address\n\nSome exsting applications may expect wifi p2p use legacy\n\"192.168.49.1/24\" address. Have a configuration for wifi p2p to\ndecide whether to use legacy dedicated address or random address.\n\nBug: 161520826\nTest: atest TetheringTests\nChange-Id: If79973416a6780ee19ee785c65772b1a2dc1fbf7\n" }, { "commit": "f603ed5fb834694ee6b4f7a68f4387fb51052f51", "tree": "5eae4aa99396130786d15120514eef5f116176f7", "parents": [ "af9ec640c93e9bf73695df7ff841887a3655c788" ], "author": { "name": "paulhu", "email": "paulhu@google.com", "time": "Mon Jun 29 00:55:41 2020 +0800" }, "committer": { "name": "paulhu", "email": "paulhu@google.com", "time": "Tue Aug 04 11:24:33 2020 +0800" }, "message": "Verify pending intent flags\n\nAll PendingIntent included activity and broadcast should set\nFLAG_IMMUTABLE flag.\n\nBug: 156353008\nTest: atest TetheringTests\nChange-Id: I4592e914b67ecb8865d7de47797423f27e9ff840\n" }, { "commit": "4a4a60da0cb25398102183157ef6c44374dc60ad", "tree": "5ec0fb5d4e1c9a35c7f1def392befa98d54a9113", "parents": [ "230cbcc6117d3f3dda2c467ccf1d36e04eccae33", "493f8b7b69efffdb0c6d36a71d0c40cda3788fbd" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Jul 31 01:12:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 31 01:12:13 2020 +0000" }, "message": "Merge \"Move utils from network stack to libs.\" am: f97ac209c2 am: d96c683595 am: 493f8b7b69\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083\n\nChange-Id: I56d148261c5fe94264ff0a68e87020329d06b857\n" }, { "commit": "493f8b7b69efffdb0c6d36a71d0c40cda3788fbd", "tree": "5ec0fb5d4e1c9a35c7f1def392befa98d54a9113", "parents": [ "d3a216ae4f4906accc04a0340d58660fb8064a1e", "d96c6835952e2cad497f252aa7012fa09ac5fe0d" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Jul 31 01:09:46 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 31 01:09:46 2020 +0000" }, "message": "Merge \"Move utils from network stack to libs.\" am: f97ac209c2 am: d96c683595\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083\n\nChange-Id: Ia163bc416e16ce56fc96855c1111a9905b712843\n" }, { "commit": "d96c6835952e2cad497f252aa7012fa09ac5fe0d", "tree": "088061007adc26712a03102ddad37d9ca8ec7396", "parents": [ "d85403cc70da0e2c00b86dee780db508b68b6b6a", "f97ac209c2dc8c69706ad0995b605c9d82f6ddb5" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Jul 31 00:53:12 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 31 00:53:12 2020 +0000" }, "message": "Merge \"Move utils from network stack to libs.\" am: f97ac209c2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083\n\nChange-Id: I846dae9b7e36ddf6360bb946cc07beb8c44a34a5\n" }, { "commit": "f97ac209c2dc8c69706ad0995b605c9d82f6ddb5", "tree": "088061007adc26712a03102ddad37d9ca8ec7396", "parents": [ "e66098036f3bd3862b3aac463ff2127ef177f305", "bdcca9246e10aaa82f7ae91a8af67087e7bc2989" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Jul 31 00:44:46 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jul 31 00:44:46 2020 +0000" }, "message": "Merge \"Move utils from network stack to libs.\"" }, { "commit": "230cbcc6117d3f3dda2c467ccf1d36e04eccae33", "tree": "97ea5f8c6464beb294442610df11086a5e6d70bb", "parents": [ "9125d2ed58d04bd3ee3c780dce41c178b719de28", "d3a216ae4f4906accc04a0340d58660fb8064a1e" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Thu Jul 30 03:38:47 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 30 03:38:47 2020 +0000" }, "message": "Merge \"Update language to comply with Android\u0027s inclusive language guidance\" am: e66098036f am: d85403cc70 am: d3a216ae4f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618\n\nChange-Id: Ib53b46257c7fec87c0da23832776133107f13e5d\n" }, { "commit": "d3a216ae4f4906accc04a0340d58660fb8064a1e", "tree": "97ea5f8c6464beb294442610df11086a5e6d70bb", "parents": [ "17cfe5d843f84ed87622843d8bf7aacf954684b5", "d85403cc70da0e2c00b86dee780db508b68b6b6a" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Thu Jul 30 03:17:44 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 30 03:17:44 2020 +0000" }, "message": "Merge \"Update language to comply with Android\u0027s inclusive language guidance\" am: e66098036f am: d85403cc70\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618\n\nChange-Id: I8426e89337e60c48ad20677e835d36622d41ed91\n" }, { "commit": "d85403cc70da0e2c00b86dee780db508b68b6b6a", "tree": "c2bddabba75117c764d8af2660ac55eef9f2de48", "parents": [ "4f671f3834644f628db415453cf7b52df959ef95", "e66098036f3bd3862b3aac463ff2127ef177f305" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Thu Jul 30 02:59:05 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 30 02:59:05 2020 +0000" }, "message": "Merge \"Update language to comply with Android\u0027s inclusive language guidance\" am: e66098036f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618\n\nChange-Id: I5bdb72d5d5d24beb29a96ae605179bd530b4c856\n" }, { "commit": "e66098036f3bd3862b3aac463ff2127ef177f305", "tree": "c2bddabba75117c764d8af2660ac55eef9f2de48", "parents": [ "af2670f4279550b5e78f890899e39fc803cb0c9a", "14aaefcb120ae1bf2cc70eb712f21b005187b5f8" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Thu Jul 30 02:49:44 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 30 02:49:44 2020 +0000" }, "message": "Merge \"Update language to comply with Android\u0027s inclusive language guidance\"" }, { "commit": "bdcca9246e10aaa82f7ae91a8af67087e7bc2989", "tree": "c387abcda309231869c08897d7a828479299726c", "parents": [ "af2670f4279550b5e78f890899e39fc803cb0c9a" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Jun 26 00:19:33 2020 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jul 29 21:15:48 2020 +0900" }, "message": "Move utils from network stack to libs.\n\nThis package is using some common utilities from\na library that used to live in the network stack.\nA better home for these utilities is frameworks/libs,\nso this topic moves the files ther and also changes\nthe package of some utilities.\n\nSee aosp/1350222 and aosp/1350182 for a detailed\ndescription of the specific files that moved.\n\nTest: checkbuild\nChange-Id: I76a9b7790f3997e3e6b3c2f75ba6308286457cde\n" }, { "commit": "9125d2ed58d04bd3ee3c780dce41c178b719de28", "tree": "a350cf51bbdc506ed24159921d6b83741536f288", "parents": [ "38a286c9cd1e5a3468caa0f59c3495117a274fcb", "17cfe5d843f84ed87622843d8bf7aacf954684b5" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Wed Jul 29 05:21:00 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 29 05:21:00 2020 +0000" }, "message": "Merge \"Always stop dhcp server even it is obsolete\" am: 0ae446b50d am: 4f671f3834 am: 17cfe5d843\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217\n\nChange-Id: Id45ad3c4bcc90fc3b8355428f8b5d131b220470e\n" }, { "commit": "17cfe5d843f84ed87622843d8bf7aacf954684b5", "tree": "a350cf51bbdc506ed24159921d6b83741536f288", "parents": [ "c882e8c995527056e5a2d45215b66f2211d18435", "4f671f3834644f628db415453cf7b52df959ef95" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Wed Jul 29 04:56:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 29 04:56:10 2020 +0000" }, "message": "Merge \"Always stop dhcp server even it is obsolete\" am: 0ae446b50d am: 4f671f3834\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217\n\nChange-Id: Ibb1c96fce2435fec3f678d89531ed10a6ddc784f\n" }, { "commit": "4f671f3834644f628db415453cf7b52df959ef95", "tree": "fa9cc285f44802f034ff77ee5e893aac202525b7", "parents": [ "adda81e88faf4d9bf75453d005dba7b168bac9ec", "af2670f4279550b5e78f890899e39fc803cb0c9a" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Wed Jul 29 04:42:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 29 04:42:10 2020 +0000" }, "message": "Merge \"Always stop dhcp server even it is obsolete\" am: 0ae446b50d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217\n\nChange-Id: I6eb68ffd14d3491784d643e0059ca6591de7d8a6\n" }, { "commit": "14aaefcb120ae1bf2cc70eb712f21b005187b5f8", "tree": "96fee36b4817693d3a6bde2aa090a1e61cb33bdc", "parents": [ "b68d322521f9a0fb851486fe0b6fd8d7462bf05b" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Wed Jul 29 12:05:04 2020 +0800" }, "committer": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Wed Jul 29 12:05:04 2020 +0800" }, "message": "Update language to comply with Android\u0027s inclusive language guidance\n\nSee https://source.android.com/setup/contribute/respectful-code\nfor reference.\n\nTest: m ; atest TetheringTests\nBug: 161896447\nChange-Id: Idc58697c72fb00896bee00185fefc50c1a24dd35\n" }, { "commit": "af2670f4279550b5e78f890899e39fc803cb0c9a", "tree": "fa9cc285f44802f034ff77ee5e893aac202525b7", "parents": [ "af9ec640c93e9bf73695df7ff841887a3655c788" ], "author": { "name": "markchien", "email": "markchien@google.com", "time": "Wed Jul 22 21:28:48 2020 +0800" }, "committer": { "name": "markchien", "email": "markchien@google.com", "time": "Wed Jul 29 09:55:29 2020 +0800" }, "message": "Always stop dhcp server even it is obsolete\n\nIf dhcp server is obsolete, explicitly stop it to shut down its thread.\n\nBug: 161418295\nTest: atest CtsTetheringTest\nChange-Id: Ic5b876bd23711ec8d832879a7baee0495246b218\n" }, { "commit": "38a286c9cd1e5a3468caa0f59c3495117a274fcb", "tree": "0f0960399725424e7847056a4f767099d2a6b48d", "parents": [ "df46c500d05b326aedc60a79189d86875aa86a0d", "c882e8c995527056e5a2d45215b66f2211d18435" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Thu Jul 16 04:58:12 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 16 04:58:12 2020 +0000" }, "message": "Merge \"Add tethering privileged test\" am: af9ec640c9 am: adda81e88f am: c882e8c995\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361\n\nChange-Id: I46e6a1514c9518ab1f308f129c27d53002793a32\n" }, { "commit": "c882e8c995527056e5a2d45215b66f2211d18435", "tree": "0f0960399725424e7847056a4f767099d2a6b48d", "parents": [ "aefd8b4e2537a8941ad6e62fca8321ad97dbc72c", "adda81e88faf4d9bf75453d005dba7b168bac9ec" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Thu Jul 16 04:41:20 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 16 04:41:20 2020 +0000" }, "message": "Merge \"Add tethering privileged test\" am: af9ec640c9 am: adda81e88f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361\n\nChange-Id: Id673131e628856ea57475384160baeac5e10de1b\n" }, { "commit": "adda81e88faf4d9bf75453d005dba7b168bac9ec", "tree": "33fb41c1cf5a732a535281a8c9fdaca9ceecb460", "parents": [ "e39fdf0a5fed0dfc8d9a3f6c688c7e680a897fb5", "af9ec640c93e9bf73695df7ff841887a3655c788" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Thu Jul 16 04:28:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 16 04:28:42 2020 +0000" }, "message": "Merge \"Add tethering privileged test\" am: af9ec640c9\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361\n\nChange-Id: I9a97578c15ee9122d1e9ef79f42fa059e4fcc7f4\n" }, { "commit": "af9ec640c93e9bf73695df7ff841887a3655c788", "tree": "33fb41c1cf5a732a535281a8c9fdaca9ceecb460", "parents": [ "df5d88796b9b40fa19a12c5c0753168c67b17c30", "88f0428056de7462093c08edf24ff6a100e9a49a" ], "author": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Thu Jul 16 04:12:58 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 16 04:12:58 2020 +0000" }, "message": "Merge \"Add tethering privileged test\"" }, { "commit": "88f0428056de7462093c08edf24ff6a100e9a49a", "tree": "4919bda9cc394dfb83a80f8e423031946fc002e1", "parents": [ "cdf6b4202c501113699f948c1612c2f4b1f534b9" ], "author": { "name": "markchien", "email": "markchien@google.com", "time": "Sat Jun 20 17:37:22 2020 +0800" }, "committer": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Thu Jul 16 04:12:01 2020 +0000" }, "message": "Add tethering privileged test\n\nCreate TetheringPrivilegedTests which have MAINLINE_NETWORK_STACK\npermission, the test can perform various network-related operations\nwhich need CAP_NET_RAW and CAP_NET_ADMIN capabilities.\n\nBug: 145490751\nTest: make TetheringPrivilegedTests\nChange-Id: Ic205e5183e066766377c63336d9c5171d4875c6a\n" }, { "commit": "df46c500d05b326aedc60a79189d86875aa86a0d", "tree": "7d19264fdaa3e5a5d95f4b7b0cf2ce9a31ea1d09", "parents": [ "99c50241f36ccba8875069d93b7bcf1e8afbb7f1", "aefd8b4e2537a8941ad6e62fca8321ad97dbc72c" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Jul 15 16:15:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 15 16:15:25 2020 +0000" }, "message": "Merge \"Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs\" am: df5d88796b am: e39fdf0a5f am: aefd8b4e25\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884\n\nChange-Id: I3362be72460c8830569b7dda470d581b176ea28a\n" }, { "commit": "aefd8b4e2537a8941ad6e62fca8321ad97dbc72c", "tree": "7d19264fdaa3e5a5d95f4b7b0cf2ce9a31ea1d09", "parents": [ "c72e3873b2b9c72a0f8b3b991a4bdb46990d0e92", "e39fdf0a5fed0dfc8d9a3f6c688c7e680a897fb5" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Jul 15 16:00:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 15 16:00:22 2020 +0000" }, "message": "Merge \"Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs\" am: df5d88796b am: e39fdf0a5f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884\n\nChange-Id: Ie45f32b2d46c8ac989a4a9242017eb4c2b73484b\n" }, { "commit": "e39fdf0a5fed0dfc8d9a3f6c688c7e680a897fb5", "tree": "1c6d2f2d8764d77eeedf6fa4168316b79e78786e", "parents": [ "8b74fe1c8b2c0f68066f136bfe26b505e24eedfe", "df5d88796b9b40fa19a12c5c0753168c67b17c30" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Jul 15 15:43:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 15 15:43:34 2020 +0000" }, "message": "Merge \"Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs\" am: df5d88796b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884\n\nChange-Id: I17d06553e949a9f092bad513ec9880b05d1b38e9\n" }, { "commit": "df5d88796b9b40fa19a12c5c0753168c67b17c30", "tree": "1c6d2f2d8764d77eeedf6fa4168316b79e78786e", "parents": [ "dace79b0aca6abb3bbb4bf2ecc31e3b5bdc533a2", "d682ebc33c2272d6e8898fad12b37e2a4acb3c18" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Jul 15 15:26:06 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 15 15:26:06 2020 +0000" }, "message": "Merge \"Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs\"" }, { "commit": "d682ebc33c2272d6e8898fad12b37e2a4acb3c18", "tree": "1c6d2f2d8764d77eeedf6fa4168316b79e78786e", "parents": [ "dace79b0aca6abb3bbb4bf2ecc31e3b5bdc533a2" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Fri Jul 10 12:05:21 2020 -0700" }, "committer": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Jul 15 01:36:38 2020 +0000" }, "message": "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs\n\nTest: build / treehugger\nBug: 146727827\nExempt-From-Owner-Approval: Cherry-picking from goog/master to aosp/master\nMerged-in: Ie1ad6711c490c679ebcfacd97154380a8810ba1c\nChange-Id: Ie1ad6711c490c679ebcfacd97154380a8810ba1c\n" }, { "commit": "45670a5265f019a1374d25879bf3fa64cbc5b847", "tree": "c1622e3f9ee82d3885ae8c5d74d3a2c223c8d199", "parents": [ "b25444227c660665dc59ea268b2ddbd8cee7aaff", "0275981699b68dba728870112ca9253714e8dbc0" ], "author": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue Jul 14 01:02:58 2020 +0000" }, "committer": { "name": "android-build-team Robot", "email": "android-build-team-robot@google.com", "time": "Tue Jul 14 01:02:58 2020 +0000" }, "message": "Snap for 6676900 from f1a6972937d72d716d5b75d73daae7e3959fb5e9 to rvc-release\n\nChange-Id: I3853e5b41c3279d20709b39e96b9316944c97771\n" }, { "commit": "99c50241f36ccba8875069d93b7bcf1e8afbb7f1", "tree": "a5a4bd3786be1dfa304374ce479c4fe951df2e12", "parents": [ "dd9a53fdf3883cd3202b64ce12742ca06d63c83c", "c72e3873b2b9c72a0f8b3b991a4bdb46990d0e92" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 13 13:43:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 13 13:43:10 2020 +0000" }, "message": "[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 -s ours am: c72e3873b2 -s ours\n\nam skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 0275981699 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906\n\nChange-Id: I7295de91e3261861fef8bace9cf3e345197e43ee\n" }, { "commit": "dd9a53fdf3883cd3202b64ce12742ca06d63c83c", "tree": "a5a4bd3786be1dfa304374ce479c4fe951df2e12", "parents": [ "8e38519317fc2b04e287f1c6fc0e1424710d0ce4", "31e4bfe7b067c817fffc133cf665914035a2bae0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 13 13:42:57 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 13 13:42:57 2020 +0000" }, "message": "[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 am: 31e4bfe7b0 -s ours\n\nam skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 45fb1aae66 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906\n\nChange-Id: I05505eaaefe7d638a1208e23994c41617ceba60b\n" }, { "commit": "c72e3873b2b9c72a0f8b3b991a4bdb46990d0e92", "tree": "a5a4bd3786be1dfa304374ce479c4fe951df2e12", "parents": [ "218040ca262be64c9efc4c4fa31a980744cad97e", "0275981699b68dba728870112ca9253714e8dbc0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 13 13:30:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 13 13:30:50 2020 +0000" }, "message": "[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 -s ours\n\nam skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 45fb1aae66 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906\n\nChange-Id: I0fd07b73d41f14cd62d208ea7434a5c8f74b7ce3\n" }, { "commit": "31e4bfe7b067c817fffc133cf665914035a2bae0", "tree": "c1622e3f9ee82d3885ae8c5d74d3a2c223c8d199", "parents": [ "ea316b9be60aaff25a745985e71738ae14ed062e", "0275981699b68dba728870112ca9253714e8dbc0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 13 13:30:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 13 13:30:50 2020 +0000" }, "message": "Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906\n\nChange-Id: I55b776ef0ae16d0a762f10c979e1efb659200ad8\n" }, { "commit": "0275981699b68dba728870112ca9253714e8dbc0", "tree": "c1622e3f9ee82d3885ae8c5d74d3a2c223c8d199", "parents": [ "6faf8619945930f9aef6c21269343d2ea0db57b9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 13 09:35:07 2020 +0000" }, "committer": { "name": "Mark Chien", "email": "markchien@google.com", "time": "Mon Jul 13 10:01:25 2020 +0000" }, "message": "Fix EthernetTetheringTest failure if tethering is not supported\n\nDo not run ethernet tethering tests if tethering is not supported\nbecause Tethering APIs would fail. Also skip the test if\nEthernetManager is not avaliable. EthernetManager would be null if\nthere are no FEATURE_ETHERNET and FEATURE_USB_HOST.\n\nBug: 159869957\nTest: atest CtsTetheringTest\nMerged-In: I2b9be6799c6edeefc8cd74897a8704dbe80dd061\nChange-Id: I2b9be6799c6edeefc8cd74897a8704dbe80dd061\n" }, { "commit": "8e38519317fc2b04e287f1c6fc0e1424710d0ce4", "tree": "a5a4bd3786be1dfa304374ce479c4fe951df2e12", "parents": [ "35e57d47947e717f83d6c8557d2827d39bd0936b", "218040ca262be64c9efc4c4fa31a980744cad97e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 13 09:46:27 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 13 09:46:27 2020 +0000" }, "message": "Merge \"Fix EthernetTetheringTest failure if tethering is not supported\" am: dace79b0ac am: 8b74fe1c8b am: 218040ca26\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244\n\nChange-Id: I861bc25832f8e3ac436e8f0127aa0aed4f64ca8a\n" }, { "commit": "218040ca262be64c9efc4c4fa31a980744cad97e", "tree": "a5a4bd3786be1dfa304374ce479c4fe951df2e12", "parents": [ "9fe7c99cb17c5e74bed5fe366aace8fca2e328aa", "8b74fe1c8b2c0f68066f136bfe26b505e24eedfe" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 13 09:35:07 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 13 09:35:07 2020 +0000" }, "message": "Merge \"Fix EthernetTetheringTest failure if tethering is not supported\" am: dace79b0ac am: 8b74fe1c8b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244\n\nChange-Id: I6763589a3af8cd78efc53e0637ff4f9d6ebcef88\n" }, { "commit": "8b74fe1c8b2c0f68066f136bfe26b505e24eedfe", "tree": "b2b6c425cf918de02b162cfa9caa14437345f0d4", "parents": [ "10daa1daaed7394a13959f3a48aa14350ab55c38", "dace79b0aca6abb3bbb4bf2ecc31e3b5bdc533a2" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 13 09:16:57 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 13 09:16:57 2020 +0000" }, "message": "Merge \"Fix EthernetTetheringTest failure if tethering is not supported\" am: dace79b0ac\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244\n\nChange-Id: I53b28c47dcf5c0590c02fc2f8f7c36a8323030d2\n" } ], "next": "dace79b0aca6abb3bbb4bf2ecc31e3b5bdc533a2" }