)]}' { "log": [ { "commit": "8a9769d60f584868f707be253d4b50a54dde9793", "tree": "385ea7dc5eabc1b42425ad6e360c6aa4a81f119e", "parents": [ "700dfde82b68f4d4c40dff8cbe57df7b2eee2506", "f10fcafcdf324e6a80e1e911bf738fa42ad8edad" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Wed Jun 28 13:44:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 13:44:40 2017 +0000" }, "message": "Merge \"Add system to avoid a crash stopping tests from running\" into oc-dr1-dev\nam: f10fcafcdf\n\nChange-Id: Ib5a821f92aefb4200ab2aef958813d38820bea74\n" }, { "commit": "f10fcafcdf324e6a80e1e911bf738fa42ad8edad", "tree": "34f874083e5b982151b189c9eac39a97d0afdb76", "parents": [ "e06004421781c7f6c1fb42d140536a2854ff7afc", "c429f690e54db1bdc4631aab7c0191e30ccf1d51" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Wed Jun 28 13:37:51 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 28 13:37:51 2017 +0000" }, "message": "Merge \"Add system to avoid a crash stopping tests from running\" into oc-dr1-dev" }, { "commit": "dcac8500a6178a4d68ff9ba688848e6839a9025e", "tree": "caf38e04dd85c55f8c53c7b9d9b32e95ab4ada0d", "parents": [ "45c074d40680e80d1b75dea39a4aba58962a9852", "48ab20a645afa39b925ff44e3a3dcb9de0d0b9ac" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Wed Jun 28 13:13:09 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 13:13:09 2017 +0000" }, "message": "Merge \"Limit when a ranking reconsidering can alert\" into oc-dr1-dev\nam: 48ab20a645\n\nChange-Id: Iec399c254e41e1c94d67ea2ed5cea637cce148b0\n" }, { "commit": "c429f690e54db1bdc4631aab7c0191e30ccf1d51", "tree": "dee65e4c2b392474bb16df051ef9be5bed37b0c4", "parents": [ "21c7490f207c60541935497b0df58604eb578bd5" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Tue Jun 27 13:13:49 2017 -0400" }, "committer": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Tue Jun 27 14:48:45 2017 -0400" }, "message": "Add system to avoid a crash stopping tests from running\n\nAdd a system such that when a crash happens on the main thread, it is\ndelayed until the tests complete, then thrown.\n\nAlso mark some old flaky tests as not flaky as they should be good\nnow.\n\nTest: runtest systemui\nChange-Id: Ic18a38daf4a93dab63549d834fa00f295644fbf1\nFixes: 62935720, 62251903, 62529569\n" }, { "commit": "af4dc2834c8882d4ccecb3c50a45d42aeb361b04", "tree": "d839fd17ef6ea17ccee52bd0882efd6643836882", "parents": [ "9f8409338697b52389b7e8bd0f2bcb7ea49ba667" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Fri Jun 23 16:13:20 2017 -0400" }, "committer": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Tue Jun 27 13:21:47 2017 -0400" }, "message": "Limit when a ranking reconsidering can alert\n\nOtherwise notifications that were silenced by DND that\nstill exist when DND is turned off can re-alert.\n\nTest: StatusBarTest, \"with zen\". No alerts should happen\nwithin ~10 seconds of starting the test\nChange-Id: I9e58118c0a40e0d4f1bafb0913e569b560879ba2\nFixes: 62355996\n" }, { "commit": "e504d0be0b08e29c103d8008b4b0592d8e96f0e6", "tree": "2b6dee821ec82fa264bb2a01be09ecfddeb26166", "parents": [ "da3774ea413da2419ad6515405a525585df02c50", "a29861b0c970055927675731e00e93c51f1c5668" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Sat Jun 24 12:44:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jun 24 12:44:45 2017 +0000" }, "message": "Merge \"Relax SharedLogTest asserts\" am: 91464bfe68 am: 541079e0d7\nam: a29861b0c9\n\nChange-Id: I53d99edee6729b753707db251e252297b927d2a7\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": "c009f2edcdfbef75a981678076530bc0681d43ae", "tree": "6aa60cdc74b16bd928d304ef398ff26e2637c491", "parents": [ "e3fc290f967dd496321506e79cbf0a7a6af5b912", "cc6cd46d707ab68984810bf51020f9718661d237" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 21 07:27:48 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 21 07:27:48 2017 +0000" }, "message": "Merge \"Always allow Ethernet to be an upstream\" am: ecbe6fa147 am: 9cec380720\nam: cc6cd46d70\n\nChange-Id: Id60706e623febcc35063ccb96c797fc4f9a223b1\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": "0cec17209e72639b6ac836eb8c59bba6bf481253", "tree": "c086e89df8ab6cf57fcdca427354a24703937151", "parents": [ "5347490663b0c695c481a724abbfc3d90c0fa469", "b912c50b197cc0fc49bb7897130581dd02d2af01" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 20 15:05:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 20 15:05:23 2017 +0000" }, "message": "resolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp\nam: b912c50b19\n\nChange-Id: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08\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": "d5c0ef9467a764a8a473b3c2009abc7396f61084", "tree": "6485deea8dd35765275411afd8585b26d8e3113d", "parents": [ "794296e7fd67429fe433c24496e3507a594af6ad", "305fe47d651a5962153e941ace6c60eca004c805" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Tue Jun 20 00:06:08 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 20 00:06:08 2017 +0000" }, "message": "Merge \"Revive DeadZone\" into oc-dev am: b278424fa6\nam: 305fe47d65\n\nChange-Id: I1402412d130edc9ad32cc60c030c92711a487b96\n" }, { "commit": "305fe47d651a5962153e941ace6c60eca004c805", "tree": "89779561cd1db23f092977ea0f5fc8cf1e5f6c63", "parents": [ "972734f592b9d91eec934ae713c0a3a4580c2a24", "b278424fa6264171d42e686dcb5b366f0a1705d8" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Mon Jun 19 23:59:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 19 23:59:46 2017 +0000" }, "message": "Merge \"Revive DeadZone\" into oc-dev\nam: b278424fa6\n\nChange-Id: I5a06302eaad1e955aaea6ae8d2785c0b12e53cc4\n" }, { "commit": "d37884a5284538567e418ced90d0af3af1eddbbe", "tree": "2e8efca239a54e13880161f0217d17517cc36129", "parents": [ "97f7dbb00441ba61a55753f015fc60d7e871159c", "b278424fa6264171d42e686dcb5b366f0a1705d8" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Mon Jun 19 23:58:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 19 23:58:04 2017 +0000" }, "message": "Merge \"Revive DeadZone\" into oc-dev\nam: b278424fa6\n\nChange-Id: Ib4388b31d3b636826c428a89389585ae5b9cb25e\n" }, { "commit": "6ad0e39f338d47e75bd1b964259ba21c00043f45", "tree": "136f9ec688f81f9262b9604d290c0c968c98d4fc", "parents": [ "8a95d49d8f149e190f2e170c968cbdef6a7db687" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Fri Jun 02 17:20:34 2017 -0700" }, "committer": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Mon Jun 19 14:06:21 2017 -0700" }, "message": "Revive DeadZone\n\nOverride dispatchTouchEvent for the root FrameLayout\nof NavigationBar to process ACTION_OUTSIDE MotionEvents\nand dispatch directly to DeadZone to keep track of the\nmost recent outside tap.\nClarified documentation of ACTION_OUTSIDE behaviour.\n\nBug: 37552674\nTest: open IME, tap any key, then quickly tap on top half\nof the home button. The home button tap is ignored\nand device does not go to homescreen.\n\nChange-Id: Icb5cf6c76959f3514b8b94c09e38cc5434f31b23\n" }, { "commit": "576d67b453e17f4c78f381cd682cd434ddbfaafc", "tree": "5741359973526b39406a70e731cfc5d03e4e31ce", "parents": [ "537782f3957c947dd9ddb4143e0a396864070980", "5219f643ddc18e5c721e9228e97bac1eb2810559" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 19 13:37:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jun 19 13:37:15 2017 +0000" }, "message": "Merge \"Make interface IP serving code set LinkProperties\" am: 1dae9a4709 am: 9461f78541\nam: 5219f643dd\n\nChange-Id: I39a1744a7fa9b91e3b607429c79f39578e9bde19\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": "af26f72fb8fe66372bf6396af0480c5da76dfa5c", "tree": "4a7c8afe883e30b81d2e90a0d3ffb1d55f84305b", "parents": [ "96e57619af1599d88619b0cf96701635a033c7d8", "11cc260047631c36a859e5a0866c01f993109003" ], "author": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Sat Jun 17 17:26:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jun 17 17:26:20 2017 +0000" }, "message": "Merge \"K-Means color clustering\" into oc-dr1-dev\nam: 11cc260047\n\nChange-Id: If99425cb57a322900f476227932cdcadd85abf00\n" }, { "commit": "1d3c00d5c7a906d5a75ff66e05c7a865ff82fd4e", "tree": "330c3e0fcb94ee985f8917467f899382d1676523", "parents": [ "14d9e3a5295a846863c90d4313b26ae2f5e7f17f" ], "author": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Mon Jun 05 08:40:39 2017 -0700" }, "committer": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Fri Jun 16 18:04:42 2017 -0700" }, "message": "K-Means color clustering\n\nTest: runtest -x tests/Internal/src/com/android/internal/ml/clustering/KMeansTest.java\nBug: 37014702\nChange-Id: Idabc163df5ded362acbe462ae6b351394a36db10\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" }, { "commit": "664d208a23be1bc6a0b1d6efdf62b711885394bc", "tree": "faf40b184568b5accf41142d1d87a707c88be45c", "parents": [ "8a945baf4acd0eb35c1b894c889fa47c5a73463e" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 15 18:06:34 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 16 21:11:39 2017 +0900" }, "message": "Fixes for tetheroffload crashes\n\nNow that we can talk to the HALs (with some out of tree CLs and\n\"setenforce 0\"), several crashes were encountered.\n\nFixes here include:\n - avoid hidl_handle move semantics\n - check HIDL method status return value (isOk())\n - convert Java short port numbers to ints\n - don\u0027t pass nulls to HIDL where Strings are required\n (limitations in parceling)\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\n - \"setenforce 0\" and start tethering\nBug: 29337859\nBug: 32163131\n\nMerged-In: I5fa930be0c9eda491cf17bd4de9b55ab33672d25\nMerged-In: Id1037d22826f4d426bccfa17dce0962c54518d64\nChange-Id: I91314440c3a04e5f2502579b5f06dac9f25cf0cd\n(cherry picked from commit 1185459c4169891bd7550655218e738c8bf1abe2)\n" }, { "commit": "c1189434c06836df61e55313db2609db49032dd0", "tree": "d8755a02180131710d97a1bc990e34051a41ac05", "parents": [ "edc2917b698e6dc4e7c03a04f5e6e7a8fe062566", "b71e5377f24145a932aeaed7b50c01b19bfd5ca8" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 16 10:35:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 10:35:22 2017 +0000" }, "message": "Merge \"Fixes for tetheroffload crashes\" into oc-dr1-dev\nam: b71e5377f2\n\nChange-Id: Id1037d22826f4d426bccfa17dce0962c54518d64\n" }, { "commit": "1185459c4169891bd7550655218e738c8bf1abe2", "tree": "f0fa46fd1a673c4e03c26dad9d1547f2b7eb8e4a", "parents": [ "69a4e37d19542a9a88c939b7a61f0c3de39b5c1b" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 15 18:06:34 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 16 17:06:05 2017 +0900" }, "message": "Fixes for tetheroffload crashes\n\nNow that we can talk to the HALs (with some out of tree CLs and\n\"setenforce 0\"), several crashes were encountered.\n\nFixes here include:\n - avoid hidl_handle move semantics\n - check HIDL method status return value (isOk())\n - convert Java short port numbers to ints\n - don\u0027t pass nulls to HIDL where Strings are required\n (limitations in parceling)\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\n - \"setenforce 0\" and start tethering\nBug: 29337859\nBug: 32163131\n\nChange-Id: I91314440c3a04e5f2502579b5f06dac9f25cf0cd\n" }, { "commit": "68117e559a6e21a8e050d0bb9d2a85c0c99f83dc", "tree": "3c8fd8df0546da2cf19db1ebcc1d9aa39220c944", "parents": [ "8411065453824e19d12568684805fed35c3f782f", "37e9a28262175e355b32b6c36e2983881b432c4e" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Jun 15 11:04:30 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 15 11:04:30 2017 +0000" }, "message": "Fix dependencies of packages that target earlier releases\nam: 37e9a28262\n\nChange-Id: Ib8b9272423ba7513ea653843335fd1907970c40f\n" }, { "commit": "37e9a28262175e355b32b6c36e2983881b432c4e", "tree": "daf20d8578cdc5f7ebf81642cc1607b40d99c5f7", "parents": [ "641160b7d46734a93b3d072adbd14fc83bf808ad" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Jun 13 15:53:11 2017 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Jun 15 09:10:13 2017 +0100" }, "message": "Fix dependencies of packages that target earlier releases\n\nA previous change added legacy-android-test as a static dependency to\nall packages that build against the current, test_current or\nsystem_current and failed to compile when the junit and android.test\nclasses were removed from the API. Unfortunately, those changes did not\ntake into account that some of those packages target earlier API\nversions and so will always have the classes available at runtime.\n\nThis change replaces those static dependencies with dynamic dependencies\nfor any package that targets an earlier API version. The file changes\nwere made automatically by a tool that constructed and then analyzed a\nfull dependency graph of all the Android Java modules. The individual\nchanges were checked manually to ensure that the changes matched the\nintent. The affected modules were built against an API with the junit\nand android.test classes removed. Any issues found during this process\nresulted in either the tool being updated to address the issue or a\nseparate change being made to fix an existing problem with the build. A\nsample of the affected packages were run to ensure that they worked as\nexpected at runtime; no issues were found during testing.\n\nThe following change descriptions were generated automatically and so\nmay be a little repetitive. They are provided to give the reviewer\nenough information to check the comments match what has actually been\nchanged and check the reasoning behind the changes.\n\n* packages/SettingsProvider/test/Android.mk\n Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES\n because SettingsProviderTest\u0027s manifest file (AndroidManifest.xml)\n targets API level 21 and dynamically includes the\n android.test.runner library at runtime so there is no point in\n statically including the classes.\n\n Added \u0027legacy-android-test\u0027 to LOCAL_JAVA_LIBRARIES because module\n SettingsProviderTest uses classes from package android.test\n (possible indirectly) and needs them available at compile time.\n\n Dependency \u0027legacy-android-test\u0027 is used instead of\n \u0027android.test.runner\u0027 because the latter will conflict with\n dependencies on junit.\n\n* services/tests/servicestests/Android.mk\n Replaced \u0027android.test.runner\u0027 with \u0027android.test.mock\u0027 and\n \u0027legacy-android-test\u0027 in LOCAL_JAVA_LIBRARIES because module\n FrameworksServicesTests uses classes from packages android.test and\n android.test.mock (possible indirectly) and needs them available at\n compile time.\n\n Dependency \u0027legacy-android-test\u0027 is used instead of\n \u0027android.test.runner\u0027 because the latter will conflict with\n dependencies on junit.\n\n They were not added to LOCAL_STATIC_JAVA_LIBRARIES because\n FrameworksServicesTests\u0027s manifest file (AndroidManifest.xml)\n targets API level 26 and uses the android.test.runner library which\n will provide the classes dynamically at runtime.\n\n Dependency \u0027android.test.mock.sdk\u0027 is used instead of\n \u0027android.test.mock\u0027 because module FrameworksServicesTests builds\n against internal jars not the API and so should use libraries that\n build against internal jars not the API.\n\n* tests/AppLaunch/Android.mk\n Replaced \u0027android.test.runner\u0027 with \u0027legacy-android-test\u0027 in\n LOCAL_JAVA_LIBRARIES because module AppLaunch uses classes from\n package android.test (possible indirectly) and needs them available\n at compile time.\n\n Dependency \u0027legacy-android-test\u0027 is used instead of\n \u0027android.test.runner\u0027 because the latter will conflict with\n dependencies on junit.\n\n Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES\n because AppLaunch\u0027s manifest file (AndroidManifest.xml) targets API\n level 24 and dynamically includes the android.test.runner library\n at runtime so there is no point in statically including the\n classes.\n\n* tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk\n Replaced \u0027android.test.runner\u0027 with \u0027legacy-android-test\u0027 in\n LOCAL_JAVA_LIBRARIES because module SmartCamera-tests uses classes\n from package android.test (possible indirectly) and needs them\n available at compile time.\n\n Dependency \u0027legacy-android-test\u0027 is used instead of\n \u0027android.test.runner\u0027 because the latter will conflict with\n dependencies on junit.\n\n Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES\n because SmartCamera-tests\u0027s manifest file (AndroidManifest.xml)\n targets API level 17 and dynamically includes the\n android.test.runner library at runtime so there is no point in\n statically including the classes.\n\n* tests/Compatibility/Android.mk\n Replaced \u0027android.test.runner\u0027 with \u0027legacy-android-test\u0027 in\n LOCAL_JAVA_LIBRARIES because module AppCompatibilityTest uses\n classes from package android.test (possible indirectly) and needs\n them available at compile time.\n\n Dependency \u0027legacy-android-test\u0027 is used instead of\n \u0027android.test.runner\u0027 because the latter will conflict with\n dependencies on junit.\n\n Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES\n because AppCompatibilityTest\u0027s manifest file (AndroidManifest.xml)\n targets API level 21 and dynamically includes the\n android.test.runner library at runtime so there is no point in\n statically including the classes.\n\nBug: 30188076\nTest: make checkbuild and ran a sample of tests\nChange-Id: I3d183a96bf87437028a2d4b774d311e40349f4d0\n" }, { "commit": "1e2897dcff865cc0f00079f2a3c7d5188811544f", "tree": "890e0370eec5318921c2f7fe508c59d14f1e0dff", "parents": [ "3760999e347ae1cfa25087451638de8ddc79c9f6" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 09 17:08:52 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 15 15:28:50 2017 +0900" }, "message": "make UpsreamNetworkMonitor the sole source of upstream network information\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 29337859\nBug: 32163131\n\nMerged-In: If45443143777e1446c812563742ae8af68d8f73e\nMerged-In: Ifeb49f1b19ab36e438763b569c78a335b094f7d0\nMerged-In: Idfebb9b79074f21aeccf773cac98aa7839bda9da\nChange-Id: I66ce682cf9c31887264a095a4e4638d281d8ed39\n(cherry picked from commit 5bbece747f7179a629eed942e2aa88507e744b6b)\n" }, { "commit": "3760999e347ae1cfa25087451638de8ddc79c9f6", "tree": "c812e8c1ef6be48b0f00b65acecfdecf837d17ab", "parents": [ "73df65acd7606f23f36d5e4c182d276611f8d2e2" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 05 16:02:02 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 15 15:28:50 2017 +0900" }, "message": "Move findPreferredUpstreamType into UNM\n\nThis changes the way in which available networks are found. Previously\nTethering asked ConnectivityService for NetworkInfo and checked for\nwhether or not it was in state CONNECTED.\n\nHere we use the fact that ConnectivityService will not call UNM\u0027s\ncallbacks\u0027 onAvailable() methods until the networks in question have\nbecome connected.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest framework-net passed\nBug: 29337859\nBug: 32163131\n\nMerged-In: I9937297727aa1a063e499fccd5833ace229b1e8a\nMerged-In: Ifa1a34a1fb32149085421a63cb0f2586d2862d6b\nMerged-In: Ia215e55b69b856f5511e5d4f852e39fa6c11462e\nChange-Id: I97abe225fdd3accb38bd9168f545445b761a90d8\n(cherry picked from commit a1d368af2f01e2048240fb730f6cc399fc1cc1ab)\n" }, { "commit": "4372af3090776bbad153d3654364e257317382bf", "tree": "15da427579595acf7043bbb1e8541208e103748b", "parents": [ "71e1b227cd015418fd72704ce7ae674d9801e176", "cbf19dcd767b01d13b43b9192d381c58470e982f" ], "author": { "name": "Gopinath Elanchezhian", "email": "gelanchezhian@google.com", "time": "Thu Jun 15 05:12:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 15 05:12:45 2017 +0000" }, "message": "Merge \"Use TotalTime instead of ThisTime in app launch test\" into oc-dev\nam: cbf19dcd76\n\nChange-Id: If78cc6a4c6a0677e872a99aab9a607022b9008ad\n" }, { "commit": "a8e2e799a88be8f3eb93132da1f1982a9273eb64", "tree": "603069e9a97a9902e6fc8112dc760b0f5cd30ca4", "parents": [ "308aa4c8460d6be4ca2c0a7487ae062aa1c29ece" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 13 21:32:10 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 14 19:45:34 2017 +0900" }, "message": "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine\n\nIdeally this would have been done immediately after IPv6 tethering code\nwas made part of an official named release. Getting this in now should\nhelp with the relaying of LinkProperties that is required for offload.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\n - runtest frameworks-wifi passes\nBug: 29337859\nBug: 32163131\n\nMerged-In: Ib6e6356e6caa469523fc098e850108de97b494e2\nMerged-In: Iec52309a56dd38ac9854ce40a792b3b622f0b015\nMerged-In: I5eb3c02331aabc033ecfebee2900477c61e1b6f6\nChange-Id: I015fa3cb05a15624f9e80b7aa5a871cefef431b7\n(cherry picked from commit 94ae4c99c5a0d580f5898d480e1e1d08a292d060)\n" }, { "commit": "607df03ae01df31abb0fe1a7aabc83e5948e21c3", "tree": "89af17cdf45e0c9fbf5c52afb51b45a2607181f3", "parents": [ "0aeac3814ae402b153bcf6d4ec7f4671f0d38ec8", "d2bf55e300a5a6c53b2f0af576328a788ddd0656" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 14 10:32:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 14 10:32:29 2017 +0000" }, "message": "Merge \"Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine\" am: 6f029bbc82 am: 35728f01cb\nam: d2bf55e300\n\nChange-Id: Iec52309a56dd38ac9854ce40a792b3b622f0b015\n" }, { "commit": "d2bf55e300a5a6c53b2f0af576328a788ddd0656", "tree": "8fcf5eae7a261ff2b1609a2bec2fb32f61e3bb31", "parents": [ "41cb9f1bb16aec13c06ab445310fb4dae3fd77fd", "35728f01cb0e6ee4a22a1889fe2da9cee0d6f92c" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 14 10:25:33 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 14 10:25:33 2017 +0000" }, "message": "Merge \"Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine\" am: 6f029bbc82\nam: 35728f01cb\n\nChange-Id: I5eb3c02331aabc033ecfebee2900477c61e1b6f6\n" }, { "commit": "35728f01cb0e6ee4a22a1889fe2da9cee0d6f92c", "tree": "74574e0208dacebd6bacb7cd9a6388bc4b55dfb6", "parents": [ "707dc81da15d6b2d8c8e7e9418b0f8b74e244b5f", "6f029bbc8272531972d02bd5f8b93446825d3cf0" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 14 10:19:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 14 10:19:35 2017 +0000" }, "message": "Merge \"Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine\"\nam: 6f029bbc82\n\nChange-Id: I098bd78d29cf4119208d24977dab8494d3bf5fdb\n" }, { "commit": "8c64bf0edf5e574a42d1b55c5bb16a7f9e3ece99", "tree": "0a44f2b5d079083fe79bc9d223b6bf379e7bf127", "parents": [ "aaca44229b4129e25828bd9a0e935f096d3f612d", "0a2c9396a289be2b1d1447d949e3f5969204261a" ], "author": { "name": "gopinath", "email": "gelanchezhian@google.com", "time": "Wed Jun 14 04:39:30 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 14 04:39:30 2017 +0000" }, "message": "App launch test apk change\nam: 0a2c9396a2\n\nChange-Id: I2468cfc8f0db8c993ed0203d12bffb5abcd76305\n" }, { "commit": "9326f2227cfc7595d52a6a48fb1831f1085961e7", "tree": "e73edccd0aa69944e31c2d50df079f901bf42be6", "parents": [ "0a2c9396a289be2b1d1447d949e3f5969204261a" ], "author": { "name": "gopinath", "email": "gelanchezhian@google.com", "time": "Thu Jun 01 17:28:36 2017 -0700" }, "committer": { "name": "Gopinath Elanchezhian", "email": "gelanchezhian@google.com", "time": "Wed Jun 14 04:33:21 2017 +0000" }, "message": "Use TotalTime instead of ThisTime in app launch test\n\nBug: 62272543\n\nTest: Tested with calculator and facebook messenger launch\n\nChange-Id: Ide4e844e54428edcb7e3356cb3d0492392f6bde3\n(cherry picked from commit fb9272c637f4b657d40057145e4dbce989005e67)\n" }, { "commit": "0a2c9396a289be2b1d1447d949e3f5969204261a", "tree": "ecb4f299fff398056114ae57c0eaf6e0c4b45c1d", "parents": [ "c041c7a34e77c22a00a504855ad13adff5ff508e" ], "author": { "name": "gopinath", "email": "gelanchezhian@google.com", "time": "Fri May 12 15:37:37 2017 -0700" }, "committer": { "name": "Gopinath Elanchezhian", "email": "gelanchezhian@google.com", "time": "Wed Jun 14 00:06:01 2017 +0000" }, "message": "App launch test apk change\n\nSupport launching the app using the package name.\nRemove the unused variables.\n\nb/33226470\n\nChange-Id: I5b3829912782a9fc0c8f09cbd6fa9ee4b5b35314\n(cherry picked from commit a00259f47dc480f799a812a00f52e3c887aae4b0)\n" }, { "commit": "d1407961f51dc41912d211b02e02e4490dfc84f9", "tree": "ab30690c8eb0c20c101887ed988c45f79473f205", "parents": [ "87460ab66ac741434097fd119fdd644adb377186", "85c96384381ffc36a739524e787b077b83ecb556" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Jun 13 23:44:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 13 23:44:45 2017 +0000" }, "message": "Merge \"Fix #62545908 : \u0027metered\u0027 network jobs run without network\" into oc-dev am: 796b510787\nam: 85c9638438\n\nChange-Id: Icc9968bcbee5fb029a4fea4368ac57fc7bc6c71d\n" }, { "commit": "4c8dccf728a18ef6bb242232037f46f72c81a9b8", "tree": "28be058f452831542ed7ce48432eb9b01174a430", "parents": [ "26cafd3e423df146fe1e49e8bcabb49dc6605b58", "796b51078792656aceabe38f72ae98433e046899" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Jun 13 23:39:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 13 23:39:28 2017 +0000" }, "message": "Merge \"Fix #62545908 : \u0027metered\u0027 network jobs run without network\" into oc-dev\nam: 796b510787\n\nChange-Id: I0659c68ece4fef6d3e93e436a35c960dc341618b\n" }, { "commit": "85c96384381ffc36a739524e787b077b83ecb556", "tree": "a6fa59d4ce16eb551b001a56f72beaa80ddf3ba0", "parents": [ "e9a4951c4d5f85b2e060678d4355907071153395", "796b51078792656aceabe38f72ae98433e046899" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Jun 13 23:34:51 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 13 23:34:51 2017 +0000" }, "message": "Merge \"Fix #62545908 : \u0027metered\u0027 network jobs run without network\" into oc-dev\nam: 796b510787\n\nChange-Id: I8c87bb6ac0ed8867ffd36a6fe1692bfb933bf746\n" }, { "commit": "06f0852ead5524c09987fc9da5129390a2dba251", "tree": "cf6853ea8f36f09aa0b09279d2c6f69ca6837862", "parents": [ "8ab4d1114564d725e8a2e6da1bd1be9eab76eb7d" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Jun 13 12:12:09 2017 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Jun 13 14:04:48 2017 -0700" }, "message": "Fix #62545908 : \u0027metered\u0027 network jobs run without network\n\nTest: JobSchedulerTestApp\n\nChange-Id: I9c15022f5542163a27c6aaa4c3ee6b677cffd699\n" }, { "commit": "94ae4c99c5a0d580f5898d480e1e1d08a292d060", "tree": "0bd3c08947290e104e298bf327b256f79cd2bf63", "parents": [ "30a1cf96bb43e59029542a7f80be5522129b45b0" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 13 21:32:10 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 13 22:36:37 2017 +0900" }, "message": "Merge IPv6TetheringInterfaceServices into TetherInterfaceStateMachine\n\nIdeally this would have been done immediately after IPv6 tethering code\nwas made part of an official named release. Getting this in now should\nhelp with the relaying of LinkProperties that is required for offload.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\n - runtest frameworks-wifi passes\nBug: 29337859\nBug: 32163131\n\nChange-Id: I015fa3cb05a15624f9e80b7aa5a871cefef431b7\n" }, { "commit": "72240b9eebbf240034efc8c001174269a6633dd3", "tree": "933d67d4d60224d4ad11e7a9b0ad4b0b70e7a3ae", "parents": [ "0cbfb82f3865e40f16fba97f2c298b60eab4603f", "4bcce2b2efa3f7e31fcdb998581f1843e2c17725" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 13 08:42:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 13 08:42:44 2017 +0000" }, "message": "Merge \"make UpsreamNetworkMonitor the sole source of upstream network information\" am: 30a1cf96bb am: cfaeabb3e3\nam: 4bcce2b2ef\n\nChange-Id: Ifeb49f1b19ab36e438763b569c78a335b094f7d0\n" }, { "commit": "4bcce2b2efa3f7e31fcdb998581f1843e2c17725", "tree": "74d0ca29edc2e4019878ea1b5e44097d2828875d", "parents": [ "e13b93c5858f7aec1609c27eec5374d3a5b0e541", "cfaeabb3e3aad47c0f75d0b9726a93d382f305df" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 13 08:36:14 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 13 08:36:14 2017 +0000" }, "message": "Merge \"make UpsreamNetworkMonitor the sole source of upstream network information\" am: 30a1cf96bb\nam: cfaeabb3e3\n\nChange-Id: Idfebb9b79074f21aeccf773cac98aa7839bda9da\n" }, { "commit": "cfaeabb3e3aad47c0f75d0b9726a93d382f305df", "tree": "76e2d2621c31905af15959fe3aba8f54b333f9d4", "parents": [ "e675273dbc740fad7d4d236dea239e10c1e53fa1", "30a1cf96bb43e59029542a7f80be5522129b45b0" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 13 08:29:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 13 08:29:06 2017 +0000" }, "message": "Merge \"make UpsreamNetworkMonitor the sole source of upstream network information\"\nam: 30a1cf96bb\n\nChange-Id: I0f7234363f94694ecc4e97d87c7ffb6bb244895d\n" }, { "commit": "5bbece747f7179a629eed942e2aa88507e744b6b", "tree": "9f46552fd01838f9ff45091955ac3cfe50e5bc09", "parents": [ "218c226b0882640a351deb0dd945a30b8bc32fff" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 09 17:08:52 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 13 12:04:00 2017 +0900" }, "message": "make UpsreamNetworkMonitor the sole source of upstream network information\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 32163131\nChange-Id: I66ce682cf9c31887264a095a4e4638d281d8ed39\n" }, { "commit": "f3a08b44ed5f3695720e92f7f51218f95018c12a", "tree": "c22d0a8da9dd2730349afbcd51c63b43f4df86e5", "parents": [ "6e9a10104c77e8f16c66ee0a435af6ec395369a2" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 07 16:33:19 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Sun Jun 11 18:19:22 2017 +0900" }, "message": "Add additional mocking for Context innards\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\n - cherry-picked to master and verified there as well\nBug: 32163131\nBug: 32561414\n\nMerged-In: I2695841bfc31280060754132e589af1ca95911da\nMerged-In: I9a05f34035a15b233a44d517f2b2426481679974\nChange-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07\n(cherry picked from commit ec37275ec9702b56bf328031675906a5483b89d4)\n" }, { "commit": "6e9a10104c77e8f16c66ee0a435af6ec395369a2", "tree": "c6ea3906a16edc8cbc47235594e96727d532b23b", "parents": [ "a96a9f7326e066c1bd6a613f2743aa9e96133625" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 06 19:24:21 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Sun Jun 11 18:08:03 2017 +0900" }, "message": "Convert IControlsTethering from interface into callback\n\nAdditionally:\n - add updateLinkProperties() method to new callback\n - skeletally connect LinkProperties updates through\n to OffloadController\n\nTODOs liberally sprinkled through out.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 29337859\nBug: 32163131\nMerged-In: I178130e65db4fef26d62ea7eaa9a52f7e8103432\nMerged-In: I832d77747de7517513c22d36fff4a2fa2bb95154\nChange-Id: I631d17b26be153534551a1615931fc98b598b953\n(cherry picked from commit ab6439b0f8dd0a67c81235a3fc4d9c149de3780d)\n" }, { "commit": "daa0bd49ea7461f44d4d5c81ca621355e12772b1", "tree": "c0509f1f3a9c7a74e4aafd7d31b5d4a90160821a", "parents": [ "34201d8d2abc26e755c10c6233495f79bbb409a0", "b9fc817f59a373e58ba847f2b4e2216fedeeaa34" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 09 09:31:05 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 09 09:31:05 2017 +0000" }, "message": "Merge \"Convert IControlsTethering from interface into callback\" am: 5b9d362b60 am: ad3fd82f8b\nam: b9fc817f59\n\nChange-Id: I178130e65db4fef26d62ea7eaa9a52f7e8103432\n" }, { "commit": "b9fc817f59a373e58ba847f2b4e2216fedeeaa34", "tree": "19350ced934907e1d377ac5da12147192df42542", "parents": [ "d614cd35099ad886e2812b6de13b45989030e048", "ad3fd82f8b816ec63f704476d84bd728df381099" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 09 09:23:37 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 09 09:23:37 2017 +0000" }, "message": "Merge \"Convert IControlsTethering from interface into callback\" am: 5b9d362b60\nam: ad3fd82f8b\n\nChange-Id: Ib1f41df1200378191c0722a280939ccbde539920\n" }, { "commit": "ad3fd82f8b816ec63f704476d84bd728df381099", "tree": "c75b584d3d37535a3cd3b77d36d93b30bc5bfc65", "parents": [ "30b7dfb526db3bea7d70cdaaecfcc25869f2cc45", "5b9d362b607ef4f35669cff19730ff7a6f03d8f2" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 09 09:16:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 09 09:16:01 2017 +0000" }, "message": "Merge \"Convert IControlsTethering from interface into callback\"\nam: 5b9d362b60\n\nChange-Id: I911548e994761778cf5434b2513d433eeaccd4f3\n" }, { "commit": "292157d9cb3ba354188b2bd935e806ac111558b8", "tree": "c6a38a1981a051fac8741bfd87738601d95caebf", "parents": [ "f661ef99050cafda185f37e08a84690389f29d20", "e7d76993811ffd7f6bab233ea95bb775e6fb689f" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 13:40:54 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 08 13:40:54 2017 +0000" }, "message": "Delete legacy \"wifi interface name guessing\" behaviour am: 9e22554068\nam: e7d7699381\n\nChange-Id: Iddfd2e5f81b80f311896e8eb4019d7ebd7c1c1c0\n" }, { "commit": "e7d76993811ffd7f6bab233ea95bb775e6fb689f", "tree": "a375dfa333dc77b176aaaef8ffff207ba5129498", "parents": [ "4d579eacece8d1103e9c45dbcde164a89057c9fc", "9e225540687d5d4eb17bdfbe4f062c22ee22b560" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 13:32:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 08 13:32:57 2017 +0000" }, "message": "Delete legacy \"wifi interface name guessing\" behaviour\nam: 9e22554068\n\nChange-Id: Iecb4498c004a45403213d6e4bd7b6f8725334646\n" }, { "commit": "998e766accec19900daa4d339c78c903ca7a9d99", "tree": "1f4dd22cd6e9249036bf4998a1299a4492d5e95c", "parents": [ "ad652cbcf34aa25418b035b6badea09974650771", "9e225540687d5d4eb17bdfbe4f062c22ee22b560" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 13:32:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 08 13:32:53 2017 +0000" }, "message": "Delete legacy \"wifi interface name guessing\" behaviour\nam: 9e22554068\n\nChange-Id: I25e3814f979dbe65055498c85b34411cf6d3c996\n" }, { "commit": "ab6439b0f8dd0a67c81235a3fc4d9c149de3780d", "tree": "ab01787b4992aafabee3dbff81102ec211a555b1", "parents": [ "32703994fe80583e4779bc0be9829c32635c5812" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 06 19:24:21 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 22:28:57 2017 +0900" }, "message": "Convert IControlsTethering from interface into callback\n\nAdditionally:\n - add updateLinkProperties() method to new callback\n - skeletally connect LinkProperties updates through\n to OffloadController\n\nTODOs liberally sprinkled through out.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 29337859\nBug: 32163131\nChange-Id: I631d17b26be153534551a1615931fc98b598b953\n" }, { "commit": "f661ef99050cafda185f37e08a84690389f29d20", "tree": "beecc4374c49a9e80e51706d5ed88f9af1ec19fa", "parents": [ "d20b1c96d79bc0ea59300c02f8ac8b5b9581ea50", "ad652cbcf34aa25418b035b6badea09974650771" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 12:28:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 08 12:28:58 2017 +0000" }, "message": "Merge \"Move findPreferredUpstreamType into UNM\" am: 32703994fe am: 8bc87070f9\nam: ad652cbcf3\n\nChange-Id: Ifa1a34a1fb32149085421a63cb0f2586d2862d6b\n" }, { "commit": "ad652cbcf34aa25418b035b6badea09974650771", "tree": "b2f861ce5637f7661917804ae8bba404f68f81f7", "parents": [ "07d2221218964dd2c3f59e58ae4a13e89ed16da8", "8bc87070f946654265fbb76ca28384dc20fe78b6" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 12:20:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 08 12:20:31 2017 +0000" }, "message": "Merge \"Move findPreferredUpstreamType into UNM\" am: 32703994fe\nam: 8bc87070f9\n\nChange-Id: Ia215e55b69b856f5511e5d4f852e39fa6c11462e\n" }, { "commit": "8bc87070f946654265fbb76ca28384dc20fe78b6", "tree": "bfae81a59c1520517ee41fd376fed098f1e3a0b0", "parents": [ "3ea0309e3931e326733d03ded25537cdfe098aba", "32703994fe80583e4779bc0be9829c32635c5812" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 12:11:59 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 08 12:11:59 2017 +0000" }, "message": "Merge \"Move findPreferredUpstreamType into UNM\"\nam: 32703994fe\n\nChange-Id: I20e90906e72bc8bba9f0f535d54ba430f96191ff\n" }, { "commit": "9e225540687d5d4eb17bdfbe4f062c22ee22b560", "tree": "b52497be4bebe4f7c72d41a726781ad7966bac82", "parents": [ "9be8c9691850d15ff306aba8fa23303ccc20ac85" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 17:48:48 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 18:51:33 2017 +0900" }, "message": "Delete legacy \"wifi interface name guessing\" behaviour\n\nNow that Wi-Fi always passes us the AP interface name (and mode)\nwe no longer need to guess which interface on which we\u0027re supposed\nto be starting IP serving (either tethering or local-only hotspot).\n\nTest: as follows\n - built\n - flashed\n - booted\n - TetheringTest passes\nBug: 32163131\nBug: 62343300\n\nChange-Id: I6019410ee5adff4929690d35ba09294765fcd6a4\n" }, { "commit": "a1d368af2f01e2048240fb730f6cc399fc1cc1ab", "tree": "a49d31e3be5108e4b4af61304b8114ea726378a1", "parents": [ "da5b77fa9b8baf08208180a7186efae1fdf9fefc" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Mon Jun 05 16:02:02 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 08 16:50:17 2017 +0900" }, "message": "Move findPreferredUpstreamType into UNM\n\nThis changes the way in which available networks are found. Previously\nTethering asked ConnectivityService for NetworkInfo and checked for\nwhether or not it was in state CONNECTED.\n\nHere we use the fact that ConnectivityService will not call UNM\u0027s\ncallbacks\u0027 onAvailable() methods until the networks in question have\nbecome connected.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest framework-net passed\nBug: 32163131\n\nChange-Id: I97abe225fdd3accb38bd9168f545445b761a90d8\n" }, { "commit": "4a1059ca0ebce318ae5c44d363cf1fef07c54f45", "tree": "23ff5e169f12f95e89e171d573a00a18eb205fe4", "parents": [ "af63dabff929a8a425d3bf036ecebc8707e58118", "48c3c00ee1a600c57c88533f00f3020bb8890cbf" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 07 09:59:43 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 07 09:59:43 2017 +0000" }, "message": "Merge \"Add additional mocking for Context innards\" am: a65aa77c1c am: 35182218d3 am: f22995eed5\nam: 48c3c00ee1\n\nChange-Id: I9a05f34035a15b233a44d517f2b2426481679974\n" }, { "commit": "48c3c00ee1a600c57c88533f00f3020bb8890cbf", "tree": "4ab34bbb82f778e416b0079b660c080cca92f53e", "parents": [ "f5b8d18798099c5fdd87f8c40aa7107a1644dbb6", "f22995eed577788c95bde827aad54f2f2863c14b" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 07 09:51:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 07 09:51:52 2017 +0000" }, "message": "Merge \"Add additional mocking for Context innards\" am: a65aa77c1c am: 35182218d3\nam: f22995eed5\n\nChange-Id: Ibde5e3e048236d32ea3c1ba2c2700bb6a75323e6\n" }, { "commit": "35182218d36f688d646cf5bac603f52bd665c4ab", "tree": "eacda4e6840d30e66027194bbafd68f7e9062812", "parents": [ "93fe99aca48696d33a40539d646742092a0faa72", "a65aa77c1c5bbd17fa0fd3d68bd74697ac57251f" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 07 09:40:37 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 07 09:40:37 2017 +0000" }, "message": "Merge \"Add additional mocking for Context innards\"\nam: a65aa77c1c\n\nChange-Id: I7f780c05c46b00457b194bfb13df5814735f0809\n" }, { "commit": "ec37275ec9702b56bf328031675906a5483b89d4", "tree": "2b737fda92d52f9977ac15d1ac38d338247014e0", "parents": [ "bede96729c1e60d53119e9b83ad1b8ff68b28c12" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 07 16:33:19 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Jun 07 17:44:53 2017 +0900" }, "message": "Add additional mocking for Context innards\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\n - cherry-picked to master and verified there as well\nBug: 32163131\nBug: 32561414\n\nChange-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07\n" }, { "commit": "964993e9aa20d859db8c3af6618a9ce9dd4dfd01", "tree": "4522f10d71623f9857dd7520afa11151c77144fd", "parents": [ "169a884f816b1d214cdfbe4b5abd581584813556", "c742b8ab2d5b6e4a3f168eef40024c7e95de2fbd" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Tue Jun 06 21:29:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 21:29:29 2017 +0000" }, "message": "Merge \"Remove usages of ActionBarActivity.\" into oc-dev\nam: c742b8ab2d\n\nChange-Id: Ie10c1ddf16fa238b2e2ee5b0c58b1cff3981433f\n" }, { "commit": "f40e6bcd2edf0f21141ed1fb1b0c4c7df1d4ed91", "tree": "7865016003d8667bb9792aa50ba97049b6770ce2", "parents": [ "7c68a15c11e8937f671fc3e421d009f8e998ac50", "6ce08f623ce706e1451caba4a2fa93592640389a" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 06 16:06:43 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 16:06:43 2017 +0000" }, "message": "Merge \"Support setting upstream parameters.\" am: faf8d67749 am: 4e5024131b am: e2018a407a\nam: 6ce08f623c\n\nChange-Id: Ia290ef28f466d6a5c3f7208b1bc078bd7a2c204a\n" }, { "commit": "79186703793eb79f12b5fee0f57eb883bb541e84", "tree": "2b42c20da88094f0cbfe98a0229ae615d0d1caa5", "parents": [ "46f4d5c4a6f93acdb44e400707d513ece5b95f29" ], "author": { "name": "Aurimas Liutikas", "email": "aurimas@google.com", "time": "Thu May 18 10:51:48 2017 -0700" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Tue Jun 06 15:16:44 2017 +0000" }, "message": "Remove usages of ActionBarActivity.\n\nActionBarActivity has been deprecated for 2+ years and has been\nextending AppCompatActivity for all that time. These changes\nshould be no-ops.\n\nBug: 35253513\nTest: None\nChange-Id: Ica46ccbc2b29a6a3399f7deed6045c1f7e1cd429\n(cherry picked from commit 19bda3d9176b02198df4cec807d86e6797f8993e)\n" }, { "commit": "6ce08f623ce706e1451caba4a2fa93592640389a", "tree": "5bd6317dfe50ad21142c92a1c597ad03b8395cbe", "parents": [ "8212cdfb402ab47af405712cc32709c6a2a38a14", "e2018a407ac94341de7e842fb646bd099edacb2a" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 06 05:16:27 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 05:16:27 2017 +0000" }, "message": "Merge \"Support setting upstream parameters.\" am: faf8d67749 am: 4e5024131b\nam: e2018a407a\n\nChange-Id: I8e0f7188ff29b2fd7c34fd2a340c8b4abaac2be7\n" }, { "commit": "4e5024131ba9ec05f929c60ea683ef555e872990", "tree": "60ad850225db8209caf36af204a299c08e513ad8", "parents": [ "2cb58deb7b906f984efadb3ed7ac9dee246323a4", "faf8d67749af7993cd574d6baa67ba214ab24aa7" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 06 04:54:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 04:54:04 2017 +0000" }, "message": "Merge \"Support setting upstream parameters.\"\nam: faf8d67749\n\nChange-Id: I0be9ad265fa664f0ce6e1e098996b46c88317b97\n" }, { "commit": "7990aef63b4fc410e4e6932a3bc0c6a190667445", "tree": "a1ebcb8fcc4c31ffd5759abd2b46ad99540ccaaf", "parents": [ "12fe022fbda6d11fea9c3ee78fa66a8225250b72" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 01 20:11:25 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Jun 06 12:02:13 2017 +0900" }, "message": "Support setting upstream parameters.\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 29337859\nBug: 32163131\nBug: 34361337\nChange-Id: Id88cae4beed7d38aec3d29a0e2f59a5c7e6a9a4e\n" }, { "commit": "1454ee750e6dad00b5a908f9e02b10db066dad78", "tree": "f8edf426c9fd0ff0c25450a710d8c82d85ce8da7", "parents": [ "1ac325e4d5d0e03271b4c67b56117d39bcdcfaeb" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed May 31 15:53:53 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 02 22:43:34 2017 +0900" }, "message": "Handle Wi-Fi passing explicit interface name and AP/IP mode\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 31466854\nBug: 32163131\nBug: 62018531\nBug: 62076211\nMerged-In: I599813c4b4d866623344df56f62ed6a40b4025d6\nMerged-In: I8f1d172a3514e4fb9230af9e09aeaf638f03091c\nChange-Id: I3557a9c14f4e9f1de1869084566a179003d98ffe\n(cherry picked from commit 2efb827f61db989ab55792052c99713ef5f5eefa)\n" }, { "commit": "d47fa266e61ee20079767d7a7ce6e6bc42ad173b", "tree": "203af40c8e8b4067d3b6f15802ca72d2273ca885", "parents": [ "619de4a6eb4825026923f7c05a0e46c3c81583fb", "fb9272c637f4b657d40057145e4dbce989005e67" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 02 06:13:28 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 02 06:13:34 2017 +0000" }, "message": "Merge \"Use TotalTime instead of ThisTime in app launch test\"" }, { "commit": "fb9272c637f4b657d40057145e4dbce989005e67", "tree": "a6f72b350f39b990225f814edd669db62d76c338", "parents": [ "a00259f47dc480f799a812a00f52e3c887aae4b0" ], "author": { "name": "gopinath", "email": "gelanchezhian@google.com", "time": "Thu Jun 01 17:28:36 2017 -0700" }, "committer": { "name": "gopinath", "email": "gelanchezhian@google.com", "time": "Thu Jun 01 23:08:04 2017 -0700" }, "message": "Use TotalTime instead of ThisTime in app launch test\n\nBug: 62272543\n\nTest: Tested with calculator and facebook messenger launch\n\nChange-Id: Ide4e844e54428edcb7e3356cb3d0492392f6bde3\n" }, { "commit": "619de4a6eb4825026923f7c05a0e46c3c81583fb", "tree": "5486f17948cbbf39b89bf6318d07e15e17d22298", "parents": [ "127f10037bcaa445477c7690d66d68a22a05a6f2", "729c31c2e9167e71c59a89191414151739f26b96" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 02 05:46:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 02 05:46:47 2017 +0000" }, "message": "Merge \"Handle Wi-Fi passing explicit interface name and AP/IP mode\" am: 3478ff8c9e am: 1536453059 am: 00956c4f7c\nam: 729c31c2e9\n\nChange-Id: I8f1d172a3514e4fb9230af9e09aeaf638f03091c\n" }, { "commit": "729c31c2e9167e71c59a89191414151739f26b96", "tree": "7444bd022bbc0d4a642718862e7cd387d7ae5050", "parents": [ "3c860ed41d2f1cb2b756558b186f6304d6e9b674", "00956c4f7c049b1f705a8c4ad894f25433c76664" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 02 05:39:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 02 05:39:23 2017 +0000" }, "message": "Merge \"Handle Wi-Fi passing explicit interface name and AP/IP mode\" am: 3478ff8c9e am: 1536453059\nam: 00956c4f7c\n\nChange-Id: I599813c4b4d866623344df56f62ed6a40b4025d6\n" }, { "commit": "1536453059d1da9def07c26adca7fa2425716a08", "tree": "d5dc781e477e9d5cbaf316e725f59ca5ac250d00", "parents": [ "0b9fa27619a4fd8a3920eba1c80e36d377763eb0", "3478ff8c9ed3ae01ac7a99a2655a66d509cb7920" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 02 05:26:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 02 05:26:49 2017 +0000" }, "message": "Merge \"Handle Wi-Fi passing explicit interface name and AP/IP mode\"\nam: 3478ff8c9e\n\nChange-Id: I489f7e6b8ca4af584879a4c9e8f00570da6e400c\n" }, { "commit": "2efb827f61db989ab55792052c99713ef5f5eefa", "tree": "147a22394143ecf446d346885dd4a4df8aed3c7f", "parents": [ "dae92faa025999f936bb95441ede8f17f71b1e1b" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed May 31 15:53:53 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Jun 02 12:21:15 2017 +0900" }, "message": "Handle Wi-Fi passing explicit interface name and AP/IP mode\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-net passes\nBug: 31466854\nBug: 32163131\nBug: 62076211\nChange-Id: I3557a9c14f4e9f1de1869084566a179003d98ffe\n" }, { "commit": "1cab777ae4aed76ede96686c0351c2b8c80f3c3f", "tree": "228b9f3cbac0be8e6d8e9b15218747ea21f2c504", "parents": [ "c44376f7a0b2de6714d9e145f8a981cb9cd49679", "9a2041ee836be925e93dd820f11686aa378dd92d" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Jun 01 23:13:29 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 01 23:13:36 2017 +0000" }, "message": "Merge \"Fix ApfTest\"" }, { "commit": "5070e5b4b37feb7c5248562c5e9d72f04f79df97", "tree": "0d71a63d15f51a9ccaad336961bc36b7afd91707", "parents": [ "aa5569ef517e20b8df184200d45fddd9cc5104ea", "b629460f33984aea220b7606fc5639f34a2f05c1" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Thu Jun 01 20:22:03 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 01 20:22:03 2017 +0000" }, "message": "Merge \"Add checks against incorrect context use in sysui tests\" into oc-dev am: 227e65d818\nam: b629460f33\n\nChange-Id: I5695d4b2361bdf4ec9abe054418780572e660d2a\n" }, { "commit": "b629460f33984aea220b7606fc5639f34a2f05c1", "tree": "7f30fc5a40658b063e0f8e3529d3966f41f9a481", "parents": [ "d83911cb2c7d348863e38c43c89d8ef87f58df85", "227e65d81887a81aa42da84d7bd7745ab53d6f07" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Thu Jun 01 19:54:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 01 19:54:22 2017 +0000" }, "message": "Merge \"Add checks against incorrect context use in sysui tests\" into oc-dev\nam: 227e65d818\n\nChange-Id: I3fad5f17321adf92f5f80c8ec04fc8fc1e4128e2\n" }, { "commit": "893f0bdcb73785ce0e06e9f935f5a7027cf77f14", "tree": "c076b117cfb1aa07628e29c988c5b5829b305c45", "parents": [ "8bc542695c2796fd26d230b86b5f2628ddb9fd1c" ], "author": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Thu Jun 01 11:21:14 2017 -0400" }, "committer": { "name": "Jason Monk", "email": "jmonk@google.com", "time": "Thu Jun 01 11:21:14 2017 -0400" }, "message": "Add checks against incorrect context use in sysui tests\n\nFix incorrect usages found by this check.\n\nTest: runtest systemui\nBug: 62251903\nChange-Id: I45a762f96838e617833c1cbe003e583087bb8176\n" }, { "commit": "726fd9085cc21a61d8d2045bea905611de1e101e", "tree": "b86d25a3736748d81739e249260b8a316f234506", "parents": [ "887ae68bb86719b9835792901a3c3ba437702773", "9d2abb4b40f1c782280b35d8e225364624afb28d" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 01 08:18:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 01 08:18:25 2017 +0000" }, "message": "Merge \"Add a tethering offload settings kill switch\" am: 7cf3086f37 am: 503a6952b2 am: 03941982dc\nam: 9d2abb4b40\n\nChange-Id: Ibeddc103a63702096972fa505071dcad4bb47a28\n" }, { "commit": "9d2abb4b40f1c782280b35d8e225364624afb28d", "tree": "16b63416a31555cacd4a6892c4dc16940bca66eb", "parents": [ "5de2e7dfe2059b7f6b50df9ce6b502962ff13f93", "03941982dc4709ea5d21b0b52591d95fb9d7b678" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 01 08:10:51 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 01 08:10:51 2017 +0000" }, "message": "Merge \"Add a tethering offload settings kill switch\" am: 7cf3086f37 am: 503a6952b2\nam: 03941982dc\n\nChange-Id: I7e15919817c59579ff6e7b28e858f13c3090ee5c\n" }, { "commit": "503a6952b249c1af081252bac9ee8b740cf0db85", "tree": "8d373233111e0c98b57d578b62f9692cb3498a49", "parents": [ "10cb6f3b4c6e3787af0b0c595d4e547a27c117bd", "7cf3086f371085b49488f42e24a9007fa8a1061b" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jun 01 07:59:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 01 07:59:11 2017 +0000" }, "message": "Merge \"Add a tethering offload settings kill switch\"\nam: 7cf3086f37\n\nChange-Id: I13264b4ae23c8754b61ff46cafbb1b5f31bd14a3\n" }, { "commit": "7cf3086f371085b49488f42e24a9007fa8a1061b", "tree": "295c62a77f64395c3de864f24a67d4b308af0223", "parents": [ "93d7c84726a0dfcde218772c7cd3f033f84a38b3", "92c4db04e54a7bb375df01ce6e3fd98d568c6990" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 01 07:50:35 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 01 07:50:35 2017 +0000" }, "message": "Merge \"Add a tethering offload settings kill switch\"" }, { "commit": "9a2041ee836be925e93dd820f11686aa378dd92d", "tree": "9c5717a888d57172a8b4c7fdb3c6a45c4ca14b63", "parents": [ "9c5e0771937ffa4e82831d03aac873a49ae3a012" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Jun 01 15:54:59 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Jun 01 15:54:59 2017 +0900" }, "message": "Fix ApfTest\n\nlibutils is now depending on libvndksupport. So any client that\nstatically links to libutils needs to link against libvndksupport as\nwell.\n\nBug: 32561414\nTest: ApfTest works\nChange-Id: Id99792baa1c0a7a61c4056f83f33d25e0bea143e\n" }, { "commit": "68fce9e97d593a9850543ed6024e7640be09b6bc", "tree": "d16cb988c699ad80266e563a8bae607beb65e6e9", "parents": [ "e37657fd9735de3b9b4ef3833b8073f8c1203394", "871e6759ac948aee51e1c1c5d65dde0adf5a2f0d" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed May 31 13:34:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 31 13:34:20 2017 +0000" }, "message": "Merge \"Fix race condition in NsdManagerTest\" am: f2383db747 am: 2dfb494827 am: ba82d646a6\nam: 871e6759ac\n\nChange-Id: Ia9237e9be9db7447985726be06a3d9020ab72087\n" }, { "commit": "871e6759ac948aee51e1c1c5d65dde0adf5a2f0d", "tree": "6f36319b09157b003fc7382fdc8763783b00e3ee", "parents": [ "380758a685a629ea77baa86e4b2f6b9538bd010e", "ba82d646a6ae999a43ad58ec9f9df3af5d411905" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed May 31 13:25:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed May 31 13:25:53 2017 +0000" }, "message": "Merge \"Fix race condition in NsdManagerTest\" am: f2383db747 am: 2dfb494827\nam: ba82d646a6\n\nChange-Id: I7efa4f92838428f69a6a7a9fa767fefa47246f69\n" } ], "next": "2dfb494827a3b9d889e6e2b89626a57917add4e8" }