)]}' { "log": [ { "commit": "02f6cfa49e21e61149222fc050c7a4642b0c8d77", "tree": "097f1abc61f54094b7a15421aa61953f339c78e0", "parents": [ "f1c99fb47f8ba1400cb282c121de6b29d9fbfa94", "91817b3129b6b459419ae8ef4d38f1119b0605c6" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Aug 29 05:20:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 29 05:20:32 2017 +0000" }, "message": "Merge \"Nat464Xlat: interface notification handler on ConnectivityService\"\nam: 91817b3129\n\nChange-Id: I2f002cd197e2eeaaadadd747a6b33d264cd34433\n" }, { "commit": "91817b3129b6b459419ae8ef4d38f1119b0605c6", "tree": "c46b0f2ba673b587a3dc3470dcb8268ef07709a9", "parents": [ "edb2e0c722b9f4144c55a231869675be69cf3840", "771d5c2f0126ba692897c9716f4098ae6e3a870c" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Aug 29 05:08:00 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 29 05:08:00 2017 +0000" }, "message": "Merge \"Nat464Xlat: interface notification handler on ConnectivityService\"" }, { "commit": "771d5c2f0126ba692897c9716f4098ae6e3a870c", "tree": "ae1f6fd3633fb96da9f063cb99e218423b2c589d", "parents": [ "4f6f139869ddadf6f9ed50967c106a10a2e8ce3f" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 05 11:08:48 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Aug 29 08:55:18 2017 +0900" }, "message": "Nat464Xlat: interface notification handler on ConnectivityService\n\nThis patch adds a layer of asynchonicity to the NetworkBaseObserver\ncallbacks implemented by Nat464Xlat in order to allow these callbacks\nto run on the main ConnectivityService handler.\n\nThis allows to run interfaceLinkStateChanged and interfaceRemoved\ncallbacks in the same thread context as other Nat464Xlat methods and\nsolves the following issues:\n - NPE risk due to race between fixupLinkProperties called on the\n ConnectivityService thread and interfaceRemoved called as a\n callback by NetworkManagementService.\n - stale LinkProperties reads in both callbacks not called on\n ConnectivityService handler.\n - removes the race between stop() and interfaceRemoved().\n\nThis patch also:\n - removes/simplifies comments related to the threading\n model which are no obsolete.\n - extract clatd management logic from ConnectivityService into\n NetworkAgentInfo\n\nBug: 62997041\nBug: 64571917\nTest: runtest frameworks-net\n manually connected to ipv6 network and went to test-ipv6.com\nChange-Id: I889d98e47423ff3d4746d6ed8015b265286e7c52\n" }, { "commit": "20d4df8cc1b42f915e4ab964f9f4fdc374b37aa0", "tree": "d1c65895bd0820214761f5c89eb3604518df0b66", "parents": [ "148414cd2c27434f635ca0c8006dd19ab7ee121d", "aee703e7e4f425203731202e3393a746c8016e21" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 28 22:49:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 28 22:49:50 2017 +0000" }, "message": "Merge \"Nat464Xlat: internal state guards cleanup + state enum\"\nam: aee703e7e4\n\nChange-Id: I188ac4c367db11cb33b67fe92df3a120e3c6fbce\n" }, { "commit": "aee703e7e4f425203731202e3393a746c8016e21", "tree": "22a905b7d67b218b4ba397df6657fbcd753a1c8d", "parents": [ "3c28e2b280eb4fe5be412e80ad4f46800ac5f05c", "4f6f139869ddadf6f9ed50967c106a10a2e8ce3f" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 28 22:30:27 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 28 22:30:27 2017 +0000" }, "message": "Merge \"Nat464Xlat: internal state guards cleanup + state enum\"" }, { "commit": "b6805dc02f0253e3ce0bd681c6362ca71384b438", "tree": "1bce43b63f42748ecd1829585d164e058a5c143c", "parents": [ "639808f1c7e83d3cd4ef743fe105a8fdddd3676a", "81b179cfdda32feac5ab0b7a44f7e7cf2624af3f" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 28 12:01:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 28 12:01:25 2017 +0000" }, "message": "Merge \"Nat464Xlat: clat management cleanup\"\nam: 81b179cfdd\n\nChange-Id: Ic3808a1afe48efac745b1b378fb12cc5678918ec\n" }, { "commit": "81b179cfdda32feac5ab0b7a44f7e7cf2624af3f", "tree": "294c1494af4e778783251ca293e8b999d73b1888", "parents": [ "5fe8e51904a6fc3be25d710cbbd620acdf721a6d", "b577d65825e623a9868664486482ed137b98b504" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 28 11:47:08 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 28 11:47:08 2017 +0000" }, "message": "Merge \"Nat464Xlat: clat management cleanup\"" }, { "commit": "639808f1c7e83d3cd4ef743fe105a8fdddd3676a", "tree": "92bfa1b80ca54147058c41166495ddc85b17b5ea", "parents": [ "c54162d3ff6f528b0ca6387314e9cbfed8691838", "5fe8e51904a6fc3be25d710cbbd620acdf721a6d" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Mon Aug 28 08:11:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 28 08:11:20 2017 +0000" }, "message": "Merge \"switch to native_handle_create() for passing ownership\"\nam: 5fe8e51904\n\nChange-Id: I101de0e7e76f61bd3f05183f4a13ac94c79ae1aa\n" }, { "commit": "5fe8e51904a6fc3be25d710cbbd620acdf721a6d", "tree": "dbf3a121b4e18f7a3fa59344a218d8365035e0f4", "parents": [ "b5b1308f2fdcf2f3f0b6c862e6afa73017f642f9", "f57aeea077ffc8be92ff4d82aaaf1d706b0b5fbd" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Mon Aug 28 08:02:19 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 28 08:02:19 2017 +0000" }, "message": "Merge \"switch to native_handle_create() for passing ownership\"" }, { "commit": "4f6f139869ddadf6f9ed50967c106a10a2e8ce3f", "tree": "3765693d2ab15f15d4e783790224761416743f3e", "parents": [ "b577d65825e623a9868664486482ed137b98b504" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Jun 29 14:04:13 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 28 15:29:27 2017 +0900" }, "message": "Nat464Xlat: internal state guards cleanup + state enum\n\nThis patch does some cleanup of Nat464Xlat internal state guards\nagainst the Nat464Xlat state Idle | Started | Running, which reduces\ncode nesting.\n\nIt also replaces introspection of internal state for distinguishing\nbetween different stages in 464xlat lifecycle with an enum explicitly\nintroducing these three Idle | Started | Running states.\n\nBug: 62997041\nBug: 64571917\nTest: runtest frameworks-net\n manually connected to ipv6 network and went to test-ipv6.com\nChange-Id: I6efc9fed2420ca488731a2b9b9c3c025b16eca10\n" }, { "commit": "b577d65825e623a9868664486482ed137b98b504", "tree": "9c7486f35c24d150a853822af13de49c3e004a9b", "parents": [ "b5b1308f2fdcf2f3f0b6c862e6afa73017f642f9" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jun 27 15:13:20 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 28 15:29:23 2017 +0900" }, "message": "Nat464Xlat: clat management cleanup\n\nThis patch does some minor refactoring of clat starting/stopping code:\n - remove unused LinkProperties arguments in updateClat\n - remove unused Context argument in Nat464Xlat ctor\n - introduce ensureClatIsStarted and ensureClatIsStopped methods and\n simplify updateClat\n - add clatd to NetworkAgentInfo toString() method\n - clarify some comments\n\nThis changes prepare for moving BaseNetworkObserver callbacks to\nConnectivityService.\n\nBug: 62997041\nBug: 64571917\nTest: runtest frameworks-net\n manually connected to IPv6 only network and went to test-ipv6.com\nChange-Id: Idb204784614cfe700f73255a7a7b78c5e9ee6eca\n" }, { "commit": "cf5fa80fbfa3b43875fd5fae1b6c06cf6c6364d2", "tree": "06aaff63ba756edfdf8c31661962dcba82b3f0e9", "parents": [ "49042dc67c6df7177db10ab5c91e062faf1efedd", "0172ce8dbfefcae92c6fb9098bb570244237dfb8" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Aug 25 14:25:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 25 14:25:41 2017 +0000" }, "message": "Merge \"Switch /data/misc/reboot/last_reboot_reason to persistent property\"\nam: 0172ce8dbf\n\nChange-Id: I69a9c17fc8594dee564e8c64e9d85f2afe60607b\n" }, { "commit": "0172ce8dbfefcae92c6fb9098bb570244237dfb8", "tree": "77780ecbc1271d420394bd4b45594349275f2ee5", "parents": [ "3b166fba8abcb0d7f6cb78b87b692c28c381d1ee", "e65c0c61b771f05e9712cbd546f675aa7c380265" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Aug 25 14:16:12 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 25 14:16:12 2017 +0000" }, "message": "Merge \"Switch /data/misc/reboot/last_reboot_reason to persistent property\"" }, { "commit": "f57aeea077ffc8be92ff4d82aaaf1d706b0b5fbd", "tree": "0b66fbcb684873d8f724e5e588922cdc64b9eb3c", "parents": [ "3b166fba8abcb0d7f6cb78b87b692c28c381d1ee" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Aug 23 22:21:57 2017 -0700" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Aug 24 18:33:35 2017 -0700" }, "message": "switch to native_handle_create() for passing ownership\n\nTest: builds\nBug: 29337859\nBug: 32163131\nBug: 64976634\nChange-Id: Ifd064736c9fcb633b72e56e93b7baa5f4a5ff051\n" }, { "commit": "df2a8807757112ca2868120bb09f973511424b77", "tree": "77238cbc0278a234de1bee1f111175d117e4568c", "parents": [ "d3d6ddea9495302db405db296bb0cbf9f214b7b1", "b09cf3fbf1c7e340bc06e8aba06461d4a0bae457" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Aug 24 05:33:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 24 05:33:44 2017 +0000" }, "message": "Merge changes from topic \"offload_cherrypick\"\nam: b09cf3fbf1\n\nChange-Id: Icb4332b34bc8b940a2c30beab143f7136e0178de\n" }, { "commit": "b09cf3fbf1c7e340bc06e8aba06461d4a0bae457", "tree": "e9cfd371696dc622a90bc55bc2ae13505b157ed4", "parents": [ "29b1826ff26fe906ad66778612da7d1caebad963", "b3bb26eaa790cc18f6383387975630c1ae35752a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 24 05:18:23 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 24 05:18:23 2017 +0000" }, "message": "Merge changes from topic \"offload_cherrypick\"\n\n* changes:\n Send add/removeDownstream info to offload HAL\n Don\u0027t completely stop offload if setting data limit fails.\n" }, { "commit": "b3bb26eaa790cc18f6383387975630c1ae35752a", "tree": "16eb52c60ed8164c7905fce7cc90f301d9db8987", "parents": [ "ddce7ee20fcad91bd45f77222d762136587bc192" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jul 06 19:49:35 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Aug 23 20:55:47 2017 -0700" }, "message": "Send add/removeDownstream info to offload HAL\n\nTest: as follows\n - built\n - flashed\n - booted\n - \"runtest frameworks-net\" passed\nBug: 29337859\nBug: 32163131\n\nMerged-In: I0cb81ac054fc2bf6c8b8bfe658e9404a15091d7a\nMerged-In: I7abcdcc2d7d967179c47081a6db2b417164891f3\nChange-Id: I6c59aa7cb80b54f376f294b24c1409710c553d74\n(cherry picked from commit ed962a84122ab950a103fbbc0bf911f61b6b9500)\n" }, { "commit": "ddce7ee20fcad91bd45f77222d762136587bc192", "tree": "57e57476dffa484d7aa43ba93fe158a4b823174e", "parents": [ "ff12ba93765cebbae0d38113b8c9d935f80681f5" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Mon Aug 21 12:34:50 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Aug 23 20:51:35 2017 -0700" }, "message": "Don\u0027t completely stop offload if setting data limit fails.\n\nCurrently, if setting a data limit fails, we completely stop\noffload in order to avoid data overages. However, the next thing\nwe do is try to fetch the stats and crash, because once offload\nis stopped all our local state is cleared.\n\nFix this by fetching stats before we stop offload.\n\nBug: 29337859\nBug: 32163131\nBug: 64867836\nTest: OffloadControllerTest passes\nTest: no crash when disabling wifi tethering with BT tethering active\nMerged-In: I7fc47e60b2da5f39c26fb22c1325618f9948dd38\nMerged-In: I464dd2a6d1996b1cfb8bbf82b6ee453fd0747569\nChange-Id: I260f5450f8b67f055983af68fb23a5f3cfc0bc69\n(cherry picked from commit d743601a002ac12c02da58e92ebd0544ab0b77ea)\n" }, { "commit": "d3d6ddea9495302db405db296bb0cbf9f214b7b1", "tree": "695030167d76dfacff49b4c8bc3161725aec8bde", "parents": [ "bbadcfd315af9933cde7c9e6d291513a0c0edb0f", "29b1826ff26fe906ad66778612da7d1caebad963" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Aug 24 03:46:07 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 24 03:46:07 2017 +0000" }, "message": "Merge \"Make NetworkManagementServiceTest pass again.\"\nam: 29b1826ff2\n\nChange-Id: If7fafa0922fdbc499c0c911a3f88ede9c8a26c1d\n" }, { "commit": "29b1826ff26fe906ad66778612da7d1caebad963", "tree": "686d657548b2d7d7391d3288ebf2bb54f70bf718", "parents": [ "ff12ba93765cebbae0d38113b8c9d935f80681f5", "a086800e0409a74279d1caf4141e5508b6be4aa6" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Aug 24 03:36:20 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 24 03:36:20 2017 +0000" }, "message": "Merge \"Make NetworkManagementServiceTest pass again.\"" }, { "commit": "bbadcfd315af9933cde7c9e6d291513a0c0edb0f", "tree": "61f3578f52a67071236edb42768b224ffe1065f7", "parents": [ "aeb64f7f98e66d992fac4ca70faf67d3a0ebc761", "ff12ba93765cebbae0d38113b8c9d935f80681f5" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Aug 24 02:52:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 24 02:52:42 2017 +0000" }, "message": "Merge \"Tethering offload stats updates are eventually consistent\"\nam: ff12ba9376\n\nChange-Id: I3a8ddc928b60c666faab2991defe8fb7afd0801e\n" }, { "commit": "752c1287bd8424ff29800a06cd0ac92d71442a58", "tree": "1a739b778064abc383ca510d32c24621354e5c88", "parents": [ "899398113a0f27c42baba70d27343a4412fec71f" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Aug 22 13:57:41 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Aug 23 09:58:09 2017 +0900" }, "message": "Tethering offload stats updates are eventually consistent\n\nThis patch removes the call to runWithScissors() in\nOffloadController#getTetherStats() that was causing a deadlock when\nNetworkStatsService would be polled for stats in certain threading\ncontexts.\n\nInstead of trying to query the tethering offload HAL synchronously all\nthe time, this patch:\n - changes getTetherStats() to only call into the offload HAL when it\n detects that it is called on the same thread as the Tethering handler\n thread.\n - changes the map of interface to accumulated tethering forwarded stats\n to be concurrent.\n\nThis makes stats reading from getTetherStats() eventually consistent.\nFrom the point of view of getTetherStats(), it preserves the guarantees\nthat tethering stats are monotonically increasing, and also guarantees\nno tearing between rx bytes and tx bytes.\n\nBug: 29337859\nBug: 32163131\nBug: 64771555\nTest: runtest frameworks-net\nMerged-In: Ibcd351ad0225ef146b00a807833f76d2a886f6c1\nMerged-In: I61786d61fe1422e429c0dd9eadaff6f02eb850e7\nMerged-In: I999d1d1bf72e7ab02c5d17f37aad00bc711d3fc5\n\n(cherry pick from commit eb5e465edd78bea26289f779b635c7e94d934854)\n\nChange-Id: I28646b962cee8c8a6efd66059f84873c02ac5810\n" }, { "commit": "a086800e0409a74279d1caf4141e5508b6be4aa6", "tree": "9d815d6fe3d19d6e8ed7ba66297e6bbdc056668b", "parents": [ "899398113a0f27c42baba70d27343a4412fec71f" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Jul 11 02:29:28 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Aug 23 09:49:05 2017 +0900" }, "message": "Make NetworkManagementServiceTest pass again.\n\n1. Mock the service manager so that NMS can fetch mock versions\n of INetd and IBatteryStats.\n2. Call LocalServices.removeServiceForTest to avoid a duplicate\n service registration error. // check this\n3. Change the timeout from 100ms to 200ms, as otherwise the tests\n that check for IfaceClass fail.\n4. Convert NetworkManagementServiceTest to JUnit 4.\n5. Move NetworkManagementServiceTest to tests/net\n\nBug: 29337859\nBug: 32163131\nBug: 32561414\nBug: 62918393\nTest: runtest frameworks-net\nChange-Id: Ic7371b427b35809ccd446addf35c9d8ae99ccfd3\n" }, { "commit": "e65c0c61b771f05e9712cbd546f675aa7c380265", "tree": "96bb8d38ba4463d8259910532e175edeee232bed", "parents": [ "b056324630b8adfeb38393bcab49f3b9c720f4fd" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Aug 15 07:53:47 2017 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Aug 22 13:29:27 2017 -0700" }, "message": "Switch /data/misc/reboot/last_reboot_reason to persistent property\n\nSwitch from /data/misc/reboot/last_reboot_reason to persistent\nAndroid property persist.sys.boot.reason for indicating why the\ndevice is rebooted or shutdown.\n\npersist.sys.boot.reason has a standard as outlined in b/63736262 and\nthe associated investigation. Made adjustments to the values so that\nwe did not create a problem even before we started. Compliance is\npart of the tests in boot_reason_test.sh.\n\nTest: system/core/bootstat/boot_reason_test.sh\nBug: 64687998\nChange-Id: Iba69acf2105f4446411d86cdb8097a1755a20f15\n" }, { "commit": "28f7ed5d3411cde0d6b21c0fc8b845aae04e2752", "tree": "5c5329230597fb6ae84ccb4314c5785d8d1209a3", "parents": [ "3f6eff5d5dbae8ad7ff74c4009431b7deedd593a", "dc46874c512936812fff68c36545178160d4adba" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 22 07:09:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 22 07:09:06 2017 +0000" }, "message": "Merge \"Fix transitioning between non-accept strict policies.\" am: bef2c91bb5 am: 345a2f98a1\nam: dc46874c51\n\nChange-Id: I46ee39bcf10e54f29ac65ad744dde7d399bec522\n" }, { "commit": "dc46874c512936812fff68c36545178160d4adba", "tree": "e36e181b3bc321c5a771d68b9385fa65c63ad165", "parents": [ "cee5738da206d6cf60f1418d7d1142f4afa96ee3", "345a2f98a15224d8471d99ff0bf1fdc08c31ab34" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 22 06:53:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 22 06:53:41 2017 +0000" }, "message": "Merge \"Fix transitioning between non-accept strict policies.\" am: bef2c91bb5\nam: 345a2f98a1\n\nChange-Id: If603d5c8f73d69ef50617a0ee25721468c136630\n" }, { "commit": "345a2f98a15224d8471d99ff0bf1fdc08c31ab34", "tree": "03758c72035f5800ab56ded07490c048b05a14ec", "parents": [ "c6a9b5564a066164ea9e09616fd45f1e94d305b0", "bef2c91bb5efdfc7d480389df9e9b9556a218600" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 22 06:42:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 22 06:42:19 2017 +0000" }, "message": "Merge \"Fix transitioning between non-accept strict policies.\"\nam: bef2c91bb5\n\nChange-Id: Iacf9f43f88ac77cb2a6094348cf52107f7ef0817\n" }, { "commit": "bef2c91bb5efdfc7d480389df9e9b9556a218600", "tree": "bed239cc8e286ee6f372eac4043f3afc1d1a8e9e", "parents": [ "5b218bdc8e41be24fed309a77059a587c236e3ad", "26364f1dea5f244f87d39615438266ef7eb3f28f" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 22 06:28:30 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 22 06:28:30 2017 +0000" }, "message": "Merge \"Fix transitioning between non-accept strict policies.\"" }, { "commit": "f7c02563ee7141b1d10762939a9539383df24985", "tree": "0ebdd2f6d8eafbef21c877ab52b5928c6413f9f1", "parents": [ "b9fc12d1d2fd709f2d582639fe9d911abb80f6d3", "e869136a54381b35abb117d6310b31de82e3a80d" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 21 12:29:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 21 12:29:53 2017 +0000" }, "message": "Merge \"IpManager: use InitialConfiguration for provisioning\" am: 5b218bdc8e am: c6a9b5564a\nam: e869136a54\n\nChange-Id: I8e9c6de63697b8c3f41480d69309360763119838\n" }, { "commit": "e869136a54381b35abb117d6310b31de82e3a80d", "tree": "502c549ec22f151cffe6a4fefb34d6d35f34b92a", "parents": [ "4fa01870157dc5c372bc7ce61d7aec2215737047", "c6a9b5564a066164ea9e09616fd45f1e94d305b0" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 21 12:19:08 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 21 12:19:08 2017 +0000" }, "message": "Merge \"IpManager: use InitialConfiguration for provisioning\" am: 5b218bdc8e\nam: c6a9b5564a\n\nChange-Id: I6e42d26ae430c213f65e466a2c556760ff0e14eb\n" }, { "commit": "c6a9b5564a066164ea9e09616fd45f1e94d305b0", "tree": "76fb29b3613676051fb9dbc245fa4241a935f96f", "parents": [ "9335d2d0b114e9b7c5f5af634390daa609196a12", "5b218bdc8e41be24fed309a77059a587c236e3ad" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 21 12:08:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 21 12:08:28 2017 +0000" }, "message": "Merge \"IpManager: use InitialConfiguration for provisioning\"\nam: 5b218bdc8e\n\nChange-Id: I131589680b68222e4fda4e9165ac2f50894ee28e\n" }, { "commit": "d00ddf567235e20bcbdc527ae20824fa944c3a64", "tree": "2b6e1ec60f2bf5d35a6bd518b4f5a87b07f60b45", "parents": [ "23868e9c0976acd0d44e8bdc22b690e9b9ef8662" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Aug 08 13:08:06 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Mon Aug 21 16:00:31 2017 +0900" }, "message": "IpManager: use InitialConfiguration for provisioning\n\nThis patch changes IpManager to take into account static provisioning\ninformation specified in the InitialConfiguration for IPv6 static\nconfiguration.\n\nWhen a valid InitialConfiguration with IPv6 content is specified,\nIpManager will do the following things:\n\n- at start(), it will push the IPv6 addresses in the config to netd\n- it will observe all addresses be notified via Netlink\n- when all addresses are there, it will patch in the associated IPv6\n routes in the config, so that they get passed to ConnectivityService\n through the usual mechanism\n\nThe logic triggering onProvisioningSuccess is also changed to take into\naccount InitialConfiguration: when all addresses and all routes in the\nconfig are seen the provisioning is successful.\n\nBug: 62988545\nTest: runtest frameworks-net, with newly added tests\nChange-Id: I77ed7c576c4b198de7a4726be70c78b74689e98b\n" }, { "commit": "26364f1dea5f244f87d39615438266ef7eb3f28f", "tree": "be1f80b3b046bd7a8e8168eebe078ce312324f86", "parents": [ "f1912ca49ac0f5bcdad063a7c042153ba791145d" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sun Aug 20 11:54:57 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sun Aug 20 12:16:29 2017 +0900" }, "message": "Fix transitioning between non-accept strict policies.\n\nhttps://android-review.googlesource.com/438278/ attempted\nto fix changing between two non-accept StrictMode policies (which\nis not supported by netd) by ensuring that if neither the old nor\nthe new policy were accept, we\u0027d first set an accept policy.\n\nUnfortunately, while this is what the comment says, what the\ncode actually does is send the new policy twice. Fix the code to\nmatch the comment and the intent of the CL.\n\nWhile I\u0027m at it, also move applyUidCleartextNetworkPolicy into\nthe synchronized block, so multiple concurrent calls to\nsetUidCleartextNetworkPolicy don\u0027t result in NMS state going out\nof sync with netd state.\n\nBug: 28362720\nTest: builds\nChange-Id: I8d876ba0786c4d6325d26a84378fc6afcf47ab84\n" }, { "commit": "b9fc12d1d2fd709f2d582639fe9d911abb80f6d3", "tree": "7cdd534f5df36ab43de0a2bff9baa52cf954ffe7", "parents": [ "c61e1cca859bcdd6d80d2a41b7e60750a9ad4092", "4fa01870157dc5c372bc7ce61d7aec2215737047" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sat Aug 19 03:38:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Aug 19 03:38:10 2017 +0000" }, "message": "Merge changes I325b13d5,I89719fe7 am: 23868e9c09 am: 9335d2d0b1\nam: 4fa0187015\n\nChange-Id: Ib980879b0e50ffe1c8209339df22da4a50d5b74e\n" }, { "commit": "4fa01870157dc5c372bc7ce61d7aec2215737047", "tree": "f112d5aff39ff63e4dd19d023cab036ad3c460c6", "parents": [ "beae6211027dc286d7e0a2192e9a17e5d9ae9167", "9335d2d0b114e9b7c5f5af634390daa609196a12" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sat Aug 19 03:25:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Aug 19 03:25:21 2017 +0000" }, "message": "Merge changes I325b13d5,I89719fe7 am: 23868e9c09\nam: 9335d2d0b1\n\nChange-Id: Iac0d1a08c45816f32b0f8ab81a079883a9965e21\n" }, { "commit": "9335d2d0b114e9b7c5f5af634390daa609196a12", "tree": "e9e3179279cc4d96a2fe1e77246bf26c680a6b9b", "parents": [ "461f4eb09929138cc8ee0070b3f0a0b5b68c4468", "23868e9c0976acd0d44e8bdc22b690e9b9ef8662" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sat Aug 19 03:15:08 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Aug 19 03:15:08 2017 +0000" }, "message": "Merge changes I325b13d5,I89719fe7\nam: 23868e9c09\n\nChange-Id: Iaced543ab17ea87c8f701975764d957bc1b17fc7\n" }, { "commit": "23868e9c0976acd0d44e8bdc22b690e9b9ef8662", "tree": "8dd5e0d1134eb78aac6f57d9acfb23cc1d2bf12f", "parents": [ "cb3c24e36b9efad8adeb72b5f814bf35c5db60bb", "f1912ca49ac0f5bcdad063a7c042153ba791145d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Aug 19 03:05:14 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Aug 19 03:05:14 2017 +0000" }, "message": "Merge changes I325b13d5,I89719fe7\n\n* changes:\n Add tether offload traffic to interface stats as well.\n Tell the system when tethering offload hits a limit.\n" }, { "commit": "f1912ca49ac0f5bcdad063a7c042153ba791145d", "tree": "fb57a8fedcb219224f8d44796c3998c383961cdc", "parents": [ "9f0baa94ca28f67e162d3ad04ca6d0e17ee5e314" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Aug 17 19:23:08 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sat Aug 19 10:12:05 2017 +0900" }, "message": "Add tether offload traffic to interface stats as well.\n\nCurrently, we only count add tethering traffic to per-UID\nstats, but not to total data usage (i.e., dev and XT stats). This\nis correct for software tethering, because all software forwarded\npackets are already included in interface counters, but it is\nincorrect for hardware offload, because such packets do not\nincrement interface counters.\n\nTo fix this:\n1. Add an argument to ITetheringStatsProvider#getTetherStats to\n indicate whether per-UID stats are requested. For clarity,\n define integer constants STATS_PER_IFACE and STATS_PER_UID\n to represent these operations.\n2. Make NetdTetheringStatsProvider return stats only if per-UID\n stats are requested. (Otherwise tethering traffic would be\n double-counted).\n3. Make OffloadController\u0027s stats provider return the same\n stats regardless of whether per-UID stats were requested or\n not.\n4. Make NetworkStatsService add non-per-UID tethering stats to\n the dev and XT snapshots. The per-UID snapshots were already\n correctly adding in per-UID stats.\n\n(cherry picked from commit 5356a35c3bcfcdf2d184c620af6bfbf9bddf35c5)\n\nBug: 29337859\nBug: 32163131\nTest: runtest frameworks-net\nTest: runtest frameworks-telephony\nChange-Id: I325b13d50e88841dfb0db4c35e7e27f163ee72fe\nMerged-In: I4e8e923d68dce1a4a68608dbd6c75a91165aa4ee\n" }, { "commit": "9f0baa94ca28f67e162d3ad04ca6d0e17ee5e314", "tree": "34ed3ff01daf584a939968052cdf4094eb9474f0", "parents": [ "deb4eb5d05ccf983adcb7252c98c2580a8a36c60" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 15 19:25:51 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sat Aug 19 00:15:31 2017 +0900" }, "message": "Tell the system when tethering offload hits a limit.\n\nAdd a new tetherLimitReached method to INetworkManagementService,\nand call it when the HAL notifies OffloadController because the\nlimit has been reached.\n\nBug: 29337859\nBug: 32163131\nTest: builds\nTest: OffloadControllerTest passes\n\n(cherry picked from commit d66cf56ba662f10f2da1d0f844116632ad0a0dbb)\n\nChange-Id: I89719fe7ec8bfd3c85d6cdca9c0d449aea86ef9d\nMerged-In: I026e6aa9e7b371f316c0d97c3cf5e78abc1f5263\n" }, { "commit": "c61e1cca859bcdd6d80d2a41b7e60750a9ad4092", "tree": "73cbdbf59e8f0c7eaf25c01a029ffafe8aa94a43", "parents": [ "0cc9d26dff8644ff6b800528e96580359f515b96", "beae6211027dc286d7e0a2192e9a17e5d9ae9167" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Aug 18 12:25:56 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 18 12:25:56 2017 +0000" }, "message": "Merge \"Really allow NetworkAgent immutable updates to NetworkCapabilities\" am: cb3c24e36b am: 461f4eb099\nam: beae621102\n\nChange-Id: If3742ea0e2151b9b710eda2fed280c31f7960393\n" }, { "commit": "beae6211027dc286d7e0a2192e9a17e5d9ae9167", "tree": "fd29a5734db89d350ad35059b182932144ab35ca", "parents": [ "d47339389efb9febb5ea95f93174a3a89861c7ab", "461f4eb09929138cc8ee0070b3f0a0b5b68c4468" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Aug 18 12:14:56 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 18 12:14:56 2017 +0000" }, "message": "Merge \"Really allow NetworkAgent immutable updates to NetworkCapabilities\" am: cb3c24e36b\nam: 461f4eb099\n\nChange-Id: Id352fdb6da21a2150d3e8d062d7eba11878f6919\n" }, { "commit": "461f4eb09929138cc8ee0070b3f0a0b5b68c4468", "tree": "fa6891fd4f79f271dec918888914fe3842c65829", "parents": [ "f7149eb698c4b624c75f3f3a8b1a1b3093efbf8b", "cb3c24e36b9efad8adeb72b5f814bf35c5db60bb" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Aug 18 11:59:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 18 11:59:02 2017 +0000" }, "message": "Merge \"Really allow NetworkAgent immutable updates to NetworkCapabilities\"\nam: cb3c24e36b\n\nChange-Id: Ifbdd005576b3f0fbf278ecec81ce3e4308c6276d\n" }, { "commit": "a60c6eab42cd904faaf26c23100939d397b80c39", "tree": "badd1cdb4baddccc71e654743f89071a17cc8675", "parents": [ "b7cbb2fe49c5d5535924c4ba255d92ba57a4c3c6" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Aug 18 14:41:22 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Aug 18 14:51:03 2017 +0900" }, "message": "Really allow NetworkAgent immutable updates to NetworkCapabilities\n\nThis patch completes commit bae105a5ccd11430bab14721d1325e2303a673da to\nreally allow updates of immutable capabilities to NetworkCapabilities of\nNetworkAgents by using satisfiedByImmutableNetworkCapabilities instead\nsatisfiedByNetworkCapabilities.\n\nBug: 64125969\nTest: runtest frameworks-net\nChange-Id: I9beeb623792f0ee31abcd4ba9d0ba2451304fb2e\n" }, { "commit": "4515fb8e9c58e7ca0374755c90c02349dc90cf74", "tree": "b162b3d78cb757bf6ba7b52e356e71452220cb56", "parents": [ "915c02c96ab9322377d0bb987ce8f2831e21eb0b", "07a21754f45672b27e765d8c7677c9663c6dce91" ], "author": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Fri Aug 18 00:49:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 18 00:49:15 2017 +0000" }, "message": "Merge \"Fix race condition of removing surface.\" into oc-dev\nam: 07a21754f4\n\nChange-Id: I1358805c52332bc79810117a6d0407273cae0ed7\n" }, { "commit": "07a21754f45672b27e765d8c7677c9663c6dce91", "tree": "17a9982475c219a3dfe906ffd89acb6a662099f2", "parents": [ "c9a9fcdcd3693e8079ddfc4063c3a83edb379d3a", "0bf3dc9822a4817b1fea1d819ab7abf61013ad8b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 18 00:40:55 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 18 00:40:55 2017 +0000" }, "message": "Merge \"Fix race condition of removing surface.\" into oc-dev" }, { "commit": "d4a5b56c416b245949a34955d80f4330577b2b03", "tree": "49c792975639b73f9e39832f2c3b1bb05d3b2d23", "parents": [ "acc598f7b48f0c8051ab8b96a4b5c33b52384ba8", "598c497be3c6a9ac4bcb1f574adda336e88c9428" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Aug 17 05:58:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 17 05:58:50 2017 +0000" }, "message": "Maps crashed entering PIP right after...\nam: 598c497be3\n\nChange-Id: I724ffe7d4b41cbd83a10bef4c78fa461633972e2\n" }, { "commit": "598c497be3c6a9ac4bcb1f574adda336e88c9428", "tree": "a4df3317d4c96b9a70bfb06f47fa98305fe4f7ea", "parents": [ "c6349f39438fa815d0409e3d25ffd48d0aec4c53" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jul 31 13:56:02 2017 -0700" }, "committer": { "name": "Amit Pawar", "email": "amitpawar@google.com", "time": "Thu Aug 17 05:17:40 2017 +0000" }, "message": "Maps crashed entering PIP right after...\n\n...beginning navigation\n\nBug: 64140901\n\nTest: booted and ran and posted notifications.\n\nMerged-In:I8c9173dab2716b901cc6dd66f0b0d18cae33f298\nChange-Id: I8c9173dab2716b901cc6dd66f0b0d18cae33f298\n(cherry picked from commit 52195a66311d79a2f57e8112db86d48ed15bf915)\n" }, { "commit": "acc598f7b48f0c8051ab8b96a4b5c33b52384ba8", "tree": "ab983f2751a4044a807e4166adcdf2f552208ede", "parents": [ "9706d8000bdf7090fcc0257a1de417b2a2156829", "c6349f39438fa815d0409e3d25ffd48d0aec4c53" ], "author": { "name": "Vineeta Srivastava", "email": "vsrivastava@google.com", "time": "Thu Aug 17 03:17:12 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 17 03:17:12 2017 +0000" }, "message": "Merge \"Add new \"fast\" filter for ambient light.\" into oc-dr1-dev\nam: c6349f3943\n\nChange-Id: Ief4db995648882e480719941680f55012208a0ff\n" }, { "commit": "0a933141e2dd72bc868598cfa2146b2c72b85d5d", "tree": "9061bd972f697cac9955d2a8ed2fcd1615fd90e0", "parents": [ "1c414bf30b51a27eb96ffa728fb513c4505296b2" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Wed Aug 16 20:38:21 2017 +0100" }, "committer": { "name": "Vineeta Srivastava", "email": "vsrivastava@google.com", "time": "Thu Aug 17 01:10:42 2017 +0000" }, "message": "Add new \"fast\" filter for ambient light.\n\nThe slow filter wasn\u0027t converging fast enough when we shortened the\ndebounce timings but we still want it to ensure there\u0027s a long term\nchange happening, so add a new filter that converges much faster. This\nnew fast filter is just a weighted sliding window just like the slow\nfilter, but it has a significantly smaller horizon.\n\nBug: 64514692\nTest: manual\nChange-Id: I1e990ac1e6a56268fa42a85399a2d41cc8dd2104\n" }, { "commit": "222941267d12e437b429d611383e4584c201d188", "tree": "b3586b18fefe6d2e9bc34ca82bbcb73e3e1e060d", "parents": [ "3d042d2d3946d98252e4d70a9e1d691968db82d0", "445a6d42effa9e75ff608cd04f3ddacb31bc5094" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Thu Aug 17 00:54:37 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 17 00:54:37 2017 +0000" }, "message": "Merge \"Optionally append managed service approvals\" into oc-dr1-dev\nam: 445a6d42ef\n\nChange-Id: I7a39822f2bef0838cfe63d44646f513539d90c5c\n" }, { "commit": "445a6d42effa9e75ff608cd04f3ddacb31bc5094", "tree": "d8e140085fed368e1c019a975860d71faf923e70", "parents": [ "8d272b9dd5cd1831da63872139519d3d84430175", "00004c44d73f7f46e8f25188403ca17a70edea8f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 17 00:31:42 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 17 00:31:42 2017 +0000" }, "message": "Merge \"Optionally append managed service approvals\" into oc-dr1-dev" }, { "commit": "00004c44d73f7f46e8f25188403ca17a70edea8f", "tree": "381778e1a8bd28a4b6fba222422e7c129f3cf5e9", "parents": [ "8d7cd4bcaa126eca061c49a32cb8e7a6ec17e88b" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Tue Aug 15 14:43:00 2017 -0400" }, "committer": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Wed Aug 16 20:58:49 2017 +0000" }, "message": "Optionally append managed service approvals\n\nIf the backup comes from a pre O device, don\u0027t wipe\npreexisting managed service grants (which were introduced in O).\n\n\nMerged-In: I142df7acb11309bc4f5f185e45a1f91f86d0334a\nMerged-In: Ie569972dc0d076718a3a9c59e1ebd942c5bfa987\nTest: manual, restore from N to O DR\nBug: 64232609\nChange-Id: Ieec2c821d9a088c69a5bc143acf8537ba300202d\n" }, { "commit": "85f81a6b62fc98fb6b22fefa5415a8bb191d6b5d", "tree": "30921715fa259014876de4cbefe3d241176a1770", "parents": [ "7d0dcbb13da9afa7b09558c3e8b19286956c73db", "9fd497cdaef83fa4f8ff01d5dca1b365b0855168" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Aug 16 19:57:33 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 19:57:33 2017 +0000" }, "message": "Merge \"Fix sync back-off\" into oc-dr1-dev\nam: 9fd497cdae\n\nChange-Id: I3b64f7eed95f3fb1670e9fdf4f3825b1deeddfad\n" }, { "commit": "9fd497cdaef83fa4f8ff01d5dca1b365b0855168", "tree": "78a53a1ca46aebf9125d57be65987781ad5d73f4", "parents": [ "d6d6d2cf797c481c9acfceea4b65bf43af934443", "9243d9ca063d9ceb3d8a71f242e1e2facd122383" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 16 19:41:53 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 16 19:41:53 2017 +0000" }, "message": "Merge \"Fix sync back-off\" into oc-dr1-dev" }, { "commit": "7745a7975f23577db755cb03f50df038f21d00a3", "tree": "6234acbdabe414b9b9d0ba7a883a990f79d86154", "parents": [ "e9291de0c45e0b07f58981e0940d650f5e7ce9cc", "759696c47cf2fd2276f305a94a3e27494d3417af" ], "author": { "name": "Di Lu", "email": "ludi@google.com", "time": "Wed Aug 16 17:12:05 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 17:12:05 2017 +0000" }, "message": "Merge \"Add user quota information into the IpSecService dump\" am: fedd856546 am: 5bef43fb64\nam: 759696c47c\n\nChange-Id: I8f958d4967e02a58d8baf7b4a4058cf15ca50cc6\n" }, { "commit": "759696c47cf2fd2276f305a94a3e27494d3417af", "tree": "3cd567a6937fc73bcc8d1cdc9cfab925dbfa59b4", "parents": [ "4d7787a310f140061ed3e22820b8248997641820", "5bef43fb64b2002d33b64f0a0bbbeb2cf80dd7ee" ], "author": { "name": "Di Lu", "email": "ludi@google.com", "time": "Wed Aug 16 16:59:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 16:59:47 2017 +0000" }, "message": "Merge \"Add user quota information into the IpSecService dump\" am: fedd856546\nam: 5bef43fb64\n\nChange-Id: Ie9900672ab24be1687bbd605b2f6993dd8acaa49\n" }, { "commit": "5bef43fb64b2002d33b64f0a0bbbeb2cf80dd7ee", "tree": "30882d09da57b77a397f7be6af1bf6be601ff9d6", "parents": [ "ea2defe62b6909d4fe92d1a9c6a3bdc439dd0f8a", "fedd8565464826be4396e493a2a84b86fe7ff169" ], "author": { "name": "Di Lu", "email": "ludi@google.com", "time": "Wed Aug 16 16:33:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 16:33:18 2017 +0000" }, "message": "Merge \"Add user quota information into the IpSecService dump\"\nam: fedd856546\n\nChange-Id: I1f64ab03918ece154fe31a07b698825315d39c0f\n" }, { "commit": "fedd8565464826be4396e493a2a84b86fe7ff169", "tree": "6d9644459901b082a60ced75ed3661f1ca6ae234", "parents": [ "2ad60c88f12d8150758902f2ff4f10f64ab6c17b", "3e5ea23673ddc2f85c8253e1f67722e8c6557917" ], "author": { "name": "Di Lu", "email": "ludi@google.com", "time": "Wed Aug 16 16:20:18 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 16 16:20:18 2017 +0000" }, "message": "Merge \"Add user quota information into the IpSecService dump\"" }, { "commit": "cd7393c641e5cec6cf009e5ce227e59155e9fb00", "tree": "d6ac3f2df305e2debbfcb858f6521d4cc09ece1c", "parents": [ "68f48673c7e9e1295881b3e8a253959eded61c0f", "f2ac860b7c2c43a5166916dd97746c048a1a9f73" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Aug 16 12:14:09 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 12:14:09 2017 +0000" }, "message": "Merge \"Allow NetworkAgent \"immutable updates\" to NetworkCapabilities\" am: b35719a057 am: 2f9fd9df23\nam: f2ac860b7c\n\nChange-Id: I01e287b4df82a53a522566d33b3166f7801badca\n" }, { "commit": "f2ac860b7c2c43a5166916dd97746c048a1a9f73", "tree": "4ced9c2656fae07cd74dd948dbf2c6e9e73af3c5", "parents": [ "7e9f379b506bad65e95f9815f5f99053ede47eed", "2f9fd9df233acbe9e2fad3f6c55be36ce2652082" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Aug 16 12:04:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 12:04:38 2017 +0000" }, "message": "Merge \"Allow NetworkAgent \"immutable updates\" to NetworkCapabilities\" am: b35719a057\nam: 2f9fd9df23\n\nChange-Id: Ied592bf6112574399a1e808da337004e1c35f244\n" }, { "commit": "2f9fd9df233acbe9e2fad3f6c55be36ce2652082", "tree": "f20fc08fb6a35e5cc89f38d306f3ab84947e3ef9", "parents": [ "b943ccef3c45746872b8181fca2670eee360b175", "b35719a057852f476efa5a6feb56b1cc8ddae25d" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Aug 16 11:50:55 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 11:50:55 2017 +0000" }, "message": "Merge \"Allow NetworkAgent \"immutable updates\" to NetworkCapabilities\"\nam: b35719a057\n\nChange-Id: I0ab76de59e87c46a6961229399ff7200bce49838\n" }, { "commit": "b35719a057852f476efa5a6feb56b1cc8ddae25d", "tree": "c949e50a3e91814c258d475958fc3fdb7e2261c7", "parents": [ "53e82a9cd03f34ecd8a9561fbc9d290d110abff6", "bae105a5ccd11430bab14721d1325e2303a673da" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 16 11:34:24 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 16 11:34:24 2017 +0000" }, "message": "Merge \"Allow NetworkAgent \"immutable updates\" to NetworkCapabilities\"" }, { "commit": "bae105a5ccd11430bab14721d1325e2303a673da", "tree": "b0d952e4e15240b8868da9768e96bcdd37d1672d", "parents": [ "c06dbc114f839112f1132e1e0edac8533b3f4c54" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Aug 16 13:19:04 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Aug 16 18:30:30 2017 +0900" }, "message": "Allow NetworkAgent \"immutable updates\" to NetworkCapabilities\n\nThis patch loosens the validation checks when a NetworkAgent updates it\nNetworkCapabilities: instead of checking that capabilities labeled as\n\"immutable\" stay identical across updates, it is now accepted to change\nimmutable capabilities in a way that the new NetworkCapabilities\nsatisfies the old NetworkCapabilities.\n\nThis allows a NetworkAgent to update itself in order to match more\nrequests, but will still catch NetworkAgents that sends degradation\nupdates causing potentially requests to not match anymore.\n\nBug: 64125969\nTest: runtest frameworks-net\nChange-Id: I2a1b3f9c0be6415e40edc989d0c1b03b5631f7b1\n" }, { "commit": "68f48673c7e9e1295881b3e8a253959eded61c0f", "tree": "9dfc35b2d1dfaecd5622202d697f749ce968d6c5", "parents": [ "305151cbae750de4c6960bca434f949e7bff6013", "44cab75cb0ec40368597180e06d6d037a76ef41a" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Wed Aug 16 06:28:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 06:28:47 2017 +0000" }, "message": "Merge \"Limit black background to only base and starting windows\" into oc-dr1-dev\nam: 44cab75cb0\n\nChange-Id: Ib835633e719cb21efa495ddb5cd749ad60014ce3\n" }, { "commit": "44cab75cb0ec40368597180e06d6d037a76ef41a", "tree": "474b5d19bf9c08ec0a9c12a1295cb5fde08aa52f", "parents": [ "87a264dfdeef1c638095bde254ac6659e440172e", "e3332341c34893eafbb1c3cd786f1e3779c79411" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Wed Aug 16 06:20:59 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 16 06:20:59 2017 +0000" }, "message": "Merge \"Limit black background to only base and starting windows\" into oc-dr1-dev" }, { "commit": "305151cbae750de4c6960bca434f949e7bff6013", "tree": "3859b103d70ef740279b36dd4d58ca9aba75e184", "parents": [ "ab380663bf1dc6cc5141229adea43bd092431062", "87a264dfdeef1c638095bde254ac6659e440172e" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Aug 16 02:42:56 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 02:42:56 2017 +0000" }, "message": "AudioService: device connection intent: never send null action\nam: 87a264dfde\n\nChange-Id: I091ee6e837a42a8a330022db9b9b64a1789469dd\n" }, { "commit": "e3332341c34893eafbb1c3cd786f1e3779c79411", "tree": "ea5c574c0c3109b9e624da0ee7793cda6926b646", "parents": [ "a3c2cee05562838cf64e7d0946b2ea66e6541304" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Tue Aug 15 17:49:24 2017 -0700" }, "committer": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Tue Aug 15 18:59:14 2017 -0700" }, "message": "Limit black background to only base and starting windows\n\nShow black background behind nav bar only behind windows\nwith type TYPE_APPLICATION_STARTING or TYPE_BASE_APPLICATION,\nwhich corresponds to main window of an activity.\n\nBug: 64711770\nTest: Go to Wallpapers app, select a static one, click \"set\" and check the background of the dialog.\nTest: Open letterboxed app, go to/from Recents.\nChange-Id: I42357a5df70b5dd58b422f31704c71d36074a50c\n" }, { "commit": "87a264dfdeef1c638095bde254ac6659e440172e", "tree": "20b774a6bc525799a7f2b90507b2897dccf46fc5", "parents": [ "a3c2cee05562838cf64e7d0946b2ea66e6541304" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Aug 15 17:52:22 2017 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Aug 15 18:07:36 2017 -0700" }, "message": "AudioService: device connection intent: never send null action\n\nChange 145c95342c9c removed a test on the type of device for which\n a ACTION_HEADSET_PLUG intent is broadcast. As a result, for some\n devices (e.g. DEVICE_OUT_USB_DEVICE), there is a code path in\n AudioService.sendDeviceConnectionIntent() where the intent\u0027s\n action is not set, causing a WTF exception to be thrown for\n the broadcast.\nThe fix consists in always checking that the intent will be sent\n with a non-null action.\n\nTest: connect a USB device recognized as DEVICE_OUT_USB_DEVICE\nBug: 64724117\nChange-Id: Ib2a486d1fabbde58d6a8f8370d5803c694977ee1\n" }, { "commit": "9243d9ca063d9ceb3d8a71f242e1e2facd122383", "tree": "51e8f7b88f9dd87a7e6cc980ce2427d7e3a70105", "parents": [ "b60e1c037a0e0793f838024a2506c58f6bf46bb3" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Tue Aug 15 14:56:47 2017 -0700" }, "committer": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Tue Aug 15 23:41:05 2017 +0000" }, "message": "Fix sync back-off\n\nCL Ifb2fc5207 affected multiple different scenario:\na) When a sync finished successfully\nb) When a sync finished with a failure\nc) When a sync is canceled by the sync manager\n\nAmong those, c) was the actual fix for b/63773598, and the change was supposed\nto not change the actual behavior of a) and b).\n\nHowever it turned out it was breaking b) by interfering back-off scheduling.\n\nThis change will revert Ifb2fc5207 for a) and b) to restore the original\nbehavior with keeping the fix fo C.\n\nBug: 63773598\nBug: 64597061\nTest: Manual test with test app.\nChange-Id: I34e5945a7a67d55cd6138f758e97d724d4b9d4b5\n" }, { "commit": "688155cac31ba5ad9a4b4dd2f3cd64290bf24610", "tree": "ce3623f717a6263c3cddc3ff673a9b6ab788f7ce", "parents": [ "8a661ee24803525d6cf04bd5e58f1b0366f56551", "3289a5a1e0cee3e9f20769f6036a3c6ae3d7c88a" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Tue Aug 15 16:33:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 15 16:33:13 2017 +0000" }, "message": "Merge \"Place black background only behind nav bar when letterboxed\" into oc-dr1-dev\nam: 3289a5a1e0\n\nChange-Id: Ic1a1c1a1d023e0da39a11b4213a2276bbb42cbd6\n" }, { "commit": "3289a5a1e0cee3e9f20769f6036a3c6ae3d7c88a", "tree": "bbd15fd047b5fb03ef081a6135f6efadfd4729d7", "parents": [ "684b056531e7a7411d85b77290751ee0f13819b2", "06ab1e14eb343d45f4b51ff41c62a417ee9e5f51" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Tue Aug 15 16:26:04 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 15 16:26:04 2017 +0000" }, "message": "Merge \"Place black background only behind nav bar when letterboxed\" into oc-dr1-dev" }, { "commit": "20fa45e3a91216b13680efca764ac455b488d176", "tree": "5064409cdd762bbfa8ca073e0e50bda9da29d616", "parents": [ "1f1d124bfea987f39b82914a722628a53ceef6ec", "0cf31d4d6d22936f9f0a6aed004f95ff6f43e169" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 15 02:25:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 15 02:25:36 2017 +0000" }, "message": "Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf\nam: 0cf31d4d6d\n\nChange-Id: I759ed9a79b6ebfa2ae6143167c0dd7d0ad84c67f\n" }, { "commit": "0cf31d4d6d22936f9f0a6aed004f95ff6f43e169", "tree": "018cf777de11386920b74865c64986e982b28b39", "parents": [ "c04cc3bb7e0aa75ef3976857260482a5095e12a1", "51c3d6a8bf86c3b0326e09f67b17876e39f800c8" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 15 02:16:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 15 02:16:18 2017 +0000" }, "message": "Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05\nam: 51c3d6a8bf\n\nChange-Id: Ie7e8806faecdad96b4033404709fb3aebc4bdd0f\n" }, { "commit": "51c3d6a8bf86c3b0326e09f67b17876e39f800c8", "tree": "9cbd4cb10c27eb1e44de5da4ed8196af7f42579b", "parents": [ "5b30d7b8194bea6e3d7d4621c94dc6d6e1a5f110", "deb4eb5d05ccf983adcb7252c98c2580a8a36c60" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 15 02:07:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 15 02:07:36 2017 +0000" }, "message": "Merge changes I82d3bee0,I9c9413d7\nam: deb4eb5d05\n\nChange-Id: Iaa6aecf3ec3a91dc04f4533c0ea5b649bdfeb83d\n" }, { "commit": "deb4eb5d05ccf983adcb7252c98c2580a8a36c60", "tree": "fe1225c41ac6128870708616cb71786c919233e8", "parents": [ "ee6e43c033ac41c82969bb3dd074687de38052d1", "50b60fc34dcf879007b5ab6e9b67f806e5a57215" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 15 01:57:28 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 15 01:57:28 2017 +0000" }, "message": "Merge changes I82d3bee0,I9c9413d7\n\n* changes:\n Pass data usage limits to tethering offload code.\n Don\u0027t time out when fetching tether offload stats.\n" }, { "commit": "9870b12bfc8b3c12f59afcf9f2ad7f8d81f8d607", "tree": "649d623aab73aa3bfd543bfca57b6e4584aca3cc", "parents": [ "a3a459778687d0f5b367a7c2c3a1a3e44e06c604", "9ae597b6f265c3bc6ef91ff7f4c171607ca87067" ], "author": { "name": "sunjian", "email": "sunjian@google.com", "time": "Tue Aug 15 01:23:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 15 01:23:15 2017 +0000" }, "message": "Fix Android O: AccountManager API not working in managed profile.\nam: 9ae597b6f2\n\nChange-Id: Ibae496434676b3f895259bfa4549fa48b08e1a36\n" }, { "commit": "3e5ea23673ddc2f85c8253e1f67722e8c6557917", "tree": "bc77547cf5527cf0fd30a943bc7dbc4dd8175cdb", "parents": [ "9282d725f06b4dc94cd06573861df15e2bd3c51f" ], "author": { "name": "ludi", "email": "ludi@google.com", "time": "Thu Aug 10 15:44:40 2017 -0700" }, "committer": { "name": "ludi", "email": "ludi@google.com", "time": "Mon Aug 14 16:10:55 2017 -0700" }, "message": "Add user quota information into the IpSecService dump\n\nBug: 64093788\nTest: runtest frameworks-net\nChange-Id: I6c5fc9e2db4ba57e0db4f6380a1251c4e444951b\n" }, { "commit": "9ae597b6f265c3bc6ef91ff7f4c171607ca87067", "tree": "b0236abc9dd5480c89042ca2e97cd60ca29b649c", "parents": [ "21f3489653c3c481ddb7315089bdf1e5ae19f0cd" ], "author": { "name": "sunjian", "email": "sunjian@google.com", "time": "Mon Aug 14 15:45:04 2017 -0700" }, "committer": { "name": "Jian Sun", "email": "sunjian@google.com", "time": "Mon Aug 14 22:58:51 2017 +0000" }, "message": "Fix Android O: AccountManager API not working in managed profile.\n\nBug: 64577509\nTest: NONE\nChange-Id: I25650b2002d392ef9b7f4f4732106b22bc0eaae2\n" }, { "commit": "06ab1e14eb343d45f4b51ff41c62a417ee9e5f51", "tree": "6bf8426bf183df75dd6c5c20f6d82bdf4825cc3e", "parents": [ "21f3489653c3c481ddb7315089bdf1e5ae19f0cd" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Mon Aug 14 15:30:48 2017 -0700" }, "committer": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Mon Aug 14 15:51:52 2017 -0700" }, "message": "Place black background only behind nav bar when letterboxed\n\nPlacing black background behind the entire app window causes\nalpha animation issues, that can be visible as black flash to\nuser.\nThis CL sizes and positions the background only behind the\nnavigation bar area.\n\nBug: 64598822\nTest: Open letterboxed app, go to/from Recents, observe animations.\nChange-Id: I16a2243117f87ca513d5ef291b7c1d3779467f3b\n" }, { "commit": "b7aade045d8e76e67e1235374a12730108d64e26", "tree": "2b851e2128022f352d37b930147ad6e1a05a1b31", "parents": [ "dadbe89a854178eb7859e84326d01096f79125c5", "21f3489653c3c481ddb7315089bdf1e5ae19f0cd" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Aug 14 22:28:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 14 22:28:45 2017 +0000" }, "message": "Merge \"Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets\" into oc-dr1-dev\nam: 21f3489653\n\nChange-Id: I357a84f9249c466bd259798d3d073886a61af8f0\n" }, { "commit": "21f3489653c3c481ddb7315089bdf1e5ae19f0cd", "tree": "cefd82f3c07d789bd31c9dc9d8b58f1d9ecec007", "parents": [ "b60e1c037a0e0793f838024a2506c58f6bf46bb3", "87d31ecdff739b423c99eeb0c860c743a5874a73" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Aug 14 22:13:32 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 14 22:13:32 2017 +0000" }, "message": "Merge \"Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets\" into oc-dr1-dev" }, { "commit": "50b60fc34dcf879007b5ab6e9b67f806e5a57215", "tree": "41860d4a7c663c20e62cab351075e85df00a64ec", "parents": [ "fef69a126793c83aa0d99a8c597037c3a29929c0" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Aug 11 13:47:49 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 15 00:09:23 2017 +0900" }, "message": "Pass data usage limits to tethering offload code.\n\nBug: 29337859\nBug: 32163131\nTest: builds\nTest: OffloadControllerTest passes\nChange-Id: I82d3bee030bafa8fe85855885b5fc3893e699181\n" }, { "commit": "fef69a126793c83aa0d99a8c597037c3a29929c0", "tree": "b0bc99d5c409af1a188ed058d4d30bb45d4552d5", "parents": [ "8c253ade20827e16720c4a0d58cddfe72350e677" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Mon Aug 14 13:07:42 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Aug 15 00:09:21 2017 +0900" }, "message": "Don\u0027t time out when fetching tether offload stats.\n\nCurrently, fetching tethering offload stats has a 1000ms timeout,\nafter which we return stats of zero. However, returning zero is\ninvalid and will cause various parts of the network stats\naccounting code to complain that statistics are moving backwards,\ncausing at least a log.wtf, and possibly a crash.\n\nThis CL removes the timeout entirely.\n\nAn alternative would have been to keep the timeout and return\nnull if the stats fetch failed. However, this complicates the\ncode, and if the HAL is persistently slow, could cause no stats\nto be counted, ever. Given the impact of such behaviour on users\u0027\ndata plans it is likely better to block until the stats are\ncollected.\n\nBug: 29337859\nBug: 32163131\nTest: builds\nTest: OffloadControllerTest passes\nChange-Id: I9c9413d757f44e87a51ea7ca82b657cc6aa0d4ba\n" }, { "commit": "41e0c055aff2faa69a9b667553760e3cedb49510", "tree": "af83e13d9dafb61d04adce92076adebe3f5a5e41", "parents": [ "f102825d6d43744eb0d7f0225c73d4267935d218", "b60e1c037a0e0793f838024a2506c58f6bf46bb3" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Mon Aug 14 06:56:08 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Aug 14 06:56:08 2017 +0000" }, "message": "Use fullscreen flag to define visibility of the background\nam: b60e1c037a\n\nChange-Id: I8a3e225d3654a206bf607a4077240f5c930f6ffe\n" }, { "commit": "b60e1c037a0e0793f838024a2506c58f6bf46bb3", "tree": "73090f12fccde95bb784675687396f91ea5700fb", "parents": [ "d8330556b38d7a3b762dd49d8689dc4bba4ed8e0" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Fri Aug 11 16:39:53 2017 -0700" }, "committer": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Sun Aug 13 00:05:19 2017 -0700" }, "message": "Use fullscreen flag to define visibility of the background\n\nUse fullscreen state provided by AM as a more reliable\nsource of truth to check if activity window hides other\nwindows behind.\n\nBug: 64615361\nTest: Open Play Newsstand, click on article, go to and from Recents.\nChange-Id: Ibc40a4241ed131f74da47c0d22833d2c3994cbe0\n" }, { "commit": "e76fc100e443b01f109bec15203f6f035acb8a57", "tree": "48db234c6dffe48c68e4308f5bfa2292e6719f69", "parents": [ "b10fd850a71ad5c930534c8ec376353f183b0711", "79e11e44296adc99385de0e5d7695b4a1ddc5354" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Sat Aug 12 06:22:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Aug 12 06:22:20 2017 +0000" }, "message": "Merge \"Update background crop animation threshold\" into oc-dr1-dev\nam: 79e11e4429\n\nChange-Id: I6fada8610ecbce5dc31683e7a3a0f4072a3e6ced\n" }, { "commit": "79e11e44296adc99385de0e5d7695b4a1ddc5354", "tree": "66f0cf04acdf0578f0d0268ce7794b9085fa1eba", "parents": [ "8193291ca36146af752dbd87e6fcab5274fd9b3d", "f672aa5cc3933e745e35547ea4bbd6dcd6c77b8f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Aug 12 06:09:06 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 12 06:09:06 2017 +0000" }, "message": "Merge \"Update background crop animation threshold\" into oc-dr1-dev" }, { "commit": "8193291ca36146af752dbd87e6fcab5274fd9b3d", "tree": "e2cc4afa98e15839777f095d09d07efdc12a77f6", "parents": [ "a031b0d6a127a4db89e60397737b6f53dcb13a8b", "3f0122b50feb749cabc7c54f0e3653df7b4a4223" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Aug 12 05:30:30 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 12 05:30:30 2017 +0000" }, "message": "Merge changes from topic \u0027b/64606807\u0027 into oc-dr1-dev\n\n* changes:\n Revert \"Add (disabled) time zone update system server impl\"\n Revert \"Time zone update API classes\"\n" }, { "commit": "708a1ca16a26da074b80f07df29542199e072a9a", "tree": "420e350f8aa60fd5355ffcfe101dd087d2e10778", "parents": [ "1cbfe74fc2822819a898c92b22200ae549692e8e" ], "author": { "name": "Dan Sandler", "email": "dsandler@android.com", "time": "Fri Aug 11 20:30:24 2017 -0400" }, "committer": { "name": "Ian Pedowitz", "email": "ijpedowitz@google.com", "time": "Sat Aug 12 01:32:09 2017 +0000" }, "message": "Move USE_COLORIZED_NOTIFICATIONS to com.android.\n\nIt\u0027s @hidden, but CTS needs it to be out of the android.*\nnamespace too.\n\nFixes: 64613274\nTest: Grab the cts binaries(android-cts.zip) from OC Release\nTest: Extract and from android-cts/tools directory, launch ./cts-tradefed\nTest: On the DUT with CL cherrypicked, run the below(will run this test on both abi\u0027s):\nTest: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial \u003cdevice serial\u003e\nTest: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn\u0027t fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK\nChange-Id: I753c2cc19111f9ed39e7fc3e006aab096c733ddc\nMerged-In: I2046ae17b9e89ac0a83e182b91422fd242bc7557\n" }, { "commit": "87d31ecdff739b423c99eeb0c860c743a5874a73", "tree": "521663cdfbbdeed998a1e44765dbc9011d34a05f", "parents": [ "b6ba151a6ffecbd048bdc423dc4d3ad66de72dc4" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Aug 11 18:28:20 2017 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Aug 11 18:28:20 2017 -0700" }, "message": "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets\n\nIn the broadcast of Intent.ACTION_HEADSET_PLUG:\n- restore setting \"microphone\" to 0 for line and headphone as\n the input bit is never set for those devices\n- for USB_HEADSET: there is no input bit for this device, so:\n * when observing change for DEVICE_OUT, check status of DEVICE_IN\n * when observing change for DEVICE_IN, only send the intent\n if DEVICE_OUT is available.\n\nTest: test broadcast and extras for Intent.ACTION_HEADSET_PLUG\nBug: 64250808\nChange-Id: I0913933d03e21189bb552f60ae5dd35ffe28ddca\n" }, { "commit": "3f0122b50feb749cabc7c54f0e3653df7b4a4223", "tree": "4592cf21f9e474a36d3032a9d46c8060fa0c07dc", "parents": [ "4e9806c4b47c22144055440ecad95fd4d2c1aeba" ], "author": { "name": "Ian Pedowitz", "email": "ijpedowitz@google.com", "time": "Fri Aug 11 15:12:00 2017 -0700" }, "committer": { "name": "Ian Pedowitz", "email": "ijpedowitz@google.com", "time": "Sat Aug 12 01:21:34 2017 +0000" }, "message": "Revert \"Add (disabled) time zone update system server impl\"\n\nThis reverts commit 328532ab13768a6303231b670708d750c4d7aa5f.\n\nFixes: 64606807\nTest: Grab the cts binaries(android-cts.zip) from OC Release\nTest: Extract and from android-cts/tools directory, launch ./cts-tradefed\nTest: On the DUT with CL cherrypicked, run the below(will run this test on both abi\u0027s):\nTest: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial \u003cdevice serial\u003e\nTest: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn\u0027t fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK\nChange-Id: Iab0fd111803ae9e7615a3b2c825bbe8d84e29edf\nMerged-In: I2600dd4bee22a571b9eb7303733591b60d1a8b2a\n" }, { "commit": "f672aa5cc3933e745e35547ea4bbd6dcd6c77b8f", "tree": "08bc313865c70f50e316048a14c784a89adfaaf8", "parents": [ "1cbfe74fc2822819a898c92b22200ae549692e8e" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Fri Aug 11 18:01:11 2017 -0700" }, "committer": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Fri Aug 11 18:01:11 2017 -0700" }, "message": "Update background crop animation threshold\n\nEmpiric value for animation epsilon covers only the last\nframe of the animation, which is not enough in some case.\nThis CL makes it a little bigger to cover two last frames.\nThe change is visually indistinguishable for user.\n\nBug: 63156733\nTest: Go to/from recents with letterboxed app.\nChange-Id: I42423527688dcb2dc157ae16bbe5b6de7eee3449\n" }, { "commit": "e4a470235691c05390e709f963629215da0ec273", "tree": "7e3afb0d3843508812bb4e9d628aa3a15c71b399", "parents": [ "8e22616fb80fa5fbad9b4f529beec1470c0da3f1", "cff260adfcbcf31e3880f7fff40ad9d243bf3580" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Fri Aug 11 23:39:59 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 11 23:39:59 2017 +0000" }, "message": "Merge \"Don\u0027t animate black background on cold launch from launcher\" into oc-dr1-dev\nam: cff260adfc\n\nChange-Id: I94b462f38ead5fb7e2253604ad4437c7a5670e4c\n" }, { "commit": "cff260adfcbcf31e3880f7fff40ad9d243bf3580", "tree": "5937df5b1110e969a9a874fc9ddf6a005863fc69", "parents": [ "7b0dec4142000df8d2fa72a5932a7b44c9c10950", "07665126dfce542237b77151ceb812b96c16fb7e" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Fri Aug 11 23:31:44 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 11 23:31:44 2017 +0000" }, "message": "Merge \"Don\u0027t animate black background on cold launch from launcher\" into oc-dr1-dev" }, { "commit": "f5cdea17240c4dd7bacdad79887f60cd7d3c2b52", "tree": "ebb3c3de283afc98bce3381fde1074322c8b048a", "parents": [ "4802b828a2e0e7ea565b68a7b5443d9b1b0cb089", "7b0dec4142000df8d2fa72a5932a7b44c9c10950" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Fri Aug 11 22:08:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 11 22:08:15 2017 +0000" }, "message": "Merge \"WTF when device has no persistent periodic syncs...\" into oc-dr1-dev\nam: 7b0dec4142\n\nChange-Id: Iebb109a246b174b6659abed862909b43ddcce74b\n" }, { "commit": "bbf6d8cfb3a151c516a8e2edb5070c18e9ad7b83", "tree": "7d3a2bf8c4f95b5e8adb78612ecd10c4a87b8c81", "parents": [ "b6ba151a6ffecbd048bdc423dc4d3ad66de72dc4" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Fri Aug 11 12:11:39 2017 -0700" }, "committer": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Fri Aug 11 19:36:03 2017 +0000" }, "message": "WTF when device has no persistent periodic syncs...\n\n... when it most likely has some.\n\nBug: 64536115\nTest: manual\nChange-Id: I24c4c950b0266ef22918156c29384bc452f523af\n" }, { "commit": "07665126dfce542237b77151ceb812b96c16fb7e", "tree": "d80172bd8af34263d309ba238b7d8b2d70de6a76", "parents": [ "cbdaf0410122bd3dba7503be92ec8cd4dd286027" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Fri Aug 11 11:27:00 2017 -0700" }, "committer": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Fri Aug 11 11:27:00 2017 -0700" }, "message": "Don\u0027t animate black background on cold launch from launcher\n\nWhen animating cold start from launcher we can\u0027t compute the\nprogress in SurfaceControlWithBackground#calculateBgCrop() via\ntracking status bar insets. This CL won\u0027t animate bg crop\nin case the progress does not make sense.\n\nBug: 64598822\nTest: Cold launch letterboxed app from launcher.\nChange-Id: I82182a3c46dd4f81bcf056d1163f78c450bd9b83\n" }, { "commit": "2189999c61fa9d4d2fde47ea75f8dbae72ffb7e1", "tree": "c6f851660f5466fe2a620df8754d5b81810f31c6", "parents": [ "f3b6768601b466aa8d200a88e504a910b7e76981", "88710dead09434df19f872e5114f19e09680323c" ], "author": { "name": "Christine Franks", "email": "christyfranks@google.com", "time": "Thu Aug 10 05:38:00 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 10 05:38:00 2017 +0000" }, "message": "Merge \"Add settings and reset operations for demo users\" into oc-dr1-dev\nam: 88710dead0\n\nChange-Id: I7b3aae902eebd27590e4799408e941ee7761b834\n" }, { "commit": "88710dead09434df19f872e5114f19e09680323c", "tree": "0df29c3a94b02db10614d82d4806095ad74e7035", "parents": [ "4f540fe8d03b415e25d11646ec7f6a776d8f5247", "9a18f5fa409d99e09bed57626d5a600142fd7009" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 10 05:28:47 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 10 05:28:47 2017 +0000" }, "message": "Merge \"Add settings and reset operations for demo users\" into oc-dr1-dev" }, { "commit": "9a18f5fa409d99e09bed57626d5a600142fd7009", "tree": "0a303dd0696e5f54caecbf704f43c08ab8b948ba", "parents": [ "0a3684eb451ae226b522d83088653b9f4f06e7bd" ], "author": { "name": "Christine Franks", "email": "christyfranks@google.com", "time": "Mon Aug 07 14:28:35 2017 -0700" }, "committer": { "name": "Christine Franks", "email": "christyfranks@google.com", "time": "Wed Aug 09 19:18:20 2017 -0700" }, "message": "Add settings and reset operations for demo users\n\n- Allow Global settings to be set in demo mode\n- Allow Secure settings to be set by demo users\n- Allow fully enabling apps for demo users\n- Send enable broadcast as foreground broadcast\n\nBug: 62712426\nTest: runtest -c \\\ncom.android.server.devicepolicy.DevicePolicyManagerTest \\\nframeworks-services\n\nChange-Id: Icd5d1eda12aa6b97bd4770713710a982bb0fc8e5\n" } ], "next": "2d6fe2f5afaf95bd026b6eec290b755bf4128891" }