)]}' { "log": [ { "commit": "a8d7b7477d99dd2671e6232e157da9954bf4699f", "tree": "1d7dc40888d00b25724c1b82e63ea26521737fab", "parents": [ "6fb9316f6bd72b406bbfc61bd210281744eea9c1", "ef8a810b3b11d177a64111125eaa44bb76624414" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Nov 02 14:59:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 02 14:59:51 2010 -0700" }, "message": "am ef8a810b: Merge \"Update of DRM framework\"\n\n* commit \u0027ef8a810b3b11d177a64111125eaa44bb76624414\u0027:\n Update of DRM framework\n" }, { "commit": "ab1b304bd4cf0bb6473b21d5604596105b794362", "tree": "9822078d7454b320f26f8c7431ba26b9ff2a0d20", "parents": [ "e06bdead5decc26c7fd7ed9b10ad0f009e14d274", "ccb75a882f670f8928f13a485c0c29b8b8b93af3" ], "author": { "name": "Dan Bornstein", "email": "danfuzz@android.com", "time": "Mon Nov 01 16:09:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 01 16:09:44 2010 -0700" }, "message": "am ccb75a88: Merge \"Update the API file.\" into gingerbread\n\n* commit \u0027ccb75a882f670f8928f13a485c0c29b8b8b93af3\u0027:\n Update the API file.\n" }, { "commit": "c7b3ccc564448cb4b918728421f9402bc18278c5", "tree": "7d97c647cef5ae086048f62636bad3343f193459", "parents": [ "5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Fri Oct 08 23:05:49 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 02 08:06:06 2010 +0900" }, "message": "Update of DRM framework\n\n - Overload openDecryptSession() with uri parameter\n in order to accept URI of DRM content,\n Following API is added,\n DecryptHandle*openDecryptSession(const char* uri);.\n - Unify texisting three event types of processDrmInfo()\n so that caller of DRM framework does not have to handle many event types.\n - Let DrmManagerService call load/unload plugins API so that\n client of DRM framework does not have to manage plug-in load/unload.\n - Trivial fix in DrmManagerClient.java is also incorporated.\n\nChanges are made by Sony Corporation.\n\nChange-Id: If62b47fa0360718fdc943e6e6143671d7db26adc\n" }, { "commit": "bc19c7bdc07f5ab305d91b43ab7a14afc8ca10cd", "tree": "ca0b86e327fb78eb5588f3ed61cf2518fc14a749", "parents": [ "42679cea5d8bc4b235b290b97805b86c8c7cbca5" ], "author": { "name": "Dan Bornstein", "email": "danfuzz@android.com", "time": "Mon Nov 01 14:08:01 2010 -0700" }, "committer": { "name": "Dan Bornstein", "email": "danfuzz@android.com", "time": "Mon Nov 01 14:14:37 2010 -0700" }, "message": "Update the API file.\n\nMy previous change was api-compatible, but some of the incidental data\nin the API file (like parameter names) changed. It looks like there\nwere probably a couple other similar changes too, that hadn\u0027t\npreviously been propagated to the API file; all I did to generate this\nchange was say \"make update-api\".\n\nChange-Id: I427a9ceb51212fde515df007613b8687b7228ce7\n" }, { "commit": "ba1664b34cc33ebb6b45fccedb35298ff8b1d998", "tree": "ba3185c79d0a86a0d99d2e6270b2bd3e8b5e2130", "parents": [ "faebca7f4319950927759163a703dd12f2727460", "4bf4b491be3fbd0f71bb87749a0e31f817b91e08" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Fri Oct 29 08:15:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 29 08:15:48 2010 -0700" }, "message": "am 4bf4b491: Merge \"Hide some NFC API\\\u0027s.\" into gingerbread\n\n* commit \u00274bf4b491be3fbd0f71bb87749a0e31f817b91e08\u0027:\n Hide some NFC API\u0027s.\n" }, { "commit": "11b075e218b9921a953eeebe73fcd1a8a81f764b", "tree": "7efd302691767e6f3e7ba83fcd2f9ee2ada647ae", "parents": [ "120a4594855951ed5eb185fdfc19bf98efef3ba2" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Oct 28 13:39:37 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Oct 28 14:54:52 2010 -0700" }, "message": "Hide some NFC API\u0027s.\n\nWe are leaving enough API so that you can see when any Tag is discovered,\nget its ID, and get its NDEF messages.\n\nBut for advanced use - creating tag connections and writing messages - we have\n2 problems. Firstly a lot of the code is untested\n(RawTagConnection.transceive()), or in some cases known not to work\n(NdefTagConnection.write()). Secondly, there is still debate about how to\nbest expose information about Tags.\n\nThe set of data/methods exposed for a Tag changes completely depending on the\ntag technology. There may be multiple sets of technology implemented in a\nsingle tag. Tag A may have technology X and Y, Tag B may have technology Y\nand Z. Furthermore, some NFC controllers will be not be able to use all\ntechnologies, and so Android Device 1 may see technology X and Y on Tag A but\nAndroid device 2 may only see technology X. So we have a pretty challenging\nset of constraints to work under, and we are not convinced the current Tag and\nNdefTag class is the best approach going forwards.\n\nThe Tag application should be able to remain unbundled, since it just needs to\nget incoming NDEF Messages.\n\nChange-Id: Ic09f094f33794e10f8d730fffe011c9a5957e0ac\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "c2f78020d3887539fc90230d96465e4b1dc84d8e", "tree": "c71f7293dfae5566b7ad688ddf33a676753c35ef", "parents": [ "2ef36763700eff5679d6012e7f078c57f1a4c465", "236568999411214ef440cabc6d12e3bf5f19d8f4" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Oct 24 18:38:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 24 18:38:11 2010 -0700" }, "message": "am 23656899: Merge \"Fix issue #3126018: No way to specify NativeActivity\\\u0027s native method\" into gingerbread\n\nMerge commit \u0027236568999411214ef440cabc6d12e3bf5f19d8f4\u0027 into gingerbread-plus-aosp\n\n* commit \u0027236568999411214ef440cabc6d12e3bf5f19d8f4\u0027:\n Fix issue #3126018: No way to specify NativeActivity\u0027s native method\n" }, { "commit": "e21d91c694e828e6285cc50e79b2a6be6e8c692b", "tree": "bff7d5088aa8dc568c33a1c68a7dbd976ebe0f58", "parents": [ "b6a2256e5461160a89d077b761d3253d95ce869f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Oct 24 14:56:38 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Oct 24 14:56:38 2010 -0700" }, "message": "Fix issue #3126018: No way to specify NativeActivity\u0027s native method\n\nChange-Id: I59de6a543e7f7f45d963a905829a3f56f32bf8cf\n" }, { "commit": "f5b5d177a94bf5b1e59c11fb6f53e2dd40271f59", "tree": "a4cff1c264d14442d9a11d62bbe50761b472d6aa", "parents": [ "d13f5f4fea0dd03cbbfc4a9ec711c4ffcc91655b", "07f3bee2db8b6e93ebbf7222676bd9f468e85569" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Fri Oct 22 18:20:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 18:20:52 2010 -0700" }, "message": "am 07f3bee2: Push Tag/NdefTag implementation details into the service.\n\nMerge commit \u002707f3bee2db8b6e93ebbf7222676bd9f468e85569\u0027 into gingerbread-plus-aosp\n\n* commit \u002707f3bee2db8b6e93ebbf7222676bd9f468e85569\u0027:\n Push Tag/NdefTag implementation details into the service.\n" }, { "commit": "07f3bee2db8b6e93ebbf7222676bd9f468e85569", "tree": "4d1d6a9f81252ebda078954da4380b470f0b320b", "parents": [ "67496e591dca9c7faa07f6e1c8849c9d5af4edb9" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Oct 21 21:42:24 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Fri Oct 22 16:29:43 2010 -0700" }, "message": "Push Tag/NdefTag implementation details into the service.\n\nTag/NdefTag objects should just be simple data objects. Push the mapping of\ninternal tag type to public rawTarget/ndefTarget into Nfc Service.\n\nThis gives an oppurtunity to clean up some Tag/NdefTag API methods. Most\nsignificantly, adding createMockTag() and createMockNdefTag() to help with\napplication testing.\n\nThere will probably be some more tweaking of the types/targets in\nTag/NdefTag to come, this commit makes that a lot easier.\n\nAlso:\n- Introduce getActivationBytes() and getPollBytes(). These are just stubs\nfor NFC service to implement, we have feedback these are really important\nto help identify NFC tags.\n- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll\ninto 3A).\n\nChange-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "9c7489f8bdcd08990c44250cbad64399badc72be", "tree": "16af554746fcb12e6715514f89d01c39c80666fa", "parents": [ "2051a1be52b3380285597c62e283e12bf659bda9", "38993d8d833ca2e61111d2a828dc4f67ca7848cb" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 22 14:03:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 14:03:08 2010 -0700" }, "message": "am 38993d8d: Merge \"Fix issue #3122240: Expose xlarge in GB.\" into gingerbread\n" }, { "commit": "5383f502e4479d117c89666fb2ee1ca53f3d27cf", "tree": "3205788a98d26a3161916279d83e7fd5629fc92f", "parents": [ "7ce276b5a3f2e0938956171abd32d60c7f619d16" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 22 12:59:20 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Oct 22 12:59:20 2010 -0700" }, "message": "Fix issue #3122240: Expose xlarge in GB.\n\nPlus some other small API cleanup.\n\nChange-Id: I1a3c60f510f99224cccac9cc3f838f04141064f8\n" }, { "commit": "8783b0e20ca8d484a13c1c5d7f19b8570c30eead", "tree": "a01dc2b19776a51c54426ffd84dceaeb37523983", "parents": [ "c81ec79d1f88ae8a80e08560a56845655a74f67e", "7c68bc3867bf536ca58ababdd7e35c676b95f0a5" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Fri Oct 22 12:11:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 22 12:11:23 2010 -0700" }, "message": "am 7c68bc38: Merge \"Unhide some NFC APIs that are required for the Tag app.\" into gingerbread\n" }, { "commit": "da83f513ca661cd2bb1e6f1c8b64b716205bae48", "tree": "362a40730be4d492165a6f7381b928eca0bbaaf1", "parents": [ "389a440ad13f7b16e8f7c7f1670bdd55f1e2112a" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Thu Oct 21 22:39:30 2010 -0500" }, "committer": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Thu Oct 21 23:43:22 2010 -0500" }, "message": "Unhide some NFC APIs that are required for the Tag app.\n\nChange-Id: Ic64e00476132dbf4644de5c465e06fe11a264508\n" }, { "commit": "de8635e4c4c9f674b52cb6041380c3ef2812630c", "tree": "c6a9f6404edf36103ab1ad553a2e6746272d6460", "parents": [ "6123e0f7c91ffc7534da99b4668879dacf662227", "389a440ad13f7b16e8f7c7f1670bdd55f1e2112a" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Thu Oct 21 21:08:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 21:08:20 2010 -0700" }, "message": "am 389a440a: Backport ParcelFileDescriptor.createPipe() from master.\n\nMerge commit \u0027389a440ad13f7b16e8f7c7f1670bdd55f1e2112a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027389a440ad13f7b16e8f7c7f1670bdd55f1e2112a\u0027:\n Backport ParcelFileDescriptor.createPipe() from master.\n" }, { "commit": "389a440ad13f7b16e8f7c7f1670bdd55f1e2112a", "tree": "def02e1a495f57e433c457e34339333855351faa", "parents": [ "1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Thu Oct 21 16:38:47 2010 -0500" }, "committer": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Thu Oct 21 22:39:41 2010 -0500" }, "message": "Backport ParcelFileDescriptor.createPipe() from master.\n\nThis allows content providers to expose arbitraty data\nthrough the ContentResolver open* APIs.\n\nChange-Id: I408a0b7cee9cdba5654a962098386c012d6b3549\n" }, { "commit": "101f14b275ab2451aef50dec427376d721d17aea", "tree": "af8c333d1c2d519c300ab817991b74d51cee43b6", "parents": [ "86f1b643d10e0b5b17ae01db3b81020db87b3295", "ba501785c7b298198d1c6e4787fd40e98f97da67" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 20:17:56 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 20:17:56 2010 -0700" }, "message": "am ba501785: Merge \"Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE\" into gingerbread\n\nMerge commit \u0027ba501785c7b298198d1c6e4787fd40e98f97da67\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ba501785c7b298198d1c6e4787fd40e98f97da67\u0027:\n Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE\n" }, { "commit": "a6d9c7c04c4b17d85ac70f4494777555655f3be1", "tree": "216d077a636fa8be9369de734e14350886c0e7ac", "parents": [ "7dc08fb070ff7455e794fc81645ccb4349cd152f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 15:32:06 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 15:32:06 2010 -0700" }, "message": "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE\n\nChange-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb\n" }, { "commit": "c0e93a849f82c97b847c9ad39b18e594f3bb3f5a", "tree": "795e634e166082ad74609dd8d715899a88e3b6cc", "parents": [ "0c55136893849d72ac267f887a841efe845218a1", "7ea5c45e8d89f59065f088d4e11cceeeed9d64d1" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Oct 21 09:38:15 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 09:38:15 2010 -0700" }, "message": "am 7ea5c45e: NFC settings cleanup.\n\nMerge commit \u00277ea5c45e8d89f59065f088d4e11cceeeed9d64d1\u0027 into gingerbread-plus-aosp\n\n* commit \u00277ea5c45e8d89f59065f088d4e11cceeeed9d64d1\u0027:\n NFC settings cleanup.\n" }, { "commit": "7ea5c45e8d89f59065f088d4e11cceeeed9d64d1", "tree": "b5bb01cdf9280d1ea7cf0cba3d96ebe3ca1c1be5", "parents": [ "fa7a87fb4b3d25b0b6b0985d65848a144d28df26" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Wed Oct 20 18:39:11 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Thu Oct 21 03:54:51 2010 -0700" }, "message": "NFC settings cleanup.\n\nRemove NFC settings from Settings.System. The NFC Service tracks them\ninternally using SharedPreference.\n\nRevert back to enable()/disable()/isEnabled() - Tag discovery is the\nonly functionality NFC service performs right now so we don\u0027t need to\nbreak it up more explicitly yet. enable/disable is the global NFC\non/off and later we\u0027ll add enableDiscovery(), enableTagEmulation(),\nenableSecureElement() etc as needed.\n\nChange-Id: Id5b23e89d4a29511835f509962842452075e56cb\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "5102856947595cffc1cceb11b9e4c5baf70b2e82", "tree": "b9b445663342cedd9fe58857a1f69fd48999092e", "parents": [ "18cbc0e58a0e68411dff655f116a7010c3f464a2", "1180f2a099a134c40f923c7e4162a5e7d7ca0184" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 13:54:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 13:54:25 2010 -0700" }, "message": "am 1180f2a0: Merge \"Remove ringtone API from SipAudioCall.\" into gingerbread\n\nMerge commit \u00271180f2a099a134c40f923c7e4162a5e7d7ca0184\u0027 into gingerbread-plus-aosp\n\n* commit \u00271180f2a099a134c40f923c7e4162a5e7d7ca0184\u0027:\n Remove ringtone API from SipAudioCall.\n" }, { "commit": "9b449e5606786f7c197679f8f9d25985308bfb72", "tree": "63957bfb80aa80a38741d8451c940ee578d40a95", "parents": [ "b595e094e3901ff8a224eaf7d4869e7d2e5649dd" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 18:07:01 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Oct 20 22:51:22 2010 +0800" }, "message": "Remove ringtone API from SipAudioCall.\n\n(watch out auto-merge conflict for SipAudioCall).\n\nBug: 3113033, related CL: https://android-git/g/#change,75185\n\nChange-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f\n" }, { "commit": "824de4b3e378a5ef41de1704ee3f50a49d408a66", "tree": "70c4485708d0020c3456211d38a3209025263b61", "parents": [ "494ec19efb8e7a600079966e52db6cd7a027ffd6", "dd7341f775ca4d86091f4106d6dfef9214073a7d" ], "author": { "name": "Sylvain Fonteneau", "email": "sylvain.fonteneau@trusted-logic.com", "time": "Mon Oct 18 19:13:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 19:13:29 2010 -0700" }, "message": "am dd7341f7: Added missing implementation for NdefRecord.\n\nMerge commit \u0027dd7341f775ca4d86091f4106d6dfef9214073a7d\u0027 into gingerbread-plus-aosp\n\n* commit \u0027dd7341f775ca4d86091f4106d6dfef9214073a7d\u0027:\n Added missing implementation for NdefRecord.\n" }, { "commit": "dd7341f775ca4d86091f4106d6dfef9214073a7d", "tree": "db9c4a8ecf76071f21cb7ff76607e855785b0e35", "parents": [ "453c6d449b6469dde9aae6044dedfe3be0da76c5" ], "author": { "name": "Sylvain Fonteneau", "email": "sylvain.fonteneau@trusted-logic.com", "time": "Sun Oct 17 15:32:33 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 18 19:09:26 2010 -0700" }, "message": "Added missing implementation for NdefRecord.\n\nImplemented constructor using a byte array to parse.\nAdded missing exception in method declaration, leading to update api/current.xml\n\nChange-Id: I2660484aef1225e90c2f32a572041a2c3aecf288\n" }, { "commit": "69a19fdbff6aff8875d87e27c9b1047d0a3f44c1", "tree": "35f95af916a26b528fdb2abee1904c542409c2a5", "parents": [ "c9cff071af175e559339c54876136612ac5eda3b", "3d2818d34feab5a62dfb33452f99f2d3ca667cc8" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 18 18:41:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 18:41:12 2010 -0700" }, "message": "am 3d2818d3: Remove public resource padding.\n\nMerge commit \u00273d2818d34feab5a62dfb33452f99f2d3ca667cc8\u0027 into gingerbread-plus-aosp\n\n* commit \u00273d2818d34feab5a62dfb33452f99f2d3ca667cc8\u0027:\n Remove public resource padding.\n" }, { "commit": "3d2818d34feab5a62dfb33452f99f2d3ca667cc8", "tree": "ebf2b81bb72b6b7ff11d39f518f852f324449c68", "parents": [ "b4157a432cf791906d5b2f6d187f1767357a51bb" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 18 13:10:49 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 18 18:20:02 2010 -0700" }, "message": "Remove public resource padding.\n\nChange-Id: I8a530a23284a1f2515b1340a1c5e5ed3a0b90780\n" }, { "commit": "c9cff071af175e559339c54876136612ac5eda3b", "tree": "a04fd46cb72d04d064578048ab105bac0205825c", "parents": [ "b65058a45544ba4b9ff5dbad3cc306d86e9554e5", "b4157a432cf791906d5b2f6d187f1767357a51bb" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Oct 18 17:04:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 17:04:55 2010 -0700" }, "message": "am b4157a43: Merge \"StrictMode: fix docs to actually compile and add a utility method.\" into gingerbread\n\nMerge commit \u0027b4157a432cf791906d5b2f6d187f1767357a51bb\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b4157a432cf791906d5b2f6d187f1767357a51bb\u0027:\n StrictMode: fix docs to actually compile and add a utility method.\n" }, { "commit": "62a1eb58bfafe8744d7a65f651e11b88fdb0938d", "tree": "37b1a0042cb480e802a5be113c694953d9a29fbd", "parents": [ "2b51fcb9ac80c7c42be8f53763773414ba9ca4fa" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Oct 18 14:32:59 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Oct 18 16:36:39 2010 -0700" }, "message": "StrictMode: fix docs to actually compile and add a utility method.\n\nYes, this is a last minute public API change, but I\u0027m already getting\na lot of inquiries about how to use StrictMode on a GB device but\ntargetting Eclair or Froyo. I\u0027d like a simple answer involving\nreflection, but the current API is too painful to use via reflection.\n\nI imagine this will be a common request, and it\u0027s much easier for us\nto write a little blog post about trying it out if there\u0027s an easy way\nto use it with reflection.\n\nChange-Id: I1f21aaac7e61e5e90d1e4facc0c787d8daf089b1\n" }, { "commit": "6b09a90a818137de52a0c7325339849ccf584b9e", "tree": "4c49fb7abab08772e9cb6f4652ad620361e13d15", "parents": [ "774b943fc6baa7d3e2880382d4dc7ab085d54b65", "e47150e933e6f610546f57183477f324566e521e" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 18 10:26:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 10:26:12 2010 -0700" }, "message": "am e47150e9: Fix up NFC permissions.\n\nMerge commit \u0027e47150e933e6f610546f57183477f324566e521e\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e47150e933e6f610546f57183477f324566e521e\u0027:\n Fix up NFC permissions.\n" }, { "commit": "e47150e933e6f610546f57183477f324566e521e", "tree": "5a415c5b9fdae883bf4dc507c516dd52ce20db67", "parents": [ "d1f7f4a68375f879671d300510f23d3ee78a500e" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Sun Oct 17 19:05:47 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 18 10:04:40 2010 -0700" }, "message": "Fix up NFC permissions.\n\nThe initial (vendor) implementation had 4 perms, replace with 1.\n\nRequires no permissions:\n- Viewing UID, type of discovered tags and cards.\n- Viewing the NDEF message contents of NDEF formatted tags and cards.\n\nRequires android.permission.NFC\n- Get/Set the local tag \"MyTag\"\n- Creating or using a RawTagConnection (transceive())\n- Creating or using a NdefTagConnection (write()/read())\n\nChange-Id: I1b585c7d91738bed6261277061a48cf7c939482a\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\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": "c6bf3eaab40f90e4e4db4dea9fdca8740b00606a", "tree": "829218dc829d835568bc629325470ea40ee03800", "parents": [ "bbb90d134a3f3a8561a6b3315b6944be939b3778", "51679ca89293ef33275b9681018c09be3948bf1c" ], "author": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Wed Oct 13 16:52:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 16:52:57 2010 -0700" }, "message": "am 51679ca8: Merge \"bug:3069735 in Download UI app, handle deletes correctly\" into gingerbread\n\nMerge commit \u002751679ca89293ef33275b9681018c09be3948bf1c\u0027 into gingerbread-plus-aosp\n\n* commit \u002751679ca89293ef33275b9681018c09be3948bf1c\u0027:\n bug:3069735 in Download UI app, handle deletes correctly\n" }, { "commit": "216fa22791889774b83977341632c4570dcec35d", "tree": "edc618a371b3f9da3a551096eba578cad79b5d3b", "parents": [ "5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1" ], "author": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Tue Oct 12 23:08:13 2010 -0700" }, "committer": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Wed Oct 13 16:18:44 2010 -0700" }, "message": "bug:3069735 in Download UI app, handle deletes correctly\n\ngingerbread.\n(for more detailed comments, please see the dependent CL\nChange-Id: Ib90eb9e647f543312c865d3bbf9a06fb867a648b )\n\n2 changes in this CL.\n1. add 2 new columns to downloads table in downloads.db:\n mediaprovider_uri \u003d downloaded file\u0027s content_uri in mediaprovider db\n deleted \u003d flag is set to true if a file is to be deleted\n2. download UI app shows only those files whose \u0027deleted\u0027 flag is not set\n\nChange-Id: I47c5f72b0a0b354fac3abe3a97752130b8189794\n" }, { "commit": "6066da89a464d2bd5f002f5e687d40876ed5ce21", "tree": "161475c32de03e01ae57bd003f3196851f394adc", "parents": [ "dfd37a4748845273d929f24ae5d68032d19f6216", "590b73bc5b8e5f7b59bff1d9264a52388a5162e6" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Tue Oct 12 19:00:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 19:00:54 2010 -0700" }, "message": "am 590b73bc: NFC API revision round 2.\n\nMerge commit \u0027590b73bc5b8e5f7b59bff1d9264a52388a5162e6\u0027 into gingerbread-plus-aosp\n\n* commit \u0027590b73bc5b8e5f7b59bff1d9264a52388a5162e6\u0027:\n NFC API revision round 2.\n" }, { "commit": "590b73bc5b8e5f7b59bff1d9264a52388a5162e6", "tree": "113139d8fd0d2b8a0e319e9f766e180a0f1e084f", "parents": [ "45738f6700cff689eacda7c8192b76939ba20591" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Tue Oct 12 13:00:50 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Tue Oct 12 18:37:26 2010 -0700" }, "message": "NFC API revision round 2.\n\n- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,\n RawTagConnection, NdefTagConnection.\n- Add implementations for all of the new NFC API.\n\nChange-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\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": "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": "89fbcd72fbe6ef26ea2703f8e338fd198c958ecc", "tree": "6163a99deac8770a25b654a51f28306ac56747fd", "parents": [ "779d1778b6147ee1b57428af234d1498a26f031e", "c28944743966b70ace7477ee50f6594f4723d2d3" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Sun Oct 10 17:45:45 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Sun Oct 10 17:45:45 2010 -0700" }, "message": "resolved conflicts for merge of c2894474 to gingerbread-plus-aosp\n\nChange-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2\n" }, { "commit": "9239612870d08fbf79b3c53f11bd5d7cb4beb875", "tree": "3cd33036d2086f31fa66699b03a20175e8e70773", "parents": [ "bd1454f5005619b69d887fee6a7a4891b3323d18" ], "author": { "name": "Imre Sunyi", "email": "imre.sunyi@sonyericsson.com", "time": "Mon Sep 20 18:02:50 2010 +0200" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Sun Oct 10 17:20:24 2010 -0700" }, "message": "Support showing \"Cold\" battery health.\n\nThe Linux kernel supports reporting \"cold\" battery health to sysfs.\nAndroid framework has not implemented this and it defaults to \"unknown\"\nThis adds handling the cold battery health.\n\nChange-Id: Idcc156aae6aabce73391081143f79d052edf332e\n" }, { "commit": "7c08b70c960a9a6d9e59e854b88c0877fe33dc99", "tree": "7583dc2a848d65441ffda008ae1d7842877c0624", "parents": [ "d7d47941a92137fa5c1ba04ba67ad87911347b6b", "d8d60da616343b3520b666c385d0005db860be83" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Fri Oct 08 14:44:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 14:44:42 2010 -0700" }, "message": "am d8d60da6: Merge \"Update DownloadManager API to support bulk actions.\" into gingerbread\n\nMerge commit \u0027d8d60da616343b3520b666c385d0005db860be83\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d8d60da616343b3520b666c385d0005db860be83\u0027:\n Update DownloadManager API to support bulk actions.\n" }, { "commit": "64c48b8842ec9f62a48fdd74b669728c5f2408a4", "tree": "fd2686cf714462851fdea1676ffb6aac275add1c", "parents": [ "9934fa77efab362729d0d3cb8aa0bdcd31d63ead" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Thu Oct 07 17:53:52 2010 -0700" }, "committer": { "name": "Steve Howard", "email": "showard@google.com", "time": "Fri Oct 08 14:14:07 2010 -0700" }, "message": "Update DownloadManager API to support bulk actions.\n\nThis includes querying by ID, removing and restarting downloads (the\nlatter is not a public API). The methods all use varargs to support\nthis without undue syntactic pain.\n\nChange-Id: I768005c539d2395cf26587d3a8c425cd01ad9cd2\n" }, { "commit": "b323559b13d8c8ced586f919c5ce083c1f5b74bc", "tree": "391040d5768e4532582edd5cd7c7fd5390143660", "parents": [ "e0c8545a2369881fe09582337a9de3db2db1a951", "a2a1ca42bc07af77a8a10b714517d006cb66c36a" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Oct 08 13:01:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 13:01:29 2010 -0700" }, "message": "am a2a1ca42: Merge \"DropBoxManager.Entry implements Closeable\" into gingerbread\n\nMerge commit \u0027a2a1ca42bc07af77a8a10b714517d006cb66c36a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a2a1ca42bc07af77a8a10b714517d006cb66c36a\u0027:\n DropBoxManager.Entry implements Closeable\n" }, { "commit": "cc792c4149b7e768fd894c9b268d815a90a60bd0", "tree": "18382af06c7d100281361bbb1b5164f95b9f25eb", "parents": [ "56e9b8ebb20a992a80696f933a2225544670ef8b" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Oct 08 09:50:30 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Oct 08 10:17:03 2010 -0700" }, "message": "DropBoxManager.Entry implements Closeable\n\nChange-Id: I61716c06b92fa1b9b5b271b5805550bdb2d51b46\n" }, { "commit": "b77455ee290691b036ac79236a93e57ff294ef0c", "tree": "4587efcb75fed3a221befa7936718876098b3680", "parents": [ "779a6e41d7e5cdb27b802551249257d600dc2d27", "78d688369a2240009d3bbe4126996a973b2e2fe2" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 07 20:13:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 20:13:24 2010 -0700" }, "message": "am 78d68836: Implement tracking of package install times.\n\nMerge commit \u002778d688369a2240009d3bbe4126996a973b2e2fe2\u0027 into gingerbread-plus-aosp\n\n* commit \u002778d688369a2240009d3bbe4126996a973b2e2fe2\u0027:\n Implement tracking of package install times.\n" }, { "commit": "78d688369a2240009d3bbe4126996a973b2e2fe2", "tree": "409d53a06e612867fcef6673a89def6a6b5e768b", "parents": [ "eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 07 01:12:46 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 07 18:48:22 2010 -0700" }, "message": "Implement tracking of package install times.\n\nProvides information about the time at which the package was\nfirst installed and the time it was last updated.\n\nChange-Id: Icb43f77b5b669a1ce685e8913046b8be386b6175\n" }, { "commit": "ea445758efba6b728d5e597402e9d9538f3ef451", "tree": "8f156bbb021b262b6dc7abb3eec99c4e6f520fbf", "parents": [ "647ff64596399e0fa234622302e03facf84ee3f6", "08faac3c26e12863858e1534985dd950193f755f" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Oct 07 17:40:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 17:40:51 2010 -0700" }, "message": "am 08faac3c: Unhide SIP API.\n\nMerge commit \u002708faac3c26e12863858e1534985dd950193f755f\u0027 into gingerbread-plus-aosp\n\n* commit \u002708faac3c26e12863858e1534985dd950193f755f\u0027:\n Unhide SIP API.\n" }, { "commit": "08faac3c26e12863858e1534985dd950193f755f", "tree": "4991aef6ac73e0d1de22e35817d10b3c64b17be0", "parents": [ "26cb01e880af5f23a58e4336facd30fa7d52581e" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 16 04:11:32 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Oct 08 08:31:42 2010 +0800" }, "message": "Unhide SIP API.\n\nChange-Id: I09468e3149a242a3b1e085ad220eb74f84ac6c68\n" }, { "commit": "9580b8ce6553ddde03db594fd4fd4f59ca61c382", "tree": "bac634abd9cb09389028cbc9c3c2d80adbb7f3d2", "parents": [ "bb70837397e3fb437b7b4443b37d7a83c11e6e43", "e6ad0e477b5d4326487059e5d6c4697f97accbd1" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Oct 07 15:27:17 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Oct 07 15:27:17 2010 -0700" }, "message": "resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp\n\nChange-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76\n" }, { "commit": "ee7e0efcc1314b994ba70d91f6e8fa951044c916", "tree": "2b6e45903190cb26c1af272cda6cd2cdd8cbcdd1", "parents": [ "65e8b476245255a96faaa70872a4196763a95e10", "59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Tue Oct 05 16:46:05 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 05 16:46:05 2010 -0700" }, "message": "am 59c4cb9e: Merge \"DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll\" into gingerbread\n\nMerge commit \u002759c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8\u0027 into gingerbread-plus-aosp\n\n* commit \u002759c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8\u0027:\n DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll\n" }, { "commit": "737e8fe2c7ce167bc68ad779160488007a5e0b1d", "tree": "ddd2b3fbb7fb11c627aad1883e3f8cee1756dc6d", "parents": [ "930d6c3cd5ad387489eb1d35a38beeafe54166b6" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Tue Oct 05 14:37:38 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Tue Oct 05 15:22:07 2010 -0700" }, "message": "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll\n\nChange-Id: If34c8ea4e15697420adad0bc404f3c278efd7c1b\n" }, { "commit": "86214276e05d81e4820862341ce9e2e3c83cd136", "tree": "27d3db9d4e9d087a224c625e2085ff4e92cab793", "parents": [ "a86a6c4e326bfdfc351dacca95b23bb78f78efbe", "7280f2155c37b00359c3fb050e2b067dcd74db40" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Oct 04 18:55:32 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 18:55:32 2010 -0700" }, "message": "am 7280f215: Merge \"Manually revert a single-line error inserted by OpenJDK.\" into gingerbread\n\nMerge commit \u00277280f2155c37b00359c3fb050e2b067dcd74db40\u0027 into gingerbread-plus-aosp\n\n* commit \u00277280f2155c37b00359c3fb050e2b067dcd74db40\u0027:\n Manually revert a single-line error inserted by OpenJDK.\n" }, { "commit": "388c14c294fe15765b67b8a21964797279bd99b3", "tree": "798357bebe7e35533a017baa63e7f86cb84372af", "parents": [ "15f107b151deff1f25f1255bdbcb630ed576ac8d" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Oct 04 18:29:05 2010 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Oct 04 18:29:05 2010 -0700" }, "message": "Manually revert a single-line error inserted by OpenJDK.\n\nIntroduced by:\n https://android-git.corp.google.com/g/71675\n\nChange-Id: I37722a8cc6bd247fe45651c2b680c2f399ccc5ac\n" }, { "commit": "c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee", "tree": "033dec00bce4a7fd974ce6435463ff9abc85a2b5", "parents": [ "e9e9467688d46b9a1b2f5599bab1fe154b2eaf02", "15f107b151deff1f25f1255bdbcb630ed576ac8d" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 04 18:27:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 18:27:27 2010 -0700" }, "message": "am 15f107b1: Merge \"New API stubs: NdefMessage and NdefRecord.\" into gingerbread\n\nMerge commit \u002715f107b151deff1f25f1255bdbcb630ed576ac8d\u0027 into gingerbread-plus-aosp\n\n* commit \u002715f107b151deff1f25f1255bdbcb630ed576ac8d\u0027:\n New API stubs: NdefMessage and NdefRecord.\n" }, { "commit": "dc993791fc3cf7a270921f7419b0c6b875bbd92b", "tree": "0cb13aaf5e9afc0e0f339c97746072893605aad7", "parents": [ "e91398d134256cf9c39677f9b1cd0279b17a6d88" ], "author": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 04 11:17:25 2010 -0700" }, "committer": { "name": "Nick Pelly", "email": "npelly@google.com", "time": "Mon Oct 04 17:56:23 2010 -0700" }, "message": "New API stubs: NdefMessage and NdefRecord.\n\nNDEF Messages and NDEF Record data classes.\n\nChange-Id: I9b7114773281b0eb9680f595c95ac79943d2903b\nSigned-off-by: Nick Pelly \u003cnpelly@google.com\u003e\n" }, { "commit": "89230e3b7b9ec455373e3f60b62ff65589a9c57d", "tree": "4c84cfb1bb82905fc52e0d22cac80604dacdf535", "parents": [ "8390651c124546a2600c5f830afbcc7d2edd4d8f", "458fc5f52e25d7a8b4e482010711aed66f0b4999" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 04 14:55:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 14:55:09 2010 -0700" }, "message": "am 458fc5f5: Merge \"Fix issue #3041660: Camera image flips upside down when rotating device\" into gingerbread\n\nMerge commit \u0027458fc5f52e25d7a8b4e482010711aed66f0b4999\u0027 into gingerbread-plus-aosp\n\n* commit \u0027458fc5f52e25d7a8b4e482010711aed66f0b4999\u0027:\n Fix issue #3041660: Camera image flips upside down when rotating device\n" }, { "commit": "10d5b0966d1b6ab0e3b63c71d5325403e75b647e", "tree": "f80bfe84762d9c46202a79c5320546593ae796f8", "parents": [ "b12bfbd4df985041ab0e584ef5a746328baac038", "407f625a9b8e356e765a5ec587c443af1f3aadb5" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 04 14:03:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 14:03:06 2010 -0700" }, "message": "am 407f625a: Add new API to find out whether external storage is removable.\n\nMerge commit \u0027407f625a9b8e356e765a5ec587c443af1f3aadb5\u0027 into gingerbread-plus-aosp\n\n* commit \u0027407f625a9b8e356e765a5ec587c443af1f3aadb5\u0027:\n Add new API to find out whether external storage is removable.\n" }, { "commit": "e5439f228f603f60febe058f633d91d5af2fff76", "tree": "54a692e6d57f5b93efb89aab2d102701876689f4", "parents": [ "407f625a9b8e356e765a5ec587c443af1f3aadb5" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sat Oct 02 16:53:50 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 04 14:01:39 2010 -0700" }, "message": "Fix issue #3041660: Camera image flips upside down when rotating device\n\nApps now must explicitly opt in to having their rotation changed while\nforcing landscape mode. Also add some new orientation constants for other\nthings apps may want to do.\n\nChange-Id: If64d84b5ef54793ee717ebda9b4c76408efc9bfd\n" }, { "commit": "407f625a9b8e356e765a5ec587c443af1f3aadb5", "tree": "f2cb0a3b75327c8ffee2e1d0f351d35431305f24", "parents": [ "eb6e22f29ded58e7e51702c34878fd01e20ff802" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 04 11:31:17 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Oct 04 13:58:56 2010 -0700" }, "message": "Add new API to find out whether external storage is removable.\n\nThis is implemented based on whether we are using the \"nosdcard\"\nproduct. Needed to tweak aapt to allow use of the product attribute\nwith other resource definition tags besides strings.\n\nChange-Id: I49922d23b52a34183a8e2f4d2515adaf1fc9149a\n" }, { "commit": "7de900f3629e53e1a05b8d5854cf0164446346ae", "tree": "dc7fe09746f9093fbeb5798c4f852a1c5b159e59", "parents": [ "115b9dc3972ce52cd774856093f8c49a53a962c2", "d29e6861717a4e762050eb5a30169729e205d651" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 04 12:18:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 12:18:44 2010 -0700" }, "message": "am d29e6861: Merge \"Fix bug 3058324\" into gingerbread\n\nMerge commit \u0027d29e6861717a4e762050eb5a30169729e205d651\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d29e6861717a4e762050eb5a30169729e205d651\u0027:\n Fix bug 3058324\n" }, { "commit": "c3808b5dc7d5873d04e8a0a247b179b2757764ba", "tree": "9c7018564435061ac4b52c8aba232e9901f56bd0", "parents": [ "4fc04f160f5ad99ce618084c689b239a2644deca" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 04 10:06:59 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 04 11:55:38 2010 -0700" }, "message": "Fix bug 3058324\n\nPopupWindow now responds to the style attribute popupAnimationStyle\ninstead of windowAnimationStyle. The latter was being overridden with\nundesired values. Animation.PopupWindow style added as a special\ndefault sentinel value, which switches animation styles based on\nwhether the window is showing above or below an anchor.\n\nChange-Id: Id7cc81f089b6053f2d3a495b1046002548ecf125\n" }, { "commit": "dc549d60f98d809f626c99de614960409a847054", "tree": "bb40a8371811f1c591cc22afa331e57b3d091c9e", "parents": [ "7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Mon Sep 20 23:40:41 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Mon Oct 04 22:14:53 2010 +0900" }, "message": "Update of DRM framework.\n\n - Change \"void\" type of return value to \"int\" for returning status.\n - Add some of overloaded Java APIs which accept database Uri as input.\n - Add asynchronous APIs\n - Add OnEventListener and OnErrorListener for asynchronous APIs\n - Disable debug log\n - Change decrypt() API to accept an optional buffer needed by some of DRM schemes\n\nChanges are incorporated by Sony Corporation.\n\nChange-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c\n" }, { "commit": "6718b365bcce5bd9e67867bd165d771c2226582d", "tree": "0461f58b5fed78c8ea31e5a74919e95f880b2044", "parents": [ "eeac43ad3c9b41c1679f3ab36064fa611106faf2", "32e60c7942eeba920ec5c27b372ec0899fd75a20" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Oct 01 13:05:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 13:05:02 2010 -0700" }, "message": "am 32e60c79: Update StrictMode\\\u0027s public API.\n\nMerge commit \u002732e60c7942eeba920ec5c27b372ec0899fd75a20\u0027 into gingerbread-plus-aosp\n\n* commit \u002732e60c7942eeba920ec5c27b372ec0899fd75a20\u0027:\n Update StrictMode\u0027s public API.\n" }, { "commit": "32e60c7942eeba920ec5c27b372ec0899fd75a20", "tree": "ed5d3bc9fe7f029ba7467fe5188e5d2068d48c02", "parents": [ "f7681f84918c27f6a626681ce37ed2a236c44e82" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Thu Sep 30 16:22:36 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Oct 01 12:54:10 2010 -0700" }, "message": "Update StrictMode\u0027s public API.\n\nThis makes it more future-proof and maintainable, not exposing the\ninternal bitpacking state.\n\nThe implementation is unchanged (the policy is still just an int we pass\naround).\n\nAlso starts to introduce VmPolicy, for things which are process-wide,\nnot per-thread. As an initial user, make SQLite\u0027s Cursor finalization\nleak warnings use StrictMode.\n\nChange-Id: Idedfba4e965716f5089a52036421460b1f383725\n" }, { "commit": "eeac43ad3c9b41c1679f3ab36064fa611106faf2", "tree": "f5765635a85c74a991623c7937801f069751a98d", "parents": [ "57853559c31154db9c202d653065c592169c5027", "f7681f84918c27f6a626681ce37ed2a236c44e82" ], "author": { "name": "Wei-Ta Chen", "email": "weita@google.com", "time": "Fri Oct 01 12:36:05 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 12:36:05 2010 -0700" }, "message": "am f7681f84: Do not merge.\n\nMerge commit \u0027f7681f84918c27f6a626681ce37ed2a236c44e82\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f7681f84918c27f6a626681ce37ed2a236c44e82\u0027:\n Do not merge.\n" }, { "commit": "f7681f84918c27f6a626681ce37ed2a236c44e82", "tree": "f5240cc798f23a57561f60e8a7c1be3bf143ba7e", "parents": [ "e619a9da44e4c00f9034917aef67f86da0bc207f" ], "author": { "name": "Wei-Ta Chen", "email": "weita@google.com", "time": "Thu Sep 30 16:31:38 2010 -0700" }, "committer": { "name": "Wei-Ta Chen", "email": "weita@google.com", "time": "Fri Oct 01 12:16:38 2010 -0700" }, "message": "Do not merge.\n\nFix 3052285 by not publishing the BitmapRegionDecoder API until the honeycomb release.\n\nBug: 3052285\nChange-Id: Ie339e414c1a5581e1d38684621e0e97162616977\n" }, { "commit": "6ce5f60c791401ed0faf5d36baf4fc6612358676", "tree": "d49732b6d288f5f9a7ad6f5a37b82a0fa66d7653", "parents": [ "9af6b53676061db6fc9c18300dc7d8258f7306ab", "38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:30:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 17:30:22 2010 -0700" }, "message": "am 38cf8867: Remove OBBs from state list when volume unmounted\n\nMerge commit \u002738cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94\u0027 into gingerbread-plus-aosp\n\n* commit \u002738cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94\u0027:\n Remove OBBs from state list when volume unmounted\n" }, { "commit": "38cf8867a8d3e8d5159abd0bd0e6a3b0b8348b94", "tree": "84b4d47ada068bda31db1b024781e6a5bfb7a585", "parents": [ "063d02bb03a9260314b529490866528433148738" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 26 14:18:51 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 30 17:24:34 2010 -0700" }, "message": "Remove OBBs from state list when volume unmounted\n\nDon\u0027t keep tracking OBBs when the volume they\u0027re located on goes away.\nRemove them from our state tracking maps and then send a notification to\nany listener that is still around.\n\nAdd a dump handler to MountService so the state of the mount lists\ncan be inspected.\n\nChange the API to just make a callback directly to the change listener\nwhen mount is called when it\u0027s already mounted or unmount called when\nit\u0027s already unmounted.\n\nChange-Id: Idb4afbb943ca5ca775825f908bff334e3ce1cfcc\n" }, { "commit": "538c3fa35fc67d07a19aa58f7b1f993e86da5e83", "tree": "19beb0e6c44f3e3de7c37347de7c23572a4ce820", "parents": [ "6bbc2f1562ddc1be65aafcce63896f5899596c2a", "cdcc0a65fae7e649f0f07e396dbe0dd59ceffada" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Thu Sep 30 11:42:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 11:42:16 2010 -0700" }, "message": "am cdcc0a65: Merge \"Have download manager give more details when downloads are paused\" into gingerbread\n\nMerge commit \u0027cdcc0a65fae7e649f0f07e396dbe0dd59ceffada\u0027 into gingerbread-plus-aosp\n\n* commit \u0027cdcc0a65fae7e649f0f07e396dbe0dd59ceffada\u0027:\n Have download manager give more details when downloads are paused\n" }, { "commit": "3e8c1d3a467bab889de7f92379be1f43d9c2d81e", "tree": "14e845226e29aa69b4f980e9dc10ff1c0755fffe", "parents": [ "71e2486209856d33d027389be2bd4924a03c4f86" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Wed Sep 29 17:03:32 2010 -0700" }, "committer": { "name": "Steve Howard", "email": "showard@google.com", "time": "Wed Sep 29 17:34:40 2010 -0700" }, "message": "Have download manager give more details when downloads are paused\n\nThis change introduces more detailed reporting of why downloads are paused in\nthe download manager.\n\nFirst, it adds new, more detailed status constants in android.provider.Downloads\nfor when a download is paused, in place of the old catch-all\nSTATUS_RUNNING_PAUSED. I\u0027ve eliminated some dead code there as well to ease the\nchange.\n\nSecond, in the public API, it changes COLUMN_ERROR_CODE to COLUMN_REASON, which\nnow reports useful info for STATUS_PAUSED in addition to STATUS_FAILED. It adds\nsome new PAUSED_* constants for reason values when a download is paused, and\nadds code to generate these values appropriately.\n\nChange-Id: Ie617d1c2c59357375e19466086923ace5e2fb122\n" }, { "commit": "d8e8186c887fe47977721315f439465771a96374", "tree": "ff89a03f9a84484e3573508da6c72ecfbc4b04d6", "parents": [ "f5bdeba197aba659e2dd3849a5bdfba8826c036d", "05105f7abe02b2dff91d6260b3628c8b97816bab" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Sep 28 17:33:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 17:33:47 2010 -0700" }, "message": "am 05105f7a: Update OBB API to include callbacks\n\nMerge commit \u002705105f7abe02b2dff91d6260b3628c8b97816bab\u0027 into gingerbread-plus-aosp\n\n* commit \u002705105f7abe02b2dff91d6260b3628c8b97816bab\u0027:\n Update OBB API to include callbacks\n" }, { "commit": "05105f7abe02b2dff91d6260b3628c8b97816bab", "tree": "f42676d818548d76b2c55045a1bcc4866d6feec1", "parents": [ "ea2cf2f936b03f1720bc43863e41c89ea2a7903a" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 22 17:29:43 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Sep 28 17:23:26 2010 -0700" }, "message": "Update OBB API to include callbacks\n\nAdd a callback for users of the StorageManager API to be able to receive\nnotifications when the requested operation completes for mountObb and\nunmountObb.\n\nAdd NDK API to get to ObbInfo like the Java API has.\n\nAlso update the docs for the API and remove the \"STOPSHIP\" comments.\n\nChange-Id: I23a4409c7f8b74d3169614beba920b4d667990a4\n" }, { "commit": "9d9719c44ad05834b48542ea0fc4edbb4f59c311", "tree": "efc5fbfba224efe584b6e2c56adaf906e86961eb", "parents": [ "d6c30e8c1521bc584f33500b8ee897dafdfec023", "5bdb89d7ac20d4d3e71660d7fe78002a63900399" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Tue Sep 28 12:41:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 12:41:42 2010 -0700" }, "message": "am 5bdb89d7: Merge \"Move DownloadManager to android.app (DO NOT MERGE)\" into gingerbread\n\nMerge commit \u00275bdb89d7ac20d4d3e71660d7fe78002a63900399\u0027 into gingerbread-plus-aosp\n\n* commit \u00275bdb89d7ac20d4d3e71660d7fe78002a63900399\u0027:\n Move DownloadManager to android.app (DO NOT MERGE)\n" }, { "commit": "31fd85f39b554e09b2e6c1c2ccf5c186859880fa", "tree": "c81b37a465629ee926adaa57bc3a67639adc15e6", "parents": [ "8d7057df401af668335c38273bc62872e4dbf538" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Mon Sep 27 16:32:39 2010 -0700" }, "committer": { "name": "Steve Howard", "email": "showard@google.com", "time": "Mon Sep 27 17:12:47 2010 -0700" }, "message": "Move DownloadManager to android.app (DO NOT MERGE)\n\nChanging package at hackbod\u0027s request. I\u0027ll merge this manually, as\nthere\u0027s some additional master-only code that will be to be\nsimultaneously changed.\n\nChange-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117\n" }, { "commit": "55ee8f9329b4e99427dddc692e3d8ff10d9c9eef", "tree": "14815a07495ff4edc92a791beb653391d5556561", "parents": [ "7063eb104657d1fa3f5e030b4657a9541ec6b054", "44e8ff9924db43ee2470d868ce31b1c039c99b35" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Mon Sep 27 15:08:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 15:08:57 2010 -0700" }, "message": "am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.\n\nMerge commit \u002744e8ff9924db43ee2470d868ce31b1c039c99b35\u0027 into gingerbread-plus-aosp\n\n* commit \u002744e8ff9924db43ee2470d868ce31b1c039c99b35\u0027:\n Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.\n" }, { "commit": "44e8ff9924db43ee2470d868ce31b1c039c99b35", "tree": "74f2b99762493f909e8a3086f7c039a42a179f73", "parents": [ "dc36da514832484f61b432291c6f5dca9f2c30bd" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Mon Sep 27 14:36:52 2010 -0700" }, "committer": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Mon Sep 27 15:04:43 2010 -0700" }, "message": "Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.\n\nChange-Id: I15a78a5c5a18b041b1cc4a7500bd3ceccd780ea9\n" }, { "commit": "c6581a1046b062d0e06e50e9b09e6c12a8e54efc", "tree": "acfa70d2c09bf45d1512cceb7b701be9b00769d3", "parents": [ "a9f17c8b424b505b50fdfb920cab37c32cbe628d", "4e9751f0770c8bfe6f7d57465cba754af5aa942b" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Mon Sep 27 10:39:19 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 10:39:19 2010 -0700" }, "message": "am 4e9751f0: Merge \"Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\\\u0027t yet been settled for Gingerbread, this change doesn\\\u0027t go into details. We can do a d\n\nMerge commit \u00274e9751f0770c8bfe6f7d57465cba754af5aa942b\u0027 into gingerbread-plus-aosp\n\n* commit \u00274e9751f0770c8bfe6f7d57465cba754af5aa942b\u0027:\n Adding a feature to indicate that the device possesses low-latency audio.\n" }, { "commit": "898e1e8860dea8490ba9208fca7965adf9cb8298", "tree": "6924c3d3d1f6c361385d7c579c515a93660fdc10", "parents": [ "8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Sun Sep 26 17:28:30 2010 -0700" }, "committer": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Sun Sep 26 17:28:30 2010 -0700" }, "message": "Adding a feature to indicate that the device possesses low-latency audio.\nThe specific criteria for low-latency audio are defined in the CDD, but since\nthat hasn\u0027t yet been settled for Gingerbread, this change doesn\u0027t go into\ndetails. We can do a docs change later once GB CDD is final.\n\nChange-Id: Ic5ad9d04e8ecd78c81b6f09439affec6bf8cb9b2\n" }, { "commit": "c388844d50a67ecd8eb93d29d618bae1fa3a3c5d", "tree": "ab2fa99951b90dfc3f73a5c9ff1eccb00a6ea747", "parents": [ "a9cf44942b8dbdc5bb00b80725ea15d176ebecc8", "234e42df5fac958ed9f15aae6005dd72e4bdf08a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 18:05:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 18:05:14 2010 -0700" }, "message": "am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*\n\nMerge commit \u0027234e42df5fac958ed9f15aae6005dd72e4bdf08a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027234e42df5fac958ed9f15aae6005dd72e4bdf08a\u0027:\n DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*\n" }, { "commit": "234e42df5fac958ed9f15aae6005dd72e4bdf08a", "tree": "bd8c19fa7b2ad259e7ffde09bbcb99638456a7e3", "parents": [ "88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 17:18:53 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 18:00:47 2010 -0700" }, "message": "DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*\n\nNot going out in GB.\n\nChange-Id: I9d4f5938ec7d2a54c0f72b8eb5a177ee66f12146\n" }, { "commit": "ffe477263c503ce75d609d5360cf5e0c72a1363f", "tree": "99fad38169a588e6b39909b139efe745232f6bff", "parents": [ "deaa8ff1b10d38add4f7c276e7be2ffc19359a14", "e78fc18b339bfe2915e61aef2013a17f0a9ede33" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Fri Sep 24 15:51:50 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 15:51:50 2010 -0700" }, "message": "am e78fc18b: Intent action to launch downloads UI.\n\nMerge commit \u0027e78fc18b339bfe2915e61aef2013a17f0a9ede33\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e78fc18b339bfe2915e61aef2013a17f0a9ede33\u0027:\n Intent action to launch downloads UI.\n" }, { "commit": "e78fc18b339bfe2915e61aef2013a17f0a9ede33", "tree": "f8717c03673c3cfd4ad74383ba19b7cf57aa1810", "parents": [ "a7ef18fca50d0db99a161d8c7e2d8979f0445503" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Fri Sep 24 14:59:36 2010 -0700" }, "committer": { "name": "Steve Howard", "email": "showard@google.com", "time": "Fri Sep 24 15:43:51 2010 -0700" }, "message": "Intent action to launch downloads UI.\n\nChange-Id: Ifd21b9b916479062d51e60108d16ce3f46b453a5\n" }, { "commit": "888bcdbeca34819c07d7dc06dc03d91207aea0c0", "tree": "636f3993bd3c66d2d8608fe803cbf617ab517a0f", "parents": [ "c55f6da7281d34a4b875975cdf68f5062dfe4b34", "3ae249dc6a23f40cfc189ce2e25f75de32e7889a" ], "author": { "name": "Patrick Scott", "email": "phanna@android.com", "time": "Fri Sep 24 11:36:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 11:36:51 2010 -0700" }, "message": "am 3ae249dc: Merge \"Add new Alarm provider class for setting an alarm.\" into gingerbread\n\nMerge commit \u00273ae249dc6a23f40cfc189ce2e25f75de32e7889a\u0027 into gingerbread-plus-aosp\n\n* commit \u00273ae249dc6a23f40cfc189ce2e25f75de32e7889a\u0027:\n Add new Alarm provider class for setting an alarm.\n" }, { "commit": "a73c4b082c2ab38831fc57c6bfb425d32ffe2aa4", "tree": "2de288f4d5523f374d6ab3bfce2fdf8abbcc0b87", "parents": [ "880dfe4f675128188f8d598f2025a417ccabd1bf" ], "author": { "name": "Patrick Scott", "email": "phanna@android.com", "time": "Wed Sep 22 08:16:53 2010 -0400" }, "committer": { "name": "Patrick Scott", "email": "phanna@android.com", "time": "Fri Sep 24 13:52:14 2010 -0400" }, "message": "Add new Alarm provider class for setting an alarm.\n\nThe new class provides static variables for creating an intent to broadcast to\napplications implementing the alarm clock. A new permission has been added and\napplications are recommended to require this permission if accepting the set\nalarm broadcast.\n\nChange-Id: I7b1014acdc54371cbda19bcf9b5c395b647aa413\n" }, { "commit": "8449490a94fb5ab02be2a67d4b57c017d8abd75a", "tree": "99127ebacc9fdd7616bf25c4713d0d330b575f63", "parents": [ "a24277977d597b88d3ccfed266e1803d3f7b20a2", "4f564cdeb8478f1a20263fc036c74cc4a63145c3" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Thu Sep 23 12:50:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 12:50:07 2010 -0700" }, "message": "am 4f564cde: Tweaks to download manager API based on API review feedback\n\nMerge commit \u00274f564cdeb8478f1a20263fc036c74cc4a63145c3\u0027 into gingerbread-plus-aosp\n\n* commit \u00274f564cdeb8478f1a20263fc036c74cc4a63145c3\u0027:\n Tweaks to download manager API based on API review feedback\n" }, { "commit": "4f564cdeb8478f1a20263fc036c74cc4a63145c3", "tree": "b2016c709978bf86e0e10de0d0ce7bf07f9f273c", "parents": [ "2dc43f3d4c721acf331d699e24d9aac4d4cc2f95" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Wed Sep 22 15:57:25 2010 -0700" }, "committer": { "name": "Steve Howard", "email": "showard@google.com", "time": "Thu Sep 23 12:42:34 2010 -0700" }, "message": "Tweaks to download manager API based on API review feedback\n\n* improved documentation of the default destination on the download\n cache and the concomitant consequences\n\n* removed NETWORK_WIMAX flag for setting allowed networks\n\n* changed request headers behavior to support multiple instances of\n the same header (as allowed in the HTTP spec), renamed\n setRequestHeader() to addRequestHeader()\n\n* accept user-facing strings as CharSequences instead of Strings\n\n* new convenience methods setDestinationInExternalFilesDir() and\n setDestinationInExternalPublicDir() for setting a destination in\n either shared or app-private external storage directories\n\n* renamed setMediaType() to setMimeType()\n\nChange-Id: I8781e2214d939c340209cab917bbbba264ab919c\n" }, { "commit": "ac4a284ab4b54a6193f1cca077e6a79ce0ba699c", "tree": "6e81094608a48f0bf5153de1131cc6c84501dcd6", "parents": [ "847810f0cdccd10e6e233281d4eb984b7ce8d680", "7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 23 11:34:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 11:34:40 2010 -0700" }, "message": "am 7864c72b: Merge \"Fix issue 3022800.\" into gingerbread\n\nMerge commit \u00277864c72b91a21eeb282e2e38d688fbbc3cd3ecb8\u0027 into gingerbread-plus-aosp\n\n* commit \u00277864c72b91a21eeb282e2e38d688fbbc3cd3ecb8\u0027:\n Fix issue 3022800.\n" }, { "commit": "1a5149e5d7f2dddc8b324f7695e69fd89af73c52", "tree": "dfa27fafc0451be6a52857f0aae941767a3de304", "parents": [ "49a8bbf4eacbf0bde71bab05be0ab40488df109c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 21 18:18:20 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 23 11:04:03 2010 -0700" }, "message": "Fix issue 3022800.\n\n- Created sub-package android.media.audiofx for audio effects.\n- Hid AudioEffect class contructor, methods and variables not needed by\napplications\n- Added more javadoc comments for AudioEffect Class\n\nChange-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1\n" }, { "commit": "ac487f708f7b58dbd4f3021b520c6ed5975daebe", "tree": "37a2a5e4d1b79854ae5923b4d44ef7f939f6fd3a", "parents": [ "37e3f49fb4b5ac23a985ab12b7951523be54b688", "6b849e2123be98eb2a1a25b8abf0b13a279ce952" ], "author": { "name": "Wei-Ta Chen", "email": "weita@google.com", "time": "Wed Sep 22 23:03:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 23:03:30 2010 -0700" }, "message": "am 6b849e21: Unhide BitmapRegionDecoder.\n\nMerge commit \u00276b849e2123be98eb2a1a25b8abf0b13a279ce952\u0027 into gingerbread-plus-aosp\n\n* commit \u00276b849e2123be98eb2a1a25b8abf0b13a279ce952\u0027:\n Unhide BitmapRegionDecoder.\n" }, { "commit": "6b849e2123be98eb2a1a25b8abf0b13a279ce952", "tree": "2d31bd61d555724b8fe7468c79049a9e782151da", "parents": [ "e81894201979513de87269a21a1802da72d2b954" ], "author": { "name": "Wei-Ta Chen", "email": "weita@google.com", "time": "Tue Sep 07 17:32:18 2010 +0800" }, "committer": { "name": "Wei-Ta Chen", "email": "weita@google.com", "time": "Thu Sep 23 13:56:52 2010 +0800" }, "message": "Unhide BitmapRegionDecoder.\n\n1. Rename LargeBitmap to BitmapRegionDecoder\n2. Move the instantiations of BitmapRegionDecoder out of BitmapFactory.\n3. Remove the use of MemoryFile in BitmapRegionDecoder, since MemoryFile\u0027s API had been modified in master. Otherwise, the change will break the master build.\n4. Move AssetStreamAdaptor, AutoFDSeek and nullObjectReturn to Utils.h because BitmapFactory.cpp and BitmapRegionDecoder.cpp both need to use these utility functions.\n\nMost of the modifications, except for (2) and (3), were reviewed in https://android-git.corp.google.com/g/#change,64716 .\nHowever, that change broke the master build due to (3) and was reverted eventually.\nSo, instead of withdrawing this change and waiting for that change to be checked in again, I merge the two changes into one.\n\nChange-Id: I2202c0fbbbd6d6676bbd9637e690023ea4099c40\n" }, { "commit": "c55a6a42afd328fd78e8cc307194e2ca33b81a04", "tree": "6195c0ca133aa6c0e4091fa95ef15afe93aa111b", "parents": [ "f78fdaccde379d1c101be137416808ea62a2f292", "2359d49b80df13c1724c7c6da5648f17a33d881a" ], "author": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Wed Sep 22 12:19:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 12:19:54 2010 -0700" }, "message": "am 2359d49b: Merge \"DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963\" into gingerbread\n\nMerge commit \u00272359d49b80df13c1724c7c6da5648f17a33d881a\u0027 into gingerbread-plus-aosp\n\n* commit \u00272359d49b80df13c1724c7c6da5648f17a33d881a\u0027:\n DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963\n" }, { "commit": "958c149496259c0068b47d70f1ab8101ed9968ef", "tree": "374f5877215680e188c6fb53ed79c4c5cedd7870", "parents": [ "32371695daf917701f78a86224b58bfda0381e27" ], "author": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Wed Sep 22 11:52:53 2010 -0700" }, "committer": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Wed Sep 22 11:52:53 2010 -0700" }, "message": "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963\n\nthe prev checkin somehow screwed up master..redoing it\n\nChange-Id: Ib9e3652d1569ab26fb62ff08c1efeaee7f2de563\n" }, { "commit": "770a681b2f5b00e699920317bff04a24676ae143", "tree": "1e51142577030a3a2c0a23d48f6c3430b689ea05", "parents": [ "596b55d9c82a52049702931839f69a12cd7dc920", "9aed300279db6953356aed5ef24a42291f5829cb" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Tue Sep 21 17:20:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 17:20:40 2010 -0700" }, "message": "am 9aed3002: Text selection anchors changed to use windows\n\nMerge commit \u00279aed300279db6953356aed5ef24a42291f5829cb\u0027 into gingerbread-plus-aosp\n\n* commit \u00279aed300279db6953356aed5ef24a42291f5829cb\u0027:\n Text selection anchors changed to use windows\n" }, { "commit": "9aed300279db6953356aed5ef24a42291f5829cb", "tree": "ec181e80d44bf55ec0bf768b3928b52a66a63113", "parents": [ "62018429c2639b8a0f27e9b18b9b186df80bca4d" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Sep 20 11:23:56 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Tue Sep 21 17:11:41 2010 -0700" }, "message": "Text selection anchors changed to use windows\n\nChange-Id: I14f138039f5e3175a8c07f21985715b8447708e5\n" }, { "commit": "596b55d9c82a52049702931839f69a12cd7dc920", "tree": "eac1d56cae28d9f3223cb00fad54193b18f6385e", "parents": [ "b255560b35f8d776a71a9e8adb127e17c704466e", "62018429c2639b8a0f27e9b18b9b186df80bca4d" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Tue Sep 21 17:03:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 17:03:42 2010 -0700" }, "message": "am 62018429: Merge \"Adding new feature definitions for new sensors (barometer and gyroscope.)\" into gingerbread\n\nMerge commit \u002762018429c2639b8a0f27e9b18b9b186df80bca4d\u0027 into gingerbread-plus-aosp\n\n* commit \u002762018429c2639b8a0f27e9b18b9b186df80bca4d\u0027:\n Adding new feature definitions for new sensors (barometer and gyroscope.)\n" }, { "commit": "5744bb4aa5dea525d1ae236cd16379134024eae1", "tree": "0c3db66479ca82fd71e33d799749593eb4476348", "parents": [ "87d208f7ea7d8fc518d1403aae6d1ba1833bff13" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Wed Sep 01 19:18:57 2010 -0700" }, "committer": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Tue Sep 21 15:27:07 2010 -0700" }, "message": "Adding new feature definitions for new sensors (barometer and gyroscope.)\n\nChange-Id: Ic3a35c7b277921eaa5b05e3285b6aed5ed75bea6\n" }, { "commit": "8bf158f6ba31efd2f262fc3ba6cdd13733c7d99e", "tree": "736d588560f86f2b312f4c194b449193e4de7c97", "parents": [ "f38c7e7531de2c3084fcf302d53e4544a4c1561d", "34a7f0807ee93eaefe83a9192ebc774fb1560875" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Tue Sep 21 15:02:53 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 15:02:53 2010 -0700" }, "message": "am 34a7f080: Merge \"Un-@hide ability to download without a running notification.\" into gingerbread\n\nMerge commit \u002734a7f0807ee93eaefe83a9192ebc774fb1560875\u0027 into gingerbread-plus-aosp\n\n* commit \u002734a7f0807ee93eaefe83a9192ebc774fb1560875\u0027:\n Un-@hide ability to download without a running notification.\n" }, { "commit": "3104775b53c9b519edad96a225131250b91fcc11", "tree": "b343f573b4690e7780ebc3b5c6d6a42bbc29334e", "parents": [ "ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Tue Sep 21 14:18:19 2010 -0700" }, "committer": { "name": "Steve Howard", "email": "showard@google.com", "time": "Tue Sep 21 14:18:19 2010 -0700" }, "message": "Un-@hide ability to download without a running notification.\n\nChange-Id: Iaf4d86f05e1f98a894a480d7e2e0ecabb42116c4\n" }, { "commit": "96d5c17e7828f1a5cbeb3d87e0146d145870558f", "tree": "6daffd8f80bf659260897d7ac98b105e0aed302f", "parents": [ "2121ec9bca3507c7c3df6fb4fb1d553990adc05b", "8d1513e13c1e3d0142423570c0028e147bf0ea37" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 21 10:52:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 10:52:27 2010 -0700" }, "message": "am 8d1513e1: Merge \"Made audio effect control panel intents public.\" into gingerbread\n\nMerge commit \u00278d1513e13c1e3d0142423570c0028e147bf0ea37\u0027 into gingerbread-plus-aosp\n\n* commit \u00278d1513e13c1e3d0142423570c0028e147bf0ea37\u0027:\n Made audio effect control panel intents public.\n" }, { "commit": "92cf2d60851462d91a1eb4b9615ea93579dd4330", "tree": "1c205fc68acb14e9eb92c4b7f8786024dce91019", "parents": [ "d45cb72ac0d7d57829ffc9223decb89a5fc42ce2" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 20 19:11:14 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 21 10:45:41 2010 -0700" }, "message": "Made audio effect control panel intents public.\n\nChange-Id: If927606a24966605eb3e02788b2477937349d518\n" } ], "next": "2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd" }