)]}' { "log": [ { "commit": "d90a56fadcdf3b367de5cfee8067f44f55508a34", "tree": "dda185bde6275e94b9ecaf85e1a858a31f161a2e", "parents": [ "6cf1a66348731ea10a835fd852f379ebbea41ee9", "27f7a866f5dad2dac82ac04a9fc312308220ba92" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Dec 12 16:49:30 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 12 16:49:30 2012 -0800" }, "message": "Merge \"Track app and display wakelocks separately.\"" }, { "commit": "27f7a866f5dad2dac82ac04a9fc312308220ba92", "tree": "d127eca8d595b60308c07c2c506f918d623e5c67", "parents": [ "fba73030d674b3cd29ffe8519aa41738b54ae827" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Dec 12 15:43:31 2012 -0800" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Dec 12 16:20:17 2012 -0800" }, "message": "Track app and display wakelocks separately.\n\nChange the power manager to use two different kernel wakelocks\nto distinguish between an application or the display keeping the\nCPU alive. This may help make the output of \"dumpsys batteryinfo\"\neasier to interpret.\n\nBug: 7726759\nChange-Id: Iaff96ad74030d00200617b459679ea16390a8da5\n" }, { "commit": "6cf1a66348731ea10a835fd852f379ebbea41ee9", "tree": "92e48a9ff65f0d9361bf6bd0ee86ce5e7f36d30b", "parents": [ "a52b503b2e992973b81d87bed5353e7fd47d9528", "ae44659f30ddaba67581fbdf9c9255ac982d45ab" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Wed Dec 12 15:35:57 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 12 15:35:57 2012 -0800" }, "message": "Merge \"Call adjustWallpaperWindowsLocked once per pass.\"" }, { "commit": "0490f02eb72adcfd652f5e8373bf0a6c99592d54", "tree": "56007d3c7be1685bc24c11f99daa6172be27293f", "parents": [ "ddb622e7287921d2260d083e565f1dc9af9dfa22", "4d254266a406b20273b00840a9426fd6d257ee2c" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Wed Dec 12 12:43:29 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 12 12:43:36 2012 -0800" }, "message": "Merge \"Remove unused code.\"" }, { "commit": "08138941189e42829b39824162447483cc9b4858", "tree": "c575ebb7295ee7f024b654a210cc9fc7c9e35f83", "parents": [ "7efad644c5e2bd30d5d0bf2337521f7895f71d0a", "764bc0a7ae9c623f18aceadda2d5d894b1bf4024" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Dec 12 11:11:13 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 12 11:11:13 2012 -0800" }, "message": "am 764bc0a7: am bf8de6a3: Merge \"Remove unnecessary locking for screen broadcasts.\"\n\n* commit \u0027764bc0a7ae9c623f18aceadda2d5d894b1bf4024\u0027:\n Remove unnecessary locking for screen broadcasts.\n" }, { "commit": "764bc0a7ae9c623f18aceadda2d5d894b1bf4024", "tree": "1eaece6df9f8345f0220504e3d1784407801ecfb", "parents": [ "e08791c8318216b7934742681edfab57b8147d78", "bf8de6a349e19b32a1577080a9d8bb7f92b2301f" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Dec 12 11:06:36 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 12 11:06:36 2012 -0800" }, "message": "am bf8de6a3: Merge \"Remove unnecessary locking for screen broadcasts.\"\n\n* commit \u0027bf8de6a349e19b32a1577080a9d8bb7f92b2301f\u0027:\n Remove unnecessary locking for screen broadcasts.\n" }, { "commit": "bf8de6a349e19b32a1577080a9d8bb7f92b2301f", "tree": "c81d2617fc28604f67d56929032338ded0be08fb", "parents": [ "e7ec492f13355888c90b3f08fbc66e49dda7ed24", "29afa142402b4b4f5e56f36b24367b84b5f64a6a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Dec 12 10:41:20 2012 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 12 10:41:20 2012 -0800" }, "message": "Merge \"Remove unnecessary locking for screen broadcasts.\"" }, { "commit": "4d254266a406b20273b00840a9426fd6d257ee2c", "tree": "8822ff0f55573663fda589bdebf819716a770ed5", "parents": [ "efafb775007e76bf50e7a3ce5b63c81c7965d6ab" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Wed Dec 12 10:38:40 2012 -0800" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Wed Dec 12 10:38:40 2012 -0800" }, "message": "Remove unused code.\n\nChange-Id: I6785cea91c0ab2c367645201fb8862dbf1a55773\n" }, { "commit": "ae44659f30ddaba67581fbdf9c9255ac982d45ab", "tree": "b0c94e079857a96ea1d6961f27bb9d2ba3a8c65c", "parents": [ "28db1975802374985f2cb8bf4aedc7f5a9e81a22" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Dec 06 19:05:05 2012 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Wed Dec 12 10:09:19 2012 -0800" }, "message": "Call adjustWallpaperWindowsLocked once per pass.\n\nAlso refactor a few methods and improve logging.\n\nChange-Id: Ic54a1ff99f6de732b31cda5c06d36e8de01a269c\n" }, { "commit": "1d42a09715a17e13c4c68e133bcae40ee9935638", "tree": "5ebb57d090efd76b9ec51dbd4fc778acc931ed72", "parents": [ "1423fa30c216ccdbbebbfa3fb120b3a7d17b073a", "f6610e2d7d883653ef80077df649e4dd91c221c1" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue Dec 11 16:54:33 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 16:54:33 2012 -0800" }, "message": "am f6610e2d: am 79e0e3fd: Merge \"return value of String.replace() is ignored.\"\n\n* commit \u0027f6610e2d7d883653ef80077df649e4dd91c221c1\u0027:\n return value of String.replace() is ignored.\n" }, { "commit": "f6610e2d7d883653ef80077df649e4dd91c221c1", "tree": "cf3dabcf328ccdce0abaa5232e2442b741be5ee9", "parents": [ "1de623939090993d03a7c398d09e2d13950d682b", "79e0e3fd69ba6426da6575e0c778eff205318172" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue Dec 11 16:52:39 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 16:52:39 2012 -0800" }, "message": "am 79e0e3fd: Merge \"return value of String.replace() is ignored.\"\n\n* commit \u002779e0e3fd69ba6426da6575e0c778eff205318172\u0027:\n return value of String.replace() is ignored.\n" }, { "commit": "79e0e3fd69ba6426da6575e0c778eff205318172", "tree": "25206a512d98130a55ba462f2c5ead8e0cdbdeef", "parents": [ "7419905676db3cecb011d7e63a0eb64421e02b55", "d7663955d0e00ddc7e93e1cc70559857c3fdb2eb" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue Dec 11 16:34:35 2012 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 11 16:34:35 2012 -0800" }, "message": "Merge \"return value of String.replace() is ignored.\"" }, { "commit": "1423fa30c216ccdbbebbfa3fb120b3a7d17b073a", "tree": "79af7b4693da8ae818e68a73a1aa3a69534b01f7", "parents": [ "0c312368cb21a15f7249cad58a714c8d57408c66", "1de623939090993d03a7c398d09e2d13950d682b" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Dec 11 16:15:38 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 16:15:38 2012 -0800" }, "message": "am 1de62393: am 534de491: Merge \"Make immersive mode public \u0026 imply update locking\" into jb-mr1-aah-dev\n\n* commit \u00271de623939090993d03a7c398d09e2d13950d682b\u0027:\n Make immersive mode public \u0026 imply update locking\n" }, { "commit": "1de623939090993d03a7c398d09e2d13950d682b", "tree": "12dc222d55bfc246146d8e0bc6eb3bab4799d326", "parents": [ "8f276515ea7204f54c773c29eb14a9346f2fa973", "534de491e6522465a7ad12d7cba9b2f80deab364" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Dec 11 16:13:51 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 16:13:51 2012 -0800" }, "message": "am 534de491: Merge \"Make immersive mode public \u0026 imply update locking\" into jb-mr1-aah-dev\n\n* commit \u0027534de491e6522465a7ad12d7cba9b2f80deab364\u0027:\n Make immersive mode public \u0026 imply update locking\n" }, { "commit": "534de491e6522465a7ad12d7cba9b2f80deab364", "tree": "3b514e4bb459eb817adf3dd7b23ea3889a8fbc93", "parents": [ "ae5cc8687b4fde98449cbec1fd9a610557ff1b5d", "73c2aee40a0e0ab2e8bd2bbbc560aa31c38eaac2" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Tue Dec 11 16:10:52 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 11 16:11:00 2012 -0800" }, "message": "Merge \"Make immersive mode public \u0026 imply update locking\" into jb-mr1-aah-dev" }, { "commit": "0c312368cb21a15f7249cad58a714c8d57408c66", "tree": "bfedae7fbd97df19fcef07bc391db7cacc579e89", "parents": [ "ace7404de8b9a5bd7566027a8a90d36d099a46f4", "8f276515ea7204f54c773c29eb14a9346f2fa973" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Dec 11 15:27:26 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 15:27:26 2012 -0800" }, "message": "am 8f276515: am ae5cc868: am 2735795f: Merge \"If freeCache deletes APK, give out of space error\" into jb-mr1.1-dev\n\n* commit \u00278f276515ea7204f54c773c29eb14a9346f2fa973\u0027:\n If freeCache deletes APK, give out of space error\n" }, { "commit": "ace7404de8b9a5bd7566027a8a90d36d099a46f4", "tree": "c01fc20897525d49aecd56c4fc6a672fceed3089", "parents": [ "fba73030d674b3cd29ffe8519aa41738b54ae827", "d7337fb97aab0b28c6ca60f6553d03feb1000991" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 11 15:21:02 2012 -0800" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 11 15:21:02 2012 -0800" }, "message": "resolved conflicts for merge of d7337fb9 to master\n\nChange-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0\n" }, { "commit": "8f276515ea7204f54c773c29eb14a9346f2fa973", "tree": "dc63f7f9eed7fd33f522ff4edd65a9819ab901fc", "parents": [ "d7337fb97aab0b28c6ca60f6553d03feb1000991", "ae5cc8687b4fde98449cbec1fd9a610557ff1b5d" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Dec 11 15:12:49 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 15:12:49 2012 -0800" }, "message": "am ae5cc868: am 2735795f: Merge \"If freeCache deletes APK, give out of space error\" into jb-mr1.1-dev\n\n* commit \u0027ae5cc8687b4fde98449cbec1fd9a610557ff1b5d\u0027:\n If freeCache deletes APK, give out of space error\n" }, { "commit": "ae5cc8687b4fde98449cbec1fd9a610557ff1b5d", "tree": "eb1c7e954173f3b3b1293e5e0e393fc70fcdf2a8", "parents": [ "3781523becbb2d576761c2701763ff3588294a97", "2735795f5aa906fbfd885dbacee1de0b41b80bf0" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Dec 11 15:10:47 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 15:10:47 2012 -0800" }, "message": "am 2735795f: Merge \"If freeCache deletes APK, give out of space error\" into jb-mr1.1-dev\n\n* commit \u00272735795f5aa906fbfd885dbacee1de0b41b80bf0\u0027:\n If freeCache deletes APK, give out of space error\n" }, { "commit": "2735795f5aa906fbfd885dbacee1de0b41b80bf0", "tree": "37138e5351033f3c25175f0c2fe0f358c72e1a7d", "parents": [ "eaae7d976a5629e064af06f0e2c10f97f1a8c462", "3f96d0e127542a5fc1eb00e2c327d909669c4f52" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Dec 11 15:07:53 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 11 15:07:54 2012 -0800" }, "message": "Merge \"If freeCache deletes APK, give out of space error\" into jb-mr1.1-dev" }, { "commit": "d7337fb97aab0b28c6ca60f6553d03feb1000991", "tree": "d07afd7096bc1d314b9b5c86d387c9468eb54cb2", "parents": [ "5ccefdd6d570a084ce708d7f4654358ef7108451", "3781523becbb2d576761c2701763ff3588294a97" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 11 14:19:41 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 14:19:41 2012 -0800" }, "message": "am 3781523b: am eaae7d97: Merge \"Play a tone when wireless charging begins.\" into jb-mr1.1-dev\n\n* commit \u00273781523becbb2d576761c2701763ff3588294a97\u0027:\n Play a tone when wireless charging begins.\n" }, { "commit": "3781523becbb2d576761c2701763ff3588294a97", "tree": "2633c97263bcceff4861e9e9f01f3e866f665d64", "parents": [ "49cc9cb85376bad11611966fcdbe58dae1ab7a56", "eaae7d976a5629e064af06f0e2c10f97f1a8c462" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 11 14:17:50 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 14:17:50 2012 -0800" }, "message": "am eaae7d97: Merge \"Play a tone when wireless charging begins.\" into jb-mr1.1-dev\n\n* commit \u0027eaae7d976a5629e064af06f0e2c10f97f1a8c462\u0027:\n Play a tone when wireless charging begins.\n" }, { "commit": "eaae7d976a5629e064af06f0e2c10f97f1a8c462", "tree": "cfd2159215f2f7caad10bb7c281c7339c136a58c", "parents": [ "5def50da0de624abeafafe71dc72b4baf423b985", "84e2756c0f3794c6efe5568a9d09101ba689fb39" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 11 14:14:54 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 11 14:14:54 2012 -0800" }, "message": "Merge \"Play a tone when wireless charging begins.\" into jb-mr1.1-dev" }, { "commit": "3f96d0e127542a5fc1eb00e2c327d909669c4f52", "tree": "0800072277f22cf607503986765c0fcb950010d9", "parents": [ "d39a0d8041cec16429331937ec81d55f18b0db72" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Dec 11 12:48:08 2012 -0800" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Dec 11 13:35:43 2012 -0800" }, "message": "If freeCache deletes APK, give out of space error\n\nAfter DownloadManager has downloaded an application to cache to install\nduring low memory condition, we try to free cache to fit the new\napplication. The free cache function deletes older files first, but it\nwill also delete the downloaded application (since it\u0027s in cache) as a\nlast resort since installd has no context about it.\n\nThis just changes the error code returned in this case so that we\u0027ll\ngive something more meaningful to the user. A later fix should actually\nmake this more sane. For instance: know which file to avoid deleting,\nnot even trying to delete anything if it won\u0027t arrive at the desired\nfree space.\n\nBug: 7684538\nChange-Id: Ide77320fc51a4f692ef8042cb0eafe17b5cd279d\n" }, { "commit": "84e2756c0f3794c6efe5568a9d09101ba689fb39", "tree": "21927b498b4d35e2afaf2687ef09e86277d70267", "parents": [ "32b424f7240580e3948f44559050262e18de99d8" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Dec 07 13:56:34 2012 -0800" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 11 12:55:03 2012 -0800" }, "message": "Play a tone when wireless charging begins.\n\nOnly plays a tone if the battery level is below 95% which\nis the same heuristic used when determining whether to turn\nthe screen on.\n\nUse new low battery and wireless charging sounds on Mako.\n\nBug: 7371658\nChange-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24\n" }, { "commit": "bbb970386026ec16b3cff1be280d0b9160cacad4", "tree": "3940325e7225fd8734de8d5327a97b47a228adb9", "parents": [ "4f67c7515b79e62d2fc33233cf5a4e2b6d21fc7f", "5ccefdd6d570a084ce708d7f4654358ef7108451" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Dec 11 11:59:28 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 11:59:28 2012 -0800" }, "message": "am 5ccefdd6: am 49cc9cb8: am 5def50da: Merge \"Fallback to default dream if the current dream is removed.\" into jb-mr1.1-dev\n\n* commit \u00275ccefdd6d570a084ce708d7f4654358ef7108451\u0027:\n Fallback to default dream if the current dream is removed.\n" }, { "commit": "5ccefdd6d570a084ce708d7f4654358ef7108451", "tree": "b37f4a514e9060faba74dae073d4d3b0e1563ade", "parents": [ "6c0ad7a0644a393e3a89a35fbd80e8f86458585c", "49cc9cb85376bad11611966fcdbe58dae1ab7a56" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Dec 11 11:56:56 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 11:56:56 2012 -0800" }, "message": "am 49cc9cb8: am 5def50da: Merge \"Fallback to default dream if the current dream is removed.\" into jb-mr1.1-dev\n\n* commit \u002749cc9cb85376bad11611966fcdbe58dae1ab7a56\u0027:\n Fallback to default dream if the current dream is removed.\n" }, { "commit": "49cc9cb85376bad11611966fcdbe58dae1ab7a56", "tree": "c5caa4bc84bb03f4f930166ee47c7c12dcfbb6cb", "parents": [ "c39adf91c9d99eea31d9e83fa3c905516ebbb37e", "5def50da0de624abeafafe71dc72b4baf423b985" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Dec 11 11:53:53 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 11 11:53:53 2012 -0800" }, "message": "am 5def50da: Merge \"Fallback to default dream if the current dream is removed.\" into jb-mr1.1-dev\n\n* commit \u00275def50da0de624abeafafe71dc72b4baf423b985\u0027:\n Fallback to default dream if the current dream is removed.\n" }, { "commit": "03cb98aecfeef0b0894f69987f8b4a15c02501f3", "tree": "9bc900ba51fb0099160983ff70e758d1bc3d7112", "parents": [ "e03c17f1cb50a7869ef33406a2be275fdb040ea1" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 11:14:58 2012 -0800" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 11:15:25 2012 -0800" }, "message": "Move Observer test to servicetests\n\nChange-Id: Ib3493af4eb3185db79004a3cad5473161ed51f71\n" }, { "commit": "e03c17f1cb50a7869ef33406a2be275fdb040ea1", "tree": "a6ab13533af6f621f67003e57c0ccddb97cff89d", "parents": [ "28db1975802374985f2cb8bf4aedc7f5a9e81a22", "814a8d35ae11b70027e0e476ca1c0bb589106b4d" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 11:08:06 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 11 11:08:06 2012 -0800" }, "message": "Merge \"Move one more test.\"" }, { "commit": "814a8d35ae11b70027e0e476ca1c0bb589106b4d", "tree": "ddebfe69aa178ba17e80be807253f30bb7447858", "parents": [ "16db3c72c09bb03b6d418893686e837fa89b601b" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 11:06:21 2012 -0800" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 11:06:21 2012 -0800" }, "message": "Move one more test.\n\nChange-Id: Iea0e0b5727746f2332db2ab1c1b216326eb50f13\n" }, { "commit": "28db1975802374985f2cb8bf4aedc7f5a9e81a22", "tree": "708a2dfc8ac26fbabca87d35f4c6f91a42fb2fe1", "parents": [ "3a57213c2d54c5f5e7e95c944ef30e6c239162ae", "66f78d7a979775efb148873797bac4584ddb3b83" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 11 10:51:30 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 11 10:51:30 2012 -0800" }, "message": "Merge \"Share the pending layout changes\"" }, { "commit": "3a57213c2d54c5f5e7e95c944ef30e6c239162ae", "tree": "c96b0f132de61d5123430260fdf3f62fe8492f4b", "parents": [ "74c9671855b436816e36d407b85d781c38095a50", "8ff9a156c04c24458d94c716a64a5b7327f0e987" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 10:43:00 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 11 10:43:45 2012 -0800" }, "message": "Merge \"Fix build. Forgot to move this test.\"" }, { "commit": "74c9671855b436816e36d407b85d781c38095a50", "tree": "2c589f194e438aaec6eebffef712516722d47a2f", "parents": [ "16db3c72c09bb03b6d418893686e837fa89b601b", "968683335e17c06504a11bc2e38a2580f613ea16" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 11 10:42:21 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 11 10:42:42 2012 -0800" }, "message": "Merge \"Recouple layout and animation a bit.\"" }, { "commit": "8ff9a156c04c24458d94c716a64a5b7327f0e987", "tree": "3d0c2ad0d1f6b1627dc2983f9a612e471f443efa", "parents": [ "16db3c72c09bb03b6d418893686e837fa89b601b" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 10:42:09 2012 -0800" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 10:42:09 2012 -0800" }, "message": "Fix build. Forgot to move this test.\n\nChange-Id: I06aab8ec6e2dac86b65bbeed3587444260fec2e8\n" }, { "commit": "16db3c72c09bb03b6d418893686e837fa89b601b", "tree": "f6a7e88960d9b6bfad90a3b867a0ffb52b83da15", "parents": [ "07ce6511378ef2942f8238bb34cfa5116667cbb0", "7a96c39c510923ef73bbb06ab20109f0168b8eb1" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 10:03:38 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 11 10:04:07 2012 -0800" }, "message": "Merge \"Move lingering services to services.jar.\"" }, { "commit": "07ce6511378ef2942f8238bb34cfa5116667cbb0", "tree": "9519dea0865685b0358b97f4aae32c17a8280735", "parents": [ "151cb90c6093d5b4371b9367b507f8aa7c1a4370", "ccc9e9b9365ee149c97589524b2abab2f381c6c8" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 11 09:54:22 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 11 09:54:22 2012 -0800" }, "message": "Merge \"Further refine test for window gone.\"" }, { "commit": "7a96c39c510923ef73bbb06ab20109f0168b8eb1", "tree": "70fd480a814add0fdcb274540e1f421806020f24", "parents": [ "151cb90c6093d5b4371b9367b507f8aa7c1a4370" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Nov 15 14:01:46 2012 -0800" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 11 09:50:50 2012 -0800" }, "message": "Move lingering services to services.jar.\n\nThis helps reduce the pressure on framework.jar, and makes it clear\nthat it should only be used by the system_server.\n\nBug: 7333397\nChange-Id: I0858904239535380fbf30562b793e277d8c3f054\n" }, { "commit": "ccc9e9b9365ee149c97589524b2abab2f381c6c8", "tree": "e8fe935fd4becbe4724e06f9e8ea0abc1a874c11", "parents": [ "83323f427d3c3e9b9a76c4cb6f76a5707cc686bd" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 11 09:40:34 2012 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 11 09:49:38 2012 -0800" }, "message": "Further refine test for window gone.\n\nDo not treat a window that is animating as being onscreen until it\nhas been drawn. The indication that a window was \"gone\" was occurring\ntoo soon resulting in windows appearing before the status bar came\nback and having to be drawn twice, with and without the status bar.\nBy waiting for the window to be drawn the status bar appears and the\nwindow does not have to get redrawn.\n\nBug 7696315 fixed.\n\nChange-Id: Ic93bf6eed03cf12a92a656791725a6d26e0ad0e9\n" }, { "commit": "73c2aee40a0e0ab2e8bd2bbbc560aa31c38eaac2", "tree": "a540919f09c77891eb647765e473ea2d1e7c1359", "parents": [ "3aecb61bebbe038b74b5e0d96acbb7142835127e" ], "author": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Thu Mar 15 16:27:14 2012 -0700" }, "committer": { "name": "Christopher Tate", "email": "ctate@google.com", "time": "Mon Dec 10 18:40:57 2012 -0800" }, "message": "Make immersive mode public \u0026 imply update locking\n\nActivity.setImmersive(boolean) / android:immersive\u003d\"bool\" are now public.\nIn addition, if the foreground activity is immersive then an update lock\nwill be held on its behalf. This lets applications such as movie players\nsuppress the display of intrusive notifications, OTA-availability dialogs,\nand the like while they are displaying content that ought not to be\nrudely interrupted.\n\nThe update lock aspect of this mode is *advisory*, not binding -- the\nupdate mechanism is not actually constrained; it simply uses this information\nin deciding whether/when to prompt the user. It\u0027s more a guideline than\na rule.\n\nBug 7681380\n\nChange-Id: I3c412a84cbf3933e3bf0168f2c71c54a86e4b7e5\n" }, { "commit": "d44280e28884085f014806d53413ec5a68d0ac25", "tree": "1c255c754481f793390ad10ee03366ab775845cc", "parents": [ "f930fee835ab51400509c054f9a850715ddc6c24", "ebcbfb3fc7750e2873a3e7c6c707fa4e203089b6" ], "author": { "name": "Mita Yun", "email": "mitayun@google.com", "time": "Mon Dec 10 16:50:22 2012 -0800" }, "committer": { "name": "Mita Yun", "email": "mitayun@google.com", "time": "Mon Dec 10 16:50:22 2012 -0800" }, "message": "resolved conflicts for merge of ebcbfb3f to master\n\nChange-Id: I0658dd4a1418fbad91d9663e5b52418a979dc683\n" }, { "commit": "ebcbfb3fc7750e2873a3e7c6c707fa4e203089b6", "tree": "3b2dc9d7cee24cb18c01d04e3d80aa20c116c4cd", "parents": [ "a41474d45c455c98bae9986b626374cb626886ce", "a98cd5122be643a51f563d02069e8f9409d44394" ], "author": { "name": "Mita Yun", "email": "mitayun@google.com", "time": "Mon Dec 10 15:35:05 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 10 15:35:05 2012 -0800" }, "message": "am a98cd512: Merge \"Use asynchronous messages for input method events.\" into jb-mr1-aah-dev\n\n* commit \u0027a98cd5122be643a51f563d02069e8f9409d44394\u0027:\n Use asynchronous messages for input method events.\n" }, { "commit": "bbdb062d98275f6833ebc2f0998b9e2a6534cecb", "tree": "5494e85d5cdee6ed398bf90ec1f4c081a088893b", "parents": [ "8642f406dcfa23836903540c7ecb0895e1e7ac4d" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Mon Dec 10 18:15:07 2012 -0500" }, "committer": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Mon Dec 10 18:15:07 2012 -0500" }, "message": "Fallback to default dream if the current dream is removed.\n\nTo minimize fix size, return only valid dreams from the service api.\n\nSettings will \"just work\" with no changes.\n\nBug:7699398\nChange-Id: I3eb88237a8ccc421fdb68d1de19820614b13d7b8\n" }, { "commit": "a98cd5122be643a51f563d02069e8f9409d44394", "tree": "b974a4edab29639de66f1fbc88aeeece6e299e91", "parents": [ "ecacbd266a7bfe52610066ec44439977cc067a98", "ed218c706d9e91e75b94c448cee2e6150aaee57f" ], "author": { "name": "Mita Yun", "email": "mitayun@google.com", "time": "Mon Dec 10 14:37:26 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 10 14:37:38 2012 -0800" }, "message": "Merge \"Use asynchronous messages for input method events.\" into jb-mr1-aah-dev" }, { "commit": "961ce2afbf82d4b2a9691f1c1cc75a97ce43fe2b", "tree": "2a97e9b90fe9b7eac855356701a1b044a32b264d", "parents": [ "524962c8cf796035f7578515ba48080873d46057", "2588648b5268526bdc9ed7fb4e9eac36c8c693dc" ], "author": { "name": "Sascha Prueter", "email": "saschap@google.com", "time": "Fri Dec 07 12:40:32 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 07 12:40:32 2012 -0800" }, "message": "am 2588648b: am 203f69f0: Merge \"Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE\" into jb-mr1.1-dev\n\n* commit \u00272588648b5268526bdc9ed7fb4e9eac36c8c693dc\u0027:\n Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE\n" }, { "commit": "2588648b5268526bdc9ed7fb4e9eac36c8c693dc", "tree": "a04f2e1d955cdd049866ce1677be06cae748cb1e", "parents": [ "fa455b47002bbbc4faadf5d8f965b3fa9738fbf6", "203f69f0998d982205b1c9f550576024654e6bc3" ], "author": { "name": "Sascha Prueter", "email": "saschap@google.com", "time": "Fri Dec 07 12:38:15 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 07 12:38:15 2012 -0800" }, "message": "am 203f69f0: Merge \"Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE\" into jb-mr1.1-dev\n\n* commit \u0027203f69f0998d982205b1c9f550576024654e6bc3\u0027:\n Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE\n" }, { "commit": "cd252d267b09d6838e9c363c87befd4697d45b53", "tree": "f67d2adb05ae196a3dd601c0d89391f6ab8df63c", "parents": [ "461c8534e1b278cfa09da56b3691b1ef3de824d7", "524962c8cf796035f7578515ba48080873d46057" ], "author": { "name": "Adam Powell", "email": "adamp@android.com", "time": "Fri Dec 07 12:24:20 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 07 12:24:20 2012 -0800" }, "message": "am 524962c8: am ff411ddb: Merge \"Framework: Use holo alert drawables\"\n\n* commit \u0027524962c8cf796035f7578515ba48080873d46057\u0027:\n Framework: Use holo alert drawables\n" }, { "commit": "524962c8cf796035f7578515ba48080873d46057", "tree": "5b10b24339ed8b1e7fd6c65c0cd4755296d7af4b", "parents": [ "d9cb3c538f034c4e5137a2d2827cc72f8fbaf67e", "ff411ddb40d250f075bfe8c4940931b27079f5cb" ], "author": { "name": "Adam Powell", "email": "adamp@android.com", "time": "Fri Dec 07 12:21:41 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 07 12:21:41 2012 -0800" }, "message": "am ff411ddb: Merge \"Framework: Use holo alert drawables\"\n\n* commit \u0027ff411ddb40d250f075bfe8c4940931b27079f5cb\u0027:\n Framework: Use holo alert drawables\n" }, { "commit": "aec227148d00e2d0ac438ea538b7e28aea766021", "tree": "7b648648015e3c2de57fd958c4d0d2a448fe455a", "parents": [ "d6afe94a2a9109db30fa5f9fc7182f23d1a08b45", "5b6069ce3a87d30960e9ef5870299db90090776b" ], "author": { "name": "Victoria Lease", "email": "violets@android.com", "time": "Fri Dec 07 12:18:37 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 07 12:18:37 2012 -0800" }, "message": "am 5b6069ce: Merge \"Wrong parameter in LocationManagerService\"\n\n* commit \u00275b6069ce3a87d30960e9ef5870299db90090776b\u0027:\n Wrong parameter in LocationManagerService\n" }, { "commit": "4abf3f987f1d7c1ca909c4b4008796e1a5851951", "tree": "4563ed62ef4c35eed483331722e9a556a06ebc67", "parents": [ "2b89f73ef805022c4e8b9bad545c1aa0421e5586" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Dec 06 22:27:59 2012 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Dec 07 11:21:35 2012 -0800" }, "message": "Call setSize to sync Surface to SurfaceFlinger. DO NOT MERGE\n\nRecentsActivity screenshots are called for very quickly after\nWindowStateAnimator prepareSurface(). Without enough delay the\nSurface.setLayer call does not propagate to the SurfaceFlinger\nand the screenshot is incorrect (black) because it stops sampling\nthe layers too early.\n\nThis fix calls Surface.setSize() for each sampled Surface in\nscreenshots. setSize forces the SurfaceFlinger to process all\ntransactions queued before returning from closeTransaction.\n\nBug 7552304 fixed.\n\nChange-Id: I1911dfa0b09cab713c55f5ba0c612496337a77df\n\nConflicts:\n\n\tservices/java/com/android/server/wm/WindowManagerService.java\n" }, { "commit": "ff411ddb40d250f075bfe8c4940931b27079f5cb", "tree": "e035754b1d579b549f85a86d09de753450ea77ef", "parents": [ "8ea5ce15651ebc1249a3b80531773b37e6f49b8d", "1129a85203ac3f238b95c4795397d84c81c01094" ], "author": { "name": "Adam Powell", "email": "adamp@android.com", "time": "Fri Dec 07 11:20:08 2012 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 07 11:20:08 2012 -0800" }, "message": "Merge \"Framework: Use holo alert drawables\"" }, { "commit": "ad5814b5b118801a6de5147119e58d7494383bce", "tree": "3fa3c2e9f9b488b142abbbacbb647d7832c32632", "parents": [ "1a10de0f6be13dcb3630ef1bec86ae0ff6a035e4", "bc36b52372be154994f19a9e767184b2d6b4783a" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Thu Dec 06 18:59:01 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 06 18:59:01 2012 -0800" }, "message": "am bc36b523: am 7b085571: Merge \"DO NOT MERGE Adjust update interval when expiring location requests.\" into jb-mr1.1-dev\n\n* commit \u0027bc36b52372be154994f19a9e767184b2d6b4783a\u0027:\n DO NOT MERGE Adjust update interval when expiring location requests.\n" }, { "commit": "ed218c706d9e91e75b94c448cee2e6150aaee57f", "tree": "e3a886680edf70b22df31d46d1948121f38de614", "parents": [ "c56a57f7d775e7b097c62f9e8fb809467dc5cf0c" ], "author": { "name": "Mita Yun", "email": "mitayun@google.com", "time": "Thu Dec 06 17:18:25 2012 -0800" }, "committer": { "name": "Mita Yun", "email": "mitayun@google.com", "time": "Thu Dec 06 18:11:32 2012 -0800" }, "message": "Use asynchronous messages for input method events.\n\nImproves the throughput of IME event handling by ensuring that\ninput events do not get serialized behind UI traversal and\ndrawing messages such as when the UI is animating.\n\nAdded support for creating an asynchronous Handler as part of a\nHandlerCaller. It turns out we should be using an asynchronous\nHandler not only in IME dispatch but also in accessibility and\nwallpaper events where HandlerCaller is used. So fixed those\nservices to also use an asynchronous Handler.\n\nChange-Id: I0b19140c9d5ca6ee300c1a150c48312fd55ed8eb\n" }, { "commit": "5b6069ce3a87d30960e9ef5870299db90090776b", "tree": "6db0eb6f619b000869c4e901e540116c85cc65e6", "parents": [ "1612e29826dfe55f8deca27374046c5931ce5335", "87c1b3127e6fecf08dfad039a4ee6eac1e3756fb" ], "author": { "name": "Victoria Lease", "email": "violets@android.com", "time": "Thu Dec 06 12:45:45 2012 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 06 12:45:46 2012 -0800" }, "message": "Merge \"Wrong parameter in LocationManagerService\"" }, { "commit": "dcf03f39725deec68f644f6162fdfcc884dc9964", "tree": "ba70eaebefeafd3de60c27534970214487262ba1", "parents": [ "9950edcdcf6eea0495ba71fa35555bbbbd26954e" ], "author": { "name": "Jianzheng Zhou", "email": "jianzheng.zhou@freescale.com", "time": "Fri Nov 16 13:45:20 2012 +0800" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Dec 06 12:00:04 2012 -0800" }, "message": "Refactor getPersistedNetworkPreference\n\nOptimize for updating mNetworkPreference according to device\u0027s networkAttributes\nsetting from overlay config.xml when connectivityservice start.\n\nChange-Id: I90286332d4f453038f1ddac7dd9d1265d96b4859\nSigned-off-by: Jianzheng Zhou \u003cjianzheng.zhou@freescale.com\u003e\n" }, { "commit": "87c1b3127e6fecf08dfad039a4ee6eac1e3756fb", "tree": "fe6bc4592392fb32ad589694a2a79c94a2a074e2", "parents": [ "568f923ba4cf522f699837bee0d8cba318343345" ], "author": { "name": "You Kim", "email": "you.kim72@gmail.com", "time": "Sun Oct 28 03:58:44 2012 +0900" }, "committer": { "name": "You Kim", "email": "you.kim72@gmail.com", "time": "Fri Dec 07 04:33:05 2012 +0900" }, "message": "Wrong parameter in LocationManagerService\n\nFix wrong parameter in removeTestProvider\n\nChange-Id: Ibf93833697c865904f29821e5778853127e5fb00\nSigned-off-by: You Kim \u003cyou.kim72@gmail.com\u003e\n" }, { "commit": "bc36b52372be154994f19a9e767184b2d6b4783a", "tree": "f82ca5b4607bb0050e6485d07145cfcdcab3d8f9", "parents": [ "23d8835dc112ef0c65fac41cf1a1a00cb6bc776d", "7b0855715bc6cb14e3ca67d815915d2172f0bc12" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Wed Dec 05 14:06:33 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 05 14:06:33 2012 -0800" }, "message": "am 7b085571: Merge \"DO NOT MERGE Adjust update interval when expiring location requests.\" into jb-mr1.1-dev\n\n* commit \u00277b0855715bc6cb14e3ca67d815915d2172f0bc12\u0027:\n DO NOT MERGE Adjust update interval when expiring location requests.\n" }, { "commit": "7b0855715bc6cb14e3ca67d815915d2172f0bc12", "tree": "0588e83ae4d2ce60b9c4ecc42310e9ea52d7cf3a", "parents": [ "ab3a5d944eb5b39ed00f3422cee691570e05a3ce", "5959bf2d3c7fcfa4058cbcf81c3dc376c962d25e" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Wed Dec 05 14:03:27 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 05 14:03:28 2012 -0800" }, "message": "Merge \"DO NOT MERGE Adjust update interval when expiring location requests.\" into jb-mr1.1-dev" }, { "commit": "384e6fe84d446067dccec69404e4a3ca507ebe07", "tree": "27c2cead41faada62dec81aa56025eb88f9c230d", "parents": [ "fb21aa84a804c8d7dd0aad7df1e4a336ed59f991", "1edc61119d145b05f0b5e1323a2fc0fa6a29d4bc" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Dec 05 12:28:25 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 05 12:28:25 2012 -0800" }, "message": "am 1edc6111: am 61e21940: am 7fcb5dc5: Merge \"Pin electron beam surface to natural orientation.\" into jb-mr1.1-dev\n\n* commit \u00271edc61119d145b05f0b5e1323a2fc0fa6a29d4bc\u0027:\n Pin electron beam surface to natural orientation.\n" }, { "commit": "fb21aa84a804c8d7dd0aad7df1e4a336ed59f991", "tree": "35ea48a0839d11206817939a39ed7aba86c31922", "parents": [ "1c328df48217616bf2975c7d38e8884b23cd306c", "8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Wed Dec 05 12:28:17 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 05 12:28:17 2012 -0800" }, "message": "am 8ec9f8f0: am dc5b21a5: am 487f8e93: Merge \"Fix an issue on installing 3rd-party IME by a non-primary user\" into jb-mr1.1-dev\n\n* commit \u00278ec9f8f074ea35cad6e6a75a87e4bde947f12ea1\u0027:\n Fix an issue on installing 3rd-party IME by a non-primary user\n" }, { "commit": "cc6f467c353b41df7db912556ab9370ffe22af68", "tree": "78eb13b511ddc3c6d45176eaa5bd2514efdc930e", "parents": [ "07e186ea54ada07e09e74c13e9b19dd9cb8325a7", "98c958097b0dd458ffd3e12f9692c0c9522d932e" ], "author": { "name": "Sascha Prueter", "email": "saschap@google.com", "time": "Wed Dec 05 12:23:38 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 05 12:23:38 2012 -0800" }, "message": "am 98c95809: am 8f7eddbe: am 652d8fc9: Merge \"PRIORITY_MIN notifications should be truly ambient.\" into jb-mr1.1-dev\n\n* commit \u002798c958097b0dd458ffd3e12f9692c0c9522d932e\u0027:\n PRIORITY_MIN notifications should be truly ambient.\n" }, { "commit": "de8f01a99b787dc90249b05985686f23e11faf1b", "tree": "73ceef7d1cb0031d9eea92e49bd36b15c9386fda", "parents": [ "0a19ad089ad93740debc52c122726507e4517ccb", "d201bf77be606fb21ef469e0174d64a919f92887" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Wed Dec 05 12:23:19 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 05 12:23:19 2012 -0800" }, "message": "am d201bf77: am 9c902ca4: am 33669f35: Merge \"Kill dreams that do not create a timely service connection.\" into jb-mr1.1-dev\n\n* commit \u0027d201bf77be606fb21ef469e0174d64a919f92887\u0027:\n Kill dreams that do not create a timely service connection.\n" }, { "commit": "5959bf2d3c7fcfa4058cbcf81c3dc376c962d25e", "tree": "9b2be150745dc6278021f9a2523754f867b15830", "parents": [ "82a76800ad78b7aa6e2bde2f6512e4ffbe21873f" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Wed Dec 05 09:57:40 2012 -0800" }, "committer": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Wed Dec 05 12:15:16 2012 -0800" }, "message": "DO NOT MERGE Adjust update interval when expiring location requests.\n\nCherry-pick I88b419c92940b7e536d48b26e5fc0f72f3c9e73d\n\nThis is a more complete solution for this issue that disables\nlocation providers when expiring their last request *and* adjusts\nupdate intervals when expiring any request. This should help\nfurther limit battery drain when a high-frequency-update app\nexits, as it allows the system to throttle the update interval\nback down to something appropriate for the remaining listeners.\n\nBug: 7611837\nChange-Id: I7629a90f4c693be4bf96d662bd3a8b06dae0b089\n" }, { "commit": "0a19ad089ad93740debc52c122726507e4517ccb", "tree": "7b6d0ec0705ee59c55184e4a45673d7d712f06af", "parents": [ "e81f55bae83559a39778fdd6a3e0b031c65dc8f9" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Wed Dec 05 09:57:40 2012 -0800" }, "committer": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Wed Dec 05 09:57:40 2012 -0800" }, "message": "Adjust update interval when expiring location requests.\n\nThis is a more complete solution for this issue that disables\nlocation providers when expiring their last request *and* adjusts\nupdate intervals when expiring any request. This should help\nfurther limit battery drain when a high-frequency-update app\nexits, as it allows the system to throttle the update interval\nback down to something appropriate for the remaining listeners.\n\nBug: 7611837\nChange-Id: I88b419c92940b7e536d48b26e5fc0f72f3c9e73d\n" }, { "commit": "29afa142402b4b4f5e56f36b24367b84b5f64a6a", "tree": "ff051ca1412f74db0d519e798934290555a420cb", "parents": [ "cdd03f5487d3d0a088651c90fc5122b5fc3f62b3" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Dec 04 17:21:21 2012 -0800" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Dec 04 17:21:38 2012 -0800" }, "message": "Remove unnecessary locking for screen broadcasts.\n\nThe actual handling occurs in updateScreenOn() on the other side of a\nhandler, which acquires the lock correctly.\n\nChange-Id: Ibd359446dba8e88f81d34f1e10a6b5e150348f89\n" }, { "commit": "1edc61119d145b05f0b5e1323a2fc0fa6a29d4bc", "tree": "7c0d7b33d7fb4d39afb9a9d8927aeea79ee61a47", "parents": [ "8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1", "61e21940ffd643dad1aa6c7c3dc9933815aecd74" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 04 17:21:00 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 17:21:00 2012 -0800" }, "message": "am 61e21940: am 7fcb5dc5: Merge \"Pin electron beam surface to natural orientation.\" into jb-mr1.1-dev\n\n* commit \u002761e21940ffd643dad1aa6c7c3dc9933815aecd74\u0027:\n Pin electron beam surface to natural orientation.\n" }, { "commit": "61e21940ffd643dad1aa6c7c3dc9933815aecd74", "tree": "e756081a4b5d91ed16435e940dcaed7122565a35", "parents": [ "dc5b21a54850735bdfd1fbbd83375b2578ed4b02", "7fcb5dc5e9fbad0f183f425e88e576aaca98b0d7" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 04 17:18:52 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 17:18:52 2012 -0800" }, "message": "am 7fcb5dc5: Merge \"Pin electron beam surface to natural orientation.\" into jb-mr1.1-dev\n\n* commit \u00277fcb5dc5e9fbad0f183f425e88e576aaca98b0d7\u0027:\n Pin electron beam surface to natural orientation.\n" }, { "commit": "7fcb5dc5e9fbad0f183f425e88e576aaca98b0d7", "tree": "8d2aa403af62affc8b5b8cde25b6c38d34ccdf4a", "parents": [ "487f8e93b0b5e2949fbfa6b60fd5e0a7a3e4d5b7", "7f3994ec2a5dce1a037f04714b1f25cab85affb6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 04 17:14:59 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 04 17:15:34 2012 -0800" }, "message": "Merge \"Pin electron beam surface to natural orientation.\" into jb-mr1.1-dev" }, { "commit": "8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1", "tree": "40b6eb553f15415be4e382ba6f788ffad2ff2d73", "parents": [ "c0512832f49a80697f2eebb889eeaa035a35029c", "dc5b21a54850735bdfd1fbbd83375b2578ed4b02" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Tue Dec 04 17:14:17 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 17:14:17 2012 -0800" }, "message": "am dc5b21a5: am 487f8e93: Merge \"Fix an issue on installing 3rd-party IME by a non-primary user\" into jb-mr1.1-dev\n\n* commit \u0027dc5b21a54850735bdfd1fbbd83375b2578ed4b02\u0027:\n Fix an issue on installing 3rd-party IME by a non-primary user\n" }, { "commit": "dc5b21a54850735bdfd1fbbd83375b2578ed4b02", "tree": "e50e9a3640e4388062467066bb98d2c057d34a04", "parents": [ "231719fa9c22df02408c17444503b790c9f0d1b9", "487f8e93b0b5e2949fbfa6b60fd5e0a7a3e4d5b7" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Tue Dec 04 17:12:10 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 17:12:10 2012 -0800" }, "message": "am 487f8e93: Merge \"Fix an issue on installing 3rd-party IME by a non-primary user\" into jb-mr1.1-dev\n\n* commit \u0027487f8e93b0b5e2949fbfa6b60fd5e0a7a3e4d5b7\u0027:\n Fix an issue on installing 3rd-party IME by a non-primary user\n" }, { "commit": "487f8e93b0b5e2949fbfa6b60fd5e0a7a3e4d5b7", "tree": "b0bfcd3291520ce298550d1741aeecfe5ef587d9", "parents": [ "fff0fb87271faf8f19d9fd062c5ebfb720204223", "81f8b7c66750a0a89c8e6b6037136ca169c96f95" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Tue Dec 04 17:09:29 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 04 17:09:57 2012 -0800" }, "message": "Merge \"Fix an issue on installing 3rd-party IME by a non-primary user\" into jb-mr1.1-dev" }, { "commit": "66f78d7a979775efb148873797bac4584ddb3b83", "tree": "bb98149ae1735e33ab0c79eeb95114ea0188cfa0", "parents": [ "968683335e17c06504a11bc2e38a2580f613ea16" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 04 16:46:50 2012 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 04 16:46:50 2012 -0800" }, "message": "Share the pending layout changes\n\nDo not pass the pending layout changes from animation to layout.\nSimply assign them to the DisplayContent.\n\nChange-Id: I72e48753db509023e5df70513a87e26998ec699f\n" }, { "commit": "6861e258f00425f299155a501db59817e8c0c2e9", "tree": "6fbfee40d9a6ba82360e9fe21ccf75a4a7f5ca11", "parents": [ "5931fa81bdf776f35367d8652a2c6d27452c0f08", "1d20e05e487faa02acca2dcb2ae9d527d097ce7d" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Tue Dec 04 16:35:23 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 16:35:23 2012 -0800" }, "message": "am 1d20e05e: am 82a76800: Merge \"DO NOT MERGE Notify provider when disposing last UpdateRecord\" into jb-mr1.1-dev\n\n* commit \u00271d20e05e487faa02acca2dcb2ae9d527d097ce7d\u0027:\n DO NOT MERGE Notify provider when disposing last UpdateRecord\n" }, { "commit": "98c958097b0dd458ffd3e12f9692c0c9522d932e", "tree": "10e82d1c4cc79660cd3ec19a83d7da2a3341b1a0", "parents": [ "32ec47c1b15b5a9c8f8d9e9f324bb6fe353119fe", "8f7eddbef33f97e7d4439707ac0039be4c81ef0e" ], "author": { "name": "Sascha Prueter", "email": "saschap@google.com", "time": "Tue Dec 04 16:35:12 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 16:35:12 2012 -0800" }, "message": "am 8f7eddbe: am 652d8fc9: Merge \"PRIORITY_MIN notifications should be truly ambient.\" into jb-mr1.1-dev\n\n* commit \u00278f7eddbef33f97e7d4439707ac0039be4c81ef0e\u0027:\n PRIORITY_MIN notifications should be truly ambient.\n" }, { "commit": "d201bf77be606fb21ef469e0174d64a919f92887", "tree": "698456eb503f96fb9be4e6d070d6d60c5e33bb93", "parents": [ "eac4be7ef28a9dfba9e6cc6d0501b4bd2146041a", "9c902ca4732f8c2a5afda4047415d1de6d3db493" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Dec 04 16:34:55 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 16:34:55 2012 -0800" }, "message": "am 9c902ca4: am 33669f35: Merge \"Kill dreams that do not create a timely service connection.\" into jb-mr1.1-dev\n\n* commit \u00279c902ca4732f8c2a5afda4047415d1de6d3db493\u0027:\n Kill dreams that do not create a timely service connection.\n" }, { "commit": "1d20e05e487faa02acca2dcb2ae9d527d097ce7d", "tree": "94b848714f49e631c29d492274b5c0189d7152d5", "parents": [ "a8a19ac5ab6c0612fe0d5bcc10b84d585fcaf509", "82a76800ad78b7aa6e2bde2f6512e4ffbe21873f" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Tue Dec 04 16:32:18 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 16:32:18 2012 -0800" }, "message": "am 82a76800: Merge \"DO NOT MERGE Notify provider when disposing last UpdateRecord\" into jb-mr1.1-dev\n\n* commit \u002782a76800ad78b7aa6e2bde2f6512e4ffbe21873f\u0027:\n DO NOT MERGE Notify provider when disposing last UpdateRecord\n" }, { "commit": "8f7eddbef33f97e7d4439707ac0039be4c81ef0e", "tree": "26ea2e35cb0e26267177b4b6131c6e9c45f85182", "parents": [ "63cc22a5c393fec725d271f5a7d82fb2fe05647f", "652d8fc944c011eb15202f678588723aa9f38a84" ], "author": { "name": "Sascha Prueter", "email": "saschap@google.com", "time": "Tue Dec 04 16:32:05 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 16:32:05 2012 -0800" }, "message": "am 652d8fc9: Merge \"PRIORITY_MIN notifications should be truly ambient.\" into jb-mr1.1-dev\n\n* commit \u0027652d8fc944c011eb15202f678588723aa9f38a84\u0027:\n PRIORITY_MIN notifications should be truly ambient.\n" }, { "commit": "9c902ca4732f8c2a5afda4047415d1de6d3db493", "tree": "3e6fdf3ecc28689a6961ec4338058adcbc08633b", "parents": [ "4fa27f314038620fd3c50170d2f8caebeb6005bb", "33669f35e4b63bec10bb7202b94340ebd41fbb10" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Dec 04 16:31:33 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 16:31:33 2012 -0800" }, "message": "am 33669f35: Merge \"Kill dreams that do not create a timely service connection.\" into jb-mr1.1-dev\n\n* commit \u002733669f35e4b63bec10bb7202b94340ebd41fbb10\u0027:\n Kill dreams that do not create a timely service connection.\n" }, { "commit": "968683335e17c06504a11bc2e38a2580f613ea16", "tree": "b7643ed4e77a9cd507dc47b16fe876d25bcc763a", "parents": [ "83323f427d3c3e9b9a76c4cb6f76a5707cc686bd" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 04 14:29:11 2012 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 04 16:20:08 2012 -0800" }, "message": "Recouple layout and animation a bit.\n\nShare state between layout and animation and stop copying\nredundant data between the two.\n\nChange-Id: If07d3fc3ddfd33e3d46bf45d24d7aca58067ee66\n" }, { "commit": "83323f427d3c3e9b9a76c4cb6f76a5707cc686bd", "tree": "3e56115f8f8a21471aa4623a65e2170d9f005d04", "parents": [ "4791ce9d2256ecd79b76768651d7f722ab17942c", "9339c401cf1a056a3a1caddc648334069e6bd267" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 04 16:15:31 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 04 16:15:31 2012 -0800" }, "message": "Merge \"Further decouple layout and animation.\"" }, { "commit": "9339c401cf1a056a3a1caddc648334069e6bd267", "tree": "3dce5deb2d047035903e76ae22e98590df7ea6b4", "parents": [ "39ec1ec187c3b27f2819aaf5a3a47819af56e44d" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Fri Nov 30 11:23:56 2012 -0800" }, "committer": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 04 16:13:45 2012 -0800" }, "message": "Further decouple layout and animation.\n\nLoad animation parameters dynamically and synchronously rather than\nasynchronously. Eliminates storing parameters and cross-barrier method\ncalls.\n\nChange-Id: Ia9162f0cb3fe60da35fd9fb5f24f31f88891b950\n" }, { "commit": "e0fa1b387f6ae3d347d76860eefff7a0d149cdba", "tree": "147bcb608d5bf99de89a4870f4813e43cbf7c186", "parents": [ "a7acb4b9cdbf39b3456bd45ef82681716e1ab2f8" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Tue Dec 04 15:04:43 2012 -0800" }, "committer": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Tue Dec 04 15:42:22 2012 -0800" }, "message": "DO NOT MERGE Notify provider when disposing last UpdateRecord\n\nCherry-pick of Id48151eb7de40164258cde7da220a4d6bb34b89a\n\nLocation providers were not being notified of the change in status\nwhen the last UpdateRecord was removed due to numUpdates exhaustion\nor request expiry. Oops! Enjoy some free battery life!\n\nBug: 7611837\nChange-Id: I66303b355be4e4a56a81efb5406c9353b2588595\n" }, { "commit": "652d8fc944c011eb15202f678588723aa9f38a84", "tree": "3f8c2a8abed119362d0c8c05225d8de6e0445602", "parents": [ "4eab3d88a21b07d029a1b22271d7d1537a245266", "526fa0e6d5cfe6ca3f390982c169b43fcb7d6f78" ], "author": { "name": "Sascha Prueter", "email": "saschap@google.com", "time": "Tue Dec 04 15:12:43 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 04 15:13:17 2012 -0800" }, "message": "Merge \"PRIORITY_MIN notifications should be truly ambient.\" into jb-mr1.1-dev" }, { "commit": "8b38b29b5213c429d1e9802d02549b5638f40706", "tree": "ffdac8e6ae2728b65fb33c7e378c51001d005855", "parents": [ "39ec1ec187c3b27f2819aaf5a3a47819af56e44d" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Tue Dec 04 15:04:43 2012 -0800" }, "committer": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Tue Dec 04 15:04:43 2012 -0800" }, "message": "Notify provider when disposing last UpdateRecord\n\nLocation providers were not being notified of the change in status\nwhen the last UpdateRecord was removed due to numUpdates exhaustion\nor request expiry. Oops! Enjoy some free battery life!\n\nBug: 7611837\nChange-Id: Id48151eb7de40164258cde7da220a4d6bb34b89a\n" }, { "commit": "7f3994ec2a5dce1a037f04714b1f25cab85affb6", "tree": "28ebf44ea836cfdcbe41ead53943104a1d026b8d", "parents": [ "e0a676a3bb0e7b9aced9359a021e4c5d2ffef752" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 04 14:04:28 2012 -0800" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Dec 04 14:40:23 2012 -0800" }, "message": "Pin electron beam surface to natural orientation.\n\nIf a rotation occurred while the electron beam surface was showing,\nthe surface may have appeared in the wrong orientation. We fix this\nproblem by adjusting the transformation matrix of the electron beam\nsurface according to the display orientation whenever a display\ntransaction occurs.\n\nThe rotation itself is allowed to proceed but it is not visible\nto the user. We must let this happen so that the lock screen\nis correctly oriented when the screen is turned back on.\n\nNote that the electron beam surface serves two purposes.\n\nFirst, it is used to play the screen off animation.\nWhen the animation is finished, the surface remains visible but is\nsolid black. Then we turn the screen off.\n\nSecond, when we turn the screen back on we leave the electron beam\nsurface showing until the window manager is ready to show the\nnew content. This prevents the user from seeing a flash of the\nold content while the screen is being turned on. When everything is\nready, we dismiss the electron beam.\n\nIt\u0027s important for the electron beam to remain visible for\nthe entire duration from just before the screen is turned off until\nafter the screen is turned on and is ready to be seen. This is\nwhy we cannot fix the bug by deferring rotation or otherwise\ngetting in the way of the window manager doing what it needs\nto do to get the screen ready when the screen is turned on again.\n\nBug: 7479740\nChange-Id: I2fcf35114ad9b2e00fdfc67793be6df62c8dc4c3\n" }, { "commit": "526fa0e6d5cfe6ca3f390982c169b43fcb7d6f78", "tree": "b04e69e730419c7f3d5a375c271c9c13b70aa004", "parents": [ "e0a676a3bb0e7b9aced9359a021e4c5d2ffef752" ], "author": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Tue Dec 04 14:51:50 2012 -0500" }, "committer": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Tue Dec 04 17:01:12 2012 -0500" }, "message": "PRIORITY_MIN notifications should be truly ambient.\n\nIf your notification is set to MIN priority, it will never\nattempt to interrupt the user, either by an icon (already\nimplemented), or (new in this patch) by LED, vibration, or\nsound.\n\nBug: 7648785\nChange-Id: Ia0f8e010e62029d8d8ef1955dd20b7c79fb68398\n" }, { "commit": "33669f35e4b63bec10bb7202b94340ebd41fbb10", "tree": "061c2dc18ee46d64199d0897697f055588c58fab", "parents": [ "80a90efcbf32b30b886380c67585ddfb41c35437", "006f567c214d67752cc7c2b6446c328744f40af7" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Dec 04 13:45:10 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 04 13:45:50 2012 -0800" }, "message": "Merge \"Kill dreams that do not create a timely service connection.\" into jb-mr1.1-dev" }, { "commit": "006f567c214d67752cc7c2b6446c328744f40af7", "tree": "5c7c54631c1591361882a3bd698c42198c61a3b6", "parents": [ "9f2532bf1215dffb4058d1b01834b3a0a7272fdc" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Mon Dec 03 08:42:25 2012 -0500" }, "committer": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Dec 04 15:10:04 2012 -0500" }, "message": "Kill dreams that do not create a timely service connection.\n\nImplement a timeout between when the dream binds and\nwhen the dream creates the service connection. If\nthe connection is not created within a certain amount of\ntime, stop the dream.\n\nThis fixes the current bug where a dream that crashes in\nonCreate (or the ctor) can put the dream controller in a\nbad state until the screen is turned off.\n\nThe timeout is equal to the service restart delay in\nactivity manager (ActiveServices) to avoid restarting\n(and recrashing).\n\nBug:7596707\nChange-Id: I3e11efc6af0b79ec4cb0fbc94e4e109c7602ddac\n" }, { "commit": "39ec1ec187c3b27f2819aaf5a3a47819af56e44d", "tree": "283aa2aa3583dc753e25464e164b6893bd355fd5", "parents": [ "1ef98fb37e1b1cb0d2bf6ab448b4ff52f5f28e80", "a6d0b6f8518c7ee110c907166d53a8d46ead97f1" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Tue Dec 04 11:56:04 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 04 11:56:04 2012 -0800" }, "message": "Merge \"Fix Wrong parameter in HashMap.remove\"" }, { "commit": "1ef98fb37e1b1cb0d2bf6ab448b4ff52f5f28e80", "tree": "93cf79276706fd044fdc2cb68653be29586fe66c", "parents": [ "3ff1139032b0d63522b627ccf69fdd0832a6da47", "5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Tue Dec 04 11:29:53 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 11:29:53 2012 -0800" }, "message": "am 5cb09b7d: am 8b283df9: am b6b4f171: Merge \"Change getName and getAddress permission to BLUETOOTH\" into jb-mr1.1-dev\n\n* commit \u00275cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a\u0027:\n Change getName and getAddress permission to BLUETOOTH\n" }, { "commit": "5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a", "tree": "f85a8c1bdbb1c7bafbce61bfdd60d085db2611af", "parents": [ "994901ee7f096751cc593e213ea60a1cbdd9504a", "8b283df989f9b8b71797f9feaeb15cb012ab3190" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Tue Dec 04 11:27:11 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 11:27:11 2012 -0800" }, "message": "am 8b283df9: am b6b4f171: Merge \"Change getName and getAddress permission to BLUETOOTH\" into jb-mr1.1-dev\n\n* commit \u00278b283df989f9b8b71797f9feaeb15cb012ab3190\u0027:\n Change getName and getAddress permission to BLUETOOTH\n" }, { "commit": "8b283df989f9b8b71797f9feaeb15cb012ab3190", "tree": "e2afe9eb70b2925c7b4ec6368117f1f0509472e7", "parents": [ "d9e46ac5ffcd2a1b3abf70bde14af7d10ebf018b", "b6b4f171ff38ccac833edb2a1ad7f725ed068d46" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Tue Dec 04 11:25:14 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 11:25:14 2012 -0800" }, "message": "am b6b4f171: Merge \"Change getName and getAddress permission to BLUETOOTH\" into jb-mr1.1-dev\n\n* commit \u0027b6b4f171ff38ccac833edb2a1ad7f725ed068d46\u0027:\n Change getName and getAddress permission to BLUETOOTH\n" }, { "commit": "af5ddbfcf59e1e0bcbd43f1f88270f822c5083b8", "tree": "65b8f69e81c2897389d2f06f31345d96c558ed90", "parents": [ "9f2532bf1215dffb4058d1b01834b3a0a7272fdc" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Tue Dec 04 10:47:43 2012 -0800" }, "committer": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Tue Dec 04 10:47:43 2012 -0800" }, "message": "Change getName and getAddress permission to BLUETOOTH\n\nThe permissions were set as BLUETOOTH_ADMIN by mistake. Correct them\nbug 7665249\n\nChange-Id: Ic1bdbeb25e8f55d886f9a8d38920cbb769dd38ca\n" }, { "commit": "bebd1a092ea2fe35d78ba9dce7374f3f5ec30f2b", "tree": "3dde564e30c5a2ea13f0cf01f91d3febbe6b93a3", "parents": [ "56a715ef7af1e8e808ac6274e0456d9731b97e7a", "d3b9dd6ca6325abe5cf2049c2894a86b256a3db1" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 04 10:39:59 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 10:39:59 2012 -0800" }, "message": "am d3b9dd6c: am 40627de3: Merge \"Remove unnecessary references in WindowManagerService\"\n\n* commit \u0027d3b9dd6ca6325abe5cf2049c2894a86b256a3db1\u0027:\n Remove unnecessary references in WindowManagerService\n" }, { "commit": "d3b9dd6ca6325abe5cf2049c2894a86b256a3db1", "tree": "7692bb5b97c478def9ace0973c41f250b15b0d32", "parents": [ "59912d40babedccb2346d94651f79491cbe5fd8e", "40627de3044c4a23c20c2229cab20aab21ff2b03" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Tue Dec 04 10:38:32 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 04 10:38:32 2012 -0800" }, "message": "am 40627de3: Merge \"Remove unnecessary references in WindowManagerService\"\n\n* commit \u002740627de3044c4a23c20c2229cab20aab21ff2b03\u0027:\n Remove unnecessary references in WindowManagerService\n" }, { "commit": "a6d0b6f8518c7ee110c907166d53a8d46ead97f1", "tree": "ae25ade813091541bb4465a38f5cda1d12696afd", "parents": [ "efe89f28cbc385fd628defe63f8e2285312987aa" ], "author": { "name": "You Kim", "email": "you.kim72@gmail.com", "time": "Sun Oct 28 03:58:44 2012 +0900" }, "committer": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Tue Dec 04 09:57:23 2012 -0800" }, "message": "Fix Wrong parameter in HashMap.remove\n\nChange-Id: Ibf93833697c865904f29821e5778853127e5fb00\nSigned-off-by: You Kim \u003cyou.kim72@gmail.com\u003e\n\nConflicts:\n\n\tservices/java/com/android/server/LocationManagerService.java\n" }, { "commit": "cb6291c9b16d6c2ead8224e81636ff1d8ee5c216", "tree": "670ead497b8f5f964b7ff943042287d0e283e8f3", "parents": [ "568f923ba4cf522f699837bee0d8cba318343345" ], "author": { "name": "You Kim", "email": "you.kim72@gmail.com", "time": "Tue Dec 04 23:22:28 2012 +0900" }, "committer": { "name": "You Kim", "email": "you.kim72@gmail.com", "time": "Wed Dec 05 00:10:03 2012 +0900" }, "message": "Remove unnecessary references in WindowManagerService\n\nClean message routines in WindowManagerService.\n\nChange-Id: I3e3106b6499c67d1fd7133c987c0452a73141a3f\nSigned-off-by: You Kim \u003cyou.kim72@gmail.com\u003e\n" }, { "commit": "81f8b7c66750a0a89c8e6b6037136ca169c96f95", "tree": "6a517e3143e31e9dd279f52648b28aa90d4a53a4", "parents": [ "16cf643694194176954b709e5ee4dfcb711f2a57" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Tue Dec 04 20:42:56 2012 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Tue Dec 04 21:16:59 2012 +0900" }, "message": "Fix an issue on installing 3rd-party IME by a non-primary user\n\nBug: 7573552\n\nCurrently IMMS doesn\u0027t receive install/uninstall messages. Accordingly enabled IMEs\u0027 list is not refreshed properly.\n\nChange-Id: I25e9798a65f528dd270cd6bb1f14b1d887194787\n" }, { "commit": "f9ae5f75af259437391e41dac7f3c4461c495dd9", "tree": "f102e47b480849cf5b5140d73473629bfcd68265", "parents": [ "dac257cd73cce3e63dd21267520660dd6869baf4", "23307cbb6b432b658b0fd7437dacfedd6298af94" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Dec 03 16:08:35 2012 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 03 16:08:35 2012 -0800" }, "message": "am 23307cbb: am e0a676a3: Merge \"Fix issue #7649590: Background windows sometimes not being hidden for secondary users\" into jb-mr1.1-dev\n\n* commit \u002723307cbb6b432b658b0fd7437dacfedd6298af94\u0027:\n Fix issue #7649590: Background windows sometimes not being hidden for secondary users\n" }, { "commit": "2c5f782094c5668a9615e2f9f41063386ae52b28", "tree": "e9ee947c253fed4757ee743a69042f6f7e922664", "parents": [ "a5c9fd93cc16df4708ea4c85239fad7b5be16d43", "152e9bb81aa5b2ab4637f4b2dae04b3ce89fa891" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Mon Dec 03 15:59:23 2012 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 03 15:59:32 2012 -0800" }, "message": "Merge \"Refactoring of the screen magnification feature.\"" } ], "next": "23307cbb6b432b658b0fd7437dacfedd6298af94" }