)]}' { "log": [ { "commit": "85808c8293b12571af7d62c15f5cfffeb42c9c98", "tree": "18fc503e764725ee6c843179f78591ea5961cc07", "parents": [ "d4932d9b5d913f80fc3ef569c9aa9de87b46fd85", "1b3877a96567c4021223c7b7c62c11db60db47fd" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 07 05:49:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 07 05:49:25 2017 +0000" }, "message": "Merge \"NetworkCapabilities: fix describeImmutableDifferences\" into oc-dr1-dev\nam: 1b3877a965\n\nChange-Id: I50748aa0c9332787797f91265afccf82ceabf332\n" }, { "commit": "8a3a012a1cd497a33bd6ec1d5935b79a695e5731", "tree": "9450551330d5a95d357fb2746f6d0fde26772d5c", "parents": [ "82e815616e1fcab7bcdab737dfc1a28946b0f486" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Aug 04 13:18:40 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Sat Aug 05 11:37:10 2017 +0900" }, "message": "NetworkCapabilities: fix describeImmutableDifferences\n\nThis patch fixes the mask used in describeImmutableDifferences which did\nnot correctly turn NET_CAPABILITY_NOT_METERED into bit flag.\n\nBug: 63326103\nTest: added unit tests, runtest frameworks-net\nMerged-In: Ib6b390b1daef5912859302692af7dcd6cfd3e39a\nMerged-In: If38efacdeec8476880835657938e435f9b598525\nMerged-In: Ieccad46fcffcaf748f5644b04617e9a82527000e\nMerged-In: I533ef8fe369cec19d283ff2950314fce6e28cffd\nMerged-In: I12636c6699ff60487a28570208e819ea0b66fa2e\nMerged-In: Ie5df14e0ea1c12e0cfabe87978ac6c9b744353b2\n\n(cherry picked from commit 2ecb9408f4102687f20f9ca19c13071ac6098cc6)\n\nChange-Id: I74ecf34a2c079c74152d00caea2c220e9c6d1fa5\n" }, { "commit": "b704e7aa75e74d955b44a53f5d0f0436dd5a670f", "tree": "357a9075fca980cf3a20216e0d794f1b5542c5f0", "parents": [ "2dfbbb3aa460fd01719eec1b42219e0715f02e2e", "a03bf7acd145e264f64aec6dedd0d537cca6bef6" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 28 04:39:14 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 28 04:39:14 2017 +0000" }, "message": "Merge \"NetworkNotificationManager: correctly handle existing notifications\" into oc-dr1-dev\nam: a03bf7acd1\n\nChange-Id: I4ca3dcc293be5408a6f207e1ac1a7229a915723a\n" }, { "commit": "3cff783a05b325862be6729db36f4d48f68ec39e", "tree": "92bc9157c30d35586930597914544c4c74960b50", "parents": [ "3d1e1cc9db6e84c19274c431ffa3d32c1a95bed2" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 25 21:57:51 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 28 09:17:20 2017 +0900" }, "message": "NetworkNotificationManager: correctly handle existing notifications\n\nThis patch corrects a regression added by commit fb2609d3eee1 that did\nnot take into account the case of multiple notifications shown for a\nsingle network id. Given how network notifications are triggered, it can\nhappen that NO_INTERNET and SIGN_IN notifications are both triggered for\nthe same network when captive portal detection is slow.\n\nContrary to the situation before commit fb2609d3eee1, a notification\npriority order is introduced so that SIGN_IN always overrides\nNO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.\n\nBug: 63676954\nBug: 62503737\nTest: runtest frameworks-net, added new unit tests\nMerged-In: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531\nMerged-In: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6\nMerged-In: I74631b0bfd14daf18a1641ed7f2ec323d636ebbf\nMerged-In: I73cc879e910d503946facdba498b300337f349fd\nMerged-In: Ieed9e3e7755e0c5f89dc41ef66f47d4dbf4c66a9\nMerged-In: I0aa590170f1bd4c37175c7e35e54d52f1fb21347\n\n(cherry picked from commit 5fcd050e0ecd5985cf184f55ea3df4434da8f824)\n\nChange-Id: I41675768ab59e9b23ca4275edf297b82595e5730\n" }, { "commit": "e9685cab9af3d9fae5929f89e5e4d199e242efba", "tree": "ac5abece59c5f17a823687fa59a4ecad36f22d8c", "parents": [ "d2eb1035ef30a583a06e41e17112c5019f152e95", "18856321057942a353e3c99eeff3ab417e39513d" ], "author": { "name": "Ahmed ElArabawy", "email": "arabawy@google.com", "time": "Wed Jul 19 22:17:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 22:17:21 2017 +0000" }, "message": "Merge \"Add Configuration to APF Policy\" into oc-dr1-dev am: 1da6af31ff\nam: 1885632105\n\nChange-Id: I5949798a6531344ed90301f452165838fa8adb6a\n" }, { "commit": "18856321057942a353e3c99eeff3ab417e39513d", "tree": "bf618ed7e21e60a9c53569d0ed747f2bec9b6c83", "parents": [ "85fa07b8312262eddbe795ca00ebd451dab7b8d3", "1da6af31ffb67e43a004ba2dddc4be0a0cb7edce" ], "author": { "name": "Ahmed ElArabawy", "email": "arabawy@google.com", "time": "Wed Jul 19 22:11:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 22:11:40 2017 +0000" }, "message": "Merge \"Add Configuration to APF Policy\" into oc-dr1-dev\nam: 1da6af31ff\n\nChange-Id: I16346bb98a0b9259f7c3f51e318c472cfc1bb492\n" }, { "commit": "1da6af31ffb67e43a004ba2dddc4be0a0cb7edce", "tree": "32bd51e78d13a665137ee5a8e0ae89a2517cb05c", "parents": [ "4dfb200d1b13d52da53b9849e813550af8778b4f", "4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 19 22:02:09 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 19 22:02:09 2017 +0000" }, "message": "Merge \"Add Configuration to APF Policy\" into oc-dr1-dev" }, { "commit": "c948cfab40477b6daafb7c3e394b62129bcecf8e", "tree": "d8bb0cec657bd8e8ef72de7bde040baf061435ee", "parents": [ "d350da9b4236d2d5fa7d7b73128997b9deeb8c90", "443f3aa138a36b9bde7dd4b9c61ac23384e7de5e" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 08:20:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 08:20:23 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\" am: 24a2adfa27 am: f6883504c2 am: b1894abbc5\nam: 443f3aa138\n\nChange-Id: I7d3bfdf6d95d5db2d31439b5c3334569666864e1\n" }, { "commit": "443f3aa138a36b9bde7dd4b9c61ac23384e7de5e", "tree": "e989a5992cf01b0ac6fe7c509dbcc8a0ca74f962", "parents": [ "8e8d274ed09a2a89b9b0b96c8040af34138bc1df", "b1894abbc598cc88e275437bdd0ba577d64217eb" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 08:15:12 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 08:15:12 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\" am: 24a2adfa27 am: f6883504c2\nam: b1894abbc5\n\nChange-Id: I458a0fdae874039e0f1d5cd38ed8ad0a1754bba9\n" }, { "commit": "b1894abbc598cc88e275437bdd0ba577d64217eb", "tree": "6b1095cd55f1f2b293733af4569d01e64f593c82", "parents": [ "04b48078e8b267f17f330f0fb29dda0c496c067f", "f6883504c28f72a4ad79ed43ac40f29c60aaf388" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 08:09:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 08:09:38 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\" am: 24a2adfa27\nam: f6883504c2\n\nChange-Id: I432f419d1c8f93136a76cbadfd32018294b3e3d7\n" }, { "commit": "f6883504c28f72a4ad79ed43ac40f29c60aaf388", "tree": "27efb44c9918ccadd0364e8b024ba1063051c5cb", "parents": [ "d82cdb4624d436189f1e1c2c53ec0b6ebb792bd9", "24a2adfa2738bd531c0172166733a8d8c089fe01" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 08:04:48 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 08:04:48 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\"\nam: 24a2adfa27\n\nChange-Id: I4be1d2ce67871c1e01364beca886fdd3af374321\n" }, { "commit": "c1014509d8654e4abfcfb7ee1bcaf642c2a2b67b", "tree": "858aa9bae549b74cf0fea0a451a30e44f1839153", "parents": [ "2627d4856be08bda40f6b50ba0974f8b875f4995" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 10:10:52 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 15:08:49 2017 +0900" }, "message": "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\n\nThis patch fixes a couple of flakyness issues with\ntestNetworkInfoOfTypeNone. It also fixes some typos and naming issues.\n\nBug: 62918393, 62918393\nTest: runtest frameworks-net\nChange-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09\n" }, { "commit": "31097a6341af2279ea0dd01528dc141f67cc7053", "tree": "85984e82e2c39906576dfce377f487ca4bb3947b", "parents": [ "e8f67b50b31719a37c0b4dd0cfe2655cb2c585d1", "93c5a4b389831654c8cc6576637f63b58a012487" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 01:31:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 01:31:28 2017 +0000" }, "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\" am: 2627d4856b am: 361162b636 am: fe88fa947e\nam: 93c5a4b389\n\nChange-Id: I7c66b30f5f7961900c3b5a5baf0c14644cbcb69e\n" }, { "commit": "93c5a4b389831654c8cc6576637f63b58a012487", "tree": "0e6ada72002e7d7121d254af8a96dcaa378a0d4b", "parents": [ "ca624861a6039b87034aa27525d6879d51412fbf", "fe88fa947e93ccf146151d115abe41f30c628507" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 01:22:59 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 01:22:59 2017 +0000" }, "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\" am: 2627d4856b am: 361162b636\nam: fe88fa947e\n\nChange-Id: I4bbbf0997f5bf9a1ebba1eb9968471fff9f297fe\n" }, { "commit": "fe88fa947e93ccf146151d115abe41f30c628507", "tree": "fda00bafbb875cf496580f91c67e30eb91aac675", "parents": [ "ad737afc4ce42f1ee86fc138058c23b0c8d4703c", "361162b6367eaffb3ecc779b893f07289e451c25" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 01:15:12 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 01:15:12 2017 +0000" }, "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\" am: 2627d4856b\nam: 361162b636\n\nChange-Id: Id72cd94c481bdc106ed022582399687b9abcc22b\n" }, { "commit": "361162b6367eaffb3ecc779b893f07289e451c25", "tree": "736272ba732d0133baa0d259a687f86325c7e742", "parents": [ "6b0e6946c3e1cf65e0b9f6b45902551ea1cf9e62", "2627d4856be08bda40f6b50ba0974f8b875f4995" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 01:06:59 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 01:06:59 2017 +0000" }, "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\"\nam: 2627d4856b\n\nChange-Id: I087aee995858ae898f5d660c11552724a07503c3\n" }, { "commit": "2627d4856be08bda40f6b50ba0974f8b875f4995", "tree": "189d0a0fa3b6f1082a4e92f5e78ad3ca2de39115", "parents": [ "777c408a220a0bc75b207ab7684b4fba84e1d316", "c10fe5f463676a05ecd3f76a5f7037700ea49b0d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 19 00:58:11 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 19 00:58:11 2017 +0000" }, "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\"" }, { "commit": "6a5fe34edfa75c4282db6fade142d582b0c8cd92", "tree": "4128d617d6bd2468852518947bfc5ed1666c6db8", "parents": [ "f947a122cb4844b94f09a413d4cb7110a5f32553", "8228eb34462cc9f76152bc87e20e721cd0e20775" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Jul 18 23:37:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 23:37:57 2017 +0000" }, "message": "resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master\nam: 8228eb3446\n\nChange-Id: Ic9ba31da8e5281c9dbc8fa7ff56a63956a495b72\n" }, { "commit": "8228eb34462cc9f76152bc87e20e721cd0e20775", "tree": "a115c75683da01b49d0fce878a2547e0aac3a1c7", "parents": [ "709f3c1d4660cbf8bbdf5f86278588113a57c91e", "a1d67fb38ec02150d674bc3b8d8354b53417552b" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 19 06:17:33 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 19 07:35:31 2017 +0900" }, "message": "resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master\n\nTest: make -j64 services\nChange-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b\nMerged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa\n" }, { "commit": "fa9c0be3574ca20fa613f358c876500da90d885a", "tree": "252f0016cdcf8b17b86b19a9a0d5002e4531f1e4", "parents": [ "3481d3d8e31d90f83b33815b5c58882a96c2169d", "3673863f3b2ec692201b7fb3089a1c05973e08e4" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Jul 18 18:47:45 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jul 18 18:47:45 2017 +0000" }, "message": "Merge \"Opt-out for always-on VPN\"" }, { "commit": "4ca0ba8f86f657f42ebae2d389f7a6f92251c01c", "tree": "59685f5a485344d13457665f9965a9c2ee9214db", "parents": [ "07f1304cfe9efbde7f90895a948b3170a3f0d0ec" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 12 15:48:07 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 19 00:55:37 2017 +0900" }, "message": "Fetch tethering offload stats.\n\nMake tethering offload register an ITetheringStatsProvider and\nfetch tethering stats from the hardware.\n\nCurrently we fetch stats in the following cases:\n\n1. Just after changing upstreams, we fetch stats from the\n previous upstream.\n2. When we are polled by NetworkStatsService.\n\n(cherry-picked from commit 5a7dea1a8eb2cf53fc1d5a52004647de94150e62)\n\nBug: 29337859\nBug: 32163131\nTest: builds, boots\nTest: stats appear in tethering logs\nChange-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56\nMerged-In: If744f2e06cb6a3095a40199936b9afb76eff7b56\n" }, { "commit": "c10fe5f463676a05ecd3f76a5f7037700ea49b0d", "tree": "da0fca48c10b6f3d4912d6f687e4fa445ddd036e", "parents": [ "d2c8dcfcfe4cdc4fb4d3d86a8a7e6e7d43fdd9c0" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 18 16:17:49 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 18 21:31:17 2017 +0900" }, "message": "IpManager: fix test for default ProvisioningConfiguration\n\nThe test did not properly account for the stopAllIP() done in starting\nstate of the IpManager state machine, which could cause assertions to\nfail when stopAllIP() is called again after stop().\n\nBug: 62988545\nTest: runtest frameworks-net\nChange-Id: I2c6eb76461a81c1d743bf448da36c58a99ce082d\n" }, { "commit": "822c5bf77892175d0b52aeaddf4e43c749c341f6", "tree": "57dbca58ce4fd89a6858d908ef3579a2a9e42cbb", "parents": [ "516e4d3c2b009bdf4e031513d6837e861e31fd62" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 18 14:28:27 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 18 14:33:12 2017 +0900" }, "message": "IP connectivity metrics: fix tests after proto update\n\nUpdate to ipconnectivity.proto in commit\n6d2f506bfd788a3685292d404dc9d82a27357cfe broke the associated unit\ntests (Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9)\n\nBug: 34901696\nTest: runtest frameworks-net\nChange-Id: I57a6bad8a9836b1c45690c4589b416786ce1dfa0\n" }, { "commit": "3673863f3b2ec692201b7fb3089a1c05973e08e4", "tree": "906b7ca09045581374fe55cec1f78e4efa97481b", "parents": [ "2ee0de2593740e3d60829b0f5d3d47bdfbc0ff4e" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Mon May 15 17:07:18 2017 +0100" }, "committer": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Jul 18 00:55:38 2017 +0100" }, "message": "Opt-out for always-on VPN\n\nAlways-on VPN is a feature introduced in N. Since then, all VPN apps\ntargeting N+ are assumed to support the feature, and the user or the DPC\ncan turn on / off always-on for any such VPN app. However, a few VPN\napps are not designed to support the always-on feature. Enabling\nalways-on for these apps will result in undefined behavior and confusing\n\"Always-on VPN disconnected\" notification.\n\nThis feature provides a new manifest meta-data field through which a VPN\napp can opt out of the always-on feature explicitly. This will stop the\nalways-on feature from being enabled for the app, both by the user and\nby the DPC, and will clear its existing always-on state.\n\nA @hide API is provided to check whether an app supports always-on VPN.\nDocumentation is updated to reflect the behavior change.\n\nBug: 36650087\nTest: runtest --path java/com/android/server/connectivity/VpnTest.java\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackage\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage\u0027\nTest: cts-tradefed run cts --module CtsDevicePolicyManagerTestCases --test \u0027com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced\u0027\n\nChange-Id: I477897a29175e3994d4ecf8ec546e26043c90f13\n" }, { "commit": "041111ff7e6157c153f186de49c4eb17f55e3c21", "tree": "cedffdedeeebbefc319a267713b13b905885ef52", "parents": [ "d792c31806af9981c5bdeb536bf0d33aa63b6c53", "3756636ad67e50262400e6670f0f15883935b158" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Jul 14 01:01:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 01:01:29 2017 +0000" }, "message": "Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev\nam: 3756636ad6\n\nChange-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa\n" }, { "commit": "a30cb89dfa6b04b86d9bf0b207e91f5c0c413933", "tree": "b2eb41d8e5e289cbabc57abbc3fe9e7c30e451e1", "parents": [ "0e015132938744f9bd116ec76094bac07719b153", "164ff8a2ed2668aaf76ddabf1c050c156ebb662a" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 14 00:46:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 00:46:49 2017 +0000" }, "message": "resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master am: a428392c1d\nam: 164ff8a2ed\n\nChange-Id: I08195e119f866acc9fe1795b892fe45cea3c7f47\n" }, { "commit": "164ff8a2ed2668aaf76ddabf1c050c156ebb662a", "tree": "64c868c8518de02d63d3378196111e167a4b5fa3", "parents": [ "9cdec3943ca6752046c880051704dbb37b2faf18", "a428392c1ddb93cabf0186ea0507b1fbc5254c60" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 14 00:37:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 00:37:20 2017 +0000" }, "message": "resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master\nam: a428392c1d\n\nChange-Id: Ide67520d074330ec050ded71118bff0bc88be784\n" }, { "commit": "a428392c1ddb93cabf0186ea0507b1fbc5254c60", "tree": "bf4c6024d1456f06da1849be5639c14d61c785bf", "parents": [ "791a698a6a5f6c6e8b37f43c38f0027af9ee70be", "4f2a0fe213e56d1eb4221a02a09571262ef8036a" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 14 07:25:51 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 14 07:25:51 2017 +0900" }, "message": "resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master\n\nTest: I solemnly swear I tested this conflict resolution.\nChange-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031\n" }, { "commit": "4f2a0fe213e56d1eb4221a02a09571262ef8036a", "tree": "82f02c150a2deb5a7d519bca891779f1bd3163c5", "parents": [ "d8dab115478e46440b7d97d8f70d41fb64efd0a1", "fd31b9d46ea09dc7d74ddc03ab7e5ecfbe80b3dc" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jul 13 20:45:21 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 13 20:45:21 2017 +0000" }, "message": "Merge \"IpManager: define InitialConfiguration\"" }, { "commit": "fd31b9d46ea09dc7d74ddc03ab7e5ecfbe80b3dc", "tree": "f113067dca4697fea38ddfe75457ca59ebb4f6dc", "parents": [ "5bb30496cf381c6546cbf02a2c5b55adf046aeb8" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jun 23 10:07:08 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 14 04:26:42 2017 +0900" }, "message": "IpManager: define InitialConfiguration\n\nThis patch adds a InitialConfiguration class to IpManager for specifying\nIP information in IpManager ProvisioningConfiguration at IpManager\nstartup.\n\nAt the moment this InitialConfiguration is not used, but is validated in\nstartProvsiioning if ProvisioningConfiguration includes one. It will be\nintegrated into IpManager IP provisioning logic in follow-up patches.\n\nThis patch also includes an example of data driven unit tests using a\ntable of test case. The highlights of this methodology are:\n 1) easy extensibility for new test case,\n 2) rich and informative error messages,\nUnfortunately Java support for inlined data structure literals is poor\nand some companion static methods for data generation are required for\nenabling this methodology.\n\nBug: 62988545\nTest: added new test in FrameworksNetTests,\n $ runtest frameworks-net\n $ runtest frameworks-wifi\nMerged-In: I060b02603af7d73a6407df89344bf0c000574af2\n\n(cherry pick of commit 2757fcf3a13b0addc4a168a12c72ac2fc418b012)\n\nChange-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53\n" }, { "commit": "5a7dea1a8eb2cf53fc1d5a52004647de94150e62", "tree": "fe6bdf78e8ddfe9c2bded036351d99a91d510557", "parents": [ "ef7b2a13ce4c34950b52de27dcf65b74388d7b3d" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 12 15:48:07 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Jul 13 23:54:51 2017 +0900" }, "message": "Fetch tethering offload stats.\n\nMake tethering offload register an ITetheringStatsProvider and\nfetch tethering stats from the hardware.\n\nCurrently we fetch stats in the following cases:\n\n1. Just after changing upstreams, we fetch stats from the\n previous upstream.\n2. When we are polled by NetworkStatsService.\n\nBug: 29337859\nBug: 32163131\nTest: builds, boots\nTest: stats appear in tethering logs\nChange-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56\n" }, { "commit": "17a62281e4934a3f3818cd4c8f107a83599262c6", "tree": "768add8d7048ed7e94739fe795514798445eb9a4", "parents": [ "cd816c1853302797c3fc7e703687e710d8d844c1", "ae21b8941453ce5973100671c2cb9ef9ff20394c" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jul 13 09:07:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 13 09:07:01 2017 +0000" }, "message": "Merge \"Program offload-exempt local prefixes into the HAL\" am: de837a97aa\nam: ae21b89414\n\nChange-Id: If96a33f26fed64a84219868d28765b7581ad453d\n" }, { "commit": "ae21b8941453ce5973100671c2cb9ef9ff20394c", "tree": "f562e864f553e0d41134d4ccfecfcbb4432b38c4", "parents": [ "8625194c19d6a2260b27c5c1870c66254c040c74", "de837a97aa9db9ae344a7c298012fa2c7b808b95" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jul 13 09:00:56 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 13 09:00:56 2017 +0000" }, "message": "Merge \"Program offload-exempt local prefixes into the HAL\"\nam: de837a97aa\n\nChange-Id: I741b6e31fb3adc922f47df824188786ff35e3aa9\n" }, { "commit": "5acb4e3b62c788bff1baa22ecb20f6b103cc8d93", "tree": "eff67776e701b9bf3666d83677e4d0b60e82d54a", "parents": [ "2fa880d0162a206b9307bfd5cd37a37cf216895a" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jul 04 18:28:11 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jul 13 16:43:34 2017 +0900" }, "message": "Program offload-exempt local prefixes into the HAL\n\nTest: as follows\n - built\n - flashed\n - booted\n - \"runtest frameworks-net\" passes\n - observed calls to the HAL setLocalPrefixes in tethering log\nBug: 29337859\nBug: 32163131\nMerged-In: I3c3bd4ee83ffe86ddbe6a16fbbfa0756bf5064d4\nMerged-In: Iaf80e584df458010741401fc1a19e7f6e21923c1\nMerged-In: Ifaf23c6179ead9de6ccfcf41e0c203025153167b\n(cherry picked from commit 32179ff81511e00aef31e8fda705be3df074ece6)\n\nChange-Id: I65ea833ac6fe7a75ebe546cfa358c4cffdf2de05\n" }, { "commit": "b3d2aaaf2f0d5b5a0efa91679a387b128d488fc1", "tree": "5c500f34044c5db9a9f762686992dad5f162ce7b", "parents": [ "c2a76d16f0db793631dbcaf92adb0258cb8a56f9", "aa7b8b532271797ebaca6c816e95530d28fc995f" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jul 13 07:36:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 13 07:36:50 2017 +0000" }, "message": "Merge \"Program offload-exempt local prefixes into the HAL\" into oc-dr1-dev\nam: aa7b8b5322\n\nChange-Id: Iaf80e584df458010741401fc1a19e7f6e21923c1\n" }, { "commit": "32179ff81511e00aef31e8fda705be3df074ece6", "tree": "5ebbf92f6698230b94b785b28f9da301cc332d11", "parents": [ "a781d471e2a9ac3f4e99934cd7e4b276f21b3493" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jul 04 18:28:11 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jul 13 13:45:49 2017 +0900" }, "message": "Program offload-exempt local prefixes into the HAL\n\nAdditionally:\n - move mOffloadController into MasterTetherSM\n\nTest: as follows\n - built\n - flashed\n - booted\n - \"runtest frameworks-net\" passes\n - observed calls to the HAL setLocalPrefixes in tethering log\nBug: 29337859\nBug: 32163131\nChange-Id: Ifaf23c6179ead9de6ccfcf41e0c203025153167b\n" }, { "commit": "d21ad47d4336f1d39e13826a3e395c33247d7299", "tree": "73e112f4c708d6551205f6b6ac7e7f977ab85c16", "parents": [ "ce4c57fd0e3014c5a26c1b8b43a61a1a728d8ea0", "c8b4ef85dc059026c99aeaeb21a98c93bbebca70" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 12 06:25:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 06:25:04 2017 +0000" }, "message": "Merge \"Restructure use of absent tether_offload_disabled setting\" am: 5bb30496cf\nam: c8b4ef85dc\n\nChange-Id: I2210e9d25a4e7c497b9383324e574c9f8aca0d6f\n" }, { "commit": "c8b4ef85dc059026c99aeaeb21a98c93bbebca70", "tree": "b0e981abe8eb544c56d9234ece34a3b8700762ce", "parents": [ "2a13286d8d60460d36a03f2e3a7861b7d88f1b68", "5bb30496cf381c6546cbf02a2c5b55adf046aeb8" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 12 06:18:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 06:18:11 2017 +0000" }, "message": "Merge \"Restructure use of absent tether_offload_disabled setting\"\nam: 5bb30496cf\n\nChange-Id: I9d1ec7d1c060278018c80c9374d724ee0ddba3a4\n" }, { "commit": "5eaa7ed03b694b475c1d7760591dbd8010af2d32", "tree": "84d75e9dbb590b564bec03669e750dd2502fa9d5", "parents": [ "cf188f664a71c135c383143a7bb8b50a44fde64a" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jul 07 17:38:30 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 12 13:29:22 2017 +0900" }, "message": "Restructure use of absent tether_offload_disabled setting\n\nThis restructures the fetching of the default disposition such\nthat we disable (and enable) the feature with only a single\ncharacter change.\n\nAdditionally: fix unittests with proper use of FakeSettingsProvider.\n\nTest: as follows\n - built\n - flashed\n - booted\n - \"runtest frameworks-net\" passed with developer enabled and disabled\nBug: 29337859\nBug: 32163131\nBug: 63250751\n(cherry picked from commit c87cd411843484225897ebdf91cd05073c1c5f35)\nMerged-In: Ib32489d07778465134bca52c589baddbd78ab129\nMerged-In: I03d68b0da192fbd6172639343d4ab88c20127ad7\nMerged-In: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3\n\nChange-Id: Ie16a022be8dacd76b0402bcb777680c36163a084\n" }, { "commit": "9d9b5c22f16dc0c65a1f8cad8c3d4bfbab9728c2", "tree": "aecdb1d876006cb7a3b95708ad63ffbaf439993f", "parents": [ "10307ebe1f8348b62891249bb2c6fa396ab07790", "d8fdb26ebfd5c9037ad4e0b97995f280d7a83b8f" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 12 03:11:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 03:11:15 2017 +0000" }, "message": "Merge \"Restructure use of absent tether_offload_disabled setting\" into oc-dr1-dev\nam: d8fdb26ebf\n\nChange-Id: I03d68b0da192fbd6172639343d4ab88c20127ad7\n" }, { "commit": "4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b", "tree": "5047b723e68a665a9b598e90d79aaa12ac068756", "parents": [ "0a2ada5416e01f762909c676b7edacb2a4104eac" ], "author": { "name": "Ahmed ElArabawy", "email": "arabawy@google.com", "time": "Mon Jun 12 18:01:11 2017 -0700" }, "committer": { "name": "Ahmed ElArabawy", "email": "arabawy@google.com", "time": "Tue Jul 11 22:16:16 2017 +0000" }, "message": "Add Configuration to APF Policy\n\nin b/37702435 battery was drained due to reception of\nEthernet frames with Eth-type \u003c 0x600 (non ehternet II frames)\n\nThis change adds an XML file to drop/allow these frames\nDropping helps tp avoid acquiring a wakelock for the\nreception of these packets, while allowing them may be needed\nfor some protocols\nThe Change allow the OEM to override the system settings\n\nBug: 37702435\nTest: runtest frameworks-net\nMerged-In: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d\n\nChange-Id: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d\nSigned-off-by: Ahmed ElArabawy \u003carabawy@google.com\u003e\n" }, { "commit": "c87cd411843484225897ebdf91cd05073c1c5f35", "tree": "938b764ca0976050e0e0c43148cb404cbd762bc9", "parents": [ "8b44d3722dde9fcd85acce2e190135c1684759d9" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jul 07 17:38:30 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jul 11 23:46:58 2017 +0900" }, "message": "Restructure use of absent tether_offload_disabled setting\n\nThis restructures the fetching of the default disposition such\nthat we disable (and enable) the feature with only a single\ncharacter change.\n\nAdditionally: fix unittests with proper use of FakeSettingsProvider.\n\nTest: as follows\n - built\n - flashed\n - booted\n - \"runtest frameworks-net\" passed with developer enabled and disabled\nBug: 29337859\nBug: 32163131\nBug: 63250751\n\nChange-Id: Ib32489d07778465134bca52c589baddbd78ab129\n" }, { "commit": "f060ecf1e81cb6c0fb19a01aea369a523671247d", "tree": "0c86d3ddecf7765a21ce659dbab12996c99994b8", "parents": [ "89c67d3211e6c1c50a322155403197cd46a33558", "0278aa4b7011e33ea0b27a0bc5f69484bbea2bca" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 14:47:56 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 14:47:56 2017 +0000" }, "message": "Merge \"ConnectivityManager: allow usage of TYPE_NONE\" am: 279f32ded5 am: 0537f16516\nam: 0278aa4b70\n\nChange-Id: I1707e39308b0cf425b75e1e3f85323743c252c2f\n" }, { "commit": "0278aa4b7011e33ea0b27a0bc5f69484bbea2bca", "tree": "90be00464577528ee13e90f280e18c9b6ed84ef7", "parents": [ "14f400ca8198a38bc783ca89ebbb60a1816f9e2f", "0537f1651630ed14f9974c6b62e4497260f9e194" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 14:40:34 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 14:40:34 2017 +0000" }, "message": "Merge \"ConnectivityManager: allow usage of TYPE_NONE\" am: 279f32ded5\nam: 0537f16516\n\nChange-Id: If6430976a3a894b9f883e03692e500eb013a5245\n" }, { "commit": "0537f1651630ed14f9974c6b62e4497260f9e194", "tree": "21a4c8b3859dbb15ea2bfcabcd3ac523993896f5", "parents": [ "0a7f5cc9d607eee92441e28d0d72fa5d26e6f2f8", "279f32ded531319d47c0ee55c606c4d627c62082" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 14:33:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 14:33:35 2017 +0000" }, "message": "Merge \"ConnectivityManager: allow usage of TYPE_NONE\"\nam: 279f32ded5\n\nChange-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962\n" }, { "commit": "89c67d3211e6c1c50a322155403197cd46a33558", "tree": "5a87dd4747fbf90e427487d82e51f438d9c76eaf", "parents": [ "7ee7b4c6d4847e064548b9ff0084b1620693cfa0", "14f400ca8198a38bc783ca89ebbb60a1816f9e2f" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 14:33:34 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 14:33:34 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: more informative assert failures\" am: 04d8a730a9 am: 0a7f5cc9d6\nam: 14f400ca81\n\nChange-Id: If00f0fd750d54074c0c642465384446502c1deec\n" }, { "commit": "14f400ca8198a38bc783ca89ebbb60a1816f9e2f", "tree": "c70455e9465dba20e7d242c844e5ea6db2ae6022", "parents": [ "80bc56bf2a2d3a2794dde27fd2765e78caffedbc", "0a7f5cc9d607eee92441e28d0d72fa5d26e6f2f8" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 14:26:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 14:26:23 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: more informative assert failures\" am: 04d8a730a9\nam: 0a7f5cc9d6\n\nChange-Id: If152d2eb134f678673b76b181146874bf65fc536\n" }, { "commit": "0a7f5cc9d607eee92441e28d0d72fa5d26e6f2f8", "tree": "9d4aa1d4f2e3c8c7401d466818ca1b920c24e462", "parents": [ "2d452e6c48bb39f54fa1d02e857d452f5fe20255", "04d8a730a9edbceda5f32931027bc933fbf38c66" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 14:19:33 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 14:19:33 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: more informative assert failures\"\nam: 04d8a730a9\n\nChange-Id: Iaa55014ae4c2f4927059735c349c40ada836b79b\n" }, { "commit": "7ee7b4c6d4847e064548b9ff0084b1620693cfa0", "tree": "c0b0deca268ac84bb35b9d860e67d356a1ecc4a0", "parents": [ "7ee7013a8337fa24debd9d44d96cbd4fec93ace6", "80bc56bf2a2d3a2794dde27fd2765e78caffedbc" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 12:49:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 12:49:04 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: eliminate remaining sleep()\" am: 66788dc4d8 am: 2d452e6c48\nam: 80bc56bf2a\n\nChange-Id: I5e33e909cd8887460c2641c069432ec6bfa5beda\n" }, { "commit": "80bc56bf2a2d3a2794dde27fd2765e78caffedbc", "tree": "82221e634a6622b9de84ab7cfcdf763d8f4e5c17", "parents": [ "53e5c05d838e6a5431c4e8edbab6556726f07351", "2d452e6c48bb39f54fa1d02e857d452f5fe20255" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 12:41:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 12:41:53 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: eliminate remaining sleep()\" am: 66788dc4d8\nam: 2d452e6c48\n\nChange-Id: I6426659d9cf84f7e1d142b006ffe69df304f7a91\n" }, { "commit": "2d452e6c48bb39f54fa1d02e857d452f5fe20255", "tree": "c39145abeab5ad2bf42c5c4adf802d1ed99cd3f8", "parents": [ "dbc7279e85b1bca8fe00d8c0dfbbc2cdd488175a", "66788dc4d8bb8d9840ecb78263571dd1098771d4" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 12:35:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 12:35:01 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: eliminate remaining sleep()\"\nam: 66788dc4d8\n\nChange-Id: Ib1e31c2b8999d07b20ef4cef8e70d851f93df6e5\n" }, { "commit": "16f0a9436a9af84938e0b49c590e8c4d011af07e", "tree": "9031a2b6da8020387963b3388914294d21713e22", "parents": [ "fed512a795e14752872a2c672cd4e37d8ebb35ca" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jun 20 14:07:59 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 21:30:52 2017 +0900" }, "message": "ConnectivityManager: allow usage of TYPE_NONE\n\nThis patch allows to use TYPE_NONE for the legacy network type variable\nof NetworkInfo. This usage is \"safe\" with respect to legacy APIs using\nnetwork types as most of them already returns null or do nothing for\nTYPE_NONE.\n\nOf the existing APIs in ConnectivityManager that accept a network type\nargument, those which were already returning null or doing nothing for\nTYPE_NONE are:\n getNetworkInfo(int)\n getNetworkForType(int)\n stopUsingNetworkFeature(int, String)\n networkCapabilitiesForType(int)\n requestRouteToHostAddress(int, InetAddress)\n reportInetCondition(int, int)\n isNetworkSupported(int)\n getLinkProperties(int)\n\nOnly setProvisioningNotificationVisible needs an additional guard\nagainst TYPE_NONE.\n\nBug: 30088447\nBug: 62844794\nTest: runtest frameworks-net\nChange-Id: I112596fcd03d3c2cd42a2a84d265adb38e3944bb\n" }, { "commit": "fed512a795e14752872a2c672cd4e37d8ebb35ca", "tree": "fada9a180bb3c67fd90a5d62efb429613466b1ce", "parents": [ "91c7ff95bd69d0514a5c4b440a73fb2ca4b03b85" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Jun 26 10:06:49 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 21:30:10 2017 +0900" }, "message": "ConnectivityServiceTest: more informative assert failures\n\nBug: 62918393\nTest: runtest frameworks-net\nChange-Id: If87315ef7cba6380596f48b92c7e0f6eeccc8368\n" }, { "commit": "53e5c05d838e6a5431c4e8edbab6556726f07351", "tree": "fe68408de2a3fedf92fa3bb2059d601d34be19ad", "parents": [ "c99ff3a1e768f6a4639553d273ab646543d6225b" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 05 19:55:45 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 05 19:55:45 2017 +0900" }, "message": "DO NOT MERGE ANYWHERE\n\nThis reverts a duplicate test method resulting from a bad merge.\n\nTest: as follows\n - built\n\nChange-Id: I8ca7c97a28fbf7d20753bb4d1f942e5c04a4edf8\n" }, { "commit": "c99ff3a1e768f6a4639553d273ab646543d6225b", "tree": "7a99704a97e126b4e25e7479aea67d43bcd0ec1c", "parents": [ "61be69646883d2e017dd3d73e2b6af8c8b8b3856", "dbc7279e85b1bca8fe00d8c0dfbbc2cdd488175a" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 05 09:17:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 09:17:46 2017 +0000" }, "message": "resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master\nam: dbc7279e85\n\nChange-Id: I0280190a1d2d48ca2e80e823ed43112161af8271\n" }, { "commit": "dbc7279e85b1bca8fe00d8c0dfbbc2cdd488175a", "tree": "2930718d2d9f98f96f62758603ea5d42ce0ee176", "parents": [ "d3f26b67312ccd5f0b1ecc43a0b2eed244285d07", "b1eb85c9a8d314461f44a30d37604f7a0eb7315c" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 05 15:44:42 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 05 16:48:19 2017 +0900" }, "message": "resolve merge conflicts of b1eb85c9a8d3 to stage-aosp-master\n\nTest: I solemnly swear I tested this conflict resolution.\n\nMerged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545\nMerged-In: I717fdd269b012f32548ebe0603999ae403b03100\nMerged-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07\nMerged-In: Ie32f50ec1a07e3126a05abee27c76bc63cdaca14\nChange-Id: I217d7ca2958f3d6ca8992f738a034693a0fac486\n" }, { "commit": "91c7ff95bd69d0514a5c4b440a73fb2ca4b03b85", "tree": "513e4ce12a07a07442b2757a1a20e3621831cf2e", "parents": [ "b1eb85c9a8d314461f44a30d37604f7a0eb7315c" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Jun 26 10:20:00 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 16:07:57 2017 +0900" }, "message": "ConnectivityServiceTest: eliminate remaining sleep()\n\nConnectivityServiceTest was still using sleep() in a few places although\nthese were unnecessary:\n - in testSatisfiedThenLostNetworkRequestDoesNotTriggerOnAvailable(),\n expectNoCallback() and expectAvailableCallback() already include\n waitForIdleHandler calls that drain the message queues and make\n sleep no-ops.\n - in testTimedoutAfterUnregisterdNetworkRequest, the sleeps were\n introduced before unregisterNetworkCallback was changed to have a\n synchronous effect for callback unregistration, therefore the sleep\n becomes simply non-sensical. To reflect this the name of the method\n is also changed.\n\nBug: 62918393\nTest: runtest frameworks-net\nChange-Id: I7b701ecf5846a5e1890e86107b8d2544b419ce44\n" }, { "commit": "2dce7712f3d974f90336e21cb7fc1cf180e860cc", "tree": "5bca9b2d776aa78b8ccb6ee3db330fca86e301df", "parents": [ "10c314e19a6b9cdbff9ff8c99ac1923d47966ebb" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jul 04 22:02:49 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 05 12:40:40 2017 +0900" }, "message": "Switch to USB_CONFIGURED as the primary USB readiness signal\n\nTest: as follows\n - built\n - flashed\n - booted\n - \"runtest frameworks-net\" passes\n - USB tethering on and off works as expected\nBug: 32163131\nBug: 36216864\nBug: 62147658\nBug: 62552150\n\nMerged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545\nMerged-In: I717fdd269b012f32548ebe0603999ae403b03100\nMerged-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07\nChange-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07\n(cherry picked from commit c438e306cc69b9d4d62512030267e93011b29978)\n" }, { "commit": "61be69646883d2e017dd3d73e2b6af8c8b8b3856", "tree": "1fe6da395f85f82ccdc1a7cf28c3ba89289dd5d3", "parents": [ "bdcebe39e686dd8a8b3fba94e0c4ea33eae44714" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jul 04 22:02:49 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 05 12:32:41 2017 +0900" }, "message": "Switch to USB_CONFIGURED as the primary USB readiness signal\n\nTest: as follows\n - built\n - flashed\n - booted\n - \"runtest frameworks-net\" passes\n - USB tethering on and off works as expected\nBug: 32163131\nBug: 36216864\nBug: 62147658\nBug: 62552150\n\nMerged-In: I3ae731c21f292a476a9e30e229d66ef6ab4a0545\nMerged-In: I717fdd269b012f32548ebe0603999ae403b03100\nChange-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07\n(cherry picked from commit c438e306cc69b9d4d62512030267e93011b29978)\n" }, { "commit": "c651117d7061c2283ae14a2edec1ad5e55cda5ec", "tree": "47ad7fe8e89f49ac59cdece237d4d909f7a30dfc", "parents": [ "6a5016df21586fe268f8370be89b8a1eb5d30b33", "c438e306cc69b9d4d62512030267e93011b29978" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 05 03:07:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 05 03:07:21 2017 +0000" }, "message": "Switch to USB_CONFIGURED as the primary USB readiness signal\nam: c438e306cc\n\nChange-Id: I717fdd269b012f32548ebe0603999ae403b03100\n" }, { "commit": "c438e306cc69b9d4d62512030267e93011b29978", "tree": "3dfe8ef48652a655a2c60a0e2554a7ba298b913b", "parents": [ "1d8d34fa3eff2c6f9ed23909e1688af6cc4560d0" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jul 04 22:02:49 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jul 05 00:36:04 2017 +0900" }, "message": "Switch to USB_CONFIGURED as the primary USB readiness signal\n\nTest: as follows\n - built\n - flashed\n - booted\n - \"runtest frameworks-net\" passes\n - USB tethering on and off works as expected\nBug: 32163131\nBug: 36216864\nBug: 62147658\nBug: 62552150\nChange-Id: Ia8f7f3616f1358b0427386ce8aff26899e03ac07\n" }, { "commit": "d3f26b67312ccd5f0b1ecc43a0b2eed244285d07", "tree": "64ac4fb42c13cae1f85d87a62eb1ec5f8c86cb25", "parents": [ "8f682322716a1719728c69c0bc3614ee3271b8c7", "10c314e19a6b9cdbff9ff8c99ac1923d47966ebb" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:31:30 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 04 11:31:30 2017 +0000" }, "message": "Merge \"Revert \"ConnectivityManager: allow usage of TYPE_NONE\"\"\nam: 10c314e19a\n\nChange-Id: I49221522c1a9a6e7d4ae72529c1a47b736e26a39\n" }, { "commit": "8f682322716a1719728c69c0bc3614ee3271b8c7", "tree": "036a2d026f7ae4d6455c1c3a4bec338c6d95ed40", "parents": [ "962f1842cabaeafa87a1f44ea9f13dadb60427b1", "d10790c9027e729c27ae10ccb2ba7c1bc97b9df5" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:24:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 04 11:24:25 2017 +0000" }, "message": "Merge \"Revert \"ConnectivityServiceTest: more informative assert failures\"\"\nam: d10790c902\n\nChange-Id: Ie61051984a1b6efbb0b19754ce0fb99024ab296a\n" }, { "commit": "962f1842cabaeafa87a1f44ea9f13dadb60427b1", "tree": "520c8c5a244ee88c42258603ba1a2d430ca6335b", "parents": [ "1005e826395f67ebb580dda099683cbc2a9f6475", "1e3624527b3fa34626e75c393a43caa97d79eae7" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:22:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 04 11:22:32 2017 +0000" }, "message": "Merge \"Revert \"ConnectivityServiceTest: eliminate remaining sleep()\"\"\nam: 1e3624527b\n\nChange-Id: If210f213c7840c218d5e847667c7613d53f86661\n" }, { "commit": "afd69a0d5782b157b87c8dda78e51c9f4b1b3f38", "tree": "887a2359f66d2952453ac0bbb4c50bef5e9aed66", "parents": [ "d10790c9027e729c27ae10ccb2ba7c1bc97b9df5" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:07:47 2017 +0000" }, "committer": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:14:03 2017 +0000" }, "message": "Revert \"ConnectivityManager: allow usage of TYPE_NONE\"\n\nThis CL is breaking some internal builds.\n\nThis reverts commit 726931ebf4707795413578b57a1f033bf9a6e064.\n\nChange-Id: Ie79214808d84c73f54a525f515b4c90a3fb23542\n" }, { "commit": "3c16b642463fc896ff67c074ad6399902cb47240", "tree": "382339678610e6663eed050b43f7323ccbd08ac5", "parents": [ "1e3624527b3fa34626e75c393a43caa97d79eae7" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:09:10 2017 +0000" }, "committer": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:11:35 2017 +0000" }, "message": "Revert \"ConnectivityServiceTest: more informative assert failures\"\n\nCL https://android-review.googlesource.com/#/c/420720/ is\nbreaking several internal builds, and CL\nhttps://android-review.googlesource.com/#/c/422480/ must\nbe reverted beforehand.\n\nThis reverts commit a6981669c4e2707bcfb3db001e262b2da4bb9c17.\n\nChange-Id: I5883409452d39e1834e183aa7b5ccdbf14291ca5\n" }, { "commit": "1e3624527b3fa34626e75c393a43caa97d79eae7", "tree": "7bdd854830bbb8673d4e87b8c6a5489873c385eb", "parents": [ "4148fe64b9323949987fc3b29a664a8fbc1c65f1", "caf0d20e1a33398cc83b65c0df98a12e62daab40" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:11:09 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 04 11:11:09 2017 +0000" }, "message": "Merge \"Revert \"ConnectivityServiceTest: eliminate remaining sleep()\"\"" }, { "commit": "caf0d20e1a33398cc83b65c0df98a12e62daab40", "tree": "5fe928b91f24ec28fae6ade5f572dfe6cb9d1ee8", "parents": [ "8afb9cfd000dadc730e52ebdeb4ad031b84b8e03" ], "author": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:10:06 2017 +0000" }, "committer": { "name": "Roland Levillain", "email": "rpl@google.com", "time": "Tue Jul 04 11:10:06 2017 +0000" }, "message": "Revert \"ConnectivityServiceTest: eliminate remaining sleep()\"\n\nCL https://android-review.googlesource.com/#/c/420720/ is\nbreaking several internal builds, and CL\nhttps://android-review.googlesource.com/#/c/422481/ must\nbe reverted beforehand.\n\nThis reverts commit 8afb9cfd000dadc730e52ebdeb4ad031b84b8e03.\n\nChange-Id: If0b196b6860c4087a05b28770469d7850a76fd37\n" }, { "commit": "1005e826395f67ebb580dda099683cbc2a9f6475", "tree": "3b841044081b1bf3f36263680bd657c3adbdacdf", "parents": [ "2c856480a0c092dcc082d9fc8808fcb120c3a72b", "4148fe64b9323949987fc3b29a664a8fbc1c65f1" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 04 09:43:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 04 09:43:01 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: eliminate remaining sleep()\"\nam: 4148fe64b9\n\nChange-Id: I31a8f64b4ee37a58bc83c08251d949f44cc26fd4\n" }, { "commit": "2c856480a0c092dcc082d9fc8808fcb120c3a72b", "tree": "520c8c5a244ee88c42258603ba1a2d430ca6335b", "parents": [ "01860f8ea551e73e615facc9161b67d9112b40f4", "a0ff4efc8b0c5bf30b4bb3ece35cb7b03f76f2c2" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 04 09:35:51 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 04 09:35:51 2017 +0000" }, "message": "Merge changes I90c211dc,I4455f272\nam: a0ff4efc8b\n\nChange-Id: I502d978ff636a00979d2083c39381bf600d3d6da\n" }, { "commit": "4148fe64b9323949987fc3b29a664a8fbc1c65f1", "tree": "8cf5392863ac41e3a12e94e70cb29faa1f60e349", "parents": [ "a0ff4efc8b0c5bf30b4bb3ece35cb7b03f76f2c2", "8afb9cfd000dadc730e52ebdeb4ad031b84b8e03" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 04 09:25:53 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 04 09:25:53 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: eliminate remaining sleep()\"" }, { "commit": "a0ff4efc8b0c5bf30b4bb3ece35cb7b03f76f2c2", "tree": "7bdd854830bbb8673d4e87b8c6a5489873c385eb", "parents": [ "b975c88178775cfacd2b9685f6286605c009cec7", "a6981669c4e2707bcfb3db001e262b2da4bb9c17" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 04 09:22:07 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 04 09:22:07 2017 +0000" }, "message": "Merge changes I90c211dc,I4455f272\n\n* changes:\n ConnectivityServiceTest: more informative assert failures\n ConnectivityManager: allow usage of TYPE_NONE\n" }, { "commit": "8afb9cfd000dadc730e52ebdeb4ad031b84b8e03", "tree": "545dce0a9e5da6ccb2a839d1ee81ca44b8fd73c1", "parents": [ "a6981669c4e2707bcfb3db001e262b2da4bb9c17" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Jun 26 10:20:00 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 04 16:23:06 2017 +0900" }, "message": "ConnectivityServiceTest: eliminate remaining sleep()\n\nConnectivityServiceTest was still using sleep() in a few places although\nthese were unnecessary:\n - in testSatisfiedThenLostNetworkRequestDoesNotTriggerOnAvailable(),\n expectNoCallback() and expectAvailableCallback() already include\n waitForIdleHandler calls that drain the message queues and make\n sleep no-ops.\n - in testTimedoutAfterUnregisterdNetworkRequest, the sleeps were\n introduced before unregisterNetworkCallback was changed to have a\n synchronous effect for callback unregistration, therefore the sleep\n becomes simply non-sensical. To reflect this the name of the method\n is also changed.\n\nBug: 62918393\nTest: runtest frameworks-net\nChange-Id: I78426665670f702304212753f417b3d5a8a2c107\n" }, { "commit": "a6981669c4e2707bcfb3db001e262b2da4bb9c17", "tree": "5fe928b91f24ec28fae6ade5f572dfe6cb9d1ee8", "parents": [ "726931ebf4707795413578b57a1f033bf9a6e064" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Jun 26 10:06:49 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 04 16:23:05 2017 +0900" }, "message": "ConnectivityServiceTest: more informative assert failures\n\nBug: 62918393\nTest: runtest frameworks-net\nChange-Id: I90c211dc6d6262475924ecabc2863c47aec5a0b9\n" }, { "commit": "726931ebf4707795413578b57a1f033bf9a6e064", "tree": "6321d4d7c4e1e612f0c772ab3db0daf21a24a30f", "parents": [ "02309e9748a33be316367ba969ad62094fccdebe" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jun 20 14:07:59 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 04 16:22:59 2017 +0900" }, "message": "ConnectivityManager: allow usage of TYPE_NONE\n\nThis patch allows to use TYPE_NONE for the legacy network type variable\nof NetworkInfo. This usage is \"safe\" with respect to legacy APIs using\nnetwork types as most of them already returns null or do nothing for\nTYPE_NONE.\n\nOf the existing APIs in ConnectivityManager that accept a network type\nargument, those which were already returning null or doing nothing for\nTYPE_NONE are:\n getNetworkInfo(int)\n getNetworkForType(int)\n stopUsingNetworkFeature(int, String)\n networkCapabilitiesForType(int)\n requestRouteToHostAddress(int, InetAddress)\n reportInetCondition(int, int)\n isNetworkSupported(int)\n getLinkProperties(int)\n\nOnly setProvisioningNotificationVisible needs an additional guard\nagainst TYPE_NONE.\n\nBug: 30088447\nBug: 62844794\nTest: runtest frameworks-net\nChange-Id: I4455f2726d06406047086368628c1f253d854d8d\n" }, { "commit": "b87cf12ad3376beae72811fe65a4c65d060a11ed", "tree": "5a47f304698c7b22fee304792068b6d90a088720", "parents": [ "96ef85895786f92c4c5a350f643869024e3f1261", "501bae6492e41fd4889e84d0e69fa34d35287d73" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Jul 03 09:35:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 03 09:35:06 2017 +0000" }, "message": "Merge \"Networking unit tests: fix some flaky tests\"\nam: 501bae6492\n\nChange-Id: I6815e732f334d11208ff12af4023912593d96499\n" }, { "commit": "501bae6492e41fd4889e84d0e69fa34d35287d73", "tree": "763eb80a0b8b7a5592e3cc069283b114f47df338", "parents": [ "7fc4f63f235f3e74a4d504187b549994a8e2e32c", "669f02323f9c7298fdef79b44e1a512549d1411a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 03 09:23:26 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 03 09:23:26 2017 +0000" }, "message": "Merge \"Networking unit tests: fix some flaky tests\"" }, { "commit": "3a5278f2c4d71a8f69ce1085da42904283d62785", "tree": "73d6fa6b5abaf1c49ac499e7b68a0fd18082502a", "parents": [ "0fc10b2b1d7be649c80dda4ebdb2e31af216bfcc" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Sat Jun 24 19:29:10 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jul 03 18:01:44 2017 +0900" }, "message": "Pass all offload-exempt prefixes into OffloadController\n\nAdditionally:\n - eliminate useless TetherMasterUtilState\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks passes\nBug: 29337859\nBug: 32163131\n\nMerged-In: I6adcdbd6a4f14bd2cdaa056cfc0cf9c573a165b9\nMerged-In: I5e689bcf5dd048ee9f9bd0c32b16d7c2e4c0268d\nMerged-In: Ifd3817bd4569682d77a70f8192432391a573f6d8\nMerged-In: I1ea57fbe322e26246f1d8b459519f18be1297467\nChange-Id: I0482ac9dd9e8ba558b253643dbc01875ce9475ef\n(cherry picked from commit be8ee08f5dcc3627cac6b0baa6664637684cce35)\n" }, { "commit": "96ef85895786f92c4c5a350f643869024e3f1261", "tree": "2065a05d7e592a4571ee11d8c73899523f62284f", "parents": [ "59079c2f8e34a2d827488d799777625c188b8122", "7fc4f63f235f3e74a4d504187b549994a8e2e32c" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jul 03 08:39:48 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 03 08:39:48 2017 +0000" }, "message": "Merge \"Pass all offload-exempt prefixes into OffloadController\"\nam: 7fc4f63f23\n\nChange-Id: Ibbca37f65dc0a0398432f325bf362996b9d61519\n" }, { "commit": "669f02323f9c7298fdef79b44e1a512549d1411a", "tree": "857757dee1f90fe16b335bf0eb79817654cb4932", "parents": [ "02309e9748a33be316367ba969ad62094fccdebe" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Jun 29 22:58:39 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Jul 03 16:29:01 2017 +0900" }, "message": "Networking unit tests: fix some flaky tests\n\n - less strict regex for SharedLogTest: the subsecond part of the\n timestamp can have 0, 1, 2 or 3 digits.\n - refactor NetworkStatsServiceTest and NetworkStatsObserversTest to use\n waitForIdleHandler facility of ConnectivityServiceTest.\n NetworkStatsServiceTest was using a flaky custom version of\n waitForIdleHandler.\n\nBug: 62918393\nBug: 32561414\nTest: runtest frameworks-net\nChange-Id: I634acfb5f4fe1bd5267e3f14b9f645edc32d5d12\n" }, { "commit": "be8ee08f5dcc3627cac6b0baa6664637684cce35", "tree": "ad571ff77deda6003c97fb61bcc4da04f1df6081", "parents": [ "3d901ec5137c92662644ccf9ca582bb6da989613" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Sat Jun 24 19:29:10 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Sat Jul 01 23:20:25 2017 +0900" }, "message": "Pass all offload-exempt prefixes into OffloadController\n\nAdditionally:\n - eliminate useless TetherMasterUtilState\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks passes\nBug: 29337859\nBug: 32163131\n\nChange-Id: I0482ac9dd9e8ba558b253643dbc01875ce9475ef\n" }, { "commit": "a29861b0c970055927675731e00e93c51f1c5668", "tree": "4ed985ae0db06fbb126fce9677c55ee1aadf53d1", "parents": [ "3a1b93d109a896e20945c8aac3166d45b7de57f8", "541079e0d781e099aa5260d82dd8f70790b92d4b" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Sat Jun 24 12:37:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jun 24 12:37:45 2017 +0000" }, "message": "Merge \"Relax SharedLogTest asserts\" am: 91464bfe68\nam: 541079e0d7\n\nChange-Id: I7a584c155915196c9b6b1a856141a3d9ab5699db\n" }, { "commit": "541079e0d781e099aa5260d82dd8f70790b92d4b", "tree": "fc3580c365766d8efd8122baf5d37058ffd549d9", "parents": [ "5dec1df23b9cc5ceea727fb68e697c20225d73e1", "91464bfe6809bf506fada1ec3822d0f9d69b5bef" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Sat Jun 24 12:29:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jun 24 12:29:28 2017 +0000" }, "message": "Merge \"Relax SharedLogTest asserts\"\nam: 91464bfe68\n\nChange-Id: Ibcf2ee24ac33a23fb3813dc6045db154644e1a3d\n" }, { "commit": "e9f469df84b9f385baac875aea186b88e156a6ab", "tree": "3746e23518fc0c0d097d6360246c33105d756553", "parents": [ "5a56873612793940ddb9a93a64d5e48929b0d02d" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jun 23 10:06:39 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jun 23 13:44:28 2017 +0900" }, "message": "Relax SharedLogTest asserts\n\nThis patch makes the asserts of SharedLogTest looser so that it is less\nlikely to get invalidated by a date formatting change.\n\nThe timestamp format of LocalLog changed in commit 6229d990828 from\n\"mm-dd HH:MM:SS.xxx\" to \"yyy-mm-ddTHH:MM:SS.xxx\".\n\nBug: 62918393\nTest: runtest frameworks-net pass\nChange-Id: I57ab3e05a0f3093f9c7b1760e596a3919d4f2ed7\n" }, { "commit": "0aecb6ad445881121e616c20e8b8e55cfbba3c80", "tree": "a6ea2483528c056be95aae71d49c83c5c11274cd", "parents": [ "bc8c0e9c1d47bdbf2094c24d3c1d6793b024694f", "be7657b03898fd04bb69b6d33064f927d0641958" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 22 17:36:12 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 22 17:36:12 2017 +0000" }, "message": "Merge \"Create a TetherInterfaceStateMachine when told the interface name.\" into oc-dev\nam: be7657b038\n\nChange-Id: Ie34a3c7aa39c9b70602236f4d4a4d5548566dd51\n" }, { "commit": "a9cde8b4fb26a963824f297e9b7489bfc35d1512", "tree": "0dae3d767fea671f0fbb5083185550e84cd42e6a", "parents": [ "c8b180116d426986a9f180dbf0c6bdf639b7f704" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 20 21:18:31 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 22 18:33:56 2017 +0900" }, "message": "Create a TetherInterfaceStateMachine when told the interface name.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 32163131\nBug: 62343300\n\nMerged-In: I542e013aa19fefd3443588c9a81ee59cd669ab6f\nMerged-In: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08\nMerged-In: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3\nChange-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3\n(cherry picked from commit b912c50b197cc0fc49bb7897130581dd02d2af01)\n" }, { "commit": "1e54351ac09478710c17fcfbb0c1de257948a1d5", "tree": "20a30775a9156008e7f17f4519de7a1779c2fa7a", "parents": [ "104b68d0a5c8b0bcf3adc01bff69209ed8d38f34" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Mar 09 11:44:11 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 21 16:41:31 2017 +0900" }, "message": "Always allow Ethernet to be an upstream\n\nIf there are any upstream types defined at all, make sure that\neither TYPE_ETHERNET is included somewhere within the sorted list\nor force it to be at the front.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 32163131\nBug: 36076442\n\nMerged-In: I97737f4c12285f0bbeed0bd2efdfec6fbe95fd03\nMerged-In: Id60706e623febcc35063ccb96c797fc4f9a223b1\nMerged-In: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc\nChange-Id: Ie61d1358f73d518de23f6ca48ca2765ca14a1067\n(cherry picked from commit 0e61baa0ac83e580429217f8394e1790d6510158)\n" }, { "commit": "cc6cd46d707ab68984810bf51020f9718661d237", "tree": "03e7919ea1ed78f3082432446085a252e8bde7d7", "parents": [ "5fd9dd2e744668c2baeaeb84a30dbeeb5f0d74b6", "9cec380720944ebb56ea2c86d08c3b604cb84f07" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 21 07:20:54 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 21 07:20:54 2017 +0000" }, "message": "Merge \"Always allow Ethernet to be an upstream\" am: ecbe6fa147\nam: 9cec380720\n\nChange-Id: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc\n" }, { "commit": "9cec380720944ebb56ea2c86d08c3b604cb84f07", "tree": "1f93edee95a8c6f6be55b89877bcd11154d11386", "parents": [ "dfc6939ed57c0bda2715e3264f816a7d640a16bc", "ecbe6fa147a38369c2309c1b6fb7d7313d9ca320" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 21 07:13:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 21 07:13:46 2017 +0000" }, "message": "Merge \"Always allow Ethernet to be an upstream\"\nam: ecbe6fa147\n\nChange-Id: Ic9fd4bfd6ba7ecc00552019f804b87bc203ea98a\n" }, { "commit": "0e61baa0ac83e580429217f8394e1790d6510158", "tree": "79bbbdfb82863d05bd64a7604c893d1e6fbd381e", "parents": [ "1bfccadc81dfdaccab231c53bdb3c1d90b7fdfc4" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Mar 09 11:44:11 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 21 14:03:03 2017 +0900" }, "message": "Always allow Ethernet to be an upstream\n\nIf there are any upstream types defined at all, make sure that\neither TYPE_ETHERNET is included somewhere within the sorted list\nor force it to be at the front.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 32163131\nBug: 36076442\nChange-Id: Ie61d1358f73d518de23f6ca48ca2765ca14a1067\n" }, { "commit": "b912c50b197cc0fc49bb7897130581dd02d2af01", "tree": "7b7a4ddbc65861f7e095e292e7df4abe99935dc4", "parents": [ "a111068342a5552537c788ccc76b7d8fab3aa4ac", "9e6b6e2a58d48d91d3780a2ed5057840b2306586" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 20 21:18:31 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 20 22:04:32 2017 +0900" }, "message": "resolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp\n\nTest: I solemnly swear I tested this conflict resolution.\nChange-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3\n" }, { "commit": "9e6b6e2a58d48d91d3780a2ed5057840b2306586", "tree": "096a1f280015884f709bafc1a750c3abd682cd8e", "parents": [ "ca0c91b9f1434e9d265b138e45e7655c5cb23b53", "51ee00785c070edb4609ec5496e690a9f4ebc871" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 20 11:12:00 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 20 11:12:00 2017 +0000" }, "message": "Merge \"Create a TetherInterfaceStateMachine when told the interface name.\"\nam: 51ee00785c\n\nChange-Id: If79a096375e6b9665d5ba4aa0bcd9dbec6a8adab\n" }, { "commit": "41531e267d7bb8bb5a0fe36555741c17d9d21c27", "tree": "4a19e8e1a6f584a13952a6a061cca90f16ded3b0", "parents": [ "778ade9073ee5c0e4e5f1dffc7479cc720dcdff4" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 20 17:18:27 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 20 17:28:55 2017 +0900" }, "message": "Create a TetherInterfaceStateMachine when told the interface name.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 32163131\nBug: 62343300\n\nChange-Id: I93f3bdcf20dc4f03cd621d7ab6066344642550e3\n" }, { "commit": "7fd696cb576f5a6a75a01c78f984716f42eb4999", "tree": "22dcdf57d3c9fc8c9dd20cf97035bd56d410a636", "parents": [ "185285592f46629f8027c09bdc4e98365f0b62b1" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 12 18:20:08 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 20 12:22:31 2017 +0900" }, "message": "Make interface IP serving code set LinkProperties\n\nAdditionally, clean up awkward IPv6TetheringInterfaceServices\ninstantiation mechanics. In future, this class will be absorbed\nby TetherInterfaceStateMachine (prior to its renaming to IpServer).\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 29337859\nBug: 32163131\n\nMerged-In: I8b15edbf04c10cd9429da079c6b79352a6740b3b\nMerged-In: I39a1744a7fa9b91e3b607429c79f39578e9bde19\nMerged-In: I753ab701f2109c0972816724e73119dc1dbc4dca\nChange-Id: Ib620e3df182f9f8e2c019aae1cd8981eb0b29376\n(cherry picked from commit dd4d5820344205085c19dc142aec252ea9ac220b)\n" }, { "commit": "5219f643ddc18e5c721e9228e97bac1eb2810559", "tree": "4e92458a5954552756b6bba31e6436c137474447", "parents": [ "fd88d146b4133e8b6ee69a5ea1f08a8b27c235e5", "9461f78541bd2fe9333823eb978ff63352656408" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 19 13:26:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 19 13:26:13 2017 +0000" }, "message": "Merge \"Make interface IP serving code set LinkProperties\" am: 1dae9a4709\nam: 9461f78541\n\nChange-Id: I753ab701f2109c0972816724e73119dc1dbc4dca\n" }, { "commit": "9461f78541bd2fe9333823eb978ff63352656408", "tree": "5de022ef08169342d5894d1c0ff3101475db271e", "parents": [ "6f0adbfaea6aa59abf2508b5285acf358a7c8ca7", "1dae9a4709642fda47dc79f8e760af9934427d60" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 19 13:15:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 19 13:15:02 2017 +0000" }, "message": "Merge \"Make interface IP serving code set LinkProperties\"\nam: 1dae9a4709\n\nChange-Id: I84e4b3fb0be210f59eb663597a6c81c95d3e51d6\n" }, { "commit": "7284e2a88befa27e97979d5239b0b70ee437c6f8", "tree": "175f4347750865c95cd5192f044e02767bb69f65", "parents": [ "a34c04d5c3323182d882dad52e3774771ae75683", "1e2897dcff865cc0f00079f2a3c7d5188811544f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jun 19 08:31:31 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 19 08:31:38 2017 +0000" }, "message": "Merge \"make UpsreamNetworkMonitor the sole source of upstream network information\" into oc-dr1-dev" }, { "commit": "dd4d5820344205085c19dc142aec252ea9ac220b", "tree": "7ecf1a7ecb5b6d93c2d5b92f26d219e25fcbed62", "parents": [ "b5c4e80ecd47dda8c73b0e93eb2ee1a8da58c981" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 12 18:20:08 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 19 15:51:50 2017 +0900" }, "message": "Make interface IP serving code set LinkProperties\n\nAdditionally, clean up awkward IPv6TetheringInterfaceServices\ninstantiation mechanics. In future, this class will be absorbed\nby TetherInterfaceStateMachine (prior to its renaming to IpServer).\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 29337859\nBug: 32163131\n\nChange-Id: Ib620e3df182f9f8e2c019aae1cd8981eb0b29376\n" }, { "commit": "2e290617c50235c6d57a22362a624e1cec0872b1", "tree": "36ada9d9917aebc9e72e2a707f7404e44bd38ca6", "parents": [ "e1c75566e5380a196c06b2abefb69005087429f4", "eeb0b31afa35a4e0ce01e8d52adc3ac19b2e8cad" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 16 14:10:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 14:10:44 2017 +0000" }, "message": "Merge \"Fixes for tetheroffload crashes\" am: 5ac7a03f9f\nam: eeb0b31afa\n\nChange-Id: I58c467be3482e01f84c9860e2b9d4b03713c1dbd\n" }, { "commit": "eeb0b31afa35a4e0ce01e8d52adc3ac19b2e8cad", "tree": "29392685def442a5c2783e6762dbaefd4a060d66", "parents": [ "47b1f54316e37bba7d543100ca01fd5f52b7a84c", "5ac7a03f9f4bb9f2222ce37ff4101aaa8787353c" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 16 14:03:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 14:03:10 2017 +0000" }, "message": "Merge \"Fixes for tetheroffload crashes\"\nam: 5ac7a03f9f\n\nChange-Id: I08406513912c9fbd383625f10837085abb5c0516\n" } ], "next": "664d208a23be1bc6a0b1d6efdf62b711885394bc" }