)]}' { "log": [ { "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": "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": "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": "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": "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": "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": "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": "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": "7b83d625aa360ea8d4e41584017e0d5179540c5b", "tree": "772ce734e08d189ada3db9c09f662afc97b9138b", "parents": [ "8cdc04957a743ff45cc18aeb91945e883121b2c8" ], "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": "Wed Mar 01 18:46:27 2017 -0800" }, "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" }, { "commit": "bb6096d37b70b8cbc41f7eac52d4e0e3f47de3ca", "tree": "5c572647bbf9cb37026171fc2d844e913996e526", "parents": [ "3e4faac39f77e3ad86cdca528d8981cb0c00daa0" ], "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": "Wed Mar 01 01:31:18 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" }, { "commit": "3e4faac39f77e3ad86cdca528d8981cb0c00daa0", "tree": "a04f9f9c0388dbae80d83e3cdb070a205201e920", "parents": [ "af85feef363b596cbac066d1eea8bf8c5df7807d", "2dfdf662d000ba66a22b0df3e5d9d87bfc6b7003" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Thu Feb 02 23:59:43 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 02 23:59:49 2017 +0000" }, "message": "Merge \"DO NOT MERGE. No direct Uri grants from system.\" into lmp-dev" }, { "commit": "af85feef363b596cbac066d1eea8bf8c5df7807d", "tree": "5af9396306857ab03d0b909fe5fa7c533bfa8baa", "parents": [ "ec3e2b9dcb859ae80f7abbd13ed191015957d3c0", "14ed611912be854b29eaa6298d813b2884c78584" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Feb 02 22:58:45 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 02 22:58:49 2017 +0000" }, "message": "Merge \"DO NOT MERGE Do not call RecoverySystem with DPMS lock held\" into lmp-dev" }, { "commit": "ec3e2b9dcb859ae80f7abbd13ed191015957d3c0", "tree": "e997acff88142ee387d59b8c4a35cd0d716395b3", "parents": [ "0a8978f04b4cc2e273545568b424756ee5a40a3d", "b278ed787ece58ca7aa28b7b3a94da02d02fd5ab" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Feb 02 22:41:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 02 22:41:38 2017 +0000" }, "message": "DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b\nam: b278ed787e -s ours\n\nChange-Id: Ib70440bdd1c60ed5eaa9b8c8152a4745f44cacd6\n" }, { "commit": "b278ed787ece58ca7aa28b7b3a94da02d02fd5ab", "tree": "01ae6dc1c3497b585824bcdc0ba16a68ce077304", "parents": [ "3380a775163f480f39d41572b06c433d45d42f79", "21992d997b7022396a3ac7699679c905b6d6d2bc" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Feb 02 22:36:03 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 02 22:36:03 2017 +0000" }, "message": "DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a\nam: 21992d997b\n\nChange-Id: Ib5ba5eb63227be2fbf25a79e7f8f8e42b1cc9a2b\n" }, { "commit": "21992d997b7022396a3ac7699679c905b6d6d2bc", "tree": "50837461e172e636c081c4757b9dab2709cc4677", "parents": [ "d417e54872100f823b8f7bbba8910f0a3f51b1bc", "8cdc04957a743ff45cc18aeb91945e883121b2c8" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Feb 02 22:31:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Feb 02 22:31:29 2017 +0000" }, "message": "DO NOT MERGE Do not call RecoverySystem with DPMS lock held\nam: 8cdc04957a\n\nChange-Id: I7c1b9e9f785ef99575136d9af0b062dad759c17a\n" }, { "commit": "2dfdf662d000ba66a22b0df3e5d9d87bfc6b7003", "tree": "6a7d961a29425192d5bc906e1a7fc755c3748bd7", "parents": [ "0a8978f04b4cc2e273545568b424756ee5a40a3d" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Nov 21 10:33:54 2016 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Thu Feb 02 07:13:08 2017 +0000" }, "message": "DO NOT MERGE. No direct Uri grants from system.\n\nThe system should never be extending Uri permission grants from\nitself, since it automatically holds all the permissions. Instead,\nthe system should always be a mediator between two specific app, and\nit should be using startActivityAsCaller() if it needs to extend\npermissions.\n\nBlocking at this level fixes an entire class of confused deputy\nsecurity issues.\n\nTest: builds, normal intent resolution UI works\nBug: 33019296, 32990341, 32879915, 32879772\nChange-Id: Iaa57c393a386d8068e807d0dd0caccc89d8a11db\n" }, { "commit": "14ed611912be854b29eaa6298d813b2884c78584", "tree": "5af9396306857ab03d0b909fe5fa7c533bfa8baa", "parents": [ "0a8978f04b4cc2e273545568b424756ee5a40a3d" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Mon Jan 30 18:24:02 2017 -0800" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Tue Jan 31 04:56:34 2017 +0000" }, "message": "DO NOT MERGE Do not call RecoverySystem with DPMS lock held\n\nNote DPM.wipeData() on a secondary user is now blocking, just like\nit\u0027s been always blocking on the primary user.\n\nBug 30681079\n\nChange-Id: Ia832bed0f22396998d6307ab46e262dae9463838\nMerged-In: Ia832bed0f22396998d6307ab46e262dae9463838\n" }, { "commit": "8cdc04957a743ff45cc18aeb91945e883121b2c8", "tree": "276fc1d816dc82b77498c99990709bb5bbeefda8", "parents": [ "a206a0f17eeac58d00800db5841a08ac32ad26d1" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Mon Jan 30 18:02:18 2017 -0800" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Mon Jan 30 18:26:35 2017 -0800" }, "message": "DO NOT MERGE Do not call RecoverySystem with DPMS lock held\n\nBug 30681079\n\nChange-Id: Ia832bed0f22396998d6307ab46e262dae9463838\n" }, { "commit": "0a8978f04b4cc2e273545568b424756ee5a40a3d", "tree": "e997acff88142ee387d59b8c4a35cd0d716395b3", "parents": [ "ae7d4b13399d3fc0a3a57fe5082b6db89ec6e23f", "3380a775163f480f39d41572b06c433d45d42f79" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:09:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:09:09 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872\nam: 3380a77516\n\nChange-Id: Ice61f337e1fcfd0569431538e475d94f9d205423\n" }, { "commit": "3380a775163f480f39d41572b06c433d45d42f79", "tree": "c8a7af142499904f44444d96d2e9c96fbaedd666", "parents": [ "9a15881184e0549fd58f735ed418d7b0e42fc771", "d417e54872100f823b8f7bbba8910f0a3f51b1bc" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:04:07 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:04:07 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e\nam: d417e54872\n\nChange-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db\n" }, { "commit": "d417e54872100f823b8f7bbba8910f0a3f51b1bc", "tree": "b8f442b91f809ee1b0c3c26e87d5c0073a809c63", "parents": [ "a5affb045eccbfb621415e2d0b648338bede738a", "a206a0f17eeac58d00800db5841a08ac32ad26d1" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 16:58:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 16:58:33 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked\nam: a206a0f17e\n\nChange-Id: Ib3af056919a4b909d3d11dd3fe2b46eaa7cdf0f4\n" }, { "commit": "a206a0f17eeac58d00800db5841a08ac32ad26d1", "tree": "a9aba56e26c4500ab88faa158fa4a7bd50b1937c", "parents": [ "418e0869ba936ff1e1d31f576021d15e8da6a105" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 15 10:26:28 2016 -0800" }, "committer": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 15 10:26:28 2016 -0800" }, "message": "Fix exploit where can hide the fact that a location was mocked\n\n- Even if call setTestProviderLocation() with inconsistent providers,\nshould still end up with a location that is flagged as mocked\n\n- Bug: 33091107\n\nChange-Id: I39e038f25b975989c2e8651bfd9ec9e74073e6cd\n" }, { "commit": "ae7d4b13399d3fc0a3a57fe5082b6db89ec6e23f", "tree": "11a259507c1d32f324dc132f715ca659571a6da6", "parents": [ "f279a5bc0dd54aadd97a0941d5fed4584794ba57", "9b858626204913b29dc677ee265e54cd14717484" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Dec 02 18:10:04 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 02 18:10:15 2016 +0000" }, "message": "Merge \"DO NOT MERGE. Check provider access for content changes.\" into lmp-dev" }, { "commit": "f279a5bc0dd54aadd97a0941d5fed4584794ba57", "tree": "533deb0ba52a5ba181bb77e30728fd48cb476e50", "parents": [ "b1f1209d9a3321d8bc44529406a3e210524d5e3a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Nov 30 16:07:00 2016 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Thu Dec 01 23:54:50 2016 +0000" }, "message": "DO NOT MERGE. Retain DownloadManager Uri grants when clearing.\n\nAs part of fixing a recent security issue, DownloadManager now needs\nto issue Uri permission grants for all downloads. However, if an app\nthat requested a download is upgraded or otherwise force-stopped,\nthe required permission grants are removed.\n\nWe could tell DownloadManager about the app being stopped, but that\nwould be racy (due to background broadcast), and waking it up would\ndegrade system health. Instead, as a special case we now only\nconsider clearing DownloadManager permission grants when app data\nis being cleared.\n\nBug: 32172542, 30537115\nTest: builds, boots, app upgrade doesn\u0027t clear grants\nChange-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9\n(cherry picked from commit 23ec811266fb728cf159a90ce4882b3c9bac1887)\n" }, { "commit": "9b858626204913b29dc677ee265e54cd14717484", "tree": "0e5609745f8388c415a376dade6713518db7b984", "parents": [ "b1f1209d9a3321d8bc44529406a3e210524d5e3a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Nov 18 14:23:23 2016 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Nov 18 15:37:08 2016 -0700" }, "message": "DO NOT MERGE. Check provider access for content changes.\n\nFor an app to either send or receive content change notifications,\nrequire that they have some level of access to the underlying\nprovider.\n\nWithout these checks, a malicious app could sniff sensitive user data\nfrom the notifications of otherwise private providers.\n\nTest: builds, boots, PoC app now fails\nBug: 32555637\nChange-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef\n" }, { "commit": "b1f1209d9a3321d8bc44529406a3e210524d5e3a", "tree": "1b1e26dd4c247a463308319d5583857daf44e343", "parents": [ "7bd25ab4850e8b14c37e3f66fb9432fc73c9c8d4" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Nov 07 16:22:48 2016 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Nov 10 10:06:01 2016 +0000" }, "message": "Zygote : Block SIGCHLD during fork.\n\nWe close the android logging related sockets prior as late as possible\nbefore every fork to avoid having to whitelist them. If one of the\nzygote\u0027s children dies after this point (but prior to the fork), we can\nend up reopening the logging sockets from the SIGCHLD signal handler.\n\nTo prevent this from happening, block SIGCHLD during this critical\nsection.\n\nBug: 32693692\nTest: Manual\n\n(cherry picked from commit e9a525829a354c92983a35455ccab16d1b0d3892)\n\nZygote: Unblock SIGCHLD in the parent after fork.\n\nFollow up to change e9a525829a354c92983a. Allows the zygote to\nreceive SIGCHLD again and prevents the zygote from getting into a\nzombie state if it\u0027s killed.\n\nContributed-By: rhed_jao \u003crhed_jao@htc.com\u003e\nBug: 32693692\nTest: manual\n\n(cherry picked from commit 1480dc3e97b661f5bfa3a5c2fbce72385b8d2be6)\n\nChange-Id: If89903a29c84dfc9b056f9e19618046874bba689\n" }, { "commit": "7bd25ab4850e8b14c37e3f66fb9432fc73c9c8d4", "tree": "363316c63dca232ab887b1d7ad995054c9246934", "parents": [ "d60156dfc6f1183cd4364224964919e30fa53e50", "7d302e018db99e859b465413d514406fb02f4d8d" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Nov 09 10:20:00 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 09 10:20:04 2016 +0000" }, "message": "Merge \"Zygote: Additional whitelisting for legacy devices.\" into lmp-dev" }, { "commit": "d60156dfc6f1183cd4364224964919e30fa53e50", "tree": "294cc2bccf1fc03c4e62277c9275a5d1a87c64bb", "parents": [ "0244ca8d10dfc27e14f481fe649b89f7638c48eb", "0ad0e859f6309fa6e6cea68fe3366d68b5c08f73" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Nov 09 09:30:47 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 09 09:30:50 2016 +0000" }, "message": "Merge \"Zygote: Additional whitelists for runtime overlay / other static resources.\" into lmp-dev" }, { "commit": "0244ca8d10dfc27e14f481fe649b89f7638c48eb", "tree": "d264e5df4f7dbb181acd90e0f446d4bffa1819ed", "parents": [ "21c4e6d532e4ec1eb49c78f5592d042c34d0c9a5" ], "author": { "name": "neo.chae", "email": "neo.chae@lge.com", "time": "Tue Nov 01 00:02:38 2016 +0900" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Nov 08 09:59:44 2016 +0000" }, "message": "Fix idmap leak in zygote process\n\nFix a idmap leak in AssetManager::addSystemOverlays.\nAnd, The fix could also prevent fd leak of idmap.\n\nTest: none\nBug: 32691930\n\nSigned-off-by: Hyangseok Chae \u003cneo.chae@lge.com\u003e\n\n(cherry picked from commit 6a742a38509693f8b39ee9a5ad2803fca12688bf)\n\nChange-Id: Idc4af77db2b0cb739bd6b009b6af0f9123be1aac\n" }, { "commit": "7d302e018db99e859b465413d514406fb02f4d8d", "tree": "27a0fc17fbaac60419224b97f3a4afbc9b2ebc67", "parents": [ "0ad0e859f6309fa6e6cea68fe3366d68b5c08f73" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Nov 07 19:59:29 2016 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Nov 08 09:42:11 2016 +0000" }, "message": "Zygote: Additional whitelisting for legacy devices.\n\nOn M and below, we provide a blanket whitelist for all files under\n\"/vendor/zygote_whitelist\". This path is whitelisted purely to allow\nthis patch to be applied easily on legacy devices and configurations.\n\nNote that this does not amount to a loosening of our security policy\nbecause whitelisted files are reopened anyway.\n\nBug: 32691930\nTest: manual\n\n(cherry picked from commit 5e2f7c6229d7191183888d685b57a7d0a2835fce)\n\nChange-Id: I9700fc7b469d0bc4d876c52292f25888b94a5223\n" }, { "commit": "0ad0e859f6309fa6e6cea68fe3366d68b5c08f73", "tree": "2ba54595370b47d0d058d4022ce007f529dd21ff", "parents": [ "21c4e6d532e4ec1eb49c78f5592d042c34d0c9a5" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Sep 23 09:07:11 2016 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Nov 08 09:41:49 2016 +0000" }, "message": "Zygote: Additional whitelists for runtime overlay / other static resources.\n\nPartially cherry picked from commit 1c15c635785c64a.\n\nThese files are safe to reopen for the same reason that files in\n/system/framework are. They\u0027re regular files and will not change after\nthe first zygote fork.\n\nBug: 32618130\n\nChange-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f\n" }, { "commit": "21c4e6d532e4ec1eb49c78f5592d042c34d0c9a5", "tree": "7fd1580582f3f910d416129ef9d77cd22c5d7cfb", "parents": [ "135524f2c51fdce4db0c16a6613f63e64049f79a", "9a15881184e0549fd58f735ed418d7b0e42fc771" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Tue Oct 18 17:41:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 18 17:41:55 2016 +0000" }, "message": "DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e\nam: 9a15881184 -s ours\n\nChange-Id: I67ba2d8b8d3c3f32fca417303ee422482acc40d8\n" }, { "commit": "9a15881184e0549fd58f735ed418d7b0e42fc771", "tree": "767426e42c8b6f6d3b9f829e692ea6411a745dc5", "parents": [ "e3c0c509ea77ab2cd6e824d86657ed71fed7f8f9", "a5affb045eccbfb621415e2d0b648338bede738a" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Tue Oct 18 17:35:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 18 17:35:23 2016 +0000" }, "message": "DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba\nam: a5affb045e\n\nChange-Id: I4bb4440c019839073b4fcf6df54d726a02286680\n" }, { "commit": "a5affb045eccbfb621415e2d0b648338bede738a", "tree": "f7a1415609ef3c262d61bf50e35c33483272375f", "parents": [ "c36913e68aabfc82d74d7e4204ba2bd06336d317", "418e0869ba936ff1e1d31f576021d15e8da6a105" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Tue Oct 18 17:28:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 18 17:28:58 2016 +0000" }, "message": "DO NOT MERGE) ExifInterface: Close the file when an exception happens\nam: 418e0869ba\n\nChange-Id: Ifad08d681f67abc4dd9ad5d8c4e82b038cbd8322\n" }, { "commit": "135524f2c51fdce4db0c16a6613f63e64049f79a", "tree": "7fd1580582f3f910d416129ef9d77cd22c5d7cfb", "parents": [ "5bea7d3aee79185589b53615f2b730986e0314bb" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Tue Oct 18 14:12:00 2016 +0900" }, "committer": { "name": "Sungsoo Lim", "email": "sungsoo@google.com", "time": "Tue Oct 18 16:18:15 2016 +0000" }, "message": "DO NOT MERGE) ExifInterface: Close the file when an exception happens\n\nBug: 32068647, Bug: 30936376\nChange-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f\n" }, { "commit": "418e0869ba936ff1e1d31f576021d15e8da6a105", "tree": "e49bd1680eb345e97e2d185ef67f19b83732c907", "parents": [ "6739ba0280ded2be6a57d94c32da660b7c105873" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Tue Oct 18 14:12:00 2016 +0900" }, "committer": { "name": "Sungsoo Lim", "email": "sungsoo@google.com", "time": "Tue Oct 18 16:17:29 2016 +0000" }, "message": "DO NOT MERGE) ExifInterface: Close the file when an exception happens\n\nBug: 32068647, Bug: 30936376\nChange-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f\n" }, { "commit": "5bea7d3aee79185589b53615f2b730986e0314bb", "tree": "646f7d282a95351813b1bcd1aafa75077d3df117", "parents": [ "9c78d0ad9f7cd7b8ead552b20b1a428e59397b67", "e3c0c509ea77ab2cd6e824d86657ed71fed7f8f9" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Sat Oct 15 00:49:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Oct 15 00:49:46 2016 +0000" }, "message": "Merge \"DO NOT MERGE Isolated processes don\u0027t get precached system service binders\" into klp-dev am: 6739ba0280 am: c36913e68a\nam: e3c0c509ea -s ours\n\nChange-Id: I287e60913bd2a3f6b46d1d5ef2413727e3e63cc2\n" }, { "commit": "9c78d0ad9f7cd7b8ead552b20b1a428e59397b67", "tree": "646f7d282a95351813b1bcd1aafa75077d3df117", "parents": [ "35bd0fc5f04d2472432a418db7cacfa1962d790f", "e07b811d78e4fa95fc695e21aa773fb286c64932" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Sat Oct 15 00:48:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Oct 15 00:48:51 2016 +0000" }, "message": "DO NOT MERGE Isolated processes don\u0027t get precached system service binders am: 2aa7e5e861 am: 9df66924c0\nam: e07b811d78 -s ours\n\nChange-Id: Ia9271aeed1c2953a318fc4bf50ee169739147d66\n" }, { "commit": "e3c0c509ea77ab2cd6e824d86657ed71fed7f8f9", "tree": "e3701b22fb00d3ad2153130992cfb1982f7c2595", "parents": [ "e07b811d78e4fa95fc695e21aa773fb286c64932", "c36913e68aabfc82d74d7e4204ba2bd06336d317" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Sat Oct 15 00:41:36 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Oct 15 00:41:36 2016 +0000" }, "message": "Merge \"DO NOT MERGE Isolated processes don\u0027t get precached system service binders\" into klp-dev am: 6739ba0280\nam: c36913e68a\n\nChange-Id: I65ab1551a4cdbbdf58bf9ec98f718e79c6ee9fe5\n" }, { "commit": "e07b811d78e4fa95fc695e21aa773fb286c64932", "tree": "e3701b22fb00d3ad2153130992cfb1982f7c2595", "parents": [ "68aa33b9bfe26ea18098e616c1d9df0bc922d519", "9df66924c0a002f40602ed9c404e1b119162cc2c" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Sat Oct 15 00:40:45 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Oct 15 00:40:45 2016 +0000" }, "message": "DO NOT MERGE Isolated processes don\u0027t get precached system service binders am: 2aa7e5e861\nam: 9df66924c0\n\nChange-Id: I9bd2580a687037fe9c5d74765d47bb4500b4d096\n" }, { "commit": "c36913e68aabfc82d74d7e4204ba2bd06336d317", "tree": "803cd661944d034e3de3db34e7e992cbf71d3661", "parents": [ "9df66924c0a002f40602ed9c404e1b119162cc2c", "6739ba0280ded2be6a57d94c32da660b7c105873" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Sat Oct 15 00:34:11 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Oct 15 00:34:11 2016 +0000" }, "message": "Merge \"DO NOT MERGE Isolated processes don\u0027t get precached system service binders\" into klp-dev\nam: 6739ba0280\n\nChange-Id: Ib8534d2c7ae344d430a9ba2e227cb65d942f0222\n" }, { "commit": "9df66924c0a002f40602ed9c404e1b119162cc2c", "tree": "803cd661944d034e3de3db34e7e992cbf71d3661", "parents": [ "29e643bcbd72d15b797eed5b9570ac47aa7db7b4", "2aa7e5e861123bab22bd2af676bcab662bcd37da" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Sat Oct 15 00:34:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Oct 15 00:34:09 2016 +0000" }, "message": "DO NOT MERGE Isolated processes don\u0027t get precached system service binders\nam: 2aa7e5e861\n\nChange-Id: Ied81e1f4b517627f0ced686e7485fa035b1f4c6a\n" }, { "commit": "35bd0fc5f04d2472432a418db7cacfa1962d790f", "tree": "646f7d282a95351813b1bcd1aafa75077d3df117", "parents": [ "2a762996cb8a57d1a8c13fe35d040cd57380adc7", "4779ee70a2ac57cd64b930f64ab3aaf6d000f4c8" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Sat Oct 15 00:26:18 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Oct 15 00:26:20 2016 +0000" }, "message": "Merge \"DO NOT MERGE Isolated processes don\u0027t get precached system service binders\" into lmp-dev" }, { "commit": "6739ba0280ded2be6a57d94c32da660b7c105873", "tree": "5d9a0893c59ec8d604277e5540c8fedbe948af91", "parents": [ "c11f599a2f4e07e3ff98dec0852ee87cce2f908c", "2aa7e5e861123bab22bd2af676bcab662bcd37da" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Oct 15 00:24:31 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Oct 15 00:24:34 2016 +0000" }, "message": "Merge \"DO NOT MERGE Isolated processes don\u0027t get precached system service binders\" into klp-dev" }, { "commit": "2aa7e5e861123bab22bd2af676bcab662bcd37da", "tree": "287a7fb86fd4e25d7e6d9d087388f4fb4775c3b8", "parents": [ "5b0522658634e859e359ef08ed63e38102d421ea" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Wed Oct 12 19:01:11 2016 -0700" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Fri Oct 14 22:55:29 2016 +0000" }, "message": "DO NOT MERGE Isolated processes don\u0027t get precached system service binders\n\nMore specifically, they get a PackageManager binder -- necessary for\nAndroid process startup and configuration -- but none of the other\nusual preloaded service binders.\n(backported from commit 2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc)\n\nBug: 30202228\n\nChange-Id: I3810649f504cd631665ece338a83d2e54d41ad05\n" }, { "commit": "4779ee70a2ac57cd64b930f64ab3aaf6d000f4c8", "tree": "b0838e06cd6c92b4542026f66c25724935fc60b8", "parents": [ "fce3b764523c94e4b6fdeffa88b4773fd816d5df" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 13 16:33:04 2016 -0700" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Fri Oct 14 22:48:48 2016 +0000" }, "message": "DO NOT MERGE Isolated processes don\u0027t get precached system service binders\n\nMore specifically, they get a PackageManager binder -- necessary for\nAndroid process startup and configuration -- but none of the other\nusual preloaded service binders.\n(backported from commit 2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc)\n\nBug: 30202228\n\nChange-Id: I3810649f504cd631665ece338a83d2e54d41ad05\n" }, { "commit": "2a762996cb8a57d1a8c13fe35d040cd57380adc7", "tree": "8cd460e2d8269597b25a5a05425b8fb5d7716445", "parents": [ "22bd36448e342ed86fbb60f9465cfdf1ba1c0f6c", "68aa33b9bfe26ea18098e616c1d9df0bc922d519" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Thu Oct 13 22:06:03 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 13 22:06:03 2016 +0000" }, "message": "DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f am: 29e643bcbd\nam: 68aa33b9bf -s ours\n\nChange-Id: I7fe3d5dbcb7bd206233ce969840f5ed182913dd6\n" }, { "commit": "68aa33b9bfe26ea18098e616c1d9df0bc922d519", "tree": "e5ab248db366ef029a9ab06c824a9b4cb10407fd", "parents": [ "84ecab6059f43d7eab941cf163c6e7a079b088f6", "29e643bcbd72d15b797eed5b9570ac47aa7db7b4" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Thu Oct 13 22:01:39 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 13 22:01:39 2016 +0000" }, "message": "DO NOT MERGE) ExifInterface: Provide backward compatibility am: c11f599a2f\nam: 29e643bcbd\n\nChange-Id: I413ba35abfc8999c405df78a40b8182f19472b6a\n" }, { "commit": "29e643bcbd72d15b797eed5b9570ac47aa7db7b4", "tree": "d5f44977f280892942539521fa4cabd7cf8036bb", "parents": [ "b38fbf9894f492ffa17ffddec02bc90c75f6a4ed", "c11f599a2f4e07e3ff98dec0852ee87cce2f908c" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Thu Oct 13 21:56:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 13 21:56:56 2016 +0000" }, "message": "DO NOT MERGE) ExifInterface: Provide backward compatibility\nam: c11f599a2f\n\nChange-Id: If503e3361e69ad88a166f145603273d728d65652\n" }, { "commit": "22bd36448e342ed86fbb60f9465cfdf1ba1c0f6c", "tree": "8cd460e2d8269597b25a5a05425b8fb5d7716445", "parents": [ "fce3b764523c94e4b6fdeffa88b4773fd816d5df" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Thu Oct 13 12:24:16 2016 +0900" }, "committer": { "name": "Sungsoo Lim", "email": "sungsoo@google.com", "time": "Thu Oct 13 03:28:16 2016 +0000" }, "message": "DO NOT MERGE) ExifInterface: Provide backward compatibility\n\nExifInterface.saveAttribute() didn\u0027t throw UnsupportedOperationException\nbefore. Use IOException instead of UnsupportedOperationException for\nbackward compatibility.\n\nBug: 30936376, Bug: 32068647, Bug: 31319086\nChange-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca\n" }, { "commit": "c11f599a2f4e07e3ff98dec0852ee87cce2f908c", "tree": "926513c309e47418dab739ec272c06855a135908", "parents": [ "5b0522658634e859e359ef08ed63e38102d421ea" ], "author": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Thu Oct 13 12:24:16 2016 +0900" }, "committer": { "name": "Sungsoo", "email": "sungsoo@google.com", "time": "Thu Oct 13 12:25:03 2016 +0900" }, "message": "DO NOT MERGE) ExifInterface: Provide backward compatibility\n\nExifInterface.saveAttribute() didn\u0027t throw UnsupportedOperationException\nbefore. Use IOException instead of UnsupportedOperationException for\nbackward compatibility.\n\nBug: 30936376, Bug: 32068647, Bug: 31319086\nChange-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca\n" }, { "commit": "fce3b764523c94e4b6fdeffa88b4773fd816d5df", "tree": "8879c368f0b8496a1663054a87a773b8adbd41c0", "parents": [ "5ac79fa0a1e21259580ab6258269f68c577fa68a", "dfedca4e436f0aa966a30fa08c9097538ba25381" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 17:46:56 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 22 17:46:59 2016 +0000" }, "message": "Merge \"DO NOT MERGE Fix build\" into lmp-dev" }, { "commit": "dfedca4e436f0aa966a30fa08c9097538ba25381", "tree": "f9300614e3764e1a859b4754d1b2eac1dfd2cdc3", "parents": [ "4e9af38ec483eb16ebf64f049c540e2bd1909b6f" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 14:56:33 2016 +0900" }, "committer": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 17:43:35 2016 +0000" }, "message": "DO NOT MERGE Fix build\n\nBug: 29833954\nChange-Id: Ia814969b516ac7cc0ad7431ebab40cc74fdf2a05\n" }, { "commit": "5ac79fa0a1e21259580ab6258269f68c577fa68a", "tree": "f212554c8f10cc76cba5b99147f855ea49b7e88c", "parents": [ "8dffbcd16982ac9aea9eff06da8c21414749349f", "84ecab6059f43d7eab941cf163c6e7a079b088f6" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 09:13:35 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 22 09:13:35 2016 +0000" }, "message": "Merge \"DO NOT MERGE Check caller for sending media key to telephony service\" into klp-dev am: 5b05226586 am: b38fbf9894\nam: 84ecab6059 -s ours\n\nChange-Id: I077206cbba5614e52046cbbbf6e40544c3e25f92\n" }, { "commit": "8dffbcd16982ac9aea9eff06da8c21414749349f", "tree": "f212554c8f10cc76cba5b99147f855ea49b7e88c", "parents": [ "8919cc83bbd92ffc9d98fff0035539226ac0e816", "27d24e01cbd2bce93d1fc3375abda347ea516c30" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 08:07:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 22 08:07:29 2016 +0000" }, "message": "DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27 am: 9477c1674c\nam: 27d24e01cb -s ours\n\nChange-Id: Ibfec9c02db97a94476d1b6b4d7e98fd051d4aa58\n" }, { "commit": "84ecab6059f43d7eab941cf163c6e7a079b088f6", "tree": "f4f976c73e5db03612dfc753594a4dfc0f7bcd33", "parents": [ "27d24e01cbd2bce93d1fc3375abda347ea516c30", "b38fbf9894f492ffa17ffddec02bc90c75f6a4ed" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 08:07:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 22 08:07:17 2016 +0000" }, "message": "Merge \"DO NOT MERGE Check caller for sending media key to telephony service\" into klp-dev am: 5b05226586\nam: b38fbf9894\n\nChange-Id: I6f6d600544f09aac349a626e3ced18de5e02a2eb\n" }, { "commit": "27d24e01cbd2bce93d1fc3375abda347ea516c30", "tree": "f4f976c73e5db03612dfc753594a4dfc0f7bcd33", "parents": [ "dc0f9fa9c901d4bb9ff9bb3513177138e492bd94", "9477c1674c447b7880202ad76ad76cf1342f0434" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 07:35:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 22 07:35:37 2016 +0000" }, "message": "DO NOT MERGE Check caller for sending media key to telephony service am: d1641e8c27\nam: 9477c1674c\n\nChange-Id: If2edd8d386cd57f00221fedff3f118e6887cab61\n" }, { "commit": "b38fbf9894f492ffa17ffddec02bc90c75f6a4ed", "tree": "b1e40965d4ce3f9004a516cd9b11a64090a39848", "parents": [ "9477c1674c447b7880202ad76ad76cf1342f0434", "5b0522658634e859e359ef08ed63e38102d421ea" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 06:39:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 22 06:39:33 2016 +0000" }, "message": "Merge \"DO NOT MERGE Check caller for sending media key to telephony service\" into klp-dev\nam: 5b05226586\n\nChange-Id: I0b0b672c42a7a4bd75ccbeb2c3a1047eebda5076\n" }, { "commit": "9477c1674c447b7880202ad76ad76cf1342f0434", "tree": "b1e40965d4ce3f9004a516cd9b11a64090a39848", "parents": [ "35d1b45b0fe02624b64da24cd3b6d6397cb232a1", "d1641e8c2719dd5e83f841dfddf7a6efff86e4d9" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 06:39:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 22 06:39:24 2016 +0000" }, "message": "DO NOT MERGE Check caller for sending media key to telephony service\nam: d1641e8c27\n\nChange-Id: I5be1d931c3a2f2748e69158d442172c327199ef5\n" }, { "commit": "5b0522658634e859e359ef08ed63e38102d421ea", "tree": "1062d0fb390593e06e11ffd0399a450e0aab1083", "parents": [ "c119a677c4ec65814b88a0298b9906865d6feb5d", "d1641e8c2719dd5e83f841dfddf7a6efff86e4d9" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 05:19:34 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 22 05:19:37 2016 +0000" }, "message": "Merge \"DO NOT MERGE Check caller for sending media key to telephony service\" into klp-dev" }, { "commit": "d1641e8c2719dd5e83f841dfddf7a6efff86e4d9", "tree": "724d1ce7a815ee4a06bc0b5be18dcc629b01aa32", "parents": [ "204da8aa9e190f9409ec5dd56fd88e4c526b202a" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Wed Sep 21 11:20:54 2016 +0900" }, "committer": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Thu Sep 22 12:53:08 2016 +0900" }, "message": "DO NOT MERGE Check caller for sending media key to telephony service\n\nPrevent sending media key events from the non-system app to the\ntelephony service through the AudioManager.dispatchMediaKeyEvent()\nor sending media key broadcast directly.\n\nBug: 29833954\nTested: Installed malicious apps and confirmed that they don\u0027t work.\nTested: Run CtsTelecomTestCases and CtsMediaTestCases\nChange-Id: I2a9e78196ba7455324e485f098f095d03b47ee15\n" }, { "commit": "8919cc83bbd92ffc9d98fff0035539226ac0e816", "tree": "f212554c8f10cc76cba5b99147f855ea49b7e88c", "parents": [ "7f84596929f10666c273a568c4ea68c256142349", "dc0f9fa9c901d4bb9ff9bb3513177138e492bd94" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Thu Sep 22 03:50:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 22 03:50:02 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed\" into klp-dev am: c119a677c4 am: 35d1b45b0f\nam: dc0f9fa9c9 -s ours\n\nChange-Id: I75e0e5a61d15b2e6c4a1fec70b807165c8768987\n" }, { "commit": "7f84596929f10666c273a568c4ea68c256142349", "tree": "f212554c8f10cc76cba5b99147f855ea49b7e88c", "parents": [ "64b7b1522e29b8464784f62d45311e103e6d88bf", "438cc52ca1e3c8835967e4e7281bad4c3e251eab" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Thu Sep 22 03:48:40 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 22 03:48:40 2016 +0000" }, "message": "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f\nam: 438cc52ca1 -s ours\n\nChange-Id: Iabaa5642ffa6c3417b5e027e2da9b33666b1aacf\n" }, { "commit": "64b7b1522e29b8464784f62d45311e103e6d88bf", "tree": "f212554c8f10cc76cba5b99147f855ea49b7e88c", "parents": [ "f78ff48d0d851c23996711cea89472341e660b6b", "4e9af38ec483eb16ebf64f049c540e2bd1909b6f" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Wed Sep 21 22:21:03 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 21 22:21:06 2016 +0000" }, "message": "Merge \"DO NOT MERGE Check caller for sending media key to global priority session\" into lmp-dev" }, { "commit": "dc0f9fa9c901d4bb9ff9bb3513177138e492bd94", "tree": "333780a7c49463032ef78aeaef751362883acfee", "parents": [ "438cc52ca1e3c8835967e4e7281bad4c3e251eab", "35d1b45b0fe02624b64da24cd3b6d6397cb232a1" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 21 21:56:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 21 21:56:49 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed\" into klp-dev am: c119a677c4\nam: 35d1b45b0f\n\nChange-Id: I0417ea58275604b9ac1fca6e79c14697d965397a\n" }, { "commit": "438cc52ca1e3c8835967e4e7281bad4c3e251eab", "tree": "333780a7c49463032ef78aeaef751362883acfee", "parents": [ "3d995d6f5fe9fd0c6cc74e75e618b9cdf8096dfb", "8fd324c33fcc6651bacfb5d4f311207c3353d406" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 21 21:55:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 21 21:55:46 2016 +0000" }, "message": "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1\nam: 8fd324c33f\n\nChange-Id: Idbe61150d738e5e41d5606fa6d89c0a5b604a86d\n" }, { "commit": "35d1b45b0fe02624b64da24cd3b6d6397cb232a1", "tree": "c0efbfabac8cfe893c62661c978b9e42c5edf0a4", "parents": [ "8fd324c33fcc6651bacfb5d4f311207c3353d406", "c119a677c4ec65814b88a0298b9906865d6feb5d" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 21 21:15:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 21 21:15:59 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed\" into klp-dev\nam: c119a677c4\n\nChange-Id: I7f1a7c5d09d38cfbd3fca0ee158f6401233e8f6d\n" }, { "commit": "8fd324c33fcc6651bacfb5d4f311207c3353d406", "tree": "c0efbfabac8cfe893c62661c978b9e42c5edf0a4", "parents": [ "a278a1e66002663b2d983e6d3a53b923cc281523", "786e2694b1de828cef333af907d6270ecad445df" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 21 21:15:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 21 21:15:56 2016 +0000" }, "message": "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed\nam: 786e2694b1\n\nChange-Id: Ia40c3fc57b5c17910c67faf40b940bdd944dd4e3\n" }, { "commit": "f78ff48d0d851c23996711cea89472341e660b6b", "tree": "22518cb37ba3faebc759db1f46b7be12c45d07ab", "parents": [ "19b09dd0d3560772f0ee808ae09ca7957c8dc5e6", "27b3d578b90bb4aa4f6cc26fb33867b705f91bae" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 21 21:08:04 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 21 21:08:07 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed\" into lmp-dev" }, { "commit": "c119a677c4ec65814b88a0298b9906865d6feb5d", "tree": "221a640cc479308de0dd9c79982ac780d769729e", "parents": [ "204da8aa9e190f9409ec5dd56fd88e4c526b202a", "786e2694b1de828cef333af907d6270ecad445df" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 21 21:08:01 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 21 21:08:04 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed\" into klp-dev" }, { "commit": "4e9af38ec483eb16ebf64f049c540e2bd1909b6f", "tree": "0a687cf900adf449ebe9eb4bed9400ee1ba6f320", "parents": [ "19b09dd0d3560772f0ee808ae09ca7957c8dc5e6" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Wed Sep 21 10:07:24 2016 +0900" }, "committer": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Wed Sep 21 10:44:09 2016 +0900" }, "message": "DO NOT MERGE Check caller for sending media key to global priority session\n\nPrevent sending media key events from the non-system app to the global\npriority session through the MediaSessionManager.dispatchMediaKeyEvent().\nNote that any app can use the API indirectly with\nthe public API AudioManager.dispatchMediaKeyEvent().\n\nBug: 29833954\nTested: Installed malicious apps and confirmed that they don\u0027t work.\nTested: Run CtsTelecomTestCases and CtsMediaTestCases\nChange-Id: I2a9e78196ba7455324e485f098f095d03b47ee15\n" }, { "commit": "19b09dd0d3560772f0ee808ae09ca7957c8dc5e6", "tree": "a9aed9bd647ee2bd3762239ce94b1105fadf4004", "parents": [ "4f77ca16e4ea9c319d713d1e765247983885a4f7", "0ea21bc70eab94068ec4ae8d484f192c77aed43c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 21 00:07:34 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 21 00:07:38 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)\" into lmp-dev" }, { "commit": "4f77ca16e4ea9c319d713d1e765247983885a4f7", "tree": "7d9302399e4862527684a99ae9a2f39779394b74", "parents": [ "cb970f408ebda0435fc513afd52dddf0b6acdec4", "3d995d6f5fe9fd0c6cc74e75e618b9cdf8096dfb" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 21 00:04:35 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 21 00:04:35 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)\" into klp-dev am: 204da8aa9e am: a278a1e660\nam: 3d995d6f5f -s ours\n\nChange-Id: I9e410ce2d5302eda87aea9628cb58ca203a212c5\n" }, { "commit": "cb970f408ebda0435fc513afd52dddf0b6acdec4", "tree": "7d9302399e4862527684a99ae9a2f39779394b74", "parents": [ "1d053b3be8492ad5ca2344b1bf2c91a31b635230", "3758253ae8fa37ee7be3a9dceddbc48d3944053f" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 21 00:03:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 21 00:03:23 2016 +0000" }, "message": "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a am: 271e34dbd5\nam: 3758253ae8 -s ours\n\nChange-Id: I0836ddb1649084a6814c461bccc41135cb475337\n" }, { "commit": "3d995d6f5fe9fd0c6cc74e75e618b9cdf8096dfb", "tree": "a641d24c9d37a7ed0c47e45431dd34a0524ab38f", "parents": [ "3758253ae8fa37ee7be3a9dceddbc48d3944053f", "a278a1e66002663b2d983e6d3a53b923cc281523" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Tue Sep 20 23:56:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 20 23:56:48 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)\" into klp-dev am: 204da8aa9e\nam: a278a1e660\n\nChange-Id: I22838d21bdd289ca34b78260ade59adafbdc408a\n" }, { "commit": "3758253ae8fa37ee7be3a9dceddbc48d3944053f", "tree": "a641d24c9d37a7ed0c47e45431dd34a0524ab38f", "parents": [ "3fca892d3e3b1bab481c92c8ec5297591daf2f5c", "271e34dbd55c9ba6d67c6aa0e8912736cfcd312a" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Tue Sep 20 23:55:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 20 23:55:44 2016 +0000" }, "message": "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a\nam: 271e34dbd5\n\nChange-Id: I954b8f2d9333fa6bb549dc812733d2b8f71220b9\n" }, { "commit": "a278a1e66002663b2d983e6d3a53b923cc281523", "tree": "94339e5366d371435532938ea3ab8c52bea58e67", "parents": [ "271e34dbd55c9ba6d67c6aa0e8912736cfcd312a", "204da8aa9e190f9409ec5dd56fd88e4c526b202a" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Tue Sep 20 23:49:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 20 23:49:13 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)\" into klp-dev\nam: 204da8aa9e\n\nChange-Id: I0ff3b20fc2f3318070e343dfe6dc29b2979284ef\n" }, { "commit": "271e34dbd55c9ba6d67c6aa0e8912736cfcd312a", "tree": "94339e5366d371435532938ea3ab8c52bea58e67", "parents": [ "a4c9bbefdf8259e419eacf011c6f05161babc442", "edae39d59aa2155c2d79cca991e163e2284cc355" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Tue Sep 20 23:49:05 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 20 23:49:05 2016 +0000" }, "message": "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)\nam: edae39d59a\n\nChange-Id: I2bdf5c6fc24fd370e2555585e8492558040c0d10\n" }, { "commit": "204da8aa9e190f9409ec5dd56fd88e4c526b202a", "tree": "c32fd60880ffa9cbeb2ac510f136c7b7116e7355", "parents": [ "d1e3e53d7912c16a5b3556d7898079ad7435563c", "edae39d59aa2155c2d79cca991e163e2284cc355" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 20 23:44:57 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 20 23:45:00 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)\" into klp-dev" }, { "commit": "1d053b3be8492ad5ca2344b1bf2c91a31b635230", "tree": "7d9302399e4862527684a99ae9a2f39779394b74", "parents": [ "ff9a8d74c7810c3105e30dbde8325e8f264920b4", "3fca892d3e3b1bab481c92c8ec5297591daf2f5c" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 19 23:24:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 23:24:48 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Fix deadlock in AcitivityManagerService.\" into klp-dev am: d1e3e53d79 am: a4c9bbefdf\nam: 3fca892d3e -s ours\n\nChange-Id: I4d66089c6ec8743f119dd4aab641b22ebdad7b5c\n" }, { "commit": "ff9a8d74c7810c3105e30dbde8325e8f264920b4", "tree": "7d9302399e4862527684a99ae9a2f39779394b74", "parents": [ "b358ee3558c657ae6ff32b60bbeef68bc03bb9cf", "c1b2e6db98e4be210555d23cb9de108055676182" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 19 21:50:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 21:50:49 2016 +0000" }, "message": "DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1\nam: c1b2e6db98 -s ours\n\nChange-Id: I006233ce7258467da7d5c09c9925bd6048d85ed3\n" }, { "commit": "3fca892d3e3b1bab481c92c8ec5297591daf2f5c", "tree": "0bf199c2c5d61401f22c2edb94ca70d91c6e2e13", "parents": [ "c1b2e6db98e4be210555d23cb9de108055676182", "a4c9bbefdf8259e419eacf011c6f05161babc442" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 19 21:50:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 21:50:47 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Fix deadlock in AcitivityManagerService.\" into klp-dev am: d1e3e53d79\nam: a4c9bbefdf\n\nChange-Id: I224c2cf56d53acf091a11372f82d1305052c6f18\n" }, { "commit": "c1b2e6db98e4be210555d23cb9de108055676182", "tree": "0bf199c2c5d61401f22c2edb94ca70d91c6e2e13", "parents": [ "963ca6f947112cf64f16a6298b8fd3b8d5e0c491", "a437e7f3f10a884c1320776c5a00a0da680c4fe2" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 19 21:02:53 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 21:02:53 2016 +0000" }, "message": "DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb\nam: a437e7f3f1\n\nChange-Id: I13fdcfc2ecca2e5e1d178d61ef8ec6990a0fc3af\n" }, { "commit": "a4c9bbefdf8259e419eacf011c6f05161babc442", "tree": "daeb7ac9807f5ebe04eb5f54aebb641a7a26709f", "parents": [ "a437e7f3f10a884c1320776c5a00a0da680c4fe2", "d1e3e53d7912c16a5b3556d7898079ad7435563c" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 19 20:16:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 20:16:17 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Fix deadlock in AcitivityManagerService.\" into klp-dev\nam: d1e3e53d79\n\nChange-Id: Id794cb9cd3792317d2786671f2f84a6ad8bbd404\n" }, { "commit": "a437e7f3f10a884c1320776c5a00a0da680c4fe2", "tree": "daeb7ac9807f5ebe04eb5f54aebb641a7a26709f", "parents": [ "7c08c4d5cc3528f545af72e05b804de5d49dbdbd", "dce4be63bb0842ec0d1f8865c46edadb0f7df148" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 19 20:16:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 20:16:13 2016 +0000" }, "message": "DO NOT MERGE: Fix deadlock in AcitivityManagerService.\nam: dce4be63bb\n\nChange-Id: Ia1db0d226d84ed07da6712f554327b49c9fe59c0\n" }, { "commit": "b358ee3558c657ae6ff32b60bbeef68bc03bb9cf", "tree": "7d9302399e4862527684a99ae9a2f39779394b74", "parents": [ "3532f10fcbfada040b21e0e3250f59990a0a43b3", "2d608378f4cb11f127bc68fa1f10282a25b54ab1" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 19 20:01:47 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 20:01:51 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Fix deadlock in AcitivityManagerService.\" into lmp-dev" }, { "commit": "d1e3e53d7912c16a5b3556d7898079ad7435563c", "tree": "e81c5b44e6fb79575b31ed0e95fdd769e0c8bc26", "parents": [ "96c045807b65f7a59966f21433397999fdb3de8b", "dce4be63bb0842ec0d1f8865c46edadb0f7df148" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Mon Sep 19 19:59:18 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 19:59:22 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Fix deadlock in AcitivityManagerService.\" into klp-dev" }, { "commit": "3532f10fcbfada040b21e0e3250f59990a0a43b3", "tree": "e29ad0242a1ef945929f246a4b9b431dc2f4368b", "parents": [ "66ee2296a9647d7f5764ce80af540ddcd801796a", "963ca6f947112cf64f16a6298b8fd3b8d5e0c491" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Mon Sep 19 11:34:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 11:34:00 2016 +0000" }, "message": "Merge \"Avoid crashing when downloading MitM\u0027d PAC that is too big\" into klp-dev am: 96c045807b am: 7c08c4d5cc\nam: 963ca6f947\n\nChange-Id: I1a509c39640e7f9d76bd2e420764aeb3d823a3df\n" }, { "commit": "66ee2296a9647d7f5764ce80af540ddcd801796a", "tree": "e29ad0242a1ef945929f246a4b9b431dc2f4368b", "parents": [ "2578264b861c596a49ade3dc8a966c44eeeb769a", "6634e90ad75b5deaa3436ee2a86f4f61de9a7cd4" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Mon Sep 19 11:31:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 11:31:54 2016 +0000" }, "message": "Avoid crashing when downloading MitM\u0027d PAC that is too big am: 7d2198b586 am: 9c1cb7a273\nam: 6634e90ad7\n\nChange-Id: Id46b32b80d47f6b7e2bfab2740978377a6b711cf\n" }, { "commit": "963ca6f947112cf64f16a6298b8fd3b8d5e0c491", "tree": "cedd7b6a33791e3737471ea27539f91b472a3f76", "parents": [ "6634e90ad75b5deaa3436ee2a86f4f61de9a7cd4", "7c08c4d5cc3528f545af72e05b804de5d49dbdbd" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Mon Sep 19 11:27:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 11:27:47 2016 +0000" }, "message": "Merge \"Avoid crashing when downloading MitM\u0027d PAC that is too big\" into klp-dev am: 96c045807b\nam: 7c08c4d5cc\n\nChange-Id: Idd0a3598ffac808a39703a23238b47a02bca66ed\n" }, { "commit": "6634e90ad75b5deaa3436ee2a86f4f61de9a7cd4", "tree": "cedd7b6a33791e3737471ea27539f91b472a3f76", "parents": [ "29f2e1d93abd7b78d95802572262954b4fb3c50b", "9c1cb7a27324c955685f47c8ceff2de7b904cbb7" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Mon Sep 19 11:25:21 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 11:25:21 2016 +0000" }, "message": "Avoid crashing when downloading MitM\u0027d PAC that is too big am: 7d2198b586\nam: 9c1cb7a273\n\nChange-Id: I8cd4b0d33da22bc29abd176672659c3eeb8c7d5b\n" }, { "commit": "7c08c4d5cc3528f545af72e05b804de5d49dbdbd", "tree": "1b983a9a8f6e6416cbcfda1d471ef8ee3a8e08c2", "parents": [ "9c1cb7a27324c955685f47c8ceff2de7b904cbb7", "96c045807b65f7a59966f21433397999fdb3de8b" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Mon Sep 19 11:19:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 11:19:16 2016 +0000" }, "message": "Merge \"Avoid crashing when downloading MitM\u0027d PAC that is too big\" into klp-dev\nam: 96c045807b\n\nChange-Id: Ia20ba679f7b0445567b43aa74eef27f751453d4e\n" }, { "commit": "9c1cb7a27324c955685f47c8ceff2de7b904cbb7", "tree": "1b983a9a8f6e6416cbcfda1d471ef8ee3a8e08c2", "parents": [ "57454cf15ee6b5db01ca9c91f8267957705bb4fc", "7d2198b586bcfbf96fb627021a0eb85d32829cc0" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Mon Sep 19 11:19:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 19 11:19:13 2016 +0000" }, "message": "Avoid crashing when downloading MitM\u0027d PAC that is too big\nam: 7d2198b586\n\nChange-Id: I512d6f9de6a92dd3cabec93bcadf437f5cf2e16d\n" } ], "next": "96c045807b65f7a59966f21433397999fdb3de8b" }