)]}' { "log": [ { "commit": "7f312a0274be580e0de0c1adb256be4320a98eaa", "tree": "383b74744be1be63e8bd7e62b7fb70b52491a1a5", "parents": [ "b7e2baaee08028e69ac6a33f67af1c3eea7c1384", "4c80e73bfab4319b389905b5c1cf64a9b4f7dbb9" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Mar 20 02:16:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 20 02:16:13 2020 +0000" }, "message": "[automerger skipped] Support setting the default interface to null again. am: 876e5e16a9 am: 65c1bc7c5d -s ours am: 4c80e73bfa -s ours\n\nam skip reason: Change-Id I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d with SHA-1 876e5e16a9 is in history\n\nChange-Id: I53d8a9896257920d4a3db462a7f3a1c8974361fa\n" }, { "commit": "b7e2baaee08028e69ac6a33f67af1c3eea7c1384", "tree": "383b74744be1be63e8bd7e62b7fb70b52491a1a5", "parents": [ "fc26b8e236fe660419e18f441adba14cb44351b3", "f7bc865d2cbe29399cf8fa7c969f56065bfa483f" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Mar 20 02:16:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 20 02:16:02 2020 +0000" }, "message": "[automerger skipped] Support setting the default interface to null again. am: 876e5e16a9 -s ours am: 6fb426f10a -s ours am: f7bc865d2c -s ours\n\nam skip reason: Change-Id I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d with SHA-1 e81f99d532 is in history\n\nChange-Id: I9cea9b849fff6b292d81b6bd2a1c8338d3d271a1\n" }, { "commit": "4c80e73bfab4319b389905b5c1cf64a9b4f7dbb9", "tree": "383b74744be1be63e8bd7e62b7fb70b52491a1a5", "parents": [ "f7bc865d2cbe29399cf8fa7c969f56065bfa483f", "65c1bc7c5d8edff88eb4189bb76dbf95735a7ae6" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Mar 20 01:16:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 20 01:16:55 2020 +0000" }, "message": "[automerger skipped] Support setting the default interface to null again. am: 876e5e16a9 am: 65c1bc7c5d -s ours\n\nam skip reason: Change-Id I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d with SHA-1 876e5e16a9 is in history\n\nChange-Id: Ie8adbc5239fdf8343a9b0e4cd30eddc28e96caaa\n" }, { "commit": "f7bc865d2cbe29399cf8fa7c969f56065bfa483f", "tree": "383b74744be1be63e8bd7e62b7fb70b52491a1a5", "parents": [ "4615bbe6674faf180e0a9afb42b7a385a3bcc47c", "6fb426f10a6ca26fa8b92dafaf89eac28e40a4b6" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Mar 20 01:09:43 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 20 01:09:43 2020 +0000" }, "message": "[automerger skipped] Support setting the default interface to null again. am: 876e5e16a9 -s ours am: 6fb426f10a -s ours\n\nam skip reason: Change-Id I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d with SHA-1 e81f99d532 is in history\n\nChange-Id: I53102631b3030ba3307c2ffe04d340c9421fc50b\n" }, { "commit": "6fb426f10a6ca26fa8b92dafaf89eac28e40a4b6", "tree": "383b74744be1be63e8bd7e62b7fb70b52491a1a5", "parents": [ "3449a344745543409417fba6c9fdc4c710b2282e", "876e5e16a97b4fa2532cd1920da84e20bea31a68" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Mar 20 00:44:57 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 20 00:44:57 2020 +0000" }, "message": "[automerger skipped] Support setting the default interface to null again. am: 876e5e16a9 -s ours\n\nam skip reason: Change-Id I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d with SHA-1 e81f99d532 is in history\n\nChange-Id: I3adadae13ef96c50e4083b8d826730e0fb4990fd\n" }, { "commit": "65c1bc7c5d8edff88eb4189bb76dbf95735a7ae6", "tree": "ce76a87d815280558a38ba94f3b3ced892f7fbc9", "parents": [ "5cc44b3cdde7deba8a7a9c7e197db5e56efbed87", "876e5e16a97b4fa2532cd1920da84e20bea31a68" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Mar 20 00:44:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 20 00:44:42 2020 +0000" }, "message": "Support setting the default interface to null again. am: 876e5e16a9\n\nChange-Id: I88a98acb57b48fb9eedf104ed783a7d27b12e47f\n" }, { "commit": "fc26b8e236fe660419e18f441adba14cb44351b3", "tree": "383b74744be1be63e8bd7e62b7fb70b52491a1a5", "parents": [ "32db6f52cb7f154cca91e122bad10e53b4ba811a", "4615bbe6674faf180e0a9afb42b7a385a3bcc47c" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 16:27:47 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 16:27:47 2020 +0000" }, "message": "Send tethered interface callbacks based on interface existence. am: 165b456d92 am: cad2e49acb am: 3449a34474 am: 4615bbe667\n\nChange-Id: I3303d8506a0d715a60843f9073cfd104b286372a\n" }, { "commit": "32db6f52cb7f154cca91e122bad10e53b4ba811a", "tree": "ce76a87d815280558a38ba94f3b3ced892f7fbc9", "parents": [ "ee758e6ae102b12ccc12ec4203d9ef72ec6a13b2", "a79245c7f0c7558ea54186d34d930c8b739efe8f" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 16:27:43 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 16:27:43 2020 +0000" }, "message": "Support setting the default interface to null again. am: e81f99d532 am: e19d6a8764 am: 4b10eea44f am: a79245c7f0\n\nChange-Id: Ie4bd5ae4c939a19dd95e3a51ebb67b4833d0a8ba\n" }, { "commit": "4615bbe6674faf180e0a9afb42b7a385a3bcc47c", "tree": "383b74744be1be63e8bd7e62b7fb70b52491a1a5", "parents": [ "a79245c7f0c7558ea54186d34d930c8b739efe8f", "3449a344745543409417fba6c9fdc4c710b2282e" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 16:16:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 16:16:22 2020 +0000" }, "message": "Send tethered interface callbacks based on interface existence. am: 165b456d92 am: cad2e49acb am: 3449a34474\n\nChange-Id: Iac66c95f07fe81d5c9e1b5dfcd42fe676ea2bc70\n" }, { "commit": "a79245c7f0c7558ea54186d34d930c8b739efe8f", "tree": "ce76a87d815280558a38ba94f3b3ced892f7fbc9", "parents": [ "8f07511302f99d0b7605ed4e3d12292d1bc12a69", "4b10eea44f2ff661874aeb16abb20519829d45f9" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 16:16:14 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 16:16:14 2020 +0000" }, "message": "Support setting the default interface to null again. am: e81f99d532 am: e19d6a8764 am: 4b10eea44f\n\nChange-Id: I0633a83170f9e9cda8113fe1ccf7b6225f16e794\n" }, { "commit": "876e5e16a97b4fa2532cd1920da84e20bea31a68", "tree": "ce76a87d815280558a38ba94f3b3ced892f7fbc9", "parents": [ "fb336e9296aeb7a944c0346f45c2878aed9d0a7c" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:52:03 2020 +0000" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:53:13 2020 +0000" }, "message": "Support setting the default interface to null again.\n\nCurrently, the default interface can only ever go from null to\nnon-null. This is correct for fixed interfaces (because they\ndon\u0027t get unplugged) and it\u0027s generally correct for USB\ninterfaces that use ethX as their device name (because when\nthey are unplugged and plugged in again, the device name won\u0027t\nchange). But it is not correct if, for example, the default\ninterface is a test interface. So, allow mDefaultInterface to go\nback to null.\n\nThis CL also fixes a crash if a tethered interface request is\nadded and removed when there is no default interface.\n\nAlso, make dump() report tethered interface requests.\n\nAlso remove an unused variable that I missed in the previous CL.\n\nBug: 150644681\nTest: tested by EthernetTetheringTest in same topic\nChange-Id: I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d\nMerged-In: I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d\n(cherry picked from commit cc156c2f7793731b2699e194d4b164138ee4cf62)\n" }, { "commit": "3449a344745543409417fba6c9fdc4c710b2282e", "tree": "383b74744be1be63e8bd7e62b7fb70b52491a1a5", "parents": [ "4b10eea44f2ff661874aeb16abb20519829d45f9", "165b456d92463d3edccf69ea13adb4b9977999ec" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:52:09 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 15:52:09 2020 +0000" }, "message": "Send tethered interface callbacks based on interface existence. am: 165b456d92 am: cad2e49acb\n\nChange-Id: I4b24ea24ede2856d8c33df3e2331efe9d5825ca6\n" }, { "commit": "4b10eea44f2ff661874aeb16abb20519829d45f9", "tree": "ce76a87d815280558a38ba94f3b3ced892f7fbc9", "parents": [ "523093a1ffb35c280142c32788351c31c9ad0af8", "e81f99d5328063219eb61ce716f253579b3efb1f" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:52:03 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 15:52:03 2020 +0000" }, "message": "Support setting the default interface to null again. am: e81f99d532 am: e19d6a8764\n\nChange-Id: I373f51835b48bdb9c7a678c4779f1a9079c7a181\n" }, { "commit": "ee758e6ae102b12ccc12ec4203d9ef72ec6a13b2", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "fcd828fe68b5fbb2088ab7dc6ee776622dd57a7e", "2af1f3b8b091fc89268bec1e4570591d5e5f26e1" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:37:44 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 15:37:44 2020 +0000" }, "message": "[automerger skipped] Make Ethernet interfaces more testable. am: fb336e9296 am: 5cc44b3cdd am: ab6fe7445b am: 2af1f3b8b0 -s ours\n\nam skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 fb336e9296 is in history\n\nChange-Id: I4562315db7b0d4e933d22aa0872a989fa243e5fb\n" }, { "commit": "fcd828fe68b5fbb2088ab7dc6ee776622dd57a7e", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "d4a0c5833c68dad39132d331b5a471fc7920565a", "8f07511302f99d0b7605ed4e3d12292d1bc12a69" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:17:12 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 15:17:12 2020 +0000" }, "message": "[automerger skipped] Make Ethernet interfaces more testable. am: fb336e9296 -s ours am: 523093a1ff -s ours am: 8f07511302 -s ours\n\nam skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 fb336e9296 is in history\n\nChange-Id: Iecf35ecae75b28c4bb529b9baf17121ef7e9dea2\n" }, { "commit": "2af1f3b8b091fc89268bec1e4570591d5e5f26e1", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "8af676004d3d1f69f6b38de45635bd8bac8611ab", "ab6fe7445b7a64f8482121213ff5218c9410c2d4" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:16:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 15:16:54 2020 +0000" }, "message": "Make Ethernet interfaces more testable. am: fb336e9296 am: 5cc44b3cdd am: ab6fe7445b\n\nChange-Id: I17fc6f115accd82ca6c8eed18a495cab28972751\n" }, { "commit": "d4a0c5833c68dad39132d331b5a471fc7920565a", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "0876b7005899fcce4762097e0348b56ff1c0a086", "6910d448e596ddfb3bced3b6ffde5a992f47a13e" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:16:44 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 15:16:44 2020 +0000" }, "message": "[automerger skipped] Make Ethernet interfaces more testable. am: fb336e9296 am: 5cc44b3cdd -s ours am: 6910d448e5 -s ours\n\nam skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 841195a103 is in history\n\nChange-Id: Icff2a8f5a0ef5d3598cc7deb6e465b97a2c92f4e\n" }, { "commit": "ab6fe7445b7a64f8482121213ff5218c9410c2d4", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "8af676004d3d1f69f6b38de45635bd8bac8611ab", "5cc44b3cdde7deba8a7a9c7e197db5e56efbed87" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:00:14 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 15:00:14 2020 +0000" }, "message": "Make Ethernet interfaces more testable. am: fb336e9296 am: 5cc44b3cdd\n\nChange-Id: I437fe3a5462d64a20675642264fc0742469bebd2\n" }, { "commit": "8f07511302f99d0b7605ed4e3d12292d1bc12a69", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "6910d448e596ddfb3bced3b6ffde5a992f47a13e", "523093a1ffb35c280142c32788351c31c9ad0af8" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 15:00:06 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 15:00:06 2020 +0000" }, "message": "[automerger skipped] Make Ethernet interfaces more testable. am: fb336e9296 -s ours am: 523093a1ff -s ours\n\nam skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 841195a103 is in history\n\nChange-Id: Iec8edbba782a10b8d5c2b8c740d265dc2c11e2a1\n" }, { "commit": "6910d448e596ddfb3bced3b6ffde5a992f47a13e", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "7988bb7cdf461f5fedcdb19659dd96eb1af0b0f9", "5cc44b3cdde7deba8a7a9c7e197db5e56efbed87" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 14:59:45 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 14:59:45 2020 +0000" }, "message": "[automerger skipped] Make Ethernet interfaces more testable. am: fb336e9296 am: 5cc44b3cdd -s ours\n\nam skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 841195a103 is in history\n\nChange-Id: Ia96d3fa55a985e8a37c0e8b2b5893dce986b7898\n" }, { "commit": "523093a1ffb35c280142c32788351c31c9ad0af8", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "ee43f745bdb4fe0778f3be0fc0a1f41ce06f15a0", "fb336e9296aeb7a944c0346f45c2878aed9d0a7c" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 14:44:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 14:44:23 2020 +0000" }, "message": "[automerger skipped] Make Ethernet interfaces more testable. am: fb336e9296 -s ours\n\nam skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 841195a103 is in history\n\nChange-Id: I31d44b8c1a538f7c4573cf6fa476529326a9c0bf\n" }, { "commit": "5cc44b3cdde7deba8a7a9c7e197db5e56efbed87", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "3379686f41883ba9abc1f530a50a2aa598b82743", "fb336e9296aeb7a944c0346f45c2878aed9d0a7c" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 14:44:04 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 14:44:04 2020 +0000" }, "message": "Make Ethernet interfaces more testable. am: fb336e9296\n\nChange-Id: I99a104ce76bbf3ceaca5497ab22b468d716769e0\n" }, { "commit": "165b456d92463d3edccf69ea13adb4b9977999ec", "tree": "4a0a6687dabc406659c84c7d9f61dfb9e3486a3c", "parents": [ "e81f99d5328063219eb61ce716f253579b3efb1f" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 14:36:24 2020 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 22:12:32 2020 +0900" }, "message": "Send tethered interface callbacks based on interface existence.\n\nCurrently, callbacks for tethered interface availability are sent\nbased on interface link state. This is incorrect:\n\n- It is acceptable and expected to be able to enable tethering on\n an interface that does not yet have link up.\n- It doesn\u0027t seem useful to disable Ethernet tethering if link\n temporarily goes down.\n\nInstead, only base the callbacks on whether an interface exists\nor not.\n\nBug: 150644681\nTest: WIP tests in aosp/1260100 pass\nChange-Id: I015219cbd03626c38fb5156d0cb2991ba7d7def7\n" }, { "commit": "e81f99d5328063219eb61ce716f253579b3efb1f", "tree": "78aa04331628119c13c4d1974ec389f048a37d61", "parents": [ "841195a10343931a8499206ef09b73b124782e7c" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Mar 17 00:11:37 2020 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 22:04:23 2020 +0900" }, "message": "Support setting the default interface to null again.\n\nCurrently, the default interface can only ever go from null to\nnon-null. This is correct for fixed interfaces (because they\ndon\u0027t get unplugged) and it\u0027s generally correct for USB\ninterfaces that use ethX as their device name (because when\nthey are unplugged and plugged in again, the device name won\u0027t\nchange). But it is not correct if, for example, the default\ninterface is a test interface. So, allow mDefaultInterface to go\nback to null.\n\nThis CL also fixes a crash if a tethered interface request is\nadded and removed when there is no default interface.\n\nAlso, make dump() report tethered interface requests.\n\nAlso remove an unused variable that I missed in the previous CL.\n\nBug: 150644681\nTest: tested by EthernetTetheringTest in same topic\nChange-Id: I5109d8da3aeb6c1f6523291d9e2ec92c64b5ad2d\n" }, { "commit": "fb336e9296aeb7a944c0346f45c2878aed9d0a7c", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "fd99009c529d5ee7734997f2dfecb486a4b5df22" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 11:46:55 2020 +0000" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 12:29:35 2020 +0000" }, "message": "Make Ethernet interfaces more testable.\n\nThis CL adds a setIncludeTestInterfaces method to EthernetManager\nthat, when called, causes the Ethernet service to recognize and\nmanage test interfaces created by TestNetworkManager.\n\nBug: 150644681\nTest: Tested by EthernetTetheringTest in same topic\nChange-Id: I86eef7a93267f800dbfc8eafd307effa76a344ca\nMerged-In: I86eef7a93267f800dbfc8eafd307effa76a344ca\n(cherry picked from commit 4978dbd5fb6592fc4e7be08d02783752245da634)\n" }, { "commit": "0876b7005899fcce4762097e0348b56ff1c0a086", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "8ccee513c159811d65506f93690a2339c34c7e2e", "7988bb7cdf461f5fedcdb19659dd96eb1af0b0f9" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 12:09:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 12:09:24 2020 +0000" }, "message": "Make Ethernet interfaces more testable. am: 841195a103 am: 6d590906f5 am: ee43f745bd am: 7988bb7cdf\n\nChange-Id: If18607492e98def1deb2d35c68d3fd991e67be2b\n" }, { "commit": "7988bb7cdf461f5fedcdb19659dd96eb1af0b0f9", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "0aa2a61c43a74a7e99c5e87047999af59d45fc3a", "ee43f745bdb4fe0778f3be0fc0a1f41ce06f15a0" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 11:49:13 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 11:49:13 2020 +0000" }, "message": "Make Ethernet interfaces more testable. am: 841195a103 am: 6d590906f5 am: ee43f745bd\n\nChange-Id: I680a4f7ab3d3b02eb35bfd2477136f87ef514c9f\n" }, { "commit": "ee43f745bdb4fe0778f3be0fc0a1f41ce06f15a0", "tree": "a02713025e69b8de6354fed91802b443f648442c", "parents": [ "bab750adfef0fb723a77a1478b984a593827fc51", "841195a10343931a8499206ef09b73b124782e7c" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 11:46:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 19 11:46:55 2020 +0000" }, "message": "Make Ethernet interfaces more testable. am: 841195a103 am: 6d590906f5\n\nChange-Id: Icd319cc53f17fc76d1a93bdb9741fc6db77c1ce9\n" }, { "commit": "841195a10343931a8499206ef09b73b124782e7c", "tree": "110ebc89804a3c0053ae17fe7b58f8a1d9d5b74d", "parents": [ "dceced7bca164a09a70332bacf90d0e56650c8da" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Mar 17 00:11:37 2020 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Mar 19 18:06:59 2020 +0900" }, "message": "Make Ethernet interfaces more testable.\n\nThis CL adds a setIncludeTestInterfaces method to EthernetManager\nthat, when called, causes the Ethernet service to recognize and\nmanage test interfaces created by TestNetworkManager.\n\nBug: 150644681\nTest: Tested by EthernetTetheringTest in same topic\nChange-Id: I86eef7a93267f800dbfc8eafd307effa76a344ca\n" }, { "commit": "8ccee513c159811d65506f93690a2339c34c7e2e", "tree": "83b8ccecc3e5629f5d35bb03817df4950fad55bc", "parents": [ "9ca435e31ae20369abf41ca98ec0549f063ba94f", "8af676004d3d1f69f6b38de45635bd8bac8611ab" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:16:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:16:11 2020 +0000" }, "message": "Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52 am: 3379686f41 am: 8af676004d\n\nChange-Id: I3dfda5288fef9b04b065cdc946ea7cd3d8b5235a\n" }, { "commit": "9ca435e31ae20369abf41ca98ec0549f063ba94f", "tree": "83b8ccecc3e5629f5d35bb03817df4950fad55bc", "parents": [ "37d12a68447576b69f00a30ad511ed208bd25ccb", "0aa2a61c43a74a7e99c5e87047999af59d45fc3a" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:10:38 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:10:38 2020 +0000" }, "message": "Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52 am: 3379686f41 am: 0aa2a61c43\n\nChange-Id: Icf8a4c051a1462b1745f08acfd17204e7472e809\n" }, { "commit": "37d12a68447576b69f00a30ad511ed208bd25ccb", "tree": "83b8ccecc3e5629f5d35bb03817df4950fad55bc", "parents": [ "6da0ed9d0303599daafd6fc894865faba9bdb5e3", "e5bab5554f8a94abfe440d4808ca03673c35c8f3" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:06:58 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:06:58 2020 +0000" }, "message": "Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52 am: bab750adfe am: e5bab5554f\n\nChange-Id: If9e3cf11a57f2570c0282a91b4fa256f6effd03e\n" }, { "commit": "0aa2a61c43a74a7e99c5e87047999af59d45fc3a", "tree": "83b8ccecc3e5629f5d35bb03817df4950fad55bc", "parents": [ "e5bab5554f8a94abfe440d4808ca03673c35c8f3", "3379686f41883ba9abc1f530a50a2aa598b82743" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:04:43 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:04:43 2020 +0000" }, "message": "Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52 am: 3379686f41\n\nChange-Id: Ia7ac2bd617a4185c70eeea6ef1def59d503c8d04\n" }, { "commit": "8af676004d3d1f69f6b38de45635bd8bac8611ab", "tree": "83b8ccecc3e5629f5d35bb03817df4950fad55bc", "parents": [ "6da0ed9d0303599daafd6fc894865faba9bdb5e3", "3379686f41883ba9abc1f530a50a2aa598b82743" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:04:07 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 03 00:04:07 2020 +0000" }, "message": "Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52 am: 3379686f41\n\nChange-Id: I8fe2ef8f60e07a0ef5eea665c5fb350984781595\n" }, { "commit": "e5bab5554f8a94abfe440d4808ca03673c35c8f3", "tree": "83b8ccecc3e5629f5d35bb03817df4950fad55bc", "parents": [ "6da0ed9d0303599daafd6fc894865faba9bdb5e3", "bab750adfef0fb723a77a1478b984a593827fc51" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 02 23:47:45 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 02 23:47:45 2020 +0000" }, "message": "Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52 am: bab750adfe\n\nChange-Id: Ib050674547f74e47fc08092cdf9a1c53d4853b8d\n" }, { "commit": "3379686f41883ba9abc1f530a50a2aa598b82743", "tree": "83b8ccecc3e5629f5d35bb03817df4950fad55bc", "parents": [ "6da0ed9d0303599daafd6fc894865faba9bdb5e3", "fd99009c529d5ee7734997f2dfecb486a4b5df22" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 02 23:46:05 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 02 23:46:05 2020 +0000" }, "message": "Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52\n\nChange-Id: I764110dd3cacb3c2953afd38983b6f43b83811a2\n" }, { "commit": "bab750adfef0fb723a77a1478b984a593827fc51", "tree": "83b8ccecc3e5629f5d35bb03817df4950fad55bc", "parents": [ "6da0ed9d0303599daafd6fc894865faba9bdb5e3", "fd99009c529d5ee7734997f2dfecb486a4b5df22" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 02 23:33:04 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 02 23:33:04 2020 +0000" }, "message": "Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573 am: fd99009c52\n\nChange-Id: Idcdfbe614f49183d38801ce4d1dd4b16de1d73b8\n" }, { "commit": "fd99009c529d5ee7734997f2dfecb486a4b5df22", "tree": "83b8ccecc3e5629f5d35bb03817df4950fad55bc", "parents": [ "6da0ed9d0303599daafd6fc894865faba9bdb5e3" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Feb 21 19:52:43 2020 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Feb 28 06:26:20 2020 +0000" }, "message": "Revert part of 79eb7ba87bedd88fffa62a13ea9399c2affa1573\n\nThis reverts the parts of the above commit that have to do\nwith NetworkScore. The parts that convert the factory to the\nnew NetworkAgent API are conserved.\n\nBug: 113554781\nTest: FrameworksNetTests\nChange-Id: If2c368e084e29f9f358f43dcd547d42e8c7c4846\n" }, { "commit": "6da0ed9d0303599daafd6fc894865faba9bdb5e3", "tree": "2c87ce97490206de1e576d7fcf57b1658d902bf5", "parents": [ "05c71a36c93d0b44739d249dbd2f85a32e3f177a", "dceced7bca164a09a70332bacf90d0e56650c8da" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 01 16:17:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 01 16:17:11 2020 +0000" }, "message": "Set Ethernet default mode as CLIENT am: f85c0b301c am: dceced7bca am: 97b0e8d67c\n\nChange-Id: Icba5166843dd4741493f2b22b519fbd1ed26489e\n" }, { "commit": "dceced7bca164a09a70332bacf90d0e56650c8da", "tree": "1b46b700f27290e433c14e014f1df5058c34e3c5", "parents": [ "c5d03c8ca498a5d5a1aa80a26ec2c9e42cc07fe9", "f85c0b301c8466b2d6f92d04029a1da5d118fb04" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 01 16:00:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 01 16:00:23 2020 +0000" }, "message": "Set Ethernet default mode as CLIENT am: f85c0b301c\n\nChange-Id: Ib3e9b501c8a9bbc8862fc97f1bcddd2a92bbe46d\n" }, { "commit": "f85c0b301c8466b2d6f92d04029a1da5d118fb04", "tree": "1b46b700f27290e433c14e014f1df5058c34e3c5", "parents": [ "32327808e1e46de98074d8bd9933852c33d010dc" ], "author": { "name": "Milim Lee", "email": "mlww.lee@samsung.com", "time": "Fri Jan 31 11:33:32 2020 +0900" }, "committer": { "name": "Milim Lee", "email": "mlww.lee@samsung.com", "time": "Sat Feb 01 05:48:53 2020 +0900" }, "message": "Set Ethernet default mode as CLIENT\n\nBug: 130840861\nTest: build, boot\n atest EthernetTrackerTest\n manual test (using Ethernet)\n\nChange-Id: I935ea2e5f214aced67fb60f4aec2744077177545\n" }, { "commit": "05c71a36c93d0b44739d249dbd2f85a32e3f177a", "tree": "531e410a76a998238241e079ab552f547587995f", "parents": [ "b1a5c68cee029f21bce4a697d4354ad47a913f9d", "79eb7ba87bedd88fffa62a13ea9399c2affa1573" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Fri Jan 31 03:06:15 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 31 03:06:15 2020 +0000" }, "message": "Merge \"Make NetworkScore system API\"" }, { "commit": "79eb7ba87bedd88fffa62a13ea9399c2affa1573", "tree": "e29727ec9cfab8c40823967b746f3e91f343e7e6", "parents": [ "6a38d3aa4bd61e5412609fd50c86e0938e065e07" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Jan 22 16:47:43 2020 +0900" }, "committer": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Thu Jan 30 15:14:56 2020 +0900" }, "message": "Make NetworkScore system API\n\nBug: 146583853\nTest: FrameworksNetTests\nChange-Id: Ie7b70750ef0e17141080f4266dea6155c3601569\n" }, { "commit": "b1a5c68cee029f21bce4a697d4354ad47a913f9d", "tree": "47a1ffabaa9eb65b82e21c89c541341eb8136ac1", "parents": [ "c750566a779e424195d13a7ec447c55986288be3", "c5d03c8ca498a5d5a1aa80a26ec2c9e42cc07fe9" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 28 09:17:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 28 09:17:08 2020 +0000" }, "message": "[automerger skipped] Support one Ethernet interface in server mode. am: 32327808e1 am: c5d03c8ca4 am: 8695bd42d3 -s ours\nam skip reason: Change-Id I78f85bc36aaceb62ce274003a75ea99d0b6bc8b7 with SHA-1 c750566a77 is in history\n\nChange-Id: I54f24efc6379337a48c54e8ef551117974d6ac04\n" }, { "commit": "c5d03c8ca498a5d5a1aa80a26ec2c9e42cc07fe9", "tree": "47a1ffabaa9eb65b82e21c89c541341eb8136ac1", "parents": [ "91a297efc6d2c7f5e4065cf15d022ee2f09edf44", "32327808e1e46de98074d8bd9933852c33d010dc" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Jan 28 00:37:36 2020 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 28 00:37:36 2020 -0800" }, "message": "Support one Ethernet interface in server mode.\nam: 32327808e1\n\nChange-Id: I49dd9ef3d199508782e77e3b362ad3135ba82fa0\n" }, { "commit": "32327808e1e46de98074d8bd9933852c33d010dc", "tree": "47a1ffabaa9eb65b82e21c89c541341eb8136ac1", "parents": [ "918f68fce9d10cf567e90c8e841e1848c108c521" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Jan 24 17:57:27 2020 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Tue Jan 28 16:22:46 2020 +0900" }, "message": "Support one Ethernet interface in server mode.\n\nCurrently, Ethernet only supports interfaces in client mode\n(e.g., to connect to the Internet). Add minimal support to\nEthernet to support interfaces in server mode. This simple\nimplementation only works on the default interface, which is the\nfirst interface that is detected on boot (even if the interface\nis later removed).\n\nThis also provides (but does not yet unhide) a simple API for\nTethering to request that the next-plugged-in interface to be\nplaced into server mode.\n\nTest: Enabling tethering with change on top\nBug: 130840861\nMerged-In: I78f85bc36aaceb62ce274003a75ea99d0b6bc8b7\nChange-Id: I78f85bc36aaceb62ce274003a75ea99d0b6bc8b7\n(clean cherry-pick from internal branch)\n" }, { "commit": "c750566a779e424195d13a7ec447c55986288be3", "tree": "47a1ffabaa9eb65b82e21c89c541341eb8136ac1", "parents": [ "6a38d3aa4bd61e5412609fd50c86e0938e065e07" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Jan 24 17:57:27 2020 +0900" }, "committer": { "name": "Remi NGUYEN VAN", "email": "reminv@google.com", "time": "Mon Jan 27 19:07:56 2020 +0900" }, "message": "Support one Ethernet interface in server mode.\n\nCurrently, Ethernet only supports interfaces in client mode\n(e.g., to connect to the Internet). Add minimal support to\nEthernet to support interfaces in server mode. This simple\nimplementation only works on the default interface, which is the\nfirst interface that is detected on boot (even if the interface\nis later removed).\n\nThis also provides (but does not yet unhide) a simple API for\nTethering to request that the next-plugged-in interface to be\nplaced into server mode.\n\nTest: Enabling tethering with change on top\nBug: 130840861\nChange-Id: I78f85bc36aaceb62ce274003a75ea99d0b6bc8b7\n" }, { "commit": "6a38d3aa4bd61e5412609fd50c86e0938e065e07", "tree": "df71a76af9c23296980d26b5151af76c3e74b975", "parents": [ "8b65e6f8cec7c41fb6016921b5d3227a92e455e7", "91a297efc6d2c7f5e4065cf15d022ee2f09edf44" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 09 05:53:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 09 05:53:55 2020 +0000" }, "message": "Merge \"Avoid creating IpClient if ethernet cable is unplugged.\" am: 918f68fce9 am: 35cc5e821e am: 91a297efc6\n\nChange-Id: I6037008fa8c864a3f006bccf969ba2c1d7aad654\n" }, { "commit": "91a297efc6d2c7f5e4065cf15d022ee2f09edf44", "tree": "df71a76af9c23296980d26b5151af76c3e74b975", "parents": [ "01e5c5a98c475ba8c4b3e6b246cc5f3e7e540f80", "35cc5e821ed5031b4d6722351592aab091d10b17" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 09 05:37:15 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 09 05:37:15 2020 +0000" }, "message": "Merge \"Avoid creating IpClient if ethernet cable is unplugged.\" am: 918f68fce9 am: 35cc5e821e\n\nChange-Id: I8c8310da8935ffbdc3b18d7b05db55b81919c774\n" }, { "commit": "35cc5e821ed5031b4d6722351592aab091d10b17", "tree": "df71a76af9c23296980d26b5151af76c3e74b975", "parents": [ "26965f92c309fe5d9bfc968d7ddc6ccf4fb65bf8", "918f68fce9d10cf567e90c8e841e1848c108c521" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jan 08 21:27:48 2020 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 08 21:27:48 2020 -0800" }, "message": "Merge \"Avoid creating IpClient if ethernet cable is unplugged.\"\nam: 918f68fce9\n\nChange-Id: I097f2f68ea5b40997de7d312bbf6946c44e3b011\n" }, { "commit": "918f68fce9d10cf567e90c8e841e1848c108c521", "tree": "df71a76af9c23296980d26b5151af76c3e74b975", "parents": [ "b92d1f55133b0ffe49df89e7aab67b8db7036fa5", "13d5b866144b4c35a53f712d0b39c4cb7904b015" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Jan 09 05:26:34 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jan 09 05:26:34 2020 +0000" }, "message": "Merge \"Avoid creating IpClient if ethernet cable is unplugged.\"" }, { "commit": "8b65e6f8cec7c41fb6016921b5d3227a92e455e7", "tree": "2c30354bef6a8d7469f7197bfc7a6be2bf9fe7ea", "parents": [ "e23b1096839335eef0540068bdd67366a5e898e3", "01e5c5a98c475ba8c4b3e6b246cc5f3e7e540f80" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 12:47:48 2019 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 12:47:48 2019 +0000" }, "message": "Fix refCount check at releaseNetworkFor am: b92d1f5513 am: 26965f92c3 am: 01e5c5a98c\n\nChange-Id: Ib743575eb1f1c804182a50f14561ee5491f7087c\n" }, { "commit": "01e5c5a98c475ba8c4b3e6b246cc5f3e7e540f80", "tree": "2c30354bef6a8d7469f7197bfc7a6be2bf9fe7ea", "parents": [ "ba1932f6016729ec97b487f3ed83f60907099867", "26965f92c309fe5d9bfc968d7ddc6ccf4fb65bf8" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 12:31:21 2019 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 12:31:21 2019 +0000" }, "message": "Fix refCount check at releaseNetworkFor am: b92d1f5513 am: 26965f92c3\n\nChange-Id: I82859813cf1e51cba5c240f86e3df4d2e1e0e2f4\n" }, { "commit": "26965f92c309fe5d9bfc968d7ddc6ccf4fb65bf8", "tree": "2c30354bef6a8d7469f7197bfc7a6be2bf9fe7ea", "parents": [ "39e75098594e4758275cd2bb15e856e363c19782", "b92d1f55133b0ffe49df89e7aab67b8db7036fa5" ], "author": { "name": "Junaid Babu", "email": "junaidvayoli@gmail.com", "time": "Tue Dec 17 04:11:07 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 17 04:11:07 2019 -0800" }, "message": "Fix refCount check at releaseNetworkFor\nam: b92d1f5513\n\nChange-Id: Ie57a05d66df6ddac7dc5919c299c1f3c2539b037\n" }, { "commit": "b92d1f55133b0ffe49df89e7aab67b8db7036fa5", "tree": "2c30354bef6a8d7469f7197bfc7a6be2bf9fe7ea", "parents": [ "39e75098594e4758275cd2bb15e856e363c19782" ], "author": { "name": "Junaid Babu", "email": "junaidvayoli@gmail.com", "time": "Tue Dec 17 13:56:26 2019 +0900" }, "committer": { "name": "Junaid Babu", "email": "junaidvayoli@gmail.com", "time": "Tue Dec 17 15:09:01 2019 +0900" }, "message": "Fix refCount check at releaseNetworkFor\n\nWhen releaseNetworkFor is called, refCount should be equal to 1 for\nnetwork.stop() to be called. This is the same logic that is followed by\nWifiNetworkFactory also.\nIn the current code, when refCount is 2 and releaseNetworkFor() is called,\nnetwork.stop() will be executed and will stop Ethernet\n\nBug: 146089778\nTest: build and boot OK\nChange-Id: Ib7d1b488a2943364a8ba4a89eec5de4c33cf1d5a\n" }, { "commit": "13d5b866144b4c35a53f712d0b39c4cb7904b015", "tree": "27c4a7396965b01340a66b9f14b44a4be7c67e1d", "parents": [ "2afd43ff9fbeb01bf51659007f41694aab79081f" ], "author": { "name": "kevinwk_lee", "email": "kevinwk_lee@askey.com.tw", "time": "Fri Oct 18 11:25:29 2019 +0800" }, "committer": { "name": "文楷 李", "email": "kevinwk_lee@askey.com", "time": "Thu Oct 31 07:23:11 2019 +0000" }, "message": "Avoid creating IpClient if ethernet cable is unplugged.\n\nThis change avoids calling start() on needNetworkFor() if ethernet\ncable is unplugged. Fixed by adding isLinkUp validation.\n\nTest: ./cts-tradefed run cts-dev -d -m CtsSecurityTestCases -t \\\n android.security.cts.ListeningPortsTest#testNoRemotelyAccessibleListeningUdpPorts\n adb shell netstat -lnup\n\nChange-Id: I2debd7367a20b665249f9c19d2d8a61737435803\n" }, { "commit": "e23b1096839335eef0540068bdd67366a5e898e3", "tree": "af0c65ac4b6eaa7798238c15ec56eaceacb97685", "parents": [ "efc7f26d6650493c18aa208f69c311923bcdd0c3", "ba1932f6016729ec97b487f3ed83f60907099867" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 15:37:47 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 15:37:47 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 39e7509859\nam: ba1932f601 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ic5e8885bfbe7257dabe36dd11574c99bad0506c9\n" }, { "commit": "ba1932f6016729ec97b487f3ed83f60907099867", "tree": "af0c65ac4b6eaa7798238c15ec56eaceacb97685", "parents": [ "5b12a54294796d0462d016bc54442c29a54f7342", "39e75098594e4758275cd2bb15e856e363c19782" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 15:14:04 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 15:14:04 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\nam: 39e7509859\n\nChange-Id: Idb13dc5c8e29cdfa6643b0686641f351a48f49eb\n" }, { "commit": "39e75098594e4758275cd2bb15e856e363c19782", "tree": "af0c65ac4b6eaa7798238c15ec56eaceacb97685", "parents": [ "2afd43ff9fbeb01bf51659007f41694aab79081f", "5b12a54294796d0462d016bc54442c29a54f7342" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:49:19 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:49:19 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\n\nBug: 142003500\nChange-Id: I10598042b88b6509ed29dee05fe27ca9decf184e\n" }, { "commit": "efc7f26d6650493c18aa208f69c311923bcdd0c3", "tree": "af0c65ac4b6eaa7798238c15ec56eaceacb97685", "parents": [ "6cad7f20e1d2a98d120c13fac37b9b72aab8be02", "5b12a54294796d0462d016bc54442c29a54f7342" ], "author": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Fri Sep 20 00:55:40 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 20 00:55:40 2019 -0700" }, "message": "Merge \"[Ethernet] Replace internal connectivity checks permission\" am: cd73c22c96 am: 2afd43ff9f am: 63721ec401\nam: 5b12a54294\n\nChange-Id: I1c248170fd82697352ac0526e3dadd8cbdb7a28d\n" }, { "commit": "5b12a54294796d0462d016bc54442c29a54f7342", "tree": "af0c65ac4b6eaa7798238c15ec56eaceacb97685", "parents": [ "761a9e0eea880963a84276df893f5b20ace85138", "63721ec401a780e01abd0784d8d325e66d4f8f52" ], "author": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Fri Sep 20 00:48:36 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 20 00:48:36 2019 -0700" }, "message": "Merge \"[Ethernet] Replace internal connectivity checks permission\" am: cd73c22c96 am: 2afd43ff9f\nam: 63721ec401\n\nChange-Id: I3606bee0a292d70dd140b4e244b8f283e8205c96\n" }, { "commit": "63721ec401a780e01abd0784d8d325e66d4f8f52", "tree": "af0c65ac4b6eaa7798238c15ec56eaceacb97685", "parents": [ "8a5d92da6dc4b08505649d6ca10d3b14395ae793", "2afd43ff9fbeb01bf51659007f41694aab79081f" ], "author": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Fri Sep 20 00:42:42 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 20 00:42:42 2019 -0700" }, "message": "Merge \"[Ethernet] Replace internal connectivity checks permission\" am: cd73c22c96\nam: 2afd43ff9f\n\nChange-Id: I1ccd73bc12ceb18e4b7578454bbfd3428ce8f135\n" }, { "commit": "2afd43ff9fbeb01bf51659007f41694aab79081f", "tree": "af0c65ac4b6eaa7798238c15ec56eaceacb97685", "parents": [ "abb7a8c574c348a342fbd7b686057e61b00b4a23", "cd73c22c962f07d0f8484e97a6584015e57fdcee" ], "author": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Fri Sep 20 00:36:15 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 20 00:36:15 2019 -0700" }, "message": "Merge \"[Ethernet] Replace internal connectivity checks permission\"\nam: cd73c22c96\n\nChange-Id: Idafe2f4e829b70920ba1f423bf5273a766257cf2\n" }, { "commit": "cd73c22c962f07d0f8484e97a6584015e57fdcee", "tree": "af0c65ac4b6eaa7798238c15ec56eaceacb97685", "parents": [ "91456a8c7abed3fb5cc9dba438a361019f4782c5", "6957e3a35ae1472956bd9d6ee27cdc2ad154dc91" ], "author": { "name": "Paul Hu", "email": "paulhu@google.com", "time": "Fri Sep 20 07:23:07 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Sep 20 07:23:07 2019 +0000" }, "message": "Merge \"[Ethernet] Replace internal connectivity checks permission\"" }, { "commit": "6cad7f20e1d2a98d120c13fac37b9b72aab8be02", "tree": "6e622b8a7fcb7551def0b5e2ff65526500ad3180", "parents": [ "c88d7a093d35249b42b57bfd7424e9433a642faf", "761a9e0eea880963a84276df893f5b20ace85138" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Sep 18 05:32:30 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 18 05:32:30 2019 -0700" }, "message": "Update Ethernet code for the NetworkFactory serial number. am: 91456a8c7a am: abb7a8c574 am: 8a5d92da6d\nam: 761a9e0eea\n\nChange-Id: Ib4a41c536d2a0b9c8914504cb5e5bffff06434b9\n" }, { "commit": "761a9e0eea880963a84276df893f5b20ace85138", "tree": "6e622b8a7fcb7551def0b5e2ff65526500ad3180", "parents": [ "946288ef22ff3ddfd614294e0b6be9a354ef5094", "8a5d92da6dc4b08505649d6ca10d3b14395ae793" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Sep 18 05:27:47 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 18 05:27:47 2019 -0700" }, "message": "Update Ethernet code for the NetworkFactory serial number. am: 91456a8c7a am: abb7a8c574\nam: 8a5d92da6d\n\nChange-Id: Ifcce756f31fc85bcba49731596a8fc270efc3c79\n" }, { "commit": "8a5d92da6dc4b08505649d6ca10d3b14395ae793", "tree": "6e622b8a7fcb7551def0b5e2ff65526500ad3180", "parents": [ "946288ef22ff3ddfd614294e0b6be9a354ef5094", "abb7a8c574c348a342fbd7b686057e61b00b4a23" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Sep 18 05:20:36 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 18 05:20:36 2019 -0700" }, "message": "Update Ethernet code for the NetworkFactory serial number. am: 91456a8c7a\nam: abb7a8c574\n\nChange-Id: I36c6a101dc4dc67fe094a7ec6d12870f06c4cb78\n" }, { "commit": "abb7a8c574c348a342fbd7b686057e61b00b4a23", "tree": "6e622b8a7fcb7551def0b5e2ff65526500ad3180", "parents": [ "946288ef22ff3ddfd614294e0b6be9a354ef5094", "91456a8c7abed3fb5cc9dba438a361019f4782c5" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed Sep 18 05:15:07 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 18 05:15:07 2019 -0700" }, "message": "Update Ethernet code for the NetworkFactory serial number.\nam: 91456a8c7a\n\nChange-Id: I4a0601db487d9d60d4bc7487601fb1b26ab748d8\n" }, { "commit": "91456a8c7abed3fb5cc9dba438a361019f4782c5", "tree": "6e622b8a7fcb7551def0b5e2ff65526500ad3180", "parents": [ "54816c5fe21f5af9d464daa541b2e5dd26880f42" ], "author": { "name": "Chalard Jean", "email": "jchalard@google.com", "time": "Wed May 02 21:36:12 2018 +0900" }, "committer": { "name": "Aaron Huang", "email": "huangaaron@google.com", "time": "Mon Sep 09 11:03:51 2019 +0800" }, "message": "Update Ethernet code for the NetworkFactory serial number.\n\nSee aosp/708790\n\nBug: 18637384\nBug: 29030667\nTest: manual\n cts\n runtest framework-net\n atest frameworks/opt/net/ethernet/tests\n\nChange-Id: I5caa4cb89ca1441f3c84b5675ceede6ecacfd132\n" }, { "commit": "6957e3a35ae1472956bd9d6ee27cdc2ad154dc91", "tree": "9a67a42c649315ee633e266402633d57bfbd14e1", "parents": [ "b95be5972e51ed4186c41af1c885a74134583561" ], "author": { "name": "paulhu", "email": "paulhu@google.com", "time": "Thu Aug 22 16:03:59 2019 +0800" }, "committer": { "name": "paulhu", "email": "paulhu@google.com", "time": "Thu Aug 22 16:03:59 2019 +0800" }, "message": "[Ethernet] Replace internal connectivity checks permission\n\nA number of connectivity checks that protect system-only methods\ncheck for CONNECTIVITY_INTERNAL, but CONNECTIVITY_INTERNAL is a\nsignature|privileged permission. We should audit the permissions\nchecks, and convert checks that protect code that should not be\ncalled outside the system to a signature permission. So replace\nthe permission to NETWORK_STACK.\n\nBug: 32963470\nTest: atest EthernetServiceTests\nChange-Id: I2a88d04bbdcd7e7e624b9065372a6603d2bb45a2\n" }, { "commit": "c88d7a093d35249b42b57bfd7424e9433a642faf", "tree": "b36708a5ed71944fc9bc6cc4285f76455d2d00f6", "parents": [ "9f3b27fed900ae3d2b90e5df64b11d024549c0d9", "946288ef22ff3ddfd614294e0b6be9a354ef5094" ], "author": { "name": "Wally Yau", "email": "wyau@google.com", "time": "Thu May 30 10:36:15 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 30 10:36:15 2019 -0700" }, "message": "Fixed fatal exception in EthernetServiceThread am: b95be5972e am: 13a87fbc0e am: 54816c5fe2\nam: 946288ef22\n\nChange-Id: I96273535af86fc63e9d63706a23af4ad16d0b4da\n" }, { "commit": "946288ef22ff3ddfd614294e0b6be9a354ef5094", "tree": "b36708a5ed71944fc9bc6cc4285f76455d2d00f6", "parents": [ "aaff25b1ecdd66d0ce6460c9aa78160009f9a551", "54816c5fe21f5af9d464daa541b2e5dd26880f42" ], "author": { "name": "Wally Yau", "email": "wyau@google.com", "time": "Thu May 30 10:10:04 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 30 10:10:04 2019 -0700" }, "message": "Fixed fatal exception in EthernetServiceThread am: b95be5972e am: 13a87fbc0e\nam: 54816c5fe2\n\nChange-Id: I35c737a0493cfbbde9cba05fb010c8253c9030ae\n" }, { "commit": "54816c5fe21f5af9d464daa541b2e5dd26880f42", "tree": "b36708a5ed71944fc9bc6cc4285f76455d2d00f6", "parents": [ "aaff25b1ecdd66d0ce6460c9aa78160009f9a551", "13a87fbc0effefc6d359c6dfc09b9ab2f4b929d0" ], "author": { "name": "Wally Yau", "email": "wyau@google.com", "time": "Thu May 30 09:49:49 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 30 09:49:49 2019 -0700" }, "message": "Fixed fatal exception in EthernetServiceThread am: b95be5972e\nam: 13a87fbc0e\n\nChange-Id: I35e91e5c2f4f04e888eceb8492a3e970f98f3789\n" }, { "commit": "13a87fbc0effefc6d359c6dfc09b9ab2f4b929d0", "tree": "b36708a5ed71944fc9bc6cc4285f76455d2d00f6", "parents": [ "571f7a6b6729cada9eef6f8306622d9e8907cc65", "b95be5972e51ed4186c41af1c885a74134583561" ], "author": { "name": "Wally Yau", "email": "wyau@google.com", "time": "Thu May 30 09:40:39 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 30 09:40:39 2019 -0700" }, "message": "Fixed fatal exception in EthernetServiceThread\nam: b95be5972e\n\nChange-Id: I9ae1b1fb00552931882ce0b1eafd6696f217c96e\n" }, { "commit": "b95be5972e51ed4186c41af1c885a74134583561", "tree": "b36708a5ed71944fc9bc6cc4285f76455d2d00f6", "parents": [ "571f7a6b6729cada9eef6f8306622d9e8907cc65" ], "author": { "name": "Wally Yau", "email": "wyau@google.com", "time": "Wed May 22 09:22:06 2019 -0700" }, "committer": { "name": "Wally Yau", "email": "wyau@google.com", "time": "Wed May 29 14:50:38 2019 -0700" }, "message": "Fixed fatal exception in EthernetServiceThread\n\nWhen this.mIpConfig is not initialized, it will cause a\njava.lang.NullPointerException and put the device in a boot\nloop with the following error:\n\nFATAL EXCEPTION IN SYSTEM PROCESS: EthernetServiceThread\n\nTest: passed pre-submit boot test.\n\nChange-Id: I47df68071b4c07a4136c0abcbe69ee7ada7090e0\n" }, { "commit": "9f3b27fed900ae3d2b90e5df64b11d024549c0d9", "tree": "6e8888dc68ad886439766bf69311433767206db0", "parents": [ "ae0045195144901cce66bd052cbf9fbfbf3262a4", "aaff25b1ecdd66d0ce6460c9aa78160009f9a551" ], "author": { "name": "tank.hung", "email": "tank.hung@mediatek.com", "time": "Tue May 14 10:12:35 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 14 10:12:35 2019 -0700" }, "message": "Merge \"Add reconnect flow when updateIPConfiguration\" am: 08998cf4d1 am: 571f7a6b67\nam: aaff25b1ec\n\nChange-Id: I612033b0dec43c1b911e00e5d42d2e34bc2d23f7\n" }, { "commit": "aaff25b1ecdd66d0ce6460c9aa78160009f9a551", "tree": "6e8888dc68ad886439766bf69311433767206db0", "parents": [ "fd849fea841620dc1b11cd2f38ccb21e9b2a0186", "571f7a6b6729cada9eef6f8306622d9e8907cc65" ], "author": { "name": "tank.hung", "email": "tank.hung@mediatek.com", "time": "Tue May 14 09:48:00 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 14 09:48:00 2019 -0700" }, "message": "Merge \"Add reconnect flow when updateIPConfiguration\" am: 08998cf4d1\nam: 571f7a6b67\n\nChange-Id: I3deeb11c92dee6ceeeb4503d3696f87fa4ab4597\n" }, { "commit": "571f7a6b6729cada9eef6f8306622d9e8907cc65", "tree": "6e8888dc68ad886439766bf69311433767206db0", "parents": [ "583912de29f93a0f45d6e5b728f4efc20f6f8b62", "08998cf4d1fe069acd853509ba2e2193e4f7dce3" ], "author": { "name": "tank.hung", "email": "tank.hung@mediatek.com", "time": "Tue May 14 09:42:35 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 14 09:42:35 2019 -0700" }, "message": "Merge \"Add reconnect flow when updateIPConfiguration\"\nam: 08998cf4d1\n\nChange-Id: Iad395c171db5f186859c485e8d929a6e577f3c5f\n" }, { "commit": "08998cf4d1fe069acd853509ba2e2193e4f7dce3", "tree": "6e8888dc68ad886439766bf69311433767206db0", "parents": [ "583912de29f93a0f45d6e5b728f4efc20f6f8b62", "f8a95e543f8def8b3a75cc7f59f9fde316beb399" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 14 16:23:23 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue May 14 16:23:23 2019 +0000" }, "message": "Merge \"Add reconnect flow when updateIPConfiguration\"" }, { "commit": "f8a95e543f8def8b3a75cc7f59f9fde316beb399", "tree": "6e8888dc68ad886439766bf69311433767206db0", "parents": [ "ea26baf9ffdd10f9c6577e8ba134575afeab5727" ], "author": { "name": "tank.hung", "email": "tank.hung@mediatek.com", "time": "Thu Apr 04 22:37:49 2019 +0800" }, "committer": { "name": "Jay Patel", "email": "pateljay@google.com", "time": "Tue May 14 15:16:19 2019 +0000" }, "message": "Add reconnect flow when updateIPConfiguration\n\nBug: 119085164\nTest: manual, test with AndroidTV device\n\nPartner gerrit review CL:\nhttps://partner-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1215654\n\n[Analysis]\nAPP called EthernetManager.setConfiguration API for switch DHCP to\nStatic,\nsetConfiguration’s flow just only update IpConfig finally but have not\ntrigger EthernetNetworkFactory.start().\nSo Static IP Setting just only take effect when unplug/plug Ethernet\nCable or AC Off\u0026On.\n\n[Repeat Steps]\n1. Connect Ethernet with DHCP and Network access is normal\n2. Change IP settings from DHCP to Static and set Static IP.\n3. After setting, you can not automatically obtain Static IP.\n\n[Recovery Method]\nUnplug the Ethernet and insert it or AC OFF / ON\n\nChange-Id: Idbb6a24ccfa360582f48e4f9369def7fc729fb9f\n\nBug: 112171349\n" }, { "commit": "ae0045195144901cce66bd052cbf9fbfbf3262a4", "tree": "aa56600ba57b2309164725331f8028cb2ecbacfa", "parents": [ "fd849fea841620dc1b11cd2f38ccb21e9b2a0186", "724fbf32faf4568fa53f6ab9d836f4be8b4cb84a" ], "author": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Wed Apr 03 17:53:51 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 03 17:53:51 2019 -0700" }, "message": "Merge master@5428150 into git_qt-dev. am: 97110cf1bf\nam: 724fbf32fa\n\nChange-Id: I492bb0e7bc8bfaa37dda1301c33e0340f1eec5ee\n" }, { "commit": "fd849fea841620dc1b11cd2f38ccb21e9b2a0186", "tree": "aa56600ba57b2309164725331f8028cb2ecbacfa", "parents": [ "d9c947bf2f7e6efa25d51061e906fcb70ef46856", "e245135f9305bd65fa1c9a00fa0b4013cc9ff93e" ], "author": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Wed Apr 03 16:45:02 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 03 16:45:02 2019 -0700" }, "message": "Merge master@5428150 into git_qt-dev-plus-aosp.\nam: e245135f93\n\nChange-Id: I95b26c922e8b19bec14d0be9c6a93291b6b0d069\n" }, { "commit": "724fbf32faf4568fa53f6ab9d836f4be8b4cb84a", "tree": "aa56600ba57b2309164725331f8028cb2ecbacfa", "parents": [ "e245135f9305bd65fa1c9a00fa0b4013cc9ff93e", "97110cf1bf6ca779058c8f0fd9705cd513ecdde7" ], "author": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Wed Apr 03 09:31:21 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Apr 03 09:31:21 2019 -0700" }, "message": "Merge master@5428150 into git_qt-dev.\nam: 97110cf1bf\n\nChange-Id: Ie8dcbdb008e1f9cb42457fa377dc6fa7ec93fab6\n" }, { "commit": "e245135f9305bd65fa1c9a00fa0b4013cc9ff93e", "tree": "aa56600ba57b2309164725331f8028cb2ecbacfa", "parents": [ "cf295965a68262d0876b595472038d8c97f3c36d", "d9c947bf2f7e6efa25d51061e906fcb70ef46856" ], "author": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Tue Apr 02 18:33:43 2019 +0000" }, "committer": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Tue Apr 02 18:33:43 2019 +0000" }, "message": "Merge master@5428150 into git_qt-dev-plus-aosp.\n\nChange-Id: Id7b68cfc15856ae3370bb9391b46a67c7c1f5505\nBUG: 129345239\n" }, { "commit": "97110cf1bf6ca779058c8f0fd9705cd513ecdde7", "tree": "aa56600ba57b2309164725331f8028cb2ecbacfa", "parents": [ "cf295965a68262d0876b595472038d8c97f3c36d", "d9c947bf2f7e6efa25d51061e906fcb70ef46856" ], "author": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Tue Apr 02 17:03:23 2019 +0000" }, "committer": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Tue Apr 02 17:03:23 2019 +0000" }, "message": "Merge master@5428150 into git_qt-dev.\n\nChange-Id: Ie1e78801f5738e6712de0e4213a5bf76770da0ed\nBUG: 129345239\n" }, { "commit": "d9c947bf2f7e6efa25d51061e906fcb70ef46856", "tree": "aa56600ba57b2309164725331f8028cb2ecbacfa", "parents": [ "cf295965a68262d0876b595472038d8c97f3c36d", "9c6fb69777c5d8cde7cd9067ca729d94b1f6c2b2" ], "author": { "name": "Sal Savage", "email": "salsavage@google.com", "time": "Tue Mar 26 10:45:27 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Mar 26 10:45:27 2019 -0700" }, "message": "Update comments and documentation in net type prop change am: ea26baf9ff am: 583912de29\nam: 9c6fb69777\n\nChange-Id: Ida49c0c86d12e5c0ae0705e53e5657a846c8d2e2\n" }, { "commit": "9c6fb69777c5d8cde7cd9067ca729d94b1f6c2b2", "tree": "aa56600ba57b2309164725331f8028cb2ecbacfa", "parents": [ "0c3285031b530880b6000eaaf4f6a37de36afa2c", "583912de29f93a0f45d6e5b728f4efc20f6f8b62" ], "author": { "name": "Sal Savage", "email": "salsavage@google.com", "time": "Tue Mar 26 10:36:15 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Mar 26 10:36:15 2019 -0700" }, "message": "Update comments and documentation in net type prop change am: ea26baf9ff\nam: 583912de29\n\nChange-Id: Ib9a534a0e13e4f6f62c27e2d028e085b4a3c1691\n" }, { "commit": "583912de29f93a0f45d6e5b728f4efc20f6f8b62", "tree": "aa56600ba57b2309164725331f8028cb2ecbacfa", "parents": [ "14837c2f318c2d045a13b318d510d2b45defaca4", "ea26baf9ffdd10f9c6577e8ba134575afeab5727" ], "author": { "name": "Sal Savage", "email": "salsavage@google.com", "time": "Tue Mar 26 10:28:12 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Mar 26 10:28:12 2019 -0700" }, "message": "Update comments and documentation in net type prop change\nam: ea26baf9ff\n\nChange-Id: I0fe7d537d46ab0b4bcd6521162e35fcb719f13f9\n" }, { "commit": "ea26baf9ffdd10f9c6577e8ba134575afeab5727", "tree": "aa56600ba57b2309164725331f8028cb2ecbacfa", "parents": [ "2c514c69b74a35de4b0f07eff6815e82e1743a29" ], "author": { "name": "Sal Savage", "email": "salsavage@google.com", "time": "Wed Jan 23 14:25:59 2019 -0800" }, "committer": { "name": "Sal Savage", "email": "salsavage@google.com", "time": "Mon Mar 25 14:11:20 2019 -0700" }, "message": "Update comments and documentation in net type prop change\n\nBug: b/112588045\nTest: atest EthernetServiceTests --verbose\nTest: kitchensink, dumpsys ethernet, with RPi devices and USB to\n ethernet adapters.\n\nChange-Id: Iaa260aabbbd7aa4b7864eba32ecff7e3f84123c3\n" }, { "commit": "cf295965a68262d0876b595472038d8c97f3c36d", "tree": "30365356390e560c02ec86ddc28fe1a78c72a869", "parents": [ "6d9fdc0839006b4af1a27a4ca5a07152f6d396bb", "0c3285031b530880b6000eaaf4f6a37de36afa2c" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Mar 11 14:34:28 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Mar 11 14:34:28 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: 2c514c69b7 -s ours am: 14837c2f31 -s ours\nam: 0c3285031b -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ibc47e3588fd3c7c027c3364899e1085ac512d029\n" }, { "commit": "0c3285031b530880b6000eaaf4f6a37de36afa2c", "tree": "30365356390e560c02ec86ddc28fe1a78c72a869", "parents": [ "d24b0551d21728ae07cd8f1ef8bcb5c63e96c1b8", "14837c2f318c2d045a13b318d510d2b45defaca4" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Mar 11 14:05:05 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Mar 11 14:05:05 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: 2c514c69b7 -s ours\nam: 14837c2f31 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I24ba2152523a30ccc20028150843f628d735c14f\n" }, { "commit": "14837c2f318c2d045a13b318d510d2b45defaca4", "tree": "30365356390e560c02ec86ddc28fe1a78c72a869", "parents": [ "da5fc0171802689396bc058c7372a239ced24ce4", "2c514c69b74a35de4b0f07eff6815e82e1743a29" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Mar 11 13:07:41 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Mar 11 13:07:41 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master\nam: 2c514c69b7 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Ic455a6ffd8a17475f7c4419e8995c54ceebfa173\n" }, { "commit": "2c514c69b74a35de4b0f07eff6815e82e1743a29", "tree": "30365356390e560c02ec86ddc28fe1a78c72a869", "parents": [ "e9eff7a4501ea535145aedf340201d2d841532b1", "fdc1d0fff5c1bc75bb51cc57ce9fb632828a196b" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Mar 11 11:23:23 2019 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Mar 11 11:23:23 2019 -0700" }, "message": "DO NOT MERGE - Skip PPRL.190305.001 into master\n\nBug: 127812889\nChange-Id: I544793199b894342e9dc245bb4254d17854afeed\n" }, { "commit": "6d9fdc0839006b4af1a27a4ca5a07152f6d396bb", "tree": "30365356390e560c02ec86ddc28fe1a78c72a869", "parents": [ "841cc7f4d8486cc50766e402def428a70c052da2", "d24b0551d21728ae07cd8f1ef8bcb5c63e96c1b8" ], "author": { "name": "Brett Chabot", "email": "brettchabot@google.com", "time": "Tue Mar 05 20:27:28 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Mar 05 20:27:28 2019 -0800" }, "message": "Migrate frameworks/opt/net/ethernet to androidx.test am: e9eff7a450 am: da5fc01718\nam: d24b0551d2\n\nChange-Id: Ie933d7d304bc13a80dd1171a761d480f3cb58353\n" }, { "commit": "d24b0551d21728ae07cd8f1ef8bcb5c63e96c1b8", "tree": "30365356390e560c02ec86ddc28fe1a78c72a869", "parents": [ "17c07503ecd7ea2948a9fd01539216c6e7419df3", "da5fc0171802689396bc058c7372a239ced24ce4" ], "author": { "name": "Brett Chabot", "email": "brettchabot@google.com", "time": "Tue Mar 05 20:19:26 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Mar 05 20:19:26 2019 -0800" }, "message": "Migrate frameworks/opt/net/ethernet to androidx.test am: e9eff7a450\nam: da5fc01718\n\nChange-Id: I7838157884da46c513b171f501d066ced7ecfc18\n" }, { "commit": "da5fc0171802689396bc058c7372a239ced24ce4", "tree": "30365356390e560c02ec86ddc28fe1a78c72a869", "parents": [ "1206467ba2539c00d62132abdeaffb145b9cbb69", "e9eff7a4501ea535145aedf340201d2d841532b1" ], "author": { "name": "Brett Chabot", "email": "brettchabot@google.com", "time": "Tue Mar 05 20:16:27 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Mar 05 20:16:27 2019 -0800" }, "message": "Migrate frameworks/opt/net/ethernet to androidx.test\nam: e9eff7a450\n\nChange-Id: Ibd005ade7b4aa33335f81ac5386d6cffca8bc0cf\n" }, { "commit": "e9eff7a4501ea535145aedf340201d2d841532b1", "tree": "30365356390e560c02ec86ddc28fe1a78c72a869", "parents": [ "5060d1d1be7e098376ebe98729484a67868a7241" ], "author": { "name": "Brett Chabot", "email": "brettchabot@google.com", "time": "Tue Mar 05 09:10:36 2019 -0800" }, "committer": { "name": "Brett Chabot", "email": "brettchabot@google.com", "time": "Tue Mar 05 09:10:36 2019 -0800" }, "message": "Migrate frameworks/opt/net/ethernet to androidx.test\n\nSee go/jetpack-test-android-migration\n\nTest: compile\nChange-Id: I20fc49dd2487af2245f060454e7f32f5e9145a9c\n" }, { "commit": "841cc7f4d8486cc50766e402def428a70c052da2", "tree": "399d4d1667cb4459fd936a6a1b80d2213e81dcef", "parents": [ "acbced583f498b9dbad8c727850ee184a3cb4818", "17c07503ecd7ea2948a9fd01539216c6e7419df3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 25 05:35:54 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Feb 25 05:35:54 2019 -0800" }, "message": "Merge stage-aosp-master into pi-dev-plus-aosp\nam: 17c07503ec\n\nChange-Id: I1fdf525277c5229791807404f3c74ab51d3ab841\n" }, { "commit": "17c07503ecd7ea2948a9fd01539216c6e7419df3", "tree": "399d4d1667cb4459fd936a6a1b80d2213e81dcef", "parents": [ "3b5065bb775ee36ef6c19c39d38d46e0fd37f06b", "1206467ba2539c00d62132abdeaffb145b9cbb69" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 25 00:30:16 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 25 00:30:16 2019 -0800" }, "message": "Merge stage-aosp-master into pi-dev-plus-aosp\n\nBug: 126125118\nChange-Id: Ifeafc16bc4f434aa86b015b4bbedceee14dc334f\n" }, { "commit": "1206467ba2539c00d62132abdeaffb145b9cbb69", "tree": "399d4d1667cb4459fd936a6a1b80d2213e81dcef", "parents": [ "f8b2a96d17a1de41f3bc7ece286d6a9be7bea372", "c05e7f186bb07b5a31a9dec0ab01c91aa80847f5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:19:22 2019 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 20 16:19:22 2019 -0800" }, "message": "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master\n\nBug: 120848293\nChange-Id: I49bc176829a1f38eb79f28e4749785c2e9426314\n" } ], "next": "acbced583f498b9dbad8c727850ee184a3cb4818" }