)]}' { "log": [ { "commit": "761427c75b85268b9ae293f6ccfd2099654b5e95", "tree": "00d16ada5ad37c401b74bf365ae0f5eaa3faeeed", "parents": [ "25c2a82bed6b32fa2a22129746c48e10a61a20cb", "64b23cca4dc4bea6bb2c7b4ff5bf3ada675d82ab" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Tue Oct 10 01:35:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 10 01:35:20 2017 +0000" }, "message": "Merge \"docs: Adding API level 27 (Oreo MR1) to the docs build options\" into oc-mr1-dev\nam: 64b23cca4d\n\nChange-Id: I4d71688ec991555d400e5ce86baad61270bba9b9\n" }, { "commit": "a6019b27e7e88369df3e8dca0b67acb417cb8a52", "tree": "bdb3b4e06fe597f045fb81e9f63e49b5f10818f3", "parents": [ "4dc293841802ab8ff15a66e1b6e6178fa126646a" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Oct 06 14:27:20 2017 -0700" }, "committer": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Sat Oct 07 02:12:34 2017 +0000" }, "message": "docs: Adding API level 27 (Oreo MR1) to the docs build options\n\nWe also need to modify the server settings to add the watermark to\ndocs with API level 27.\n\nTest: make ds-docs\nBug: 67459392\nChange-Id: I7c0f74924a5b39dede4c324069ff05e26eec5413\n" }, { "commit": "ae1d9692e18dadcc5c304538ef3160334ec4c04d", "tree": "dc6ff3b451c8859c5d9d95f69e92baa5f7a415ad", "parents": [ "9c970eee778ef50bc6313d715629a9a3d9fc22bc", "e2154883341df9bac61c7784bc10d667f7ab00e9" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Oct 04 04:29:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 04 04:29:26 2017 +0000" }, "message": "Merge \"Convert java hwbinder mk -\u003e bp.\" am: 53c945fb71 am: 7bebf15460\nam: e215488334\n\nChange-Id: Ic24c9d2af58e58aa97e0ad1f8b2ff50f7db66007\n" }, { "commit": "7bebf1546009b896bac7145fbecadefc9cce5d3d", "tree": "7a55e2dfd13ee2dda7fb4ef36491ef634aae9277", "parents": [ "d4b6e59cadce670fced3df4dcb1d368d0b1284b6", "53c945fb71ab5375c54302f02f7b20e5678667b1" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Oct 04 04:11:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 04 04:11:38 2017 +0000" }, "message": "Merge \"Convert java hwbinder mk -\u003e bp.\"\nam: 53c945fb71\n\nChange-Id: Ia1bde2b32e824f160dd4e768531b6b48179f7ba5\n" }, { "commit": "eddafe990f12526c3a22c724159670e0df5fbe44", "tree": "865536bd5b9b7a1cd800521c7f0a52215ace04b5", "parents": [ "537d63fe1a6c06a4219deee188f0cf781cb80c1d" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Oct 02 16:58:41 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Oct 04 03:40:15 2017 +0000" }, "message": "Convert java hwbinder mk -\u003e bp.\n\nThis library is used to avoid a circular dependency\nbetween frameworks.jar and HIDL hal definition libs.\nIt is not installed on the device.\n\nBug: 33420795\nTest: m -j hwbinder and things it depends on\nChange-Id: I44cc670383f80275026ea892151524599b713087\n" }, { "commit": "3e0f22f67620a3dcbd496bb868152695f7d12d7e", "tree": "ed82708864ee7577be94245c7d39239a13f8a1bc", "parents": [ "2089f926254ee91068141cf77ea6d49b0f99308b", "febecb821865a03585ac1d752c4f1a3de094581c" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Sep 15 03:22:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 15 03:22:23 2017 +0000" }, "message": "Merge \"Apply suggested edits to the file-download API\" am: f6c9baa0cd am: 3934c475ce\nam: febecb8218\n\nChange-Id: Ibf5acac5b44c772b629472591124151c479c8f6c\n" }, { "commit": "3934c475ce8e831cdcb65165c7867bab7efd6fdd", "tree": "4fdc44874a155e97a6e9721e5cbe628087c2c362", "parents": [ "66d7275d393209bea48711df633b023d987652bb", "f6c9baa0cd24d44880adb667b7d9e4a752f6d784" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Sep 15 00:40:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 15 00:40:49 2017 +0000" }, "message": "Merge \"Apply suggested edits to the file-download API\"\nam: f6c9baa0cd\n\nChange-Id: I0724d3bad15fadbfd5eb46e104b49ee1dafc8c9c\n" }, { "commit": "1a5b1304687d591cd5f913e50e8636d139ec1a25", "tree": "47389ae19e3f866b94e18ceeaacbf9929a126ecc", "parents": [ "a96478a9b7d7be9c646a5679b817ea2fae27d704" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Sep 01 17:59:15 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Sep 14 17:04:49 2017 -0700" }, "message": "Apply suggested edits to the file-download API\n\n* Rename Manager -\u003e Session\n* Add Handler for callbacks in download flow\n* Separate out registering a state callback into another method\n* Rename dispose -\u003e close, implement AutoClosable\n* No more thrown MbmsExceptions\n* Add sanity check for temp file root\n* Remove the getNames method, replace with getNameForLocale\n\nBug: 30981736\nTest: testapps\nChange-Id: I1a2054d79c934bc4929464de4a644b6960db47e9\n" }, { "commit": "23d80af5c11de192bdb648642706c43c942be60e", "tree": "1364477f430517ea1b5a752b2614acdc055d3e18", "parents": [ "1bbf2878595ca6ead31a93a39ba93a74aabb4fb7" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Sep 01 17:59:15 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Sep 14 14:37:47 2017 -0700" }, "message": "Apply suggested edits to the file-download API\n\n* Rename Manager -\u003e Session\n* Add Handler for callbacks in download flow\n* Separate out registering a state callback into another method\n* Rename dispose -\u003e close, implement AutoClosable\n* No more thrown MbmsExceptions\n* Add sanity check for temp file root\n* Remove the getNames method, replace with getNameForLocale\n\nBug: 30981736\nTest: testapps\nChange-Id: I1a2054d79c934bc4929464de4a644b6960db47e9\n" }, { "commit": "a96478a9b7d7be9c646a5679b817ea2fae27d704", "tree": "64f2722cadc90ce6ed13e5708418a11381995cc4", "parents": [ "5dab2f297c9e51640114eaa0f7bac1b2044a4d0a" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Mon Aug 28 14:10:46 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Sep 14 13:42:08 2017 -0700" }, "message": "Make changes to MBMS Streaming APIs per recommendations\n\n* Rename MbmsStreamingManager -\u003e MbmsStreamingSession\n* MbmsStreamingSession now implements AutoClosable instead of using\ndispose()\n* No longer throw checked MbmsExceptions from any methods. All such\nerrors will be reported via the async callback.\n* null arguments no longer accepted for Handlers\n* Guarantee that no further callbacks will get enqueued after closing.\n\nTest: run testapps\nBug: 30981736\nMerged-In: I6db045053f1baa4cd4de3718865fcfe525e8a4d6\nChange-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d\n" }, { "commit": "9408a33b7eadb691ac6ba6e1639879dad664b584", "tree": "42b7e77b73968debac8d31f224c588f7f9cbf2d1", "parents": [ "bd4d6dede5577219a969c36799b42f1ffdbe6458", "4de6420978f70824fed360b7bcad5bce49c9f08c" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Sep 14 20:11:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 20:11:32 2017 +0000" }, "message": "Merge \"Make changes to MBMS Streaming APIs per recommendations\" am: 1bbf287859 am: 200d8f6242\nam: 4de6420978\n\nChange-Id: I6db045053f1baa4cd4de3718865fcfe525e8a4d6\n" }, { "commit": "200d8f6242cad3ad1d2bff71c939134557735f01", "tree": "1986b66e60cdfe0ce58d1c91278a6502c02ca60b", "parents": [ "8ab1ed1789bc519ed6a18e564c0bbd99a8946543", "1bbf2878595ca6ead31a93a39ba93a74aabb4fb7" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Sep 14 19:45:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 19:45:04 2017 +0000" }, "message": "Merge \"Make changes to MBMS Streaming APIs per recommendations\"\nam: 1bbf287859\n\nChange-Id: I76662fd9822dcde781cdecafb45239e1da6337d9\n" }, { "commit": "fc2bd9ee5ef47227247809e2d1e16de9b03d8461", "tree": "67b6f9c7ced10400422c54222993d7ce971dc123", "parents": [ "dbc067bcc78c619d45f5bbe0195e222e7828c3a5", "6288f42286e02069b57c3f1a192526c1a152e3e4" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Sep 14 10:26:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 14 10:26:20 2017 +0000" }, "message": "Merge changes from topics \"embms-0804-adjustments\", \"prepare-download-unhide\" am: 910e5751b6 am: dd6878ad03\nam: 6288f42286\n\nChange-Id: I62c0d1f6e8d82ccda9740672263f8dfe11f475a4\n" }, { "commit": "dd6878ad03743f303bd055f87749748fbf73e009", "tree": "57a49906057a7ffa86c1fb538a2b2f625392f5a4", "parents": [ "c41603544877403dd1f2c6a9efc070e3bef26602", "910e5751b65163ced4710616d0aa5045937ac2e4" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Sep 13 22:17:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 13 22:17:01 2017 +0000" }, "message": "Merge changes from topics \"embms-0804-adjustments\", \"prepare-download-unhide\"\nam: 910e5751b6\n\nChange-Id: I07e7d0d4d799aded59797e237ec733354f3293df\n" }, { "commit": "9903558d9df6e2493fffb37b199faac01e595a0d", "tree": "26cd0db5f0dd152df6bf61c64a13fbb6865b8d14", "parents": [ "3b51e07889b0e708511a6adfd79b78d024de6592" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Aug 04 18:41:56 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Sep 13 13:19:18 2017 -0700" }, "message": "Make EMBMS adjustments for 08/04\n\n* Add a download state callback to the callback formerly for progress\n* Rename EXTRA_SERVICE_INFO to EXTRA_SERVICE_ID, and specify that it\nshould be a String rather than a ServiceInfo\n* Add documentation to clarify that the progress/state callback may be\nnull\n\nBug: 30981736\nTest: manual\nChange-Id: Ie1ec99868f5b09a270b500dc97abeb9f819cfa56\n" }, { "commit": "d666a8916346ed760e809d708c63bf36f8b12aed", "tree": "0e2327ca7256a93bb85609a24c7d834a4150317d", "parents": [ "39605add8994d6114736c2e98fa8314209215670" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Mon Aug 28 14:10:46 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Sep 08 14:55:03 2017 -0700" }, "message": "Make changes to MBMS Streaming APIs per recommendations\n\n* Rename MbmsStreamingManager -\u003e MbmsStreamingSession\n* MbmsStreamingSession now implements AutoClosable instead of using\ndispose()\n* No longer throw checked MbmsExceptions from any methods. All such\nerrors will be reported via the async callback.\n* null arguments no longer accepted for Handlers\n* Guarantee that no further callbacks will get enqueued after closing.\n\nTest: run testapps\nBug: 30981736\nChange-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d\n" }, { "commit": "571293ad96eae0a10d61fa2bd9e78f8cbb78803e", "tree": "0be94e57cc798ccd2365535c000547d93fe4434c", "parents": [ "ff6f9862e5dd1b2fd825ed69dc11918a0565fd33" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Aug 04 18:41:56 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Mon Aug 28 14:27:56 2017 -0700" }, "message": "Make EMBMS adjustments for 08/04\n\n* Add a download state callback to the callback formerly for progress\n* Rename EXTRA_SERVICE_INFO to EXTRA_SERVICE_ID, and specify that it\nshould be a String rather than a ServiceInfo\n* Add documentation to clarify that the progress/state callback may be\nnull\n\nBug: 30981736\nTest: manual\nChange-Id: Ie1ec99868f5b09a270b500dc97abeb9f819cfa56\n" }, { "commit": "28440ed3b9476adb768254166ee26a1aa37950c3", "tree": "5535719d9589f9799b3d6324b3aba1f85c480197", "parents": [ "793c4be8d46aa163744e62c2af2907055028f8a7", "0716c8e60ec30a1ef42a57ef19a091866b5984c7" ], "author": { "name": "Ian Pedowitz", "email": "ijpedowitz@google.com", "time": "Thu Aug 10 17:46:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 10 17:46:32 2017 +0000" }, "message": "Merge \"Revert \"Initial support for proposed android.net.lowpan\"\" into oc-dr1-dev\nam: 0716c8e60e\n\nChange-Id: I1016361cd17be52a02a21fb4d1da791c0247be1d\n" }, { "commit": "3608d5fad7f900d5ba6a2730570059b019e5a8ec", "tree": "36506e7b88c0e0869d9a07d55ae871e7293eb0ce", "parents": [ "256fe97329d6e27b72fa027623b8c6499fe12e10" ], "author": { "name": "Ian Pedowitz", "email": "ijpedowitz@google.com", "time": "Wed Aug 09 19:15:31 2017 -0700" }, "committer": { "name": "Ian Pedowitz", "email": "ijpedowitz@google.com", "time": "Thu Aug 10 08:56:41 2017 -0700" }, "message": "Revert \"Initial support for proposed android.net.lowpan\"\n\nThis reverts commit 4e0c2195dd999859f4e79cec1884326fb52a5916.\n\nFixes: 64111427\nTest: Grabbed OC CTS binaries\nTest: Extracted android-cts.zip and from android-cts/tools directory launched ./cts-tradefed\nTest: On the DUT (running build which has this CL cherrypicked), ran 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: Note, while b/64111427 is fixed, this uncovered b/64560640\n\nChange-Id: I1d2132678281a917f03c69d5ead1d28313d7f46d\nMerged-In: Icab67ba2c40bc02968e3f8ed2da5a4a3be6cf77f\n" }, { "commit": "8c7734f66409ff606c12349be99d7057d4742853", "tree": "cebcdd8fae2438e28102c85369cd92c37c0e5085", "parents": [ "9165ecff77b8c94d5cca0e42c487ae58b524b862", "e48ca2099a79e3e27a237fc02294a2aa2e8e8305" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Aug 09 20:29:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 09 20:29:04 2017 +0000" }, "message": "Merge \"resolve merge conflicts of 15658662fdde to stage-aosp-master am: 3b38eaa3c2 am: 208a84ecb9\" into oc-dr1-dev-plus-aosp\nam: e48ca2099a\n\nChange-Id: Ia0d6e190d11061687649183979430d6fec375f2d\n" }, { "commit": "fa983ab25428c29fdde791249a347ae75cbc4e3c", "tree": "f385b356672a08382714f3da6d3db0b868bc2aaa", "parents": [ "0d1606949c00305dcd47ad22bb9edfc8b9db2899", "208a84ecb97aa51ac851ce86db5ac4411edac30c" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Aug 09 16:19:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 09 16:19:32 2017 +0000" }, "message": "resolve merge conflicts of 15658662fdde to stage-aosp-master am: 3b38eaa3c2\nam: 208a84ecb9\n\nChange-Id: Ic8af1a3be3c867dc3822e1374c2554be3758e52d\n" }, { "commit": "208a84ecb97aa51ac851ce86db5ac4411edac30c", "tree": "bd87a13c291bb303a89ef86d8663de0e24ebd7a3", "parents": [ "99f010ea3cf086fb82499e6bc0a6946f34df877b", "3b38eaa3c2ad33c81be46ba5d685260295447791" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Aug 09 16:06:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 09 16:06:47 2017 +0000" }, "message": "resolve merge conflicts of 15658662fdde to stage-aosp-master\nam: 3b38eaa3c2\n\nChange-Id: Ie87c58c7a0a93ab398c3f5eac6e13be837f4ed58\n" }, { "commit": "3b38eaa3c2ad33c81be46ba5d685260295447791", "tree": "06b9e0a2d2bb15566e064e85a033e1a929a537d2", "parents": [ "825345628c873539983b4ee27f0446a2e8530401" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Aug 09 00:45:34 2017 -0700" }, "committer": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Aug 09 13:03:35 2017 +0000" }, "message": "resolve merge conflicts of 15658662fdde to stage-aosp-master\n\nTest: this fixes merge conflict that I skipped\nChange-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08\n" }, { "commit": "3ff3e75fb21b9f7528b9e446266af79a21118203", "tree": "fda2032afc67b5ad4763705c9843aabe95c3fa62", "parents": [ "b208d5c4f39a5c3389e4d2a5aec7d23bad5cefa5", "8c18e1faf8020d55a08b1a9094202e91c621babe" ], "author": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Tue Aug 08 16:06:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 08 16:06:17 2017 +0000" }, "message": "Merge \"Add native bindings for getNamesForUids\" into oc-mr1-dev\nam: 8c18e1faf8\n\nChange-Id: If0d1dc60455c961215454a5b2edcb59c0097add4\n" }, { "commit": "8c18e1faf8020d55a08b1a9094202e91c621babe", "tree": "daf2bb0fe31e348bd80f170747d378582f694b1e", "parents": [ "faa01fb3704953597d124dde6363c3215e1aa54e", "ad192a392bb51dc71863eab61cb8d415fef4d54f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 08 15:58:41 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 08 15:58:41 2017 +0000" }, "message": "Merge \"Add native bindings for getNamesForUids\" into oc-mr1-dev" }, { "commit": "589ce7dfc582b8fd5ae7c462acdb2691e5b7cd1b", "tree": "423cc78493681a2fe25e75b37e8fe17a2c92940f", "parents": [ "f288de8421525860ce2b88a3644d84ee985318b7", "590f519f244a35d688aedb3387e0c4a4a53a3adf" ], "author": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Tue Aug 08 01:23:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 08 01:23:35 2017 +0000" }, "message": "Merge \"thermalservice: Add ThermalService java interfaces\" into oc-mr1-dev\nam: 590f519f24\n\nChange-Id: I1397add21609288770d46f21d8a23cf55e6e9a75\n" }, { "commit": "875e5c74516dec3ccd32e2239beb1a28a5d931bb", "tree": "36c3323f46561276f4ecd6827be6317e7670b4c7", "parents": [ "cb921c1efccd1e210bb30acb269aedf7b6d197c3" ], "author": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Thu May 25 17:53:21 2017 -0700" }, "committer": { "name": "Todd Poynor", "email": "toddpoynor@google.com", "time": "Mon Aug 07 23:08:36 2017 +0000" }, "message": "thermalservice: Add ThermalService java interfaces\n\nBinder service ThermalService broadcasts thermal events to registered\nlisteners.\n\nTest: manual: marlin with modified thermal-engine.conf and temporary\n java thermal event listener\nBug: 30982366\nChange-Id: I11f7fd18feff3b9af0eecc3fd3a13d54c0b97ff0\n(cherry picked from commit dd05582eabb6809899e3187d3afc1e97e148fdb1)\n" }, { "commit": "1ad38fe278ace2ed6858506a5d57201bef92dcb4", "tree": "f2aeab28fdeca7f3dc56dc182ce0b35c172985f4", "parents": [ "93c738354e022da13899502e4f5e28acc327f905", "b79eb54d36b85c447660471419da4247a5b9d387" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Sun Aug 06 16:45:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Aug 06 16:45:10 2017 +0000" }, "message": "Merge \"Fix broken javadocs.\" into oc-mr1-dev\nam: b79eb54d36\n\nChange-Id: I283e3914833b01969308afbd2fad1889e0497338\n" }, { "commit": "67f9d5070a74a0bf34f0335899a96dedcac26c96", "tree": "810fc5ffaebfa04915242fe949acd81c3964c3f9", "parents": [ "b26cc6aef4a49ef2ae39374b22f8fc150f846c67" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Sat Aug 05 13:49:13 2017 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Sun Aug 06 07:37:08 2017 -0600" }, "message": "Fix broken javadocs.\n\nBug: 64337634\nTest: make -j32 doc-comment-check-docs\nChange-Id: I20fdd3dcddef09111d35946c41c596c7689effa6\n" }, { "commit": "ad192a392bb51dc71863eab61cb8d415fef4d54f", "tree": "cabec0eff116a3ddadfe9647c9b35c7ef8fd4863", "parents": [ "6e8e322ea114fa609f040b821cb891bb755c7eb9" ], "author": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Wed Aug 02 07:51:57 2017 -0700" }, "committer": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Fri Aug 04 13:36:37 2017 -0700" }, "message": "Add native bindings for getNamesForUids\n\nA new API [getNamesForUids] was recently added to the PackageManager\nand this API needs to be accessible to native code. However, there\nwere two constraints:\n1) Instead of hand-rolling the binder, we wanted to auto generate\nthe bindings directly from the AIDL compiler.\n2) We didn\u0027t want to expose/annotate all 180+ PackageManager APIs\nwhen only a single API is needed.\nSo, we chose to create a parallel API that can be used explicitly\nfor native bindings without exposing the entirety of the\nPackageManager.\n\nBug: 62805090\nTest: Manual\nTest: Create a native application that calls into the new service\nTest: See the call works and data and returned\nChange-Id: Ia571ab1607c6c88fef44eb0de6a313a28906c732\n" }, { "commit": "014ca608c7c6b69bfc006dc5dac2073486d07c39", "tree": "59cc9991c5d9ef5c2b6cc7a652325484b03c1f55", "parents": [ "5a37624e4a83223a17705db32e9641f2d2389c8b", "a4fb234a4caec8638d76ba423db7dab421c93af5" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Wed Aug 02 17:27:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 02 17:27:38 2017 +0000" }, "message": "Merge \"Merge \"Add hwbinder library\" am: 49e2a9a612 am: 811027ede7 am: 2785be7572\" into oc-dr1-dev-plus-aosp\nam: a4fb234a4c\n\nChange-Id: I026ca8c33ef2fce7d40e2daec8db970d6b578f25\n" }, { "commit": "30538850f246bdfb109141dcd7191507d67ecd6f", "tree": "f606445ac19b753cd6ff5ff19dcb5c0eb8daa6e5", "parents": [ "ccd31213793b05942e5ed68c8e3a8addd0add914", "2785be757274fa5518ddee2cbc881082abe899db" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Wed Aug 02 17:14:55 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 02 17:14:55 2017 +0000" }, "message": "Merge \"Add hwbinder library\" am: 49e2a9a612 am: 811027ede7\nam: 2785be7572\n\nChange-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22\n" }, { "commit": "2785be757274fa5518ddee2cbc881082abe899db", "tree": "f8b2e2da2350f17f14dc196a9df98458d10a87d6", "parents": [ "fb3f29b608e41e4169e5d7ac8b4ad40627999f89", "811027ede7610486a983eada787f6e5b67d9aea6" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Wed Aug 02 17:05:56 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 02 17:05:56 2017 +0000" }, "message": "Merge \"Add hwbinder library\" am: 49e2a9a612\nam: 811027ede7\n\nChange-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf\n" }, { "commit": "811027ede7610486a983eada787f6e5b67d9aea6", "tree": "2fb3efac967072c015434d10c4ac810a51ac8f4b", "parents": [ "98eaf41eec21d1519f433df70abd9cae8b60469e", "49e2a9a612ca15044f5e8b08d0399ee4c8f7a935" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Wed Aug 02 16:57:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 02 16:57:50 2017 +0000" }, "message": "Merge \"Add hwbinder library\"\nam: 49e2a9a612\n\nChange-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4\n" }, { "commit": "28cc6e88fdfa1434b99219a0eb59dae82c10887c", "tree": "188f2460cf0f7a2c493fce37c4156880f4089722", "parents": [ "01d686b85ebc5f7eea1a43db33a2f3e3f3becc3e" ], "author": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Thu Jul 13 16:34:01 2017 +0900" }, "committer": { "name": "Sundong Ahn", "email": "sundongahn@google.com", "time": "Tue Aug 01 11:26:18 2017 +0900" }, "message": "Add hwbinder library\n\nHAL impls will depend hwbinder.jar instead of framework.jar on\nbuild-time, but on runtime framework.jar will be used.\n\nThis is to cut the circular dependency when using configstore from\nAndroid framework. Also added JNI call to HwBinder.java to cut\nconfigstore\u0027s dependency on systemproperty in framework.jar.\n\nNote that hwbinder.jar is LOCAL_UNINSTALLABLE_MODULE and so it won\u0027t be\ninstalled in an actual image.\n\nBug: 35771640\nTest: build \u0026 run\nChange-Id: I2420298cf9df5d6bbcead3e4451b703ce9bc3e29\n" }, { "commit": "5f2086fc7d4a3fba1bf836cba9ad2b0a94521c20", "tree": "522235f51295bf6964277b7f99498b3ab43fc05a", "parents": [ "37fe261c58b7ac24903f312c038aa6ef18367243", "1dbd4a48c56aa90ef356048b3a39c8c369472f16" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Jul 28 22:00:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 28 22:00:35 2017 +0000" }, "message": "Merge \"Cherry-pick from master Doc change: Add API 26 to @since list\" into oc-dev am: 04d43a6a7b am: 51f65bbcbf\nam: 1dbd4a48c5\n\nChange-Id: I8ae0c12093620fd14fe60e5b7f653df4cdb2db67\n" }, { "commit": "76044cddc5de1606df81468831a3e5c00b7ddb68", "tree": "8bb064b10ab54a7ca42042297ceb7a1700bfc00d", "parents": [ "57ded16f031d2e883b5f5b5fc3e6de399a07910c", "51f65bbcbff5f2d42df632114b6e8e9e3af10cb3" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Jul 28 21:50:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 28 21:50:15 2017 +0000" }, "message": "Merge \"Cherry-pick from master Doc change: Add API 26 to @since list\" into oc-dev am: 04d43a6a7b\nam: 51f65bbcbf\n\nChange-Id: I17386cc10e591e60442eeeba7e4dec42c9b4bd54\n" }, { "commit": "1dbd4a48c56aa90ef356048b3a39c8c369472f16", "tree": "71f98a54c8d54ac741186bd40e1f72414f86b36f", "parents": [ "619835e5e31b1f8672a41a081a43a7ba9d582208", "51f65bbcbff5f2d42df632114b6e8e9e3af10cb3" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Jul 28 20:30:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 28 20:30:26 2017 +0000" }, "message": "Merge \"Cherry-pick from master Doc change: Add API 26 to @since list\" into oc-dev am: 04d43a6a7b\nam: 51f65bbcbf\n\nChange-Id: If54feb86d47552ea89da661c7769a25efe669237\n" }, { "commit": "557b11bac1a5c0cb78b2853057df88890dbe6233", "tree": "2ad8608297d796b629d079e04bb43461775ec234", "parents": [ "c058675b80a65aa7f4d2d9c1aef8ba495a5f0b6b", "04d43a6a7b78c18fe3c894f25b08b3802df7f78f" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Jul 28 20:18:34 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 28 20:18:34 2017 +0000" }, "message": "Merge \"Cherry-pick from master Doc change: Add API 26 to @since list\" into oc-dev\nam: 04d43a6a7b\n\nChange-Id: I2936fc48db92ad5846b5c72549d265ce4180686d\n" }, { "commit": "51f65bbcbff5f2d42df632114b6e8e9e3af10cb3", "tree": "420bdc086288eff86aa10ae51d1cc83e3ef44348", "parents": [ "c541380f91f657cd1fea159ad01bd74ea64006fe", "04d43a6a7b78c18fe3c894f25b08b3802df7f78f" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Jul 28 20:18:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 28 20:18:29 2017 +0000" }, "message": "Merge \"Cherry-pick from master Doc change: Add API 26 to @since list\" into oc-dev\nam: 04d43a6a7b\n\nChange-Id: I57763d6980b66ef288788153d275cf196fbd510a\n" }, { "commit": "fdad0ba193b597adfc5f1724cb1e368f11ebf825", "tree": "b15f7b37da6a5f4b2b938b49603e021ca6195816", "parents": [ "81a1d589babb48247689d84c0edb14d9b813297f" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Jun 09 14:43:32 2017 -0700" }, "committer": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu Jul 27 15:00:46 2017 -0700" }, "message": "Cherry-pick from master Doc change: Add API 26 to @since list\n\nAdd API 26 to @since list and turn off preview watermarking.\nFix has been successfully submitted in master and affects doc files\nonly.\n\nBug: 62087404\nBug: 64123587\nTest: make ds-docs\n\nOriginal change-Id: Idcf84882a1a1fe0864ee6ff3d0af6cd857c73a06\n\nChange-Id: I28700ad15d931256d9dfc1016df546bd2f0e718f\n" }, { "commit": "b54567810f00c4db62398c0af2d2bfcf7983e4c1", "tree": "52c9a119877f4d06116e0494613ad94ab3ebb8cc", "parents": [ "d37f13603ae82ac3f844c87bdb9cee2e26c3032d" ], "author": { "name": "Love Khanna", "email": "love.khanna@nxp.com", "time": "Wed May 17 15:52:16 2017 +0530" }, "committer": { "name": "Ruchi Kandoi", "email": "kandoiruchi@google.com", "time": "Fri Jul 21 17:05:47 2017 -0700" }, "message": "NFC DTA Integration\n\nTest: compiles.\nMerged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592\nChange-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592\n" }, { "commit": "276f9fe619c8e2245ff9d480326a501ac8d491b5", "tree": "d2a2c2d85c866e5df771addc275b993261f686f3", "parents": [ "e3d791973021f68b1f9646f498cbf9eb14615fa6" ], "author": { "name": "Love Khanna", "email": "love.khanna@nxp.com", "time": "Wed May 17 15:52:16 2017 +0530" }, "committer": { "name": "Ruchi Kandoi", "email": "kandoiruchi@google.com", "time": "Fri Jul 21 17:01:28 2017 -0700" }, "message": "NFC DTA Integration\n\nTest: compiles.\nMerged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592\nChange-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592\n" }, { "commit": "d313469e28268c864ab5c0467ffb4ccf16fe36f9", "tree": "b0f5cfc110fe78fa868a6004e2f205b73e80fe91", "parents": [ "94e82d9b0e7ee2e657564e5904b556eeefc1d423" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Mon Jun 26 14:57:02 2017 -0700" }, "committer": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Fri Jul 21 13:14:37 2017 -0700" }, "message": "DO NOT MERGE VirtualDisplay wrapper with input forwarding\n\nNew version of ActivityView that doesn\u0027t use expensive\nActivityContainer, but utilizes VirtualDisplays instead.\n\nCreation of this view is only allowed for callers who have\nandroid.Manifest.permission.INJECT_EVENTS permission.\n\nLaunching activities into this container is restricted by\nthe same rules that apply to launching on VirtualDisplays:\n- Owner is allowed to launch its own activities.\n- If activity that\u0027s being launched is not from the same\n app, then it must be embeddable and launcher must have\n permission to embed.\n\nBug: 63338670\nTest: go/wm-smoke\nChange-Id: Id9a25752367ebe8e59d2fc21c5d9de5cf597ea01\n" }, { "commit": "94e82d9b0e7ee2e657564e5904b556eeefc1d423", "tree": "0267d2af281ebde75aeb0d8cfd57139f73cca4be", "parents": [ "95a3528866fcbb41c1ea2e5f7db7442f1101c66a" ], "author": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Thu Jul 13 15:33:06 2017 -0700" }, "committer": { "name": "Andrii Kulian", "email": "akulian@google.com", "time": "Fri Jul 21 13:14:19 2017 -0700" }, "message": "DO NOT MERGE ActivityView be gone!\n\nThis hidden functionality is no longer support/needed since\nwe now have multi-window/display. A new view group class\nwill be added later that uses multi-window to support remaining\nfunctionality of this class.\n\nTest: go/wm-smoke\nChange-Id: Ie2fa2de92841d33199da9988741905060dd1ddf4\n" }, { "commit": "a42c8a1667bdf2caa38e183588ef4541b1035ddc", "tree": "519c0d50a4436de4300988b02dc0d7e7448fa507", "parents": [ "e0a743d035376a5477661b5e7b317b278724c99d", "2dc772165b117a1774c335526e35409c8940027d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 21 17:38:53 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jul 21 17:38:53 2017 +0000" }, "message": "Merge \"NFC DTA Integration\"" }, { "commit": "2dc772165b117a1774c335526e35409c8940027d", "tree": "cce7a08af24c9491fe6b149c214a9ba0e79a7ad0", "parents": [ "d2c8dcfcfe4cdc4fb4d3d86a8a7e6e7d43fdd9c0" ], "author": { "name": "Love Khanna", "email": "love.khanna@nxp.com", "time": "Wed May 17 15:52:16 2017 +0530" }, "committer": { "name": "Ruchi Kandoi", "email": "kandoiruchi@google.com", "time": "Fri Jul 21 16:23:21 2017 +0000" }, "message": "NFC DTA Integration\n\nTest: compiles.\nMerged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592\nChange-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592\n" }, { "commit": "1d3929d46a9479300080ca9371a227babe60a684", "tree": "86424f00d5842f178b18ab2ec43e774d0da1add8", "parents": [ "ed005b29283ebc620e4bdf33a6a965dbf614f448", "f8469ccf17a7ff257c3251af377095d6e004aa6e" ], "author": { "name": "Love Khanna", "email": "love.khanna@nxp.com", "time": "Fri Jul 21 05:09:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 21 05:09:02 2017 +0000" }, "message": "Merge \"NFC DTA Integration\" into oc-dr1-dev\nam: f8469ccf17\n\nChange-Id: I661800e26a8dc66b2a7a7676e0df11d928272f89\n" }, { "commit": "1e43a74a47b8bafac35226f349d82c4d07d50f08", "tree": "5a1f485f14ae3e9de103520beacc2c006535bb1b", "parents": [ "640f04ef38d39c03b5374a1616ce96f333df0851", "f8469ccf17a7ff257c3251af377095d6e004aa6e" ], "author": { "name": "Love Khanna", "email": "love.khanna@nxp.com", "time": "Fri Jul 21 05:08:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 21 05:08:25 2017 +0000" }, "message": "Merge \"NFC DTA Integration\" into oc-dr1-dev\nam: f8469ccf17\n\nChange-Id: I8acca990e6191360fc3f4f9c668f74d7a06d6a52\n" }, { "commit": "755a8fa44e3ac3566a175c74da5707d4a6fb5c07", "tree": "a324901f6467eaa0daea32ab0fcb7c4e03c08e07", "parents": [ "37a9991be98d7e5c9ab4ba102c4d29845fa94152" ], "author": { "name": "Love Khanna", "email": "love.khanna@nxp.com", "time": "Wed May 17 15:52:16 2017 +0530" }, "committer": { "name": "Ruchi Kandoi", "email": "kandoiruchi@google.com", "time": "Thu Jul 20 22:15:39 2017 +0000" }, "message": "NFC DTA Integration\n\nBug: 63903843\nTest: compiles.\nChange-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592\n" }, { "commit": "bfa50d4852037787569fd16bb217b7595cbb403f", "tree": "d5e3afe1565fd1b75607dc34163397212598cb75", "parents": [ "2b594992635b94332a5e541c335d27af51401bb0", "7acfec846b7e11b3a72787df0b815d40d78328cd" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Jul 20 00:49:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 00:49:58 2017 +0000" }, "message": "Merge \"Add details to Download progress callback\" am: b440b572d7 am: 5f047a68d9 am: 12286b2608\nam: 7acfec846b\n\nChange-Id: If16b8c107d39c5791ea8c3b3b28afd4f37500b44\n" }, { "commit": "7acfec846b7e11b3a72787df0b815d40d78328cd", "tree": "5853d88ef8c3b7d8af6cec7bc55b21d41281fb77", "parents": [ "4dec845d52fc676eda9808c082ca7b0e53d439b3", "12286b2608f69c3911c40f4dc2a070097373b73f" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Jul 20 00:42:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 00:42:21 2017 +0000" }, "message": "Merge \"Add details to Download progress callback\" am: b440b572d7 am: 5f047a68d9\nam: 12286b2608\n\nChange-Id: Iff3707dab4ee737e5de2b1b8bded811f919553a8\n" }, { "commit": "5f047a68d96f252772144a729f423c172ce816e4", "tree": "575a928c636e847c26916d83649ef5d9d4fac70a", "parents": [ "5af59940d17cf20174865ac0aaf52c3b4d962a64", "b440b572d78d7cfc8a03030913465daac26bebad" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Jul 20 00:30:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 00:30:50 2017 +0000" }, "message": "Merge \"Add details to Download progress callback\"\nam: b440b572d7\n\nChange-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011\n" }, { "commit": "0ebff46583de6e77b80bd0cd282d7a6ba0074f96", "tree": "1f5b41fceb86df7bcdcd924d15314f9c3129aa78", "parents": [ "1585b2e7b75d2e1358cc0069f9fe7bcbb2f88417" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Jun 16 17:37:20 2017 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Wed Jul 19 15:02:29 2017 -0700" }, "message": "Add details to Download progress callback\n\nSplit decode into max size and current size.\n\nTest: builds\nChange-Id: Ice18d7f0e9ae99b3c24fe10843da80abd0d912d7\n" }, { "commit": "8228eb34462cc9f76152bc87e20e721cd0e20775", "tree": "a115c75683da01b49d0fce878a2547e0aac3a1c7", "parents": [ "709f3c1d4660cbf8bbdf5f86278588113a57c91e", "a1d67fb38ec02150d674bc3b8d8354b53417552b" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 19 06:17:33 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 19 07:35:31 2017 +0900" }, "message": "resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master\n\nTest: make -j64 services\nChange-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b\nMerged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa\n" }, { "commit": "07f1304cfe9efbde7f90895a948b3170a3f0d0ec", "tree": "009b34b0d3e072ab220248961b162ca585accdff", "parents": [ "d2c8dcfcfe4cdc4fb4d3d86a8a7e6e7d43fdd9c0" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Mon Jul 10 19:06:57 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 19 00:54:54 2017 +0900" }, "message": "Allow more than one source of tethering statistics.\n\nCurrently, netd is the only source of tethering statistics.\nIn order to support multiple sources, define a new\nITetheringStatsProvider interface that can be registered with\nNetworkManagmentService. Convert the existing code into the\nfirst ITetheringStatsProvider.\n\n(cherry picked from commit ef7b2a13ce4c34950b52de27dcf65b74388d7b3d)\n\nBug: 29337859\nBug: 32163131\nTest: builds, boots\nTest: tethering stats continue to be collected\nChange-Id: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4\nMerged-In: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4\n" }, { "commit": "38d9ee4cd661c10e012f71051d23644c65607eed", "tree": "0dda3bc5db88275e639f94e06e930bf0c74ff81f", "parents": [ "3779fb5f575adb17152a27b1c86c658217f60a6d", "8cfb0e81fdd91b7fe1c02287394ac068287281d5" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Jul 18 15:36:22 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jul 18 15:36:22 2017 +0000" }, "message": "Merge \"Implement ProgramSelector for font-end Java APIs.\"" }, { "commit": "8cfb0e81fdd91b7fe1c02287394ac068287281d5", "tree": "40c1aec73b5b4a6886f59395aca998b9d27098f4", "parents": [ "e83dbb90fa03173e80fba7de44adab9c023b93e6" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Jul 12 13:59:20 2017 -0700" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Mon Jul 17 16:23:05 2017 -0700" }, "message": "Implement ProgramSelector for font-end Java APIs.\n\nBug: b/32621193\nTest: instrumentalization\nChange-Id: Ibb9841fed76ef3568c2e36ca28ea31addf9175f1\n" }, { "commit": "f7a008ff693a9bdaf7ce1c071152f0f5d0342692", "tree": "e9d1447d5f657c6d4125620ec73d0eb1cf5affd9", "parents": [ "0ce595353452551220d9033b63d48e66945e8976", "041111ff7e6157c153f186de49c4eb17f55e3c21" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Jul 14 01:06:56 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 01:06:56 2017 +0000" }, "message": "Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev am: 3756636ad6\nam: 041111ff7e\n\nChange-Id: I538f7faef85bbb13499dec2125e0f82b3175396f\n" }, { "commit": "041111ff7e6157c153f186de49c4eb17f55e3c21", "tree": "cedffdedeeebbefc319a267713b13b905885ef52", "parents": [ "d792c31806af9981c5bdeb536bf0d33aa63b6c53", "3756636ad67e50262400e6670f0f15883935b158" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Jul 14 01:01:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 01:01:29 2017 +0000" }, "message": "Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev\nam: 3756636ad6\n\nChange-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa\n" }, { "commit": "ef7b2a13ce4c34950b52de27dcf65b74388d7b3d", "tree": "8198db1c8e7e5c588322cf939f34a4bab0bf1ce2", "parents": [ "aa7b8b532271797ebaca6c816e95530d28fc995f" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Mon Jul 10 19:06:57 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Jul 13 23:34:25 2017 +0900" }, "message": "Allow more than one source of tethering statistics.\n\nCurrently, netd is the only source of tethering statistics.\nIn order to support multiple sources, define a new\nITetheringStatsProvider interface that can be registered with\nNetworkManagmentService. Convert the existing code into the\nfirst ITetheringStatsProvider.\n\nBug: 29337859\nBug: 32163131\nTest: builds, boots\nTest: tethering stats continue to be collected\nChange-Id: Ie1b5a5e47ae4bf5af922365b09fa241e834236e4\n" }, { "commit": "19b49f6c3ca051f91243c290e7868f7e83ba7005", "tree": "a8a6df3ad6306a41689c75ea66cf9653b2c37407", "parents": [ "1ecf426f08aae8c98cc618763f16266feb8a3f7b", "81d9c6fe71ce2685fed7f30a66090a3c9752c5da" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 12 23:57:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 23:57:21 2017 +0000" }, "message": "Merge \"Implement getDownloadStatus and add permission\" am: 2fa880d016 am: d45a007222 am: 9888af1dfc\nam: 81d9c6fe71\n\nChange-Id: Ida7f8cfd440553658108688b84f866dddafa3166\n" }, { "commit": "81d9c6fe71ce2685fed7f30a66090a3c9752c5da", "tree": "17996ca991ed5d4a1e6b05e2cc053816739793a5", "parents": [ "7e8be4fcc2c3a007864864a4a358004cd8f8a543", "9888af1dfcf6525d62dd2a33673362d38d585ad3" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 12 23:44:51 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 23:44:51 2017 +0000" }, "message": "Merge \"Implement getDownloadStatus and add permission\" am: 2fa880d016 am: d45a007222\nam: 9888af1dfc\n\nChange-Id: I98d30f379072302a5e76a8b157d8aecdd1616235\n" }, { "commit": "d45a00722271a39bb420b3d15b6bdd3a675d4dc5", "tree": "8c70841195f0a4db9470c373ad5d26d353cd9a86", "parents": [ "74868feecd376d4efce1096236ed58a0051a1bee", "2fa880d0162a206b9307bfd5cd37a37cf216895a" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 12 23:27:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 23:27:49 2017 +0000" }, "message": "Merge \"Implement getDownloadStatus and add permission\"\nam: 2fa880d016\n\nChange-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959\n" }, { "commit": "55f557dc7c1622ec757f7f47d469f742148814a8", "tree": "fe53d0db48c8a23323a83efe7a94624cf1d0d54d", "parents": [ "54b1e9c57c3b3bc08b106849ed78672b87ea954e" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jun 29 18:37:11 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 06 13:40:09 2017 -0700" }, "message": "Implement getDownloadStatus and add permission\n\n- Implement getDownloadStatus in the manager\n- Remove DownloadStatus and add constants in its place to reflect the\nstatus of a single file\n- Add ACT_AS_EMBMS_MIDDLEWARE permission\n\nChange-Id: Ica8b8a872a8088a2aaf56d40926051225aa39e87\n" }, { "commit": "db8ef65206ec8b4377e1df0cb618cb49a0c15c31", "tree": "5f75f6fdb3606b2669459971d41daedeaebf0df0", "parents": [ "8a57888844ab38d87bc2098b93227e213400f8d4", "c08090f6d25675fd5f469bf14a9fed6e2231c2ea" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Fri Jun 30 07:46:55 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 30 07:46:55 2017 +0000" }, "message": "Merge \"Refactor in preparation for removing android.test.mock\"" }, { "commit": "4dbcd23b5a21feda92f0f105d1e30fd29ac12b2b", "tree": "60f56964b80174c0b050d31e4833bacbe5549024", "parents": [ "677c0db1136c8464445d1d7dfd96991d03fbbfd9", "dea6a027610951541981467276d8cd8ba8abc28b" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Jun 29 17:35:17 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 29 17:35:17 2017 +0000" }, "message": "Merge \"Add SharedMemory API\"" }, { "commit": "c08090f6d25675fd5f469bf14a9fed6e2231c2ea", "tree": "143bcda8ddaea0fa8fb5786e69b5773a5757506f", "parents": [ "09c29c1324b96e5404400947da7eeb9f0976353a" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Jun 29 14:58:43 2017 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Jun 29 15:57:42 2017 +0100" }, "message": "Refactor in preparation for removing android.test.mock\n\nThe goal of this change is two fold:\n1) Allow the test-runner/src classes to continue to be included in the\n JavaDoc even when they are removed from the Android API.\n\n2) Make it easy to remove android.test.mock classes from the API.\n\nThis was done in two stages:\n1) Push the reference to test-runner/src from fwbase_dirs_to_document\n down to dirs_to_document and\n framework_docs_LOCAL_API_CHECK_SRC_FILES.\n\n2) Expand the reference in framework_docs_LOCAL_API_CHECK_SRC_FILES into\n two new variables that reference the classes from test-runner/src.\n One references those that are required for android.test.mock and the\n other references the remaining ones.\n\nBug: 30188076\nTest: make checkbuild\nChange-Id: I558164e6c9ea2a24bd58e5f4f54dd4c3b2a11924\n" }, { "commit": "dea6a027610951541981467276d8cd8ba8abc28b", "tree": "4f9407055ace409a23b096836e9e79645e06b10a", "parents": [ "1d9ce6678eb1a84f42a5edb73558fb1ce0867b42" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu May 25 17:09:33 2017 -0700" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Wed Jun 28 16:49:12 2017 -0700" }, "message": "Add SharedMemory API\n\nSharedMemory is parcelable and AIDL friendly\nand exposes cool things like dropping write permissions\nthat are useful for shared memory to have.\n\nAlso exposes getFileDescriptor() on MemoryFile\nsince that was necessary to use MemoryFile\nwith IPC previously and there are a sizeable\nnumber of reflections that access it, so just make\nit public.\n\nTest: SharedMemory CTS tests pass\n\nChange-Id: I71a322abf2eb55267d7299a8e41f847339af8b08\n" }, { "commit": "b6d9ba31dec8e81a665cb7c1d19de1f31c717097", "tree": "209937fd2a176ac17cfed153ada8f067bb07d889", "parents": [ "accd277cb9df88c43a12df4dbbadf3f167f8883c", "2659c2f16cf55d58f5b3817347340ae84f9eaabd" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 28 20:37:24 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 28 20:37:24 2017 +0000" }, "message": "Merge \"cas: convert MediaCas to HIDL\"" }, { "commit": "ad60b3757533674dc27a441fdf40ca47db9e876e", "tree": "e7694a9e1257688eaac788951ac6e0c774b5d93a", "parents": [ "8d98c72f759615278e16be672363526ad7de46d4", "53ad2499f1bae7ea93bf1c73b7a32decb4fb74b0" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Wed Jun 28 17:41:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 28 17:41:26 2017 +0000" }, "message": "Merge \"Add EuiccManager#retainSubscriptionsOnFactoryReset API.\" into oc-dr1-dev am: f28843dd3f\nam: 53ad2499f1\n\nChange-Id: I538f0405811b0df28960acdb6f275689f19185dc\n" }, { "commit": "7b69a86b02e1e4b469181a8ad286f473df8b6352", "tree": "fc3d56d2e6ce2e69ffc46cb85d339f99d7086f21", "parents": [ "d20db5a0bd7f6560656f0da8637592143278e44d" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Fri Jun 16 15:20:34 2017 -0700" }, "committer": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Tue Jun 27 09:23:07 2017 -0700" }, "message": "Add EuiccManager#retainSubscriptionsOnFactoryReset API.\n\nBy default, all subscriptions are wiped on first boot after a factory\nreset. This ensures that if data is wiped outside of userspace (e.g.\nin fastboot/recovery), the profiles are wiped, as there\u0027s no way to\noffer this option to users in those modes - the radio isn\u0027t available\nfor us to access the eUICC.\n\nThis API provides a way to bypass this wipe if the user opts to retain\nthe policies for a wipe done from userspace (e.g. by unchecking the\n\"Wipe eUICC\" checkbox in platform settings before wiping). We tell the\nLPA to note this and skip the wipe on the ensuing factory reset.\n\nChange-Id: I2fe472417497e28b043841a5aa2dc9efa45ebbff\nTest: TreeHugger\nFixes: 62681577\n" }, { "commit": "2659c2f16cf55d58f5b3817347340ae84f9eaabd", "tree": "dc0bb4acf1880ac47407fed3a5eb15a6e03843a9", "parents": [ "b425e0029e2ee2812050098d060acd39fad9c99b" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Apr 27 13:18:20 2017 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Jun 23 16:18:55 2017 -0700" }, "message": "cas: convert MediaCas to HIDL\n\n- Replace AIDL interfaces with corresponding HIDL ones.\n\nbug: 22804304\nChange-Id: I8c552ce6fc3766715cd1bc0ea05c0988d56f590e\n" }, { "commit": "efd7a8c0c037d7f8fe18b9aa1b1b2355633267e9", "tree": "ac54a484fb4cd54cdaf9c4b473d9b397e7dd1fba", "parents": [ "70f38167863e58f64b0f4c04125de7daf715eebb", "7074cb84f0cb22d4a080b3f17a2060cf82e52a99" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Thu Jun 15 03:49:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 15 03:49:31 2017 +0000" }, "message": "Merge \"eUICC API error code cleanup.\" into oc-dr1-dev am: 93a59696ad\nam: 7074cb84f0\n\nChange-Id: I71f401ce03c51a6c5b52ececda183f8a32433c9c\n" }, { "commit": "93a59696ad4c803be054d8f09b77050f9e90a2a2", "tree": "2f4e47f5202c5e9c3cb9324b8295e1cd117c1bb3", "parents": [ "a3891ae678e7b9adba48543e08e448654af45034", "83f8bc81be65cb09720c6d8dac7717d4652cd931" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Thu Jun 15 03:35:07 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 15 03:35:12 2017 +0000" }, "message": "Merge \"eUICC API error code cleanup.\" into oc-dr1-dev" }, { "commit": "1ead7fc753ba30152cc37b387252616cba39205f", "tree": "6d51622e2a9816608337a4522b0526c4fd4d9e9f", "parents": [ "adfc1ad840fac588e28f80fbcc4f75713b368596" ], "author": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Wed May 24 14:14:44 2017 -0700" }, "committer": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Wed Jun 14 10:00:16 2017 -0700" }, "message": "Scrims should be grey when in-app\n\nBug: 38164389\nTest: runtest -x colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java\nTest: runtest -x tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java\nChange-Id: Ifcc04a8562e46b4f65bce0470ccd6c02dffcf377\n(cherry picked from commit e1571705e6ea8367e7ee93d61104ce27035492dc)\n" }, { "commit": "6cd045754883a37694a1e9a6733dc89fc52aeb67", "tree": "a8355eee1a4aed2053aa7cc3aa8538390d90d8ff", "parents": [ "8505739ad43b94d3e54bb4eb7b5da43fab995d5f", "9ca513e042d04dfe7b0ed2f1f937aa0a7cf4282b" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Tue Jun 13 20:33:16 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 13 20:33:23 2017 +0000" }, "message": "Merge \"Federate platform docs against support library API file\"" }, { "commit": "83f8bc81be65cb09720c6d8dac7717d4652cd931", "tree": "e6f88743b1966d6561037b8a4bc4c1c3767b1cc7", "parents": [ "17652d85ecbbbababa7bec457130024346ff4b18" ], "author": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Mon May 15 10:22:20 2017 -0700" }, "committer": { "name": "Jeff Davidson", "email": "jpd@google.com", "time": "Tue Jun 13 17:51:07 2017 +0000" }, "message": "eUICC API error code cleanup.\n\n-Remove result classes in cases that a simple int will do. Split the\nint error code space (now shared across all calls) into two parts -\npredefined errors (0 or negative) and custom errors (positive).\n\n-Replace \"generic error\" with \"error\" in naming.\n\n-Remove detailed code from any result returned by the LPA. There is\nstill a detailed code in the platform API, which is equal to the\nresult code returned by the LPA.\n\nFixes: 38206601\nTest: TreeHugger\nChange-Id: I304081db2127a22d6dd67b6494b4f3279614d19c\n" }, { "commit": "9045e5d226503fe2bb5378c2815bc33856808587", "tree": "cb308125da97821404d8505c822fd9159a39cdc9", "parents": [ "715073c998c1d4245ceea72b3f0458262d4de97e", "c9a1ac78192e773d32462a3de899c7522c55eded" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Jun 13 15:42:20 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 13 15:42:24 2017 +0000" }, "message": "Merge \"Implement remaining ITunerCallback methods.\"" }, { "commit": "9ca513e042d04dfe7b0ed2f1f937aa0a7cf4282b", "tree": "c085de47e5ca8da662390fb1d7a633bd040fb8df", "parents": [ "acc2b5c1ca486c55060f7505acb70dd510135f55" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Apr 05 10:21:58 2017 -0400" }, "committer": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Mon Jun 12 11:32:07 2017 -0400" }, "message": "Federate platform docs against support library API file\n\nBug: 36959367\nTest: make docs\nChange-Id: I7c6dffed25566c2bb1183aba60103c437888ba21\n" }, { "commit": "e1571705e6ea8367e7ee93d61104ce27035492dc", "tree": "d7b206917625246873c453f30bd7e22a35698ff0", "parents": [ "3b1a5a91549357b11b9b696d2bec559d272ce6eb" ], "author": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Wed May 24 14:14:44 2017 -0700" }, "committer": { "name": "Lucas Dupin", "email": "dupin@google.com", "time": "Sun Jun 11 20:05:11 2017 -0700" }, "message": "Scrims should be grey when in-app\n\nBug: 38164389\nTest: runtest -x colorextraction/tests/src/com/google/android/colorextraction/ColorExtractorTest.java\nTest: runtest -x tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java\nChange-Id: Ifcc04a8562e46b4f65bce0470ccd6c02dffcf377\n" }, { "commit": "c9a1ac78192e773d32462a3de899c7522c55eded", "tree": "0212fd83470f8546a6fd6ab338e29a8d7a4d8bab", "parents": [ "9e0e2f80fe4c21783e851665a4df95ba3fb4b427" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed May 17 21:29:28 2017 -0700" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Fri Jun 09 13:09:39 2017 -0700" }, "message": "Implement remaining ITunerCallback methods.\n\nTest: instrumentation tests passes, none added\nBug: b/36863239\nChange-Id: I57de30992f679624c8fde0657c0e24b5cbfab905\n" }, { "commit": "b699e982851dc1ff15831ccbae819f84668ff7b5", "tree": "5e0aa61a42eb66d6f9cfc2d569eed4aa94d921fd", "parents": [ "d6e30017702f1d7badf95399dfe12926a707f050", "7b78a176a92e8a6b20b701106d9eb7284b643b91" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Fri Jun 09 19:04:48 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 09 19:04:48 2017 +0000" }, "message": "Merge \"Add IApnSourceService.aidl\" am: 1d5d409f6f\nam: 7b78a176a9\n\nChange-Id: I8fd54598aae183364ba44a0d5ca2f4331436292a\n" }, { "commit": "6d783e3529174f521d3fc18b76a1f89d890ce008", "tree": "618cfddcbd99157562de54dbb1cd1b57a87bd916", "parents": [ "afa235e444143319e554158cd33933ba63635ed6" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Tue May 23 13:07:07 2017 -0700" }, "committer": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Fri Jun 09 10:41:37 2017 -0700" }, "message": "Add IApnSourceService.aidl\n\nThis service is bound to by TelephonyProvider on devices where we don\u0027t\nuse the apns-conf.xml file.\n\nBug: 37283190\nTest: manual\nChange-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508\nMerged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508\n" }, { "commit": "e5c7420f45a5bae24c07201efd31ee93b8a17c0a", "tree": "e08429345a4bdc6c49f734337968ce351600b93d", "parents": [ "a370159592307f97bc9a6cb031349686e0abe7f4" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Tue May 23 13:07:07 2017 -0700" }, "committer": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Thu Jun 08 15:56:38 2017 -0700" }, "message": "Add IApnSourceService.aidl\n\nThis service is bound to by TelephonyProvider on devices where we don\u0027t\nuse the apns-conf.xml file.\n\nBug: 37283190\nTest: manual\nChange-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508\nMerged-In: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508\n" }, { "commit": "a1bb6957f56e6618d8e1d9fb2e6e7209d1933249", "tree": "32f4f1c99652df6a8c34e1a2a2dd80d326fea812", "parents": [ "48af81eb388def1dccc0f0902010687466655853", "e1ef510f4ee59ab5dad8c07329138ccf5b9fcd11" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Thu Jun 08 21:40:12 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 08 21:40:21 2017 +0000" }, "message": "Merge \"Add IApnSourceService.aidl\"" }, { "commit": "486a4112240c11fc0971d2fe730c228aaaf643e2", "tree": "581a9bac078cd5953d848150994bba8b0fcc9db5", "parents": [ "2fe945c3a916430d1ba33824e6452dd48c5f13c8" ], "author": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Tue Jun 06 17:03:09 2017 -0700" }, "committer": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Wed Jun 07 12:08:09 2017 -0700" }, "message": "[AWARE] Add validity check on PMK/Passphrase lengths\n\nBug: 62376042\nTest: unit tests + inegrated (sl4a) tests\nChange-Id: Ib6383a0ba9ef61114eb72b9a04cc683792b8e89d\n" }, { "commit": "e1ef510f4ee59ab5dad8c07329138ccf5b9fcd11", "tree": "158091505fef2a5b40932a954d3ab93bda80a87e", "parents": [ "27fba9589fcecddf7b13474a76ccdfeb10e92371" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Tue May 23 13:07:07 2017 -0700" }, "committer": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Tue Jun 06 14:38:25 2017 -0700" }, "message": "Add IApnSourceService.aidl\n\nThis service is bound to by TelephonyProvider on devices where we don\u0027t\nuse the apns-conf.xml file.\n\nBug: 37283190\nTest: manual\nChange-Id: I16da1c5acc5ba1fe0237cc0d37c73d831c2d1508\n" }, { "commit": "ae6455957b13fbd5e892231cec2e9d243b5fd449", "tree": "2a1c13ca3e88ac35e220d08c09e6ec9b0c40758d", "parents": [ "ea3d9d1b42527062c7a07b8be6c1783412ca1a63", "4e0c2195dd999859f4e79cec1884326fb52a5916" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 06 20:25:47 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 06 20:25:54 2017 +0000" }, "message": "Merge \"Initial support for proposed android.net.lowpan\"" }, { "commit": "28f6dc951223a017f9abc90599662cb3f4995ad1", "tree": "b0b9563a9afbff8e02eadcf4ba1e8fefcd64c639", "parents": [ "3de8df76b5f2f7d4aa2f37a1b7c1d0100fc94059", "67cb5f5210dd53d6e4726ab77bc5fc5164ab1a3c" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Tue Jun 06 16:17:39 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 16:17:39 2017 +0000" }, "message": "Merge \"Give Doclava our manifest; more permission docs.\" into oc-dev am: 65d4cbba37\nam: 67cb5f5210\n\nChange-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216\n" }, { "commit": "67cb5f5210dd53d6e4726ab77bc5fc5164ab1a3c", "tree": "0256cbd62a3841bf3a1364e243fbac12a52a3068", "parents": [ "0ffff6a341b294e251a23136664472f47b73302f", "65d4cbba370ec85d45b88f91ee13b8d37b3d9909" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Tue Jun 06 15:28:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 15:28:26 2017 +0000" }, "message": "Merge \"Give Doclava our manifest; more permission docs.\" into oc-dev\nam: 65d4cbba37\n\nChange-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e\n" }, { "commit": "bfc4fcde9f756337fc8d0867ff04549b08688fff", "tree": "59c1a1cbbfd8483c335409c4c3a820a9a82c2f66", "parents": [ "d86b8fea43ebb6e5c31691b44d8ceb0d8d3c9072" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jun 05 17:38:17 2017 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Jun 05 17:38:19 2017 -0600" }, "message": "Give Doclava our manifest; more permission docs.\n\nWe\u0027ve seen some @SystemApi methods protected with non-system\npermissions, so give Doclava the platform AndroidManifest.xml so it\ncan parse the actual permission protection levels to look for APIs\nthat are letting in non-system apps.\n\nAlso document more @SystemApi permissions.\n\nThis is purely a docs change; no logic changes are being made.\n\nTest: make -j32 update-api\nBug: 62263906\nChange-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06\n" }, { "commit": "067cf3e8835cca3112ce99fbb01a0c7a431f7d06", "tree": "f74c576cc0171880981c25383553b61be829093d", "parents": [ "0ea89f0f409eecbbcd8d6b3850e93b8da7d2d54b" ], "author": { "name": "Keun-young Park", "email": "keunyoung@google.com", "time": "Mon Jun 05 12:20:41 2017 -0700" }, "committer": { "name": "Keun-young Park", "email": "keunyoung@google.com", "time": "Mon Jun 05 14:27:25 2017 -0700" }, "message": "add skeleton CarServiceHelperService\n\n- CarServiceHelperService is a companion service for car service which\n is used only for car product.\n- HelperService starts car service and provide necessary interface\n for system server internal behavior control.\n\nbug: 62342376\nTest: test boot-up\nChange-Id: I1728437434eab36bd2df6ba0a534731823bbcf35\n" }, { "commit": "4e0c2195dd999859f4e79cec1884326fb52a5916", "tree": "3666b0241b636d5842ec84ae88a68d41cb9e6278", "parents": [ "4bfb604d043058b0ce95234319fd872124c5ec11" ], "author": { "name": "Robert Quattlebaum", "email": "rquattle@google.com", "time": "Wed Feb 08 12:13:19 2017 -0800" }, "committer": { "name": "Robert Quattlebaum", "email": "rquattle@google.com", "time": "Mon Jun 05 17:47:16 2017 +0000" }, "message": "Initial support for proposed android.net.lowpan\n\nChange-Id: I0bf8edb5199d50d2a549a353b2785aef8134ff92\n" }, { "commit": "57d94d9fb1e55345307e579977138aaf6177e388", "tree": "308d608181bf9af376981956c87325e5debdc39f", "parents": [ "426a6148b52387d567169335abdde0696986a056" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Wed May 31 14:44:45 2017 +0100" }, "committer": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Fri Jun 02 15:48:49 2017 +0100" }, "message": "Add support for vibrator 1.1 HAL and TICK effect.\n\nNew HAL support is a bit hacky but gets us unblocked.\n\nBug: 38417655\nBug: 38417570\nTest: Manual (hacked up 1.1 HAL implementation that just logs)\nChange-Id: I207cce97c81734bac1ca00a5de18e160d13e2bbe\n" }, { "commit": "bb354909bd018e7683089ba8930ebd2eed8adadc", "tree": "037c6c5985ade5ae9190840a69d85aba2a75579c", "parents": [ "768ce6edf679a4ef85675a717e2f72b63b52cda0", "1cb063d3edd9b1b40c0291f766828b44261a7c22" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Tue May 23 17:25:09 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 23 17:25:09 2017 +0000" }, "message": "Merge \"Fix makefile warning.\" am: f523227a6e am: 9e317f8743\nam: 1cb063d3ed\n\nChange-Id: I83e952804b47ad50b1c8c9125ef36772f6571d69\n" }, { "commit": "191330e4a19175a32adceb790066732771579728", "tree": "bd024d64854da48215116930aada93efe3b34b74", "parents": [ "99cf40a25a23393b7463e9c5f664c4586c5eca48" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Apr 11 11:06:34 2017 -0700" }, "committer": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Mon May 22 22:39:15 2017 -0700" }, "message": "Fix makefile warning.\n\nTest: it builds.\nBug: b/37159108\nChange-Id: I73c09c8eeb0bab5f506c3d81072cc80c71f63779\nMerged-In: I73c09c8eeb0bab5f506c3d81072cc80c71f63779\n" }, { "commit": "43cd4987fc6e7e14562910cca1cc8006ed78f09f", "tree": "3522d87f9ec21c0c1df2e622132df5789b341bf7", "parents": [ "8881f2351e09ab82a8fc52b4ae727acf04c3d88d", "4b1d35035d11d190f7aeb6d3e2ed6393aab703df" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Tue May 16 20:22:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 16 20:22:29 2017 +0000" }, "message": "Merge \"startStreaming for MBMS apis\" am: 4b3c44be55 am: 0a4740ec5c am: 624290d3c8\nam: 4b1d35035d\n\nChange-Id: I85644f09227e1b23b16e7b219a0fc572514f8b97\n" }, { "commit": "4b1d35035d11d190f7aeb6d3e2ed6393aab703df", "tree": "bd2ce6d2e5a2eda2da263e0925bb39731788cde4", "parents": [ "73b63bd5acc259016831f9755e4e5e6cfc565b36", "624290d3c86a8e8243a0ecbc1b7f0245a04df651" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Tue May 16 20:05:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue May 16 20:05:41 2017 +0000" }, "message": "Merge \"startStreaming for MBMS apis\" am: 4b3c44be55 am: 0a4740ec5c\nam: 624290d3c8\n\nChange-Id: I6cddee57736b27dfcf88537f4e602d4bf6bc81aa\n" }, { "commit": "fb1ee0ebb2ac9aa3c4e89919079de379375f3e11", "tree": "5b579312f531c8d0783a4b67bd1ac8748f2e2e9a", "parents": [ "73818566d6cdab38b96a9a6dbf773f11b166526c" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu May 11 13:32:32 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Mon May 15 16:48:52 2017 -0700" }, "message": "startStreaming for MBMS apis\n\nClean up MBMS APIs a bit and make things functional for the\nstartStreaming/getPlaybackUri APIs.\n\nTest: testapps\nChange-Id: I141a4114cc912b98ae22aefb760346061e286f1a\n" } ], "next": "91c3d07fd9c75258a47fb25c59bc0cd5d2b638a4" }