)]}' { "log": [ { "commit": "d330eeeedafc842ff0f5807cb42c8e5d9a2ca00b", "tree": "b67e68dc84c3f459d3c7bc5b401a7dbe3bb2468a", "parents": [ "5319777274a206c917ae13708c14daf3f942d853", "69516f4df7129b39dfa05654b9e5163442438c72" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Dec 12 23:25:48 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 12 23:25:48 2017 +0000" }, "message": "Merge \"Separate android.test.mock from test-runner source\"" }, { "commit": "69516f4df7129b39dfa05654b9e5163442438c72", "tree": "3e21c3ef15385e32487c3750cdc43af95c2b21f6", "parents": [ "eb652a47a180092b397ec40c718dfc13935f7fb6" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Nov 15 11:39:14 2017 +0000" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Dec 12 23:23:31 2017 +0000" }, "message": "Separate android.test.mock from test-runner source\n\nExtracts the source for the android.test.mock library from the\nframeworks/base/test-runner directory into its own\nframeworks/base/test-mock directory. They are already treated separately\nat runtime and compile time so this just makes the separation complete.\n\nBug: 30188076\nTest: make checkbuild\nChange-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6\nMerged-In: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6\n(cherry picked from commit e254526f0fe5d22681555bd4a00b7ee96fee1dc1)\n" }, { "commit": "b592e29f28d2afe8c4a2bfcc93654e76c11c8e5b", "tree": "8b636ae2d264f7b4055cfb31af521f2aec14e0b0", "parents": [ "e7120f505651500098eae89b5816b724106c248d" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Thu Nov 30 14:03:58 2017 -0800" }, "committer": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Fri Dec 08 13:28:07 2017 -0800" }, "message": "Moved data connection response into system api.\n\nThis is a preliminary step for IWLAN refactoring, where data response\nwill be one of the parameter in data service callback.\n\nTest: Telephony sanity tests\nbug: 64132030\nMerged-In: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1\nChange-Id: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1\n(cherry picked from commit e44609b15866d080e0f8813b99d04b51a6f32929)\n" }, { "commit": "2337aec921d051da0d6b506e5fbb564ea2e49911", "tree": "45312f63da4f26b64dc1e432fa31d74f6745c93e", "parents": [ "bc4f48b21d4f78a81a78a120a59e523369e41e7b" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Dec 06 21:12:23 2017 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Dec 07 00:22:25 2017 -0700" }, "message": "Deeper sanity checking of emitted types.\n\nWhen emitting a method or field, verify that we\u0027re able to reference\nall mentioned types. This ensures that we don\u0027t accidentally\nreference undefined classes/interfaces.\n\nTest: manual inspection of API files\nBug: 69791141\nChange-Id: I84e0c87fe83daa118661f61dbdf17b58ea5282d4\nMerged-In: I84e0c87fe83daa118661f61dbdf17b58ea5282d4\n" }, { "commit": "bc4f48b21d4f78a81a78a120a59e523369e41e7b", "tree": "2a4d62b613e1c08543eb31aa422c5871045da2f5", "parents": [ "983df8cc6cd450c6e30881aa6a1b429ebe09d383" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Dec 06 21:02:11 2017 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Dec 06 21:56:12 2017 -0700" }, "message": "Emit all APIs using Predicates.\n\nGenerate APIs using updated doclava.\n\nTest: manual inspection of API text files\nBug: 69505783\nChange-Id: I2efd22998a64ebb57588b073c4a591242f4aef91\nMerged-In: I2efd22998a64ebb57588b073c4a591242f4aef91\n" }, { "commit": "b42cfb691d1bb94902a7279e101f574986b275a0", "tree": "41ca9e389382fd2838f0cb799c68fb264971115c", "parents": [ "bafba08c6b88ee03eebc1d2f7606cadb936d1dba", "85f095e24666f87d7270e0b4a5ce31c7bf29a67f" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Dec 05 01:29:12 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 05 01:29:12 2017 +0000" }, "message": "Merge \"Fix droiddoc when OUT_DIR is an absolute path\"\nam: 85f095e246\n\nChange-Id: I5a91ba906958777944fc25fb5de281e4c8beebe7\n" }, { "commit": "0c7609553df2b324c4557fc5687e7700e773d193", "tree": "ea03b101d105a494f81d1086d3833ac1a2366130", "parents": [ "3d16ff7a4ae01773a9a54023b72e825f1cef886e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Dec 04 13:45:19 2017 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Dec 05 01:07:53 2017 +0000" }, "message": "Fix droiddoc when OUT_DIR is an absolute path\n\nThe droiddoc rules were passing the sources in through\nLOCAL_SRC_FILES, which gets prefixed with $(LOCAL_PATH). They\nwere prefixing ../.. to try to counter frameworks/base in\n$(LOCAL_PATH), but that doesn\u0027t work for absolute paths to\ngenerated files in an absolute $(OUT_DIR).\n\nUse $(LOCAL_GENERATED_SOURCES) for anything that is in $(OUT_DIR)\ninstead, which takes paths that are relative to the top of the tree\nor absolute.\n\nBug: 70166718\nTest: m OUT_DIR\u003d/tmp/out docs\nChange-Id: I93b743607c2b8ce05512ecd4bbe860747cb48428\nMerged-In: I93b743607c2b8ce05512ecd4bbe860747cb48428\n(cherry-picked from commit bd200ce7d4ebe31ad4327683e59af269420b0ef5)\n" }, { "commit": "943e2aa7ef03caa234da36d37072a5d6f1b3e88c", "tree": "a336cad286de69a0a7fb889b63507fe29863f31d", "parents": [ "74445ed3111486737520a1768db20ba36f5af1fd" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Nov 16 00:15:28 2017 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sun Dec 03 20:23:43 2017 -0800" }, "message": "Convert framework.jar to Android.bp\n\nUse Soong to build framework-res.apk and framework.jar.\nSee build/soong/README.md for more information.\n\nBug: 69917341\nTest: m checkbuild tests docs\nTest: manually compare framework.jar and framework-res.apk\nTest: manually compare out/target/common/docs\nChange-Id: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4\nMerged-In: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4\n(cherry picked from commit cf3a0b5355c6138538f9f3d4b369a875814bc01c)\n" }, { "commit": "5f4dcf67022ac7bd7686eb16b4623ca113ef4000", "tree": "70e204489a97b3f6fe76597bb4cdd6ca24424308", "parents": [ "bd4b1bad48662057a44cdaaef3c0fc8c07739a31" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Nov 16 00:15:28 2017 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sun Dec 03 17:50:34 2017 +0000" }, "message": "Convert framework.jar to Android.bp\n\nUse Soong to build framework-res.apk and framework.jar.\nSee build/soong/README.md for more information.\n\nBug: 69917341\nTest: m checkbuild tests docs\nTest: manually compare framework.jar and framework-res.apk\nTest: manually compare out/target/common/docs\nChange-Id: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4\nMerged-In: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4\n(cherry picked from commit cf3a0b5355c6138538f9f3d4b369a875814bc01c)\n" }, { "commit": "208f232825b8799e12f16994f303efa0188ee493", "tree": "0ac2364fef4d6899864348f7cec74ec48903520e", "parents": [ "cba4979a6a2f2bd2fee1a7043203cbc9367cbda9", "74445ed3111486737520a1768db20ba36f5af1fd" ], "author": { "name": "Mohamed", "email": "abdalkader@google.com", "time": "Thu Nov 30 16:05:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Nov 30 16:05:36 2017 +0000" }, "message": "Merge \"Add SMS over IMS APIs\"\nam: 74445ed311\n\nChange-Id: I5b08b82f39968adc111d0b3361b4312eb7244913\n" }, { "commit": "74445ed3111486737520a1768db20ba36f5af1fd", "tree": "fae0671094ea26917719f9fe7e09c7ed99a49dca", "parents": [ "171fce83775f98175c7113f2ec8cec2e247e174d", "037749df03aff860db94c47e69b4ba3913f5e0e2" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Nov 30 15:56:30 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Nov 30 15:56:30 2017 +0000" }, "message": "Merge \"Add SMS over IMS APIs\"" }, { "commit": "037749df03aff860db94c47e69b4ba3913f5e0e2", "tree": "cb4363fddb9a141ce525d3dc284d71122b07c7ff", "parents": [ "419ec0528444ba4755199ed6cf6ffa6d1b201d95" ], "author": { "name": "Mohamed", "email": "abdalkader@google.com", "time": "Mon Nov 27 18:40:09 2017 -0800" }, "committer": { "name": "Mohamed", "email": "abdalkader@google.com", "time": "Wed Nov 29 16:14:57 2017 -0800" }, "message": "Add SMS over IMS APIs\n\n- Adds public APIs that IMS providers will implement/use\n- Adds aidl APIs for internal communications to support SMS over IMS.\n- First pass at documentation of APIs.\n\nMoving over from ag/3265442\n\nBug: 69846044\n\nTest: None\nChange-Id: Ic665a2a7d64a56417bcf2a159d6b88b05cdb832a\n" }, { "commit": "3221d23138e1f1dfb3319df419bf786e5450bd4c", "tree": "7a2ac82e2e01c5724886aa05bca6407d91eebec3", "parents": [ "0f9b8c2c600cda5554e50734214ae35d3f9ce37f", "24cd7cbd1e3086f4d4ffdea76bde4fa638180110" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Tue Nov 28 17:39:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 28 17:39:01 2017 +0000" }, "message": "Merge \"Moved DataProfile from telephony internal hidden API to System API\"\nam: 24cd7cbd1e\n\nChange-Id: Ica76a82b03f6bb0623a98480ae1c2fbc34d07337\n" }, { "commit": "1d1022e44552b067a32e7b900f7dda9a75d364f6", "tree": "0b9f378b99b2daed7f97ad6086720c2799216ca2", "parents": [ "e72b6f0d3113c84df6d9113609942ef5d9b4e34e" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Mon Nov 20 11:14:23 2017 -0800" }, "committer": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Mon Nov 27 14:36:15 2017 -0800" }, "message": "Moved DataProfile from telephony internal hidden API to System API\n\nThis is the preliminary change in order to make the new data call\nsetup API for IWLAN refactoring.\n\nTest: Telephony sanity tests + unit tests\nbug: 64132030\n\nMerged-In: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020\nChange-Id: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020\n(cherry picked from commit fc84bb5f5c6e30db0eca589eb67b406bf4bfadbe)\n" }, { "commit": "e575ad10ca5d4713235f766086ee8d83d56b72c9", "tree": "de5e7e6ad0fe2137bd2d5bcb6656c1c36a90f7a4", "parents": [ "c6dc6baf4f8e78b96728361e3523feefbb770268", "8a02c63f166de7ed0b29afc9a485a8e606d9d441" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Wed Nov 22 19:23:16 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 22 19:23:16 2017 +0000" }, "message": "Merge \"Refactor ImsService to AIDL\"\nam: 8a02c63f16\n\nChange-Id: I195d7ccff8498241b6c7be819d2ee96b661d51e1\n" }, { "commit": "216b3ce485ccd0c42a778c3ca0668f371465a8d4", "tree": "1dae6d3acfdee684338360ad4dda32dc4c2e0675", "parents": [ "a89f6150dc68b64ae0fe2466cad6afc6880f7cae" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Thu Nov 09 10:22:49 2017 -0800" }, "committer": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Thu Nov 16 21:28:36 2017 +0000" }, "message": "Refactor ImsService to AIDL\n\nThe ImsService was originally designed as a flat\ninterface, all ImsFeatures would be forwarded\nthrough ImsService. This has been refactored to\nusing AIDL interfaces for each feature, as it\nis more straightforward.\n\nTest: Manual, Telephony IMS Unit Tests\nChange-Id: Ibe065ddec6f180eabda03cf06f842c642a11114f\n" }, { "commit": "220871a697290529278ed16db508eda8e12f3fc7", "tree": "bc13101b63c6fe39a9d92706ecb7ded7f98f5a9c", "parents": [ "802f191b2b84a1b1b82c7f6f3268846084b35dfb", "98e12851336b7db16e583f9afac63ecc97465980" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Nov 14 12:31:11 2017 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Nov 14 12:31:11 2017 -0800" }, "message": "Merge commit \u002798e12851336b7db16e583f9afac63ecc97465980\u0027 from\noc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.\n\nChange-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7\nMerged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d\n" }, { "commit": "422af4d04962b029958ddb6897fd9ef2d3a012b3", "tree": "7c0eec253bf3f41a1271dfb7edf008edc21af0bc", "parents": [ "bbaa19cad3227eb0262beb5555db54902ef17821" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Nov 01 10:12:36 2017 -0700" }, "committer": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Thu Nov 09 19:39:51 2017 +0000" }, "message": "Add IBluetoothSocketManager (3/3)\n\nAdd IBluetoothSocketManager native Binder implementation. Thanks to it\nwe\u0027ll skip jni to native calls, and need to re-serialize data manually.\n\nBug: 68359837\nTest: none\nChange-Id: I6c99717aa18ab41addf96b7536e483ae12802601\n" }, { "commit": "2d362a5831b15fb6e9dc78d300533fefbb7a4761", "tree": "9e646b6456091b00cb29ca49bcd5ea809a9eea27", "parents": [ "8476a2c75d9193d1a038a7e0ee47f6fc46424dd8" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Wed Apr 05 10:21:58 2017 -0400" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 31 09:25:06 2017 -0700" }, "message": "Federate platform docs against support library API file\n\nBug: 36959367\nTest: make docs\nChange-Id: I7c6dffed25566c2bb1183aba60103c437888ba21\n" }, { "commit": "72d359f227bc24afd010f26310f2e0d3ec7dc230", "tree": "c75c024a44016a7ef9806532752b24da6d722939", "parents": [ "536d241fb2fc7ad628dbc6a77092ba5372aa0c71" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Oct 27 10:46:53 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Oct 27 12:58:45 2017 -0700" }, "message": "Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES\n\nLOCAL_SRC_FILES is expected to be a list of files relative to the\nAndroid.mk files. If OUT_DIR is absolute then adding generated\nfiles to the list produces bad paths when $(LOCAL_PATH)/ is prepended\nto it. Put libcore\u0027s generated sources into\nLOCAL_INTERMEDIATE_SOURCES instead.\n\nBug: 64930165\nBug: 68375156\nTest: m checkbuild\nChange-Id: I4b36fd192570ea0cd52d8537a16c078c726d97fd\n" }, { "commit": "c8a370aeba5fe441ec84950ec0dcefd5456bc777", "tree": "2daf6835f8a5ae4c57aeacd4f208f25a4197fcd5", "parents": [ "9953542c3aca41d76b336710d8a7e92601041f8d", "8218b219f3738d40731ecf9e70fd92dcdc2847a0" ], "author": { "name": "Hansong Zhang", "email": "hsz@google.com", "time": "Mon Oct 23 22:33:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 23 22:33:50 2017 +0000" }, "message": "Merge \"Change Bluetooth HID Profile Name (1/6)\"\nam: 8218b219f3\n\nChange-Id: Ic085deaa070b4008b34d03b507f81a5df220764a\n" }, { "commit": "0edf754b2d04965d3186407a6d5de1d36d29f0a9", "tree": "7b36e4ac534eba37f7e01d14805350ac77fcce29", "parents": [ "3e26cb18fb7ec7d9406d3b6c58920a19bfea5170" ], "author": { "name": "Hansong Zhang", "email": "hsz@google.com", "time": "Fri Oct 20 15:55:59 2017 -0700" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Oct 23 22:21:00 2017 +0000" }, "message": "Change Bluetooth HID Profile Name (1/6)\n\nMake the Bluetooth HID profile name consistent with the Bluetooth HID service\nname.\n\nBluetoothInputHost → BluetoothHidDevice\nBluetoothInputDevice → BluetoothHidHost\nIBluetoothInputHost → IBluetoothHidDevice\nIBluetoothInputDevice → IBluetoothHidHost\nBluetoothProfile.INPUT_HOST → BluetoothProfile.HID_DEVICE\nBluetoothProfile.INPUT_DEVICE → BluetoothProfile.HID_HOST\n\n(Cherry-picked from commit c26c76c63d933f8057f795d05624f91b811c8c71)\nMerged-In: Iadb890a54dd3d6868b87514472bbac6bb0c6179f\nBug: 68055651\nTest: make\nChange-Id: Iadb890a54dd3d6868b87514472bbac6bb0c6179f\n" }, { "commit": "b06e03c134c5d43675a3bd20398eb6f3f3926b8d", "tree": "4408989a980506161a7ca87e57fc4341a8f5efeb", "parents": [ "18abf57e9961a9f793ad1598848940f63d9a92c9", "6a90c3f793be94f54f1fdb4c8a69f6380ef8624d" ], "author": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Fri Oct 20 00:17:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 20 00:17:23 2017 +0000" }, "message": "Merge \"Shard framework during Java compilation for target side.\"\nam: 6a90c3f793\n\nChange-Id: I1a24f704d3537bde1e4aaef5bd4edf4cc898bb04\n" }, { "commit": "6a90c3f793be94f54f1fdb4c8a69f6380ef8624d", "tree": "cacb768077f5f4cdf67418af2cf126579b1f7539", "parents": [ "1f4f6d2a18e3d433ff2f1566370b696d6a6e9c9a", "f7141d5a8742c8e478d09755e03ebcd2dc5fca19" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 23:46:18 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 19 23:46:18 2017 +0000" }, "message": "Merge \"Shard framework during Java compilation for target side.\"" }, { "commit": "3f6bef874e0d248e91e9a58f2e49b92f233281a3", "tree": "ad63295f0bffd13e0a9f5cfb3ef6d55391af128e", "parents": [ "ecc8bdc227ac31380384cb7544bd260d6e4076b2", "faededa6af954254eb26beae13ba0d96a9b45d6e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sun Oct 15 02:43:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Oct 15 02:43:13 2017 +0000" }, "message": "Merge \"Convert ext.jar to Android.bp\" am: 42156f3e56 am: 8feea076a2\nam: faededa6af\n\nChange-Id: I9e640ea1f6175306c74075e25485bce622d6ca52\n" }, { "commit": "8feea076a2907524b423aaefaec3002d8339b5af", "tree": "dfc23160abb50709825f33b6461c23f8c5f883e8", "parents": [ "c04d233ac205cd38aec50f40f97869075854386d", "42156f3e56617d3867020d0a81fe24f48723efc1" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sun Oct 15 02:06:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Oct 15 02:06:20 2017 +0000" }, "message": "Merge \"Convert ext.jar to Android.bp\"\nam: 42156f3e56\n\nChange-Id: I44443e9095c8b527ebb42d11a6f5369fdf3e5d05\n" }, { "commit": "42156f3e56617d3867020d0a81fe24f48723efc1", "tree": "36de056c87391c687b8b2e5d9193f5282533bfc3", "parents": [ "db95dff0d8e4b3459b609e8793062679da6df802", "d8e022518853a309367c8b552db7e742e07b3329" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Oct 13 01:08:01 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 13 01:08:01 2017 +0000" }, "message": "Merge \"Convert ext.jar to Android.bp\"" }, { "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": "f7141d5a8742c8e478d09755e03ebcd2dc5fca19", "tree": "864fcbc07119fa5080777dfbd081992c2f5befea", "parents": [ "ed8d236319a112a0b19b1f05ea55a90ba93e8aa2" ], "author": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Wed Oct 04 09:45:04 2017 -0700" }, "committer": { "name": "Nan Zhang", "email": "nanzhang@google.com", "time": "Mon Oct 09 11:06:03 2017 -0700" }, "message": "Shard framework during Java compilation for target side.\n\nPerformance Compare:\n\u003cUnsharded Build------------------------------------------------\u003e\n1. Build from clean state\nrm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/\n\u0026\u0026 time m\nout/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar\n\nreal\t1m2.720s user\t5m26.604s sys\t0m39.552s\n\n2. Incremental build\nm\nout/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar\n\u0026\u0026\ntouch frameworks/base/core/java/android/net/http/HttpResponseCache.java\n\u0026\u0026 time m\nout/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar\n\nreal\t0m37.586s user\t5m47.804s sys\t0m50.388s\n\n\u003cSharded Build--------------------------------------------------\u003e\n1. Build from clean state\nrm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/\n\u0026\u0026 time m\nout/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar\n\nJavac Shard Size: 50----real\t1m10.163s user\t25m59.008s sys 1m58.460s\nJavac Shard Size: 100---real\t1m2.115s user\t21m3.600s sys 1m15.964s\nJavac Shard Size: 150---real\t0m59.520s user\t18m10.544s sys 1m12.628s\nJavac Shard Size: 200---real\t0m56.894s user\t15m39.244s sys 1m11.608s\nJavac Shard Size: 250---real\t0m55.991s user\t14m38.716s sys\t1m2.292s\nJavac Shard Size: 300---real\t0m55.114s user\t13m6.568s sys\t1m8.200s\nJavac Shard Size: 350---real\t0m53.144s user\t12m7.740s sys\t1m3.836s\nJavac Shard Size: 400---real\t0m54.929s user\t12m9.324s sys\t1m4.340s\nJavac Shard Size: 450---real\t1m30.194s user\t25m31.468s sys 1m52.416s\nJavac Shard Size: 500---real\t0m53.976s user\t10m35.500s sys 0m55.160s\n\n2. Incremental build\nm\nout/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar\n\u0026\u0026\ntouch frameworks/base/core/java/android/net/http/HttpResponseCache.java\n\u0026\u0026 time m\nout/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar\n\nJavac Shard Size: 50-----real\t0m16.322s user\t1m8.648s sys 0m31.700s\nJavac Shard Size: 100----real\t0m16.163s user\t1m22.932s sys 0m29.440s\nJavac Shard Size: 150----real\t0m16.611s user\t1m37.828s sys 0m21.168s\nJavac Shard Size: 200----real\t0m16.936s user\t1m49.248s sys 0m28.636s\nJavac Shard Size: 250----real\t0m17.509s user\t1m54.944s sys 0m32.768s\nJavac Shard Size: 300----real\t0m18.868s user\t1m54.088s sys 0m28.824s\nJavac Shard Size: 350----real\t0m17.629s user\t1m54.108s sys 0m31.056s\nJavac Shard Size: 400----real\t0m18.658s user\t2m7.712s sys 0m30.636s\nJavac Shard Size: 450----real\t0m18.874s user\t2m8.808s sys 0m33.540s\nJavac Shard Size: 500----real\t0m19.432s user\t2m24.400s sys 0m30.368s\n\ntime m nothing:\nreal 0m5.799s user 0m7.236s sys 0m3.068s\n\nTest: m clean \u0026\u0026 m -j checkbuild\nBug: b/67424047\n\nChange-Id: I105733160ef034ec4689259aee30247148ca089c\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": "d8e022518853a309367c8b552db7e742e07b3329", "tree": "3809e7b491c2e0e9086e52becfc6ebddd2941055", "parents": [ "d30e47ecfc821682260c8cc869e0f484b453ddbb" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Oct 02 17:14:22 2017 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Oct 02 17:14:22 2017 -0700" }, "message": "Convert ext.jar to Android.bp\n\nSee build/soong/README.md for more information\n\nSwitches to using static libraries for tagsoup and nist-sip to avoid\nreference source files in another project.\n\nTest: m -j checkbuild\nChange-Id: I5d4c7729196dd78da63bd9d6b43647f6f61006cb\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" } ], "next": "7b69a86b02e1e4b469181a8ad286f473df8b6352" }