)]}' { "log": [ { "commit": "14be4e65b2e5aa6570965abd2b83ec799bf7bf5e", "tree": "e2e7195dc3fd0fe1364c19252cdcb37234da6ede", "parents": [ "16255fda639eab872a974dc404b289c6514210c8", "b7e10650d8a44600ead2f3e1b161f9c7c888e98e" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jul 21 21:18:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 21 21:18:42 2017 +0000" }, "message": "Merge \"Make slight API and doc adjustments\"\nam: b7e10650d8\n\nChange-Id: I96a361924ddff300eb36933bed67d30ec00e8f87\n" }, { "commit": "b7e10650d8a44600ead2f3e1b161f9c7c888e98e", "tree": "39ee5be1df4fe44daade9554feb35bf47ae954bc", "parents": [ "79994cb142831ea90ca9c9089f8c4eea5172ecf9", "64a98f9646e58e05fc84f28c441762285347a8c9" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jul 21 21:09:34 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jul 21 21:09:34 2017 +0000" }, "message": "Merge \"Make slight API and doc adjustments\"" }, { "commit": "16255fda639eab872a974dc404b289c6514210c8", "tree": "e9639638cbde293825cba83c010abc38e9c7b23e", "parents": [ "b167ed08cc8440ef8aa31f0cd183501da64c2ea5", "79994cb142831ea90ca9c9089f8c4eea5172ecf9" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jul 21 19:28:14 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 21 19:28:14 2017 +0000" }, "message": "Merge \"Revert \"Update for less arguments in hidl toBinder.\"\"\nam: 79994cb142\n\nChange-Id: I325335a278fc9aebf7957e23089c72665169eeb3\n" }, { "commit": "79994cb142831ea90ca9c9089f8c4eea5172ecf9", "tree": "519c0d50a4436de4300988b02dc0d7e7448fa507", "parents": [ "602b7be04e1e71879978ed06b5fa1165e7082d36", "243bcfda3ac35735a959f8abcc45186aba0af116" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jul 21 19:14:24 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jul 21 19:14:24 2017 +0000" }, "message": "Merge \"Revert \"Update for less arguments in hidl toBinder.\"\"" }, { "commit": "243bcfda3ac35735a959f8abcc45186aba0af116", "tree": "6ac37ec9d476bbdd0348e3a6a91ea6cb61a72938", "parents": [ "de2a9dfe3a7f343d4c1568d644ae0ddce7725a8d" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jul 21 19:13:05 2017 +0000" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jul 21 19:13:05 2017 +0000" }, "message": "Revert \"Update for less arguments in hidl toBinder.\"\n\nThis reverts commit de2a9dfe3a7f343d4c1568d644ae0ddce7725a8d.\n\nChange-Id: I6f451b0a05759501f59921747d95c6ae5b7ce656\n" }, { "commit": "b167ed08cc8440ef8aa31f0cd183501da64c2ea5", "tree": "57a15cdcda116efa6f96f2bb99f0f0b24fad669a", "parents": [ "b9d0a22aaf149edc894bee4aedfc712b0154f895", "602b7be04e1e71879978ed06b5fa1165e7082d36" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jul 21 18:13:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 21 18:13:01 2017 +0000" }, "message": "Merge \"Update for less arguments in hidl toBinder.\"\nam: 602b7be04e\n\nChange-Id: I61f30db7a638c8c74925509e0bee1a7fffd5c546\n" }, { "commit": "b9d0a22aaf149edc894bee4aedfc712b0154f895", "tree": "e9639638cbde293825cba83c010abc38e9c7b23e", "parents": [ "3d423c9c3965b6c4d9f5e2a23b002ae20d9983a1", "a42c8a1667bdf2caa38e183588ef4541b1035ddc" ], "author": { "name": "Love Khanna", "email": "love.khanna@nxp.com", "time": "Fri Jul 21 17:56:59 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 21 17:56:59 2017 +0000" }, "message": "Merge \"NFC DTA Integration\"\nam: a42c8a1667 -s ours\n\nChange-Id: I6edab80bee45eb4f95a36273857068487ff506b7\n" }, { "commit": "602b7be04e1e71879978ed06b5fa1165e7082d36", "tree": "0607abf1bfdacf60513ff4cd03b8e64fbd9b03dc", "parents": [ "a42c8a1667bdf2caa38e183588ef4541b1035ddc", "de2a9dfe3a7f343d4c1568d644ae0ddce7725a8d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 21 17:49:39 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jul 21 17:49:39 2017 +0000" }, "message": "Merge \"Update for less arguments in hidl toBinder.\"" }, { "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": "de2a9dfe3a7f343d4c1568d644ae0ddce7725a8d", "tree": "a8ef6c164da16cbe4dba6b843a3d2b77a2ef1460", "parents": [ "e0a743d035376a5477661b5e7b317b278724c99d" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Jul 20 09:24:56 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jul 21 08:39:26 2017 -0700" }, "message": "Update for less arguments in hidl toBinder.\n\nRemoved unnecessary templatization argument.\n\nTest: hidl_test_java\nBug: 32172906\nChange-Id: I88cd2bf7abc3065ece4e28698ba5e0d836b1d0e3\n" }, { "commit": "3d423c9c3965b6c4d9f5e2a23b002ae20d9983a1", "tree": "e9639638cbde293825cba83c010abc38e9c7b23e", "parents": [ "42199bf5a06f8efe4aa1d4eac2f917b5ad389511", "e0a743d035376a5477661b5e7b317b278724c99d" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 21 08:15:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 21 08:15:20 2017 +0000" }, "message": "Merge \"IpManagerTest: fix flaky test for real\"\nam: e0a743d035\n\nChange-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41\n" }, { "commit": "e0a743d035376a5477661b5e7b317b278724c99d", "tree": "6ac37ec9d476bbdd0348e3a6a91ea6cb61a72938", "parents": [ "2cae07284d035692274b28aa40fe8f3e76498073", "e9bdc19a43c46e8d2116017a1f58d88cb87d13f5" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 21 08:07:40 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jul 21 08:07:40 2017 +0000" }, "message": "Merge \"IpManagerTest: fix flaky test for real\"" }, { "commit": "e9bdc19a43c46e8d2116017a1f58d88cb87d13f5", "tree": "edbd9d4784806c2da9499958b016db34e124c1fd", "parents": [ "2627d4856be08bda40f6b50ba0974f8b875f4995" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 21 14:12:26 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Jul 21 14:14:25 2017 +0900" }, "message": "IpManagerTest: fix flaky test for real\n\nCommit c10fe5f46367 tried to fix the flaky unit test for a default\nProvisioningConfiguration but failed to reinitialize the mock class\ninvolved, so that in practice the flaky assertion is as flaky as before.\n\nThis patch correctly resets the mock after the default assertions are\ndone once an IpManager object is created.\n\nBug: 32561414\nBug: 62918393\nTest: runtest frameworks-net\nChange-Id: I516b6981f96e83a90cb372a727c41f0b2ea59801\n" }, { "commit": "64a98f9646e58e05fc84f28c441762285347a8c9", "tree": "1897f0f22d63322744ffbceff3328cc6f44b1e1a", "parents": [ "a3bde812059bc5781b3691b1efc8bc15addd094a" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Fri Jul 14 13:39:54 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Jul 20 13:31:52 2017 -0700" }, "message": "Make slight API and doc adjustments\n\n* Fix a compile error on Java 7\n* Update initialization mechanism to allow exceptions and return codes\n* App-facing api for StreamingService#dispose no longer throws an\nIllegalArgumentException\n* Add REASON_NONE to stream state change reasons\n\nChange-Id: I4710c6e56b35f74188f5877f0cf74b7773c1e9b7\n" }, { "commit": "42199bf5a06f8efe4aa1d4eac2f917b5ad389511", "tree": "5b5ee962752a26610c0f71de86f364fbd3515fec", "parents": [ "3182454f2816e29d8ad63ac17e5cda022f78ca1d", "2cae07284d035692274b28aa40fe8f3e76498073" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Jul 20 18:25:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 18:25:10 2017 +0000" }, "message": "Merge \"Logging improvements for time zone updates\"\nam: 2cae07284d\n\nChange-Id: Ic9e4b16d66164447f4937cf59d90ca8ecc9568ce\n" }, { "commit": "2cae07284d035692274b28aa40fe8f3e76498073", "tree": "d83853b76c8c8cd82080ede52b9f1855dde5d341", "parents": [ "9e3f886dca4bc2cc973fe194b2f6ba438928c48b", "d857f676744af55c79c4871c881bf9598f6b21e9" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Jul 20 17:58:12 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 20 17:58:12 2017 +0000" }, "message": "Merge \"Logging improvements for time zone updates\"" }, { "commit": "d857f676744af55c79c4871c881bf9598f6b21e9", "tree": "d83853b76c8c8cd82080ede52b9f1855dde5d341", "parents": [ "9e3f886dca4bc2cc973fe194b2f6ba438928c48b" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Jul 20 11:00:35 2017 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Jul 20 13:13:20 2017 +0100" }, "message": "Logging improvements for time zone updates\n\nLogging improvements for time zone updates:\n1) Add EventLog entries time zone update service interactions.\n2) Add more information to dumpsys logs to improve debugging.\n\nUnit tests run with:\n\nmake -j30 FrameworksServicesTests\nadb install -r -g \\\n \"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk\"\nadb shell am instrument -e package com.android.server.timezone -w \\\n com.android.frameworks.servicestests \\\n \"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner\"\n\nBug: 31008728\nTest: See above for unit testing.\nTest: Internal xTS tests\nTest: adb shell dumpsys timezone\nTest: adb logcat -b events -v threadtime -v printable -v uid -d *:v\nChange-Id: I9356f4694e60b49e4b06aadd632d1bad517b8a29\n" }, { "commit": "3182454f2816e29d8ad63ac17e5cda022f78ca1d", "tree": "664920e6884bf5e0423f00503807069dcb6fb743", "parents": [ "73b7292a05044d32b2180430493a0348765a3957", "9e3f886dca4bc2cc973fe194b2f6ba438928c48b" ], "author": { "name": "Di Lu", "email": "ludi@google.com", "time": "Thu Jul 20 07:36:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 07:36:19 2017 +0000" }, "message": "Merge \"Add unit test for IpSecService\"\nam: 9e3f886dca\n\nChange-Id: I16fb89239e641ac39a8a7adeafd72b7fe03935ed\n" }, { "commit": "9e3f886dca4bc2cc973fe194b2f6ba438928c48b", "tree": "a409f95d6e399c2156b1d72e02c5bc110576ea78", "parents": [ "dd494fa91c413db9eb54f6661b77af481e1219c0", "1a06aa75e5a717de66a27cc1355f6658a2aa4737" ], "author": { "name": "Di Lu", "email": "ludi@google.com", "time": "Thu Jul 20 07:27:16 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 20 07:27:16 2017 +0000" }, "message": "Merge \"Add unit test for IpSecService\"" }, { "commit": "73b7292a05044d32b2180430493a0348765a3957", "tree": "6bdeb13c9ee9862c324b3938474720397f687fc8", "parents": [ "6078facf1f0f34514c2994a30ba596044c98c45d", "dd494fa91c413db9eb54f6661b77af481e1219c0" ], "author": { "name": "Di Lu", "email": "ludi@google.com", "time": "Thu Jul 20 05:52:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 05:52:10 2017 +0000" }, "message": "Merge \"Add unit test for IpSecManager\"\nam: dd494fa91c\n\nChange-Id: I56c336eb8234b31154b6a7defd95ce76ea0800d8\n" }, { "commit": "dd494fa91c413db9eb54f6661b77af481e1219c0", "tree": "5c0ced7ccc6adb127ddb449821a79917a7a88264", "parents": [ "89d119abe6724d68f9bdf780d98bc94bdd7f4695", "90de61b3ed2f3bedd5af74f675ae0957438c3565" ], "author": { "name": "Di Lu", "email": "ludi@google.com", "time": "Thu Jul 20 05:42:53 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 20 05:42:53 2017 +0000" }, "message": "Merge \"Add unit test for IpSecManager\"" }, { "commit": "6078facf1f0f34514c2994a30ba596044c98c45d", "tree": "3ab1eef1827461ec87e6d3031b941f5c9f5cf40b", "parents": [ "70291ef1d79d62f7c55bf147c878f45db9d1a490", "89d119abe6724d68f9bdf780d98bc94bdd7f4695" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Thu Jul 20 05:36:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 05:36:42 2017 +0000" }, "message": "Merge \"Zygote: Poll with timeout for pid\"\nam: 89d119abe6\n\nChange-Id: I704192c4a2e1d0509f0f3c19b42945f2c00669ed\n" }, { "commit": "89d119abe6724d68f9bdf780d98bc94bdd7f4695", "tree": "f9d70a3cb615294266d9272b95254512c401ba0f", "parents": [ "d27a6d62c66c76bff60f746b7ecb3a04c432b94a", "3fbde346ad04a557d519239d8d4f88bc6c8a7333" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jul 20 05:25:24 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 20 05:25:24 2017 +0000" }, "message": "Merge \"Zygote: Poll with timeout for pid\"" }, { "commit": "1a06aa75e5a717de66a27cc1355f6658a2aa4737", "tree": "cf130a87e8d99bf44f1669cd2746e8d598ce4cbe", "parents": [ "d27a6d62c66c76bff60f746b7ecb3a04c432b94a" ], "author": { "name": "ludi", "email": "ludi@google.com", "time": "Fri May 12 09:15:00 2017 -0700" }, "committer": { "name": "Di Lu", "email": "ludi@google.com", "time": "Thu Jul 20 04:26:24 2017 +0000" }, "message": "Add unit test for IpSecService\n\nTest: runtest frameworks-net\n\nBug:38259578\nChange-Id: I4a049d5fdec79e36692e3b12306bd0758c19ad75\n" }, { "commit": "70291ef1d79d62f7c55bf147c878f45db9d1a490", "tree": "3948135f11c2c8ae38cf664f9a6ac4121a58b874", "parents": [ "5c091dc9449b583e18656a8850a61f557dfcc945", "d27a6d62c66c76bff60f746b7ecb3a04c432b94a" ], "author": { "name": "Ahmed ElArabawy", "email": "arabawy@google.com", "time": "Thu Jul 20 03:46:08 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 03:46:08 2017 +0000" }, "message": "Merge \"Add Configuration to APF Policy\"\nam: d27a6d62c6\n\nChange-Id: I491bad86e4e9ae7a813ac214b06273719a583079\n" }, { "commit": "d27a6d62c66c76bff60f746b7ecb3a04c432b94a", "tree": "307d7af25804062c5b262de74b1b6e80dd145aa5", "parents": [ "826eafd95885adbfc142f3f70ec82b4091abed85", "8537c58cc8c07e39e016e217a4033a7652d84794" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jul 20 03:34:57 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 20 03:34:57 2017 +0000" }, "message": "Merge \"Add Configuration to APF Policy\"" }, { "commit": "5c091dc9449b583e18656a8850a61f557dfcc945", "tree": "db4ca724dd661b112d2bd72da67f2a91edce0850", "parents": [ "5f047a68d96f252772144a729f423c172ce816e4", "826eafd95885adbfc142f3f70ec82b4091abed85" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Jul 20 02:50:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jul 20 02:50:53 2017 +0000" }, "message": "Merge \"frameworks/base: use proper nativehelper headers\"\nam: 826eafd958\n\nChange-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2\n" }, { "commit": "3fbde346ad04a557d519239d8d4f88bc6c8a7333", "tree": "c791a81fdd4d3f9aed70de585a15afd156f4f132", "parents": [ "b440b572d78d7cfc8a03030913465daac26bebad" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Wed Jul 12 19:17:52 2017 -0700" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Wed Jul 19 19:45:55 2017 -0700" }, "message": "Zygote: Poll with timeout for pid\n\nDo not use a blocking readInt. Poll for available bytes with a timeout.\n\n(cherry picked from commit cbc421406193308667a38b0bebc16c4064a19e83)\n\nBug: 63638768\nTest: m\nTest: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases\nChange-Id: Ib2131c00aa47dd10bb940d8678bbbfb5a0346ad5\n" }, { "commit": "826eafd95885adbfc142f3f70ec82b4091abed85", "tree": "c687301d0ce95df97e79e82fba033cfdcc3e6035", "parents": [ "b440b572d78d7cfc8a03030913465daac26bebad", "2279b2534272282a5b5152723235da397e49195c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jul 20 02:42:49 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 20 02:42:49 2017 +0000" }, "message": "Merge \"frameworks/base: use proper nativehelper headers\"" }, { "commit": "8537c58cc8c07e39e016e217a4033a7652d84794", "tree": "eadfddf661eedd46912a6693d6c9471b3e792671", "parents": [ "2627d4856be08bda40f6b50ba0974f8b875f4995" ], "author": { "name": "Ahmed ElArabawy", "email": "arabawy@google.com", "time": "Mon Jun 12 18:01:11 2017 -0700" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Jul 20 11:22:46 2017 +0900" }, "message": "Add Configuration to APF Policy\n\nin b/37702435 battery was drained due to reception of\nEthernet frames with Eth-type \u003c 0x600 (non ehternet II frames)\n\nThis change adds an XML file to drop/allow these frames\nDropping helps tp avoid acquiring a wakelock for the\nreception of these packets, while allowing them may be needed\nfor some protocols\nThe Change allow the OEM to override the system settings\n\nBug: 37702435\nTest: runtest frameworks-net\nMerged-In: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d\nMerged-In: I16346bb98a0b9259f7c3f51e318c472cfc1bb492\n\nSigned-off-by: Ahmed ElArabawy \u003carabawy@google.com\u003e\n\n(cherry pick from commit 4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b)\n\nChange-Id: Ie466baf1e6395d6c28245e41179232ea8e523845\n" }, { "commit": "90de61b3ed2f3bedd5af74f675ae0957438c3565", "tree": "4a60679a0eb3b23bb9cb680923b996cc0a0757d2", "parents": [ "a3bde812059bc5781b3691b1efc8bc15addd094a" ], "author": { "name": "ludi", "email": "ludi@google.com", "time": "Fri May 12 09:15:00 2017 -0700" }, "committer": { "name": "ludi", "email": "ludi@google.com", "time": "Wed Jul 19 18:59:12 2017 -0700" }, "message": "Add unit test for IpSecManager\n\nTest: runtest frameworks-net\n\nBug:38259578\nChange-Id: Idb76aab899ccb7145bef2b7dce36e115c25fa6ca\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": "b440b572d78d7cfc8a03030913465daac26bebad", "tree": "35233b00d95be0e80966430265286d39d78f565a", "parents": [ "bf296640e6dfc624a9854eb634a896c819aa11c2", "0ebff46583de6e77b80bd0cd282d7a6ba0074f96" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jul 20 00:23:48 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jul 20 00:23:48 2017 +0000" }, "message": "Merge \"Add details to Download progress callback\"" }, { "commit": "5af59940d17cf20174865ac0aaf52c3b4d962a64", "tree": "37c6f897c8d68c982910fc0f26d92bfc2f500262", "parents": [ "3e0a8b1d2b5134ee58576efe71c7a9da1be3c192", "bf296640e6dfc624a9854eb634a896c819aa11c2" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 19 23:58:16 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 23:58:16 2017 +0000" }, "message": "Merge \"Add timezone for Telecom event date formatting\"\nam: bf296640e6\n\nChange-Id: Ic9db643ff6d204f75aed44160003bbe0b685eb7e\n" }, { "commit": "bf296640e6dfc624a9854eb634a896c819aa11c2", "tree": "e661a20a4fc22dff00558c09f50338ef7760d666", "parents": [ "a3bde812059bc5781b3691b1efc8bc15addd094a", "b6643acd8f82277eb9111ca4c71dca8b674dd864" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 19 23:46:52 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 19 23:46:52 2017 +0000" }, "message": "Merge \"Add timezone for Telecom event date formatting\"" }, { "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": "b6643acd8f82277eb9111ca4c71dca8b674dd864", "tree": "e661a20a4fc22dff00558c09f50338ef7760d666", "parents": [ "a3bde812059bc5781b3691b1efc8bc15addd094a" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 19 14:57:56 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Wed Jul 19 14:57:56 2017 -0700" }, "message": "Add timezone for Telecom event date formatting\n\nOutput event times in local time rather than in UTC for compatibility\nwith the rest of the timestamps in the bug report\n\nTest: manual\nChange-Id: I2d458f09aec635a43e3d0565e8f8da803124f368\n" }, { "commit": "3e0a8b1d2b5134ee58576efe71c7a9da1be3c192", "tree": "80afda857552dd3fdb57d68b9ddbce3881a094fa", "parents": [ "3a6a8b9baa524cae439308fe74b7831f4f51dadd", "a3bde812059bc5781b3691b1efc8bc15addd094a" ], "author": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Wed Jul 19 17:36:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 17:36:23 2017 +0000" }, "message": "Merge \"Fix static analyzer complaints\"\nam: a3bde81205\n\nChange-Id: I39f7b56c6abc0398cd517eef174b0620dbc50caa\n" }, { "commit": "a3bde812059bc5781b3691b1efc8bc15addd094a", "tree": "5a607ea5bf4642577fc33e15f93b4e44f5d71866", "parents": [ "1585b2e7b75d2e1358cc0069f9fe7bcbb2f88417", "d657a38d874283455cdcca1b3bd70af77dd8c1a4" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 19 17:26:36 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 19 17:26:36 2017 +0000" }, "message": "Merge \"Fix static analyzer complaints\"" }, { "commit": "2279b2534272282a5b5152723235da397e49195c", "tree": "884c0a32e34c87d58e8f36329eb77d6dec7a8ab4", "parents": [ "a1d67fb38ec02150d674bc3b8d8354b53417552b" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jul 19 09:50:45 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jul 19 10:06:40 2017 -0700" }, "message": "frameworks/base: use proper nativehelper headers\n\nlibnativehelper exports headers under nativehelper. These were\navailable before incorrectly as global headers in order to give\naccess to jni.h.\n\nTest: modules using frameworks/base find headers\nBug: 63762847\nChange-Id: I0f9f231acdebe460f279135462f43d3e32eff64d\n" }, { "commit": "3a6a8b9baa524cae439308fe74b7831f4f51dadd", "tree": "5fa85133cd6ea2482e7dd9cca65039a6ce0a6128", "parents": [ "a76d88d26d8bd60c5e0ec7fe3b4e254081cac057", "1585b2e7b75d2e1358cc0069f9fe7bcbb2f88417" ], "author": { "name": "Carlos Vinueza", "email": "chinesco@google.com", "time": "Wed Jul 19 14:26:55 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 14:26:55 2017 +0000" }, "message": "Merge \"Adding 26 free short codes for DCB and other purposes\"\nam: 1585b2e7b7\n\nChange-Id: Ia85bdccb4c6b15c6b5b7974f4cb5cc34af04d8d1\n" }, { "commit": "1585b2e7b75d2e1358cc0069f9fe7bcbb2f88417", "tree": "0fc305f7cbc6cf4a5c6e76d7d8dffbd30e74cfa7", "parents": [ "8feaad72499feae1ee6e4c0edf75aa4eaa31b10c", "2bfbb6cae5ef56d405afac1ed75dd4a6f7581ba2" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 19 14:13:36 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 19 14:13:36 2017 +0000" }, "message": "Merge \"Adding 26 free short codes for DCB and other purposes\"" }, { "commit": "a76d88d26d8bd60c5e0ec7fe3b4e254081cac057", "tree": "5711263232fc0dca301e8fcb0432cef5efd9a41a", "parents": [ "f6883504c28f72a4ad79ed43ac40f29c60aaf388", "8feaad72499feae1ee6e4c0edf75aa4eaa31b10c" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Jul 19 09:51:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 09:51:17 2017 +0000" }, "message": "Merge \"Re-enable some test cases\"\nam: 8feaad7249\n\nChange-Id: I1b86866748afa6d6014abcbf59116a7abf67b54e\n" }, { "commit": "8feaad72499feae1ee6e4c0edf75aa4eaa31b10c", "tree": "f6d16c5c599d48a724dbb5e67c7ab024473ba506", "parents": [ "24a2adfa2738bd531c0172166733a8d8c089fe01", "29ff71baa481a687a71276d2683774a0281aff43" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Wed Jul 19 09:40:52 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 19 09:40:52 2017 +0000" }, "message": "Merge \"Re-enable some test cases\"" }, { "commit": "f6883504c28f72a4ad79ed43ac40f29c60aaf388", "tree": "27efb44c9918ccadd0364e8b024ba1063051c5cb", "parents": [ "d82cdb4624d436189f1e1c2c53ec0b6ebb792bd9", "24a2adfa2738bd531c0172166733a8d8c089fe01" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 08:04:48 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 08:04:48 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\"\nam: 24a2adfa27\n\nChange-Id: I4be1d2ce67871c1e01364beca886fdd3af374321\n" }, { "commit": "24a2adfa2738bd531c0172166733a8d8c089fe01", "tree": "858aa9bae549b74cf0fea0a451a30e44f1839153", "parents": [ "2627d4856be08bda40f6b50ba0974f8b875f4995", "c1014509d8654e4abfcfb7ee1bcaf642c2a2b67b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 19 07:54:45 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 19 07:54:45 2017 +0000" }, "message": "Merge \"ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\"" }, { "commit": "c1014509d8654e4abfcfb7ee1bcaf642c2a2b67b", "tree": "858aa9bae549b74cf0fea0a451a30e44f1839153", "parents": [ "2627d4856be08bda40f6b50ba0974f8b875f4995" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 10:10:52 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 15:08:49 2017 +0900" }, "message": "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone\n\nThis patch fixes a couple of flakyness issues with\ntestNetworkInfoOfTypeNone. It also fixes some typos and naming issues.\n\nBug: 62918393, 62918393\nTest: runtest frameworks-net\nChange-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09\n" }, { "commit": "d82cdb4624d436189f1e1c2c53ec0b6ebb792bd9", "tree": "6e7237a0e4a1cc36d927e288a4fdddc6b95cdf52", "parents": [ "361162b6367eaffb3ecc779b893f07289e451c25" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jul 17 19:00:43 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jul 19 02:26:57 2017 +0000" }, "message": "Reference nativehelper/jni.h as jni.h\n\nnativehelper will no longer export nativehelper/jni.h so that everywhere\ncan reference this file with the same name.\n\nBug: 63762847\nChange-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af\n(cherry picked from commit 98f40c71399e63f2b10cf6e3dffbbcea84d52490)\n" }, { "commit": "361162b6367eaffb3ecc779b893f07289e451c25", "tree": "736272ba732d0133baa0d259a687f86325c7e742", "parents": [ "6b0e6946c3e1cf65e0b9f6b45902551ea1cf9e62", "2627d4856be08bda40f6b50ba0974f8b875f4995" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Wed Jul 19 01:06:59 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 19 01:06:59 2017 +0000" }, "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\"\nam: 2627d4856b\n\nChange-Id: I087aee995858ae898f5d660c11552724a07503c3\n" }, { "commit": "2627d4856be08bda40f6b50ba0974f8b875f4995", "tree": "189d0a0fa3b6f1082a4e92f5e78ad3ca2de39115", "parents": [ "777c408a220a0bc75b207ab7684b4fba84e1d316", "c10fe5f463676a05ecd3f76a5f7037700ea49b0d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 19 00:58:11 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 19 00:58:11 2017 +0000" }, "message": "Merge \"IpManager: fix test for default ProvisioningConfiguration\"" }, { "commit": "6b0e6946c3e1cf65e0b9f6b45902551ea1cf9e62", "tree": "87256ce2d66bfcf4c6da159ea100933dafce7098", "parents": [ "8e82bc9961ffe95ec938501bb8960ead5d3d7db2", "777c408a220a0bc75b207ab7684b4fba84e1d316" ], "author": { "name": "Robert Quattlebaum", "email": "rquattle@google.com", "time": "Tue Jul 18 23:33:08 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 23:33:08 2017 +0000" }, "message": "Merge \"NetworkCapabilities: Unhide TRANSPORT_LOWPAN\"\nam: 777c408a22\n\nChange-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad\n" }, { "commit": "8e82bc9961ffe95ec938501bb8960ead5d3d7db2", "tree": "ff2bf9e1cfeac277db6120e5cf0bceefcaabce6e", "parents": [ "8228eb34462cc9f76152bc87e20e721cd0e20775", "f126c41de7104a75fbe36bf7b9b1c78d09737001" ], "author": { "name": "Billy Lam", "email": "shiufai@google.com", "time": "Tue Jul 18 23:30:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 23:30:46 2017 +0000" }, "message": "Merge \"GC in heapDumpFinished to cleanup hprof fd\"\nam: f126c41de7\n\nChange-Id: I7025d5810dccb6b2637249063f08c80b1ab7e8d0\n" }, { "commit": "777c408a220a0bc75b207ab7684b4fba84e1d316", "tree": "50b06b646acdbe9dc08b2f25fc537d4a70b32135", "parents": [ "f126c41de7104a75fbe36bf7b9b1c78d09737001", "d95f73c338ed55371c958eeabafc4568f601d2a2" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 18 23:09:58 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 18 23:09:58 2017 +0000" }, "message": "Merge \"NetworkCapabilities: Unhide TRANSPORT_LOWPAN\"" }, { "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": "f126c41de7104a75fbe36bf7b9b1c78d09737001", "tree": "4b5f384b1e1efd4c7fed82a762dd0a675a425f82", "parents": [ "a1d67fb38ec02150d674bc3b8d8354b53417552b", "5603b71328cbcd9ab244404be6f8eda94eb9adcd" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 18 22:30:31 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 18 22:30:31 2017 +0000" }, "message": "Merge \"GC in heapDumpFinished to cleanup hprof fd\"" }, { "commit": "5603b71328cbcd9ab244404be6f8eda94eb9adcd", "tree": "4b5f384b1e1efd4c7fed82a762dd0a675a425f82", "parents": [ "a1d67fb38ec02150d674bc3b8d8354b53417552b" ], "author": { "name": "Billy Lam", "email": "shiufai@google.com", "time": "Tue Jul 18 12:01:44 2017 -0700" }, "committer": { "name": "Billy Lam", "email": "shiufai@google.com", "time": "Tue Jul 18 13:37:57 2017 -0700" }, "message": "GC in heapDumpFinished to cleanup hprof fd\n\nPreviously the fd associated with the dump file was\nnot closed until the next GC. While this did not\naffect AMS, external systems relying on monitoring\nthe close event on the file could not accurately\nknow when a dump operation was finished.\n\nBug: 62907010\nTest: Manually flashed and tested\n\nChange-Id: I0f6988099f479468f674eb7483f1f14529852270\n" }, { "commit": "709f3c1d4660cbf8bbdf5f86278588113a57c91e", "tree": "a914b7806771c1a09d2135ee7aa2bcd2c991174c", "parents": [ "3ed109136c008e47450a8ae29ca584f21dc86dc5", "c721dce3fcc4a00c087900f8582766e40c5ee500" ], "author": { "name": "nharold", "email": "nharold@google.com", "time": "Tue Jul 18 20:18:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 20:18:10 2017 +0000" }, "message": "Merge \"Launch NetD in a different thread\"\nam: c721dce3fc\n\nChange-Id: I0edeac83cc31b7ff9b264c35e225707ebb8418f2\n" }, { "commit": "3ed109136c008e47450a8ae29ca584f21dc86dc5", "tree": "1527f85b0fcf6794e51e52303c5e26d391c16bd9", "parents": [ "d61516d7b5e2ca65aa9381547285b704502d32fe", "b793aa8c81551fb1d6281f5bbb629c8253063991" ], "author": { "name": "Tom Cherry", "email": "tomcherry@google.com", "time": "Tue Jul 18 20:13:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 20:13:25 2017 +0000" }, "message": "Merge \"Remove ALOGD_IF_SLOW\"\nam: b793aa8c81 -s ours\n\nChange-Id: Id80a4061331c073f7283bd9c0a708e4faf8dc7f7\n" }, { "commit": "d61516d7b5e2ca65aa9381547285b704502d32fe", "tree": "1527f85b0fcf6794e51e52303c5e26d391c16bd9", "parents": [ "d2bf323c40b044d0fb8dde965404794ac4ffc7ee", "c685e1e4a15db1373579fc7d2384e8091a7bba23" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 18 20:09:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 20:09:26 2017 +0000" }, "message": "Merge \"Remove a TODO associate with starting a thread\"\nam: c685e1e4a1\n\nChange-Id: I5c9f30ac024a1ccf6fe0e5cba1534dcad4317e25\n" }, { "commit": "d2bf323c40b044d0fb8dde965404794ac4ffc7ee", "tree": "c1034025bf92be785ee4dd321f7264de9d549d2d", "parents": [ "253e515259d759ee34fb2035a9025d1945f83dd0", "899a1f23c5be569d46fc965b9a459e9df0847bc4" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Jul 18 20:05:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 20:05:36 2017 +0000" }, "message": "Merge \"Reference nativehelper/jni.h as jni.h\"\nam: 899a1f23c5\n\nChange-Id: I30ec4f6b329360ea4161f2ad5538ecd238db7b62\n" }, { "commit": "a1d67fb38ec02150d674bc3b8d8354b53417552b", "tree": "6aad5525819e3a28298303ddb6503264b3671368", "parents": [ "c721dce3fcc4a00c087900f8582766e40c5ee500", "d17160ba191259ccde9fd74a974b2e6c88a7e8da" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Tue Jul 18 18:45:29 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 18 18:45:29 2017 +0000" }, "message": "Merge changes from topic \u0027tether-offload-cherrypick\u0027\n\n* changes:\n Add code to dump OffloadController state.\n Fetch tethering offload stats.\n Allow more than one source of tethering statistics.\n" }, { "commit": "c721dce3fcc4a00c087900f8582766e40c5ee500", "tree": "0a54b7685a9cde3d94dbd6a61e673b322391ad5c", "parents": [ "b793aa8c81551fb1d6281f5bbb629c8253063991", "b0e0508582c8f1cbee74ffbf11b8409dd28934e8" ], "author": { "name": "nharold", "email": "nharold@google.com", "time": "Tue Jul 18 17:56:35 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 18 17:56:35 2017 +0000" }, "message": "Merge \"Launch NetD in a different thread\"" }, { "commit": "b793aa8c81551fb1d6281f5bbb629c8253063991", "tree": "59a1721ed9f3c41c7cfdee34d57aa0d61055b4fd", "parents": [ "c685e1e4a15db1373579fc7d2384e8091a7bba23", "10fc62756b8d930eab4b4cb181c2431ec2b17e6c" ], "author": { "name": "Tom Cherry", "email": "tomcherry@google.com", "time": "Tue Jul 18 17:20:39 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 18 17:20:39 2017 +0000" }, "message": "Merge \"Remove ALOGD_IF_SLOW\"" }, { "commit": "d657a38d874283455cdcca1b3bd70af77dd8c1a4", "tree": "85097f68428abfcdb2baf6de7201d071aac230a1", "parents": [ "d1ffb1343723a2cf1b8e82cde75710268fcc6a11" ], "author": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Tue Jun 20 23:53:29 2017 -0700" }, "committer": { "name": "George Burgess IV", "email": "gbiv@google.com", "time": "Tue Jul 18 08:56:10 2017 -0700" }, "message": "Fix static analyzer complaints\n\nframeworks/base/core/jni/android_view_MotionEvent.cpp:383:12: warning:\nPotential leak of memory pointed to by \u0027event\u0027\n\nframeworks/base/core/jni/AndroidRuntime.cpp:975:20: warning: Null passed\nto a callee that requires a non-null 1st parameter\n\nFor the former, it was surprising to me that the analyzer couldn\u0027t\nfigure out that `event \u003d\u003d nativePtr` for the latter check. Filed\nhttps://bugs.llvm.org/show_bug.cgi?id\u003d33540 upstream about it.\n\nFor the latter, it was complaining because `className` could be NULL\n(more precisely, we have a NULL check at the top of the function it\u0027s\ndeclared in, so NULL is presumably a valid value).\n\nBug: None\nTest: Ran mma; complaints are gone.\nChange-Id: I26a91ae25934f95acbfdbe4f3641e081fbc66c6d\n" }, { "commit": "d17160ba191259ccde9fd74a974b2e6c88a7e8da", "tree": "bb8976dbfe0701444a5827e32bda34af8b5861c3", "parents": [ "4ca0ba8f86f657f42ebae2d389f7a6f92251c01c" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Jul 13 01:48:26 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 19 00:55:57 2017 +0900" }, "message": "Add code to dump OffloadController state.\n\n(cherry-picked from commit c2519c5feae397e18561e00acea9d5e456bfaabe)\n\nBug: 29337859\nBug: 32163131\nTest: observed output of \"adb shell dumpsys connectivity tethering\"\nChange-Id: Icc5aa605cd64a4a2bb5993941dcc4010cc0b1d8e\nMerged-In: Icc5aa605cd64a4a2bb5993941dcc4010cc0b1d8e\n" }, { "commit": "4ca0ba8f86f657f42ebae2d389f7a6f92251c01c", "tree": "59685f5a485344d13457665f9965a9c2ee9214db", "parents": [ "07f1304cfe9efbde7f90895a948b3170a3f0d0ec" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 12 15:48:07 2017 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jul 19 00:55:37 2017 +0900" }, "message": "Fetch tethering offload stats.\n\nMake tethering offload register an ITetheringStatsProvider and\nfetch tethering stats from the hardware.\n\nCurrently we fetch stats in the following cases:\n\n1. Just after changing upstreams, we fetch stats from the\n previous upstream.\n2. When we are polled by NetworkStatsService.\n\n(cherry-picked from commit 5a7dea1a8eb2cf53fc1d5a52004647de94150e62)\n\nBug: 29337859\nBug: 32163131\nTest: builds, boots\nTest: stats appear in tethering logs\nChange-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56\nMerged-In: If744f2e06cb6a3095a40199936b9afb76eff7b56\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": "c685e1e4a15db1373579fc7d2384e8091a7bba23", "tree": "946781cbd7a795a580e853333b1c23226ec4e49f", "parents": [ "899a1f23c5be569d46fc965b9a459e9df0847bc4", "17ee5dbc05424b24377b3ee326de39184cfce290" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 18 15:17:25 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 18 15:17:25 2017 +0000" }, "message": "Merge \"Remove a TODO associate with starting a thread\"" }, { "commit": "2bfbb6cae5ef56d405afac1ed75dd4a6f7581ba2", "tree": "2d397c7210cf74e71ef7a1e4e1812f3e2b33bd29", "parents": [ "476d58c6bd52eab06f5f38bc9e0503b7e6f190cc" ], "author": { "name": "Carlos Vinueza", "email": "chinesco@google.com", "time": "Fri Jul 07 12:19:29 2017 -0700" }, "committer": { "name": "Carlos Vinueza", "email": "chinesco@google.com", "time": "Tue Jul 18 15:13:36 2017 +0000" }, "message": "Adding 26 free short codes for DCB and other purposes\n\nWhitelist free short code batch 2017 Q2 - Android Partner Engineering\nThe list includes 2 short codes used for spam reports in GB, 15 for free\ncarrier services and 9 for for Direct Carrier Billing purposes in\ndifferent geos.\n\nTest: manual - uploaded modified file onto test device and tested\nsending SMS to changed shortcodes to verify behaviour.\n\nBug: 37355429\n\nChange-Id: Idb0a1b76619fc635659922083bd19423d96229f1\nSigned-off-by: Carlos Vinueza \u003cchinesco@google.com\u003e\n" }, { "commit": "17ee5dbc05424b24377b3ee326de39184cfce290", "tree": "946781cbd7a795a580e853333b1c23226ec4e49f", "parents": [ "899a1f23c5be569d46fc965b9a459e9df0847bc4" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 18 14:02:01 2017 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 18 14:02:01 2017 +0100" }, "message": "Remove a TODO associate with starting a thread\n\nSwitching to an alternative method to run something off\nthread.\n\nBug: 31008728\nTest: Internal automated testing / manual tests\nChange-Id: Ia33ca29e8d83028a21af1dca22de75dd43eee119\n" }, { "commit": "c10fe5f463676a05ecd3f76a5f7037700ea49b0d", "tree": "da0fca48c10b6f3d4912d6f687e4fa445ddd036e", "parents": [ "d2c8dcfcfe4cdc4fb4d3d86a8a7e6e7d43fdd9c0" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 18 16:17:49 2017 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Jul 18 21:31:17 2017 +0900" }, "message": "IpManager: fix test for default ProvisioningConfiguration\n\nThe test did not properly account for the stopAllIP() done in starting\nstate of the IpManager state machine, which could cause assertions to\nfail when stopAllIP() is called again after stop().\n\nBug: 62988545\nTest: runtest frameworks-net\nChange-Id: I2c6eb76461a81c1d743bf448da36c58a99ce082d\n" }, { "commit": "253e515259d759ee34fb2035a9025d1945f83dd0", "tree": "626fe01510d17965cbf44ed830fd7bdbec166ca6", "parents": [ "e7715b35ea9899fe9db499dc98b0c8e41a586606" ], "author": { "name": "Fredrik Roubert", "email": "roubert@google.com", "time": "Thu Apr 06 22:13:51 2017 +0200" }, "committer": { "name": "Joachim Sauer", "email": "jsauer@google.com", "time": "Tue Jul 18 11:13:48 2017 +0100" }, "message": "Update JNI code in preparation for ICU 59 switching to C++11 char16_t.\n\nICU 59 (update pending on the aosp/icu59 branch) has switched to using\nthe C++11 char16_t data type, which is a distinct type from uint16_t\n(which is what JNI\u0027s jchar is typedef\u0027d as), even though they are\nbitwise identical.\n\nAll code that passes UTF-16 data between ICU4C and JNI must therefore be\nupdated with typecasts in the appropriate places before ICU 59 is merged\nto aosp/master.\n\nBug: 37554848\nTest: make\nChange-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d\nMerged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29\n" }, { "commit": "29ff71baa481a687a71276d2683774a0281aff43", "tree": "633442f9364000d7a7eb296052f0591e94c62b15", "parents": [ "899a1f23c5be569d46fc965b9a459e9df0847bc4" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 18 10:30:53 2017 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Tue Jul 18 10:30:53 2017 +0100" }, "message": "Re-enable some test cases\n\nRe-enable some test cases now the case they test has been\nrenabled (by commit 3d7a4143d5a2b771a02777354c9a11c981c63c59).\n\nTested with:\n\nmake -j30 FrameworksServicesTests\nadb install -r -g \\\n \"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk\"\nadb shell am instrument -e package com.android.server.timezone -w \\\n com.android.frameworks.servicestests \\\n \"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner\"\n\nBug: 31008728\nTest: See above\nChange-Id: Ia26c4355e41d5b1010594a06bb8c4e8cef8528f7\n" }, { "commit": "b0e0508582c8f1cbee74ffbf11b8409dd28934e8", "tree": "33dbad72b90d90c8dfef835d21481d6f95c6ad07", "parents": [ "4ff3cf1eca71e61896a6f4a493974113656f3fd5" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Mon Jul 17 14:01:53 2017 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Mon Jul 17 20:22:35 2017 -0700" }, "message": "Launch NetD in a different thread\n\nCalling run() launches in the current thread;\nwe want to call start() to launch in a separate\nthread to unblock system initialization.\n\nBug: none\nTest: compilation\nChange-Id: Ia85059100add6a44a5e3262500b00ba8ca21e125\n" }, { "commit": "899a1f23c5be569d46fc965b9a459e9df0847bc4", "tree": "2788f857bc76f29024300d9ad929269f88cccd2f", "parents": [ "a09784ac7587c1d93754a83d7edc3359cd2ceb83", "889f9952d8aa438d5aef6fea9046eddb38ea11b0" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jul 18 02:47:33 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jul 18 02:47:33 2017 +0000" }, "message": "Merge \"Reference nativehelper/jni.h as jni.h\"" }, { "commit": "e7715b35ea9899fe9db499dc98b0c8e41a586606", "tree": "9a205abe19ac7eb510671b0f22e87ef9f7d9bc51", "parents": [ "5c15f6d6b18b62aa6971e839b076739703feee98", "a09784ac7587c1d93754a83d7edc3359cd2ceb83" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Mon Jul 17 22:34:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 17 22:34:23 2017 +0000" }, "message": "Merge \"BootReceiver: check console-ramoops-0\"\nam: a09784ac75\n\nChange-Id: Ic3af3fd4f768f391740d56bd73c7dcca7698d1de\n" }, { "commit": "5c15f6d6b18b62aa6971e839b076739703feee98", "tree": "5c2f36dd519583581c464b73fd0389cf2631b94a", "parents": [ "08cff4c76b5cfc19c57860b1240acb46345e199b", "858634e4ec2e7338d2e69713eb5224a64ca678cf" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 17 22:32:37 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 17 22:32:37 2017 +0000" }, "message": "Merge \"Address post-commit review comments\"\nam: 858634e4ec\n\nChange-Id: Ia530cc2cdf583baae825386a52fdb8eb3763d99b\n" }, { "commit": "08cff4c76b5cfc19c57860b1240acb46345e199b", "tree": "af2e9ebece55adfe81fd080837ce8f1916e75a63", "parents": [ "5c2cfc51c5276ad7d03fadaed6317248460be298", "a5c96cf4bf2f975d88754dbda68581783dd8f6cf" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 17 22:26:48 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 17 22:26:48 2017 +0000" }, "message": "Merge \"Remove unnecessary TODOs\"\nam: a5c96cf4bf\n\nChange-Id: I1e03cd3fa9eef34218e4a4eb958fbb6dd0593be6\n" }, { "commit": "a09784ac7587c1d93754a83d7edc3359cd2ceb83", "tree": "b2bc9cf226e47c415b9b5ba8f1ef80402f2e7c40", "parents": [ "858634e4ec2e7338d2e69713eb5224a64ca678cf", "18c139c57f104c90e8003dd9e54142b41b9b6c24" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 17 22:24:39 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 17 22:24:39 2017 +0000" }, "message": "Merge \"BootReceiver: check console-ramoops-0\"" }, { "commit": "5c2cfc51c5276ad7d03fadaed6317248460be298", "tree": "7114bd380301819c7d876717f8ee38be3ae7f213", "parents": [ "75bd16d2dfdcf28b2ff33bde21eaf84708a1d361", "0f9842304a368c55cf6e18feee72b18ea896b32b" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 17 22:24:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 17 22:24:36 2017 +0000" }, "message": "Merge \"Remove TODOs that are not needed\"\nam: 0f9842304a\n\nChange-Id: Ie46a57ce88e25e40193b073c0add69adccc14a79\n" }, { "commit": "858634e4ec2e7338d2e69713eb5224a64ca678cf", "tree": "e35a8f619a0d37d14bf7458e558ff1cb18f63091", "parents": [ "a5c96cf4bf2f975d88754dbda68581783dd8f6cf", "316fb607e1e705be53beccbe95f753fe9540a17d" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 17 22:19:07 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 17 22:19:07 2017 +0000" }, "message": "Merge \"Address post-commit review comments\"" }, { "commit": "a5c96cf4bf2f975d88754dbda68581783dd8f6cf", "tree": "edf53a9753f567955791f2b8152faf5f17c54cc1", "parents": [ "0f9842304a368c55cf6e18feee72b18ea896b32b", "8f4a5361147fef049f4437bdcd54fd4a114c8766" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 17 22:15:42 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 17 22:15:42 2017 +0000" }, "message": "Merge \"Remove unnecessary TODOs\"" }, { "commit": "0f9842304a368c55cf6e18feee72b18ea896b32b", "tree": "1e9aba090c13942eb0be16d999ad91f8c72ccfe8", "parents": [ "66af025feacf038ac17871849b743ad19733cf7c", "a9f0eeb36fafcc83a265d89726ea4dc6e3211def" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 17 22:15:08 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 17 22:15:08 2017 +0000" }, "message": "Merge \"Remove TODOs that are not needed\"" }, { "commit": "75bd16d2dfdcf28b2ff33bde21eaf84708a1d361", "tree": "d5509e124eaa38e1eca48d2fa1efd55882274960", "parents": [ "d600905e4a03610cbc32e539e03fbf36c944d54f", "66af025feacf038ac17871849b743ad19733cf7c" ], "author": { "name": "xutianguo", "email": "xutianguo@xiaomi.com", "time": "Mon Jul 17 21:58:04 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 17 21:58:04 2017 +0000" }, "message": "Merge \"Make BluetoothStateChangeCallback oneway to prevent waiting on response.\"\nam: 66af025fea\n\nChange-Id: Iab47add488fd9f4e09f2d0a2aacb435b0cdb24d0\n" }, { "commit": "66af025feacf038ac17871849b743ad19733cf7c", "tree": "875e5ff712c9df374803ee9f734a6eb56027c30f", "parents": [ "d1ffb1343723a2cf1b8e82cde75710268fcc6a11", "a5325e18df259f940478b3e61573bc35e624feff" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 17 21:47:31 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 17 21:47:31 2017 +0000" }, "message": "Merge \"Make BluetoothStateChangeCallback oneway to prevent waiting on response.\"" }, { "commit": "18c139c57f104c90e8003dd9e54142b41b9b6c24", "tree": "18e2a577ad8a1a1ed2c7016c9d49bbbcba6a45ee", "parents": [ "d2c8dcfcfe4cdc4fb4d3d86a8a7e6e7d43fdd9c0" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Jul 14 13:08:47 2017 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Mon Jul 17 20:33:40 2017 +0000" }, "message": "BootReceiver: check console-ramoops-0\n\nOn later kernels /sys/fs/pstore/console-ramoops becomes\n/sys/fs/pstore/console-ramoops-0\n\nTest: none\nBug: 63058217\nChange-Id: Ia68c0b5741c35cb35f10be6bbce93e0f0c92480f\n" }, { "commit": "d600905e4a03610cbc32e539e03fbf36c944d54f", "tree": "d5509e124eaa38e1eca48d2fa1efd55882274960", "parents": [ "e38e57c25d40fff9cd19146e63564ba3a4e69cc5", "923611728841f5e9a873a3f20e3e01a068af9b53" ], "author": { "name": "Tom Cherry", "email": "tomcherry@google.com", "time": "Mon Jul 17 19:20:58 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 17 19:20:58 2017 +0000" }, "message": "Merge \"Remove ALOGD_IF_SLOW\" into stage-aosp-master" }, { "commit": "889f9952d8aa438d5aef6fea9046eddb38ea11b0", "tree": "242a579f482025d2a6e6e8689ad3c8127aa39285", "parents": [ "d1ffb1343723a2cf1b8e82cde75710268fcc6a11" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jul 17 12:08:45 2017 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jul 17 12:08:45 2017 -0700" }, "message": "Reference nativehelper/jni.h as jni.h\n\nnativehelper will no longer export nativehelper/jni.h so that everywhere\ncan reference this file with the same name.\n\nBug: 63762847\nChange-Id: I8d2e9587439efa2d6ab03a5bdfa749fc620759e1\n" }, { "commit": "a5325e18df259f940478b3e61573bc35e624feff", "tree": "4b6eb8c30da4490528d3196650b0e7da55e83c3e", "parents": [ "29926838d4deaa7e2c12baeb0656db2c92dbd1f8" ], "author": { "name": "xutianguo", "email": "xutianguo@xiaomi.com", "time": "Mon May 22 14:03:33 2017 +0800" }, "committer": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Mon Jul 17 11:52:24 2017 -0700" }, "message": "Make BluetoothStateChangeCallback oneway to prevent waiting on response.\n\nTest: Connected bluetooth devices(included Headset/HID devices), and\nmade bluetooth enabling/disabling over 1000 times, no other side effect\nobserved.\n\nBug: 38485770\n\nChange-Id: Ia3959d2441aece39a79ab2d662b57790a78df674\nSigned-off-by: xutianguo \u003cxutianguo@xiaomi.com\u003e\n(cherry picked from commit 95e1e21a639318bb3399c394707624393cfa2300)\n" }, { "commit": "e38e57c25d40fff9cd19146e63564ba3a4e69cc5", "tree": "6dca36d872f9ce2462b239fc09d8c7fc133fd7f3", "parents": [ "cd53e91851f7e6b9a606a6b1d23cad2a37161e0c", "d1ffb1343723a2cf1b8e82cde75710268fcc6a11" ], "author": { "name": "nharold", "email": "nharold@google.com", "time": "Mon Jul 17 17:52:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 17 17:52:25 2017 +0000" }, "message": "Merge \"Check ManagedResource is NonNull before Checking Owner\"\nam: d1ffb13437\n\nChange-Id: I2e8cde8a7be8bdbdeebb00df053fdc621d30cdec\n" }, { "commit": "cd53e91851f7e6b9a606a6b1d23cad2a37161e0c", "tree": "d0386d39ac772223568a49e9cad95d1100bc4ff7", "parents": [ "40dfadda77639e2f262a1ecf4040d8f05bee627a", "0f3d90eec821f41f7361fe8904dd1e2d9eacffb5" ], "author": { "name": "Fredrik Roubert", "email": "roubert@google.com", "time": "Mon Jul 17 17:50:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 17 17:50:02 2017 +0000" }, "message": "Merge \"Update JNI code in preparation for ICU 59 switching to C++11 char16_t.\"\nam: 0f3d90eec8 -s ours\n\nChange-Id: If37c0a67a40a2b1ee0d5e3050cba38af5e932e83\n" }, { "commit": "8f4a5361147fef049f4437bdcd54fd4a114c8766", "tree": "1fc65115ae84d60b145f7eadcfce874116bb30da", "parents": [ "a9f0eeb36fafcc83a265d89726ea4dc6e3211def" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 17 18:02:29 2017 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 17 18:02:29 2017 +0100" }, "message": "Remove unnecessary TODOs\n\nThe classes under test are not part of a public\nAPI so they are not tested via CTS.\n\nBug: 31008728\nTest: make droid\nChange-Id: If10db42b6e79728a6625708d35a04c5002164866\n" }, { "commit": "a9f0eeb36fafcc83a265d89726ea4dc6e3211def", "tree": "50bb50670a305774d6831b6dae10ca7b5d1f8909", "parents": [ "b279ec51b6e53396509848ce025f4bdbdd608da6" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 03 14:38:50 2017 +0100" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Mon Jul 17 17:57:11 2017 +0100" }, "message": "Remove TODOs that are not needed\n\nRemove TODOs to add classes to the system API that are not needed\n(since they are used by a platform-only app).\n\nBug: 31008728\nTest: make droid\nChange-Id: I0d75686ddeae929e9d87c5ca8703a609a1450d76\nMerged-In: I600e7b08853b86b27463193411cf85207ae09ce8\n" }, { "commit": "d1ffb1343723a2cf1b8e82cde75710268fcc6a11", "tree": "55f717d9d170047f8d5780fcf2baa1bd6856ce31", "parents": [ "0f3d90eec821f41f7361fe8904dd1e2d9eacffb5", "b6d2eff8b1ad4ceed1f8a97f19e43aff5452898f" ], "author": { "name": "nharold", "email": "nharold@google.com", "time": "Mon Jul 17 16:57:01 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 17 16:57:01 2017 +0000" }, "message": "Merge \"Check ManagedResource is NonNull before Checking Owner\"" }, { "commit": "0f3d90eec821f41f7361fe8904dd1e2d9eacffb5", "tree": "055ea3c1174d4a393b273ea19675b3a3d55523f8", "parents": [ "29926838d4deaa7e2c12baeb0656db2c92dbd1f8", "adf11aef0fee9f64f1df325e82f849baa5a043b5" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jul 17 16:46:09 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 17 16:46:09 2017 +0000" }, "message": "Merge \"Update JNI code in preparation for ICU 59 switching to C++11 char16_t.\"" }, { "commit": "adf11aef0fee9f64f1df325e82f849baa5a043b5", "tree": "055ea3c1174d4a393b273ea19675b3a3d55523f8", "parents": [ "29926838d4deaa7e2c12baeb0656db2c92dbd1f8" ], "author": { "name": "Fredrik Roubert", "email": "roubert@google.com", "time": "Thu Apr 06 22:13:51 2017 +0200" }, "committer": { "name": "Fredrik Roubert", "email": "roubert@google.com", "time": "Mon Jul 17 14:28:18 2017 +0200" }, "message": "Update JNI code in preparation for ICU 59 switching to C++11 char16_t.\n\nICU 59 (update pending on the aosp/icu59 branch) has switched to using\nthe C++11 char16_t data type, which is a distinct type from uint16_t\n(which is what JNI\u0027s jchar is typedef\u0027d as), even though they are\nbitwise identical.\n\nAll code that passes UTF-16 data between ICU4C and JNI must therefore be\nupdated with typecasts in the appropriate places before ICU 59 is merged\nto aosp/master.\n\nBug: 37554848\nTest: make\nChange-Id: Ibbc90d2b603382d4715551d05c4a6a462529542d\nMerged-In: Ic84a94be82acbef41f80cc113d5da485ce54ae29\n" }, { "commit": "40dfadda77639e2f262a1ecf4040d8f05bee627a", "tree": "d0386d39ac772223568a49e9cad95d1100bc4ff7", "parents": [ "41718e2413201f9040a78f493ead3adf160e0318", "29926838d4deaa7e2c12baeb0656db2c92dbd1f8" ], "author": { "name": "Przemyslaw Szczepaniak", "email": "pszczepaniak@google.com", "time": "Mon Jul 17 10:48:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 17 10:48:50 2017 +0000" }, "message": "Merge \"Track libcore commit 58228b82c64808eddac02736f18f5003730443a0\"\nam: 29926838d4\n\nChange-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100\n" }, { "commit": "29926838d4deaa7e2c12baeb0656db2c92dbd1f8", "tree": "a0ce8a4d5e973759652aef13ba503700fd4646d6", "parents": [ "4ccf8b83a171bc3b3028fd193cf5a2ec4ad3f31f", "f36ecf37f3d1dbf6542a290f1e881bbceb1e8719" ], "author": { "name": "Przemyslaw Szczepaniak", "email": "pszczepaniak@google.com", "time": "Mon Jul 17 10:37:35 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 17 10:37:35 2017 +0000" }, "message": "Merge \"Track libcore commit 58228b82c64808eddac02736f18f5003730443a0\"" }, { "commit": "41718e2413201f9040a78f493ead3adf160e0318", "tree": "c0bbc9e419b3400676389a05ea44a4b0ed194aee", "parents": [ "d98024a1f9acfb2ba342a42300fda24e2bcff47f", "4ccf8b83a171bc3b3028fd193cf5a2ec4ad3f31f" ], "author": { "name": "Mathieu Chartier", "email": "mathieuc@google.com", "time": "Fri Jul 14 21:37:43 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jul 14 21:37:43 2017 +0000" }, "message": "Merge \"Add more details to dumpsys meminfo -d\"\nam: 4ccf8b83a1\n\nChange-Id: I54fadc1bd30cc508faccabe1553c2db4cc040904\n" } ], "next": "4ccf8b83a171bc3b3028fd193cf5a2ec4ad3f31f" }