)]}' { "log": [ { "commit": "f3c3c4fd14cb4185ec6df5a4355aab8b9f4039dc", "tree": "848b4faed343c2fc72a800b0973e6fa1ebbe7d4a", "parents": [ "10e370c68902782c17c42e92c8d5a21978442010" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Oct 21 11:09:02 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Oct 21 15:42:34 2010 -0400" }, "message": "Refactor SystemUI so the status bar isn\u0027t a Service of its own.\n\nThere is now one SystemUIService, which starts the status bar service.\nPretty soon there will be other things running in here too. This way\nwe don\u0027t need to have each of them started by something individually.\n\nThis also moves the choice between tablet and phone status bar into\nSystemUI.apk, which seems like a much better place for it.\n\nChange-Id: Ib69ef2f43d648764f8dbb52008f5d036a1ee07d9\n" }, { "commit": "163d8d972b8b78979310fd31dcb17fe237d27533", "tree": "b98ead61d27036fa2f692b1301dbba9c811566a4", "parents": [ "749984798c64de1594ceb123d419711eed6e90a2" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Oct 21 13:21:20 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Oct 21 13:32:49 2010 -0400" }, "message": "Don\u0027t remove items from mRecords while iterating over it.\n\nThis change also make removeList a member, because it\u0027s only\nactually used in an error case (when the client process has\ngone away).\n\nBug: 3118244\nBug: 3083062\nBug: 2876696\nBug: 2778958\nChange-Id: I856118d8de4309cd63287d7c57cd938e1c35dab0\n" }, { "commit": "749984798c64de1594ceb123d419711eed6e90a2", "tree": "964515574493ada5ab695902e3ea75f317c8c01e", "parents": [ "385a753dead6ef15f2e30eae47f73e642b3ef7ed" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Oct 21 11:38:11 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Oct 21 11:38:25 2010 -0400" }, "message": "fix bad merge\n\nChange-Id: I44b9265a7ef3accc5c794d2ef9308b050c961a81\n" }, { "commit": "385a753dead6ef15f2e30eae47f73e642b3ef7ed", "tree": "ae4e55f4c7903e62f23802c7d49ad97ae5b2f0a7", "parents": [ "a376d030a2075909219926d622b71016418d7dcd", "368fdba47a49f249aa4346edaf3f45291ca6a7ff" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Thu Oct 21 07:39:10 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Thu Oct 21 07:39:10 2010 -0700" }, "message": "resolved conflicts for merge of 368fdba4 to master\n\nChange-Id: I42b7b433c86a71a5da5db67109f056a280077c9d\n" }, { "commit": "4b7ba09c8bf773dbd045b4bbe7831fa16e33653d", "tree": "e512599cd36aaa8ae7fdd93f2d8332442c48206e", "parents": [ "1b35f942ec659fa843e531e207e5e90b0544504a" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Wed Oct 20 15:37:41 2010 -0700" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Wed Oct 20 15:52:42 2010 -0700" }, "message": "Change removeNetowrk to a synchronous channel call.\n\nChange-ID: Iad0380d56972826615e044fa2aaee418b617d732\n" }, { "commit": "4f5f7c968339a83b6af98ac8893a1ac33c7aa7bc", "tree": "1bf9e2f1548ba3db07defb52d38d11ca784fd2ca", "parents": [ "92f987a07a0b2d03a769a8b5fc57fe97a7bd7541" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu Oct 14 17:01:27 2010 -0700" }, "committer": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Wed Oct 20 12:04:21 2010 -0700" }, "message": "Fix wake and scan behavior\n\n- Add wakelock for driver start/stop to ensure a wifilock\n acquisition kick starts driver. Also cleaned up state machine\n driver start/stop behavior.\n- Add periodic scans when driver is started to ensure wifi\n reconnections when wifilock exists or when user chooses\n never to sleep\n- some minor clean up\n\nChange-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534\n" }, { "commit": "368fdba47a49f249aa4346edaf3f45291ca6a7ff", "tree": "437ece3f7d6b298f0f4911e4195ae86482a55eae", "parents": [ "5a67749a35bcbb70bfcc5f4c18da6a196bda33c1", "bdf1706ac680c0fe74765b8d6d34823b8ac05306" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Oct 19 12:29:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 12:29:43 2010 -0700" }, "message": "am bdf1706a: Merge \"Reduce logging.\" into gingerbread\n\nMerge commit \u0027bdf1706ac680c0fe74765b8d6d34823b8ac05306\u0027 into gingerbread-plus-aosp\n\n* commit \u0027bdf1706ac680c0fe74765b8d6d34823b8ac05306\u0027:\n Reduce logging.\n" }, { "commit": "431bb2269532f2514861b908d5fafda8fa64da79", "tree": "c862fe87c2525c18057728a75f2b3da9cdc30d2b", "parents": [ "1858031946b3627b599475c5894655362e510351" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Mon Oct 18 19:13:23 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Oct 19 15:08:05 2010 -0400" }, "message": "Reduce logging.\n\nRemember, the system and main logs are\n - Shared resources\n - Primarily for recording problems\n - To be used only for large grained events during normal operation\n\nBug: 3104855\nChange-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7\n" }, { "commit": "a30c88359f62391b77874b83825a6e400c5100b3", "tree": "483be0da7e7faceb4e1d52fc9872f4a0a2182739", "parents": [ "2d00c6050977f3e03665fbfef93f4f6aed041a63", "1858031946b3627b599475c5894655362e510351" ], "author": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Tue Oct 19 12:04:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 12:04:44 2010 -0700" }, "message": "am 18580319: DO NOT MERGE. Turn down backup logging for release.\n\nMerge commit \u00271858031946b3627b599475c5894655362e510351\u0027 into gingerbread-plus-aosp\n\n* commit \u00271858031946b3627b599475c5894655362e510351\u0027:\n DO NOT MERGE. Turn down backup logging for release.\n" }, { "commit": "1858031946b3627b599475c5894655362e510351", "tree": "42c6b21667f9fde9291408d5caacb12b74cf1239", "parents": [ "52bea277ff92a2a1780e035c82c72082434e7b16" ], "author": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Tue Oct 19 11:22:03 2010 -0700" }, "committer": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Tue Oct 19 11:22:03 2010 -0700" }, "message": "DO NOT MERGE. Turn down backup logging for release.\n\nChange-Id: Ib9f4fd15981fcf52b5d5912995c1891836303427\n" }, { "commit": "1072b7f751db555c9b48fe4085a5a1391e215737", "tree": "a68db7ff059aa9853c8ce041685b6e030fc19971", "parents": [ "4b3370a31cf9cc497b6de0d4a5414f1951c6f33b", "c0e9787293b761b04bdb07908751b22458f17bbc" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 19 11:19:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 11:19:45 2010 -0700" }, "message": "am c0e97872: am 928b0748: Merge \"Don\\\u0027t symlink native library paths for old apps\" into gingerbread\n\nMerge commit \u0027c0e9787293b761b04bdb07908751b22458f17bbc\u0027\n\n* commit \u0027c0e9787293b761b04bdb07908751b22458f17bbc\u0027:\n Don\u0027t symlink native library paths for old apps\n" }, { "commit": "0bc1f39643a8434d855c3166b17fcece2e7050dc", "tree": "901578a2361a437c9f429debf29cd1ccb68725b5", "parents": [ "b8b200d10847dd91bcff7a576e401d7d21fff696", "8333d59133da8e56cfb5465c767e89c61ede28bc" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Tue Oct 19 09:55:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 09:55:45 2010 -0700" }, "message": "am 8333d591: am 5d5a9db5: Merge \"GPS: Enable some more logging\" into gingerbread\n\nMerge commit \u00278333d59133da8e56cfb5465c767e89c61ede28bc\u0027\n\n* commit \u00278333d59133da8e56cfb5465c767e89c61ede28bc\u0027:\n GPS: Enable some more logging\n" }, { "commit": "dd074306e1a3847416fdb284bcf8ae7ba92aaf7e", "tree": "9220be93b81435c823923d3fbd98a7c4e2bdce96", "parents": [ "1046553d0ab3479dbe6fe43ea48b6ad540b6320d", "11eada780dc82fcac2a1dad4e2dde1d310b4231c" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Tue Oct 19 09:54:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 09:54:42 2010 -0700" }, "message": "am 11eada78: am ba2ec2b4: Merge \"Enable framework GPS and location manager logging\" into gingerbread\n\nMerge commit \u002711eada780dc82fcac2a1dad4e2dde1d310b4231c\u0027\n\n* commit \u002711eada780dc82fcac2a1dad4e2dde1d310b4231c\u0027:\n Enable framework GPS and location manager logging\n" }, { "commit": "f186dafdfe60d77c526c4e087655e8b257bc45cd", "tree": "2104de54c5424cfe8bf33ed4f2e469c5663e68d7", "parents": [ "5bc8c853f5f8118b172bb4651aba58fd254c3cb7", "5747eebf6eb5ea91480dc576c45c752685383e37" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Oct 19 09:53:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 09:53:47 2010 -0700" }, "message": "am 5747eebf: am a8d477f0: Merge \"Pressing the power button quickly needs to turn the screen on and off correctly.\" into gingerbread\n\nMerge commit \u00275747eebf6eb5ea91480dc576c45c752685383e37\u0027\n\n* commit \u00275747eebf6eb5ea91480dc576c45c752685383e37\u0027:\n Pressing the power button quickly needs to turn the screen on and off correctly.\n" }, { "commit": "c0e9787293b761b04bdb07908751b22458f17bbc", "tree": "0bbb5cca9eb0150de52257f2b1aac18bf869ba1f", "parents": [ "9bf511db85db8e8eff8833b3ec2c30cef12f9188", "928b07480bc5372f2b959bce7b4a3b49651b49b8" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 19 09:33:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 19 09:33:30 2010 -0700" }, "message": "am 928b0748: Merge \"Don\\\u0027t symlink native library paths for old apps\" into gingerbread\n\nMerge commit \u0027928b07480bc5372f2b959bce7b4a3b49651b49b8\u0027 into gingerbread-plus-aosp\n\n* commit \u0027928b07480bc5372f2b959bce7b4a3b49651b49b8\u0027:\n Don\u0027t symlink native library paths for old apps\n" }, { "commit": "928b07480bc5372f2b959bce7b4a3b49651b49b8", "tree": "acc3ba2df960bd4d7658af313fd889b8c7d3d8ba", "parents": [ "f73d48d754b11f6ed0fba017f5bc8f27acdfbe4f", "e68d58a2981827c6f54245fb62e70303a6a7ddb8" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 19 09:28:28 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 19 09:28:28 2010 -0700" }, "message": "Merge \"Don\u0027t symlink native library paths for old apps\" into gingerbread" }, { "commit": "e68d58a2981827c6f54245fb62e70303a6a7ddb8", "tree": "5f1b12fc433e0e2b37b2548e1354cae0fa1ec223", "parents": [ "1f90908c19ab24791bd54c856b32bb12682496eb" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 18 16:08:54 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 18 16:55:27 2010 -0700" }, "message": "Don\u0027t symlink native library paths for old apps\n\nApps that existed in an ASEC container before we put native libraries\nin the ASEC container will have their native libraries in the\n/data/data/\u003capp\u003e/lib directory. Don\u0027t try to symlink to the ASEC\ncontainer\u0027s library directory in this case.\n\nBug: 3108230\nChange-Id: I32167341cc8ff8c005e50f456ee7c783bfb0bf22\n" }, { "commit": "96eeb7e1ad396ed1140b464cba31b73de89c0268", "tree": "e847cc3f5415d6de6948b4ea52c3a69c685fa3a4", "parents": [ "d040f95190a3dd3b1ae925917eba7086c8ce563e", "7d0548d0944e48421857de4aec2822ced325bea0" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Oct 18 15:59:55 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 15:59:55 2010 -0700" }, "message": "Merge \"Fix race condition between starting of service and getting the Profile Proxy.\"" }, { "commit": "7d0548d0944e48421857de4aec2822ced325bea0", "tree": "956617b2a45551ba7688a4b3a684745800683d45", "parents": [ "2cd6f4709c6c260bfde999d7fe5364e88ee46b53" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Oct 18 15:29:09 2010 -0700" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Mon Oct 18 15:32:11 2010 -0700" }, "message": "Fix race condition between starting of service and getting the Profile Proxy.\n\nIncoming A2DP connections were not working.\n\nChange-Id: I5a3322ddb39b2512495b4cd2e35593da0f605087\n" }, { "commit": "8333d59133da8e56cfb5465c767e89c61ede28bc", "tree": "91be58e0d36964f98f1bb2064f2dab3d84f4a6f5", "parents": [ "f2c406030874b355ca9e4e67cc0e3aff6103c23e", "5d5a9db514a9cf42fbc189fc3af6da602d89b747" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 15:20:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 15:20:31 2010 -0700" }, "message": "am 5d5a9db5: Merge \"GPS: Enable some more logging\" into gingerbread\n\nMerge commit \u00275d5a9db514a9cf42fbc189fc3af6da602d89b747\u0027 into gingerbread-plus-aosp\n\n* commit \u00275d5a9db514a9cf42fbc189fc3af6da602d89b747\u0027:\n GPS: Enable some more logging\n" }, { "commit": "5d5a9db514a9cf42fbc189fc3af6da602d89b747", "tree": "d55457e5fb3d5f15c04327f7ebda81f109cbc5cd", "parents": [ "7689dd4928d1cc4080e43f83a523521b5ecf44e5", "b8d9033d9928209e68518c4b12fea74187ddb382" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 15:14:46 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 15:14:46 2010 -0700" }, "message": "Merge \"GPS: Enable some more logging\" into gingerbread" }, { "commit": "b8d9033d9928209e68518c4b12fea74187ddb382", "tree": "389da976714bc5c5b9195d4cfe2e0b110ef93d6e", "parents": [ "2d4d1bf14b531de9d4238b1e41b53c77f8976405" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 17:59:48 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 17:59:48 2010 -0400" }, "message": "GPS: Enable some more logging\n\nChange-Id: I7d13c859002fa96fa8c361c0c709931c6b12eb99\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "11eada780dc82fcac2a1dad4e2dde1d310b4231c", "tree": "a13e33df12d0447a9ec49b978e879da13168c5a5", "parents": [ "86bf0c7b69856124feb41fb1a938dce1f6695949", "ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 14:19:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 14:19:09 2010 -0700" }, "message": "am ba2ec2b4: Merge \"Enable framework GPS and location manager logging\" into gingerbread\n\nMerge commit \u0027ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1\u0027:\n Enable framework GPS and location manager logging\n" }, { "commit": "ba2ec2b44f33f55ff8507199e4e8b108a4bec7b1", "tree": "e9a7b7479d4c6f32937a70578dc5495ca7db3b9b", "parents": [ "72a635a1e08c1fe316dd91786774677abb11aafa", "2d4d1bf14b531de9d4238b1e41b53c77f8976405" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 14:16:15 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 18 14:16:15 2010 -0700" }, "message": "Merge \"Enable framework GPS and location manager logging\" into gingerbread" }, { "commit": "2d4d1bf14b531de9d4238b1e41b53c77f8976405", "tree": "2ef8e19d33360133c85e10e759a860e8f646e646", "parents": [ "1f90908c19ab24791bd54c856b32bb12682496eb" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 17:06:26 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 18 17:06:26 2010 -0400" }, "message": "Enable framework GPS and location manager logging\n\nChange-Id: Id54fc01e7288e7d90d7b76824b708bcb2ee88333\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "5747eebf6eb5ea91480dc576c45c752685383e37", "tree": "84639e332ab37c3e1e261bdb7ae04b0adf3c3674", "parents": [ "c2e4daacb4470bd43d5db3cf6b82f39be757ebe8", "a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Mon Oct 18 13:16:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 13:16:42 2010 -0700" }, "message": "am a8d477f0: Merge \"Pressing the power button quickly needs to turn the screen on and off correctly.\" into gingerbread\n\nMerge commit \u0027a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a8d477f0d7fd0cf01c47e37c59f26c5fa4d1cf42\u0027:\n Pressing the power button quickly needs to turn the screen on and off correctly.\n" }, { "commit": "3d3db601cdcb884ed8179cd3fd855454ea6bafac", "tree": "0b4888f1df40c48d3457f85b4e89aacd02291b1e", "parents": [ "d1f7f4a68375f879671d300510f23d3ee78a500e" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Mon Oct 18 16:08:16 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Mon Oct 18 16:08:16 2010 -0400" }, "message": "Pressing the power button quickly needs to turn the screen on and off correctly.\n\nThis does the animation with the power manager lock held, which isn\u0027t great, but is safe.\n\nBug: 3102208\nChange-Id: Ib0af3fab1cf6ba47053c10ae8b701376d63802ff\n" }, { "commit": "027610a76e67f39e3a435d68ec785a1cf09dcf9c", "tree": "3de83809df6336bef734be54274bda7eefb3f3d2", "parents": [ "afb05db237c2d614ddde77f033e0ac1856f17170", "964eb4389bb62e4e9e7f65ef7b9307e052053679" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 18 13:03:35 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 18 13:03:35 2010 -0700" }, "message": "resolved conflicts for merge of 964eb438 to master\n\nChange-Id: I0c54d6b88356d8734d7f51234b0114434414502e\n" }, { "commit": "875ecaa511ce36c8044ccdf48ee2a3e69dd633fe", "tree": "0eee1fac2967ffd3fe711eb56d39e7f1d7f270c8", "parents": [ "dab540e6f8535f6534c08c947c6ccd1d4c43692e", "13e46665ff69c1a37880762d7d611aacdf02dac7" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 18 08:04:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 08:04:47 2010 -0700" }, "message": "am 13e46665: am 736f5ec4: Merge \"Work on issue #3101415: Crespo apps seem to have their UID changed over time.\" into gingerbread\n\nMerge commit \u002713e46665ff69c1a37880762d7d611aacdf02dac7\u0027\n\n* commit \u002713e46665ff69c1a37880762d7d611aacdf02dac7\u0027:\n Work on issue #3101415: Crespo apps seem to have their UID changed over time.\n" }, { "commit": "cd0e839a2448deea50f79bddeba782c546b33893", "tree": "e8842c168d9048b47843c125661fc71831957cc5", "parents": [ "dbb78f0e4ee3a1ba3e3418b0c1bf8b51e4fa2019" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Wed Oct 13 17:25:24 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Sun Oct 17 18:35:29 2010 -0700" }, "message": "NFC: Move NFC service implementation out of system_server.\n\nNFC service is now an application service in packages/apps/Nfc.\n\nNFC service is registered through ServiceManager.addService(), and the proxy\nobject NfcAdapter obtains a handle to it through ServiceManager.getService().\n\n**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and\nmodify service_manager.c, Process.java and PackageManagerService.java in order\nto force the com.android.nfc process to take a fixed uid, so that it can use\nServiceManager.addService().\n\nMost of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and\nNdefMessage require some in-process native code, so android_com_NdefMessage.cpp\nand android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to\na very small library libnfc_ndef.so that implements NDEF message parsing. This\nhas been added to core.mk so all devices (even without NFC hardware) can work\nwith NDEF data.\n\nBug: 3041259\nBug: 3097445\nChange-Id: If7f00cd8f2053acfc9319ca366d4a9c02bd396e6\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "17692569661b9fd20d7a953fce6355b176a5ab2f", "tree": "d4b735587fd9c7da8fcc1caa8cde63814941ad0a", "parents": [ "7247cfa9cd5cd740e98c88072969483df7b1e7dd", "10d48f26e72dc7978ae683e8f99cc71409eb75ef" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Oct 17 13:49:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 17 13:49:16 2010 -0700" }, "message": "am 10d48f26: am efb58101: Debug logs for issue #3101415: Apps seem to have their UID changed over time.\n\nMerge commit \u002710d48f26e72dc7978ae683e8f99cc71409eb75ef\u0027\n\n* commit \u002710d48f26e72dc7978ae683e8f99cc71409eb75ef\u0027:\n Debug logs for issue #3101415: Apps seem to have their UID changed over time.\n" }, { "commit": "964eb4389bb62e4e9e7f65ef7b9307e052053679", "tree": "c1d32d034b1f976d06d61d3adf9c167964367e7e", "parents": [ "157fa0aca55b8e4747f00d2b729e5e361dea7ddb", "424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sat Oct 16 16:51:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Oct 16 16:51:13 2010 -0700" }, "message": "am 42499170: Implement issue #3094621 and #3094609 - wipe sd card\n\nMerge commit \u0027424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0\u0027 into gingerbread-plus-aosp\n\n* commit \u0027424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0\u0027:\n Implement issue #3094621 and #3094609 - wipe sd card\n" }, { "commit": "424991704b5fb7a64f6cf0fcc3f4b1aabbf2a2e0", "tree": "e2961682902ad3bac3966dac644186470bbdd21b", "parents": [ "77c011ba75ee1403c9b7626e4676cd3c8746605b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 15 18:45:07 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sat Oct 16 16:32:15 2010 -0700" }, "message": "Implement issue #3094621 and #3094609 - wipe sd card\n\n3094621: add \"wipe sd card\" option to factory data reset\n3094609: collapse unmount/format into one command\n\nAlso since we have decided that it is important to consider\nthe Crespo storage as internal storage, DevicePolicyManager\ngets a new API to be able to wipe it. (No big deal, since\nall of the work for this is now done in the implementation\nof the new UI.)\n\nChange-Id: I32a77c410f710a87dcdcbf6586c09bd2e48a8807\n" }, { "commit": "b25d5be54b7d876aa2b445584b829a410b50e034", "tree": "f8c235efeaf84cb219d7e3b053db7ed82c80c023", "parents": [ "2c3a7869ccf00782846d9e9ae813df8ba13ff40b", "258d0e805ee63685b807b5dae43efc5ecc97179e" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Sat Oct 16 08:59:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Oct 16 08:59:20 2010 -0700" }, "message": "am 258d0e80: am 0d65a3fc: Merge \"Screen on/off animation tweaks\" into gingerbread\n\nMerge commit \u0027258d0e805ee63685b807b5dae43efc5ecc97179e\u0027\n\n* commit \u0027258d0e805ee63685b807b5dae43efc5ecc97179e\u0027:\n Screen on/off animation tweaks\n" }, { "commit": "b478f4606e76a820e2b2b1d84f95867825441fc2", "tree": "2255a2c35e672346b9f13eee0ea024a1592df77e", "parents": [ "2a8ecf3f29ff831d2aee669aba6a30103cfa6def" ], "author": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Fri Oct 15 16:02:26 2010 -0700" }, "committer": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Fri Oct 15 20:30:32 2010 -0700" }, "message": "Drag/drop changes\n\n* Increase the opacity of the drag thumbnail a bit\n* Properly present window-local drag locations; this fixes drags into\n the status bar\n* Pass the current drag touch point in DRAG_STARTED. This may\n be reconsidered, but might conceivably be useful to someone.\n\nChange-Id: I77690e82e9831ed6be412990c1c9da92e700a501\n" }, { "commit": "6ba052b4847d85831c38c9b8e2942cef4987e55b", "tree": "aa693582c047451f74ad1e45943684cde1f314ed", "parents": [ "bce520e6460e712c0985f12cf212e2d72fd1b9e4", "c1a564b108c511c0bdd699567c245b031930e718" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 18:40:39 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 18:40:39 2010 -0700" }, "message": "am c1a564b1: Merge \"Add support for secure system overlays. (DO NOT MERGE)\" into gingerbread\n\nMerge commit \u0027c1a564b108c511c0bdd699567c245b031930e718\u0027 into gingerbread-plus-aosp\n\n* commit \u0027c1a564b108c511c0bdd699567c245b031930e718\u0027:\n Add support for secure system overlays. (DO NOT MERGE)\n" }, { "commit": "13e46665ff69c1a37880762d7d611aacdf02dac7", "tree": "0eb205446ce6783c0cfd787de681ea379635a1a1", "parents": [ "cf66f587514a935c290c8c9558243a48ba0243eb", "736f5ec476526f3431d81dec5fb695bdee27e21a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 15 18:24:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 18:24:49 2010 -0700" }, "message": "am 736f5ec4: Merge \"Work on issue #3101415: Crespo apps seem to have their UID changed over time.\" into gingerbread\n\nMerge commit \u0027736f5ec476526f3431d81dec5fb695bdee27e21a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027736f5ec476526f3431d81dec5fb695bdee27e21a\u0027:\n Work on issue #3101415: Crespo apps seem to have their UID changed over time.\n" }, { "commit": "10d48f26e72dc7978ae683e8f99cc71409eb75ef", "tree": "2380b3e1617301da6da11c8527fbadccd6df2b82", "parents": [ "36e7790b6b3c2c36c67fbe5dc2e2313cdd537349", "efb581018bbede2ecdc76bcd9722ded5b6903254" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 15 18:22:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 18:22:25 2010 -0700" }, "message": "am efb58101: Debug logs for issue #3101415: Apps seem to have their UID changed over time.\n\nMerge commit \u0027efb581018bbede2ecdc76bcd9722ded5b6903254\u0027 into gingerbread-plus-aosp\n\n* commit \u0027efb581018bbede2ecdc76bcd9722ded5b6903254\u0027:\n Debug logs for issue #3101415: Apps seem to have their UID changed over time.\n" }, { "commit": "3b2b354ec1ba070eae13391d004d97a3e1403050", "tree": "e2647c9a8797a4b3542deab7d1cb766967b35879", "parents": [ "1edb2bda37726ba6bc6feeafad25ea51b1cacaee" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 00:54:27 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 17:10:55 2010 -0700" }, "message": "Add support for secure system overlays.\n\nManual merge from Gingerbread.\n\nThis change adds a new window type for secure system overlays\ncreated by the system itself from non-secure system overlays that\nmight be created by applications that have the system alert permission.\nSecure views ignore the presence of secure system overlays.\n\nBug: 3098519\nChange-Id: Id876736fd8bf332ff9a5428bde59f5268aa49c3a\n" }, { "commit": "36e7790b6b3c2c36c67fbe5dc2e2313cdd537349", "tree": "015c31cf98f1bcc1c3b4b1e8ec7ed1eb5612882f", "parents": [ "6bc34da8acf26c8e70325719fe43eaf22489809d", "a851d8d0cfec45e33ee884114548a4f2890d1f06" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Oct 15 17:02:57 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Oct 15 17:02:57 2010 -0700" }, "message": "Merge a851d8d0 from gingerbread\n\nChange-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a\n" }, { "commit": "2d3f159aa9622e05a18e7f93cecd57ad673955ae", "tree": "8df18f80f44133f19ce9e669a36bdd785b31460a", "parents": [ "c9f7890a203a013646650a695157277df81b6a17" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 00:54:27 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 16:03:35 2010 -0700" }, "message": "Add support for secure system overlays. (DO NOT MERGE)\n\nThis change adds a new window type for secure system overlays\ncreated by the system itself from non-secure system overlays that\nmight be created by applications that have the system alert permission.\nSecure views ignore the presence of secure system overlays.\n\nBug: 3098519\nChange-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07\n" }, { "commit": "8bdf5935c0db4a66ab33a10b43398d2523cfa15d", "tree": "5483e26cd1fb2de239b2f01f3d35c52aeeb7b598", "parents": [ "efb581018bbede2ecdc76bcd9722ded5b6903254" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 15 12:54:40 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 15 14:46:33 2010 -0700" }, "message": "Work on issue #3101415: Crespo apps seem to have their UID changed over time.\n\nfsync!\n\nChange-Id: Ie6c5397202579935ac69bf61d3e7b3081ecf269c\n" }, { "commit": "fcab0f5502410b975afe045354bbae31ccba68a5", "tree": "184b37e57a998580c15fdaa98d7d8bf0c9155a90", "parents": [ "10aca41e51934822dc492cb69b69cef37f42ad42", "8fda1636e3e35f060b9046294efd3c062a1fdb84" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 15 14:00:58 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 14:00:58 2010 -0700" }, "message": "am 8fda1636: am bdf8034c: Merge \"OBB: use PBKDF2 for key generation.\" into gingerbread\n\nMerge commit \u00278fda1636e3e35f060b9046294efd3c062a1fdb84\u0027\n\n* commit \u00278fda1636e3e35f060b9046294efd3c062a1fdb84\u0027:\n OBB: use PBKDF2 for key generation.\n" }, { "commit": "efb581018bbede2ecdc76bcd9722ded5b6903254", "tree": "53ba83804a0ac7a53331b12bec05479954de6a9a", "parents": [ "a851d8d0cfec45e33ee884114548a4f2890d1f06" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 14 16:47:34 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 15 11:22:17 2010 -0700" }, "message": "Debug logs for issue #3101415: Apps seem to have their UID changed over time.\n\n- Activity manager now prints the pid doing a startActivity request.\n- Package manager now remembers messages about problems it has parsing\n packages.xml.\n\nChange-Id: I11a75aa3953dbfa5dd41cfbdf69116c764ec228f\n" }, { "commit": "09b35d2fe51c59b6495df3492e12ecd5009e4cf0", "tree": "2ba0e6b687c0b9b4f5a6c9aa340253340d9a66d5", "parents": [ "733e79c24042145d12a18cac59e8edb08965fab0", "89b73a75467d85c58467c5b8c080c77d25860fe0" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 15 08:32:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 08:32:43 2010 -0700" }, "message": "am 89b73a75: am 361a6ad1: Merge \"Handle native library deletion in scanPackage\" into gingerbread\n\nMerge commit \u002789b73a75467d85c58467c5b8c080c77d25860fe0\u0027\n\n* commit \u002789b73a75467d85c58467c5b8c080c77d25860fe0\u0027:\n Handle native library deletion in scanPackage\n" }, { "commit": "bc21fdefdfbeba1754c6cd339c7dd8e8f1d6fd48", "tree": "8b58be37237ea58089f6541403fd3092ff64f6bc", "parents": [ "c1e7b2182594aa0463c4a738cc8e7eea6777ef50" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Wed Oct 13 17:25:24 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Fri Oct 15 02:12:32 2010 -0700" }, "message": "NFC: Move NFC service implementation out of system_server.\n\nNFC service is now an application service in packages/apps/Nfc.\n\nNFC service is registered through ServiceManager.addService(), and the proxy\nobject NfcAdapter obtains a handle to it through ServiceManager.getService().\n\n**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and\nmodify service_manager.c, Process.java and PackageManagerService.java in order\nto force the com.android.nfc process to take a fixed uid, so that it can use\nServiceManager.addService().\n\nMost of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and\nNdefMessage require some in-process native code, so android_com_NdefMessage.cpp\nand android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to\na very small library libnfc_ndef.so that implements NDEF message parsing. This\nhas been added to core.mk so all devices (even without NFC hardware) can work\nwith NDEF data.\n\nBug: 3041259\nBug: 3097445\nChange-Id: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "9456714cfb9eb5ba4882fdcc922b787d77ed4da4", "tree": "ecf5b32ba086af72d8936c60a48bb6468d7f9960", "parents": [ "b079a106524c8028a1602b6df9be5d273a6552cf", "b4f26a9d37caf7762b66b68d50825c5b075b42bd" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 15 00:08:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 00:08:22 2010 -0700" }, "message": "am b4f26a9d: am e6ae5c39: Merge \"Add shutdown assurance\" into gingerbread\n\nMerge commit \u0027b4f26a9d37caf7762b66b68d50825c5b075b42bd\u0027\n\n* commit \u0027b4f26a9d37caf7762b66b68d50825c5b075b42bd\u0027:\n Add shutdown assurance\n" }, { "commit": "912932c2d95017d939856b0f5558259b1b73aebd", "tree": "b9cdfef0211c257fca585d964d14884f32c99e96", "parents": [ "c8e87e3ce64bc623b856c12cc63e4a46029da743", "4ce930da993c778c8b75da61a9ee3793f9aa84ea" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 14 21:19:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 14 21:19:20 2010 -0700" }, "message": "am 4ce930da: am 259c8499: Merge \"Fix issue #3089800: adb shell am -W causes ActivityManager crash\" into gingerbread\n\nMerge commit \u00274ce930da993c778c8b75da61a9ee3793f9aa84ea\u0027\n\n* commit \u00274ce930da993c778c8b75da61a9ee3793f9aa84ea\u0027:\n Fix issue #3089800: adb shell am -W causes ActivityManager crash\n" }, { "commit": "258d0e805ee63685b807b5dae43efc5ecc97179e", "tree": "1c8905712416f6110992572277b0c44bb66b0b05", "parents": [ "fd28b45125f7d58a9d88c0dd09fe610f6e5878df", "0d65a3fc075b7dbdbfaba6b570217d87e307d75f" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Oct 14 17:57:32 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 14 17:57:32 2010 -0700" }, "message": "am 0d65a3fc: Merge \"Screen on/off animation tweaks\" into gingerbread\n\nMerge commit \u00270d65a3fc075b7dbdbfaba6b570217d87e307d75f\u0027 into gingerbread-plus-aosp\n\n* commit \u00270d65a3fc075b7dbdbfaba6b570217d87e307d75f\u0027:\n Screen on/off animation tweaks\n" }, { "commit": "609695dab0f0318459d32ff5dfc529d7398e751b", "tree": "24d1aad42b48d9040d162a015b29c5d7c21c1d07", "parents": [ "d4e03f37423bee383d17f7292753a5f67e497a28" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Oct 14 14:57:49 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Oct 14 17:49:01 2010 -0700" }, "message": "Screen on/off animation tweaks\n\n- Pass to surface flinger whether we want animations or not.\n- Don\u0027t use the animation when the screen goes off because of the prox sensor.\n- Turn the screen-on animation back off\n- Also, now the animation setting controls whether or not we do the animation.\n\nBug: 3097475\nBug: 3098508\nChange-Id: I205d5564d6668b33a8dc1c40d8cc06c4aad305cf\n" }, { "commit": "a32dcf7f724137842b9b8d72add4e690fac74984", "tree": "bb366de1b38df0f88b8016592d9162c5e03c915b", "parents": [ "2794eb3b02e2404d453d3ad22a8a85a138130a07" ], "author": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Thu Oct 14 12:13:50 2010 -0700" }, "committer": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Thu Oct 14 14:41:07 2010 -0700" }, "message": "Actually draw the drag thumbnail\n\nNow sets the layer and thumbnail dimensions correctly. Also removed the\nleftover bits of the now-replaced thumbnail measurement/drawing mechanism.\n\nFixes bug 3077339\n\nChange-Id: I02983648e0a7ce2ce5fee10825f744e20a3a5b8d\n" }, { "commit": "e55fa3b0fe4d97ada0904c72cc946d51c1b111a5", "tree": "b62f1c203ca8e2d6c39c7a5634fb8873320d61da", "parents": [ "a8b6dad8e5c23f6ade3ccc6010a8915a41d6fbf9", "8a703c772ef233998fccfbdb159c8879c72fa5d3" ], "author": { "name": "Andy Stadler", "email": "stadler@android.com", "time": "Wed Oct 13 23:35:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 23:35:12 2010 -0700" }, "message": "am 8a703c77: am 8e2be267: Add versionCode and versionName to dumpsys packages\n\nMerge commit \u00278a703c772ef233998fccfbdb159c8879c72fa5d3\u0027\n\n* commit \u00278a703c772ef233998fccfbdb159c8879c72fa5d3\u0027:\n Add versionCode and versionName to dumpsys packages\n" }, { "commit": "eb86aaaab34687a77454fa130b08788db1317d74", "tree": "6a0b8bd8dc7d3bb45511902d5d6fba012a3c8b43", "parents": [ "4afdf666fdb034834c48445570ed9d6f4133fc71", "9a12a3c8d4bb20042cf69e07d268e3a04ac71f96" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Wed Oct 13 23:34:21 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 23:34:21 2010 -0700" }, "message": "am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread\n\nMerge commit \u00279a12a3c8d4bb20042cf69e07d268e3a04ac71f96\u0027\n\n* commit \u00279a12a3c8d4bb20042cf69e07d268e3a04ac71f96\u0027:\n Remove dead code, and make the animation a setting.\n turn off the electron beam\n" }, { "commit": "8fda1636e3e35f060b9046294efd3c062a1fdb84", "tree": "9c5d4cb8df12357a067f5214eb2f3dbd08d252ca", "parents": [ "e3c50a5470f64fd99438d6fd985f88d9fe20919a", "bdf8034c657147226b2390eef113ff841e0d6065" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 22:54:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 22:54:10 2010 -0700" }, "message": "am bdf8034c: Merge \"OBB: use PBKDF2 for key generation.\" into gingerbread\n\nMerge commit \u0027bdf8034c657147226b2390eef113ff841e0d6065\u0027 into gingerbread-plus-aosp\n\n* commit \u0027bdf8034c657147226b2390eef113ff841e0d6065\u0027:\n OBB: use PBKDF2 for key generation.\n" }, { "commit": "bdf8034c657147226b2390eef113ff841e0d6065", "tree": "58be0affeafef6d38ef9e53744af1aaf1a7a8fa8", "parents": [ "cebe5b2e01f8ebbf9089aebc386caecea232df76", "3b1abba6bbc895d63da3e82e9b158c01bd12eddd" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 18:29:43 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 18:29:43 2010 -0700" }, "message": "Merge \"OBB: use PBKDF2 for key generation.\" into gingerbread" }, { "commit": "3b1abba6bbc895d63da3e82e9b158c01bd12eddd", "tree": "1296e8c25a2927c94783eda83100c061fc9fe379", "parents": [ "dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 15:00:07 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 18:25:33 2010 -0700" }, "message": "OBB: use PBKDF2 for key generation.\n\nSwitch to using PBKDF2 for the key generation for OBBs. Any previously\ngenerated OBBs will stop being read correctly. A small pbkdf2gen program\nis available to allow generation of appropriate keys with the salts.\n\nBug: 3059950\nChange-Id: If4305c989fd692fd1150eb270dbf751e09c37295\n" }, { "commit": "184498ce5a8d77e1d9c45693363829daaeef9611", "tree": "b5508f851174110267189ede8cf551f771a57be1", "parents": [ "5d794412e3e429e47404395badcd11b0b8639e8b" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Fri Oct 08 17:57:18 2010 -0400" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Oct 13 17:29:26 2010 -0700" }, "message": "Allow notifications to not specify a contentIntent.\n\nIf they don\u0027t, the click events will be passed through to the individual\nviews in the notification view, which may have their own PendingIntents\nattached.\n\nPreviously, it was against the UX spec to allow this, but now we are\nchanging that and will have buttons in there.\n\nChange-Id: I674234212f64b2b8802a0708b7eed0614e147ca3\n" }, { "commit": "db6303e51ef2779b2b6b8b6dc557b5de9b7fdcf0", "tree": "1069c51bc9bd8c034dfd72111542a1f9492d76b2", "parents": [ "70983c47a9810158c85279125875941cc0d59175", "e02d808abf370965c3c4e4d38af11bc69110fde2" ], "author": { "name": "Daniel Sandler", "email": "dsandler@google.com", "time": "Wed Oct 13 16:32:07 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 16:32:07 2010 -0700" }, "message": "Merge \"Dynamically show the menu button on the system bar.\"" }, { "commit": "0a9b54e88b9cbb30748b5f0b331aec3f3ef8d639", "tree": "22ff1466c777067596537ccb085cd64ed0bc3bc5", "parents": [ "0726fd9e835579019f6b23ab50d7b45401e11dbe", "8bb7a1dfbb43dda49fb3c4f86181bcd7f969a832" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 15:43:35 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 15:43:51 2010 -0700" }, "message": "resolved conflicts for merge of 8bb7a1df to master\n\nChange-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9\n" }, { "commit": "89b73a75467d85c58467c5b8c080c77d25860fe0", "tree": "164689be1cc31dcd4ddc550ce4aacfda82f065ad", "parents": [ "2f98a585cda066689b1b525322c51fcacbc3770b", "361a6ad16dedfed871c76e8fa64eb45aa82a0088" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 14:53:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 14:53:23 2010 -0700" }, "message": "am 361a6ad1: Merge \"Handle native library deletion in scanPackage\" into gingerbread\n\nMerge commit \u0027361a6ad16dedfed871c76e8fa64eb45aa82a0088\u0027 into gingerbread-plus-aosp\n\n* commit \u0027361a6ad16dedfed871c76e8fa64eb45aa82a0088\u0027:\n Handle native library deletion in scanPackage\n" }, { "commit": "361a6ad16dedfed871c76e8fa64eb45aa82a0088", "tree": "74b5232126790b9169e7375c985cd2ccc36a62ed", "parents": [ "49ec3dff4350209e109fc11dafe4294acea36146", "70e4210ad9119bfb7e8b7d93ade667518332e882" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 14:50:29 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 14:50:29 2010 -0700" }, "message": "Merge \"Handle native library deletion in scanPackage\" into gingerbread" }, { "commit": "b4f26a9d37caf7762b66b68d50825c5b075b42bd", "tree": "97e8a1b5c8af162ebda2b67a1b94348f969ee2ae", "parents": [ "94980e0f76295de53bd168608d11dba3c39cca9d", "e6ae5c39848d2a3a6f3fb750811550969799e410" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 14:22:19 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 14:22:19 2010 -0700" }, "message": "am e6ae5c39: Merge \"Add shutdown assurance\" into gingerbread\n\nMerge commit \u0027e6ae5c39848d2a3a6f3fb750811550969799e410\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e6ae5c39848d2a3a6f3fb750811550969799e410\u0027:\n Add shutdown assurance\n" }, { "commit": "e02d808abf370965c3c4e4d38af11bc69110fde2", "tree": "78e681d5f884ee5fd9a75f297b6c0384e6542a2c", "parents": [ "3f703de0fbc4a626eacc2973926a99bb8e4fe8e2" ], "author": { "name": "Daniel Sandler", "email": "dsandler@google.com", "time": "Fri Oct 08 15:13:22 2010 -0400" }, "committer": { "name": "Daniel Sandler", "email": "dsandler@google.com", "time": "Wed Oct 13 16:25:43 2010 -0400" }, "message": "Dynamically show the menu button on the system bar.\n\nWindows with FLAG_NEEDS_MENU_KEY (or windowNeedsMenuKey\u003dtrue\nin their theme) will cause the system bar to show a menu\nicon. (Note that the phone\u0027s status bar currently ignores\nthis, but phones tend to have hardware menu keys anyway.)\n\nAdditionally, all windows whose package\u0027s SDK version is\npre-Honeycomb will have FLAG_NEEDS_MENU_KEY set by default.\n\nBug: 3003728\n\nChange-Id: I2d983763a726ea4f32cd1af9b0390e30478b11d1\n" }, { "commit": "f547d679c058ed00de78a32146d04b75254df7ec", "tree": "5a25cc02f0dcc5ad8ea59850f6383ababd4c956d", "parents": [ "dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 22 10:36:48 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 11:45:35 2010 -0700" }, "message": "Add shutdown assurance\n\nIf something kills system_server before it completes its shutdown\naction, the runtime will just restart giving the illusion that a reboot\nfor an OTA or something else has happened.\n\nTo prevent this, write a system property containing the reboot reason\nbefore initiating the shutdown with all the services. If the\nsystem_server is killed before it completes, the next time the main\nthread of system_server starts up, it will immediately execute the\nshutdown action.\n\nBug: 3022556\nChange-Id: I81723bac333430f04205e7a7b799914d96f170eb\n" }, { "commit": "70e4210ad9119bfb7e8b7d93ade667518332e882", "tree": "a12c6f82b3c11a2bb31bae29b512dc4189e491b8", "parents": [ "dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 12 08:59:10 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 08:49:24 2010 -0700" }, "message": "Handle native library deletion in scanPackage\n\nThe deletion of native libraries was initially added to\nFileInstallArgs.cleanUpResourcesLI() as a way to get rid of old native\nlibraries during an upgrade, but it runs well after scanPackage unpacks\nthe new native libraries. scanPackage now removes old libraries before\nunpacking the new ones, so we don\u0027t need this code anymore.\n\nBug: 3087739\nChange-Id: I54aca830ec34d6440ba22f117d55aa3107bf5b75\n" }, { "commit": "4ce930da993c778c8b75da61a9ee3793f9aa84ea", "tree": "3806e09048a59c2c016c9d424dcc53634b9c2a15", "parents": [ "373a69614e534ae04dddd79c92933b6d8969fad7", "259c849989ccd30b0bb4569d11f125ed2c0c1911" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Oct 12 19:08:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 19:08:49 2010 -0700" }, "message": "am 259c8499: Merge \"Fix issue #3089800: adb shell am -W causes ActivityManager crash\" into gingerbread\n\nMerge commit \u0027259c849989ccd30b0bb4569d11f125ed2c0c1911\u0027 into gingerbread-plus-aosp\n\n* commit \u0027259c849989ccd30b0bb4569d11f125ed2c0c1911\u0027:\n Fix issue #3089800: adb shell am -W causes ActivityManager crash\n" }, { "commit": "ba0492d5edd3e6e24d948c531b74ffb5fc9b922e", "tree": "8452016fd3a0e7806647ce06cf288be94ebe31ee", "parents": [ "45738f6700cff689eacda7c8192b76939ba20591" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Oct 12 19:01:46 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Oct 12 19:01:46 2010 -0700" }, "message": "Fix issue #3089800: adb shell am -W causes ActivityManager crash\n\nChange-Id: I5508afeb523d84e552117f94c8b70e2bae2c33fa\n" }, { "commit": "ab275bb637af007deeed34676dd5aad3aa7746cc", "tree": "284d7de6d87de143af017f7e416ddaa28951aeaa", "parents": [ "77b9c89f83ea005a298da39ad13eedb80d84f31e", "1c67b7af0147080de807db3cc564899db85b43a8" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 12 16:40:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 16:40:47 2010 -0700" }, "message": "am 1c67b7af: am a4e95dfe: Merge \"Grant URI permissions to the MCS\" into gingerbread\n\nMerge commit \u00271c67b7af0147080de807db3cc564899db85b43a8\u0027\n\n* commit \u00271c67b7af0147080de807db3cc564899db85b43a8\u0027:\n Grant URI permissions to the MCS\n" }, { "commit": "c88a1f955c56a6cc0527ddf045ac93c657ca859d", "tree": "d9048e7c75f0c1cb271d4713155a7b76d44f6f43", "parents": [ "5e850b70dc4a4ef58628af18e3508e8894d9102e", "14854820eac895a925791fb41ccd330447fd4f02" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Oct 12 16:27:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 16:27:22 2010 -0700" }, "message": "am 14854820: am c0ad216c: Merge \"Add a configuration option to turn on the screen when you unplug the device.\" into gingerbread\n\nMerge commit \u002714854820eac895a925791fb41ccd330447fd4f02\u0027\n\n* commit \u002714854820eac895a925791fb41ccd330447fd4f02\u0027:\n Add a configuration option to turn on the screen when you unplug the device.\n" }, { "commit": "8a703c772ef233998fccfbdb159c8879c72fa5d3", "tree": "921b2c964c7c2f765ce94d64560d1f5cddb100c1", "parents": [ "4af1de39ab36cbff08075e654db516526ff9038d", "8e2be267f53bd1d2f1531f56732ead4138ac5c58" ], "author": { "name": "Andy Stadler", "email": "stadler@android.com", "time": "Tue Oct 12 15:25:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 15:25:34 2010 -0700" }, "message": "am 8e2be267: Add versionCode and versionName to dumpsys packages\n\nMerge commit \u00278e2be267f53bd1d2f1531f56732ead4138ac5c58\u0027 into gingerbread-plus-aosp\n\n* commit \u00278e2be267f53bd1d2f1531f56732ead4138ac5c58\u0027:\n Add versionCode and versionName to dumpsys packages\n" }, { "commit": "8e2be267f53bd1d2f1531f56732ead4138ac5c58", "tree": "5ceb35720a1daf0be56e161c788f7069430f56b7", "parents": [ "fb6431c0298747d240fcdc025575e5f46db95132" ], "author": { "name": "Andy Stadler", "email": "stadler@android.com", "time": "Tue Oct 12 15:00:43 2010 -0700" }, "committer": { "name": "Andy Stadler", "email": "stadler@android.com", "time": "Tue Oct 12 15:05:06 2010 -0700" }, "message": "Add versionCode and versionName to dumpsys packages\n\nbug: 3090491\nChange-Id: If116baaeb83bd282c5c5534fde6248f19830a71c\n" }, { "commit": "9a12a3c8d4bb20042cf69e07d268e3a04ac71f96", "tree": "8077adbd81854c5b5571b57a5f9d20f28d92ca75", "parents": [ "090ac9f7dd883aa75c899745182471d409a2b762", "ba799098608c7be8ff1e18adfa7dc1f452205a7e" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Oct 12 14:46:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 14:46:23 2010 -0700" }, "message": "am ba799098: Merge changes I76513387,I335fb671 into gingerbread\n\nMerge commit \u0027ba799098608c7be8ff1e18adfa7dc1f452205a7e\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ba799098608c7be8ff1e18adfa7dc1f452205a7e\u0027:\n Remove dead code, and make the animation a setting.\n turn off the electron beam\n" }, { "commit": "b8203e9718350e0b5ada07848c40a639220472b3", "tree": "33628ab7048ab0b7484282c19c48187af9ded316", "parents": [ "2bc063fdb697574a58eddf12adf2cc301d6aab74" ], "author": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Tue Oct 12 14:23:21 2010 -0700" }, "committer": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Tue Oct 12 14:23:21 2010 -0700" }, "message": "Pass the starting touch point in the DRAG_STARTED message\n\nFixes bug 3089251\n\nChange-Id: I072742dc6c5745083cdac8dcfa19fb1f2bbbf404\n" }, { "commit": "b08a1af667b16cb1faaea2aec1cf2a0e4659cb3f", "tree": "5d9491ee082cdb6f6fb61a22c97c961ee5ae5721", "parents": [ "aab758e87991d1460ca94d4a5f22c0ef34641e2d" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Mon Oct 11 19:28:58 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Oct 12 14:16:11 2010 -0700" }, "message": "Remove dead code, and make the animation a setting.\n\nWhen we don\u0027t do the brightness fade, turn off the electron beam instead.\n\nChange-Id: I76513387c4fb420a67e59e005f6e8c3bc72f7f08\n" }, { "commit": "1ab5de7f2101537c14a8a7e1224de3a0bdeac7c9", "tree": "4f5e70ecf20b65f75367fd3db8c3048d14a72912", "parents": [ "ef31d7d00ef7ce8e1690903574402b3a6e0a454f", "a75803e9502a5687d825d7ff8f62ec70b540a3c2" ], "author": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Tue Oct 12 13:57:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 13:57:20 2010 -0700" }, "message": "am a75803e9: am 0a789236: Merge \"Temporarily turn on backup/restore debug logs\" into gingerbread\n\nMerge commit \u0027a75803e9502a5687d825d7ff8f62ec70b540a3c2\u0027\n\n* commit \u0027a75803e9502a5687d825d7ff8f62ec70b540a3c2\u0027:\n Temporarily turn on backup/restore debug logs\n" }, { "commit": "7031e7a60d916ff7f0b8d848ffbf4ad7252b388b", "tree": "c22663be3d6f6e10c019598aea036b3e0c0f0b6d", "parents": [ "5e6338d4a80e10fe5911fc4317d1d5958d8b033d", "5be893a71aa72f54660496dd01cfad66adb86b8f" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Oct 12 13:22:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 13:22:41 2010 -0700" }, "message": "am 5be893a7: am 446547af: Merge \"Don\\\u0027t throw when userActivity fails because of the permission check.\" into gingerbread\n\nMerge commit \u00275be893a71aa72f54660496dd01cfad66adb86b8f\u0027\n\n* commit \u00275be893a71aa72f54660496dd01cfad66adb86b8f\u0027:\n Don\u0027t throw when userActivity fails because of the permission check.\n" }, { "commit": "5e6338d4a80e10fe5911fc4317d1d5958d8b033d", "tree": "fd74e61711f12d057e7a8d0cf2be253da473081b", "parents": [ "735821fccc181bdfbebd6f067296182130934e5d", "2af4c51e9a82848e3efce4621559a69fda965665" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Oct 12 13:22:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 13:22:27 2010 -0700" }, "message": "am 2af4c51e: am 6bb7a4a6: Go one day into 1970 for timezone code.\n\nMerge commit \u00272af4c51e9a82848e3efce4621559a69fda965665\u0027\n\n* commit \u00272af4c51e9a82848e3efce4621559a69fda965665\u0027:\n Go one day into 1970 for timezone code.\n" }, { "commit": "5fdc0c7397ee2d638bc310e5ce2830b938d7c008", "tree": "eb0106e57478c315cbb35220ecbc6c7af2236890", "parents": [ "e28c8f286d9bd4c7b558d6ffb8bd2fb1226ada2e", "14d151bf41736b8f8e4f13c72a2c612286257c99" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Oct 12 13:12:18 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Oct 12 13:12:18 2010 -0700" }, "message": "resolved conflicts for merge of 14d151bf to master\n\nChange-Id: Ib1ac9acfd6dc71b5fa4e1456a056d1e9dee65fda\n" }, { "commit": "e28c8f286d9bd4c7b558d6ffb8bd2fb1226ada2e", "tree": "9db50803fcfa0ba90251d994567b80c421287fc9", "parents": [ "be27cc6943ead560c0b404b7755b88cda0fd1eea", "e1ff214e32ed5c546a7603b07b054908c4d93312" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 12 12:45:46 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 12 12:45:46 2010 -0700" }, "message": "Merge \"Add API to check for emulated external storage\"" }, { "commit": "301f78bbbe44e78583d9b4ecb2d9bd96feeabdec", "tree": "bc019460698b90b90d2061b188cf915f13479535", "parents": [ "98f06865530c825aadd4ebf4c043403e3d9095f8", "431dd3b1bc8f2acf7cbcf08463649b5629baf398" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue Oct 12 11:50:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 11:50:23 2010 -0700" }, "message": "am 431dd3b1: am 86564dc6: Merge \"GPS: Add update_network_state call to AGpsRillInterface\" into gingerbread\n\nMerge commit \u0027431dd3b1bc8f2acf7cbcf08463649b5629baf398\u0027\n\n* commit \u0027431dd3b1bc8f2acf7cbcf08463649b5629baf398\u0027:\n GPS: Add update_network_state call to AGpsRillInterface\n" }, { "commit": "e1ff214e32ed5c546a7603b07b054908c4d93312", "tree": "d61485a78a33eaedf4494cbdf21e48225d49b4e7", "parents": [ "84e8827a477cdf3d8c2b67e370395b22ec1963ad" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 12 11:20:01 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Oct 12 11:30:56 2010 -0700" }, "message": "Add API to check for emulated external storage\n\nWhen the storage is emulated, we don\u0027t want to install ASEC containers\nto it. This adds the API to check when the external storage is emulated\nand uses it to check whether or not to install packages to the external\nstorage in an ASEC container.\n\nBug: 3024387\nChange-Id: Ia0318aca9e4938a4897deaada5603a4c7c1d0f48\n" }, { "commit": "d10cd5765a2b706fc174f16b951d6b0a5d3740d3", "tree": "a3b21518ecfd0729e2f790745a088d7d6ee5cb1a", "parents": [ "514c969ca72b081d84b5f563edf696c6642fa1fa" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Sun Oct 10 13:33:22 2010 -0700" }, "committer": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Tue Oct 12 11:00:18 2010 -0700" }, "message": "Always create OpenGL accelerated windows in RGBA 8888.\n\nBug #3081600\n\nThe OpenGL renderer in libhwui uses a single EGL context per process and\nthus create it with an RGBA 8888 EGL configuration. To ensure that all\nwindows are compatible with this configuration, this change modifies\nthe window manager and SurfaceFlinger.\n\nThe window manager now checks the window\u0027s flags and if the window is\nhardware accelerated, it forces the window\u0027s pixel format to be\ntranslucent when creating the surface. The window itself is still\nmarked as opaque if we know that the window will be opaque on screen.\nThis keeps existing optimizations in place.\n\nSimilarly in SurfaceFlinger, a translucent Surface can now be created\nwith the Surface.OPAQUE flag, indicating SurfaceFlinger that the surface\ndoes not require blending, despite its RGBA 8888 configuration.\n\nChange-Id: Ic747b6b12564ba064412d842117880fcc199eb7c\n" }, { "commit": "5994359f3009a3ebfbd37d82bb9a665e9b947851", "tree": "e47c94c1f106238a7a1d4311214cfde4deeadf13", "parents": [ "26b6df74b9bcc693a5b57347d427b352cdc0541a" ], "author": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Mon Oct 11 20:33:44 2010 -0700" }, "committer": { "name": "Chris Tate", "email": "ctate@google.com", "time": "Mon Oct 11 20:58:07 2010 -0700" }, "message": "Be sure to hold the window manager lock around *Lw() methods\n\nChange-Id: Ia0271df34b084bf1d3dc39373dd66b6afe96c379\n" }, { "commit": "40e7a62789bf338c7b4f8243543896dcfc372e44", "tree": "d97eea070daa5d8d006d624fa0dd892273889905", "parents": [ "057c13bcce4d6f6a35fe7a096e1d1774de003fad", "6d1321f02f8e8c201469f17a7a62a4d063821b9a" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Oct 11 18:58:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 18:58:35 2010 -0700" }, "message": "am 6d1321f0: am 65f23e71: Merge \"Corrected visibility reporting error in WindowManager\"\n\nMerge commit \u00276d1321f02f8e8c201469f17a7a62a4d063821b9a\u0027\n\n* commit \u00276d1321f02f8e8c201469f17a7a62a4d063821b9a\u0027:\n Corrected visibility reporting error in WindowManager\n" }, { "commit": "6a443f2ee1770347c16016d719a603f96d9733ba", "tree": "bfa391da0a1a231789fb3e2404a6624b804c292a", "parents": [ "a081fa662ba98e1c058693d954bddcd8a6607c26", "d54a97a0efc5cdd8088a277b0e6787ea24711e0c" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Oct 11 18:57:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 18:57:43 2010 -0700" }, "message": "am d54a97a0: am fb1e5529: Merge \"Fix time zone info in kernel is nothing after reboot\"\n\nMerge commit \u0027d54a97a0efc5cdd8088a277b0e6787ea24711e0c\u0027\n\n* commit \u0027d54a97a0efc5cdd8088a277b0e6787ea24711e0c\u0027:\n Fix time zone info in kernel is nothing after reboot\n" }, { "commit": "4231124c9df51727a42cb1c09777816797c912cb", "tree": "7ebad7fcf31ab71ebcf422ce156a3c69f0f22548", "parents": [ "d5d2b7382cd863dd5c92c99575fb345777f0c567", "e20c9e0264190f94324197a8271cf03811a4ca58" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 18:15:38 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 11 18:15:38 2010 -0700" }, "message": "Merge \"Fix an event injection bug when the policy is bypassed.\"" }, { "commit": "e20c9e0264190f94324197a8271cf03811a4ca58", "tree": "e482829d555d313e57ead50bc24102897dde9b36", "parents": [ "182e5cf105aa71effbdee15628f020214b54774c" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 14:20:19 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 17:54:12 2010 -0700" }, "message": "Fix an event injection bug when the policy is bypassed.\n\nAdded the concept of a \"trusted\" event to distinguish between events from\nattached input devices or trusted injectors vs. other applications.\nThis change enables us to move certain policy decisions out of the\ndispatcher and into the policy itself where they can be handled more\nsystematically.\n\nCherry pick of b931a1b4 from gingerbread into master.\n\nChange-Id: I700a5f07b8b227878cea9437a289a45a245c0424\n" }, { "commit": "76f8688e9b9a71cb064119022a3f69c2e17b8b65", "tree": "2e8753df114cf82e84c71312db5a3857ed2ad406", "parents": [ "a23935ab334b2dec47735608383608ca3093b4b2", "779d1778b6147ee1b57428af234d1498a26f031e" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Oct 11 17:49:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 17:49:28 2010 -0700" }, "message": "am 779d1778: am bd1454f5: Merge \"Include debugger connection status in error entry\"\n\nMerge commit \u0027779d1778b6147ee1b57428af234d1498a26f031e\u0027\n\n* commit \u0027779d1778b6147ee1b57428af234d1498a26f031e\u0027:\n Include debugger connection status in error entry\n" }, { "commit": "dd8b0c90400a1c59d4d71d768c02eed961596bc8", "tree": "824f5086cdab46a9484c41dc87e921e2ff4212a6", "parents": [ "5d3f6073bfc62811f552a16be7d58483104a29a3", "41aabeb51305d19747687f246080f44fc2a74435" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 17:42:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 17:42:30 2010 -0700" }, "message": "am 41aabeb5: am 1e6a3a53: Merge \"Added more robust tracking and cancelation of events.\" into gingerbread\n\nMerge commit \u002741aabeb51305d19747687f246080f44fc2a74435\u0027\n\n* commit \u002741aabeb51305d19747687f246080f44fc2a74435\u0027:\n Added more robust tracking and cancelation of events.\n" }, { "commit": "8bb7a1dfbb43dda49fb3c4f86181bcd7f969a832", "tree": "0eb8b8355abedba7b083d5ef547893ed66d3d56a", "parents": [ "0ad4a77cb78348951c349ba92ec858bfb26aeb33", "b4de3dca96b9ff18562062e181dcd8b83e641e45" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 11 17:31:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 17:31:06 2010 -0700" }, "message": "am b4de3dca: Merge \"OBB: rearrange to be entirely asynchronous\" into gingerbread\n\nMerge commit \u0027b4de3dca96b9ff18562062e181dcd8b83e641e45\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b4de3dca96b9ff18562062e181dcd8b83e641e45\u0027:\n OBB: rearrange to be entirely asynchronous\n" }, { "commit": "f2e0681ada3ffe1de994a51dcebd6ef045d27434", "tree": "c6f8e837d2091a890fb3d9d2882b3a534b190625", "parents": [ "d965724fdcc63a070657518542559a8b1a35a70d", "1da8d4d1697cec871dea8c30dad67e90db10bde6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 17:26:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 17:26:51 2010 -0700" }, "message": "am 1da8d4d1: Merge \"Fix an event injection bug when the policy is bypassed.\" into gingerbread\n\nMerge commit \u00271da8d4d1697cec871dea8c30dad67e90db10bde6\u0027 into gingerbread-plus-aosp\n\n* commit \u00271da8d4d1697cec871dea8c30dad67e90db10bde6\u0027:\n Fix an event injection bug when the policy is bypassed.\n" }, { "commit": "1c67b7af0147080de807db3cc564899db85b43a8", "tree": "21518fb309e87a734cb1d723d5d87692721391bc", "parents": [ "cf88cf878be96a564b38f428c161cc864dfad56d", "a4e95dfea4f3635d6cb845873fce0566c20cc88e" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 11 17:26:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 17:26:07 2010 -0700" }, "message": "am a4e95dfe: Merge \"Grant URI permissions to the MCS\" into gingerbread\n\nMerge commit \u0027a4e95dfea4f3635d6cb845873fce0566c20cc88e\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a4e95dfea4f3635d6cb845873fce0566c20cc88e\u0027:\n Grant URI permissions to the MCS\n" }, { "commit": "b4de3dca96b9ff18562062e181dcd8b83e641e45", "tree": "b2e8b6060e1dbea173de867e5258add9b08ef8f3", "parents": [ "1169f420f6df5cf5254fed883efa7e6780473c08", "af9d667ccf3e24058214cf4cc0a8aa8bc5100e3c" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 11 17:24:54 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 11 17:24:54 2010 -0700" }, "message": "Merge \"OBB: rearrange to be entirely asynchronous\" into gingerbread" }, { "commit": "af9d667ccf3e24058214cf4cc0a8aa8bc5100e3c", "tree": "c59adbe6d27cf236d6920f689dd237a115fef3f9", "parents": [ "ce2f1909c74a1b90995f06a865d21260b062300b" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 08 09:21:39 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 11 17:22:03 2010 -0700" }, "message": "OBB: rearrange to be entirely asynchronous\n\nRearrange structure of MountService handling of OBBs to be entirely\nasynchronous so we don\u0027t rely on locking as much. We still need the\nlocking to support dumpsys which has been improved to output all the\ndata structures for OBBs.\n\nAdded more tests to cover more of the error return codes.\n\nOh and fix a logic inversion bug.\n\nChange-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9\n" }, { "commit": "1da8d4d1697cec871dea8c30dad67e90db10bde6", "tree": "9a9fe2f4a87edb3e0816ef5b28f1076e476803e8", "parents": [ "44104df10660c711129fd263364afc2174f40ac2", "b931a1b4183386ba840edc1bcc507eccf11b5cbe" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 16:27:36 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 11 16:27:36 2010 -0700" }, "message": "Merge \"Fix an event injection bug when the policy is bypassed.\" into gingerbread" }, { "commit": "b931a1b4183386ba840edc1bcc507eccf11b5cbe", "tree": "f9e1ba1030d392ab288ad13e5eaba32c65a96c76", "parents": [ "b699726018a0049665d8ad6b90dbc5af0e18f135" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 14:20:19 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 16:26:13 2010 -0700" }, "message": "Fix an event injection bug when the policy is bypassed.\n\nAdded the concept of a \"trusted\" event to distinguish between events from\nattached input devices or trusted injectors vs. other applications.\nThis change enables us to move certain policy decisions out of the\ndispatcher and into the policy itself where they can be handled more\nsystematically.\n\nChange-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970\n" }, { "commit": "a4e95dfea4f3635d6cb845873fce0566c20cc88e", "tree": "1715f9fd98681f03b15ec36209f72f8ea53ad6bf", "parents": [ "c0ad216c8ebc74b59074a7538533605eebfd65c3", "111285763204cabff682b381928fd5447a5c6a90" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 11 15:49:30 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 11 15:49:30 2010 -0700" }, "message": "Merge \"Grant URI permissions to the MCS\" into gingerbread" }, { "commit": "14854820eac895a925791fb41ccd330447fd4f02", "tree": "2a51b4aaada03918304877c535f2e5f34d514fa6", "parents": [ "ad9a559c611a2901a490c887f03d9622695beba2", "c0ad216c8ebc74b59074a7538533605eebfd65c3" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Mon Oct 11 15:22:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 15:22:30 2010 -0700" }, "message": "am c0ad216c: Merge \"Add a configuration option to turn on the screen when you unplug the device.\" into gingerbread\n\nMerge commit \u0027c0ad216c8ebc74b59074a7538533605eebfd65c3\u0027 into gingerbread-plus-aosp\n\n* commit \u0027c0ad216c8ebc74b59074a7538533605eebfd65c3\u0027:\n Add a configuration option to turn on the screen when you unplug the device.\n" }, { "commit": "c0ad216c8ebc74b59074a7538533605eebfd65c3", "tree": "cfb84ecf60bfe1b679080ef08922e8b02415b874", "parents": [ "3d90d11a7b6d2b1c49e5890306a06f01646392b0", "6d747656628aa86ee2190a3e5939d447623294a5" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Mon Oct 11 15:19:47 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 11 15:19:47 2010 -0700" }, "message": "Merge \"Add a configuration option to turn on the screen when you unplug the device.\" into gingerbread" }, { "commit": "6d747656628aa86ee2190a3e5939d447623294a5", "tree": "2c95adad3e676973f4e98691b185852819293e44", "parents": [ "446547af37fd10142f15f6a9b3ac3007c6473981" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Mon Oct 11 15:15:31 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Mon Oct 11 15:16:28 2010 -0700" }, "message": "Add a configuration option to turn on the screen when you unplug the device.\n\nBug: 3068624\nChange-Id: I7366ece2528b31feee920f4600a475e81a0f3709\n" } ], "next": "111285763204cabff682b381928fd5447a5c6a90" }