)]}' { "log": [ { "commit": "c510ecb3ec0eeca5425f5bc96fae80ea56f85be6", "tree": "0e43ab585113ae6c71c4f14065bfafd7a26f95a7", "parents": [ "07a21754f45672b27e765d8c7677c9663c6dce91" ], "author": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Fri Aug 18 18:01:46 2017 -0700" }, "committer": { "name": "Phil Weaver", "email": "pweaver@google.com", "time": "Tue Aug 29 00:52:25 2017 +0000" }, "message": "Backport overlay security fix\n\nReplacing app opps fix with the flag that is used\nelsewhere.\n\nBug: 37442941\nTest: Verified that toast and system overlay still goes\naway on permission and a11y service capability screens.\n\nMerged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b\n\nChange-Id: If9bec515105369055415d54c7fcad7a65431f8e7\n" }, { "commit": "07a21754f45672b27e765d8c7677c9663c6dce91", "tree": "17a9982475c219a3dfe906ffd89acb6a662099f2", "parents": [ "c9a9fcdcd3693e8079ddfc4063c3a83edb379d3a", "0bf3dc9822a4817b1fea1d819ab7abf61013ad8b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 18 00:40:55 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 18 00:40:55 2017 +0000" }, "message": "Merge \"Fix race condition of removing surface.\" into oc-dev" }, { "commit": "c9a9fcdcd3693e8079ddfc4063c3a83edb379d3a", "tree": "654c7ac6fccc70b736998cba9ec18bc45c882515", "parents": [ "357f42bf69b69fcbb6c486878cba14632ace69ce", "0c2b2d1f87415adcab6a1760f2e4067046e74c4f" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Thu Aug 17 22:07:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Aug 17 22:07:36 2017 +0000" }, "message": "Merge \"Enforce policy for camera gesture in keyguard\" into nyc-mr2-dev\nam: 0c2b2d1f87 -s ours\n\nChange-Id: Id0fe09b6f6ba687b6597ce2f97b6b8d83fbc4915\n" }, { "commit": "0c2b2d1f87415adcab6a1760f2e4067046e74c4f", "tree": "2fcf5065a4e21ac3b3182dc3dd2693b85dec27b4", "parents": [ "1ca8da19693c920fe0ad3059d7b9b0bf5d52d3c9", "5b064e03bd28c734a6f6022e2cbdff14410dc59a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 17 21:56:52 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 17 21:56:52 2017 +0000" }, "message": "Merge \"Enforce policy for camera gesture in keyguard\" into nyc-mr2-dev" }, { "commit": "357f42bf69b69fcbb6c486878cba14632ace69ce", "tree": "654c7ac6fccc70b736998cba9ec18bc45c882515", "parents": [ "3455f8f5279b37bd3ba42e2c36ec3c4aa11aa881", "eb1936cb98a25a437ce90ebdbdc6f09a96e7d6a9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 17 02:29:21 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 17 02:29:21 2017 +0000" }, "message": "Merge \"Properly compute default and system set flag on an upgrade\" into oc-dev" }, { "commit": "eb1936cb98a25a437ce90ebdbdc6f09a96e7d6a9", "tree": "654c7ac6fccc70b736998cba9ec18bc45c882515", "parents": [ "80376a98a5eaca8a03f302688fec002a809ad737" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Wed Aug 16 14:50:00 2017 -0700" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Aug 17 02:21:49 2017 +0000" }, "message": "Properly compute default and system set flag on an upgrade\n\nWe added the notions of a default value and whether this default is set\nby the system for a setting which is needed for experiments since in\ncase a bad value is pushed we should be able to incrementally rollback\nto a stable state. If a system component sets a setting value this\nautomatically becomes the default. System components are the platform\npackage, the special UIDs (telephony, etc), apps singed with the\nplatform cert, system installed persistent apps, and SUW.\n\nIn N we did not have the notion of a default and during an upgrade need\nto adjust the default and whether this default is set by the system.\nThis migration runs as the system UID and was incorrectly computing that\nthe package that changed the settings last was a part of the system and\nsetting the current value as its default set by the system. This\nresulted in taking more storage space as we also count the default which\nled the package which changed the setting to go over the quota and that\nthrows. If the first caller into the settings provider is the system\nmain\nthread (almost certain) we end up throwing an exception on the system\nmain thread - crashing the system server.\n\nTest: flash N, install an app abusing sys settings, update to O\n\nMerged-In:I8e2c578cb564b2bc2de7c793eb40dea2639fa04e\n\nbug:64718888\n\nChange-Id: I82f0d52fd7984fb2d0da1fd91399a0c914dfa24b\n" }, { "commit": "3455f8f5279b37bd3ba42e2c36ec3c4aa11aa881", "tree": "580dfc1b232d233d7e8bd1ae26b5508a65582b23", "parents": [ "c29ad5c94ca6d3027f279530bfe8c3388157abce", "1ca8da19693c920fe0ad3059d7b9b0bf5d52d3c9" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 23:47:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 23:47:50 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553 am: 3d1931d4e3 -s ours am: 6a7c6a24a7 am: e8b48abb02 am: a23674b4f9 am: b007784ed1 -s ours am: 712baa6c99 am: a5e996c2e2 am: 3674e3d9d8 am: a5ba83e2ee\nam: 1ca8da1969 -s ours\n\nChange-Id: I7db93785a58b059d17725188d42adfd4c7b7780a\n" }, { "commit": "1ca8da19693c920fe0ad3059d7b9b0bf5d52d3c9", "tree": "a7cd772e142eb02d943afe7e69169dbcbc685e77", "parents": [ "35c3b58d46cf6ae4d94ee6419db927170591d1a0", "a5ba83e2ee2cc0dba6ae355a70b001f9d20a888c" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 23:30:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 23:30:28 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553 am: 3d1931d4e3 -s ours am: 6a7c6a24a7 am: e8b48abb02 am: a23674b4f9 am: b007784ed1 -s ours am: 712baa6c99 am: a5e996c2e2 am: 3674e3d9d8\nam: a5ba83e2ee\n\nChange-Id: I442dc3021f89fe808159ce8787e4d2950a4d0806\n" }, { "commit": "a5ba83e2ee2cc0dba6ae355a70b001f9d20a888c", "tree": "efd177807799b8b0393cd3b2dbf3e61a6d24e771", "parents": [ "69ae08b680fffafa184d2542436c67bf6b31fe97", "3674e3d9d85dd748d2e02cb95af425d98406c131" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 23:09:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 23:09:40 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553 am: 3d1931d4e3 -s ours am: 6a7c6a24a7 am: e8b48abb02 am: a23674b4f9 am: b007784ed1 -s ours am: 712baa6c99 am: a5e996c2e2\nam: 3674e3d9d8\n\nChange-Id: I9bc6659634cd92ceadc9b0560f2802b90b24d573\n" }, { "commit": "3674e3d9d85dd748d2e02cb95af425d98406c131", "tree": "438ac79f626827df27eb19453768df4bb9cf16cd", "parents": [ "510f02244d6eca3661353a770c77692bb464b870", "a5e996c2e279ab404d495f18b0bb4aca9a0e3d9d" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 22:55:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 22:55:31 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553 am: 3d1931d4e3 -s ours am: 6a7c6a24a7 am: e8b48abb02 am: a23674b4f9 am: b007784ed1 -s ours am: 712baa6c99\nam: a5e996c2e2\n\nChange-Id: Idfdd87bbf432a23d73a544810bbda29126f15c6d\n" }, { "commit": "a5e996c2e279ab404d495f18b0bb4aca9a0e3d9d", "tree": "e7fbdbb4763f5cd2ac8e207391e91d4668dfae3b", "parents": [ "a175bae6624ca36a8d0ff3463be2503059edca98", "712baa6c997aaf2e5b7bfb116b313cb5ad95abb8" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 22:39:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 22:39:46 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553 am: 3d1931d4e3 -s ours am: 6a7c6a24a7 am: e8b48abb02 am: a23674b4f9 am: b007784ed1 -s ours\nam: 712baa6c99\n\nChange-Id: Ic2c5a354d8ee69609a6152d75ccdbe66fb8e3daa\n" }, { "commit": "712baa6c997aaf2e5b7bfb116b313cb5ad95abb8", "tree": "8c6016618cd23720461a7185962dc661e35c8ec6", "parents": [ "6adae5108c1dd4d3c4040a3571e711932832de09", "b007784ed143100eec8f7dc8ddf803446b4b7639" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 22:19:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 22:19:11 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553 am: 3d1931d4e3 -s ours am: 6a7c6a24a7 am: e8b48abb02 am: a23674b4f9\nam: b007784ed1 -s ours\n\nChange-Id: I152a8ebaf97c37be52de29c0639fa221a28b5fce\n" }, { "commit": "b007784ed143100eec8f7dc8ddf803446b4b7639", "tree": "2f6ba1ab8bad39f87465ff46e612f96b1fbed738", "parents": [ "733c7607d11a6706cca572cc0d109f45df550b94", "a23674b4f97dfed253abade7ea4dade2e96ce721" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 21:56:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 21:56:58 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553 am: 3d1931d4e3 -s ours am: 6a7c6a24a7 am: e8b48abb02\nam: a23674b4f9\n\nChange-Id: I1071a79ff62a800027c5da1ffad9401e83f541b1\n" }, { "commit": "a23674b4f97dfed253abade7ea4dade2e96ce721", "tree": "19d3c265b09bc3ebf103fbfb105887e0ec76693b", "parents": [ "5d34739d70b78fad7176fce456b2f5646d4eb040", "e8b48abb026f86eb7e9c58cd5da9df95a5177549" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 21:39:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 21:39:41 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553 am: 3d1931d4e3 -s ours am: 6a7c6a24a7\nam: e8b48abb02\n\nChange-Id: I171e3e1d9575f4e9b61ee46cfc08ac4331d6d245\n" }, { "commit": "e8b48abb026f86eb7e9c58cd5da9df95a5177549", "tree": "14d14493ff0f0497f49c10db03b61154019abb6c", "parents": [ "5048fc8e927fd72b0a2f44469f243d1a76c716ed", "6a7c6a24a770206815d22cd5dd6598737ce0b13d" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 21:26:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 21:26:49 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553 am: 3d1931d4e3 -s ours\nam: 6a7c6a24a7\n\nChange-Id: I72398c99878637d26dbb976bab05aca315368729\n" }, { "commit": "6a7c6a24a770206815d22cd5dd6598737ce0b13d", "tree": "1273f470e66cd85d4a17b19aadac07564007c4ab", "parents": [ "039b357a469c2daa08747e1a0c2d42d15d738455", "3d1931d4e32e0d1d7cbd9a94784dbbf57c119013" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 21:15:05 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 21:15:05 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours am: b737365553\nam: 3d1931d4e3 -s ours\n\nChange-Id: Ieb19904cf060072d2525836ebba9f310da515b4b\n" }, { "commit": "3d1931d4e32e0d1d7cbd9a94784dbbf57c119013", "tree": "7896e6bc932e53806e09326e16d03ec9600f6322", "parents": [ "37cf6265dbc0fe3e3694c58f82ce077c150c2b35", "b7373655532592fdac89c004147e93ee4ede95f8" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 20:50:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:50:20 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours am: 3280efe50e -s ours\nam: b737365553\n\nChange-Id: I375324a937478c584e95cb6550d98293162656fc\n" }, { "commit": "b7373655532592fdac89c004147e93ee4ede95f8", "tree": "059435b7d219c90fe8e447f0556416a773f3ef50", "parents": [ "954deb1c6e39a6daf0aa4cbd7e778f63bc7657ae", "3280efe50ea8febc5957c09ff29ff4038358bd9b" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 20:35:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:35:40 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours\nam: 3280efe50e -s ours\n\nChange-Id: Ia7bf4d6991be15c732ba8b55c37f2c9e447b1dbd\n" }, { "commit": "3280efe50ea8febc5957c09ff29ff4038358bd9b", "tree": "aaf34ac0c2a588f24f4d3d8441226ea2e1503f9d", "parents": [ "a620b218282ae086b1987ffa0e7dbc6a72c9750b", "9d99b0001e53306f8215391076d107097ba01643" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 20:19:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:19:29 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6\nam: 9d99b0001e -s ours\n\nChange-Id: Ib0fb40f990138b3729b66bdb6d6a095bd3ad231d\n" }, { "commit": "c29ad5c94ca6d3027f279530bfe8c3388157abce", "tree": "580dfc1b232d233d7e8bd1ae26b5508a65582b23", "parents": [ "80376a98a5eaca8a03f302688fec002a809ad737", "35c3b58d46cf6ae4d94ee6419db927170591d1a0" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Wed Aug 16 20:15:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:15:23 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92 am: 5d34739d70 am: 733c7607d1 am: 6adae5108c am: a175bae662 am: 510f02244d am: 69ae08b680\nam: 35c3b58d46\n\nChange-Id: I9ce7456fec5af181ec5e42bfc5f139a1b00137cf\n" }, { "commit": "9d99b0001e53306f8215391076d107097ba01643", "tree": "78105071f2056b3d8eeea1a6c9158404b9016777", "parents": [ "f433884a84536386d637a1736c88518f8af78772", "96fe6421f66225ff3bfc66096e21609b57dbee7c" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 20:03:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:03:29 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff\nam: 96fe6421f6\n\nChange-Id: Ia2ce3f8b95b578253c5336407ae85880d3d317f4\n" }, { "commit": "35c3b58d46cf6ae4d94ee6419db927170591d1a0", "tree": "a7cd772e142eb02d943afe7e69169dbcbc685e77", "parents": [ "24587d57cfcdca9de98b7012543498c034e83c5c", "69ae08b680fffafa184d2542436c67bf6b31fe97" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Wed Aug 16 20:03:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 20:03:15 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92 am: 5d34739d70 am: 733c7607d1 am: 6adae5108c am: a175bae662 am: 510f02244d\nam: 69ae08b680\n\nChange-Id: Ida122a46fece975924a002e6a5a0f6521ed8756f\n" }, { "commit": "69ae08b680fffafa184d2542436c67bf6b31fe97", "tree": "efd177807799b8b0393cd3b2dbf3e61a6d24e771", "parents": [ "159cd14334860ee9b8de0a105af0fdc668a635e7", "510f02244d6eca3661353a770c77692bb464b870" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Wed Aug 16 19:51:43 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 19:51:43 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92 am: 5d34739d70 am: 733c7607d1 am: 6adae5108c am: a175bae662\nam: 510f02244d\n\nChange-Id: I3bfe22ab41813abbeebee58d7cc8789e95a1a2fa\n" }, { "commit": "96fe6421f66225ff3bfc66096e21609b57dbee7c", "tree": "837b5735575faf7489b01b6d60fef2b43388a2fa", "parents": [ "5a7eb970e26744941be0853ff991beebc7e89ad6", "c3c2ed94ff5df23bb05b5f8ab6218b2be8ae3470" ], "author": { "name": "Siarhei Vishniakou", "email": "svv@google.com", "time": "Wed Aug 16 19:48:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 19:48:22 2017 +0000" }, "message": "DO NOT MERGE Remove window obscurement information.\nam: c3c2ed94ff\n\nChange-Id: Ib9552165e9b1c2dfcd235d1f7930d85c258b2ece\n" }, { "commit": "510f02244d6eca3661353a770c77692bb464b870", "tree": "438ac79f626827df27eb19453768df4bb9cf16cd", "parents": [ "40317127f490f8ecf6f8be026259558c88cd3a97", "a175bae6624ca36a8d0ff3463be2503059edca98" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Wed Aug 16 19:39:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 19:39:50 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92 am: 5d34739d70 am: 733c7607d1 am: 6adae5108c\nam: a175bae662\n\nChange-Id: Id250bcbcf92bdb95813dc4fcdd772aeef7f29c0a\n" }, { "commit": "a175bae6624ca36a8d0ff3463be2503059edca98", "tree": "e7fbdbb4763f5cd2ac8e207391e91d4668dfae3b", "parents": [ "4acf4fabf40c3e3a7b5cb23d01cab720dda86d31", "6adae5108c1dd4d3c4040a3571e711932832de09" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Wed Aug 16 19:26:45 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 19:26:45 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92 am: 5d34739d70 am: 733c7607d1\nam: 6adae5108c\n\nChange-Id: I104eea9bf02f89b6c2bde0daeff81aaa781e323d\n" }, { "commit": "6adae5108c1dd4d3c4040a3571e711932832de09", "tree": "8c6016618cd23720461a7185962dc661e35c8ec6", "parents": [ "a3c1de7e492048217c558283d2f679bad7f4a1e8", "733c7607d11a6706cca572cc0d109f45df550b94" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Wed Aug 16 19:13:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 19:13:17 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92 am: 5d34739d70\nam: 733c7607d1\n\nChange-Id: Id1c4c4de5d6e4da05188326287ae86e74bf89623\n" }, { "commit": "733c7607d11a6706cca572cc0d109f45df550b94", "tree": "2f6ba1ab8bad39f87465ff46e612f96b1fbed738", "parents": [ "6dfc8d8d4da9b419914d603e27e218e522119f2a", "5d34739d70b78fad7176fce456b2f5646d4eb040" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Wed Aug 16 18:58:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 18:58:11 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev am: 039b357a46 -s ours am: 5048fc8e92\nam: 5d34739d70\n\nChange-Id: I51f9bbaa35a853ec3442267cbb9327a2a64ff1d1\n" }, { "commit": "5d34739d70b78fad7176fce456b2f5646d4eb040", "tree": "19d3c265b09bc3ebf103fbfb105887e0ec76693b", "parents": [ "1cd9e8096fcf10077115b46676a51346349e6a61", "5048fc8e927fd72b0a2f44469f243d1a76c716ed" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Wed Aug 16 18:48:14 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 18:48:14 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev am: 039b357a46 -s ours\nam: 5048fc8e92\n\nChange-Id: Ib55158e1608d7eeba7d41854377ed1e93e283a75\n" }, { "commit": "80376a98a5eaca8a03f302688fec002a809ad737", "tree": "580dfc1b232d233d7e8bd1ae26b5508a65582b23", "parents": [ "5714da6e93271324b020be990b8274463b441b4b", "e7cbfa995d32b0480942af90db0c05128dc0d152" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Wed Aug 16 18:44:34 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 16 18:44:34 2017 +0000" }, "message": "Merge \"docs: Updated ShortcutManager API reference guide.\" into oc-dev" }, { "commit": "5048fc8e927fd72b0a2f44469f243d1a76c716ed", "tree": "14d14493ff0f0497f49c10db03b61154019abb6c", "parents": [ "b1141b6ff0b1b390839aa4c6e74e99d8c33dacea", "039b357a469c2daa08747e1a0c2d42d15d738455" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Wed Aug 16 18:37:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 16 18:37:17 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev\nam: 039b357a46 -s ours\n\nChange-Id: Ia916a0c1a5ec5d63e4e76ed9da9d563fd39d3823\n" }, { "commit": "5714da6e93271324b020be990b8274463b441b4b", "tree": "1da75da099bc40d35074136eb8323378d7f578fe", "parents": [ "36cbdef8808fa845fa554eae5c8bcf0bc7785608", "2b1a5b8fd9efc41451f933fff27f615961f2d6d1" ], "author": { "name": "Cindy Kuang", "email": "ckuang@google.com", "time": "Wed Aug 16 16:59:31 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 16 16:59:31 2017 +0000" }, "message": "Merge \"docs: corrected code example mistakes\" into oc-dev" }, { "commit": "36cbdef8808fa845fa554eae5c8bcf0bc7785608", "tree": "0ffe35e00ee5e3d7097c33ce9f1437cdc762c8d3", "parents": [ "0fa9328b80245e6170522bf74dbae6a33122fbcb", "303b609eaa8c28c4f36a46ce882b126e9c144aee" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 15 21:12:32 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 15 21:12:32 2017 +0000" }, "message": "Merge \"Additional documentation about Autofill / WebView security.\" into oc-dev" }, { "commit": "0fa9328b80245e6170522bf74dbae6a33122fbcb", "tree": "ff26c6359fe44599aa39f3638b409886283179c0", "parents": [ "0e1976292de68ba5b1bec47fb4931c478420ecf8", "24587d57cfcdca9de98b7012543498c034e83c5c" ], "author": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Tue Aug 15 20:47:03 2017 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Tue Aug 15 20:47:03 2017 +0000" }, "message": "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4 am: 159cd14334 am: 24587d57cf\n\nChange-Id: If5cad5c0f361acda25df4d90de06821d16e689c0\n" }, { "commit": "24587d57cfcdca9de98b7012543498c034e83c5c", "tree": "a7cd772e142eb02d943afe7e69169dbcbc685e77", "parents": [ "facc5e40fca108be7b0261b16d1be539ec8b4e85", "159cd14334860ee9b8de0a105af0fdc668a635e7" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 20:42:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 15 20:42:11 2017 +0000" }, "message": "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4\nam: 159cd14334\n\nChange-Id: Iaed779900e094a5951e24771ed1f1f55b0c1b014\n" }, { "commit": "0e1976292de68ba5b1bec47fb4931c478420ecf8", "tree": "9f957f8f67583746f06c7d486fd385898b1e72e7", "parents": [ "dc12cb1fb29e445e0a72f388a388e356c5c0ec72", "facc5e40fca108be7b0261b16d1be539ec8b4e85" ], "author": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Tue Aug 15 20:35:00 2017 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Tue Aug 15 20:35:00 2017 +0000" }, "message": "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af am: 569af6584a am: 30d3df57dc am: 79ada733cc am: 2eb85eca12 am: f3589fded1 -s ours am: facc5e40fc\n\nChange-Id: I4531fab8eab2291fcfd790d04a2661307f40dc60\n" }, { "commit": "facc5e40fca108be7b0261b16d1be539ec8b4e85", "tree": "abf4f4d4009595d285ce16b9444fbb7834c85d2d", "parents": [ "4542686e4241b5e3b59f6a0a86e5d193386d3cf0", "f3589fded11232e63d0d9682b3facf48d4b35f76" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Tue Aug 15 20:29:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 15 20:29:29 2017 +0000" }, "message": "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af am: 569af6584a am: 30d3df57dc am: 79ada733cc am: 2eb85eca12\nam: f3589fded1 -s ours\n\nChange-Id: I3b60e5cb94895fc155ba11d27ed81640eb8a2a05\n" }, { "commit": "039b357a469c2daa08747e1a0c2d42d15d738455", "tree": "1273f470e66cd85d4a17b19aadac07564007c4ab", "parents": [ "093c7a8e56d5c9143ccd1a29ba5ad666f8777246", "e74cae8f7c3e6b12f2bf2b75427ee8f5b53eca3c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Aug 15 19:30:53 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 15 19:30:53 2017 +0000" }, "message": "Merge \"Fix security hole in GateKeeperResponse.\" into mnc-dev" }, { "commit": "159cd14334860ee9b8de0a105af0fdc668a635e7", "tree": "efd177807799b8b0393cd3b2dbf3e61a6d24e771", "parents": [ "f3589fded11232e63d0d9682b3facf48d4b35f76", "40317127f490f8ecf6f8be026259558c88cd3a97" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:54:35 2017 +0000" }, "committer": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:54:35 2017 +0000" }, "message": "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4 am: 40317127f4\n\nChange-Id: I6bb7e6146e9a5a1a7c4721c496b1088fb3209f00\n" }, { "commit": "40317127f490f8ecf6f8be026259558c88cd3a97", "tree": "438ac79f626827df27eb19453768df4bb9cf16cd", "parents": [ "2eb85eca129e0c726a1353eeadeb01b83322067b", "4acf4fabf40c3e3a7b5cb23d01cab720dda86d31" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:54:05 2017 +0000" }, "committer": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:54:05 2017 +0000" }, "message": "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49 am: 4acf4fabf4\n\nChange-Id: Iea8871d4f1a491e4571e2152afbf8855bf451478\n" }, { "commit": "4acf4fabf40c3e3a7b5cb23d01cab720dda86d31", "tree": "e7fbdbb4763f5cd2ac8e207391e91d4668dfae3b", "parents": [ "79ada733cc8fdeb75c3caade7405e54ff3d29c4a", "a3c1de7e492048217c558283d2f679bad7f4a1e8" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:53:35 2017 +0000" }, "committer": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:53:35 2017 +0000" }, "message": "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d am: a3c1de7e49\n\nChange-Id: Idcc4beaf75e1aba8609aa18ad1850e0796a17741\n" }, { "commit": "a3c1de7e492048217c558283d2f679bad7f4a1e8", "tree": "8c6016618cd23720461a7185962dc661e35c8ec6", "parents": [ "30d3df57dcf81103928841b149afe2b8b6d41750", "6dfc8d8d4da9b419914d603e27e218e522119f2a" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:52:57 2017 +0000" }, "committer": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:52:57 2017 +0000" }, "message": "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f am: 6dfc8d8d4d\n\nChange-Id: Ia5ad4b5d36d92caa26fa69951180320848c372e7\n" }, { "commit": "6dfc8d8d4da9b419914d603e27e218e522119f2a", "tree": "2f6ba1ab8bad39f87465ff46e612f96b1fbed738", "parents": [ "569af6584ae526573daad817375327f315fc8bb4", "1cd9e8096fcf10077115b46676a51346349e6a61" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:52:27 2017 +0000" }, "committer": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:52:27 2017 +0000" }, "message": "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0 am: 1cd9e8096f\n\nChange-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8\n" }, { "commit": "1cd9e8096fcf10077115b46676a51346349e6a61", "tree": "19d3c265b09bc3ebf103fbfb105887e0ec76693b", "parents": [ "6acee639af6ecadf0aed9540ffca30b849ba5b77", "b1141b6ff0b1b390839aa4c6e74e99d8c33dacea" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:51:58 2017 +0000" }, "committer": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:51:58 2017 +0000" }, "message": "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c am: b1141b6ff0\n\nChange-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20\n" }, { "commit": "b1141b6ff0b1b390839aa4c6e74e99d8c33dacea", "tree": "14d14493ff0f0497f49c10db03b61154019abb6c", "parents": [ "65f02e8ba7a9f013d6971b3d6d1bd95f1785cb3d", "e74cae8f7c3e6b12f2bf2b75427ee8f5b53eca3c" ], "author": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:51:28 2017 +0000" }, "committer": { "name": "Charles He", "email": "qiurui@google.com", "time": "Tue Aug 15 17:51:28 2017 +0000" }, "message": "[automerger] Fix security hole in GateKeeperResponse. am: e74cae8f7c\n\nChange-Id: Ic72c354aaec594f02567949e294be2c10da47853\n" }, { "commit": "5b064e03bd28c734a6f6022e2cbdff14410dc59a", "tree": "f7ae104275792fcd900ea828ea7381483f953318", "parents": [ "4542686e4241b5e3b59f6a0a86e5d193386d3cf0" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Jul 28 11:53:56 2017 +0100" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Tue Aug 15 10:46:31 2017 +0100" }, "message": "Enforce policy for camera gesture in keyguard\n\nTest:\n1. Set lock screen, set keyguard policy. Lock the device.\n Observe that double tap is not showing camera\n\n2. Set lock screen, unset the keyguard policy. Lock the device.\n Observe that double tap is showing camera\n\n3. Unset lock screen (swipe), set the keyguard policy. Lock the device.\n Observe that double tap is showing camera.\n\n4. Unset lock screen (swipe), unset the keyguard policy. Lock the device.\n Observe that double tap is showing camera.\n\nBug: 63787722\nMerged-In: I104688eaad719528376e2851f837d5956a6a1169\n\nChange-Id: I42e6d9015682998176fe41971356bde22e1b37b2\n" }, { "commit": "303b609eaa8c28c4f36a46ce882b126e9c144aee", "tree": "bba14c92fea041e5797c5634528ffee44ee8e8fc", "parents": [ "2976109d898ad14129281d117c07301f3567c065" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Jul 31 18:01:15 2017 -0700" }, "committer": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Aug 14 08:49:47 2017 -0700" }, "message": "Additional documentation about Autofill / WebView security.\n\nTest: ran \u0027m -j doc-comment-check-docs\u0027 and checked resulting HTML\n\nFixes: 64114048\nFixes: 64337380\nFixes: 64125551\n\nChange-Id: I375bb4712af875251fea4f3e572d92165643409a\n" }, { "commit": "f3589fded11232e63d0d9682b3facf48d4b35f76", "tree": "addce4096710045482a6f4a0ef04bc13d0ec932a", "parents": [ "9468b48565654a59017f19efbd3b442abd63c786", "2eb85eca129e0c726a1353eeadeb01b83322067b" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:13:21 2017 +0000" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:13:21 2017 +0000" }, "message": "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af am: 569af6584a am: 30d3df57dc am: 79ada733cc am: 2eb85eca12\n\nChange-Id: I3d7846f3b82dd429c69cff700e3d2794039b73db\n" }, { "commit": "2eb85eca129e0c726a1353eeadeb01b83322067b", "tree": "814b381c65a8735a8d8eeb76d6d302ca4fe5da68", "parents": [ "4a1dc3458d2fe391aa176625e1065aced90b916c", "79ada733cc8fdeb75c3caade7405e54ff3d29c4a" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:12:38 2017 +0000" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:12:38 2017 +0000" }, "message": "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af am: 569af6584a am: 30d3df57dc am: 79ada733cc\n\nChange-Id: Iea1acc1d757871aaaa58fb27f547fd6261b73585\n" }, { "commit": "79ada733cc8fdeb75c3caade7405e54ff3d29c4a", "tree": "a1a9b9a8027c07aac4bf080842d55c63da53e97d", "parents": [ "afdcad0df3995562a4988519b6eed3b5f203917c", "30d3df57dcf81103928841b149afe2b8b6d41750" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:11:51 2017 +0000" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:11:51 2017 +0000" }, "message": "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af am: 569af6584a am: 30d3df57dc\n\nChange-Id: I4ab24abc5c58022d92eb399750c8c8ef07995c5b\n" }, { "commit": "30d3df57dcf81103928841b149afe2b8b6d41750", "tree": "6ff5014bc62e6d0cf4d2a51c7ab134051a65a8bf", "parents": [ "9e39e1e5486723e57e1100ec8a90a1c40437595a", "569af6584ae526573daad817375327f315fc8bb4" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:10:58 2017 +0000" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:10:58 2017 +0000" }, "message": "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af am: 569af6584a\n\nChange-Id: Ic65e9bb19e46a8d16406a3d02e5b60f375338334\n" }, { "commit": "569af6584ae526573daad817375327f315fc8bb4", "tree": "d9b1d5802570d989653d4250784d27536e55993f", "parents": [ "996bc6bc12b928664a7e9e74896b8a40c2eced07", "6acee639af6ecadf0aed9540ffca30b849ba5b77" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:09:58 2017 +0000" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:09:58 2017 +0000" }, "message": "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7 am: 6acee639af\n\nChange-Id: I877b0cba326b85e894d52f24a694a1ef666cdb1c\n" }, { "commit": "6acee639af6ecadf0aed9540ffca30b849ba5b77", "tree": "c7a294d7257ca617fd9381d0ab2e4e61c77e0bf5", "parents": [ "9625d164e44a10394e6590a216aa6d539e6c281d", "65f02e8ba7a9f013d6971b3d6d1bd95f1785cb3d" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:09:21 2017 +0000" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Aug 11 21:09:21 2017 +0000" }, "message": "[automerger] Enforce policy for camera gesture in keyguard am: 65f02e8ba7\n\nChange-Id: Ia91fe8b88c04f1b430f8cf90f5691b6b2791610b\n" }, { "commit": "dc12cb1fb29e445e0a72f388a388e356c5c0ec72", "tree": "9f957f8f67583746f06c7d486fd385898b1e72e7", "parents": [ "0580ac8a651ee97156ab3b1527c0c3021cba5e12", "2e98cc555e5cb1f0e632aa3344686841b17c4e28" ], "author": { "name": "Cindy Kuang", "email": "ckuang@google.com", "time": "Fri Aug 11 20:38:35 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 11 20:38:35 2017 +0000" }, "message": "Merge \"docs: corrected grammar mistake in Class Overview\" into oc-dev" }, { "commit": "0580ac8a651ee97156ab3b1527c0c3021cba5e12", "tree": "d05c4a317cf1ef5bde88e2db837cb0f476402428", "parents": [ "49bef543b304e359fd673e35f93e2c4e544168b0", "12d3747c0b3fdd186d6ae10ef3dc28bb777cb63a" ], "author": { "name": "Cindy Kuang", "email": "ckuang@google.com", "time": "Fri Aug 11 20:33:34 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 11 20:33:34 2017 +0000" }, "message": "Merge \"docs: replaced \"i.e.\" to fix formatting error\" into oc-dev" }, { "commit": "2b1a5b8fd9efc41451f933fff27f615961f2d6d1", "tree": "85d278260f6a51cf75972355922f00148071d03c", "parents": [ "744976e2985a07f602c02721db8969a638d51c82" ], "author": { "name": "Cindy Kuang", "email": "ckuang@google.com", "time": "Wed Aug 09 14:18:02 2017 -0700" }, "committer": { "name": "Cindy Kuang", "email": "ckuang@google.com", "time": "Fri Aug 11 10:49:04 2017 -0700" }, "message": "docs: corrected code example mistakes\n\nTest: make ds-docs\n\nBug: 10808505\nChange-Id: I9ee4efab9f0cbac00213179d06a6f0919cb82756\n" }, { "commit": "49bef543b304e359fd673e35f93e2c4e544168b0", "tree": "fbe2880c6b438eaddc51b4d2348027321a4e44df", "parents": [ "6e749c392bb99be5eb0d4b1819222beefbba33d0", "98ec92375d75630c10595bfcbae184ad7350e2d3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 11 12:25:01 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 11 12:25:01 2017 +0000" }, "message": "Merge \"Enforce policy for camera gesture in keyguard\" into oc-dev" }, { "commit": "12d3747c0b3fdd186d6ae10ef3dc28bb777cb63a", "tree": "ea3f861838df62876e77ea758c2a1f7a12518cfa", "parents": [ "744976e2985a07f602c02721db8969a638d51c82" ], "author": { "name": "Cindy Kuang", "email": "ckuang@google.com", "time": "Wed Aug 09 10:08:15 2017 -0700" }, "committer": { "name": "Cindy Kuang", "email": "ckuang@google.com", "time": "Thu Aug 10 09:59:58 2017 -0700" }, "message": "docs: replaced \"i.e.\" to fix formatting error\n\nTest: make ds-docs\n\nBug: 6440865\nChange-Id: I428476ddfe55f14df531ea6a1c3e3a09f7a29e7d\n" }, { "commit": "2e98cc555e5cb1f0e632aa3344686841b17c4e28", "tree": "185eface7dc3fec0a6d0b5b0b0b766c860b48e50", "parents": [ "744976e2985a07f602c02721db8969a638d51c82" ], "author": { "name": "Cindy Kuang", "email": "ckuang@google.com", "time": "Wed Aug 09 14:49:19 2017 -0700" }, "committer": { "name": "Cindy Kuang", "email": "ckuang@google.com", "time": "Wed Aug 09 14:49:19 2017 -0700" }, "message": "docs: corrected grammar mistake in Class Overview\n\nTest: make ds-docs\n\nBug: 17533073\nChange-Id: Iaf22ad26794e2aac454a736efc746bca6f48eb82\n" }, { "commit": "6e749c392bb99be5eb0d4b1819222beefbba33d0", "tree": "ee46bef55e1d3ff39b9b429484f7715df8d45674", "parents": [ "c915b7f703e77cfd2cd7e70255b5ac203e9b66ac", "c2fd144218d035f45e7063134f4c644a1dc36535" ], "author": { "name": "Vinay Kalia", "email": "vinaykalia@google.com", "time": "Wed Aug 09 21:02:32 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 09 21:02:32 2017 +0000" }, "message": "Merge \"Fix BLE scan leaks\" into oc-dev" }, { "commit": "c915b7f703e77cfd2cd7e70255b5ac203e9b66ac", "tree": "2df7e9aacc757cbc569386bc0c34ab7e2f428ca8", "parents": [ "17669d31dfc0ddbfd1f3fe4852c97fc0d71f2032", "4542686e4241b5e3b59f6a0a86e5d193386d3cf0" ], "author": { "name": "Zheng Zhang", "email": "zhzh@google.com", "time": "Wed Aug 09 18:09:48 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 09 18:09:48 2017 +0000" }, "message": "Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b48565 -s ours\nam: 4542686e42\n\nChange-Id: Id140fee89f552999522f3116854761c14265ef04\n" }, { "commit": "17669d31dfc0ddbfd1f3fe4852c97fc0d71f2032", "tree": "2df7e9aacc757cbc569386bc0c34ab7e2f428ca8", "parents": [ "744976e2985a07f602c02721db8969a638d51c82", "5d60709dc3abd01229bdee076f9cce902be13fc0" ], "author": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Wed Aug 09 18:08:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 09 18:08:52 2017 +0000" }, "message": "Fix Wakelock underlock in GnssLocationProvider. am: 2ed0166808 -s ours\nam: 5d60709dc3\n\nChange-Id: I10a42eee839da98af9434d1f7530335dfa732632\n" }, { "commit": "4542686e4241b5e3b59f6a0a86e5d193386d3cf0", "tree": "abf4f4d4009595d285ce16b9444fbb7834c85d2d", "parents": [ "5d60709dc3abd01229bdee076f9cce902be13fc0", "9468b48565654a59017f19efbd3b442abd63c786" ], "author": { "name": "Zheng Zhang", "email": "zhzh@google.com", "time": "Wed Aug 09 17:58:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 09 17:58:18 2017 +0000" }, "message": "Catch (and ignore) any timeout exceptions when releasing WakeLock\nam: 9468b48565 -s ours\n\nChange-Id: Ia1c10a46771ff4602a1005a3bf0bddaf6f1a70b6\n" }, { "commit": "5d60709dc3abd01229bdee076f9cce902be13fc0", "tree": "abf4f4d4009595d285ce16b9444fbb7834c85d2d", "parents": [ "b5da08a27606ebf7870cfe1dfa5c70088a86985b", "2ed0166808e99aeef15a0fe4bbbd6a78a87faef7" ], "author": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Wed Aug 09 17:57:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 09 17:57:17 2017 +0000" }, "message": "Fix Wakelock underlock in GnssLocationProvider.\nam: 2ed0166808 -s ours\n\nChange-Id: I965a5b57ffbc2adcde3a83a95793a3dc29673641\n" }, { "commit": "c2fd144218d035f45e7063134f4c644a1dc36535", "tree": "ee46bef55e1d3ff39b9b429484f7715df8d45674", "parents": [ "744976e2985a07f602c02721db8969a638d51c82" ], "author": { "name": "Vinay Kalia", "email": "vinaykalia@google.com", "time": "Fri Jul 28 15:09:57 2017 -0700" }, "committer": { "name": "Vinay Kalia", "email": "vinaykalia@google.com", "time": "Wed Aug 09 09:03:52 2017 -0700" }, "message": "Fix BLE scan leaks\n\nIf an app starts multiple scans with same callback then\nthere is a collision in mLeScanClients hash map which\nresults in leaking first scan. This change fixes it by\nnot allowing the second scan with same callback.\n\nBUG: 62389939\nBUG: 38198694\n\nTest: Tested applications which started multiple scans with\n same callback.\n\nChange-Id: I569069a40b6f8b4b8bb070731225e732c6b23ec8\n(cherry picked from commit 9722971cb4a79e37165f636f9dd057707d2e620a)\n" }, { "commit": "e7cbfa995d32b0480942af90db0c05128dc0d152", "tree": "9e8cf89aef1a7a162ed78ec1baff18c3e436c3e7", "parents": [ "2976109d898ad14129281d117c07301f3567c065" ], "author": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Fri Aug 04 17:03:48 2017 -0700" }, "committer": { "name": "Kevin Hufnagle", "email": "khufnagle@google.com", "time": "Mon Aug 07 20:01:31 2017 -0700" }, "message": "docs: Updated ShortcutManager API reference guide.\n\nThe guide now contains supplemental, rather than duplicate,\ninformation relative to the \"App Shortcuts\" guide, available at\nhttps://developer.android.com/guide/topics/ui/shortcuts.html\n\nTest: make ds-docs -j8\n\nBug: 64401518\nChange-Id: Iefa34299a9765eb5d853da71d9197a0edb346026\n" }, { "commit": "744976e2985a07f602c02721db8969a638d51c82", "tree": "2df7e9aacc757cbc569386bc0c34ab7e2f428ca8", "parents": [ "2976109d898ad14129281d117c07301f3567c065" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Jul 31 11:34:14 2017 -0700" }, "committer": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Aug 07 17:22:50 2017 -0700" }, "message": "Clarifies autofill lifecycle.\n\nTest: m update-api\n\nBug: 64125551\nBug: 64114048\nChange-Id: I17c5bc2e2e64fa27e877301dbcb983ac8497209e\n" }, { "commit": "9468b48565654a59017f19efbd3b442abd63c786", "tree": "bde167daa6f059847124e26b1d3ef1e260c23d1d", "parents": [ "2ed0166808e99aeef15a0fe4bbbd6a78a87faef7" ], "author": { "name": "Zheng Zhang", "email": "zhzh@google.com", "time": "Mon Aug 07 13:51:23 2017 -0700" }, "committer": { "name": "Zheng Zhang", "email": "zhzh@google.com", "time": "Mon Aug 07 17:07:39 2017 -0700" }, "message": "Catch (and ignore) any timeout exceptions when releasing WakeLock\n\nBug: 64424030\nChange-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb\n" }, { "commit": "2ed0166808e99aeef15a0fe4bbbd6a78a87faef7", "tree": "d17119e4743ceaec6f5236a4a8e8098cc530366d", "parents": [ "33676dddbdd37dc76c449e81ca8c5642f87a60c7" ], "author": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Mon May 01 20:24:19 2017 -0700" }, "committer": { "name": "Zheng Zhang", "email": "zhzh@google.com", "time": "Mon Aug 07 17:06:30 2017 -0700" }, "message": "Fix Wakelock underlock in GnssLocationProvider.\n\nAdded a separate wakelock for xtra download so it won\u0027t\ninterfer with any wakelocks.\n\nTest: manual\n\nBug: 37545729\nChange-Id: I0867166f03802d1ed133437bcd85b0062db69947\n" }, { "commit": "2976109d898ad14129281d117c07301f3567c065", "tree": "4361033de1a4c680688eb48cef6a2e603964bc41", "parents": [ "c8f0fd7076233fa969ccc523fc5284d50b2c759a", "5b0a58ea45157efcf8b8d742fcc57f60a116ecc9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 02 19:43:31 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 02 19:43:31 2017 +0000" }, "message": "Merge \"camera2: Fix template requirements\" into oc-dev" }, { "commit": "c8f0fd7076233fa969ccc523fc5284d50b2c759a", "tree": "e422cb397a98c6326f08e016a7cc2294200a92fd", "parents": [ "6829a1dace16c05f3af362b62c15b6ce5f4399fa", "2fb64c0b2824c2df00b27f6702fa0030c6e1e71e" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Wed Aug 02 15:52:05 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 02 15:52:05 2017 +0000" }, "message": "Merge \"Clarifies how the autofill service should check for signature hashes.\" into oc-dev" }, { "commit": "6829a1dace16c05f3af362b62c15b6ce5f4399fa", "tree": "59e17fcaf4af73ab8ef1e32640fe4e1be2bd1828", "parents": [ "d71cc3b72eadc8ad0f07651c63764edb6a96f0e2", "33681a94cff6b48bcf82fda1fcb53b8cf7cd38fe" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 02 00:08:15 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 02 00:08:15 2017 +0000" }, "message": "Merge \"Cherry-picked some Autofill Javadoc improvements from master.\" into oc-dev" }, { "commit": "d71cc3b72eadc8ad0f07651c63764edb6a96f0e2", "tree": "2dc2a73d1d2072bc57c6384b3173918c13def939", "parents": [ "d88f4b723d3d26020d3cfa811203f9183aa5e1b0", "494f1a4dfa8abba5b468349a5375ec7a0194a91f" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Tue Aug 01 21:07:18 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 01 21:07:18 2017 +0000" }, "message": "Merge \"docs: Noted that JobIntentService is usually a better choice\" into oc-dev" }, { "commit": "2fb64c0b2824c2df00b27f6702fa0030c6e1e71e", "tree": "1261c2cbeffce4be832e1ffdd49d1b2eec2c65dd", "parents": [ "d88f4b723d3d26020d3cfa811203f9183aa5e1b0" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Jul 31 11:34:14 2017 -0700" }, "committer": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Tue Aug 01 12:51:58 2017 -0700" }, "message": "Clarifies how the autofill service should check for signature hashes.\n\nTest: m update-api\n\nBug: 64125551\nFixes: 63991811\n\nChange-Id: I1ba66787ef91c0fc5fab20b5e9e9fd47aee46412\n" }, { "commit": "d88f4b723d3d26020d3cfa811203f9183aa5e1b0", "tree": "7fbeb4390731dd96abc91224b921902843482157", "parents": [ "502986f72a7fb0aaf68102bcf48cbefda538ba4c", "b5da08a27606ebf7870cfe1dfa5c70088a86985b" ], "author": { "name": "Maggie Lee", "email": "mfylee@google.com", "time": "Tue Aug 01 14:47:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 01 14:47:57 2017 +0000" }, "message": "Merge \"power: gps: add gps read timeout\" into cw-f-dev am: 33676dddbd\nam: b5da08a276\n\nChange-Id: I5d96dd73affe79880583347e32a95be8510a5462\n" }, { "commit": "502986f72a7fb0aaf68102bcf48cbefda538ba4c", "tree": "519c03908ea919f929677dfc76bbe3f3f4ba0429", "parents": [ "17e2448c26311527ab6f67bcd2c560c5e485686b", "9295f58d26126f69d7944c322cb03040d87ba4e2" ], "author": { "name": "Andriy Naborskyy", "email": "andriyn@google.com", "time": "Tue Aug 01 14:38:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 01 14:38:26 2017 +0000" }, "message": "Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b\nam: 9295f58d26\n\nChange-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7\n" }, { "commit": "b5da08a27606ebf7870cfe1dfa5c70088a86985b", "tree": "abf4f4d4009595d285ce16b9444fbb7834c85d2d", "parents": [ "9295f58d26126f69d7944c322cb03040d87ba4e2", "33676dddbdd37dc76c449e81ca8c5642f87a60c7" ], "author": { "name": "Maggie Lee", "email": "mfylee@google.com", "time": "Tue Aug 01 14:37:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 01 14:37:40 2017 +0000" }, "message": "Merge \"power: gps: add gps read timeout\" into cw-f-dev\nam: 33676dddbd\n\nChange-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29\n" }, { "commit": "17e2448c26311527ab6f67bcd2c560c5e485686b", "tree": "519c03908ea919f929677dfc76bbe3f3f4ba0429", "parents": [ "6b2d37ca25122e3285ddc657258378b9e7d4960f", "ff55799950e4cc2b549b09c24141c10a99d1c5fd" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Aug 01 14:37:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 01 14:37:06 2017 +0000" }, "message": "DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours\nam: ff55799950 -s ours\n\nChange-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70\n" }, { "commit": "33676dddbdd37dc76c449e81ca8c5642f87a60c7", "tree": "6598bdc61e6747e1ea47562b44a868d46158a84e", "parents": [ "f18599a15b210c81232ec26462d70ec6a6f9fea0", "45d68cb35bafa155eeae018be6706c92ca336e72" ], "author": { "name": "Maggie Lee", "email": "mfylee@google.com", "time": "Tue Aug 01 14:31:23 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 01 14:31:23 2017 +0000" }, "message": "Merge \"power: gps: add gps read timeout\" into cw-f-dev" }, { "commit": "9295f58d26126f69d7944c322cb03040d87ba4e2", "tree": "79b626ec84a118fbd03c284a1a587cc7dc944f1f", "parents": [ "ff55799950e4cc2b549b09c24141c10a99d1c5fd", "f18599a15b210c81232ec26462d70ec6a6f9fea0" ], "author": { "name": "Andriy Naborskyy", "email": "andriyn@google.com", "time": "Tue Aug 01 14:30:05 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 01 14:30:05 2017 +0000" }, "message": "Merge changes I49a76582,Iac4b75bc into cw-f-dev\nam: f18599a15b\n\nChange-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f\n" }, { "commit": "ff55799950e4cc2b549b09c24141c10a99d1c5fd", "tree": "79b626ec84a118fbd03c284a1a587cc7dc944f1f", "parents": [ "65d806d0438f073f93403c48a571b4d66434a073", "456b91561d2060454dbaf4301cd8f3d0cb472711" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Tue Aug 01 14:30:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 01 14:30:02 2017 +0000" }, "message": "DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler\nam: 456b91561d -s ours\n\nChange-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad\n" }, { "commit": "f18599a15b210c81232ec26462d70ec6a6f9fea0", "tree": "478eee448c3f7d14dd427ce04661d83d1f9a8846", "parents": [ "a053eaa841c8619a7ed0e70ab0e4950df35c4f31", "456b91561d2060454dbaf4301cd8f3d0cb472711" ], "author": { "name": "Andriy Naborskyy", "email": "andriyn@google.com", "time": "Tue Aug 01 14:16:30 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 01 14:16:30 2017 +0000" }, "message": "Merge changes I49a76582,Iac4b75bc into cw-f-dev\n\n* changes:\n DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler\n DO NOT MERGE ANYWHERE ConnectivityService: safer locking\n" }, { "commit": "494f1a4dfa8abba5b468349a5375ec7a0194a91f", "tree": "35b9d2e7ded11473afc7bce7af4d4d85e9b20139", "parents": [ "101fca656d56896a9c53c12ca4c9c150444e111e" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Mon Jul 31 19:13:38 2017 -0700" }, "committer": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Mon Jul 31 19:41:01 2017 -0700" }, "message": "docs: Noted that JobIntentService is usually a better choice\n\nSince IntentService is subject to the O background restrictions,\nmost devs are better off switching to the new JobIntentService.\n(I assume IntentService is not actually deprecated; if it is, tell\nme and I\u0027ll change this to a @deprecated tag!)\n\nSee first comment for doc stage location.\n\nTest: make ds-docs\nBug: 64159987\nChange-Id: I83a53d1e6336c2134bf4c61bedd2ae42cd80493a\n" }, { "commit": "6b2d37ca25122e3285ddc657258378b9e7d4960f", "tree": "519c03908ea919f929677dfc76bbe3f3f4ba0429", "parents": [ "101fca656d56896a9c53c12ca4c9c150444e111e", "65d806d0438f073f93403c48a571b4d66434a073" ], "author": { "name": "Tyler Freeman", "email": "fuego@google.com", "time": "Tue Aug 01 01:33:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 01 01:33:44 2017 +0000" }, "message": "Merge \"DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)\" into cw-f-dev am: a053eaa841 -s ours\nam: 65d806d043 -s ours\n\nChange-Id: Ie89e28aae64abfc833ed97748654d509cd52c07b\n" }, { "commit": "65d806d0438f073f93403c48a571b4d66434a073", "tree": "79b626ec84a118fbd03c284a1a587cc7dc944f1f", "parents": [ "452b8f2bd32b29d8038e7f931e02c0a0198a9477", "a053eaa841c8619a7ed0e70ab0e4950df35c4f31" ], "author": { "name": "Tyler Freeman", "email": "fuego@google.com", "time": "Tue Aug 01 01:24:08 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 01 01:24:08 2017 +0000" }, "message": "Merge \"DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)\" into cw-f-dev\nam: a053eaa841 -s ours\n\nChange-Id: If8383edac561ad83edf182ee1c6e9687b180a1c2\n" }, { "commit": "a053eaa841c8619a7ed0e70ab0e4950df35c4f31", "tree": "0923089d1c137b1114a2e3a7a16b9ade5bcadf88", "parents": [ "a763fdba09862aaf77701d8563f223fbfe2400f9", "f6b59c80da416b7b069cb16e8ede83064ebf7919" ], "author": { "name": "Tyler Freeman", "email": "fuego@google.com", "time": "Tue Aug 01 01:10:44 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 01 01:10:44 2017 +0000" }, "message": "Merge \"DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)\" into cw-f-dev" }, { "commit": "45d68cb35bafa155eeae018be6706c92ca336e72", "tree": "77aa09ce7ff71235ae12d0fbef6cef9524566cc6", "parents": [ "a763fdba09862aaf77701d8563f223fbfe2400f9" ], "author": { "name": "z00208928", "email": "zhangwei519@huawei.com", "time": "Fri Jul 21 22:26:29 2017 +0800" }, "committer": { "name": "Zheng Zhang", "email": "zhzh@google.com", "time": "Mon Jul 31 23:40:30 2017 +0000" }, "message": "power: gps: add gps read timeout\n\nDuring download gps file, if network is disconnected, it do not release wakelock\nto prevent system to sleep and consume more power until network is connected.\nSo set gps read tiemout.\n\nBug: 33469278\n\nChange-Id: I41adf137559d88f76d9da6f63585bfdefc3117b1\nSigned-off-by: z00208928 \u003czhangwei519@huawei.com\u003e\n" }, { "commit": "f6b59c80da416b7b069cb16e8ede83064ebf7919", "tree": "228115357093f11b76f35f4f29632aedf29b6cbb", "parents": [ "581a166ae161afb836115989071c97b63c41303a" ], "author": { "name": "Stanley Tng", "email": "stng@google.com", "time": "Mon Apr 17 22:35:45 2017 -0700" }, "committer": { "name": "Tyler Freeman", "email": "fuego@google.com", "time": "Mon Jul 31 21:14:50 2017 +0000" }, "message": "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)\n\nThere are intermittent issues where either the returned Bluetooth\nMAC address to Java framework is uninitialized or this address update\narrives too late. This fix will do 2 things:\n(1) Returns error when MAC address is unavailable in the native code.\n(2) Updates the MAC address later by adding a new broadcast event.\n\nTest: Check address for these cases: factory reset, system reboot, and\nBluetooth re-enable.\nBug: 36709382\n\nMerged-In: I09720193e38fdf9139e1bb146f8e1847e2b65b1a\n(cherry picked from commit ad4d1d8e28618546953e75d4983335631feb6f2a)\n\nChange-Id: Ifae3adf6e2aad1f0811c03d3114d1bd0452e7c23\n" }, { "commit": "33681a94cff6b48bcf82fda1fcb53b8cf7cd38fe", "tree": "92f376bbd1bed057c04bff31fa5a1c5d339e25de", "parents": [ "81a1d589babb48247689d84c0edb14d9b813297f" ], "author": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Fri Jul 28 09:14:38 2017 -0700" }, "committer": { "name": "Felipe Leme", "email": "felipeal@google.com", "time": "Mon Jul 31 10:18:03 2017 -0700" }, "message": "Cherry-picked some Autofill Javadoc improvements from master.\n\nTest: m update-api\n\nBug: 64125551\nBug: 63669555\nBug: 63985284\n\nMerged-in: Iba4817f682670e9fd6d891ae221e1fa415252e99\nChange-Id: I82cbb54a522b2cf1dfb11aacc9735c932aa9af90\n" }, { "commit": "101fca656d56896a9c53c12ca4c9c150444e111e", "tree": "519c03908ea919f929677dfc76bbe3f3f4ba0429", "parents": [ "f173b2a4c34c96ab80c3186edb6d0710a242b764", "0ae9570c9925603a04d5a78775a68cc9d437542b" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Sat Jul 29 15:56:14 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jul 29 15:56:14 2017 +0000" }, "message": "Merge \"Add a missing null check\" into oc-dev" }, { "commit": "f173b2a4c34c96ab80c3186edb6d0710a242b764", "tree": "5be2c4598ea43b5d833b290fde977f53dafc21eb", "parents": [ "39cc33f192d528f250818446ea0418aaf0cfe41f", "452b8f2bd32b29d8038e7f931e02c0a0198a9477" ], "author": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Sat Jul 29 02:52:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jul 29 02:52:46 2017 +0000" }, "message": "DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am: a763fdba09 -s ours\nam: 452b8f2bd3 -s ours\n\nChange-Id: Iaee8bab95acf6490e468d1a0df66b6aea6e61398\n" }, { "commit": "452b8f2bd32b29d8038e7f931e02c0a0198a9477", "tree": "79b626ec84a118fbd03c284a1a587cc7dc944f1f", "parents": [ "603a43e5c39c55216206ca7e28736ffcd87ff8b9", "a763fdba09862aaf77701d8563f223fbfe2400f9" ], "author": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Sat Jul 29 02:46:12 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jul 29 02:46:12 2017 +0000" }, "message": "DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.\nam: a763fdba09 -s ours\n\nChange-Id: Id38ed8a73decbf2dc3ce4e657e69fe838acb50c1\n" }, { "commit": "a763fdba09862aaf77701d8563f223fbfe2400f9", "tree": "b0ea91c722a40d7b79dfce9109a2c1a70da8cf37", "parents": [ "581a166ae161afb836115989071c97b63c41303a" ], "author": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Tue Apr 18 11:26:26 2017 -0700" }, "committer": { "name": "Maggie Lee", "email": "mfylee@google.com", "time": "Sat Jul 29 01:20:18 2017 +0000" }, "message": "DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS.\n\nTest: manual\n\nBug:36973866\nChange-Id: Ia7168f313abebbf3c5c4fc26567ed914f1987a91\n(cherry picked from commit c5706f651a0462e9ae5a91c9a026d44710b1f8ea)\n" }, { "commit": "0ae9570c9925603a04d5a78775a68cc9d437542b", "tree": "519c03908ea919f929677dfc76bbe3f3f4ba0429", "parents": [ "39cc33f192d528f250818446ea0418aaf0cfe41f" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Fri Jul 28 15:35:06 2017 -0700" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Fri Jul 28 22:41:45 2017 +0000" }, "message": "Add a missing null check\n\nTest: manual\n\nbug::62755026\n\nChange-Id: Icf719d0e62986febd4d31f22be3e59d83c8e6e09\n" }, { "commit": "5b0a58ea45157efcf8b8d742fcc57f60a116ecc9", "tree": "151b155cc3f750ae86b060a8542408ddccbcefe2", "parents": [ "04d43a6a7b78c18fe3c894f25b08b3802df7f78f" ], "author": { "name": "Chien-Yu Chen", "email": "cychen@google.com", "time": "Fri Jul 28 14:52:05 2017 -0700" }, "committer": { "name": "Chien-Yu Chen", "email": "cychen@google.com", "time": "Fri Jul 28 15:15:39 2017 -0700" }, "message": "camera2: Fix template requirements\n\nSTILL_CAPTURE, RECORD, and VIDEO_SNAPSHOT templates are not\nguaranteed on depth only devices.\n\nTest: make docs\nBug: 64157646\nChange-Id: I1b2db9d919e136d640be0ca04f63b71e4603e542\n" }, { "commit": "39cc33f192d528f250818446ea0418aaf0cfe41f", "tree": "5be2c4598ea43b5d833b290fde977f53dafc21eb", "parents": [ "04d43a6a7b78c18fe3c894f25b08b3802df7f78f" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Fri Jul 28 13:10:33 2017 -0700" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Fri Jul 28 20:25:56 2017 +0000" }, "message": "Handle case for missing permissions - fix NPE\n\nTest: manual\n\nBug:62755026\n\nChange-Id: Ie4dddffdb055f6084d9420ae94d0de2a61574bd8\n" }, { "commit": "04d43a6a7b78c18fe3c894f25b08b3802df7f78f", "tree": "c8c2fde463fcf33258195f5758df80626ba4f340", "parents": [ "91f16ace4f3121a34b038dd453386b9d4daf826a", "fdad0ba193b597adfc5f1724cb1e368f11ebf825" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Jul 28 20:05:04 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 28 20:05:04 2017 +0000" }, "message": "Merge \"Cherry-pick from master Doc change: Add API 26 to @since list\" into oc-dev" }, { "commit": "91f16ace4f3121a34b038dd453386b9d4daf826a", "tree": "d91f7e603d6112a471af1fa1f5f230e5d93d852a", "parents": [ "adb8c522a84b5c7531b009b7a8d4c854ca7dee08", "05fef7ed69af434dc43c700a751140ecbbfd069d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 28 17:11:28 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 28 17:11:28 2017 +0000" }, "message": "Merge \"Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting\" into oc-dev" }, { "commit": "98ec92375d75630c10595bfcbae184ad7350e2d3", "tree": "c251420720ba964ff8027584a46ac226831076af", "parents": [ "784b56e1e64049d3bf81b7d8fa8c1ae3408c5886" ], "author": { "name": "Esteban Talavera", "email": "etalavera@google.com", "time": "Fri Jul 14 16:14:07 2017 +0100" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Jul 28 16:03:02 2017 +0100" }, "message": "Enforce policy for camera gesture in keyguard\n\nIf the admin has disabled the camera for secure\nkeyguards, in addition to removing the bottom-right hand\ncorner camera button do not allow the camera to be opened\nvia the camera gesture either.\n\nBug: 63334090\nMerged-In: I104688eaad719528376e2851f837d5956a6a1169\nTest: Manually tested launching the camera on secure and non-secure keyguard and non-keyguard, both via camera icon and gesture\nChange-Id: I104688eaad719528376e2851f837d5956a6a1169\n" }, { "commit": "65f02e8ba7a9f013d6971b3d6d1bd95f1785cb3d", "tree": "c63ad36d9a2d1ac85697b225fb93ff0573ea57de", "parents": [ "0ddd7e471489b1df50deb0e451df74006c8c9d3a" ], "author": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Jul 28 11:53:56 2017 +0100" }, "committer": { "name": "Tony Mak", "email": "tonymak@google.com", "time": "Fri Jul 28 15:25:29 2017 +0100" }, "message": "Enforce policy for camera gesture in keyguard\n\nTest:\n1. Set lock screen, set keyguard policy. Lock the device.\n Observe that double tap is not showing camera\n\n2. Set lock screen, unset the keyguard policy. Lock the device.\n Observe that double tap is showing camera\n\n3. Unset lock screen (swipe), set the keyguard policy. Lock the device.\n Observe that double tap is showing camera.\n\n4. Unset lock screen (swipe), unset the keyguard policy. Lock the device.\n Observe that double tap is showing camera.\n\nBug: 63787722\nMerged-In: I104688eaad719528376e2851f837d5956a6a1169\n\nChange-Id: I42e6d9015682998176fe41971356bde22e1b37b2\n" } ], "next": "05fef7ed69af434dc43c700a751140ecbbfd069d" }