)]}' { "log": [ { "commit": "6d79675e0c0e55a7d5591a123727796f52c42954", "tree": "751b10c5499fb4f9e0b2227478f48311e7ef49bb", "parents": [ "89a94b706df307c5c7032c81b79a4f79ca3d1d6c" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Wed Sep 13 16:32:21 2017 -0700" }, "committer": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Sep 14 00:59:49 2017 +0000" }, "message": "Fix ClipboardService device lock check for cross profile\n\nClipboardService.isDeviceLocked should clear callingIdentity before\naccessing KeyguardManager.\n\nTest: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest\n\nBug: 64934810\nChange-Id: I81a7adac8c9d56ed801ffc1380fcbc987d5df3e6\nMerged-In: I712abfe8d542cd1be9c1816f407c8912321ac480\n" }, { "commit": "89a94b706df307c5c7032c81b79a4f79ca3d1d6c", "tree": "857e4a176261e07049b268fb9ef4baac14761c5f", "parents": [ "06183a57a601239b8fcd8bcd55bb762d7714905d", "9b1d542985a84b094f8b8a8c698527b19e58a45a" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Tue Sep 12 15:29:21 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 12 15:29:21 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into mnc-dev" }, { "commit": "9b1d542985a84b094f8b8a8c698527b19e58a45a", "tree": "e88ffa3e18d66160666da8052e4072bf7e7cf875", "parents": [ "6a7c6a24a770206815d22cd5dd6598737ce0b13d" ], "author": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Fri Sep 01 11:14:03 2017 -0400" }, "committer": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Tue Sep 12 14:32:59 2017 +0000" }, "message": "DO NOT MERGE Backporting potential usb tapjacking precaution.\n\nBug: 62187985\nTest: manual, backport\nChange-Id: Id9fff28cf54969cbcbdc8a3bfaeadc02ff597c89\n" }, { "commit": "06183a57a601239b8fcd8bcd55bb762d7714905d", "tree": "2f88a580e7f65114b463a9f133056a7ba20858dd", "parents": [ "328c129f4ca67d2ec5858fbc9382ea2b24369cfa", "0b8fa2f5e0d305f083345968a7c39fe7a6f0a158" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Mon Sep 11 23:31:44 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 11 23:31:44 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into mnc-dev" }, { "commit": "328c129f4ca67d2ec5858fbc9382ea2b24369cfa", "tree": "9cf0c5153c8f87892e1a30b159977bd671a15281", "parents": [ "5470469d73eefec4cfe87c5642f45ef58ccf49c3", "2ce5539045437b44a464a8c633af379c7eef21e1" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 11 08:14:19 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 11 08:14:19 2017 +0000" }, "message": "Merge \"DPC should not be allowed to grant development permission\" into mnc-dev" }, { "commit": "0b8fa2f5e0d305f083345968a7c39fe7a6f0a158", "tree": "e3a08362f3524c3215a0b6462f190f6bb3e6b8e6", "parents": [ "6a7c6a24a770206815d22cd5dd6598737ce0b13d" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Wed Sep 06 18:02:23 2017 -0700" }, "committer": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Sep 07 06:48:08 2017 +0000" }, "message": "Prevent getting data from Clipboard if device is locked\n\nClipboard should not return data if the device is locked. This CL checks\nfor device locked state before returning values from get/has functions.\n\nBug: 64934810\nChange-Id: I856a9079fe64db0af44383fae1a9a418de959420\nMerged-In: Icefac226615fe22a7735dff4ba4c3b528fb2ac12\n" }, { "commit": "5470469d73eefec4cfe87c5642f45ef58ccf49c3", "tree": "c4ee087ac8a290c6a20299a9ebbc8a715f4526dc", "parents": [ "6a7c6a24a770206815d22cd5dd6598737ce0b13d" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Fri May 12 15:26:54 2017 -0700" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Tue Sep 05 19:43:46 2017 -0700" }, "message": "Clearing up invalid entries when SyncStorageEngine starts\n\nAny app with permission WRITE_SYNC_SETTINGS could write sync settings\nfor authorities or accounts that are not valid. This results in invalid\ndata being persisted to disk which can effectively lead to a DOS style\nattack. Clearing such entries on boot will make sure that a reboot fixes\nany such issues.\n\nTest: cts-tradefed run cts-dev -m CtsSyncContentHostTestCases\n\nBug: 35028827\nChange-Id: I9e206a42508e3cba65d7523bf47fff743f47dcb2\nMerged-In: I9e206a42508e3cba65d7523bf47fff743f47dcb2\n(cherry picked from commit 042a478b73c3b7f7cd73f5bb1af657cfe07d0571)\n" }, { "commit": "2ce5539045437b44a464a8c633af379c7eef21e1", "tree": "8768f36d05612c13e0983897ba4cec11bdc5d9fa", "parents": [ "6a7c6a24a770206815d22cd5dd6598737ce0b13d" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Tue Aug 15 19:56:39 2017 +0100" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 18 16:23:45 2017 +0000" }, "message": "DPC should not be allowed to grant development permission\n\nTest: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant_developmentPermission\nTest: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant_developmentPermission\nTest: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant\nTest: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant\nTest: Run \"Permissions lockdown\" test in CtsVerifier\n\nMerged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c\nMerged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512\n\n\nBug: 62623498\nChange-Id: Ief96a23fa49f1ea923574840f8ff590a5ea2456e\n" }, { "commit": "6a7c6a24a770206815d22cd5dd6598737ce0b13d", "tree": "1273f470e66cd85d4a17b19aadac07564007c4ab", "parents": [ "039b357a469c2daa08747e1a0c2d42d15d738455", "3d1931d4e32e0d1d7cbd9a94784dbbf57c119013" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 21:15:05 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 21:15:05 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553\nam: 3d1931d4e3 -s ours\n\nChange-Id: Ieb19904cf060072d2525836ebba9f310da515b4b\n" }, { "commit": "3d1931d4e32e0d1d7cbd9a94784dbbf57c119013", "tree": "7896e6bc932e53806e09326e16d03ec9600f6322", "parents": [ "37cf6265dbc0fe3e3694c58f82ce077c150c2b35", "b7373655532592fdac89c004147e93ee4ede95f8" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 20:50:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:50:20 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours\nam: b737365553\n\nChange-Id: I375324a937478c584e95cb6550d98293162656fc\n" }, { "commit": "b7373655532592fdac89c004147e93ee4ede95f8", "tree": "059435b7d219c90fe8e447f0556416a773f3ef50", "parents": [ "954deb1c6e39a6daf0aa4cbd7e778f63bc7657ae", "3280efe50ea8febc5957c09ff29ff4038358bd9b" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 20:35:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:35:40 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours\nam: 3280efe50e -s ours\n\nChange-Id: Ia7bf4d6991be15c732ba8b55c37f2c9e447b1dbd\n" }, { "commit": "3280efe50ea8febc5957c09ff29ff4038358bd9b", "tree": "aaf34ac0c2a588f24f4d3d8441226ea2e1503f9d", "parents": [ "a620b218282ae086b1987ffa0e7dbc6a72c9750b", "9d99b0001e53306f8215391076d107097ba01643" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 20:19:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:19:29 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6\nam: 9d99b0001e -s ours\n\nChange-Id: Ib0fb40f990138b3729b66bdb6d6a095bd3ad231d\n" }, { "commit": "9d99b0001e53306f8215391076d107097ba01643", "tree": "78105071f2056b3d8eeea1a6c9158404b9016777", "parents": [ "f433884a84536386d637a1736c88518f8af78772", "96fe6421f66225ff3bfc66096e21609b57dbee7c" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 20:03:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:03:29 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff\nam: 96fe6421f6\n\nChange-Id: Ia2ce3f8b95b578253c5336407ae85880d3d317f4\n" }, { "commit": "96fe6421f66225ff3bfc66096e21609b57dbee7c", "tree": "837b5735575faf7489b01b6d60fef2b43388a2fa", "parents": [ "5a7eb970e26744941be0853ff991beebc7e89ad6", "c3c2ed94ff5df23bb05b5f8ab6218b2be8ae3470" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 19:48:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 19:48:22 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information.\nam: c3c2ed94ff\n\nChange-Id: Ib9552165e9b1c2dfcd235d1f7930d85c258b2ece\n" }, { "commit": "039b357a469c2daa08747e1a0c2d42d15d738455", "tree": "1273f470e66cd85d4a17b19aadac07564007c4ab", "parents": [ "093c7a8e56d5c9143ccd1a29ba5ad666f8777246", "e74cae8f7c3e6b12f2bf2b75427ee8f5b53eca3c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 15 19:30:53 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 15 19:30:53 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev" }, { "commit": "c3c2ed94ff5df23bb05b5f8ab6218b2be8ae3470", "tree": "31db72dd3e5f48b7015a8c68da7931d8bd0e95a3", "parents": [ "5bdffc5d57aa1387565b86b163e62121a72e3fb0" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Thu Jul 27 18:24:01 2017 -0700" }, "committer": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Thu Jul 27 20:22:20 2017 -0700" }, "message": "DO NOT MERGE Remove window obscurement information.\n\nIf ACTION_OUTSIDE_EVENTS contain information about whether the touch is\nobscured, then a pattern of invisible, untouchable, unfocusable\nSYSTEM_ALERT_WINDOWS can be placed across the screen to determine\napproximate locations of touch events without the user knowing.\n\nBug: 31097064\nTest: cts-tradefed run cts --class android.security.cts.MotionEventTest\nChange-Id: I081a483c491dd384e252f0b615affee96038fdda\n" }, { "commit": "093c7a8e56d5c9143ccd1a29ba5ad666f8777246", "tree": "01fe6c3aec9ddfa44072ab98cda2bed53e48f4f0", "parents": [ "5d46833d9c7d3fa4d5ab3036a21c6a16c8f56ae0", "d4a5fd1ce32b25c8a8d7af35c4676011d64faa22" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 23:21:16 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jul 18 23:21:16 2017 +0000" }, "message": "Merge \"Back-port fixes for b/62196835\" into mnc-dev" }, { "commit": "5d46833d9c7d3fa4d5ab3036a21c6a16c8f56ae0", "tree": "ee3ecbd6ee958c1070b0dd81a78c4a3ff96bcded", "parents": [ "76007bb240078a52f9089c7b4d78fb8bea39f972", "37cf6265dbc0fe3e3694c58f82ce077c150c2b35" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 20:30:39 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 20:30:39 2017 +0000" }, "message": "Merge \"DO NOT MERGE Back-port fixes for b/62196835\" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e\nam: 37cf6265db -s ours\n\nChange-Id: I28f848331e5379736dd777995fe844aa5c5df689\n" }, { "commit": "76007bb240078a52f9089c7b4d78fb8bea39f972", "tree": "ee3ecbd6ee958c1070b0dd81a78c4a3ff96bcded", "parents": [ "68efc2e5b52b24908544f80529fc3c803a19ac7d", "ccbac7e9e0d7e5d238da5101821fa9d030dac4e5" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 20:28:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 20:28:22 2017 +0000" }, "message": "DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1\nam: ccbac7e9e0 -s ours\n\nChange-Id: I28a499e21a6a6d6a4df26317712c09f658383d37\n" }, { "commit": "68efc2e5b52b24908544f80529fc3c803a19ac7d", "tree": "ee3ecbd6ee958c1070b0dd81a78c4a3ff96bcded", "parents": [ "111a2c79874f826edd1fe08ecc5c6e8513eb6093", "3c4d24923cff388891bc8a863b8b6d0a2ebfdfea" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 20:25:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 20:25:44 2017 +0000" }, "message": "Back-port fixes for b/62196835 am: fd0ca151a6\nam: 3c4d24923c -s ours\n\nChange-Id: Ie8d7f1d4840bcea7538f99b2eb1bfb2bc472549f\n" }, { "commit": "37cf6265dbc0fe3e3694c58f82ce077c150c2b35", "tree": "7896e6bc932e53806e09326e16d03ec9600f6322", "parents": [ "ccbac7e9e0d7e5d238da5101821fa9d030dac4e5", "954deb1c6e39a6daf0aa4cbd7e778f63bc7657ae" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 18:41:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 18:41:22 2017 +0000" }, "message": "Merge \"DO NOT MERGE Back-port fixes for b/62196835\" into lmp-dev am: a620b21828 -s ours\nam: 954deb1c6e\n\nChange-Id: I929c9dfa84b25fdbeadfedf0e0e9ecd914a74483\n" }, { "commit": "954deb1c6e39a6daf0aa4cbd7e778f63bc7657ae", "tree": "059435b7d219c90fe8e447f0556416a773f3ef50", "parents": [ "ff115bffb12a3e2290ab55c77d061ad2182f49d6", "a620b218282ae086b1987ffa0e7dbc6a72c9750b" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 18:36:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 18:36:23 2017 +0000" }, "message": "Merge \"DO NOT MERGE Back-port fixes for b/62196835\" into lmp-dev\nam: a620b21828 -s ours\n\nChange-Id: Iaa4e8eb83ebf2036999a31e3487c6157bcefecbf\n" }, { "commit": "ccbac7e9e0d7e5d238da5101821fa9d030dac4e5", "tree": "7896e6bc932e53806e09326e16d03ec9600f6322", "parents": [ "3c4d24923cff388891bc8a863b8b6d0a2ebfdfea", "ff115bffb12a3e2290ab55c77d061ad2182f49d6" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 18:36:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 18:36:21 2017 +0000" }, "message": "DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours\nam: ff115bffb1\n\nChange-Id: Ieca157f60b7c57f60900b55b10fcf8e585852e70\n" }, { "commit": "3c4d24923cff388891bc8a863b8b6d0a2ebfdfea", "tree": "7896e6bc932e53806e09326e16d03ec9600f6322", "parents": [ "ba46064323d8ece7cacddf520354c70c93cc2c57", "fd0ca151a68a4ed8babeb6b9e43948165cd0b692" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 18:26:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 18:26:58 2017 +0000" }, "message": "Back-port fixes for b/62196835\nam: fd0ca151a6\n\nChange-Id: I442d26b476e3e83602b5f2eb61a01386e4d6d247\n" }, { "commit": "ff115bffb12a3e2290ab55c77d061ad2182f49d6", "tree": "059435b7d219c90fe8e447f0556416a773f3ef50", "parents": [ "fd0ca151a68a4ed8babeb6b9e43948165cd0b692", "24fdc53cfeb5ce060007ec38226caff65781fe30" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 18:26:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 18 18:26:57 2017 +0000" }, "message": "DO NOT MERGE Back-port fixes for b/62196835\nam: 24fdc53cfe -s ours\n\nChange-Id: I01a6f574df5cc1b133b7f761062a6259aac07476\n" }, { "commit": "a620b218282ae086b1987ffa0e7dbc6a72c9750b", "tree": "aaf34ac0c2a588f24f4d3d8441226ea2e1503f9d", "parents": [ "ba928bd5224f746ed7d19d1dbdd0970782d5136f", "24fdc53cfeb5ce060007ec38226caff65781fe30" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 18 18:19:45 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jul 18 18:19:45 2017 +0000" }, "message": "Merge \"DO NOT MERGE Back-port fixes for b/62196835\" into lmp-dev" }, { "commit": "d4a5fd1ce32b25c8a8d7af35c4676011d64faa22", "tree": "01fe6c3aec9ddfa44072ab98cda2bed53e48f4f0", "parents": [ "111a2c79874f826edd1fe08ecc5c6e8513eb6093" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 14:04:16 2017 -0700" }, "committer": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Mon Jul 17 16:36:34 2017 -0700" }, "message": "Back-port fixes for b/62196835\n\nBug: 62196835\nTest: Created an accessibility service that displays a system\nand a toast overlay, confirmed that it disappeared when we\nreached the accessibility permission screen that uses this\nflag.\n\nChange-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0\n" }, { "commit": "e74cae8f7c3e6b12f2bf2b75427ee8f5b53eca3c", "tree": "8eb2a10327125f22bba5979cb273357821b929d0", "parents": [ "111a2c79874f826edd1fe08ecc5c6e8513eb6093" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Fri Jul 14 14:41:06 2017 +0100" }, "committer": { "name": "Charles He", "email": "qiurui@google.com", "time": "Fri Jul 14 14:36:11 2017 +0000" }, "message": "Fix security hole in GateKeeperResponse.\n\nGateKeeperResponse has inconsistent writeToParcel() and\ncreateFromParcel() methods, making it possible for a malicious app to\ncreate a Bundle that changes contents after reserialization. Such\nBundles can be used to execute Intents with system privileges.\n\nThis CL changes writeToParcel() to make serialization and\ndeserialization consistent, thus fixing the issue.\n\nBug: 62998805\nTest: use the debug app (see bug)\nChange-Id: Ie1c64172c454c3a4b7a0919eb3454f0e38efcd09\n" }, { "commit": "fd0ca151a68a4ed8babeb6b9e43948165cd0b692", "tree": "059435b7d219c90fe8e447f0556416a773f3ef50", "parents": [ "1add6be25e69e706b29efbd8aec283ed5c9c7685" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 14:04:16 2017 -0700" }, "committer": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 16:57:31 2017 -0700" }, "message": "Back-port fixes for b/62196835\n\nBug: 62196835\nTest: Created an accessibility service that displays a system\nand a toast overlay, confirmed that it disappeared when we\nreached the accessibility permission screen that uses this\nflag.\n\nChange-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0\n" }, { "commit": "24fdc53cfeb5ce060007ec38226caff65781fe30", "tree": "aaf34ac0c2a588f24f4d3d8441226ea2e1503f9d", "parents": [ "9a4a34afd801b075228795382a63b690765ee977" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 14:04:16 2017 -0700" }, "committer": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 23:25:00 2017 +0000" }, "message": "DO NOT MERGE Back-port fixes for b/62196835\n\nBug: 62196835\nTest: Created an accessibility service that displays a system\nand a toast overlay, confirmed that it disappeared when we\nreached the accessibility permission screen that uses this\nflag.\n\nChange-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0\n" }, { "commit": "111a2c79874f826edd1fe08ecc5c6e8513eb6093", "tree": "ee3ecbd6ee958c1070b0dd81a78c4a3ff96bcded", "parents": [ "23118a9b77ce3bba17f2a8f9710b5c9a8583c96e", "ba46064323d8ece7cacddf520354c70c93cc2c57" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 22:18:59 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 22:18:59 2017 +0000" }, "message": "Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e\nam: ba46064323\n\nChange-Id: I7119e3f003562f6d826d40ad3577b9db0e44c2c6\n" }, { "commit": "ba46064323d8ece7cacddf520354c70c93cc2c57", "tree": "9a1d9455e8337b4a039e02fcf73c4195c00ffdf7", "parents": [ "49fc959be3dfb0ea135301cfb1028121e9b2ebb2", "1add6be25e69e706b29efbd8aec283ed5c9c7685" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 22:14:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 22:14:01 2017 +0000" }, "message": "Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84 am: ba928bd522\nam: 1add6be25e\n\nChange-Id: I83a6c654862443a69bfeeaf675a8c038b3f7fb53\n" }, { "commit": "1add6be25e69e706b29efbd8aec283ed5c9c7685", "tree": "04d343518292ab286c885df91460f76bc91ec3a5", "parents": [ "398d50feebe3778d1e5041f7475b74f61d1d365a", "ba928bd5224f746ed7d19d1dbdd0970782d5136f" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 22:06:27 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 22:06:27 2017 +0000" }, "message": "Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84\nam: ba928bd522\n\nChange-Id: I74a7b0488371606dd9bdccab854d23c0e09b1ac9\n" }, { "commit": "ba928bd5224f746ed7d19d1dbdd0970782d5136f", "tree": "4f9e8fc7e56eca7207d192766853b3458d9d2a0b", "parents": [ "9a4a34afd801b075228795382a63b690765ee977", "f433884a84536386d637a1736c88518f8af78772" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 22:00:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 22:00:31 2017 +0000" }, "message": "Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours\nam: f433884a84\n\nChange-Id: I737838098a36efafe1509c4814ac1120a3bb8297\n" }, { "commit": "f433884a84536386d637a1736c88518f8af78772", "tree": "64b182ad7d654920633442c0799d89713a0f9c51", "parents": [ "156fa32e2acdd5b2c7438497f0c88d38c212c653", "5a7eb970e26744941be0853ff991beebc7e89ad6" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 21:55:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 21:55:31 2017 +0000" }, "message": "Back-port fixes for b/62196835 am: 5bdffc5d57\nam: 5a7eb970e2 -s ours\n\nChange-Id: Ifd4b5ff2487c8b8035ffaf6ed7e55539f26a463e\n" }, { "commit": "5a7eb970e26744941be0853ff991beebc7e89ad6", "tree": "3313e4df66e870c1b72b2c8caebb9261839c7566", "parents": [ "a821245d70a91ce948f0bf52164f512da4194733", "5bdffc5d57aa1387565b86b163e62121a72e3fb0" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Wed Jul 12 21:43:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 12 21:43:46 2017 +0000" }, "message": "Back-port fixes for b/62196835\nam: 5bdffc5d57\n\nChange-Id: Ia5dafc7a8724d296e710f32d936bb493b51951de\n" }, { "commit": "5bdffc5d57aa1387565b86b163e62121a72e3fb0", "tree": "3d2410866203dc01aaf3bf47bc32dab252c24e79", "parents": [ "ac87aee3542972965937d6a0ff4f000a2b120ab8" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Mon Jul 10 17:27:20 2017 -0700" }, "committer": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Jul 11 15:11:26 2017 -0700" }, "message": "Back-port fixes for b/62196835\n\nBug: 62196835\nTest: Created an accessibility service that displays a system\nand a toast overlay, confirmed that it disappeared when we\nreached the accessibility permission screen that uses this\nflag.\n\nChange-Id: Ibb4c2c6a30de6b4ce8d27c34caa02e2d8148f621\n" }, { "commit": "23118a9b77ce3bba17f2a8f9710b5c9a8583c96e", "tree": "ee3ecbd6ee958c1070b0dd81a78c4a3ff96bcded", "parents": [ "6d5bc9a3c23116fa3415723fe9cef7b9fb613d27", "49fc959be3dfb0ea135301cfb1028121e9b2ebb2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 16 16:02:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 16:02:19 2017 +0000" }, "message": "libmedia_jni.so doesn\u0027t need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb -s ours\nam: 49fc959be3 -s ours\n\nChange-Id: I0eb248911ce1a582a4939e2bd5419659c586128f\n" }, { "commit": "49fc959be3dfb0ea135301cfb1028121e9b2ebb2", "tree": "9a1d9455e8337b4a039e02fcf73c4195c00ffdf7", "parents": [ "4b78a79546dc2f44575593bb13f12566526a0526", "398d50feebe3778d1e5041f7475b74f61d1d365a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 16 15:51:48 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 15:51:48 2017 +0000" }, "message": "libmedia_jni.so doesn\u0027t need libjhead.so am: 9a4a34afd8 -s ours\nam: 398d50feeb -s ours\n\nChange-Id: Ide31821909dde91443cdf650216a6ada7277ce9a\n" }, { "commit": "398d50feebe3778d1e5041f7475b74f61d1d365a", "tree": "04d343518292ab286c885df91460f76bc91ec3a5", "parents": [ "5181a7ab64f1c37bf29c40063f6b1e143917669e", "9a4a34afd801b075228795382a63b690765ee977" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 16 15:43:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jun 16 15:43:46 2017 +0000" }, "message": "libmedia_jni.so doesn\u0027t need libjhead.so\nam: 9a4a34afd8 -s ours\n\nChange-Id: I557d7e96401b742d916e2eef5aa03949018382c7\n" }, { "commit": "9a4a34afd801b075228795382a63b690765ee977", "tree": "4f9e8fc7e56eca7207d192766853b3458d9d2a0b", "parents": [ "a8648ecebb84418dc47e3ce7f3a38bce1e9ec316" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 09 15:07:38 2017 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 09 22:57:49 2017 +0000" }, "message": "libmedia_jni.so doesn\u0027t need libjhead.so\n\nBug: 37776688\nMerged-In: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501\nChange-Id: I18f0b6b88a9c0b117839497f081549404d5edc40\n" }, { "commit": "6d5bc9a3c23116fa3415723fe9cef7b9fb613d27", "tree": "ee3ecbd6ee958c1070b0dd81a78c4a3ff96bcded", "parents": [ "47beaa8fab293908f6dae1416d0c32b352a0fac0", "4b78a79546dc2f44575593bb13f12566526a0526" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 06 23:16:24 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 23:16:24 2017 +0000" }, "message": "Merge \"Close connection before retrying\" into lmp-dev am: a8648ecebb am: 5181a7ab64\nam: 4b78a79546\n\nChange-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8\n" }, { "commit": "4b78a79546dc2f44575593bb13f12566526a0526", "tree": "9a1d9455e8337b4a039e02fcf73c4195c00ffdf7", "parents": [ "8965cd6a3980b99cc64c9ab6a1f142698f772d29", "5181a7ab64f1c37bf29c40063f6b1e143917669e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 06 23:10:16 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 23:10:16 2017 +0000" }, "message": "Merge \"Close connection before retrying\" into lmp-dev am: a8648ecebb\nam: 5181a7ab64\n\nChange-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9\n" }, { "commit": "5181a7ab64f1c37bf29c40063f6b1e143917669e", "tree": "04d343518292ab286c885df91460f76bc91ec3a5", "parents": [ "1cc9ec47c84345e11087e0d16fdb8c067df643e5", "a8648ecebb84418dc47e3ce7f3a38bce1e9ec316" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 06 23:02:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 06 23:02:35 2017 +0000" }, "message": "Merge \"Close connection before retrying\" into lmp-dev\nam: a8648ecebb\n\nChange-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74\n" }, { "commit": "a8648ecebb84418dc47e3ce7f3a38bce1e9ec316", "tree": "c51965a687be85aca63bdbf81db60a3bf771c497", "parents": [ "4911af2b8ced29dc5035dca301dc80939c9bdab5", "46132afee7783665ae12538edd024770dbd93ecb" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 06 22:53:55 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 06 22:54:01 2017 +0000" }, "message": "Merge \"Close connection before retrying\" into lmp-dev" }, { "commit": "46132afee7783665ae12538edd024770dbd93ecb", "tree": "c5834a6a0c612e9ea9661bd466318c5f8288006d", "parents": [ "1d8eb490735943c3808f48848168e284289e3156" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 02 12:16:44 2017 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Jun 02 22:35:35 2017 +0000" }, "message": "Close connection before retrying\n\nOtherwise the (CTS) server might run out of connections.\nBug: 38391487\nBug: 22771132\nTest: build, run CTS, stream music\n\nChange-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a\n" }, { "commit": "47beaa8fab293908f6dae1416d0c32b352a0fac0", "tree": "0b84f4669143bc4ad4044f375270f092e18cc1f5", "parents": [ "f5bd84b82d940010341076ebc9ad1fdc9ee91e22", "8965cd6a3980b99cc64c9ab6a1f142698f772d29" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon May 22 22:46:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 22 22:46:18 2017 +0000" }, "message": "ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8\nam: 8965cd6a39\n\nChange-Id: If549cda5fd1a640fee746311745b9b08ebf63b91\n" }, { "commit": "f5bd84b82d940010341076ebc9ad1fdc9ee91e22", "tree": "8618e0b464f429447c4eeeaed2cc90ffb6a06718", "parents": [ "d7552dc81931e7032c00f1cbba34f35c324e7eb7", "c46889e2d22e6a69b39ae609fd6db74fa2fe14ba" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon May 22 22:45:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 22 22:45:44 2017 +0000" }, "message": "system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973\nam: c46889e2d2\n\nChange-Id: I840740012d9ba0c434f7de0fd9ca83a44926d018\n" }, { "commit": "8965cd6a3980b99cc64c9ab6a1f142698f772d29", "tree": "e9c78e2a46fb8b280d3f2edf88d4629af9f5557e", "parents": [ "c46889e2d22e6a69b39ae609fd6db74fa2fe14ba", "1cc9ec47c84345e11087e0d16fdb8c067df643e5" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon May 22 22:24:39 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 22 22:24:39 2017 +0000" }, "message": "ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c\nam: 1cc9ec47c8\n\nChange-Id: Ic81685686dabbc1f0004a30785a021bf89420846\n" }, { "commit": "c46889e2d22e6a69b39ae609fd6db74fa2fe14ba", "tree": "6943309786399df5df6c4a40d0db47348a9d65d8", "parents": [ "7cb5e1dfd1d1019b9db5c37b4db404a31450a4b3", "b8d972e973e7c89f0fbbb6c73c3657eaeb7f7311" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon May 22 22:23:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 22 22:23:47 2017 +0000" }, "message": "system_server: add CAP_SYS_PTRACE am: 966619d0ab\nam: b8d972e973\n\nChange-Id: I4d9e2d9b53523b9182a9f9272d06a93a87b0c61b\n" }, { "commit": "1cc9ec47c84345e11087e0d16fdb8c067df643e5", "tree": "4c0a8e2dbdc6131c54e3ddc589f561a4eb1d189e", "parents": [ "b8d972e973e7c89f0fbbb6c73c3657eaeb7f7311", "4911af2b8ced29dc5035dca301dc80939c9bdab5" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon May 22 22:05:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 22 22:05:18 2017 +0000" }, "message": "ZygoteInit: Remove CAP_SYS_RESOURCE\nam: 4911af2b8c\n\nChange-Id: I4aa46981edb8fd711e1aec8c889528e596e5c233\n" }, { "commit": "b8d972e973e7c89f0fbbb6c73c3657eaeb7f7311", "tree": "e3cfaa033f9bf90c0443d81fa2fbcf1dc2af2677", "parents": [ "88698afd0155426ba3f4dc21da4158fdce198b8a", "966619d0ab6950fb6c90127b47d493b4c8617878" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon May 22 22:04:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon May 22 22:04:57 2017 +0000" }, "message": "system_server: add CAP_SYS_PTRACE\nam: 966619d0ab\n\nChange-Id: Ie5f95f2c078cd0bec7a2b2321c3303301ec9ec74\n" }, { "commit": "4911af2b8ced29dc5035dca301dc80939c9bdab5", "tree": "2e2291cdb810d8b77337b1b7597130cf60c6572b", "parents": [ "966619d0ab6950fb6c90127b47d493b4c8617878" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Tue Mar 14 10:25:35 2017 -0700" }, "committer": { "name": "JP Sugarbroad", "email": "jpsugar@google.com", "time": "Mon May 22 12:19:29 2017 -0700" }, "message": "ZygoteInit: Remove CAP_SYS_RESOURCE\n\nPlease see commit 3082eb7c7253c62a06aa151a80487a4eabd49914 for an\nexplanation of this change.\n\nThis capability is not used by system_server.\n\nBug: 34951864\nBug: 38496951\nTest: code compiles, device boots, no selinux errors ever reported.\nChange-Id: I4242b1abaa8679b9bfa0d31a1df565b46b7b3cc3\n(cherry picked from commit 35775783fc6609035136184e3843bc743b59945d)\n" }, { "commit": "966619d0ab6950fb6c90127b47d493b4c8617878", "tree": "2f5267876f85a19b35473f7b9af90952588c3777", "parents": [ "1d8eb490735943c3808f48848168e284289e3156" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Wed Feb 15 15:12:31 2017 -0800" }, "committer": { "name": "JP Sugarbroad", "email": "jpsugar@google.com", "time": "Mon May 22 11:28:48 2017 -0700" }, "message": "system_server: add CAP_SYS_PTRACE\n\nCommit https://android.googlesource.com/kernel/common/+/f0ce0eee added\nCAP_SYS_RESOURCE as a capability check which would allow access to\nsensitive /proc/PID files. system_server uses this capability to collect\nsmaps from managed processes. Presumably this was done to avoid the\nimplications of granting CAP_SYS_PTRACE to system_server.\n\nHowever, with SELinux enforcement, we can grant CAP_SYS_PTRACE but not\nallow ptrace attach() to other processes. The net result of this is that\nCAP_SYS_PTRACE and CAP_SYS_RESOURCE have identical security controls, as\nlong as system_server:process ptrace is never granted.\n\nAdd CAP_SYS_PTRACE to the set of capabilities granted to system_server.\n\nDon\u0027t delete CAP_SYS_RESOURCE for now. SELinux has blocked the use of\nCAP_SYS_RESOURCE, but we still want to generate audit logs if it\u0027s\ntriggered. CAP_SYS_RESOURCE can be deleted in a future commit.\n\nBug: 34951864\nBug: 38496951\nTest: Device boots, functionality remains identical, no sys_resource\ndenials from system_server.\nChange-Id: I2570266165396dba2b600eac7c42c94800d9c65b\n(cherry picked from commit 3082eb7c7253c62a06aa151a80487a4eabd49914)\n" }, { "commit": "d7552dc81931e7032c00f1cbba34f35c324e7eb7", "tree": "668c534c719f4e091cf2657c81dfd7971aceea3a", "parents": [ "d3a4f4a33cd0200a1c20885f4c122365b9a48989", "7cb5e1dfd1d1019b9db5c37b4db404a31450a4b3" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 23:43:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 07 23:43:28 2017 +0000" }, "message": "Merge \"Make a11y node info parceling more robust\" into lmp-mr1-dev am: 88698afd01\nam: 7cb5e1dfd1\n\nChange-Id: I8e51350ae38384dfb9ae034d73fe9087837b27f7\n" }, { "commit": "7cb5e1dfd1d1019b9db5c37b4db404a31450a4b3", "tree": "aef5f797dd51aac8ab93c0bc1e85b7311ed3952b", "parents": [ "3a7cf1f057daf1316f0815fcb0d5de82a67b1c09", "88698afd0155426ba3f4dc21da4158fdce198b8a" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 23:36:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 07 23:36:29 2017 +0000" }, "message": "Merge \"Make a11y node info parceling more robust\" into lmp-mr1-dev\nam: 88698afd01\n\nChange-Id: I37194d958aa5fc21ece027c288e2f9a0a239cd93\n" }, { "commit": "d3a4f4a33cd0200a1c20885f4c122365b9a48989", "tree": "668c534c719f4e091cf2657c81dfd7971aceea3a", "parents": [ "d0e54c1c096f4836c7eb4054ff02e5e5563f9577", "3a7cf1f057daf1316f0815fcb0d5de82a67b1c09" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 23:30:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 07 23:30:19 2017 +0000" }, "message": "Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07\nam: 3a7cf1f057 -s ours\n\nChange-Id: I0000c6df3ca0375022535be19cf0f9a76ed07e39\n" }, { "commit": "88698afd0155426ba3f4dc21da4158fdce198b8a", "tree": "c5fa00f5e7e408a9f473bb66aa74ef5d9822380d", "parents": [ "93c47c9d072c216af075b75587ac4275605c3b29", "2b6197f464d851a8a4654fb0c31753ca1e92069e" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 23:27:47 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Apr 07 23:27:51 2017 +0000" }, "message": "Merge \"Make a11y node info parceling more robust\" into lmp-mr1-dev" }, { "commit": "3a7cf1f057daf1316f0815fcb0d5de82a67b1c09", "tree": "aef5f797dd51aac8ab93c0bc1e85b7311ed3952b", "parents": [ "2411b4f774047f500265f57c2a976c1fff9c126c", "93c47c9d072c216af075b75587ac4275605c3b29" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 23:16:55 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 07 23:16:55 2017 +0000" }, "message": "Make a11y node info parceling more robust am: 1d8eb49073\nam: 93c47c9d07\n\nChange-Id: I8677c77968c202c8c6a0553db919610a140fda58\n" }, { "commit": "93c47c9d072c216af075b75587ac4275605c3b29", "tree": "c5fa00f5e7e408a9f473bb66aa74ef5d9822380d", "parents": [ "2c112c4ad2cef6251d8c48cbbea6747c3d9673f1", "1d8eb490735943c3808f48848168e284289e3156" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 23:09:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Apr 07 23:09:28 2017 +0000" }, "message": "Make a11y node info parceling more robust\nam: 1d8eb49073\n\nChange-Id: I5280a23cbfff5abfcc83e9e6d9afb4f8960ece44\n" }, { "commit": "2b6197f464d851a8a4654fb0c31753ca1e92069e", "tree": "c5fa00f5e7e408a9f473bb66aa74ef5d9822380d", "parents": [ "2c112c4ad2cef6251d8c48cbbea6747c3d9673f1" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 14:39:27 2017 -0700" }, "committer": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 22:23:12 2017 +0000" }, "message": "Make a11y node info parceling more robust\n\nFix a bug where a malformed Parceled representation\nof an AccessibilityNodeInfo could be used to mess with\nBundles as they get reparceled.\n\nBug: 36491278\nTest: Verified that POC no longer works, a11y cts still passes.\n\n(Manual merge from commit 687bb44b437f7bb24dd3dddf072c2f646308e2ca)\n\nChange-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852\n" }, { "commit": "1d8eb490735943c3808f48848168e284289e3156", "tree": "3ba43708cc282e86504536be1e272e1881f345bf", "parents": [ "de9cb7ed68e55362f1c3f1b5676730f38d416d15" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 14:39:27 2017 -0700" }, "committer": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 15:21:39 2017 -0700" }, "message": "Make a11y node info parceling more robust\n\nFix a bug where a malformed Parceled representation\nof an AccessibilityNodeInfo could be used to mess with\nBundles as they get reparceled.\n\nBug: 36491278\nTest: Verified that POC no longer works, a11y cts still passes.\n\n(Manual merge from commit 687bb44b437f7bb24dd3dddf072c2f646308e2ca)\n\nChange-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852\n" }, { "commit": "d0e54c1c096f4836c7eb4054ff02e5e5563f9577", "tree": "668c534c719f4e091cf2657c81dfd7971aceea3a", "parents": [ "aa0b718886f818045618b334251a0809797ae23b" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Thu Apr 06 17:40:51 2017 -0700" }, "committer": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Apr 07 18:53:26 2017 +0000" }, "message": "Make a11y node info parceling more robust\n\nFix a bug where a malformed Parceled representation\nof an AccessibilityNodeInfo could be used to mess with\nBundles as they get reparceled.\n\nBug: 36491278\nTest: Verified that POC no longer works, a11y cts still passes.\nChange-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441\n(cherry picked from commit 687bb44b437f7bb24dd3dddf072c2f646308e2ca)\n" }, { "commit": "aa0b718886f818045618b334251a0809797ae23b", "tree": "255f81cbd366f72ec76f71056dba98080dc605f2", "parents": [ "b76704bf25d954917ba04b7b8b2969209b536f72", "2411b4f774047f500265f57c2a976c1fff9c126c" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 03:17:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 03:17:46 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2\nam: 2411b4f774 -s ours\n\nChange-Id: Ie78ad1a602d6502c09a98ee9e28119caab3534b7\n" }, { "commit": "2411b4f774047f500265f57c2a976c1fff9c126c", "tree": "39d2d36b0b40c8718521e600841e719b98db1f97", "parents": [ "ce677737ec25b972ae6831c0a5bd629dae79070c", "2c112c4ad2cef6251d8c48cbbea6747c3d9673f1" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 03:12:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 03:12:06 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours\nam: 2c112c4ad2\n\nChange-Id: Ic108a0750248d001873de33d69984e6cf2c3584a\n" }, { "commit": "2c112c4ad2cef6251d8c48cbbea6747c3d9673f1", "tree": "ebcf5484e4fdfe961bb97f4d58189adeb27ec4c1", "parents": [ "1e6d3f904e38a3ba03bc87ac1e5ad0d88e06b1b0", "de9cb7ed68e55362f1c3f1b5676730f38d416d15" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 03:06:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 03:06:31 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours\nam: de9cb7ed68 -s ours\n\nChange-Id: I2f94e2ea49c05a29308ca2351a083377350bb2ab\n" }, { "commit": "de9cb7ed68e55362f1c3f1b5676730f38d416d15", "tree": "b0b6495f402bf721e32ef04a77913c311812777a", "parents": [ "d2e8e1488a26d0774a98ee947329c4dec74dae29", "156fa32e2acdd5b2c7438497f0c88d38c212c653" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 03:00:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 03:00:46 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into klp-dev am: ac87aee354 am: a821245d70\nam: 156fa32e2a -s ours\n\nChange-Id: Ic4e51daa36c395f2e3b538658649ff9104bb962c\n" }, { "commit": "156fa32e2acdd5b2c7438497f0c88d38c212c653", "tree": "64b182ad7d654920633442c0799d89713a0f9c51", "parents": [ "305a41b7a673939c9f51126a1e3870ff5dfb3b27", "a821245d70a91ce948f0bf52164f512da4194733" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 02:55:07 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 02:55:07 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into klp-dev am: ac87aee354\nam: a821245d70\n\nChange-Id: I1e47c963728906cb2283a353c882017368d07747\n" }, { "commit": "a821245d70a91ce948f0bf52164f512da4194733", "tree": "6fcb2b675565a3dd036662f4e97a2cc89f166777", "parents": [ "2d54d2c0d58906c864c499104ac5dfed31accb5b", "ac87aee3542972965937d6a0ff4f000a2b120ab8" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 02:49:34 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 02:49:34 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into klp-dev\nam: ac87aee354\n\nChange-Id: I5bbdc48120f2d03b4ad6605bfeccd5ccdc8c7958\n" }, { "commit": "ac87aee3542972965937d6a0ff4f000a2b120ab8", "tree": "96c2b216208aecbabdae01728bb32d26cfa1518c", "parents": [ "7b83d625aa360ea8d4e41584017e0d5179540c5b", "589796a57eefa0432bd6af78e375dde8eca8aa25" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 02:39:09 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 10 02:39:14 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into klp-dev" }, { "commit": "b76704bf25d954917ba04b7b8b2969209b536f72", "tree": "255f81cbd366f72ec76f71056dba98080dc605f2", "parents": [ "13df27e68bad92903f4ab7c3536bf98df8caafbf", "ce677737ec25b972ae6831c0a5bd629dae79070c" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 02:14:07 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 02:14:07 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e\nam: ce677737ec -s ours\n\nChange-Id: I4ef50e6ff43d354f1542a0c1bb486ebfe14309e8\n" }, { "commit": "13df27e68bad92903f4ab7c3536bf98df8caafbf", "tree": "255f81cbd366f72ec76f71056dba98080dc605f2", "parents": [ "677a8879c0e5efdb061bfa9be1cd5a494fc660bb", "78861ad53e76b29760bb5f6cec0995823668ab34" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 02:10:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 02:10:31 2017 +0000" }, "message": "[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab\nam: 78861ad53e -s ours\n\nChange-Id: I32668e97f69f63e798cab1e62f68deae861ec96e\n" }, { "commit": "ce677737ec25b972ae6831c0a5bd629dae79070c", "tree": "39d2d36b0b40c8718521e600841e719b98db1f97", "parents": [ "78861ad53e76b29760bb5f6cec0995823668ab34", "1e6d3f904e38a3ba03bc87ac1e5ad0d88e06b1b0" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 02:07:27 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 02:07:27 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into lmp-dev am: d2e8e1488a -s ours\nam: 1e6d3f904e\n\nChange-Id: I50a91bc415fb1aa9b0baf8eb48e208f3792425bc\n" }, { "commit": "78861ad53e76b29760bb5f6cec0995823668ab34", "tree": "39d2d36b0b40c8718521e600841e719b98db1f97", "parents": [ "105b0ff30c4372fb7b0c0ae703c778b33d3dea29", "1c732801abe265ad3de601867920af3498ba207c" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 02:03:24 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 02:03:24 2017 +0000" }, "message": "[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours\nam: 1c732801ab\n\nChange-Id: I5edf742dbf962ce2a863996b71192ccca038705e\n" }, { "commit": "677a8879c0e5efdb061bfa9be1cd5a494fc660bb", "tree": "255f81cbd366f72ec76f71056dba98080dc605f2", "parents": [ "d2699d009b8ff9d282a12e6ce608572c851bca52", "105b0ff30c4372fb7b0c0ae703c778b33d3dea29" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 02:03:16 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 02:03:16 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into lmp-mr1-dev am: e1766acb41\nam: 105b0ff30c -s ours\n\nChange-Id: Iec5bbb651da033182ec99e9b10e10c098724a5a0\n" }, { "commit": "1e6d3f904e38a3ba03bc87ac1e5ad0d88e06b1b0", "tree": "ebcf5484e4fdfe961bb97f4d58189adeb27ec4c1", "parents": [ "1c732801abe265ad3de601867920af3498ba207c", "d2e8e1488a26d0774a98ee947329c4dec74dae29" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 02:02:30 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 02:02:30 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into lmp-dev\nam: d2e8e1488a -s ours\n\nChange-Id: I85273c31137127b733b51579c55618326d67a88c\n" }, { "commit": "105b0ff30c4372fb7b0c0ae703c778b33d3dea29", "tree": "39d2d36b0b40c8718521e600841e719b98db1f97", "parents": [ "b50794ec65aa5490319a50b872e9ce311c183c7d", "e1766acb41088cceb2a7c1aaa56ce6d627eff2cc" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 01:56:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 01:56:58 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into lmp-mr1-dev\nam: e1766acb41\n\nChange-Id: I5bfc6d7e47772f0aabcc0567e52c6534ba6815c9\n" }, { "commit": "1c732801abe265ad3de601867920af3498ba207c", "tree": "ebcf5484e4fdfe961bb97f4d58189adeb27ec4c1", "parents": [ "e1766acb41088cceb2a7c1aaa56ce6d627eff2cc", "69e347f7ef91c5b708de72e7b4b10a067d1ccfe4" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 01:55:54 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Mar 10 01:55:54 2017 +0000" }, "message": "[DO NOT MERGE] Throw exception if slot has invalid offset\nam: 69e347f7ef -s ours\n\nChange-Id: I5b06e8493703961f828894358a05c9cc70856fa9\n" }, { "commit": "e1766acb41088cceb2a7c1aaa56ce6d627eff2cc", "tree": "ebcf5484e4fdfe961bb97f4d58189adeb27ec4c1", "parents": [ "a482ac81a53fdab0b219c3ed187f5663fcd67e81", "8aee0b25166f21d6d732b2b09bf7a82948b31dce" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 01:51:13 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 10 01:51:17 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into lmp-mr1-dev" }, { "commit": "d2e8e1488a26d0774a98ee947329c4dec74dae29", "tree": "b0b6495f402bf721e32ef04a77913c311812777a", "parents": [ "e0f30ecdb96eaf4486614cf0c20d7ec5407c48e1", "69e347f7ef91c5b708de72e7b4b10a067d1ccfe4" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 01:50:38 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 10 01:50:40 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into lmp-dev" }, { "commit": "d2699d009b8ff9d282a12e6ce608572c851bca52", "tree": "255f81cbd366f72ec76f71056dba98080dc605f2", "parents": [ "9d2914436f82a6670a42da4545ffd2fcb9301025", "3b3f08e68f2d169d0881ef1441102712fff21d1e" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 10 01:49:54 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 10 01:49:59 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Throw exception if slot has invalid offset\" into mnc-dev" }, { "commit": "9d2914436f82a6670a42da4545ffd2fcb9301025", "tree": "09f7fefb2b13d67a6bed24a5ff378ef2e77c14a3", "parents": [ "29104fe5eb637043f86191e9edf0b566cad8150f", "b50794ec65aa5490319a50b872e9ce311c183c7d" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 20:18:55 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 20:18:55 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours am: e0f30ecdb9 -s ours am: a482ac81a5\nam: b50794ec65 -s ours\n\nChange-Id: If7f57fc24bc60e8fa990e43fed483576d5451282\n" }, { "commit": "b50794ec65aa5490319a50b872e9ce311c183c7d", "tree": "9ab2d25a0976dae154d364cfdcf185e8471f7032", "parents": [ "56020da60181b2ee031ff1fd31c9ea6a012b1321", "a482ac81a53fdab0b219c3ed187f5663fcd67e81" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 20:12:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 20:12:46 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours am: e0f30ecdb9 -s ours\nam: a482ac81a5\n\nChange-Id: I4f7b8442c5094c30496299cf00b744db48fd72ad\n" }, { "commit": "a482ac81a53fdab0b219c3ed187f5663fcd67e81", "tree": "ee2449b9683f4ea9a0108456a53eda53b61c3f55", "parents": [ "31b54b9803fafac5060983667a214866b55ff3c3", "e0f30ecdb96eaf4486614cf0c20d7ec5407c48e1" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 20:05:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 20:05:21 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours\nam: e0f30ecdb9 -s ours\n\nChange-Id: Iffa0c61e06cbfe2e66912c26b0a3d81660bc5a91\n" }, { "commit": "29104fe5eb637043f86191e9edf0b566cad8150f", "tree": "09f7fefb2b13d67a6bed24a5ff378ef2e77c14a3", "parents": [ "451bcb50c7e661ff7b629e2563ff03391654437e", "56020da60181b2ee031ff1fd31c9ea6a012b1321" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 19:58:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 19:58:28 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours am: 31b54b9803\nam: 56020da601 -s ours\n\nChange-Id: I1117f04043a04adce2fc544052884e96430cc88a\n" }, { "commit": "e0f30ecdb96eaf4486614cf0c20d7ec5407c48e1", "tree": "5c572647bbf9cb37026171fc2d844e913996e526", "parents": [ "bb6096d37b70b8cbc41f7eac52d4e0e3f47de3ca", "305a41b7a673939c9f51126a1e3870ff5dfb3b27" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 19:58:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 19:58:26 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5\nam: 305a41b7a6 -s ours\n\nChange-Id: I902e6af1c2ef49d454a7d1bae92d8e20ea263b0e\n" }, { "commit": "305a41b7a673939c9f51126a1e3870ff5dfb3b27", "tree": "f724e9dea2c80040a1984abd695121b836e0cc70", "parents": [ "b278ed787ece58ca7aa28b7b3a94da02d02fd5ab", "2d54d2c0d58906c864c499104ac5dfed31accb5b" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 19:52:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 19:52:01 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa\nam: 2d54d2c0d5\n\nChange-Id: I29dccd1ed95079470fc1dd7b04e3db6c5c7d76d2\n" }, { "commit": "451bcb50c7e661ff7b629e2563ff03391654437e", "tree": "09f7fefb2b13d67a6bed24a5ff378ef2e77c14a3", "parents": [ "07beec953b25881d61d85dd2796368a0d7864f73", "cd1be81d25fbdf477d8c906afb4be8cf21f82c61" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 19:51:55 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 19:51:55 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8\nam: cd1be81d25 -s ours\n\nChange-Id: Idce25609138797d130d511ea84847ed71fc6dd65\n" }, { "commit": "56020da60181b2ee031ff1fd31c9ea6a012b1321", "tree": "9ab2d25a0976dae154d364cfdcf185e8471f7032", "parents": [ "cd1be81d25fbdf477d8c906afb4be8cf21f82c61", "31b54b9803fafac5060983667a214866b55ff3c3" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 19:50:39 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 19:50:39 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours\nam: 31b54b9803\n\nChange-Id: Idfb4997bc0e44322bcf2db7e111b76ea59244168\n" }, { "commit": "cd1be81d25fbdf477d8c906afb4be8cf21f82c61", "tree": "9ab2d25a0976dae154d364cfdcf185e8471f7032", "parents": [ "a0b1198e7066c70a99a24e091b06b0dc0ef22103", "1cbfeef9d8667ba62a263e2cf09ef9c6af4517da" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 19:44:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 19:44:01 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr\nam: 1cbfeef9d8\n\nChange-Id: Ib2dc9c376b0ad77a0b64ac3a762bc49e4ef6159f\n" }, { "commit": "2d54d2c0d58906c864c499104ac5dfed31accb5b", "tree": "0149fa421e07c1199c3fd80b0be7a04e55e3d806", "parents": [ "21992d997b7022396a3ac7699679c905b6d6d2bc", "7b83d625aa360ea8d4e41584017e0d5179540c5b" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 19:43:54 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 19:43:54 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr\nam: 7b83d625aa\n\nChange-Id: Icfcec14e7d4bfcd6c893f0fa319541223b9d7901\n" }, { "commit": "31b54b9803fafac5060983667a214866b55ff3c3", "tree": "ee2449b9683f4ea9a0108456a53eda53b61c3f55", "parents": [ "1cbfeef9d8667ba62a263e2cf09ef9c6af4517da", "bb6096d37b70b8cbc41f7eac52d4e0e3f47de3ca" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 19:43:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Mar 09 19:43:52 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr\nam: bb6096d37b -s ours\n\nChange-Id: Ief3269100fb5c0d425e58b4faf87bd73677251b1\n" }, { "commit": "07beec953b25881d61d85dd2796368a0d7864f73", "tree": "09f7fefb2b13d67a6bed24a5ff378ef2e77c14a3", "parents": [ "c8dac8d6f609a50a6aac04a098fdb22fa3861b29", "23efadc807d753906edf0cb61e76ba50cde3ab39" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Mar 09 19:35:27 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 09 19:35:32 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Check bounds in offsetToPtr\" into mnc-dev" }, { "commit": "c8dac8d6f609a50a6aac04a098fdb22fa3861b29", "tree": "e8e4e16e6c042c02c9ab82e5d47bcf1d8b704c4b", "parents": [ "48f1ddc94a85d4b063cdf4b76cba14ccdd34376f", "8b943f40b6efc94490d79b1fe1bd7e6db0657eb0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 09 19:19:39 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 09 19:19:43 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Don\u0027t allow permission change to runtime\" into mnc-dev" }, { "commit": "8b943f40b6efc94490d79b1fe1bd7e6db0657eb0", "tree": "f69016653d95e351cbb0b7f1e2620f35e36a1bd0", "parents": [ "1f458fdc66c27977a2f93ba473d120aad190282a" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 29 14:40:11 2016 -0800" }, "committer": { "name": "Zach Jang", "email": "zachjang@google.com", "time": "Thu Mar 09 19:16:08 2017 +0000" }, "message": "[DO NOT MERGE] Don\u0027t allow permission change to runtime\n\nPrevent apps to change permission protection level to dangerous\nfrom any other type as this would allow a privilege escalation\nwhere an app adds a normal permission in other app\u0027s group and\nthen redefines it as dangerous leading to the group auto-grant.\n\nTest: Added a CTS test which passes.\n\nBug: 33860747\n\nChange-Id: I4e86ee54e61d2fa45be601fae577986ef9a84673\n" }, { "commit": "8aee0b25166f21d6d732b2b09bf7a82948b31dce", "tree": "5ea0cd2e55f3e25d394e48dc023890900a62d9ba", "parents": [ "6f754e48e95410d00382c9a6b694f0a8a655eb63" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Wed Feb 22 14:12:50 2017 -0800" }, "committer": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Sat Mar 04 01:35:49 2017 +0000" }, "message": "[DO NOT MERGE] Throw exception if slot has invalid offset\n\nPreviously the process would crash, which is OK, but complicates testing.\n\nTest: cts-tradefed run cts --module CtsContentTestCases\n --test android.content.cts.ContentProviderCursorWindowTest\nBug: 34128677\n\nChange-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7\n(cherry picked from commit eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)\n" }, { "commit": "589796a57eefa0432bd6af78e375dde8eca8aa25", "tree": "82a66e2b20746c3de8c86f8f9481007c72eccfd6", "parents": [ "8cdc04957a743ff45cc18aeb91945e883121b2c8" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Wed Feb 22 14:12:50 2017 -0800" }, "committer": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 03 23:40:06 2017 +0000" }, "message": "[DO NOT MERGE] Throw exception if slot has invalid offset\n\nPreviously the process would crash, which is OK, but complicates testing.\n\nTest: cts-tradefed run cts --module CtsContentTestCases\n --test android.content.cts.ContentProviderCursorWindowTest\nBug: 34128677\n\nChange-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7\n(cherry picked from commit eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)\n" }, { "commit": "69e347f7ef91c5b708de72e7b4b10a067d1ccfe4", "tree": "4ca1a316fd88cecb12cae4b7204c95de709ddb8a", "parents": [ "3e4faac39f77e3ad86cdca528d8981cb0c00daa0" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Wed Feb 22 14:12:50 2017 -0800" }, "committer": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 03 23:37:53 2017 +0000" }, "message": "[DO NOT MERGE] Throw exception if slot has invalid offset\n\nPreviously the process would crash, which is OK, but complicates testing.\n\nTest: cts-tradefed run cts --module CtsContentTestCases\n --test android.content.cts.ContentProviderCursorWindowTest\nBug: 34128677\n\nChange-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7\n(cherry picked from commit eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)\n" }, { "commit": "3b3f08e68f2d169d0881ef1441102712fff21d1e", "tree": "fdbbfce70afe8ca6c53b2207568ebb80f92d470d", "parents": [ "48f1ddc94a85d4b063cdf4b76cba14ccdd34376f" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Wed Feb 22 14:12:50 2017 -0800" }, "committer": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 03 23:19:11 2017 +0000" }, "message": "[DO NOT MERGE] Throw exception if slot has invalid offset\n\nPreviously the process would crash, which is OK, but complicates testing.\n\nTest: cts-tradefed run cts --module CtsContentTestCases\n --test android.content.cts.ContentProviderCursorWindowTest\nBug: 34128677\n\nChange-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7\n(cherry picked from commit eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)\n" }, { "commit": "1cbfeef9d8667ba62a263e2cf09ef9c6af4517da", "tree": "ee2449b9683f4ea9a0108456a53eda53b61c3f55", "parents": [ "6f754e48e95410d00382c9a6b694f0a8a655eb63" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Mon Feb 27 17:33:18 2017 -0800" }, "committer": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Mar 03 19:01:24 2017 +0000" }, "message": "[DO NOT MERGE] Check bounds in offsetToPtr\n\nCheck whether specified offset belongs to mData.\nAlso added a default argument bufferSize to check the end offset.\n\nSize of the ashmem descriptor can be modified between\nashmem_get_size_region call and mmap. createFromParcel method was updated\nto check ashmem size again immediately after memory is mapped.\n\nTest: manual - using the test app from the bug\nBug: 34128677\nChange-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750\n(cherry picked from commit 45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)\n" } ], "next": "7b83d625aa360ea8d4e41584017e0d5179540c5b" }