)]}' { "log": [ { "commit": "447ac4b31d6faa9e3411bb93be2dc3d31b5072df", "tree": "122c1934e5e89c6115238678540932769541b70a", "parents": [ "60bf672485456ad426c2c22457aa08399a349a1c", "85bc33a8f444d70ad7af0e80380692b09fa1c133" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 21 21:08:07 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 21 21:08:10 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed\" into lmp-mr1-dev" }, { "commit": "bb9b38b95706052c296b287a9697dfef9b7c56af", "tree": "693400525e20111b5b702f118956b69ab6662ced", "parents": [ "af97c8805f13caac4e54307032786e2d806999a3" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Thu Sep 08 11:01:29 2016 -0700" }, "committer": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Tue Sep 20 23:47:09 2016 +0000" }, "message": "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)\n\nsetPairingConfirmation was set to only require BLUETOOTH_ADMIN\npermission which shouldn\u0027t be able to set the confirmation itself.\n\nThis is restricted to BLUETOOTH_PRIVILEGED permission.\n\nBug: 29043989\nChange-Id: Iddc935f0b02f5ff56e930914b4b664377e786184\n" }, { "commit": "f6d7c1ed158e17ef3079ff9537d49aa2349e3301", "tree": "54e0375edf47ca24959d049bc569d326209fcd90", "parents": [ "9f37a8900e8ac69ffca0f3ebff4debf608033904", "15471944181f34184e6c6eaf6175ed115919545c" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Sep 16 21:48:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 16 21:48:24 2016 +0000" }, "message": "Use \"all_downloads\" instead of \"my_downloads\".\nam: 1547194418\n\nChange-Id: I6dabba1f82ef1989eb2a52c3c493127a174ff315\n" }, { "commit": "15471944181f34184e6c6eaf6175ed115919545c", "tree": "fe916c76f7a9e3b91836d48c8deee0f5ad79579c", "parents": [ "f495cf69443fa3ad5d2ca57b52ad4db386d8329d" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Sep 16 12:04:05 2016 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Sep 16 12:04:05 2016 -0600" }, "message": "Use \"all_downloads\" instead of \"my_downloads\".\n\nWe can no longer return the \"my_downloads\" paths: if those Uris were\nshared beyond the app that requested the download, access would be\ndenied. Instead, we need to switch to using \"all_downloads\" Uris so\nthat permission grants can be issued to third-party viewer apps.\n\nSince an app requesting a download doesn\u0027t normally have permission\nto \"all_downloads\" paths, DownloadProvider now issues narrow grants\ntoward the owner of each download, both at device boot and when new\ndownloads are started.\n\nBug: 30537115, 30945409\nChange-Id: I533125b36444877f54373d88922f2acc777e250b\n" }, { "commit": "85bc33a8f444d70ad7af0e80380692b09fa1c133", "tree": "f519152ccacf8ff439f1cd3dd6d21a39c492f99a", "parents": [ "9f37a8900e8ac69ffca0f3ebff4debf608033904" ], "author": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Thu Sep 08 13:23:02 2016 -0700" }, "committer": { "name": "Ajay Panicker", "email": "apanicke@google.com", "time": "Wed Sep 14 19:17:49 2016 +0000" }, "message": "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed\n\nBug: 28672558\nChange-Id: I4bc14bd7f098e34012c2ae1eeba2d439145901f0\n" }, { "commit": "f7b9f84f87a41149c5aa302bfc9ecdd4777fd394", "tree": "abcd3c13d0f4df8acdc51cd1d18f838641c05e12", "parents": [ "52d0f48f80fcbcded9a1502645e8c29d5cd88231", "7ec85f9d549971af59f047d5eafd7a829e1541c7" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Sep 07 18:53:40 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 07 18:53:40 2016 +0000" }, "message": "Backport changes to whitelist sockets opened by the zygote.\nam: 7ec85f9d54\n\nChange-Id: I6db56b5b06636201382f6d908297644183253c0b\n" }, { "commit": "7ec85f9d549971af59f047d5eafd7a829e1541c7", "tree": "897bb5ed4ef0a6bc8027ced6b8c7d34f6e37cd4d", "parents": [ "b31a6955a41218b50521ca024d2ee9a2ac05a092" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Aug 19 13:45:24 2016 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Sep 07 18:48:48 2016 +0100" }, "message": "Backport changes to whitelist sockets opened by the zygote.\n\nThis is the backport of the following commits :\n\nCommit c5f27a7cb2ec816f483a65255034a1b57a8aa22:\n-----------------------------------------------\n\nReopen whitelisted zygote file descriptors after a fork.\n\nWe don\u0027t want these descriptors to be shared post-fork, so we\u0027ll\nhave to close and reopen them when the zygote forks. The set of\nopen descriptors is checked against a whitelist and it is a fatal\nerror if a non whitelisted FD is opened. It is also a fatal error\nif anything other than a regular file / character device or socket\nis opened at the time of forking.\n\nThis work is done in two stages :\n- An initial list of FDs is constructed and cached prior to the\n first zygote fork.\n\n- On each subsequent fork, we check whether the list of open FDs\n has changed. We are currently tolerant of changes, but in the\n longer term, it should be a fatal error if the set of open file\n descriptors in the zygote changes.\n\n- Post fork, we traverse the list of open descriptors and reopen\n them if necessary.\n\nbug: 30963384\n\nCommit 3764a260f0c90dcb323caeda14baf903cc108759:\n-----------------------------------------------\n\nAdd a whitelist of sockets on fork.\n\nMaintain a whitelist of AF_UNIX sockets that are permitted\nto exist at the time of forking. If an open socket does not belong\nto the whitelist (or is not AF_UNIX), the process will abort. If an\nopen socket is whitelisted, it will be redirected to /dev/null after\na sucessful fork. This allows us to unify our handling of the special\nzygote sockets (/dev/socket/zygote[_secondary]) with the existing\nwhitelist of non socket file descriptors.\n\nThis change also removes non-fatal ALOGW messages since they have the\nside effect of reopening the logging socket.\n\nbug: 30963384\n\nCommit 0b76d6a28e6978151bf245a775329cdae5e574d5:\n-----------------------------------------------\nfd_utils: Fix broken usage of iterators.\n\nThere were two separate issues here :\n- RestatInternal was using an iterator after a call to erase(). This\n will not work because it will be invalidated.\n- The \"standard\" for loop idiom for iterating over a map while making\n structural changes to it is broken. Switch to a while loop and treat\n cases where elements are erased differently from cases where they\n aren\u0027t.\n\nbug: 31092930\nbug: 30963384\n\nPlus additional changes:\n-----------------------------------------------\n- change std::unordered_map to std::tr1::unordered_map.\n- add /dev/alarm and /dev/__properties__ to the whitelist.\n- map.erase(iterator) returns void prior to C++11, so need the kludge\n of calling erase(it++).\n\nChange-Id: I694ff66d5f227239b0190ffc2287882b16e336fa\n" }, { "commit": "1bd43c162ff9950be639729ded132d1262827e54", "tree": "0fcdbd071df4aa7fe86ba891d6c04a6354f0de6d", "parents": [ "62783bde301c2787cbf9518ee9df15b11187c035", "e29c6493c07acf1a0b706917e9af0c8d761c8ae9" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Aug 18 09:53:12 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 18 09:53:12 2016 +0000" }, "message": "Process: Fix communication with zygote.\nam: e29c6493c0\n\nChange-Id: I86b073f7f69943911aa0bea782e29ae6d86609a2\n" }, { "commit": "e29c6493c07acf1a0b706917e9af0c8d761c8ae9", "tree": "7359f4a3e934e2ce09d6480dadff9fc4758fc861", "parents": [ "655361b2b154949fe609623023932474291a3ee5" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Aug 09 17:00:25 2016 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Aug 16 16:17:29 2016 +0000" }, "message": "Process: Fix communication with zygote.\n\nDon\u0027t write partial requests, and don\u0027t return (or throw) early after\npartially reading a response.\n\nbug: 30143607\n\n(cherry-picked from commit 448be0a62209c977593d81617853a8a428d013df)\n\nChange-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1\n" }, { "commit": "f1d9152f9f07dda8d3a609438345ab9773608bff", "tree": "17a78c8b559459f16a17c396984aebd1d94bb55e", "parents": [ "863ac471cf363e75a6ba2c5451bad10aad629d9c", "3f12e8e2bf364e85004708604c1be1a967807eae" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Tue Jul 12 19:03:12 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jul 12 19:03:14 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev" }, { "commit": "3f12e8e2bf364e85004708604c1be1a967807eae", "tree": "92d62c097157afb7afc1b1b49d807b6a29ae07ce", "parents": [ "0e64d7411ec54e28883a1a3f66cca35f9bc71af1" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Wed Jun 08 17:13:24 2016 -0700" }, "committer": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Tue Jul 12 01:59:08 2016 +0000" }, "message": "DO NOT MERGE: Reduce shell power over user management.\n\nRemove MANAGE_USERS permission from shell and whitelist it for\nsome specific functionality.\n\nBug: 29189712\nChange-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3\n" }, { "commit": "863ac471cf363e75a6ba2c5451bad10aad629d9c", "tree": "bb5ad5cf9be4db9c7b7edd7e2a377dbdaa16e4e1", "parents": [ "7bd0eea999a73bae30e9cf83f15040025c4e4597" ], "author": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Thu Jun 30 15:59:55 2016 -0700" }, "committer": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Wed Jul 06 17:05:32 2016 -0700" }, "message": "DO NOT MERGE revert system api loadSafeLabel\n\nBug: 28557603\nChange-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5\n" }, { "commit": "0fffbcb158dafef27d515ec3139f49dc8eda702c", "tree": "dee3dd8486fed6759d0ef5e68d04f783168d2dd4", "parents": [ "b43fe6293368e215100ab8799931bfbe45c82918" ], "author": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Tue Jun 28 00:43:35 2016 -0700" }, "committer": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Tue Jun 28 00:43:35 2016 -0700" }, "message": "DO NOT MERGE revert public api loadSafeLabel\n\nBug: 28557603\nChange-Id: I61f4939864228fb50112502044da599b9cec2430\n" }, { "commit": "e64034a27d1fbf4f530f0321711f30b0a1c8487f", "tree": "f811cfab03bfe227a2f2f6a691eaaaa8f63fbfc5", "parents": [ "41821a26a51cd67046f1e8ae74f30b92f2f46d8b", "65f53e1445598972a6aa2ec6a3ff1ed3beffc176" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Tue Jun 21 22:03:08 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 21 22:03:09 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev" }, { "commit": "65f53e1445598972a6aa2ec6a3ff1ed3beffc176", "tree": "d356c82d530815c8345720d9165f90ef633cace4", "parents": [ "e1ca4cd074e48b861c543aa965b9b92fd9b125a9" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Wed Jun 08 17:13:24 2016 -0700" }, "committer": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Tue Jun 21 18:45:13 2016 +0000" }, "message": "DO NOT MERGE: Reduce shell power over user management.\n\nRemove MANAGE_USERS permission from shell and whitelist it for\nsome specific functionality.\n\nBug: 29189712\nChange-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3\n" }, { "commit": "cd777e95a77ba0035566088a5432aa28a409e7d1", "tree": "fff59d20e945cc1d9cada96cec8c502b7998e960", "parents": [ "0e64d7411ec54e28883a1a3f66cca35f9bc71af1", "c58054f25fb8ad624a749ed48e3f5775de4bec14" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Jun 16 22:21:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 16 22:21:37 2016 +0000" }, "message": "Don\\\u0027t trust callers to supply app info to bindBackupAgent()\nam: c58054f25f\n\nChange-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c\n" }, { "commit": "c58054f25fb8ad624a749ed48e3f5775de4bec14", "tree": "6c37f2a8d75ee754dd63238c3aaf35f14efd2e17", "parents": [ "e1ca4cd074e48b861c543aa965b9b92fd9b125a9" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Mon Jun 13 15:17:54 2016 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Jun 14 13:28:43 2016 -0700" }, "message": "Don\u0027t trust callers to supply app info to bindBackupAgent()\n\nGet the canonical identity and metadata about the package from the\nPackage Manager at time of usage rather than rely on the caller to\nhave gotten things right, even when the caller has the system uid.\n\nBug 28795098\n\nChange-Id: I215786bc894dedf7ca28e9c80cefabd0e40ca877\n" }, { "commit": "c196526f8e33b745b8d515df46b003ef44114135", "tree": "46af9436e05858f7d94a060e150d994da621991b", "parents": [ "42a59833648243a8ac3aec7adf7f4ca0d3babdd1", "2c53526b4b2d89d453ecf89548ed94427424d1ec" ], "author": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Tue Jun 07 18:57:12 2016 -0700" }, "committer": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Tue Jun 07 22:01:19 2016 -0700" }, "message": "resolve merge conflicts of 2c53526 to lmp-mr1-dev\n\nChange-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641\n" }, { "commit": "2c53526b4b2d89d453ecf89548ed94427424d1ec", "tree": "093ca468b973a3281fcc7b3d5ce924c8ab04586c", "parents": [ "6c35cf2434ca373196b16620455f8f234b63d594", "9a825b0fd50537f49057f7e1c9f91fc071c584c4" ], "author": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Tue Jun 07 23:23:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 07 23:23:10 2016 +0000" }, "message": "Backport loadSafeLabel changes am: be2865a60a am: 4c50846519\nam: 9a825b0fd5\n\nChange-Id: Ie3042058420fbd3018ae238dab4129de58ec69c8\n" }, { "commit": "9a825b0fd50537f49057f7e1c9f91fc071c584c4", "tree": "9462bc705d76380a2ba113d7a5c148fbd7dcb679", "parents": [ "bb2762614181a0ee03554a96c070ea1006d7263c", "4c508465190067dbf71583b5b2a2807229d512a8" ], "author": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Tue Jun 07 23:20:04 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 07 23:20:04 2016 +0000" }, "message": "Backport loadSafeLabel changes am: be2865a60a\nam: 4c50846519\n\nChange-Id: Ia31592def4d88a3a9e92a7e0c9126691c64a5fc4\n" }, { "commit": "4c508465190067dbf71583b5b2a2807229d512a8", "tree": "3ab0ebc68a92062b8e9ad6876b4b53a0398ed057", "parents": [ "8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac", "be2865a60a470c6248bdd7155f79d57239baa0f1" ], "author": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Tue Jun 07 23:13:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 07 23:13:08 2016 +0000" }, "message": "Backport loadSafeLabel changes\nam: be2865a60a\n\nChange-Id: Ifabe996449c534c5085245c4f07e2d865a23e126\n" }, { "commit": "be2865a60a470c6248bdd7155f79d57239baa0f1", "tree": "63e2b717af36df6e5a3821ff37dba9d4477e2950", "parents": [ "af0b4466ffe2ed09b288014d1d3a9ed308fe3c76" ], "author": { "name": "fionaxu", "email": "fionaxu@google.com", "time": "Thu Jun 02 18:49:01 2016 -0700" }, "committer": { "name": "Chen Xu", "email": "fionaxu@google.com", "time": "Tue Jun 07 22:51:28 2016 +0000" }, "message": "Backport loadSafeLabel changes\n\nBug:23531798\nBug:28557603\nChange-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172\n" }, { "commit": "42a59833648243a8ac3aec7adf7f4ca0d3babdd1", "tree": "0608a6cbba92c8f4bd314889ba810fe95b85c29b", "parents": [ "077534b1015762d445f505fc2f440beaa2ba974a", "6c35cf2434ca373196b16620455f8f234b63d594" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Thu May 26 14:01:19 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 26 14:01:19 2016 +0000" }, "message": "Merge \"Don\\\u0027t pass URL path and username/password to PAC scripts\" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141\nam: 6c35cf2434\n\n* commit \u00276c35cf2434ca373196b16620455f8f234b63d594\u0027:\n Don\u0027t pass URL path and username/password to PAC scripts\n\nChange-Id: I9bbca312129011822fc5ea95682bac5ca4258ced\n" }, { "commit": "6c35cf2434ca373196b16620455f8f234b63d594", "tree": "de2036ad4df97695a794b9f1c24c3303898a1b44", "parents": [ "647cb6a6d82e3bb22eca0e5a27810e99084e2d5b", "bb2762614181a0ee03554a96c070ea1006d7263c" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Thu May 26 13:44:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 26 13:44:37 2016 +0000" }, "message": "Merge \"Don\\\u0027t pass URL path and username/password to PAC scripts\" into klp-dev am: af0b4466ff am: 8940d2b0ff\nam: bb27626141\n\n* commit \u0027bb2762614181a0ee03554a96c070ea1006d7263c\u0027:\n Don\u0027t pass URL path and username/password to PAC scripts\n\nChange-Id: I9e4d3282765dec1554955b9f72484e9d7e2d6594\n" }, { "commit": "bb2762614181a0ee03554a96c070ea1006d7263c", "tree": "d321075b368e8115cfa6fa09b72b3517268609ec", "parents": [ "5527fd1323cc1d6470576386c8298f45c3895d75", "8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Thu May 26 13:37:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 26 13:37:24 2016 +0000" }, "message": "Merge \"Don\\\u0027t pass URL path and username/password to PAC scripts\" into klp-dev am: af0b4466ff\nam: 8940d2b0ff\n\n* commit \u00278940d2b0ff2fb5a9cc9e12be8a7959670e4390ac\u0027:\n Don\u0027t pass URL path and username/password to PAC scripts\n\nChange-Id: I03d6273d7ddaecac071ab3d1207d3d684e80159e\n" }, { "commit": "8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac", "tree": "d9668e3c8d1eea5bf802e139a6a7e45f68f231b4", "parents": [ "1b1fcbaab5169f824e803bcd97aa848e27dbcafb", "af0b4466ffe2ed09b288014d1d3a9ed308fe3c76" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Thu May 26 13:30:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu May 26 13:30:59 2016 +0000" }, "message": "Merge \"Don\\\u0027t pass URL path and username/password to PAC scripts\" into klp-dev\nam: af0b4466ff\n\n* commit \u0027af0b4466ffe2ed09b288014d1d3a9ed308fe3c76\u0027:\n Don\u0027t pass URL path and username/password to PAC scripts\n\nChange-Id: I8a49a29ed1999ab811d3306dc46769d83c05244e\n" }, { "commit": "08ec0e53b8ab0c3c6ab605c237fcc6df4cad2fcd", "tree": "4d68effcd3dfebf3f16f75d9f662afc237df4ef1", "parents": [ "60351d3be29977dfe0b422de797a0429edf500b7" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Fri Apr 15 10:41:13 2016 -0400" }, "committer": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Fri Apr 29 10:57:13 2016 +0000" }, "message": "Don\u0027t pass URL path and username/password to PAC scripts\n\nThe URL path could contain credentials that apps don\u0027t want exposed\nto a potentially malicious PAC script.\n\nBug: 27593919\nChange-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed\n" }, { "commit": "ca133845ef815d7cc1f036b1355130a8a867a98c", "tree": "d96d624716ad6253947a912cd9b54892eff4c93e", "parents": [ "58048c1f17d54166c6a048af2365d17dd32f4d57", "3dfc6d986f6142b1e0020c9970f626c7c435711e" ], "author": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Mon Apr 11 22:06:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 11 22:06:38 2016 +0000" }, "message": "DO NOT MERGE Fix intent filter priorities am: 60351d3\nam: 3dfc6d9\n\n* commit \u00273dfc6d986f6142b1e0020c9970f626c7c435711e\u0027:\n DO NOT MERGE Fix intent filter priorities\n\nChange-Id: Id396cca79db8f830a513746f387fb866c773c778\n" }, { "commit": "3dfc6d986f6142b1e0020c9970f626c7c435711e", "tree": "2528f9f811bd21992d3ff19d151c1f4d100784a8", "parents": [ "339c4f2b055d40acea280a2d4b6c83c17f86a8b5", "60351d3be29977dfe0b422de797a0429edf500b7" ], "author": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Mon Apr 11 22:00:27 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Apr 11 22:00:27 2016 +0000" }, "message": "DO NOT MERGE Fix intent filter priorities\nam: 60351d3\n\n* commit \u002760351d3be29977dfe0b422de797a0429edf500b7\u0027:\n DO NOT MERGE Fix intent filter priorities\n\nChange-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7\n" }, { "commit": "60351d3be29977dfe0b422de797a0429edf500b7", "tree": "74bfab941ff5aeb22c583a6d9c21895c68315fe7", "parents": [ "a962d9eba7a8f741ed149964126fb08fe4fd7128" ], "author": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Mon Apr 04 12:29:59 2016 -0700" }, "committer": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Thu Apr 07 16:40:18 2016 -0700" }, "message": "DO NOT MERGE Fix intent filter priorities\n\nSince this is a backport, there is only one rule that guards intent\nfilter priorities:\n1) Updates will NOT be granted a priority greater than the priority\n defined on the system image.\n\nNOTE: I had to bring in pieces of ag/526831 so intent filters could\nbe collected and matched\n\nBug: 27450489\nChange-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4\n" }, { "commit": "d6174e74020aaec97db5780837a3edcd787018bf", "tree": "e1989c2571b0a71e8f2058150f06bc689fc45391", "parents": [ "d385a6d95fc830ecc8d55937e9f46b14165d4b34" ], "author": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Mon Apr 04 12:29:59 2016 -0700" }, "committer": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Tue Apr 05 10:20:41 2016 -0700" }, "message": "DO NOT MERGE Fix intent filter priorities\n\nSince this is a backport, there is only one rule that guards intent\nfilter priorities:\n1) Updates will NOT be granted a priority greater than the priority\n defined on the system image.\n\nBug: 27450489\nChange-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4\n" }, { "commit": "5fc753acaf9731742957db256b2818376fe8c4a4", "tree": "4e6c0c2511462c0f9802c682b9795e5572dda715", "parents": [ "cc7c1d381249edfd906cb57afbd8589e6c345141", "06ef7dfdf0a3efb44326228c55309ec6df134376" ], "author": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Thu Jan 21 18:14:32 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 21 18:14:32 2016 +0000" }, "message": "DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93\nam: 06ef7dfdf0\n\n* commit \u002706ef7dfdf0a3efb44326228c55309ec6df134376\u0027:\n DO NOT MERGE Redact Account info from getCurrentSyncs\n" }, { "commit": "06ef7dfdf0a3efb44326228c55309ec6df134376", "tree": "36cad5c46755b9bb870827f83b0cf587309610fa", "parents": [ "294611faa8bd1bdbf75adc3cee835b69d348df86", "a5cafd2a93ce1c481328e2ce25c3bf2a19b81601" ], "author": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Thu Jan 21 18:07:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 21 18:07:55 2016 +0000" }, "message": "DO NOT MERGE Redact Account info from getCurrentSyncs\nam: a5cafd2a93\n\n* commit \u0027a5cafd2a93ce1c481328e2ce25c3bf2a19b81601\u0027:\n DO NOT MERGE Redact Account info from getCurrentSyncs\n" }, { "commit": "a5cafd2a93ce1c481328e2ce25c3bf2a19b81601", "tree": "06d8ca189b0f75b27f0a624cb47126c93e751161", "parents": [ "2f137b7705875ee026319abb8e512d918c118222" ], "author": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Tue Jan 19 23:04:04 2016 +0000" }, "committer": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Thu Jan 21 14:15:11 2016 +0000" }, "message": "DO NOT MERGE Redact Account info from getCurrentSyncs\n\nBUG:26094635\nIf the caller to ContentResolver#getCurrentSyncs does not hold the\nGET_ACCOUNTS permission, return a SyncInfo object that does not\ncontain any Account information.\n\nChange-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314\n(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)\n" }, { "commit": "0e7cd0a9fbdcb48c551d54627eb964364dd946d0", "tree": "c86df03cf78829e516b00f2732c2b2c18610632b", "parents": [ "4df8f4abe076d870b0e406efcd9c2d7cb6e4c81f", "1a0aed3257ad1b8216930928090885cf4210bd87" ], "author": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Wed Jan 20 11:37:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 20 11:37:17 2016 +0000" }, "message": "Redact Account info from getCurrentSyncs am: f39549e389\nam: 1a0aed3257\n\n* commit \u00271a0aed3257ad1b8216930928090885cf4210bd87\u0027:\n Redact Account info from getCurrentSyncs\n" }, { "commit": "1a0aed3257ad1b8216930928090885cf4210bd87", "tree": "b3f058b0807b6df975be337c6c1f31a3e1c14622", "parents": [ "8874f9754f909dafcc2c5c23109e35297263f469", "f39549e389edf62f43bacd95a1b8580d75ad77ed" ], "author": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Wed Jan 20 11:32:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 20 11:32:56 2016 +0000" }, "message": "Redact Account info from getCurrentSyncs\nam: f39549e389\n\n* commit \u0027f39549e389edf62f43bacd95a1b8580d75ad77ed\u0027:\n Redact Account info from getCurrentSyncs\n" }, { "commit": "f39549e389edf62f43bacd95a1b8580d75ad77ed", "tree": "bad1c5a02b1b3dfa6fab82a0e3878ac01a3ce5dc", "parents": [ "9887f2f50a41043e2105e306b48d2b04277cb128" ], "author": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Tue Jan 19 23:04:04 2016 +0000" }, "committer": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Wed Jan 20 00:02:58 2016 +0000" }, "message": "Redact Account info from getCurrentSyncs\n\nBUG:26094635\nIf the caller to ContentResolver#getCurrentSyncs does not hold the\nGET_ACCOUNTS permission, return a SyncInfo object that does not\ncontain any Account information.\n\nChange-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314\n(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)\n" }, { "commit": "8874f9754f909dafcc2c5c23109e35297263f469", "tree": "ab701b8bae5694a907375ef3c80b18ac0521c19b", "parents": [ "9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4" ], "author": { "name": "Geoff Mendal", "email": "mendal@google.com", "time": "Mon Jan 11 14:24:19 2016 +0000" }, "committer": { "name": "Geoff Mendal", "email": "mendal@google.com", "time": "Mon Jan 11 14:24:19 2016 +0000" }, "message": "Revert \"Import translations. DO NOT MERGE\"\n\nThis reverts commit 9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4.\n\nChange-Id: I7164f13dedd0713b948b4f6bcf4b54aa0bdcc0c8\n" }, { "commit": "9f9e736e0dc08f7fd84d3b557ee4ae8212c61be4", "tree": "7435d8d87ff5c66eb83b017d1646a08ce17737f4", "parents": [ "61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9" ], "author": { "name": "Geoff Mendal", "email": "mendal@google.com", "time": "Mon Jan 11 08:46:48 2016 -0500" }, "committer": { "name": "Geoff Mendal", "email": "mendal@google.com", "time": "Mon Jan 11 08:46:48 2016 -0500" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37\nAuto-generated-cl: translation import\n" }, { "commit": "4340e0677b691f2ab12549556c23b88e599cf8c1", "tree": "34e9b3f947b4916afb496631477f4ed3ce0fea50", "parents": [ "5946a9b798f9a4b0e9eacd2685fc5ec9d6cc9ed6", "61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Thu Jan 07 16:18:11 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 07 16:18:11 2016 +0000" }, "message": "Fix plurals variable to unblock Translations Pipeline.\nam: 61f9f31468\n\n* commit \u002761f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9\u0027:\n Fix plurals variable to unblock Translations Pipeline.\n" }, { "commit": "61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9", "tree": "ab701b8bae5694a907375ef3c80b18ac0521c19b", "parents": [ "5a77651489ace080671034a85e5771c6ddc73525" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Fri Jan 30 07:09:16 2015 -0800" }, "committer": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Wed Jan 06 18:54:41 2016 +0000" }, "message": "Fix plurals variable to unblock Translations Pipeline.\n\nBug: 19067882\n(cherry picked from commit 50d23adfe26bf0cf9a34138efc299eaec04127e9)\n\nChange-Id: I86022d6edab73dc4d11269783900710dc07a5b49\n" }, { "commit": "9887f2f50a41043e2105e306b48d2b04277cb128", "tree": "0d6d39a832bcb3bcf71529660e9e185f0e4f9ec6", "parents": [ "f1f45fe012ddbd516e797099994c400a1cac8581" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Dec 04 15:54:53 2015 -0800" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Dec 04 15:54:53 2015 -0800" }, "message": "Protect some new broadcasts.\n\nDEFAULT_*_SUBSCRIPTION_CHANGED broadcasts were added but not protected,\nallowing 3rd parties to potentially spoof the bcasts feeding misinformation\nto system listeners.\n\nbug:25778215\nChange-Id: Ie5fc68a7d2224ce3f6beeca91667fe9b7654f0d5\n" }, { "commit": "a0d20db02f0e6cfc06ec37cfc68ce626dd35858a", "tree": "11f2b881599200bb2c5e495dfc0c9aa8d18cb6d5", "parents": [ "410bea181b229adef7a2c1a9308379eead260706", "34b700a7c2355f1dbea4b8d796619033bdd87a0c" ], "author": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Fri Nov 13 01:50:11 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Nov 13 01:50:11 2015 +0000" }, "message": "Sync extras bundle comparison can throw NPE am: c0f39c1ece\nam: 34b700a7c2\n\n* commit \u002734b700a7c2355f1dbea4b8d796619033bdd87a0c\u0027:\n Sync extras bundle comparison can throw NPE\n" }, { "commit": "cc7c1d381249edfd906cb57afbd8589e6c345141", "tree": "c079d47e5f489f43bf278e5a2b40c810975b8a7d", "parents": [ "fe4cbf2b1b135b327018915a512a8e6293a96017", "294611faa8bd1bdbf75adc3cee835b69d348df86" ], "author": { "name": "Shreyas Basarge", "email": "snb@google.com", "time": "Fri Nov 13 01:50:02 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Nov 13 01:50:02 2015 +0000" }, "message": "Sync extras bundle comparison can throw NPE am: 2f137b7705\nam: 294611faa8\n\n* commit \u0027294611faa8bd1bdbf75adc3cee835b69d348df86\u0027:\n Sync extras bundle comparison can throw NPE\n" }, { "commit": "294611faa8bd1bdbf75adc3cee835b69d348df86", "tree": "bc1e58e67206c629cecd2cc3cc07fe6783a6a665", "parents": [ "cff4e09e26e3b976aa0273df78e89f592fc6d287", "2f137b7705875ee026319abb8e512d918c118222" ], "author": { "name": "Shreyas Basarge", "email": "snb@google.com", "time": "Fri Nov 13 01:41:59 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Nov 13 01:41:59 2015 +0000" }, "message": "Sync extras bundle comparison can throw NPE\nam: 2f137b7705\n\n* commit \u00272f137b7705875ee026319abb8e512d918c118222\u0027:\n Sync extras bundle comparison can throw NPE\n" }, { "commit": "34b700a7c2355f1dbea4b8d796619033bdd87a0c", "tree": "8f82a201a9c2f6a8f0875b60b2941b709b0e023e", "parents": [ "b1de85487af1726c3d9e80d78bd643f550d9f3a4", "c0f39c1ece72a05c796f7ba30b7a2b5b580d5025" ], "author": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Fri Nov 13 01:41:59 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Nov 13 01:41:59 2015 +0000" }, "message": "Sync extras bundle comparison can throw NPE\nam: c0f39c1ece\n\n* commit \u0027c0f39c1ece72a05c796f7ba30b7a2b5b580d5025\u0027:\n Sync extras bundle comparison can throw NPE\n" }, { "commit": "2f137b7705875ee026319abb8e512d918c118222", "tree": "dff8e88fd0f75d43371d782fd248df859eddf1bb", "parents": [ "bdf7f3583c637f370e97e74526df14b9c70e6493" ], "author": { "name": "Shreyas Basarge", "email": "snb@google.com", "time": "Thu Nov 12 15:32:44 2015 +0000" }, "committer": { "name": "Shreyas Basarge", "email": "snb@google.com", "time": "Thu Nov 12 15:32:44 2015 +0000" }, "message": "Sync extras bundle comparison can throw NPE\n\nBug: 23591205\nChange-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25\n" }, { "commit": "c0f39c1ece72a05c796f7ba30b7a2b5b580d5025", "tree": "e5f7c651a41edbae12213d2b0097713c63aa393d", "parents": [ "1044e162c3dc4169b79112fc1a2de14757bca8c3" ], "author": { "name": "Matthew Williams", "email": "mjwilliams@google.com", "time": "Fri Oct 16 12:01:31 2015 -0700" }, "committer": { "name": "Shreyas Basarge", "email": "snb@google.com", "time": "Wed Nov 11 14:34:04 2015 +0000" }, "message": "Sync extras bundle comparison can throw NPE\n\nBUG: 23591205\nChange-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c\n(cherry picked from commit 9ad2c8403354a985258c098681067e74b9e2f638)\n" }, { "commit": "773d71e7c45d12810267bb24735360da6e5b258d", "tree": "f2e71b2ab0b42a40a818ede1a29d176e1ef831b8", "parents": [ "96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6", "962c3a0f2dd46d55ea591671c0a90c1c40214af7" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Wed Sep 23 11:13:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 23 11:13:48 2015 +0000" }, "message": "am 962c3a0f: am ece4ac21: Merge \"Don\\\u0027t mark NetworkRequests restricted when they don\\\u0027t have restricted caps\" into lmp-dev\n\n* commit \u0027962c3a0f2dd46d55ea591671c0a90c1c40214af7\u0027:\n Don\u0027t mark NetworkRequests restricted when they don\u0027t have restricted caps\n" }, { "commit": "96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6", "tree": "b26385559fdf9c69aca9b54d192d3377cf45106a", "parents": [ "f8cda08986a5caa14daace69e24c82224ac5a9fc", "635f871132449bea7489f6a61276979beeee5591" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Wed Sep 23 11:13:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 23 11:13:40 2015 +0000" }, "message": "am 635f8711: am a9e98343: Merge \"Fix NOT_RESTRICTED network capability and enforce it.\" into lmp-dev\n\n* commit \u0027635f871132449bea7489f6a61276979beeee5591\u0027:\n Fix NOT_RESTRICTED network capability and enforce it.\n" }, { "commit": "962c3a0f2dd46d55ea591671c0a90c1c40214af7", "tree": "d3cc2387fe48bbe06207c92f74473b4d98b99669", "parents": [ "635f871132449bea7489f6a61276979beeee5591", "ece4ac2105d18d8d7b6296d6de3fdd5641c35258" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Wed Sep 23 11:06:32 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 23 11:06:32 2015 +0000" }, "message": "am ece4ac21: Merge \"Don\\\u0027t mark NetworkRequests restricted when they don\\\u0027t have restricted caps\" into lmp-dev\n\n* commit \u0027ece4ac2105d18d8d7b6296d6de3fdd5641c35258\u0027:\n Don\u0027t mark NetworkRequests restricted when they don\u0027t have restricted caps\n" }, { "commit": "635f871132449bea7489f6a61276979beeee5591", "tree": "0dd253616d8b8b48394991f89f7dd0791b811963", "parents": [ "b2b3cecbd3de80d40f8c207c6aa94532c3426829", "a9e98343146244b71e236d82c95a8d0fa30a41c1" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Wed Sep 23 11:06:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 23 11:06:27 2015 +0000" }, "message": "am a9e98343: Merge \"Fix NOT_RESTRICTED network capability and enforce it.\" into lmp-dev\n\n* commit \u0027a9e98343146244b71e236d82c95a8d0fa30a41c1\u0027:\n Fix NOT_RESTRICTED network capability and enforce it.\n" }, { "commit": "ece4ac2105d18d8d7b6296d6de3fdd5641c35258", "tree": "5830f7b964f49bede7a5fc1b78d58e728827b046", "parents": [ "a9e98343146244b71e236d82c95a8d0fa30a41c1", "2b6af396ad14def9a967f62cccc87ee715823bb1" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Wed Sep 23 10:59:31 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 23 10:59:31 2015 +0000" }, "message": "Merge \"Don\u0027t mark NetworkRequests restricted when they don\u0027t have restricted caps\" into lmp-dev" }, { "commit": "a9e98343146244b71e236d82c95a8d0fa30a41c1", "tree": "379be282322e31fbaa50bb47c58354063925c2c2", "parents": [ "7b5bf993e4cc9f333a9adb3a00672c668a0f3fdb", "a12044215b1148826ea9a88d5d1102378b13922f" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Wed Sep 23 10:58:57 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 23 10:58:57 2015 +0000" }, "message": "Merge \"Fix NOT_RESTRICTED network capability and enforce it.\" into lmp-dev" }, { "commit": "e54c195a53694696e0913722fa721c882e33753e", "tree": "313b7a1810e1adf514b0b1116d95bedb5c986b61", "parents": [ "683cd049f7c762251567a0e0386ee49bb1428351", "0a8197b1e43bc3771fc3f8595619603ec8f6f641" ], "author": { "name": "Zach Jang", "email": "zachjang@google.com", "time": "Mon Sep 21 18:58:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 21 18:58:18 2015 +0000" }, "message": "am 0a8197b1: am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings\n\n* commit \u00270a8197b1e43bc3771fc3f8595619603ec8f6f641\u0027:\n DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings\n" }, { "commit": "fe4cbf2b1b135b327018915a512a8e6293a96017", "tree": "71d0da5780a4a5771f162e59359fe2f524ba5d07", "parents": [ "55f86b1811f0411a5d685d6c97772b846a706e19", "cff4e09e26e3b976aa0273df78e89f592fc6d287" ], "author": { "name": "Zach Jang", "email": "zachjang@google.com", "time": "Thu Sep 17 20:24:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 17 20:24:00 2015 +0000" }, "message": "am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings\n\n* commit \u0027cff4e09e26e3b976aa0273df78e89f592fc6d287\u0027:\n DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings\n" }, { "commit": "cff4e09e26e3b976aa0273df78e89f592fc6d287", "tree": "945212fdb0c32bb4b840b8aa0232e81fda4a6503", "parents": [ "9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1", "bdf7f3583c637f370e97e74526df14b9c70e6493" ], "author": { "name": "Zach Jang", "email": "zachjang@google.com", "time": "Thu Sep 17 20:09:55 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 17 20:09:55 2015 +0000" }, "message": "am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings\n\n* commit \u0027bdf7f3583c637f370e97e74526df14b9c70e6493\u0027:\n DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings\n" }, { "commit": "0a8197b1e43bc3771fc3f8595619603ec8f6f641", "tree": "98c95802cfa0eae5ae90ceb0e04abfb3ce862788", "parents": [ "521def98c0f4eaac898a345c6d4d97e1512ce267", "1cf21e443aaf207b962f50169be28c0babe71f61" ], "author": { "name": "Zach Jang", "email": "zachjang@google.com", "time": "Thu Sep 17 20:04:23 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 17 20:04:23 2015 +0000" }, "message": "am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings\n\n* commit \u00271cf21e443aaf207b962f50169be28c0babe71f61\u0027:\n DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings\n" }, { "commit": "1cf21e443aaf207b962f50169be28c0babe71f61", "tree": "d516248df4f70b6208cee8ea588df43d2bbbb065", "parents": [ "4c330c6ae53df48f6486b6f047021b204fc66594" ], "author": { "name": "Zach Jang", "email": "zachjang@google.com", "time": "Fri Sep 11 16:35:04 2015 -0700" }, "committer": { "name": "Zach Jang", "email": "zachjang@google.com", "time": "Thu Sep 17 01:20:27 2015 +0000" }, "message": "DO NOT MERGE - Backport of ag/748165 to klp-dev\nSecurity patch level in Settings\n\nb/23946860\n\nChange-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d\n" }, { "commit": "bdf7f3583c637f370e97e74526df14b9c70e6493", "tree": "ff9c05f3eec40d9fb0bde2341df209ff9d171bb4", "parents": [ "18089ceb71ad4ce2332096b8e7b5f8c1f8e263db" ], "author": { "name": "Zach Jang", "email": "zachjang@google.com", "time": "Fri Sep 11 16:35:04 2015 -0700" }, "committer": { "name": "Zach Jang", "email": "zachjang@google.com", "time": "Thu Sep 17 01:17:58 2015 +0000" }, "message": "DO NOT MERGE - Backport of ag/748165 to klp-dev\nSecurity patch level in Settings\n\nb/23946860\n\nChange-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d\n" }, { "commit": "2b6af396ad14def9a967f62cccc87ee715823bb1", "tree": "27fe7fb1ba9bc767ba4d898bd74d5fcb498e3515", "parents": [ "a12044215b1148826ea9a88d5d1102378b13922f" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Fri Aug 28 12:00:15 2015 -0400" }, "committer": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Fri Aug 28 12:50:09 2015 -0400" }, "message": "Don\u0027t mark NetworkRequests restricted when they don\u0027t have restricted caps\n\nRequests without NET_CAPABILITIES_INTERNET and just the default network\ncapabilities should not be marked restricted. Without this fix apps\ncan hit permissions exceptions if they inadvertently make requests\nwithout NET_CAPABILITIES_INTERNET.\n\nBug:23164917\nChange-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6\n(cherry picked from commit aae613d96134245af7c55976731a49fa59e77470)\n" }, { "commit": "a12044215b1148826ea9a88d5d1102378b13922f", "tree": "99b57c6f198d9b13411d024c40886fa0aed38b08", "parents": [ "50af68e74a756d0fc81eda2a3580dbcf70362d42" ], "author": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Fri Aug 28 11:58:50 2015 -0400" }, "committer": { "name": "Paul Jensen", "email": "pauljensen@google.com", "time": "Fri Aug 28 12:48:11 2015 -0400" }, "message": "Fix NOT_RESTRICTED network capability and enforce it.\n\nWith this change:\n1. NOT_RESTRICTED should be removed from NetworkRequests that bring up\n special restricted carrier networks (e.g. IMS, FOTA).\n2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL\n permission to register\n3. Binding sockets to networks without NOT_RESTRICTED requires\n CONNECTIVITY_INTERNAL permission\n\nBug:21637535\nChange-Id: I5991d39facaa6b690e969fe15dcbeec52e918321\n(cherry picked from commit 487ffe7d3d84bf65212158f7098e8a84b5b55e09)\n" }, { "commit": "55f86b1811f0411a5d685d6c97772b846a706e19", "tree": "40982262cc95ac55d7dca254a1ff2bceea0ce183", "parents": [ "f3dbb57ee8fce4b7c2cad352ebe5096a880ae06b", "9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1" ], "author": { "name": "Sebastien Hertz", "email": "shertz@google.com", "time": "Fri Aug 21 10:09:22 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 21 10:09:22 2015 +0000" }, "message": "am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE\n\n* commit \u00279e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1\u0027:\n Allow debugging only for apps forked from zygote DO NOT MERGE\n" }, { "commit": "9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1", "tree": "06e1e179caa608d55ef64760895ce89acdc8d5f9", "parents": [ "c215b2b24575e6d7693f396c7fdfe675d5ea9d1c", "18089ceb71ad4ce2332096b8e7b5f8c1f8e263db" ], "author": { "name": "Sebastien Hertz", "email": "shertz@google.com", "time": "Fri Aug 21 09:50:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 21 09:50:24 2015 +0000" }, "message": "am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE\n\n* commit \u002718089ceb71ad4ce2332096b8e7b5f8c1f8e263db\u0027:\n Allow debugging only for apps forked from zygote DO NOT MERGE\n" }, { "commit": "87a786afdba8ec94036c62fb58265d364a7064ae", "tree": "f871b4bbcf30b1e8c9fa35e68df16cbda524e4f4", "parents": [ "50ed152ab646b00714947a9cf75e01e618b16c02", "445ab7fa43f32ac1a256b15f5ab2bd619e9711e4" ], "author": { "name": "Sebastien Hertz", "email": "shertz@google.com", "time": "Fri Aug 21 07:08:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 21 07:08:43 2015 +0000" }, "message": "am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote\n\n* commit \u0027445ab7fa43f32ac1a256b15f5ab2bd619e9711e4\u0027:\n Allow debugging only for apps forked from zygote\n" }, { "commit": "445ab7fa43f32ac1a256b15f5ab2bd619e9711e4", "tree": "754a3962c08f532c0408b1e99ef253b0bdde608f", "parents": [ "7f63ef380ff8c95ea43edd832a7b986ad362e7cf", "ff8dc21278b19b22ed8dc9f9475850838336d351" ], "author": { "name": "Sebastien Hertz", "email": "shertz@google.com", "time": "Fri Aug 21 07:01:02 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 21 07:01:02 2015 +0000" }, "message": "am ff8dc212: Allow debugging only for apps forked from zygote\n\n* commit \u0027ff8dc21278b19b22ed8dc9f9475850838336d351\u0027:\n Allow debugging only for apps forked from zygote\n" }, { "commit": "18089ceb71ad4ce2332096b8e7b5f8c1f8e263db", "tree": "6979f7298c495643c0d681ab7fa9d1f2edd18793", "parents": [ "dc9cfca80139714ca37122148d041beedbf0ceb2" ], "author": { "name": "Sebastien Hertz", "email": "shertz@google.com", "time": "Mon Aug 10 18:55:34 2015 +0200" }, "committer": { "name": "Sebastien Hertz", "email": "shertz@google.com", "time": "Wed Aug 19 17:12:34 2015 +0200" }, "message": "Allow debugging only for apps forked from zygote DO NOT MERGE\n\nWhen starting the runtime from app_process, we only pass JDWP options\nif starting zygote. It prevents from opening a JDWP connection in\nnon-zygote programs while Android apps (forked from zygote) remain\ndebuggable.\n\nBug: 23050463\n\n(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)\n\nChange-Id: I2400ecc8aea7579c43300efccf288b69f70eef53\n" }, { "commit": "ff8dc21278b19b22ed8dc9f9475850838336d351", "tree": "7af9449525e2c57ea0100070280c31237fcfd895", "parents": [ "9b6a60991453136819a6feeca404e1102e78f735" ], "author": { "name": "Sebastien Hertz", "email": "shertz@google.com", "time": "Mon Aug 10 18:55:34 2015 +0200" }, "committer": { "name": "Sebastien Hertz", "email": "shertz@google.com", "time": "Wed Aug 19 11:25:56 2015 +0200" }, "message": "Allow debugging only for apps forked from zygote\n\nWhen starting the runtime from app_process, we only pass JDWP options\nif starting zygote. It prevents from opening a JDWP connection in\nnon-zygote programs while Android apps (forked from zygote) remain\ndebuggable.\n\nBug: 23050463\n\n(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)\n\nChange-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19\n" }, { "commit": "23444e76d2480d2537c2b6418f0c6c89c8cdb590", "tree": "ae8bca4e1ec33c1ab0333aeed849548d32341659", "parents": [ "765255b41229553842da855b8e5d9dfa87cf8e2b", "eee86342713a7c89c30933a22f8b7e190d3af10f" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Fri Jun 26 22:31:49 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 26 22:31:49 2015 +0000" }, "message": "am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.\n\n* commit \u0027eee86342713a7c89c30933a22f8b7e190d3af10f\u0027:\n DO NOT MERGE Change to add STK_PERMISSION for stk related commands.\n" }, { "commit": "eee86342713a7c89c30933a22f8b7e190d3af10f", "tree": "1fab99323bf0236b855cd514f24fcdbbcd908987", "parents": [ "7496e153f4308b39df9c53615770f44f593c3504", "9edf7ad563ead119698ac3106b699515bd160ffe" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Fri Jun 26 22:14:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 26 22:14:24 2015 +0000" }, "message": "am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.\n\n* commit \u00279edf7ad563ead119698ac3106b699515bd160ffe\u0027:\n DO NOT MERGE Change to add STK_PERMISSION for stk related commands.\n" }, { "commit": "853c61788387c38c1103f26b1c8c028da5676776", "tree": "acd63d7e6b94c3a34298d16ec248aa0e9d3230e0", "parents": [ "48b38452b0454a1398d01a5df9fe949e2febdeef", "791dd2c67466d2d9dafe58b1258e7718e3f30bc0" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Fri Jun 26 22:03:46 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 26 22:03:46 2015 +0000" }, "message": "am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.\n\n* commit \u0027791dd2c67466d2d9dafe58b1258e7718e3f30bc0\u0027:\n DO NOT MERGE Change to add STK_PERMISSION for stk related commands.\n" }, { "commit": "791dd2c67466d2d9dafe58b1258e7718e3f30bc0", "tree": "cbb9944990c1f6f6b65474c6d1cae2dc63df14d0", "parents": [ "a6932472d976c63a6b3970aac3607c4fe3a790b9" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Wed Jun 10 17:02:39 2015 -0700" }, "committer": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Fri Jun 26 17:33:37 2015 +0000" }, "message": "DO NOT MERGE Change to add STK_PERMISSION for stk related commands.\n\nBug: 21697171\nChange-Id: I7649c7341428194963ac74e9ae622dfa76ea738b\n" }, { "commit": "9edf7ad563ead119698ac3106b699515bd160ffe", "tree": "f4c03f9818f31254c29fd9614d73c797676676f4", "parents": [ "0d2081734ce124191ac1f3e8585336daa414abbe" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Wed Jun 10 17:02:39 2015 -0700" }, "committer": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Fri Jun 26 17:33:32 2015 +0000" }, "message": "DO NOT MERGE Change to add STK_PERMISSION for stk related commands.\n\nBug: 21697171\nChange-Id: I7649c7341428194963ac74e9ae622dfa76ea738b\n" }, { "commit": "90224355cd6bd54fa7a9ec30c1cecc573104a3e3", "tree": "1e7787b4535282b6a6c10f4982957557cd22ff05", "parents": [ "5e50e00c663a5d0b11d1f41509e1fb4e56d166f1" ], "author": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Wed Jun 10 17:02:39 2015 -0700" }, "committer": { "name": "Amit Mahajan", "email": "amitmahajan@google.com", "time": "Fri Jun 26 17:33:27 2015 +0000" }, "message": "DO NOT MERGE Change to add STK_PERMISSION for stk related commands.\n\nBug: 21697171\nChange-Id: I7649c7341428194963ac74e9ae622dfa76ea738b\n" }, { "commit": "6b16398dd148b38da19a8d5d7f5598fa44fbe7ac", "tree": "51c0ae610810b567fb639b96053327c718bd4478", "parents": [ "07264d936d4039057277151641e66671c33ed1af", "604ae32bcc6791da813a8e594783b695131bf888" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed Jun 10 15:51:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 10 15:51:38 2015 +0000" }, "message": "am 604ae32b: am 4dae8e41: Merge \"DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\" into lmp-dev\n\n* commit \u0027604ae32bcc6791da813a8e594783b695131bf888\u0027:\n DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\n" }, { "commit": "5b751c80070a6c790fd386808be2a4258e37e69a", "tree": "5e5392eb48eab7aeb9d3a9ff5c4f437c8d54d86b", "parents": [ "425d7c8713679ce9799139f7f91c6a45caa3b486", "7496e153f4308b39df9c53615770f44f593c3504" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Jun 02 13:12:12 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 02 13:12:12 2015 +0000" }, "message": "am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\n\n* commit \u00277496e153f4308b39df9c53615770f44f593c3504\u0027:\n DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\n" }, { "commit": "604ae32bcc6791da813a8e594783b695131bf888", "tree": "63b61810cc99474e551f178f5e8b72125460a95d", "parents": [ "18fb1c92d8c6ac732b85d7dee02a75591aec154b", "4dae8e41b530672030731ec7cb69369da645cf30" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Jun 02 13:01:13 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 02 13:01:13 2015 +0000" }, "message": "am 4dae8e41: Merge \"DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\" into lmp-dev\n\n* commit \u00274dae8e41b530672030731ec7cb69369da645cf30\u0027:\n DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\n" }, { "commit": "7496e153f4308b39df9c53615770f44f593c3504", "tree": "4c9cd3d4eac05c6507d4a818888a3e585011173a", "parents": [ "11297581667128d2568a47ee03acab5c4f9f2784", "0d2081734ce124191ac1f3e8585336daa414abbe" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Jun 02 12:59:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 02 12:59:29 2015 +0000" }, "message": "am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\n\n* commit \u00270d2081734ce124191ac1f3e8585336daa414abbe\u0027:\n DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\n" }, { "commit": "4dae8e41b530672030731ec7cb69369da645cf30", "tree": "f413807969f1659942837ffdb255d0be00de5e41", "parents": [ "bf0652eeea280bb1d687fe2fc3e869e0f6e9a541", "6549eed89e50ceafdb88646339288f820711d840" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Jun 02 12:48:41 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 02 12:48:43 2015 +0000" }, "message": "Merge \"DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\" into lmp-dev" }, { "commit": "18fb1c92d8c6ac732b85d7dee02a75591aec154b", "tree": "95e748af458e7213687c6f9df00041030f96676a", "parents": [ "3d3e3bb445dbd1775cdcab0ac19563400ac2d60a", "bf0652eeea280bb1d687fe2fc3e869e0f6e9a541" ], "author": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Mon Jun 01 23:02:37 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 01 23:02:37 2015 +0000" }, "message": "am bf0652ee: DO NOT MERGE Don\\\u0027t take flags when creating app widget config activity.\n\n* commit \u0027bf0652eeea280bb1d687fe2fc3e869e0f6e9a541\u0027:\n DO NOT MERGE Don\u0027t take flags when creating app widget config activity.\n" }, { "commit": "bf0652eeea280bb1d687fe2fc3e869e0f6e9a541", "tree": "ba00ec4594747bb65da1e248228de42f1606864d", "parents": [ "c7a558fe73631e438061c31a54861594f0eb024f" ], "author": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Mon Jun 01 12:55:35 2015 -0700" }, "committer": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Mon Jun 01 12:55:38 2015 -0700" }, "message": "DO NOT MERGE Don\u0027t take flags when creating app widget config activity.\n\nbug:19618745\n\nChange-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722\n" }, { "commit": "6549eed89e50ceafdb88646339288f820711d840", "tree": "cd9d76dacf14a153dd1794870c5ba751a9dc2a1f", "parents": [ "c7a558fe73631e438061c31a54861594f0eb024f" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Fri May 29 16:13:11 2015 -0400" }, "committer": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Fri May 29 20:14:58 2015 +0000" }, "message": "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\n\nbug: 20883006\nChange-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce\n" }, { "commit": "0d2081734ce124191ac1f3e8585336daa414abbe", "tree": "c1e5a8d8e580f13ef17ae95f7cce181720b56fe9", "parents": [ "18d7926709451b9e767731f46778e4238fc8e3b5" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Fri May 29 16:13:11 2015 -0400" }, "committer": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Fri May 29 16:13:11 2015 -0400" }, "message": "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes\n\nbug: 20883006\nChange-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce\n" }, { "commit": "b6e3f930c182ed254e7de3b3e5d22bc7323227f2", "tree": "e1c438e7cc64235adb0480e3e63be729daa7102c", "parents": [ "02f3cf79989b202a45753ad74653d48f7d73c73d", "2bbcc253254a497b8f9bb86712fb6f0f2548e9f2" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed May 27 17:18:47 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 27 17:18:47 2015 +0000" }, "message": "am 2bbcc253: am b36ace74: Merge \"Check that the parcel contained the expected amount of region data. DO NOT MERGE\" into lmp-dev\n\n* commit \u00272bbcc253254a497b8f9bb86712fb6f0f2548e9f2\u0027:\n Check that the parcel contained the expected amount of region data. DO NOT MERGE\n" }, { "commit": "425d7c8713679ce9799139f7f91c6a45caa3b486", "tree": "769340c125aac5a1882814dbc9cde2c0e6740c66", "parents": [ "ee35410ff8297b1ab39f3e546ebcedc27300a7de", "11297581667128d2568a47ee03acab5c4f9f2784" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed May 27 14:53:00 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 27 14:53:00 2015 +0000" }, "message": "am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE\n\n* commit \u002711297581667128d2568a47ee03acab5c4f9f2784\u0027:\n Check that the parcel contained the expected amount of region data. DO NOT MERGE\n" }, { "commit": "2bbcc253254a497b8f9bb86712fb6f0f2548e9f2", "tree": "052483d4f606fb5dda43b938a5f51d2ae15d926f", "parents": [ "523a19bf3df202c58369279fc4e538e9e342c1e7", "b36ace7401c0e198ceddd2fdb908346b7bb5928f" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed May 27 14:39:21 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 27 14:39:21 2015 +0000" }, "message": "am b36ace74: Merge \"Check that the parcel contained the expected amount of region data. DO NOT MERGE\" into lmp-dev\n\n* commit \u0027b36ace7401c0e198ceddd2fdb908346b7bb5928f\u0027:\n Check that the parcel contained the expected amount of region data. DO NOT MERGE\n" }, { "commit": "11297581667128d2568a47ee03acab5c4f9f2784", "tree": "66dd9ca9b60ce71c563553af5480e4b73171e8d0", "parents": [ "a7501119e341626536ce12c3539c2f9a986a2945", "18d7926709451b9e767731f46778e4238fc8e3b5" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed May 27 14:37:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 27 14:37:18 2015 +0000" }, "message": "am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE\n\n* commit \u002718d7926709451b9e767731f46778e4238fc8e3b5\u0027:\n Check that the parcel contained the expected amount of region data. DO NOT MERGE\n" }, { "commit": "5cfd16201fbcb4a095071058263682f7b4ab77a5", "tree": "5edb60594a3faff7d36064052a76b2ca9e371800", "parents": [ "ea2dcda788e035ccdc55ab16303c9e34740a3f8c" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue May 26 16:41:09 2015 -0400" }, "committer": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Tue May 26 21:09:24 2015 +0000" }, "message": "Check that the parcel contained the expected amount of region data. DO NOT MERGE\n\nbug:20883006\nChange-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b\n" }, { "commit": "18d7926709451b9e767731f46778e4238fc8e3b5", "tree": "3e1f6fb009aa138f9c3d39eea57d6d447126b7b5", "parents": [ "69b8e962e1b8346b33a2c14889547a0ac00c8b17" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue May 26 16:41:09 2015 -0400" }, "committer": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue May 26 17:05:22 2015 -0400" }, "message": "Check that the parcel contained the expected amount of region data. DO NOT MERGE\n\nbug:20883006\nChange-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b\n" }, { "commit": "862540cdb11a7128ae1fd670136f398645b4af7b", "tree": "fcfab92bcdf13034fff58f377ed68e29e028822d", "parents": [ "69355eaa1c1f4bfc961d5dd9fdb0f3817d36d5f0", "25607a6642d7c8bb134c7576e11bd79b5c4d233d" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu May 14 00:40:44 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 14 00:40:45 2015 +0000" }, "message": "Merge \"Revert \"DO NOT MERGE Backport of limited jank-tracking metrics\"\" into lmp-mr1-dev" }, { "commit": "25607a6642d7c8bb134c7576e11bd79b5c4d233d", "tree": "2db1447e729696a3d9da7664ca4d3dc79b9539b5", "parents": [ "2614bd225f84f7a23e6b30fc6b47bede153e5f4c" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Wed May 13 21:42:28 2015 +0000" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Wed May 13 21:42:28 2015 +0000" }, "message": "Revert \"DO NOT MERGE Backport of limited jank-tracking metrics\"\n\nThis reverts commit 2614bd225f84f7a23e6b30fc6b47bede153e5f4c.\n\nChange-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8\n" }, { "commit": "69355eaa1c1f4bfc961d5dd9fdb0f3817d36d5f0", "tree": "31b4116f5258ee5ec34836041f4c9044bf56fde9", "parents": [ "afd883f8a3ee260a5505f83d628c0b789871c837", "2614bd225f84f7a23e6b30fc6b47bede153e5f4c" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Wed May 13 21:42:08 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 13 21:42:13 2015 +0000" }, "message": "Merge \"DO NOT MERGE Backport of limited jank-tracking metrics\" into lmp-mr1-dev" }, { "commit": "38cf068c04e1ce244529b95f6cc6d7d6a88fab24", "tree": "2ec4181e373c36426542590a83d3c2d3426ee85c", "parents": [ "44fa5e71ab709c83af387958598f551583d6dbb0", "16ac8ad7fac73524b5296f955884bd2aec405ded" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Fri Apr 24 17:15:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 24 17:15:43 2015 +0000" }, "message": "am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n\n* commit \u002716ac8ad7fac73524b5296f955884bd2aec405ded\u0027:\n Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n" }, { "commit": "ee35410ff8297b1ab39f3e546ebcedc27300a7de", "tree": "797bfb0251af9ca98fe616f7ad369ec1c189e5d6", "parents": [ "5c9d0de174caf151937f19aa6898f60bce3fb4f4", "a7501119e341626536ce12c3539c2f9a986a2945" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Thu Apr 23 16:20:02 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 23 16:20:02 2015 +0000" }, "message": "am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n\n* commit \u0027a7501119e341626536ce12c3539c2f9a986a2945\u0027:\n Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n" }, { "commit": "16ac8ad7fac73524b5296f955884bd2aec405ded", "tree": "9e249b41c6fe8be388a7388d3ab71ed08f063117", "parents": [ "17bb697b3bce1b23137553829dd62e0e7c16b472", "4a6ca6724c789603626d74a8cc187365788a6cfd" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Thu Apr 23 15:53:24 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 23 15:53:24 2015 +0000" }, "message": "am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n\n* commit \u00274a6ca6724c789603626d74a8cc187365788a6cfd\u0027:\n Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n" }, { "commit": "a7501119e341626536ce12c3539c2f9a986a2945", "tree": "1765d6a6dadeb53968993f687eb66a91274a386f", "parents": [ "545dd853bffbf778a0a44816ac6ed381b13f2158", "69b8e962e1b8346b33a2c14889547a0ac00c8b17" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Thu Apr 23 15:48:12 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 23 15:48:12 2015 +0000" }, "message": "am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n\n* commit \u002769b8e962e1b8346b33a2c14889547a0ac00c8b17\u0027:\n Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n" }, { "commit": "68e6b5055b916f70ba81790603636168f444c6db", "tree": "0406277cf4e53bbc8192209f9a938f7531638c8b", "parents": [ "558907f702ab21d4166d5d7f7986cb18c4a993bd" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Mon Apr 20 08:28:30 2015 -0700" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Mon Apr 20 17:16:38 2015 +0000" }, "message": "DO NOT MERGE Don\u0027t take flags when creating app widget config activity.\n\nbug:19618745\n\nChange-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095\n" }, { "commit": "4a6ca6724c789603626d74a8cc187365788a6cfd", "tree": "4114f8712ae25f97d08389ad5c66629dabefd049", "parents": [ "ec8df9af2f35eb5be4df01d66b1add4a4e7546c7" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed Mar 11 13:12:06 2015 -0400" }, "committer": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Thu Apr 16 15:38:03 2015 +0000" }, "message": "Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n\nWhen reading from the parcel, if the number of colors is invalid, early\nexit.\n\nAdd two more checks: setInfo must return true, and Parcel::readInplace\nmust return non-NULL. The former ensures that the previously read values\n(width, height, etc) were valid, and the latter checks that the Parcel\nhad enough data even if the number of colors was reasonable.\n\nAlso use an auto-deleter to handle deletion of the SkBitmap.\n\nCherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6\n\nBUG\u003d19666945\n\nChange-Id: Iab0d218c41ae0c39606e333e44cda078eef32291\n" }, { "commit": "69b8e962e1b8346b33a2c14889547a0ac00c8b17", "tree": "cc34f6ec5aab7d7bb1a97d52fbef79cbeea3269f", "parents": [ "9a425aa71c0ae6fb8c9c84d3e71321a44433d861" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed Apr 15 08:16:29 2015 -0400" }, "committer": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed Apr 15 08:16:29 2015 -0400" }, "message": "Make Bitmap_createFromParcel check the color count. DO NOT MERGE\n\nWhen reading from the parcel, if the number of colors is invalid, early\nexit.\n\nAdd two more checks: setInfo must return true, and Parcel::readInplace\nmust return non-NULL. The former ensures that the previously read values\n(width, height, etc) were valid, and the latter checks that the Parcel\nhad enough data even if the number of colors was reasonable.\n\nAlso use an auto-deleter to handle deletion of the SkBitmap.\n\nCherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6\n\nBUG\u003d19666945\n\nChange-Id: I9490d90244e051a4019d6266b2a1cb375a65198f\n" }, { "commit": "a9f6a9b769b71d89382b9b8c158b168cd7b4c692", "tree": "885589b76bafb50a1b3d4286a64a76e4c589fbe8", "parents": [ "922946ea75e0b387d900bb20c55759c6343ac4b5" ], "author": { "name": "Quddus Chong", "email": "quddusc@google.com", "time": "Tue Apr 07 13:03:29 2015 -0700" }, "committer": { "name": "Quddus Chong", "email": "quddusc@google.com", "time": "Tue Apr 07 13:04:39 2015 -0700" }, "message": "Fixed broken link in UiAutomation.setRunAsMonkey() method description.\nbug: 19711873\n\nChange-Id: I4ebb50e03e6e979486ebd3a7c15f21358734574e\n" } ], "next": "37661db7fa58c0559ef2b73b6f8c38124e3acd4a" }