)]}' { "log": [ { "commit": "38724a234d8d45b25fa8c38eba637a30c4212a9b", "tree": "9e63145907c8f6a61e8b75df4a360154bb870201", "parents": [ "7f8f7da7d2d6eb2685af72a0e4b54fd8ec7d0c71", "5456cdbc27f0d1e4be4ed18162806418172f1469" ], "author": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Thu Dec 08 17:24:32 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 17:24:32 2016 +0000" }, "message": "Merge \"Support multiple caches in NetworkScoreService.\" am: 78f3f0049e am: a7c0b73971 am: b45a4a5d1b\nam: 5456cdbc27\n\nChange-Id: I421cff1c47959c40088a31f72556630a8acd007e\n" }, { "commit": "6cd5d2f8385fa363edfb8c214b29876321486695", "tree": "d6e61c8abadde690c9eb62d541b754b0dd882ec5", "parents": [ "fdc5ea113bbf41d14d04afd143c4caacc819aea1", "322347ba58f02b960dc87eca3cb0ebe0455c9253" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 08 06:05:25 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 06:05:28 2016 +0000" }, "message": "Merge \"Adding orientation preserving resizing\"" }, { "commit": "322347ba58f02b960dc87eca3cb0ebe0455c9253", "tree": "7fd49f6133a8fc5665bacde4f7e179d2596b3a3a", "parents": [ "5026cabbe17645bfd978a1d724153bd449b89811" ], "author": { "name": "skuhne@google.com", "email": "skuhne@google.com", "time": "Fri Dec 02 12:54:03 2016 -0800" }, "committer": { "name": "skuhne@google.com", "email": "skuhne@google.com", "time": "Wed Dec 07 20:01:19 2016 -0800" }, "message": "Adding orientation preserving resizing\n\nAdding freeform resizing to activities which require\na certain orientation. This is needed for e.g. ARC++.\n\nBug: 33267688\nTest: runtest frameworks-services -c com.android.server.wm.TaskPositionerTests\nTest: Visually on ARC++\nChange-Id: If708c1602cb2ff464174389af4648ad767b0b079\n" }, { "commit": "be5378574b5596308fe9d9dc12b620a657ddd0e5", "tree": "d1659573855aedc37e2102ac38e36b3114717577", "parents": [ "5683204632cc0b5ed129921b0ca3ea01cbd9bb9a", "fb9f736a3c6c2e1c91c69b1abc0456b54215e8ef" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Dec 08 02:39:45 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 02:39:50 2016 +0000" }, "message": "Merge changes from topic \u0027proto convenience methods\u0027\n\n* changes:\n ProtoOutputStream convenience methods.\n Give protoc-gen-javastream the ability to output multiple java files.\n" }, { "commit": "5683204632cc0b5ed129921b0ca3ea01cbd9bb9a", "tree": "1d5e2fb2463b33879dd263bfb6020331be954cdf", "parents": [ "a62415dd1e53cd6d7def2a4ff5557db89ed6a541", "71e6d62d232cce042ae1f98328b628aaca108850" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 08 02:34:04 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 02:34:08 2016 +0000" }, "message": "Merge \"Camera2: Consolidate the overriding of PRIVATE format\"" }, { "commit": "5456cdbc27f0d1e4be4ed18162806418172f1469", "tree": "c70b6df4fd7b73c9940de751068a60b44089500a", "parents": [ "7e789f3f5c4d491b49487758165e05088295a11d", "b45a4a5d1b81f433503dd72a7fedd90a45c5d816" ], "author": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Thu Dec 08 02:28:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 02:28:57 2016 +0000" }, "message": "Merge \"Support multiple caches in NetworkScoreService.\" am: 78f3f0049e am: a7c0b73971\nam: b45a4a5d1b\n\nChange-Id: If0080f344e53c4cddf4605879614a664c80b62ee\n" }, { "commit": "b45a4a5d1b81f433503dd72a7fedd90a45c5d816", "tree": "fe9d0afcdb0508ff86e163436bd184ac4e693edc", "parents": [ "638134c1d8d7ff151e6212c8a53ff09548de4323", "a7c0b73971f8b14d8150b58e8226ceb58fd8c0b1" ], "author": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Thu Dec 08 02:24:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 02:24:59 2016 +0000" }, "message": "Merge \"Support multiple caches in NetworkScoreService.\" am: 78f3f0049e\nam: a7c0b73971\n\nChange-Id: Idf846f55436c44930f5db2a07b7362412274f46e\n" }, { "commit": "a62415dd1e53cd6d7def2a4ff5557db89ed6a541", "tree": "e87de32ff31756586475d73ff5e77fe0e43ec08a", "parents": [ "66ebaf7ff553f43c706efb21c5a8a084cef12cce", "c543b56706b13940156df664816ade473e1a0a22" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 08 02:23:33 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 02:23:37 2016 +0000" }, "message": "Merge \"Only persist last Shared Preferences state\"" }, { "commit": "61705a3e6432131f9a5d05f56503b1b78692304a", "tree": "07b1a331725867e56940bc13c9677da88f39ff7e", "parents": [ "2e0e9363acaccfe2e7b7143ec1291322b2768791", "6023fd180006f8561183ebfd2341328298e6e338" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 02:11:39 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 02:11:39 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa am: 557858b9c0\nam: 6023fd1800\n\nChange-Id: I313c59c10f2d18673c5f9e7fbdfc2141d6c91e77\n" }, { "commit": "638134c1d8d7ff151e6212c8a53ff09548de4323", "tree": "4f359771af4737ad0cb8506351ab5787be79ab06", "parents": [ "7eb917d5eb51123a9e2cd718a1dfcba7ca6ea6a8", "557858b9c0c154a973a15939a4560b05b9a3ecf4" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 02:08:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 02:08:26 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa\nam: 557858b9c0\n\nChange-Id: I872df5965848ccd935c43473168e1e5aea40aad1\n" }, { "commit": "6023fd180006f8561183ebfd2341328298e6e338", "tree": "3b6c3d6c3a38c24b1eefe2e68aa5418b3a2a88b1", "parents": [ "116a4e883dba73ef8cde5c1f4c0fc12d72ca919f", "557858b9c0c154a973a15939a4560b05b9a3ecf4" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 02:08:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 02:08:23 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb am: 138a541eaa\nam: 557858b9c0\n\nChange-Id: Ia6b6b59be28f938f4c3a7c4aecb035fd4c6607f6\n" }, { "commit": "a0c8b340beacd9ecc7b690eea03e7876a801510a", "tree": "36f6fca5a2b52360764a199b93c1c57fa6361a17", "parents": [ "c1afd37135b3175ae5c729cc1425cf82c564e04c", "7eb917d5eb51123a9e2cd718a1dfcba7ca6ea6a8" ], "author": { "name": "Aart Bik", "email": "ajcbik@google.com", "time": "Thu Dec 08 02:08:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 02:08:23 2016 +0000" }, "message": "Revert \"Fix vulnerability in MemoryIntArray\" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9 am: 278cad4793\nam: 7eb917d5eb\n\nChange-Id: I7ea739ac873ce3e5a2252666394db2b3199ec42a\n" }, { "commit": "7eb917d5eb51123a9e2cd718a1dfcba7ca6ea6a8", "tree": "5308e442aefcabe619a5dbf9de18cefc617bc270", "parents": [ "63499946b09740aad97742b2a619efb33d5fd14f", "278cad4793163dbfb948e76ad74d0a94b279f151" ], "author": { "name": "Aart Bik", "email": "ajcbik@google.com", "time": "Thu Dec 08 02:01:06 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 02:01:06 2016 +0000" }, "message": "Revert \"Fix vulnerability in MemoryIntArray\" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9\nam: 278cad4793\n\nChange-Id: Ib58a5a1e7506327b690df9c1a98c2fa8b895d216\n" }, { "commit": "116a4e883dba73ef8cde5c1f4c0fc12d72ca919f", "tree": "ea0acdda443d66c74423e40a353abe36b8a098f7", "parents": [ "1e1d5b07a69243187b932118b30ce1196dab990a", "278cad4793163dbfb948e76ad74d0a94b279f151" ], "author": { "name": "Aart Bik", "email": "ajcbik@google.com", "time": "Thu Dec 08 02:00:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 02:00:56 2016 +0000" }, "message": "Revert \"Fix vulnerability in MemoryIntArray\" am: 29139a8ae5 am: 86699f980f am: 65cf055ad9\nam: 278cad4793\n\nChange-Id: I545ba917e74f34716fe773250468e06b1dfd8312\n" }, { "commit": "557858b9c0c154a973a15939a4560b05b9a3ecf4", "tree": "317fb82eed33db02fbca91e5fefbcf81854d381f", "parents": [ "278cad4793163dbfb948e76ad74d0a94b279f151", "138a541eaaf71c4fad6116f078e3c6976b017157" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 02:00:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 02:00:55 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 4694cad511 am: ec40a70ffb\nam: 138a541eaa\n\nChange-Id: I659d82f39cab9f6d73ceb118cdc74307ee995dfb\n" }, { "commit": "138a541eaaf71c4fad6116f078e3c6976b017157", "tree": "bb33616806e716e5002d8b88c7f1f26180554b58", "parents": [ "65cf055ad9c6813cc5932da14e74f84b55008810", "ec40a70ffb9f1a5a2dcb4527dfea6231189c5c41" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 01:56:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 01:56:24 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 4694cad511\nam: ec40a70ffb\n\nChange-Id: I5d03aaa04fe13b3af20bcc61e9bb925b471ab825\n" }, { "commit": "278cad4793163dbfb948e76ad74d0a94b279f151", "tree": "1f776b7af533a8d823b076f3fead9b1ed25e1263", "parents": [ "b317e60014d8d42e39a783067ac65bb820510d03", "65cf055ad9c6813cc5932da14e74f84b55008810" ], "author": { "name": "Aart Bik", "email": "ajcbik@google.com", "time": "Thu Dec 08 01:52:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 01:52:51 2016 +0000" }, "message": "Revert \"Fix vulnerability in MemoryIntArray\" am: 29139a8ae5 am: 86699f980f\nam: 65cf055ad9\n\nChange-Id: Iae6e4fe6eada607d71a20b8ea588ee8efd56a8e0\n" }, { "commit": "ec40a70ffb9f1a5a2dcb4527dfea6231189c5c41", "tree": "e645e9db6f24f4d7bc2bc29542e8cc4a2e82c06a", "parents": [ "86699f980ffa7396830b61a6e29cee8eeab01e34", "4694cad51122c20880d00389ef95833d7a14b358" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 01:49:21 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 01:49:21 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray\nam: 4694cad511\n\nChange-Id: I64257a851c06e4a333056ee132ff8a2ea29aef5c\n" }, { "commit": "65cf055ad9c6813cc5932da14e74f84b55008810", "tree": "41c0c6f2dfbdc5c3a1ba24935c8cddcebd626b43", "parents": [ "e123f41553a8a2281abd5b2be9e1e53e26b842ca", "86699f980ffa7396830b61a6e29cee8eeab01e34" ], "author": { "name": "Aart Bik", "email": "ajcbik@google.com", "time": "Thu Dec 08 01:44:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 01:44:54 2016 +0000" }, "message": "Revert \"Fix vulnerability in MemoryIntArray\" am: 29139a8ae5\nam: 86699f980f\n\nChange-Id: I7876874ba0d6815920f21021a47e3fe1b3e1c42f\n" }, { "commit": "66ebaf7ff553f43c706efb21c5a8a084cef12cce", "tree": "5ccea637300544ac0c8f972d9a8ba2efb3ff2a53", "parents": [ "45cf37aa2718b9919c132c58ab6f8cac9dc5c900", "74c9983e80d8224bbe1de7c37e8f6ac4a76df11d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 08 01:39:47 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 01:39:52 2016 +0000" }, "message": "Merge \"Fix vulnerability in MemoryIntArray\"" }, { "commit": "86699f980ffa7396830b61a6e29cee8eeab01e34", "tree": "e737ee21fc86e4672a660b4d3f32ac42e57c99a7", "parents": [ "367023218e2100e10d293a3b10105a992128b268", "29139a8ae51110b0cd9d6249f643364849d401c9" ], "author": { "name": "Aart Bik", "email": "ajcbik@google.com", "time": "Thu Dec 08 01:36:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 01:36:50 2016 +0000" }, "message": "Revert \"Fix vulnerability in MemoryIntArray\"\nam: 29139a8ae5\n\nChange-Id: I3975cfc51bd03a65855c113dfdb827d24471e0ba\n" }, { "commit": "4694cad51122c20880d00389ef95833d7a14b358", "tree": "3c547375d0123eba7145b6b8d904a2df3dbe9bfc", "parents": [ "29139a8ae51110b0cd9d6249f643364849d401c9" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 01:30:38 2016 +0000" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 01:35:08 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray\n\nMemoryIntArray was using the size of the undelying\nashmem region to mmap the data but the ashmem size\ncan be changed until the former is memory mapped.\nSince we use the ashmem region size for boundary\nchecking and memory unmapping if it does not match\nthe size used while mapping an attacker can force\nthe system to unmap memory or to access undefined\nmemory and crash.\n\nAlso we were passing the memory address where the\nashmem region is mapped in the owner process to\nsupport cases where the client can pass back the\nMemoryIntArray instance. This allows an attacker\nto put invalid address and cause arbitrary memory\nto be freed.\n\nNow we no longer support passing back the instance\nto the owner process (the passed back instance is\nread only), so no need to pass the memory adress\nof the owner\u0027s mapping, thus not allowing freeing\narbitrary memory.\n\nFurther, we now check the memory mapped size against\nthe size of the underlying ashmem region after we do\nthe memory mapping (to fix the ahsmem size) and if\nan attacker changed the size under us we throw.\n\nTests: Updated the tests and they pass.\n\nbug:33039926\nbug:33042690\n\nChange-Id: Id7f0e8a4c861b0b9fa796767e0c22d96633b14d1\n" }, { "commit": "29139a8ae51110b0cd9d6249f643364849d401c9", "tree": "d932aefc1a7996c98d68e4ec6f59e5b40516c1be", "parents": [ "86dfa094de773670743d41c3e3156eace8e403a3" ], "author": { "name": "Aart Bik", "email": "ajcbik@google.com", "time": "Thu Dec 08 01:05:35 2016 +0000" }, "committer": { "name": "Aart Bik", "email": "ajcbik@google.com", "time": "Thu Dec 08 01:12:48 2016 +0000" }, "message": "Revert \"Fix vulnerability in MemoryIntArray\"\n\nThis reverts commit 86dfa094de773670743d41c3e3156eace8e403a3.\n\n\nBROKE BUILD (as shown in some treehugger builds)\n\nframeworks/base/core/java/android/util/MemoryIntArray.java:84: error: cannot find symbol\n mCloseGuard.open(\"close\");\n ^\n \n \nbug:33039926\nbug:33042690\n\nChange-Id: Ief875e543ec849fe55c747fb1ed5253f0cd9a122\n" }, { "commit": "cd92cc49d2870920982ce6aa1c0b401cbd146d7c", "tree": "d10c4f239535e0baf3d399443309929301bef6e6", "parents": [ "fa29b710780935bb4af72c2a380d1596287e2d4e", "63499946b09740aad97742b2a619efb33d5fd14f" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 01:11:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 01:11:51 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553 am: b317e60014\nam: 63499946b0\n\nChange-Id: Ib9f5aabdf4e96b250a66f4dab7f3a90bd27a773f\n" }, { "commit": "63499946b09740aad97742b2a619efb33d5fd14f", "tree": "b7db15546924fc5f0c6b077d8ef1f9b669c29aba", "parents": [ "609711bbd5379a01f701d736d48964537a5a50df", "b317e60014d8d42e39a783067ac65bb820510d03" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 01:04:53 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 01:04:53 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553\nam: b317e60014\n\nChange-Id: Ieb3bf25ec225a0d3c5e568ff9c9e753a95be297c\n" }, { "commit": "9aed2f6f53acb52d2df068734ec9ef2a14de505e", "tree": "33e9e4b78f4703caeabc4a280fe259ecd6a390ee", "parents": [ "652276ca3fd660ccc8050a3440cdb6b159565ed0", "b317e60014d8d42e39a783067ac65bb820510d03" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 01:04:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 01:04:48 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e am: e123f41553\nam: b317e60014\n\nChange-Id: I550293e05ce1d1039e3f22f72002e69df919f735\n" }, { "commit": "55abee314cc7318690803e0925e4b5c892709bec", "tree": "3aea8223a81c7070960c0e0da8341e5dbaa0b021", "parents": [ "ffba913de57ee8a28c576d29c628cdee07a5537a", "4ac8f40d96196a2a36d7bda7d92eee9bbd4ee7e7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 08 01:00:04 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 01:00:10 2016 +0000" }, "message": "Merge \"MessagingStyle: Fix buggy measure in MessagingLinearLayout\"" }, { "commit": "b317e60014d8d42e39a783067ac65bb820510d03", "tree": "daf18de910e3d7f4bc8bd3471ae73b63cfcf4cfe", "parents": [ "d7a313fb118fb6f5e5eaae6acff253038a85da4b", "e123f41553a8a2281abd5b2be9e1e53e26b842ca" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 00:57:21 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 00:57:21 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 86dfa094de am: 367023218e\nam: e123f41553\n\nChange-Id: Id5cd6072d972b5d03512e83dc342a7c78341ffeb\n" }, { "commit": "e123f41553a8a2281abd5b2be9e1e53e26b842ca", "tree": "9ceb898098e5a04658a2fbca9f29bddbe692ea7c", "parents": [ "050cf854c7613290ebeded53d86c5cb70b21390a", "367023218e2100e10d293a3b10105a992128b268" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 00:49:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 00:49:48 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray am: 86dfa094de\nam: 367023218e\n\nChange-Id: I38d3f7089b9678210772f79215b44198b262e922\n" }, { "commit": "c6a43b1e0b4ff6ead17fc272b9189a78e9e207f2", "tree": "9de068a49df13de04adce6ac868a8d9be6ca999e", "parents": [ "dee593ab480801b6edff418c33158c9fadb06cbf", "52e364e4bade7d085ab3be95bdb5eaf93bfa0865" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Dec 08 00:44:27 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 00:44:27 2016 +0000" }, "message": "Notifications: Fix bad layout for long texts am: 62be439d26\nam: 52e364e4ba\n\nChange-Id: I299401ef2627cbf55332cc0648398e19f25b594f\n" }, { "commit": "367023218e2100e10d293a3b10105a992128b268", "tree": "086ef558206339685ef54b2b302f57a14b9db952", "parents": [ "1d752340a72243dd89a4e7c15a1a9c1878aab20f", "86dfa094de773670743d41c3e3156eace8e403a3" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 08 00:42:18 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 00:42:18 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray\nam: 86dfa094de\n\nChange-Id: I664782bea6e2b941ba94e51c65afd7e9b0f95f8d\n" }, { "commit": "52e364e4bade7d085ab3be95bdb5eaf93bfa0865", "tree": "f43f63192df28dd499a2a8826439d238a762cf56", "parents": [ "4bc6d41f10d4c31cc2bb6db7e1498a0a74edc31d", "62be439d26a9e0748d4626bed8ffa117e39764a2" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Dec 08 00:35:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 08 00:35:59 2016 +0000" }, "message": "Notifications: Fix bad layout for long texts\nam: 62be439d26\n\nChange-Id: Ia0f6fe64cc853dcdaf84910055cf5a8b1e163ddd\n" }, { "commit": "8f250c13d7e60e0b75e5a1a4fea882e5ce322733", "tree": "a8444600f93617d35c45327deb5412aedac68ba4", "parents": [ "3e3bb0d08fd770aa782ac998bdb65322d6105a71", "62be439d26a9e0748d4626bed8ffa117e39764a2" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Dec 08 00:30:04 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 00:30:08 2016 +0000" }, "message": "Merge \"Notifications: Fix bad layout for long texts\" into nyc-mr2-dev" }, { "commit": "71e6d62d232cce042ae1f98328b628aaca108850", "tree": "f4048ffdb94e6fbac39d4e9a72876357999cc426", "parents": [ "f3fc930c3cbcebdf2b314df503146b53e3000b1b" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Wed Dec 07 14:46:30 2016 -0800" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Wed Dec 07 16:22:37 2016 -0800" }, "message": "Camera2: Consolidate the overriding of PRIVATE format\n\nWe had overriding of PRIVATE format scattered at multiple places.\nConsolidate them into one place.\n\nTest: Camera preview/capture, and camcorder recording\nChange-Id: I098ce93bba2000760a20c0297fcf0cb9d8c6caab\n" }, { "commit": "972e236e84fd4073f7ecc40f2de326b388203dfb", "tree": "a98da98cdb14bdc009993c6791f9ff049a562268", "parents": [ "faf3aa697fc569180cc029c09affe08ade9c5e82" ], "author": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Wed Dec 07 14:08:09 2016 -0800" }, "committer": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Wed Dec 07 15:52:33 2016 -0800" }, "message": "Support multiple caches in NetworkScoreService.\n\n- Use RemoteCallbackList for managing multiple callbacks\n- Add unregisterNetworkScoreCache to the service interface\n- Added NetworkScoreServiceTest\n\nTest: runtest frameworks-services\n\nBug: 32913019\nChange-Id: I16ca1682acca9cbe403812e520394688a026414b\n" }, { "commit": "4aef203cb84ea81eca5e24814a298c9a912b094a", "tree": "30b7306003030ccd69d58669be213f8bb2fea6f0", "parents": [ "f47437fd8bf8c038fcc4c017096a5bbdbc8aff39", "357483f41ecfec8fe9e4e9bfb8ae6e95964d83fb" ], "author": { "name": "Stephen Chen", "email": "stewchen@google.com", "time": "Wed Dec 07 23:33:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 23:33:49 2016 +0000" }, "message": "Merge \"Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED.\" am: faf3aa697f am: fe9a20c980 am: 609711bbd5\nam: 357483f41e\n\nChange-Id: I4cb930396651b86d9a786b9b0abe807c300cd526\n" }, { "commit": "357483f41ecfec8fe9e4e9bfb8ae6e95964d83fb", "tree": "a32dea9afee06753fe19a43d31da6895fcdbad8e", "parents": [ "88f6752547a179756915b938f5d4fea1ef831ba1", "609711bbd5379a01f701d736d48964537a5a50df" ], "author": { "name": "Stephen Chen", "email": "stewchen@google.com", "time": "Wed Dec 07 23:25:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 23:25:46 2016 +0000" }, "message": "Merge \"Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED.\" am: faf3aa697f am: fe9a20c980\nam: 609711bbd5\n\nChange-Id: I11634693f1088319c90e291d78edbc8e10cd147a\n" }, { "commit": "86dfa094de773670743d41c3e3156eace8e403a3", "tree": "0910dacdcfb6dce915a8fe5fb14295674b2b29ed", "parents": [ "f199d511c37fa21b33b6f26b08990c310eac3f71" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Wed Dec 07 15:19:09 2016 -0800" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Wed Dec 07 15:19:13 2016 -0800" }, "message": "Fix vulnerability in MemoryIntArray\n\nMemoryIntArray was using the size of the undelying\nashmem region to mmap the data but the ashmem size\ncan be changed until the former is memory mapped.\nSince we use the ashmem region size for boundary\nchecking and memory unmapping if it does not match\nthe size used while mapping an attacker can force\nthe system to unmap memory or to access undefined\nmemory and crash.\n\nAlso we were passing the memory address where the\nashmem region is mapped in the owner process to\nsupport cases where the client can pass back the\nMemoryIntArray instance. This allows an attacker\nto put invalid address and cause arbitrary memory\nto be freed.\n\nNow we no longer support passing back the instance\nto the owner process (the passed back instance is\nread only), so no need to pass the memory adress\nof the owner\u0027s mapping, thus not allowing freeing\narbitrary memory.\n\nFurther, we now check the memory mapped size against\nthe size of the underlying ashmem region after we do\nthe memory mapping (to fix the ahsmem size) and if\nan attacker changed the size under us we throw.\n\nTests: Updated the tests and they pass.\n\nbug:33039926\nbug:33042690\n\nChange-Id: Ie267646eb88014034fbd048d7a9bc273420c7eff\n" }, { "commit": "609711bbd5379a01f701d736d48964537a5a50df", "tree": "5308e442aefcabe619a5dbf9de18cefc617bc270", "parents": [ "2c106012fe06890d1e0040b526044d4ecda9ef78", "fe9a20c980e4df85c9cb012e7b50f47318ece84b" ], "author": { "name": "Stephen Chen", "email": "stewchen@google.com", "time": "Wed Dec 07 23:18:15 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 23:18:15 2016 +0000" }, "message": "Merge \"Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED.\" am: faf3aa697f\nam: fe9a20c980\n\nChange-Id: I7bba392e349525dd55bb8b251554e81967424136\n" }, { "commit": "4ac8f40d96196a2a36d7bda7d92eee9bbd4ee7e7", "tree": "03833b1a6b867e839b6b51d091e24a08e82b314b", "parents": [ "e8ac4110c8ba22dfa01e9941c296d8b32781c500" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Dec 05 15:42:16 2016 -0800" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Dec 07 15:16:19 2016 -0800" }, "message": "MessagingStyle: Fix buggy measure in MessagingLinearLayout\n\nFixes a bug in MessagingLinearLayout where we would not\nrecompute the height of it after applying the computed\ninsets to the text views, leading to incorrect padding\nand in rare cases a cut off message at the bottom.\n\nChange-Id: If87a527555158e94e501832e9f49e380cc7da2bb\nTest: runtest -x core/tests/coretests/src/com/android/internal/widget/MessagingLinearLayoutTest.java\nFixes: 31463075\n" }, { "commit": "faf3aa697fc569180cc029c09affe08ade9c5e82", "tree": "6d0abdb034af6f3b26f26010ecd63de381492552", "parents": [ "2007ee8de375cc69ebdf57815f2ede0a35a227ca", "f1b75647a3d8b51abdc3064445db4f6e40617cb8" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 07 23:00:26 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 07 23:00:26 2016 +0000" }, "message": "Merge \"Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED.\"" }, { "commit": "74c9983e80d8224bbe1de7c37e8f6ac4a76df11d", "tree": "1c8681cfc6e4844c19211655ad86919f2aa5c58c", "parents": [ "713f913c4445f754f26b812ce8231ec36f806373" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Mon Dec 05 20:07:20 2016 -0800" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Wed Dec 07 22:43:56 2016 +0000" }, "message": "Fix vulnerability in MemoryIntArray\n\nMemoryIntArray was using the size of the undelying\nashmem region to mmap the data but the ashmem size\ncan be changed until the former is memory mapped.\nSince we use the ashmem region size for boundary\nchecking and memory unmapping if it does not match\nthe size used while mapping an attacker can force\nthe system to unmap memory or to access undefined\nmemory and crash.\n\nAlso we were passing the memory address where the\nashmem region is mapped in the owner process to\nsupport cases where the client can pass back the\nMemoryIntArray instance. This allows an attacker\nto put invalid address and cause arbitrary memory\nto be freed.\n\nNow we no longer support passing back the instance\nto the owner process (the passed back instance is\nread only), so no need to pass the memory adress\nof the owner\u0027s mapping, thus not allowing freeing\narbitrary memory.\n\nFurther, we now check the memory mapped size against\nthe size of the underlying ashmem region after we do\nthe memory mapping (to fix the ahsmem size) and if\nan attacker changed the size under us we throw.\n\nTests: Updated the tests and they pass.\n\nbug:33039926\nbug:33042690\n\nChange-Id: Ib8e50afcdb5475123968572ac9696e8ed4031631\n" }, { "commit": "e5e0a85ef3eb6133478990ef78be972cc787c464", "tree": "e077c7f00884e6857e16057320d070dbecef695b", "parents": [ "99840df1e206c1fbd53b85900e8ec38aa1b240b0", "5a2a948be701267e4dcfc3219196ac3f19f36db9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 07 22:22:44 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 22:22:48 2016 +0000" }, "message": "Merge \"Fix slow exit transition left exited views INVISIBLE.\"" }, { "commit": "fb9f736a3c6c2e1c91c69b1abc0456b54215e8ef", "tree": "37542a8f3a93f073f3de7265123f9a4e32a79b83", "parents": [ "b38ac0b15dfa8d28d47e5d5a18ed6d1cf26b3a96" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Fri Oct 28 13:07:43 2016 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Wed Dec 07 13:24:54 2016 -0800" }, "message": "ProtoOutputStream convenience methods.\n\n- Add a set of write methods to ProtoOutputStream that figure out the type.\n The other methods are doing all the type checking anyway, so this won\u0027t be\n much slower, and it\u0027s way easier to use. The expected java type casts\n that people would do anyway happen inside.\n- Add writeObject and writeRepeatedObject methods that write a pre-encoded\n object.\n- Add a constructor that takes an OutputStream, and a flush() method. Right\n now, all the data gets flushed at the end, but given this API it would be\n possible to write smaller chunks at the object boundaries and do more\n sophisticated buffering.\n\nTest: CTS\nChange-Id: Ieb852092d3d65812c81139558151de9e3f467dc8\n" }, { "commit": "3dc8814e047cdc9f23375bd69d0e9dfd67f205c7", "tree": "6f3567b1df687d5b2f5a41fd4a1ceb9cde4fa678", "parents": [ "6f174ed4b11be919cd422d24ad728b28e4bf5b0c", "5207e1cff17530df336bbaf343ccc9c633fc1b65" ], "author": { "name": "Ned Burns", "email": "pixel@google.com", "time": "Wed Dec 07 21:20:15 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 21:20:15 2016 +0000" }, "message": "DO NOT MERGE Fix android:noHistory for Wear am: d7a313fb11\nam: 5207e1cff1\n\nChange-Id: Ie5ed01b9161da8ecf0e6b4ec92be71e941cc966c\n" }, { "commit": "5207e1cff17530df336bbaf343ccc9c633fc1b65", "tree": "015162400a4775eaf02bf8aebd7a9204e5ff9a31", "parents": [ "a33630fbbecf8fdb2314787cf296160c1829bff5", "d7a313fb118fb6f5e5eaae6acff253038a85da4b" ], "author": { "name": "Ned Burns", "email": "pixel@google.com", "time": "Wed Dec 07 21:14:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 21:14:51 2016 +0000" }, "message": "DO NOT MERGE Fix android:noHistory for Wear\nam: d7a313fb11\n\nChange-Id: I3715b2fb1045b7bfce7f52e9b4982fcc0218d28c\n" }, { "commit": "6a860f7f3bc9398199af7fb5b31f98890e9f51da", "tree": "1571e8ceda0ec379689694a6748ae929b3652359", "parents": [ "ef1d2b970c44523f3a7e822503a36f05f63b13d3", "d7a313fb118fb6f5e5eaae6acff253038a85da4b" ], "author": { "name": "Ned Burns", "email": "pixel@google.com", "time": "Wed Dec 07 21:14:36 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 21:14:36 2016 +0000" }, "message": "DO NOT MERGE Fix android:noHistory for Wear\nam: d7a313fb11\n\nChange-Id: I4de91badcff2690e701d3c46edf3b06498b003ee\n" }, { "commit": "9a648a1c74f39b8aca525ae3787d379cb4c76971", "tree": "b1441579cf9aa620ef915436f18659b73c835740", "parents": [ "c138a935d6961ab1ca01cccf17e510c5a0cfacce", "6e49c9f007c879f05b035c40c0ba543c00f9d0d0" ], "author": { "name": "Mike Reed", "email": "reed@google.com", "time": "Wed Dec 07 20:54:55 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 20:54:59 2016 +0000" }, "message": "Merge \"switch over clip calls to use SkClipOp instead of SkRegion::Op\"" }, { "commit": "ba6f8c8bef19111cd6247df87392149b7963c36f", "tree": "c80a8904ff889c55994aae7be2bd25472dcb4575", "parents": [ "f9587a35ba897b6229e9ae9829f815205d6ac474" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Nov 09 12:25:44 2016 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Dec 07 12:24:21 2016 -0800" }, "message": "Move dump() to dumpAsync(), more oneway calls.\n\nWhen calling out to dump services hosted by external apps, use\ndumpAsync() to avoid hanging if the remote process is wedged.\n\n(cherry picked from commit 850c83e6da3b34a4eab804133420247fc9dbb8a1)\n\nTest: builds, boots, runs with minimal logs triggered\nBug: 32715088\n\nMerged-In: I70aa2666ae21dae8f09ded2063bed359c0b210c5\n\nChange-Id: Ic2be10dc8478d613cea6e2c976b9987c250b86b7\n" }, { "commit": "d7a313fb118fb6f5e5eaae6acff253038a85da4b", "tree": "1f776b7af533a8d823b076f3fead9b1ed25e1263", "parents": [ "647166e852e361d9c91e939950d3038d373a4b58" ], "author": { "name": "Ned Burns", "email": "pixel@google.com", "time": "Tue Dec 06 15:52:01 2016 -0500" }, "committer": { "name": "Ned Burns", "email": "pixel@google.com", "time": "Wed Dec 07 15:05:25 2016 -0500" }, "message": "DO NOT MERGE Fix android:noHistory for Wear\n\nModifies swipe-to-close activities to be opaque by default (instead\nof translucent by default). Previously, android:noHistory properties\non most activities in Wear were being ignored because they were\nusually transitioning to a swipe-to-close activity that was marked\nas translucent. This meant that the noHistory activity was still\ntechnically visible, and so would never be culled from the task\nhistory.\n\nNow, we convert a swiped activity to translucent as soon as a swipe\nbegins, and convert it back after the swipe finishes. The previous\nversion of SDL tries to do this, but fails in the case where the\ncontext is a ContextWrapper.\n\nThis approach is hacky and isn\u0027t merge-able into master. We leave\nit DO NOT MERGE and will do a long-term fix after the holidays.\n\nTest: Built a test app to verify that noHistory is now being\ncorrectly respected. Manually verified that new activities start\nout opaque and not translucent. Manually verified that Home\ncorrectly starts/stops when it\u0027s revealed from underneath a\npartially swiped activity. Tested general swipe behavior on Settings,\nContacts, Flashlight, Fit.\n\nBug: 33252029\n\nChange-Id: Ib2e7f21ea1e0d52db03e78d25676501e5f73b31f\n" }, { "commit": "13b50bde4b5fef5cf843b6550646238132ee7be5", "tree": "d24473cbb1a95158301f4bdda94651464293ebf7", "parents": [ "674c6fba2f90dc0c89abfc64a29996d2a00f0114", "af534b111ccdb8c7c963ed49438332a7a05dcedc" ], "author": { "name": "Matthew Fritze", "email": "mfritze@google.com", "time": "Wed Dec 07 19:37:39 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 19:37:43 2016 +0000" }, "message": "Merge \"Update SearchIndexablesContract\"" }, { "commit": "1d138e59197ee05d89c43043d43916cccd7cd8e0", "tree": "860943f843cd31127bfe2162ae86f11402eb359a", "parents": [ "c76ec25ac438c93c42444d9141630bf26c22efb3", "4f05d8d76beef330339dea55170eddb86c58b03c" ], "author": { "name": "Sunny Goyal", "email": "sunnygoyal@google.com", "time": "Wed Dec 07 19:20:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 19:20:02 2016 +0000" }, "message": "Preventing widgets from exceeding Bitmap memory limit\nam: 4f05d8d76b\n\nChange-Id: I0174a7e8cc8b228d7cbf2c0403f0a022eff34194\n" }, { "commit": "bde1091f50d5125eb249dcdb1dc2e042a59e2f03", "tree": "678ba88ded2b647381598bf488a2edc4ac595a91", "parents": [ "987f4e53e412fbf540ae8f05ae7b5eca9bfc8c7e", "4f05d8d76beef330339dea55170eddb86c58b03c" ], "author": { "name": "Sunny Goyal", "email": "sunnygoyal@google.com", "time": "Wed Dec 07 19:12:21 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 19:12:24 2016 +0000" }, "message": "Merge \"Preventing widgets from exceeding Bitmap memory limit\" into nyc-mr2-dev" }, { "commit": "1804995d7ef7c76966824307b48e7eddbddbfce5", "tree": "de6136cbf09d13a1815fd42bb7d21517ee93aaab", "parents": [ "4566d01f6708fc16b49ccd117a491d115fc1e459", "20db11cfdab0e2838308847e644d9e6d4c31079b" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Dec 07 18:44:28 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 18:44:28 2016 +0000" }, "message": "Fix two StrictMode stack collection bugs.\nam: 20db11cfda\n\nChange-Id: Ie68764c9864e1c26f43c9d70c5697fe12d00e665\n" }, { "commit": "ae91d10629352ba9573d6c2dd91b5cc891521b65", "tree": "72cd69afe1759943d8d9c5685443ff3c380f920a", "parents": [ "6e5ff8a87d5d4e51ca040a9bb6ad50813ff45058", "20db11cfdab0e2838308847e644d9e6d4c31079b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 07 18:39:00 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 18:39:04 2016 +0000" }, "message": "Merge \"Fix two StrictMode stack collection bugs.\" into nyc-mr2-dev" }, { "commit": "c543b56706b13940156df664816ade473e1a0a22", "tree": "bc4e367a86dfbe17748ea48a8fd9e51fffab66dc", "parents": [ "929a81b81dc5ebdedf0fb4ba0aaa0ba544829304" ], "author": { "name": "Philip P. Moltmann", "email": "moltmann@google.com", "time": "Tue Dec 06 14:35:32 2016 -0800" }, "committer": { "name": "Philip P. Moltmann", "email": "moltmann@google.com", "time": "Wed Dec 07 10:33:21 2016 -0800" }, "message": "Only persist last Shared Preferences state\n\nIf multiple async shared preferences writes are queued, all but the\nlast one can be ignored as they will be overwritten by the last one\nanyway.\n\nFor commit() we need to make sure that we have at least persisted the\nstate of the commit.\n\nGeneration counts are 64 bit, hence they never overflow.\n\nTest: Produced a lot of SharedPreferences.Editor.apply and did not see\nexcessive writes anymore, ran SharedPreferences CTS tests\nBug: 33385963\nChange-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6\n" }, { "commit": "85e2fa4ee98160112d52d1d4005e7300193c056f", "tree": "93d08f7d354082e8a5bd95450dc7ba9cdd543edb", "parents": [ "56cbe002c09edcf2025c975fc2f4aeee032fc925", "10219fb261606fcc71c607167b28295b4578a10d" ], "author": { "name": "Derek Sollenberger", "email": "djsollen@google.com", "time": "Wed Dec 07 18:10:16 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 18:10:20 2016 +0000" }, "message": "Merge \"SkImageEncoder-\u003eSkEncodeImage\"" }, { "commit": "cb566f368bc3b83640f3f75f64c1e29641e362df", "tree": "1a4440f3ccee2eeaf50eca3d374afd77fd2c3913", "parents": [ "d5d209a745e9c0e906451cfdd5518b1931962567", "fc526f6e8406b073e8e48fbd8f63f57d3331237d" ], "author": { "name": "Mark Renouf", "email": "mrenouf@google.com", "time": "Wed Dec 07 17:38:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 17:38:13 2016 +0000" }, "message": "Revert \"Allow power button to close an input method\" am: 28f0e5bf48\nam: fc526f6e84\n\nChange-Id: Ifcf2f842c91677128e458dd7256013263543937f\n" }, { "commit": "fc526f6e8406b073e8e48fbd8f63f57d3331237d", "tree": "b4bebf8d695d6e70a1dc2ddeac3040df5c5726b8", "parents": [ "4ad5bd10cbce3ee26ea98ad1c765ba4d30237dcd", "28f0e5bf48e2d02e1f063670e435b1232f07ba03" ], "author": { "name": "Mark Renouf", "email": "mrenouf@google.com", "time": "Wed Dec 07 17:29:25 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 17:29:25 2016 +0000" }, "message": "Revert \"Allow power button to close an input method\"\nam: 28f0e5bf48\n\nChange-Id: I678857531259617cc26941fcc832cb7670d25bfe\n" }, { "commit": "af534b111ccdb8c7c963ed49438332a7a05dcedc", "tree": "b17c3d5fbb52c90a786218ed25455c927b8e07e8", "parents": [ "8e9440efde29cddfc9bd45498a9e82fc7493f1a5" ], "author": { "name": "Matthew Fritze", "email": "mfritze@google.com", "time": "Mon Dec 05 18:13:46 2016 -0800" }, "committer": { "name": "Matthew Fritze", "email": "mfritze@google.com", "time": "Wed Dec 07 17:24:30 2016 +0000" }, "message": "Update SearchIndexablesContract\n\nAdd Payload and PayloadType to the SearhIndexablesContract to support\nthe new Search architecture in Settings Search.\n\nChange-Id: I07e411ead11d420c19c737fad79d459f44288681\nTest: SettingsUnitTests\nBug: 33390556\n" }, { "commit": "6e5ff8a87d5d4e51ca040a9bb6ad50813ff45058", "tree": "0dbf65768bc626d4dc594073b67d3579b38c4cf7", "parents": [ "94280c0a91aca4d2b4025b5c78643c9bc3c8f629", "28f0e5bf48e2d02e1f063670e435b1232f07ba03" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 07 17:22:56 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 17:22:59 2016 +0000" }, "message": "Merge \"Revert \"Allow power button to close an input method\"\" into nyc-mr2-dev" }, { "commit": "20db11cfdab0e2838308847e644d9e6d4c31079b", "tree": "1d871daa1bdc25a062038b845df6b26852d591a5", "parents": [ "d95fc2d4c9103cab004931ecd22cbcfa9fcfd546" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Dec 06 16:47:00 2016 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Dec 07 08:58:38 2016 -0800" }, "message": "Fix two StrictMode stack collection bugs.\n\nWhen Binder calls are nested, we can quickly end up with a snowball\nof stacktraces that can cause the original transaction to fail. This\nCL makes two specific changes to alleviate this pressure:\n\n-- Consider a nested Binder call from PID A -\u003e B -\u003e C. If both B and\nC encounter dozens of StrictMode violations, then gatheredViolations\nin B will end up with 10 ViolationInfo (5 from B and 5 from C). This\nproblem only grows with each successive nested call. To solve this,\nalways limit ourselves to only ever write out 3 ViolationInfo from\nany given process.\n\n-- CrashInfo already nicely truncates any large stack traces to 20kB,\nbut readAndHandleBinderCallViolations() blindly appends the entire\nlocal trace, and never considers truncating again. Similar to the\nfirst problem above, nested calls can quickly cause the stackTrace\nvalue to explode in size. To solve this, we always re-truncate the\nstackTrace value after appending our local stack.\n\nAlso fix some NPE bugs when missing crashInfo.\n\n(cherry-picked from commit 58f27b5033542150a78fb050e2f85253a48efa67)\n\nTest: builds, boots\nBug: 32575987\nChange-Id: Ie8373ca277296f920f2b1c564d419c702a8ee0f2\n" }, { "commit": "929a81b81dc5ebdedf0fb4ba0aaa0ba544829304", "tree": "f30236d6f69232dbe80b6a398b087f1b157bf9a0", "parents": [ "9751197d30b750508f46dfa1112c4a8e7b4940d7", "64145dcbebdde22bc005f8968d72dc53045cff37" ], "author": { "name": "Wale Ogunwale", "email": "ogunwale@google.com", "time": "Wed Dec 07 16:09:07 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 16:09:10 2016 +0000" }, "message": "Merge \"Revert \"Correct error in Configuration.updateFrom\"\"" }, { "commit": "64145dcbebdde22bc005f8968d72dc53045cff37", "tree": "1f27b7a0427b94fa9106b6e568842d3852782986", "parents": [ "4647acb60e407670356c628d3a823c172dfeea64" ], "author": { "name": "Wale Ogunwale", "email": "ogunwale@google.com", "time": "Wed Dec 07 16:00:53 2016 +0000" }, "committer": { "name": "Wale Ogunwale", "email": "ogunwale@google.com", "time": "Wed Dec 07 16:00:53 2016 +0000" }, "message": "Revert \"Correct error in Configuration.updateFrom\"\n\nChange is preventing the device from showing the lock screen\nafter the boot animation.\n\nThis reverts commit 4647acb60e407670356c628d3a823c172dfeea64.\n\nBug: 33098677\nChange-Id: If7ecb04b74d5b626c7c3517e7e8d1dc1566ccb17\n" }, { "commit": "6e49c9f007c879f05b035c40c0ba543c00f9d0d0", "tree": "236bada9584af476e4989530fcc6154e589ae64a", "parents": [ "7bdd131a2458a833af31251b10a37d7ee2b646ed" ], "author": { "name": "Mike Reed", "email": "reed@google.com", "time": "Fri Dec 02 15:36:59 2016 -0500" }, "committer": { "name": "Mike Reed", "email": "reed@google.com", "time": "Wed Dec 07 10:34:39 2016 -0500" }, "message": "switch over clip calls to use SkClipOp instead of SkRegion::Op\n\nChange-Id: I67d23c487b5249bc31d96e3b2393f693c0b2bcff\n" }, { "commit": "9751197d30b750508f46dfa1112c4a8e7b4940d7", "tree": "867fc634a2216ef8cf6e3d3b407203dc17b2f985", "parents": [ "4a7cda98fca86d1a1b7df78d302e3caaf07137e1", "aa9cbc00e642a85898d3f3b17dbb8a40c8c3945b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 07 14:29:25 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 14:29:28 2016 +0000" }, "message": "Merge \"Fix javadoc of EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION\"" }, { "commit": "10219fb261606fcc71c607167b28295b4578a10d", "tree": "38b06a88ef8cd07c6d5517612c098d1a81880044", "parents": [ "4a7cda98fca86d1a1b7df78d302e3caaf07137e1" ], "author": { "name": "Hal Canary", "email": "halcanary@google.com", "time": "Wed Nov 23 20:41:22 2016 -0500" }, "committer": { "name": "Derek Sollenberger", "email": "djsollen@google.com", "time": "Wed Dec 07 13:29:42 2016 +0000" }, "message": "SkImageEncoder-\u003eSkEncodeImage\n\nTest: none\nChange-Id: I15630d2852d12840329181f135852e28d287bbcf\n(cherry picked from commit 8c6bac4c77caeefb667bec90d16b5384fd2b2b31)\n" }, { "commit": "754950497050d20ede4ebd30fd99dfda95721349", "tree": "5512230f522cdbbd20ae5503951a7bd01e297e27", "parents": [ "2c01c43055d6a2e9a7862bf9d91d526dedfc6336", "4467b79592052598a362ff77884fdcce67d16cb4" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Dec 07 09:30:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 09:30:09 2016 +0000" }, "message": "Merge \"Handle IpReachabilityMonitor errors better.\" am: 3af34c8e0a\nam: 4467b79592\n\nChange-Id: I5d4d2d9888d85a684425b8204785099f818e6546\n" }, { "commit": "82ddb5e118e92cecb07e8850217c1b333563237a", "tree": "192f8c102b9387b6499689d259423facca4c9a45", "parents": [ "dc46397a448671cd5fec888fc30e70df8e8b791b", "58f27b5033542150a78fb050e2f85253a48efa67" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 07 08:21:38 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 08:21:42 2016 +0000" }, "message": "Merge \"Fix two StrictMode stack collection bugs.\"" }, { "commit": "b406666cf5f09a9d11fcdad4df7124c386672954", "tree": "c15851a933a06a283e39d537ee0684ec2aaca41e", "parents": [ "3101778fb2b757e5416f4ebbd36d7df0d5d05daa" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Fri Oct 14 18:33:22 2016 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Dec 07 16:23:26 2016 +0900" }, "message": "Handle IpReachabilityMonitor errors better.\n\nIf construction of a new IpReachabilityMonitor throws an IAE then\nlog it and immediately call onProvisioningFailure().\n\nTest: runtest frameworks-wifi\n passes, except for selectQualifiedNetworkDoesNotChooseDeletedEphemeral()\n which fails with an NPE for unrelated reasons.\n\nBug: 31038971\nBug: 31742703\nChange-Id: Ie91b8bdd509d06ad54d062bf446e74c092eb096c\n(cherry picked from commit e4526604664cb66ecdcbeca4d8f64e8c94750c31)\n" }, { "commit": "58f27b5033542150a78fb050e2f85253a48efa67", "tree": "9e8e223ddaa2c2f38c5e5b796e804368621ddacd", "parents": [ "598e9a7f41c714b6ccac05dea0d63e9274af7739" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Dec 06 16:47:00 2016 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Wed Dec 07 06:31:50 2016 +0000" }, "message": "Fix two StrictMode stack collection bugs.\n\nWhen Binder calls are nested, we can quickly end up with a snowball\nof stacktraces that can cause the original transaction to fail. This\nCL makes two specific changes to alleviate this pressure:\n\n-- Consider a nested Binder call from PID A -\u003e B -\u003e C. If both B and\nC encounter dozens of StrictMode violations, then gatheredViolations\nin B will end up with 10 ViolationInfo (5 from B and 5 from C). This\nproblem only grows with each successive nested call. To solve this,\nalways limit ourselves to only ever write out 3 ViolationInfo from\nany given process.\n\n-- CrashInfo already nicely truncates any large stack traces to 20kB,\nbut readAndHandleBinderCallViolations() blindly appends the entire\nlocal trace, and never considers truncating again. Similar to the\nfirst problem above, nested calls can quickly cause the stackTrace\nvalue to explode in size. To solve this, we always re-truncate the\nstackTrace value after appending our local stack.\n\nAlso fix some NPE bugs when missing crashInfo.\n\nTest: builds, boots\nBug: 32575987\nChange-Id: Ie8373ca277296f920f2b1c564d419c702a8ee0f2\n" }, { "commit": "761ee08e0ac954143511fd05bfd028c906a2b01a", "tree": "84bf1b74b40110edfd7237eae794c92e2917538a", "parents": [ "82284a176d109f9c15ec308bef42bb0fbd5a4331", "519cb74e9268f97da3c35c9b7bb876e22d2eaa78" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Wed Dec 07 02:35:42 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 02:35:42 2016 +0000" }, "message": "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission. am: 965f4265c5\nam: 519cb74e92\n\nChange-Id: I988f82958648d6e141e3c161f6e7e72346d0a818\n" }, { "commit": "519cb74e9268f97da3c35c9b7bb876e22d2eaa78", "tree": "a712e8d586f530979138c365452c80d096bb6797", "parents": [ "429919106077574ef787ae415dce32a10c732ad3", "965f4265c5207c01d79626e0b55245330658020e" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Wed Dec 07 02:31:41 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 02:31:41 2016 +0000" }, "message": "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.\nam: 965f4265c5\n\nChange-Id: Ib7380a343f55e262c2df61d7ad9fc9e8e959a7b7\n" }, { "commit": "d95fc2d4c9103cab004931ecd22cbcfa9fcfd546", "tree": "170de5ba162e2474b41962d9b3086e65c5a423ba", "parents": [ "7ba6d21aac5d268e70b49a9d767e0144e15d57e4", "965f4265c5207c01d79626e0b55245330658020e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 07 02:24:34 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 02:24:42 2016 +0000" }, "message": "Merge \"Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.\" into nyc-mr2-dev" }, { "commit": "6c686c4dd35f675a695f2f0d56a8e22b6041b626", "tree": "4b781a51a4099a20a4fb93fc05840afb05b5c324", "parents": [ "c2f084e18fd2ce782e247d1326f509d0150af5dd", "37541865f32f02f8447692eb762d3d5109440edb" ], "author": { "name": "Tomasz Mikolajewski", "email": "mtomasz@google.com", "time": "Wed Dec 07 02:09:12 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 02:09:12 2016 +0000" }, "message": "Merge \"Fix crashing StrictJarFile due to doubled closing.\" am: 68ea36243d am: 15cd392108 am: 3199d58939\nam: 37541865f3\n\nChange-Id: Iae24b046178c00e4e8cda7ee1dc25c993ef38c0b\n" }, { "commit": "37541865f32f02f8447692eb762d3d5109440edb", "tree": "36c52e62e3e41454baf58cee1c1caa87f397ff8d", "parents": [ "9347a4f38f85357957aa11f47ef942275579380c", "3199d58939ad949f7cc074806d366d615e2fc998" ], "author": { "name": "Tomasz Mikolajewski", "email": "mtomasz@google.com", "time": "Wed Dec 07 02:01:12 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 02:01:12 2016 +0000" }, "message": "Merge \"Fix crashing StrictJarFile due to doubled closing.\" am: 68ea36243d am: 15cd392108\nam: 3199d58939\n\nChange-Id: I269b4a0a7fcbb30804a3dd39870cce927c2b9596\n" }, { "commit": "3199d58939ad949f7cc074806d366d615e2fc998", "tree": "3a36d70085971218ff2a255e3be3d9ae6dca9d87", "parents": [ "472d5ecb5faee1ca7706410abbb6776f52891d71", "15cd3921083bd54c72b4a2501329ea3a0e8574cf" ], "author": { "name": "Tomasz Mikolajewski", "email": "mtomasz@google.com", "time": "Wed Dec 07 01:54:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 01:54:13 2016 +0000" }, "message": "Merge \"Fix crashing StrictJarFile due to doubled closing.\" am: 68ea36243d\nam: 15cd392108\n\nChange-Id: I63034776a185682f11ea736b0d37a4b3be31bc47\n" }, { "commit": "68ea36243df0d75bd6ab4f6c94cfba40b91ab089", "tree": "f817d6a664df4fc7040f560ff1e20664aaf97e3a", "parents": [ "54710df28d72ef6bca663447c9dab0a84899aeb8", "b061fc2bb5b6e8397c7f3a40be521badad91e9af" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 07 01:40:48 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 07 01:40:48 2016 +0000" }, "message": "Merge \"Fix crashing StrictJarFile due to doubled closing.\"" }, { "commit": "f1b75647a3d8b51abdc3064445db4f6e40617cb8", "tree": "e4dce05d8eaf96de10a7aaff58cb55a9502e9b0a", "parents": [ "70ae1bf4db205fd22608a3831233e4804f85e09c" ], "author": { "name": "Stephen Chen", "email": "stewchen@google.com", "time": "Tue Dec 06 16:08:52 2016 -0800" }, "committer": { "name": "Stephen Chen", "email": "stewchen@google.com", "time": "Tue Dec 06 16:21:14 2016 -0800" }, "message": "Clarify doc on NETWORK_RECOMMENDATIONS_ENABLED and WIFI_WAKEUP_ENABLED.\n\nBug: 32913919\nTest: n/a\nChange-Id: Ied075bdcc1ebb8f0a4bc0d3bf9758fa6719ce0b9\n" }, { "commit": "ba825554bc02ab3506d56d56e944e070c44639b1", "tree": "c7fd33557e6408ffb6547ec0957873f5b97117f3", "parents": [ "82834baa358f55acb542e17da828b2d497cf8332" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Wed Nov 30 16:44:11 2016 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Dec 06 16:19:12 2016 -0800" }, "message": "Adding a new string array resource for network recommendations.\n\nThe new resource allows for multiple package names to be specified\nin priority order.\n\nTest: Nothing to test.\nBUG: 33158362\nMerged-In: I4a066d9220c723a17dd11e2566161fade6bb471b\nMerged-In: Ifed73e493fe7de64b3dd051a53d16d39da1e4eef\nChange-Id: I26ac87a49ae94dd0763173af5c8a2c6abe7cb5f8\n" }, { "commit": "2724906a6ca63fe93868bc4a2032775bf2c6eda6", "tree": "43b66b614e1452ae873abf8d5bb6a3f7efac4b79", "parents": [ "b7abefa16a3e274bfa1ecb2dd84f5c00159a8cea", "33e8de479ab373767ef38de24c17aec326281c52" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Wed Dec 07 00:12:27 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 00:12:27 2016 +0000" }, "message": "Merge \"API for requesting network recommendations.\" am: 800a4e753e am: 2b57c69e25\nam: 33e8de479a\n\nChange-Id: Ibf7f6a12eeb92f56c5873c3f7e3e10ff4adbd8fd\n" }, { "commit": "965f4265c5207c01d79626e0b55245330658020e", "tree": "d57faaffb4f5ec14958daf1f62d7fd6c15798629", "parents": [ "52ae3289fba02b03b7cb74afad628b9c80253045" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Dec 05 10:51:30 2016 -0800" }, "committer": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Wed Dec 07 00:08:40 2016 +0000" }, "message": "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission.\n\nChange-Id: I84dc652f7297c2b8c9351e737074ddf43754718d\nFixes: 32950329\nTest: manually verified it\n" }, { "commit": "33e8de479ab373767ef38de24c17aec326281c52", "tree": "926160bea7dbf453c5a5bb2fca9d4111c732621d", "parents": [ "d917e23bbb8bda95f9ce512b1446f15926868454", "2b57c69e258f4f5254c1c42d4241aaac7df6654c" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Wed Dec 07 00:05:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 00:05:29 2016 +0000" }, "message": "Merge \"API for requesting network recommendations.\" am: 800a4e753e\nam: 2b57c69e25\n\nChange-Id: I8f2357942919193a22e97e4f1d9ec415b736565c\n" }, { "commit": "2b57c69e258f4f5254c1c42d4241aaac7df6654c", "tree": "35a57c84d9810438a92cb7036cab3bba96580a5b", "parents": [ "19426fef23de12470599f84261632d20f2944b10", "800a4e753e991ea23b4c72568b3150b8c232aa6a" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Dec 06 23:58:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 06 23:58:13 2016 +0000" }, "message": "Merge \"API for requesting network recommendations.\"\nam: 800a4e753e\n\nChange-Id: Icda431682a283051d4f5f5052dc70b8ab8e01dc9\n" }, { "commit": "82834baa358f55acb542e17da828b2d497cf8332", "tree": "35a57c84d9810438a92cb7036cab3bba96580a5b", "parents": [ "800a4e753e991ea23b4c72568b3150b8c232aa6a", "5b9b0db9f8532aea7c907d3f5ac8b7808b46c1c7" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Dec 06 15:17:16 2016 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Dec 06 15:17:16 2016 -0800" }, "message": "Merge remote-tracking branch \u0027goog/stage-aosp-master\u0027 into HEAD\n" }, { "commit": "800a4e753e991ea23b4c72568b3150b8c232aa6a", "tree": "f3f0317e5dd7867831a04d481c1d9e1ac499b7c4", "parents": [ "019867cb52ce82d8e09de5e346e2ab86bd24e5be", "d1daf6d22aeb502c0f94261f3421999c2da6ee51" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Dec 06 23:08:02 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 06 23:08:03 2016 +0000" }, "message": "Merge \"API for requesting network recommendations.\"" }, { "commit": "892c750f17cc8542d0048c2cdc5bda57d38f9f1c", "tree": "03142a3c0405700abbafa5b494b9317a4d2fbb9e", "parents": [ "e35aff17e9c58c1c28325e77e53e5e4f71a07580", "4647acb60e407670356c628d3a823c172dfeea64" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Dec 06 22:38:17 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 06 22:38:20 2016 +0000" }, "message": "Merge \"Correct error in Configuration.updateFrom\"" }, { "commit": "62be439d26a9e0748d4626bed8ffa117e39764a2", "tree": "2fb600204052dd76fb00c5823144d280fa215737", "parents": [ "873c99c30b550172d6793d9d04ce6196aec64721" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Mon Dec 05 13:59:52 2016 -0800" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Tue Dec 06 14:17:06 2016 -0800" }, "message": "Notifications: Fix bad layout for long texts\n\nFixes a bug where the max lines restriction was not properly\npassed to ImageFloatingTextView\u0027s layout, causing the TextView\nto improperly apply bottom padding.\n\nChange-Id: Ibe07515866a4599047712a0482332ed4430c9056\nTest: runtest -x core/tests/coretests/src/com/android/internal/widget/ImageFloatingTextViewTest.java\nFixes: 32658499\nBug: 32658499\n" }, { "commit": "cb42822758e95fcfbb791cb471dc96f780fb9bd1", "tree": "702f59091e75da91806e2ec889492f9e56f9f76b", "parents": [ "d66edc45b69e8644dbe0a5004077d71bcc315234", "1397837af370206fea01247fae7cf77228b08037" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Dec 06 21:17:21 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 06 21:17:23 2016 +0000" }, "message": "Merge \"API for requesting network recommendations.\"" }, { "commit": "975ce4661a9db2daf1d70ad688d9b84aa382e5c1", "tree": "5581781635ca5b39788f68ccc468fbc2040c5d4d", "parents": [ "0c9bd0a4afae1c9d3a0af00bcf7ab520bb3afd10", "b63bf2a5ef34bedeee274bfe13f035321aceb49f" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Dec 06 21:03:18 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 06 21:03:18 2016 +0000" }, "message": "Adding a new string array resource for network recommendations.\nam: b63bf2a5ef\n\nChange-Id: Icadfc2ee9fa108c9bdf62f167f13497da3db814e\n" }, { "commit": "7f0dc425a31d4173fc6c79e20d1490bb9a2a25fd", "tree": "dab1e88390b3537f4ed6148ad3d19e3d12047db5", "parents": [ "17ba97ca522308554adfc1c3669d1863294e1176", "5db1ec0de1ead159ae7e272bb7e9a881359a31a7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Dec 06 21:00:42 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 06 21:00:44 2016 +0000" }, "message": "Merge \"Adding a new string array resource for network recommendations.\"" }, { "commit": "95b7e5fb2123776e553a5e88c30e446e369a4ac3", "tree": "85c08d15b9b925bd3e48e8e42055116cc31877da", "parents": [ "6bc035949f5237d6833a4a8be8cc17872b9ba7e9", "b63bf2a5ef34bedeee274bfe13f035321aceb49f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Dec 06 20:55:10 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 06 20:55:13 2016 +0000" }, "message": "Merge \"Adding a new string array resource for network recommendations.\" into nyc-mr1-dev-plus-aosp" }, { "commit": "d1daf6d22aeb502c0f94261f3421999c2da6ee51", "tree": "9eebc755d44107d1a83cf96a9b9f66b54a7f7492", "parents": [ "9600df035b9994ae481dd7ce0335241b752f7034" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Mon Nov 28 17:47:35 2016 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Dec 06 12:48:30 2016 -0800" }, "message": "API for requesting network recommendations.\n\nDefining a new system API that will allow the system to request\nnetwork recommendations from a NetworkScoreService implementation.\n\nTest: Coming in a future CL.\nBUG: 32909424\nMerged-In: I2d5c0a843b928b04e87c1862a78702a02fd54c31\nChange-Id: Idd33095c6cd2f5b391796c900399f18a2c40fcc3\n" }, { "commit": "4647acb60e407670356c628d3a823c172dfeea64", "tree": "94e4b2da590ac8b2f601ca7e4dd717c3eff7ba4f", "parents": [ "cac1d6a00b8e21f5f6c9925e25a29ef883c56308" ], "author": { "name": "Robert Carr", "email": "racarr@google.com", "time": "Mon Dec 05 20:33:10 2016 -0800" }, "committer": { "name": "Robert Carr", "email": "racarr@google.com", "time": "Tue Dec 06 12:34:35 2016 -0800" }, "message": "Correct error in Configuration.updateFrom\n\nWhen updating the non direction members of screenLayout\nwe check that they are not in total undefined, before\naccepting the new value in full. This was enough for LONG/SIZE\nwhich are always undefined or set together. It seems we have paths\nnow where SCREENLAYOUT_ROUND however can be undefined and the others\nwill be set. In this case if we pass a configuration with SCREENLAYOUT_ROUND_UNDEFINED\nbut LONG/SIZE set to updateFrom then we will overwrite our previous SCREENLAYOUT_ROUND value.\nThis triggers extra configuration changes.\n\nBug: 33098677\nTest: bit FrameworksCoreTests:android.content.res.ConfigurationTest\nChange-Id: I6eb321d27011a2af2134d0ed5b6864d4cd902dc3\n" }, { "commit": "5773d9702e30a4a3f7c159eb26937a67c332f8c1", "tree": "fc37432e47ddb3a202f5b91ec0ee84abf325cca5", "parents": [ "70ae1bf4db205fd22608a3831233e4804f85e09c", "b2c312a742ad650c4f8c39e5ba7d94acd41b2357" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Dec 06 20:15:27 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 06 20:15:28 2016 +0000" }, "message": "Merge \"Move dump() to dumpAsync(), more oneway calls.\"" }, { "commit": "79046ce039b973025180eac2d19ec5e72bdaa55b", "tree": "9321c63acd40792cea5f65a5743d978f80e06da0", "parents": [ "877ab7f9fd165b2f93adc325858fd6b1d93dc100", "70889ff69fe6af3dd51d67bea6dcf4ef940df546" ], "author": { "name": "Stephen Chen", "email": "stewchen@google.com", "time": "Tue Dec 06 19:41:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 06 19:41:55 2016 +0000" }, "message": "Merge \"Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag.\" am: 70ae1bf4db am: 45fdf32038 am: e70ef235fb\nam: 70889ff69f\n\nChange-Id: If076123dc3874615b058bbddfd3c4810f54b303d\n" }, { "commit": "70889ff69fe6af3dd51d67bea6dcf4ef940df546", "tree": "f547d0e1375ee907996f330b385400ed6d1362c0", "parents": [ "416427e82080d4652e0292b29117710de8bc409b", "e70ef235fbe4f38ab2c76da45027b16fe4635210" ], "author": { "name": "Stephen Chen", "email": "stewchen@google.com", "time": "Tue Dec 06 19:34:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 06 19:34:46 2016 +0000" }, "message": "Merge \"Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag.\" am: 70ae1bf4db am: 45fdf32038\nam: e70ef235fb\n\nChange-Id: I46186245e038597018f66e44459d724456e8f993\n" }, { "commit": "e70ef235fbe4f38ab2c76da45027b16fe4635210", "tree": "9dc99640bb5f5cb0c53148600bea9ae095e3eec3", "parents": [ "4ce3dee6e64e6ab568f9d3ecf8ea9249f71cdae3", "45fdf320381637ed60b6a78a0af58c8e9ce8f60a" ], "author": { "name": "Stephen Chen", "email": "stewchen@google.com", "time": "Tue Dec 06 19:27:45 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 06 19:27:45 2016 +0000" }, "message": "Merge \"Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag.\" am: 70ae1bf4db\nam: 45fdf32038\n\nChange-Id: I141248962fc0ce710b6860f3f67ca156ecdab46e\n" }, { "commit": "45fdf320381637ed60b6a78a0af58c8e9ce8f60a", "tree": "86370d43e09c456b7a3d0292d90c575ba6fc4e23", "parents": [ "f120cf3d886753b4ae28bda48b1d2b10b754798c", "70ae1bf4db205fd22608a3831233e4804f85e09c" ], "author": { "name": "Stephen Chen", "email": "stewchen@google.com", "time": "Tue Dec 06 19:20:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 06 19:20:24 2016 +0000" }, "message": "Merge \"Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag.\"\nam: 70ae1bf4db\n\nChange-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022\n" }, { "commit": "70ae1bf4db205fd22608a3831233e4804f85e09c", "tree": "bf89168638e34f5b680ab2b90be19db9f4b78d74", "parents": [ "9600df035b9994ae481dd7ce0335241b752f7034", "6a0c879de30e8e1a3ad23748a4ba9dde10bba75c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Dec 06 19:11:28 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 06 19:11:28 2016 +0000" }, "message": "Merge \"Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag.\"" } ], "next": "b2c312a742ad650c4f8c39e5ba7d94acd41b2357" }