)]}' { "log": [ { "commit": "f63b0f44eb53f535a65bd83dbc1d8b95abc501da", "tree": "3ce4d9acada556c3f7658e420ba21602466776fd", "parents": [ "9305647eb61bb60a1f42481a0c0d208dc9bbe965" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Sun Sep 12 17:03:19 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Sun Sep 12 17:06:01 2010 -0400" }, "message": "Connect my plumbing to dsandler\u0027s awesome lights out mode.\n\nIt took a little bit of refactoring to move the authoritative state\nabout whether the lights are on or not into the StatusBarManagerService,\nso that if the system ui process crashes, the bar comes up in the\nright mode.\n\nChange-Id: I95cfaf8f78ca4443ded5262272ea755d44dc5d17\n" }, { "commit": "9305647eb61bb60a1f42481a0c0d208dc9bbe965", "tree": "e778597b64e7f72131ffcdcbdc18ac9311b4c525", "parents": [ "5af8c63e487841db70314d7d512e6bafddcbb149" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Fri Sep 10 10:30:46 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Sun Sep 12 13:25:06 2010 -0400" }, "message": "Plumb lights out mode through from the window manager to the status bar running in the system ui process.\n\nLights out mode itself isn\u0027t implemented.\n\nChange-Id: Ieeef0eb9ae5be23000f770e74e8ee66472f4c673\n" }, { "commit": "2088fb0191811618e9ac53be18cf6f8a046980ca", "tree": "be10d54b4d462ceec3674d9ded2ffba2efdf100d", "parents": [ "8485fedfebd37f0569226c360e1147402f47f74c", "03821dc6ea9f96e2b420ab327b727fdcefd880d3" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Sep 10 16:23:17 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 10 16:23:17 2010 -0700" }, "message": "am 03821dc6: am 962e4826: Merge \"Allow two SurfaceViews inbetween the app and the wallpaper.\"\n\nMerge commit \u002703821dc6ea9f96e2b420ab327b727fdcefd880d3\u0027\n\n* commit \u002703821dc6ea9f96e2b420ab327b727fdcefd880d3\u0027:\n Allow two SurfaceViews inbetween the app and the wallpaper.\n" }, { "commit": "c74a1b441490e5648ac4388baeccb78cae4ab364", "tree": "e24c2b2fbde1db7f15dfb6502813aee870c8ef55", "parents": [ "6b3ea951718c5a1c56a01279add6cf25197148f9" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Sep 10 16:03:29 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Sep 10 16:03:29 2010 -0700" }, "message": "Fix build caused by automerger and missing imports in master.\n\ngingerbread had an import android.os.*. master doesn\u0027t. auto-merger\napplied it fine, but it doesn\u0027t compile.\n\nChange-Id: I28d7b5053616a40223eeb29a0669831d5ca76d9e\n" }, { "commit": "03821dc6ea9f96e2b420ab327b727fdcefd880d3", "tree": "96d4e1e9de3dffa021358e0ec54406f0b12cab65", "parents": [ "d77b0dfdf364ed2fabd9d7a2b26d54e34fce0855", "962e482606e3f8f8c0b8e540888eaef56a1c8603" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Sep 10 15:47:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 10 15:47:34 2010 -0700" }, "message": "am 962e4826: Merge \"Allow two SurfaceViews inbetween the app and the wallpaper.\"\n\nMerge commit \u0027962e482606e3f8f8c0b8e540888eaef56a1c8603\u0027 into gingerbread-plus-aosp\n\n* commit \u0027962e482606e3f8f8c0b8e540888eaef56a1c8603\u0027:\n Allow two SurfaceViews inbetween the app and the wallpaper.\n" }, { "commit": "0b29554188f57ff1eec4150fa24f9a6a6603ed0f", "tree": "d7f9fab08946700bd4cd15bd4d783eae36b5d9b9", "parents": [ "b05766a05172d05169f56de865ff5a6241e8b525", "37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Sep 10 15:07:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 10 15:07:20 2010 -0700" }, "message": "am 37fc8cc7: am b724d251: Merge \"Enable strictmode logging in system_server \u0026 add a lock.\" into gingerbread\n\nMerge commit \u002737fc8cc7b87133eddacaeab60cabefaf4a7b9bdd\u0027\n\n* commit \u002737fc8cc7b87133eddacaeab60cabefaf4a7b9bdd\u0027:\n Enable strictmode logging in system_server \u0026 add a lock.\n" }, { "commit": "37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd", "tree": "5a9c52ed793cd9d86a7e0f7941bba704ead84319", "parents": [ "30f163e4d9c4f75c3493200c29f8f333ab3de07b", "b724d2519a900744a477bd57df6a2f8703c87e72" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Sep 10 14:08:58 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 10 14:08:58 2010 -0700" }, "message": "am b724d251: Merge \"Enable strictmode logging in system_server \u0026 add a lock.\" into gingerbread\n\nMerge commit \u0027b724d2519a900744a477bd57df6a2f8703c87e72\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b724d2519a900744a477bd57df6a2f8703c87e72\u0027:\n Enable strictmode logging in system_server \u0026 add a lock.\n" }, { "commit": "1e02d36b0f1dc833cf8a837c7619fbe6478694c8", "tree": "e364db25610607edd63a0289df87ea2c7d67c1f3", "parents": [ "219eb7ec8403ef9b98125f2b58cc27669ae69712" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Sep 10 09:19:50 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Sep 10 09:19:50 2010 -0700" }, "message": "Enable strictmode logging in system_server \u0026 add a lock.\n\nWe weren\u0027t logging strictmode violation in the system_server process\nin non-user builds (only system apps), even though the rest of the\nstrictmode logging supports it.\n\nAlso add a missing lock in ActivityManagerService.\n\nChange-Id: If2af96a7e4fdde604a647b836097f0029ef1334b\n" }, { "commit": "a97ccc02e18cd21c9cf1caaf63c4a680bf3c6f0a", "tree": "c2b64c4ddde10e42e556df8f44b52d59b411b494", "parents": [ "cfbdf8d0b5befbb8fcb4c59b5f4ea47a8932b227", "5f93c39cdb2f75dda805691987ccd4e570f6cb74" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 10 02:31:05 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 10 02:31:05 2010 -0700" }, "message": "am 5f93c39c: am ca3c24db: Merge \"SIP: add SipErrorCode for error feedback.\" into gingerbread\n\nMerge commit \u00275f93c39cdb2f75dda805691987ccd4e570f6cb74\u0027\n\n* commit \u00275f93c39cdb2f75dda805691987ccd4e570f6cb74\u0027:\n SIP: add SipErrorCode for error feedback.\n" }, { "commit": "5f93c39cdb2f75dda805691987ccd4e570f6cb74", "tree": "5c9c79f0cf62ffb1fb6d85cd847c38afa193fdfc", "parents": [ "8615fdc15146d27cc2d3a8efbe57f0a425b19efb", "ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 10 02:23:04 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 10 02:23:04 2010 -0700" }, "message": "am ca3c24db: Merge \"SIP: add SipErrorCode for error feedback.\" into gingerbread\n\nMerge commit \u0027ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680\u0027:\n SIP: add SipErrorCode for error feedback.\n" }, { "commit": "ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680", "tree": "1d9b25f6d8ac1565f5140812b0effeec78ab42ee", "parents": [ "506d724cc356a7ba73995ef2929c65062277c83d", "903e1031605d715e904811b0dd06cc6a518f0048" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 10 02:19:22 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 10 02:19:22 2010 -0700" }, "message": "Merge \"SIP: add SipErrorCode for error feedback.\" into gingerbread" }, { "commit": "903e1031605d715e904811b0dd06cc6a518f0048", "tree": "410e5f2d1152cb9579f51598f04b705ecd420f31", "parents": [ "a71d69947d4a74730b17021b4c809d054d66c741" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 09 20:07:14 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 10 17:15:06 2010 +0800" }, "message": "SIP: add SipErrorCode for error feedback.\n\nChange-Id: I8b071d4933479b780a403d0bfa30511f4c23ca8f\n" }, { "commit": "203e9529c5d9a883088cc28439e003106397d6a4", "tree": "8ecd2e6f3cbeae1104cac97d311e7afef9efe6e5", "parents": [ "f22c30cd818db80e5c27d27c14b9dbe9507cef38", "62d005ec945f509b50a3a2d412b18721d4017e05" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 09 23:06:27 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 09 23:06:27 2010 -0700" }, "message": "resolved conflicts for merge of 62d005ec to master\n\nChange-Id: I552d7adffe70a2bd94113ffb70cdc3e625fca0bd\n" }, { "commit": "62d005ec945f509b50a3a2d412b18721d4017e05", "tree": "284afebbcff994a622b032d8b9b893af26900890", "parents": [ "033b381b4c91aff4bf76481d0b37fb5f39b50ec2", "a7d868d4f99dfaf85e13498210aecf1ad8efd859" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 09 21:34:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 09 21:34:44 2010 -0700" }, "message": "am a7d868d4: Merge \"Add toast when an app intercepts the launch of another app.\" into gingerbread\n\nMerge commit \u0027a7d868d4f99dfaf85e13498210aecf1ad8efd859\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a7d868d4f99dfaf85e13498210aecf1ad8efd859\u0027:\n Add toast when an app intercepts the launch of another app.\n" }, { "commit": "a7d868d4f99dfaf85e13498210aecf1ad8efd859", "tree": "5a92cc100ef554d4cd683221b84e1716df703deb", "parents": [ "7f07f842c9c375648b52de5d8a84c080e9394d71", "0dad364adb9e9cbc2f7fa115602552f4897387ad" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 09 21:31:34 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 09 21:31:34 2010 -0700" }, "message": "Merge \"Add toast when an app intercepts the launch of another app.\" into gingerbread" }, { "commit": "0dad364adb9e9cbc2f7fa115602552f4897387ad", "tree": "2f7d9825ab2261d3349250b4d09c94acc005f035", "parents": [ "ee455f5a9572bc0d23c3328f6c22da91dc109a50" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 09 21:25:35 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 09 21:25:35 2010 -0700" }, "message": "Add toast when an app intercepts the launch of another app.\n\nThe activity manager looks for cases where one app launches immediately\nafter another. If this happens, a brief toast is shown telling the user\nwhen app is actually running and what was originally starting.\n\nChange-Id: If94cf5bd393dd0bc0f09789dae044fde1386c481\n" }, { "commit": "d14f0dfd58af653a2d41424d472fe97de6af0a78", "tree": "5f582a90d816e7faae3bdbe36a6518006359b2f0", "parents": [ "2004ebfde368e5ae0cfc19b26e9e95f591909977", "736984573a1975d69d1c6efd87e4af9ca16e505f" ], "author": { "name": "Rich Cannings", "email": "richc@google.com", "time": "Thu Sep 09 16:51:53 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 09 16:51:53 2010 -0700" }, "message": "am 73698457: am 6bff8c79: Merge \"Remove the use of FileInputStream.available()\" into gingerbread\n\nMerge commit \u0027736984573a1975d69d1c6efd87e4af9ca16e505f\u0027\n\n* commit \u0027736984573a1975d69d1c6efd87e4af9ca16e505f\u0027:\n Remove the use of FileInputStream.available()\n" }, { "commit": "736984573a1975d69d1c6efd87e4af9ca16e505f", "tree": "17294c54b1a4d918b1a755465d5d6f3fa4cbba47", "parents": [ "0d661b5eb42aba49de8d4d6ddc5140a8b2348055", "6bff8c7994f35c5b8021f1f3da43f70739f472e0" ], "author": { "name": "Rich Cannings", "email": "richc@google.com", "time": "Thu Sep 09 16:45:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 09 16:45:34 2010 -0700" }, "message": "am 6bff8c79: Merge \"Remove the use of FileInputStream.available()\" into gingerbread\n\nMerge commit \u00276bff8c7994f35c5b8021f1f3da43f70739f472e0\u0027 into gingerbread-plus-aosp\n\n* commit \u00276bff8c7994f35c5b8021f1f3da43f70739f472e0\u0027:\n Remove the use of FileInputStream.available()\n" }, { "commit": "8d578836dc4f9fb41532b8b3dd7a6b168d6f4f9d", "tree": "0b1d4c4c5f51e723f9139244d9ac05d0a77fa847", "parents": [ "76e4fa19264793e3ed7e2ee7afccfc808a1a7458" ], "author": { "name": "Rich Cannings", "email": "richc@google.com", "time": "Thu Sep 09 15:12:40 2010 -0700" }, "committer": { "name": "Rich Cannings", "email": "richc@google.com", "time": "Thu Sep 09 16:28:48 2010 -0700" }, "message": "Remove the use of FileInputStream.available()\n\nBug: 2976294\nChange-Id: I34b13cedbf1d2338163ef74454817c318a3a24f5\n" }, { "commit": "dc936251c4b6f33158b9f55afb8b86a776c01c86", "tree": "0b7d7efc1ff89b7958e7617d36fcf8ca6843367d", "parents": [ "ecad4545d5f94dfaae25606ef8a191212a941fdf", "91cf049f34b4f3d53d39e868104f11156a332b65" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Sep 09 16:10:00 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 09 16:10:00 2010 -0700" }, "message": "am 91cf049f: am 76e4fa19: Merge \"Only pulse notification light if a new notification has been received since the screen was last turned off\" into gingerbread\n\nMerge commit \u002791cf049f34b4f3d53d39e868104f11156a332b65\u0027\n\n* commit \u002791cf049f34b4f3d53d39e868104f11156a332b65\u0027:\n Only pulse notification light if a new notification has been received since the screen was last turned off\n" }, { "commit": "91cf049f34b4f3d53d39e868104f11156a332b65", "tree": "9c8a562d0b09f5c2563acebd66f595dabe8ccb4c", "parents": [ "f49b052d308bf4c2b5eb8daadf3559ea3fd68b8e", "76e4fa19264793e3ed7e2ee7afccfc808a1a7458" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Sep 09 16:05:38 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 09 16:05:38 2010 -0700" }, "message": "am 76e4fa19: Merge \"Only pulse notification light if a new notification has been received since the screen was last turned off\" into gingerbread\n\nMerge commit \u002776e4fa19264793e3ed7e2ee7afccfc808a1a7458\u0027 into gingerbread-plus-aosp\n\n* commit \u002776e4fa19264793e3ed7e2ee7afccfc808a1a7458\u0027:\n Only pulse notification light if a new notification has been received since the screen was last turned off\n" }, { "commit": "057d5e9824a01a03c13d5a32d3c7f5023d01586e", "tree": "e70aedcf30cce63b43f31de44d4ca786f63b1997", "parents": [ "1560473ec1e0f7fe63e182dd72a4beb4a1ed1c7b" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 09 14:05:10 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 09 14:05:10 2010 -0700" }, "message": "Fix the build\n\nbroken merge resolution.\n\nChange-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe\n" }, { "commit": "76e4fa19264793e3ed7e2ee7afccfc808a1a7458", "tree": "41b8715b16752fda312c074e7c335e0df26624e0", "parents": [ "47fa8e800ca3ce56733f7b3a54bace86ad37a1f4", "2117f6fa3880e55e6a90fbd8b3a12d469c9b738b" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Sep 09 14:02:19 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 09 14:02:19 2010 -0700" }, "message": "Merge \"Only pulse notification light if a new notification has been received since the screen was last turned off\" into gingerbread" }, { "commit": "ca4306c976d393c3cd04270bc2de0af2f4f30fa5", "tree": "c34e677ec1a783e01bd8f51c8eeaf4afa83faa9e", "parents": [ "c804b27d119f8cb50a2217f4d80e4c260c692b0e", "ec52c98d441aa592a203f547c0edec79c25bf28e" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 09 13:15:32 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 09 13:15:32 2010 -0700" }, "message": "resolved conflicts for merge of ec52c98d to master\n\nChange-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed\n" }, { "commit": "ec52c98d441aa592a203f547c0edec79c25bf28e", "tree": "7b63570297eed4590bbacf27342f7efd1afb9fa1", "parents": [ "c2eff4a71bd3ab75983ffd029123f10bc177d32a", "0727a865d83b944c2fecc0bf1228a36976fe5300" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 09 09:49:15 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 09 09:49:15 2010 -0700" }, "message": "am 0727a865: Merge \"Add network condition reporting.\" into gingerbread\n\nMerge commit \u00270727a865d83b944c2fecc0bf1228a36976fe5300\u0027 into gingerbread-plus-aosp\n\n* commit \u00270727a865d83b944c2fecc0bf1228a36976fe5300\u0027:\n Add network condition reporting.\n" }, { "commit": "0727a865d83b944c2fecc0bf1228a36976fe5300", "tree": "10f6c738a653b4a5be5c744a6f956d91199ef94a", "parents": [ "f6936a3a52b6bb6de27f75d4e38d116e896b7f4d", "d7085fcf6567452a9d6fc69b0c6b1bf556f4c1b9" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 09 09:41:05 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 09 09:41:05 2010 -0700" }, "message": "Merge \"Add network condition reporting.\" into gingerbread" }, { "commit": "d7085fcf6567452a9d6fc69b0c6b1bf556f4c1b9", "tree": "0a659201bb5520ba870fc16535165df616421803", "parents": [ "65634a7935ed6f173179e7ac91a05288693b2bbf" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Wed Sep 08 15:24:47 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 09 09:33:02 2010 -0700" }, "message": "Add network condition reporting.\n\nApps can report if they like their connection to the nets\nand we display either not-really-connected or fully-connected\nicons. Final icons TBD.\n\nbug:2978624\nChange-Id: I28be52085edfe54571c0d4559aba0df883548654\n" }, { "commit": "2117f6fa3880e55e6a90fbd8b3a12d469c9b738b", "tree": "7b7a054ea3306a8b93a7354e3b995a453c7df152", "parents": [ "f6936a3a52b6bb6de27f75d4e38d116e896b7f4d" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Sep 09 09:48:08 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Sep 09 09:48:08 2010 -0400" }, "message": "Only pulse notification light if a new notification has been received since the screen was last turned off\n\nBUG: 2980248\n\nChange-Id: I4dca527a191fae4ad87eeff8ad32594fd6aeb417\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "98093a941835eff049370dbfd204a8c0a3d253c2", "tree": "78e2aafe4c4d17ffbb3eeda77f3ab667ecd472f1", "parents": [ "079fd1c0a329b0fbd3761abe2e900a941131efed", "b2118252545f4b3ab43ffb2cda4b956f8f85ff69" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Sep 08 22:47:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 22:47:30 2010 -0700" }, "message": "am b2118252: am 4d1e0121: Change the keep-alive interval to 10 seconds.\n\nMerge commit \u0027b2118252545f4b3ab43ffb2cda4b956f8f85ff69\u0027\n\n* commit \u0027b2118252545f4b3ab43ffb2cda4b956f8f85ff69\u0027:\n Change the keep-alive interval to 10 seconds.\n" }, { "commit": "b2118252545f4b3ab43ffb2cda4b956f8f85ff69", "tree": "6a2c7c5d79a986548819acfeb626a570ca1e3e78", "parents": [ "0c592acfc0ea298a0cf6c049cce4c5c10974e911", "4d1e0121277b566b5e1c22e790a3b607b75d945d" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Sep 08 22:42:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 22:42:52 2010 -0700" }, "message": "am 4d1e0121: Change the keep-alive interval to 10 seconds.\n\nMerge commit \u00274d1e0121277b566b5e1c22e790a3b607b75d945d\u0027 into gingerbread-plus-aosp\n\n* commit \u00274d1e0121277b566b5e1c22e790a3b607b75d945d\u0027:\n Change the keep-alive interval to 10 seconds.\n" }, { "commit": "4d1e0121277b566b5e1c22e790a3b607b75d945d", "tree": "b0a9d91b9f51025f58ef91268c9887bfd3907300", "parents": [ "edbb8083a815e9d911f8e659fc5c293543fdf502" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 09 13:27:10 2010 +0800" }, "committer": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 09 13:27:10 2010 +0800" }, "message": "Change the keep-alive interval to 10 seconds.\n\nChange-Id: I216cee622f57ee18533de3960d4da1a41e01f1ae\n" }, { "commit": "debd36f7c9038ae62b766f2e43681b56ff177400", "tree": "a7cef5ec587d42ae46c42e9664e5dd0639c3b18e", "parents": [ "fd1a8945be5ea1ce5dd948f8fdbefc6c5963eb9f", "f2bf6d6e705b655a546a9e6435e6acef3a82cda3" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Wed Sep 08 15:51:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 15:51:41 2010 -0700" }, "message": "am f2bf6d6e: am 65634a79: Merge \"Don\\\u0027t block in the BackupManagerService.dataChanged() Binder call.\" into gingerbread\n\nMerge commit \u0027f2bf6d6e705b655a546a9e6435e6acef3a82cda3\u0027\n\n* commit \u0027f2bf6d6e705b655a546a9e6435e6acef3a82cda3\u0027:\n Don\u0027t block in the BackupManagerService.dataChanged() Binder call.\n" }, { "commit": "f2bf6d6e705b655a546a9e6435e6acef3a82cda3", "tree": "0479cdebde90e839598b5edf5a61ca0cf76cfc1e", "parents": [ "de5cfcb608f3432d98ae17e0febb6e726df79e90", "65634a7935ed6f173179e7ac91a05288693b2bbf" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Wed Sep 08 15:26:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 15:26:57 2010 -0700" }, "message": "am 65634a79: Merge \"Don\\\u0027t block in the BackupManagerService.dataChanged() Binder call.\" into gingerbread\n\nMerge commit \u002765634a7935ed6f173179e7ac91a05288693b2bbf\u0027 into gingerbread-plus-aosp\n\n* commit \u002765634a7935ed6f173179e7ac91a05288693b2bbf\u0027:\n Don\u0027t block in the BackupManagerService.dataChanged() Binder call.\n" }, { "commit": "65634a7935ed6f173179e7ac91a05288693b2bbf", "tree": "2b365855f611d0113cf7bc0d164c9e65bd584874", "parents": [ "d9c80ab31ac3755141765e2c030bd1404ff0b050", "3dd42334ee971ad668eb8ca97f8b363292fc828d" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Wed Sep 08 15:20:20 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 08 15:20:20 2010 -0700" }, "message": "Merge \"Don\u0027t block in the BackupManagerService.dataChanged() Binder call.\" into gingerbread" }, { "commit": "467e8e13327bd9ad2dbabfa0a9b31f860202c7b1", "tree": "c3dc19f3c5372c9c3d313880cf3a74fa42777cd0", "parents": [ "94bf9431e5464c7757890abfe0716997151f153f", "5fdacb8a2818136218afdea4308ad1b10049a201" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 08 14:38:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 14:38:20 2010 -0700" }, "message": "am 5fdacb8a: am ee455f5a: Merge \"People holding partial wake locks now get blamed for CPU usage.\" into gingerbread\n\nMerge commit \u00275fdacb8a2818136218afdea4308ad1b10049a201\u0027\n\n* commit \u00275fdacb8a2818136218afdea4308ad1b10049a201\u0027:\n People holding partial wake locks now get blamed for CPU usage.\n" }, { "commit": "94bf9431e5464c7757890abfe0716997151f153f", "tree": "c02626293e1bc5ac5c565df5b427d04db054958c", "parents": [ "3dfc5721ad4dfe15962fd18daf038044cd09bf86", "e75783440a55fb0a5ef75066be94a11898f652f0" ], "author": { "name": "Jake Hamby", "email": "jhamby@google.com", "time": "Wed Sep 08 14:38:15 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 14:38:15 2010 -0700" }, "message": "am e7578344: am 5872e9d7: Merge \"Allow incoming SMS until internal storage is almost full.\" into gingerbread\n\nMerge commit \u0027e75783440a55fb0a5ef75066be94a11898f652f0\u0027\n\n* commit \u0027e75783440a55fb0a5ef75066be94a11898f652f0\u0027:\n Allow incoming SMS until internal storage is almost full.\n" }, { "commit": "5fdacb8a2818136218afdea4308ad1b10049a201", "tree": "f5d18a5298d6d5b94bfde302e6b8b35b114672b9", "parents": [ "e75783440a55fb0a5ef75066be94a11898f652f0", "ee455f5a9572bc0d23c3328f6c22da91dc109a50" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 08 14:34:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 14:34:41 2010 -0700" }, "message": "am ee455f5a: Merge \"People holding partial wake locks now get blamed for CPU usage.\" into gingerbread\n\nMerge commit \u0027ee455f5a9572bc0d23c3328f6c22da91dc109a50\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ee455f5a9572bc0d23c3328f6c22da91dc109a50\u0027:\n People holding partial wake locks now get blamed for CPU usage.\n" }, { "commit": "e75783440a55fb0a5ef75066be94a11898f652f0", "tree": "2d4f57457757577208acb99db0032c28b0114660", "parents": [ "8723bb58b17a07b7ca036cc76d737c6c0f4b13c7", "5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78" ], "author": { "name": "Jake Hamby", "email": "jhamby@google.com", "time": "Wed Sep 08 14:34:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 14:34:31 2010 -0700" }, "message": "am 5872e9d7: Merge \"Allow incoming SMS until internal storage is almost full.\" into gingerbread\n\nMerge commit \u00275872e9d7f31e5a4c5f3d871dba02b6d72a7ada78\u0027 into gingerbread-plus-aosp\n\n* commit \u00275872e9d7f31e5a4c5f3d871dba02b6d72a7ada78\u0027:\n Allow incoming SMS until internal storage is almost full.\n" }, { "commit": "ee455f5a9572bc0d23c3328f6c22da91dc109a50", "tree": "5fe731d867f3ac63b0d6fe476df253571a913928", "parents": [ "5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78", "0d903a84d04d241a648ec429e3a0e82c712677fd" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 08 14:15:35 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 08 14:15:35 2010 -0700" }, "message": "Merge \"People holding partial wake locks now get blamed for CPU usage.\" into gingerbread" }, { "commit": "b380c4d7edc158788a85c906900232675c0164ac", "tree": "579f4e6e8cd611c0f95302e0e53b6739b2e4d84e", "parents": [ "35dc79da11639117aab34d3278a7ae90984c0f87", "a05088c18d22f822e78e7b91d60f518dc3dc06fc" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 13:02:55 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 13:02:55 2010 -0700" }, "message": "resolved conflicts for merge of a05088c1 to master\n\nChange-Id: I7973f9f28586dec9b9659f8f662f40db7997a521\n" }, { "commit": "0d903a84d04d241a648ec429e3a0e82c712677fd", "tree": "815e9535debd0db364ef41a3882ed1bda51a4efa", "parents": [ "de2f3340d64e20e51029ff438f0d635d97b8a3e0" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 07 23:51:03 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 08 12:41:24 2010 -0700" }, "message": "People holding partial wake locks now get blamed for CPU usage.\n\nFor the duration of the wake lock, 50% of all CPU usage is now\naccounted against the app(s) holding partial wake locks, evenly\ndistributed between them. This is only while the device is on\nbattery and screen off.\n\nChange-Id: I3e5c978b792b6ef17bf8540705bfe8343dadd464\n" }, { "commit": "bb3716332321e22537a5015be13e2229fb9b90bc", "tree": "95cee569b2a4093366944cf236131aead4165089", "parents": [ "de2f3340d64e20e51029ff438f0d635d97b8a3e0" ], "author": { "name": "Jake Hamby", "email": "jhamby@google.com", "time": "Mon Aug 23 18:16:48 2010 -0700" }, "committer": { "name": "Jake Hamby", "email": "jhamby@google.com", "time": "Wed Sep 08 12:37:18 2010 -0700" }, "message": "Allow incoming SMS until internal storage is almost full.\n\nFix for bug 2382830: new incoming SMS should not be rejected when\nrunning low on internal phone storage.\n\nTesting revealed that the /data partition should have at least 256 KiB\navailable in order to prevent random app crashes (including system apps)\ndue to SQLite transaction failures. With 256 KiB free, the device should\nsafely boot without storage full errors. This takes into account the\n36-40 KiB that the YAFFS2 filesystem reports as available even after\nthe partition has been completely filled. I\u0027ve set the default full\nthreshold to 1 MiB to provide a generous safety margin.\n\nFor this bug, I changed the DeviceStorageMonitorService demon to send\ntwo new hidden notifications for device storage \"full\" and \"not full\",\nwhen the free space falls below the full threshold (default 1 MiB,\nbut configurable as a system setting), in addition to the existing\nstorage low/okay notifications sent when the storage crosses the threshold\nof 90% full (also configurable).\n\nThe SMS code was changed to use these new notifications so that it can\naccept messages until the data partition has been filled to the maximum\nsafe capacity rather than stopping when it hits 90% full. There should\nbe no negative impact on battery life because the additional check in\nthe storage polling service should be offset by an optimization to cache\nthe free threshold values which were previously being computed every time\nthrough the loop.\n\nWhile testing this change, I discovered that SMSDispatcher was being\ninstantiated twice, the first time in GSMPhone/CDMAPhone, and the second\ntime in SimSmsInterfaceManager / RuimSmsInterfaceManager. Changed the code\nto pass the original SMSDispatcher to the Sim/RuimSmsInterfaceManager\nconstructor.\n\nChange-Id: Ie0c6d05294778ab6ee42e0fa01313af96d824c77\n" }, { "commit": "a05088c18d22f822e78e7b91d60f518dc3dc06fc", "tree": "2aedf7f9109bf4d1f7bc014476e0823182686be4", "parents": [ "6ffee9bbba53700d33456261b986ac8a3f333b9e", "85a3176704b5bfbeece9bd928369fbb76eec7dc6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 11:55:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 11:55:24 2010 -0700" }, "message": "am 85a31767: Add support for secure views.\n\nMerge commit \u002785a3176704b5bfbeece9bd928369fbb76eec7dc6\u0027 into gingerbread-plus-aosp\n\n* commit \u002785a3176704b5bfbeece9bd928369fbb76eec7dc6\u0027:\n Add support for secure views.\n" }, { "commit": "85a3176704b5bfbeece9bd928369fbb76eec7dc6", "tree": "1a84f21c037b514c5b6717b106f5a9a2c4fd6c99", "parents": [ "c0b4f6d30d962d75125628317b5f5ea622531dfe" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 01 17:01:00 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 11:50:55 2010 -0700" }, "message": "Add support for secure views.\n\nAdded the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the\ninput manager whenever another visible window is partly or wholly obscured\nthe target of a touch event so that applications can filter touches\naccordingly.\n\nAdded a \"filterTouchesWhenObscured\" attribute to View which can be used to\nenable filtering of touches when the view\u0027s window is obscured.\n\nChange-Id: I936d9c85013fd2d77fb296a600528d30a29027d2\n" }, { "commit": "d48a709e3e8caf49e2926cd1c7017d659bcee848", "tree": "71686096883d50e660d34fc7183f09d51ef85dc0", "parents": [ "980bd4a12d70e87cdab3c7b39b5b1d7828913933", "576b492c15a079c9d3d818f3f7fadc4408c2908a" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Sep 08 10:35:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 10:35:11 2010 -0700" }, "message": "am 576b492c: am 5de1d36d: Log outbound proxy address if exists for debugging.\n\nMerge commit \u0027576b492c15a079c9d3d818f3f7fadc4408c2908a\u0027\n\n* commit \u0027576b492c15a079c9d3d818f3f7fadc4408c2908a\u0027:\n Log outbound proxy address if exists for debugging.\n" }, { "commit": "576b492c15a079c9d3d818f3f7fadc4408c2908a", "tree": "f8fc8209e9646708d1abedf6e9c440cb4e9b7fc5", "parents": [ "84f992a249491b9f755e879bf096baac3f9472f5", "5de1d36dd0415c4cf9afdf093a4915951ef6c770" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Sep 08 10:28:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 10:28:09 2010 -0700" }, "message": "am 5de1d36d: Log outbound proxy address if exists for debugging.\n\nMerge commit \u00275de1d36dd0415c4cf9afdf093a4915951ef6c770\u0027 into gingerbread-plus-aosp\n\n* commit \u00275de1d36dd0415c4cf9afdf093a4915951ef6c770\u0027:\n Log outbound proxy address if exists for debugging.\n" }, { "commit": "b8a8a578c2483d84ef96fd7050bbbcbc48d49a37", "tree": "bee1c6f2e1d5c05ba9b6ef9a9407f2aec68fdc09", "parents": [ "582deec1f3c8f51b431bb2ad685c9217ffd9eaad" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Sep 08 07:21:07 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Sep 08 07:47:03 2010 -0400" }, "message": "Fix Intent.ACTION_REBOOT\n\nTurns out this would be useful for automated testing.\n\nChange-Id: Idd5e35a8d4a354447b17a77fe0b606f78df844d0\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "3dd42334ee971ad668eb8ca97f8b363292fc828d", "tree": "ae6e3cda95449cde601b5911e00406c42026fe86", "parents": [ "5de1d36dd0415c4cf9afdf093a4915951ef6c770" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Sep 07 23:40:30 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Tue Sep 07 23:40:30 2010 -0700" }, "message": "Don\u0027t block in the BackupManagerService.dataChanged() Binder call.\n\nThis unnecessarily blocks callers.\n\nBug: 2977348\nChange-Id: I5267e575cdd5eb2136379f9710126b62a1bd75ad\n" }, { "commit": "5de1d36dd0415c4cf9afdf093a4915951ef6c770", "tree": "c9c1a7f0c42083549c81571648126dce7a7aa8ae", "parents": [ "6aec2250108b7db774643bbc088590138099adb6" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Sep 08 13:15:55 2010 +0800" }, "committer": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Sep 08 13:15:55 2010 +0800" }, "message": "Log outbound proxy address if exists for debugging.\n\nChange-Id: I2d2dffe3536e674b6956164c400e397c2f00f212\n" }, { "commit": "3a47e9524aba5fa3bc27932a42a995bc36a0bdbd", "tree": "fb6d14e7a727fc58dac20e185120a0e686f45c7f", "parents": [ "6834330c162248c74a832bade9c1b4ab3d061ac0", "b6432ca4a090c02a07038f926e9e514d8cb1b657" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 06 20:19:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 06 20:19:52 2010 -0700" }, "message": "am b6432ca4: am 960b31e3: Merge \"SipService: unset session listener if listener is gone.\" into gingerbread\n\nMerge commit \u0027b6432ca4a090c02a07038f926e9e514d8cb1b657\u0027\n\n* commit \u0027b6432ca4a090c02a07038f926e9e514d8cb1b657\u0027:\n SipService: unset session listener if listener is gone.\n" }, { "commit": "b6432ca4a090c02a07038f926e9e514d8cb1b657", "tree": "8d7f18e7c198d307342c74eaf0bd1124c9447cad", "parents": [ "32e298511a31160868f7303dbf9a1910099c0b57", "960b31e3b3b40f92665be4b7a79da7f05ea19751" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 06 20:16:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 06 20:16:51 2010 -0700" }, "message": "am 960b31e3: Merge \"SipService: unset session listener if listener is gone.\" into gingerbread\n\nMerge commit \u0027960b31e3b3b40f92665be4b7a79da7f05ea19751\u0027 into gingerbread-plus-aosp\n\n* commit \u0027960b31e3b3b40f92665be4b7a79da7f05ea19751\u0027:\n SipService: unset session listener if listener is gone.\n" }, { "commit": "1b1601d740c34de4680ec96368002893aa5f71de", "tree": "3d8647636826b9d642d2d7cbf2c52f122e433ad5", "parents": [ "6dc003a73f7f01aa5dd5831e777e2aa44f65b032" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Sun Sep 05 00:26:11 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Sun Sep 05 00:26:11 2010 +0800" }, "message": "SipService: unset session listener if listener is gone.\n\nChange-Id: I0b85ee7bcb32c24cf64dfc3edc40c0cad9717562\n" }, { "commit": "004abb12238d34cf9567d70eac194983636524bd", "tree": "cf72d916f7aea1f147ba83ad5df0cd80d7c12163", "parents": [ "8ae409f50156394b517a86a8d171938e0aa32897", "3d7d3690defa2e63a60b0d9133608cf771cdbca7" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 14:07:25 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 14:07:25 2010 -0700" }, "message": "resolved conflicts for merge of 3d7d3690 to master\n\nChange-Id: I1d1d7a448b3ae8a86600addfa75f2448a98327bf\n" }, { "commit": "3d7d3690defa2e63a60b0d9133608cf771cdbca7", "tree": "c0092d09979ac75d9028435066a1abba32b22239", "parents": [ "bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb", "e25b4bc76fef584b38ce4e72f919fba119bdfa99" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 13:26:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 13:26:30 2010 -0700" }, "message": "am e25b4bc7: Merge \"These are not ready to be exposed. Also rename them to be better.\" into gingerbread\n\nMerge commit \u0027e25b4bc76fef584b38ce4e72f919fba119bdfa99\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e25b4bc76fef584b38ce4e72f919fba119bdfa99\u0027:\n These are not ready to be exposed. Also rename them to be better.\n" }, { "commit": "e25b4bc76fef584b38ce4e72f919fba119bdfa99", "tree": "781dfba1a3a08ceda9d7f63071ef8490f6371f5d", "parents": [ "2b136832be7326caed0c79bae418c2dd54372bea", "482566ed5cc7307b0401361509fb06acc5476115" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 13:24:33 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 03 13:24:33 2010 -0700" }, "message": "Merge \"These are not ready to be exposed. Also rename them to be better.\" into gingerbread" }, { "commit": "482566ed5cc7307b0401361509fb06acc5476115", "tree": "3a41c2b2301bf17dc1575d32641a8cbfaa9e7af9", "parents": [ "46e63b346770efa14451b8e67b7f7636c4e5a76c" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 12:51:28 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 12:51:28 2010 -0700" }, "message": "These are not ready to be exposed. Also rename them to be better.\n\nChange-Id: I7c234144497084b7769f8c46761b7d74d1c583d5\n" }, { "commit": "462bac9222428c227b3704c1be0744b00c3bad73", "tree": "3a545bbf8cf27fcc99c266dc01c28b252ed151f8", "parents": [ "b062f02d54b97dd45c810a6bb4544c94ff4ed0f1", "e7884d68a613e579a12a52455f6b5b13a90a0f8a" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Sep 03 11:54:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 11:54:31 2010 -0700" }, "message": "am e7884d68: am d85621c9: Don\\\u0027t crash when extra logging is enabled.\n\nMerge commit \u0027e7884d68a613e579a12a52455f6b5b13a90a0f8a\u0027\n\n* commit \u0027e7884d68a613e579a12a52455f6b5b13a90a0f8a\u0027:\n Don\u0027t crash when extra logging is enabled.\n" }, { "commit": "e7884d68a613e579a12a52455f6b5b13a90a0f8a", "tree": "219ac2bb1459d7608c91e6aec211d87a8b38ecdb", "parents": [ "bc1452a307ac61ca87bf78722701ac85100952af", "d85621c938286a568b1173e7ab29f80ab93d27e1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Sep 03 11:51:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 11:51:28 2010 -0700" }, "message": "am d85621c9: Don\\\u0027t crash when extra logging is enabled.\n\nMerge commit \u0027d85621c938286a568b1173e7ab29f80ab93d27e1\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d85621c938286a568b1173e7ab29f80ab93d27e1\u0027:\n Don\u0027t crash when extra logging is enabled.\n" }, { "commit": "d85621c938286a568b1173e7ab29f80ab93d27e1", "tree": "cd67b767301b16439d7d1dfb4cab353771ce171d", "parents": [ "7755cdd69690ccbb42c6fd47b3e9c4594d4ade82" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Sep 03 09:25:33 2010 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Sep 03 11:46:19 2010 -0700" }, "message": "Don\u0027t crash when extra logging is enabled.\n\nChange-Id: I76cf8db0f51ed33e91acee9636180e8d7c0b5ff9\n" }, { "commit": "4d42bdec8229802945e57a634374e113ff234dfe", "tree": "90a2fa5e18ce2e3bb0fc2f79c4c23f554144562a", "parents": [ "94cba5b2a2b1c4f1b53493e6fd6e03bced88f3e8", "0eec8948f89c5216464d8204cadd69d7a6ec3669" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Sep 03 09:58:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 09:58:51 2010 -0700" }, "message": "am 0eec8948: am 305bcbf0: Decrease PackageManagerService wait time for vold\n\nMerge commit \u00270eec8948f89c5216464d8204cadd69d7a6ec3669\u0027\n\n* commit \u00270eec8948f89c5216464d8204cadd69d7a6ec3669\u0027:\n Decrease PackageManagerService wait time for vold\n" }, { "commit": "0eec8948f89c5216464d8204cadd69d7a6ec3669", "tree": "e359453b0596f3db8bd54aa86c26298799c7a5f1", "parents": [ "fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f", "305bcbf0c961840c4505770d084a1caacc074dbb" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Sep 03 09:55:33 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 09:55:33 2010 -0700" }, "message": "am 305bcbf0: Decrease PackageManagerService wait time for vold\n\nMerge commit \u0027305bcbf0c961840c4505770d084a1caacc074dbb\u0027 into gingerbread-plus-aosp\n\n* commit \u0027305bcbf0c961840c4505770d084a1caacc074dbb\u0027:\n Decrease PackageManagerService wait time for vold\n" }, { "commit": "305bcbf0c961840c4505770d084a1caacc074dbb", "tree": "6ccdf93bd6bbc7728370f7ceefad72f4ec39ecfc", "parents": [ "12da9d7472ae87b841575d5358e19f143d12f900" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Sep 03 07:56:38 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Sep 03 09:33:34 2010 -0700" }, "message": "Decrease PackageManagerService wait time for vold\n\nUp the blocking queue maximum to twice the number of containers we\nallow which should let \"asec list\" complete without blocking the thread\nseveral times.\n\nChange the threads for the NativeDaemonConnector to vold and netd to be\nmore descriptive instead of the same name.\n\nBug: 2501075\nChange-Id: I7e7949845a6c70a3d619aec0fa79ceef3c17a4be\n" }, { "commit": "de7fb55369e9051d5c565414e7c0cbd7d15dcdc4", "tree": "8f1f5e170a4e647e51ddea6f8733defea476f6e4", "parents": [ "c4b05982398b3b2f2bcc60ba9dc25bf5b2b348aa", "bb08caf54bdb201d9b85393152f1b400eb4abe2b" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri Sep 03 08:16:30 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 03 08:16:30 2010 -0700" }, "message": "Merge \"Fix and simplify ConnectivityService singleton.\"" }, { "commit": "73dc2592bed890c3ea3be5e472bcda977eaf6b1c", "tree": "274c92cbd33948b04fe842d2854bb44b14c6d282", "parents": [ "75a2ae937f5354a3432d0a2382e98177bd9b80d5" ], "author": { "name": "Pal Szasz", "email": "pal.szasz@sonyericsson.com", "time": "Fri Sep 03 11:46:26 2010 +0200" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonyericsson.com", "time": "Fri Sep 03 11:46:26 2010 +0200" }, "message": "Allow two SurfaceViews inbetween the app and the wallpaper.\n\nWhen two SurfaceViews are used by an application, which is\ntransparent and uses the wallpaper, only one of the SurfaceViews\nwill be visible.\n\nThe problem is that when trying to find the correct location\nfor the wallpaper, the window manager locates the activity\nwindow and skips every window below it which is related.\nFor the first SurfaceView this will be ok, since the\nSurfaceViews\u0027s attached window is the previous window.\nHowever for the second SurfaceView this condition will fail\n(the 2nd SurfaceViews attached window is not the previous\nwindow (which is the 1st SurfaceView)).\n\nThe fix adds an extra check which detects this usecase\n(the windows are related if the attached window is the same\nas the attached window of the previous window).\n\nChange-Id: I368e9dd53455dc310f48d6d8c0be68350ff2b79e\n" }, { "commit": "1d5c87b75321b3f7decfe0874f9b472318a4b473", "tree": "226d801c310ed3f30e03bb2617cf5fe2d6ac68da", "parents": [ "3559d1d1fc9d6e57325f50cde36c433044793b11", "fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 02 22:32:39 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 02 22:32:39 2010 -0700" }, "message": "am fb79b7da: am 12da9d74: Fix buffer compacting in NativeDaemonConnector\n\nMerge commit \u0027fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f\u0027\n\n* commit \u0027fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f\u0027:\n Fix buffer compacting in NativeDaemonConnector\n" }, { "commit": "fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f", "tree": "f589e50bb367519557c54e4695e8aa551c186708", "parents": [ "ea16e72bff350c0b6e2a00a82b934d1a2fc0fa2d", "12da9d7472ae87b841575d5358e19f143d12f900" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 02 22:29:05 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 02 22:29:05 2010 -0700" }, "message": "am 12da9d74: Fix buffer compacting in NativeDaemonConnector\n\nMerge commit \u002712da9d7472ae87b841575d5358e19f143d12f900\u0027 into gingerbread-plus-aosp\n\n* commit \u002712da9d7472ae87b841575d5358e19f143d12f900\u0027:\n Fix buffer compacting in NativeDaemonConnector\n" }, { "commit": "12da9d7472ae87b841575d5358e19f143d12f900", "tree": "69bb942ca890c1b732145b06a480bd3bced0e80c", "parents": [ "b355714a2995ebe343808e06f69da5067f52a833" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 02 22:18:14 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Sep 02 22:24:06 2010 -0700" }, "message": "Fix buffer compacting in NativeDaemonConnector\n\nThe buffer was being compacted in the read loop, but the start offset on\nthe compacted buffer wasn\u0027t being considered after the next read.\n\nBug: 2501075\nChange-Id: I163297d751cf800d0bbc66df66b1a0fa0785de49\n" }, { "commit": "bb08caf54bdb201d9b85393152f1b400eb4abe2b", "tree": "b42d80ff4cb117a1e8c942129e96e826678386c0", "parents": [ "dcfd5d784c7d474e0932604a9f0dff591c3210e2" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Thu Sep 02 19:23:52 2010 -0700" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Thu Sep 02 19:23:52 2010 -0700" }, "message": "Fix and simplify ConnectivityService singleton.\n\nChange-Id: Idb74854db9d801c1cc138eb5ca866cf01940ff6d\n" }, { "commit": "3d67c5688f4855acbfd6de103b278ceee74a4451", "tree": "d48796ae0c461ce5160b8c948c290fbb2bef058e", "parents": [ "f61f75eb0f0030f0aaee4621f83bb2bf579043fb", "12eaf9d50c2ed30a561eb433ad69a388e54c482d" ], "author": { "name": "repo sync", "email": "chiachi@android.com", "time": "Fri Sep 03 00:24:26 2010 +0800" }, "committer": { "name": "repo sync", "email": "chiachi@android.com", "time": "Fri Sep 03 00:24:26 2010 +0800" }, "message": "resolved conflicts for merge of 12eaf9d5 to master\n\nChange-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d\n" }, { "commit": "12eaf9d50c2ed30a561eb433ad69a388e54c482d", "tree": "38217995a184fac75d402431d7ae345cbb8e44e9", "parents": [ "18dfae226b0f9d3983226eb6cd377fc937b30730", "dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Sep 02 08:17:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 02 08:17:11 2010 -0700" }, "message": "am dc296b0d: Merge \"SipService: reduce the usage of javax.sdp.*.\" into gingerbread\n\nMerge commit \u0027dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6\u0027 into gingerbread-plus-aosp\n\n* commit \u0027dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6\u0027:\n SipService: reduce the usage of javax.sdp.*.\n" }, { "commit": "95b15c35608fe3ea679c8a478c6cbd841623371e", "tree": "42c634c71c513a3f87bde823fb79120f9ecf4e31", "parents": [ "79492a0d75b0b02f11f35500f79dd3fcbc6e2211" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Sep 02 22:15:26 2010 +0800" }, "committer": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Sep 02 22:15:26 2010 +0800" }, "message": "SipService: reduce the usage of javax.sdp.*.\n\nAfter this change, SipAudioCallImpl is the only place still using it.\n\nChange-Id: I5693bffa54f9e19cbfa70b45dfcf40fba04dedbb\n" }, { "commit": "a5034b5d802d0573808dc0fab7a71f9283ad3994", "tree": "56b4eab290e0f7b8adf0abeb24dcedd399df4298", "parents": [ "8f5edc93b622bbdc33db24d348480fd7d55afb41", "75823339cd03e5b25b576cd7a2b5941254017c4a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 23:20:18 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 23:20:18 2010 -0700" }, "message": "am 75823339: am a1c69e08: Fix a small bug when granting permissions through activity results.\n\nMerge commit \u002775823339cd03e5b25b576cd7a2b5941254017c4a\u0027\n\n* commit \u002775823339cd03e5b25b576cd7a2b5941254017c4a\u0027:\n Fix a small bug when granting permissions through activity results.\n" }, { "commit": "75823339cd03e5b25b576cd7a2b5941254017c4a", "tree": "6c6d0788c0439f73e5e3c428a41eb3ef306ff4ea", "parents": [ "840f0fecd87357cadf4b2a0ae96d30b457f89729", "a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 23:17:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 23:17:20 2010 -0700" }, "message": "am a1c69e08: Fix a small bug when granting permissions through activity results.\n\nMerge commit \u0027a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4\u0027:\n Fix a small bug when granting permissions through activity results.\n" }, { "commit": "a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4", "tree": "a7717db542b45f4ad8fa9dc7f22c0a663d047c6b", "parents": [ "d3efa3924407da6d38aa5931ac29aa088d9eb986" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 22:55:02 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 22:55:02 2010 -0700" }, "message": "Fix a small bug when granting permissions through activity results.\n\nChange-Id: I2a5c4025fb5f566e29c219fde4d50ed2eba6e174\n" }, { "commit": "0ed0221e9c01753eb8cf312ea9d148a0097a99a1", "tree": "3a814e08f50ba1daf04f2f7974018426be2ed54a", "parents": [ "2de8a82643a4c7e6c07a24f938d0674758484e60", "bc4603b0b1f1242387655274e39649882ca391d1" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Wed Sep 01 21:41:51 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 01 21:41:51 2010 -0700" }, "message": "Merge \"Fix 2579224: Add a separate timeout for lockscreen vs display\"" }, { "commit": "00092874b1fea2354b6a3048974abfc4bba69258", "tree": "a3a6961c9e919863950921936083f97c3cf73773", "parents": [ "5486dcb00a44f6367a880cf7ea7f699bfa1e15cb" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Wed Sep 01 21:18:22 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Wed Sep 01 21:18:22 2010 -0700" }, "message": "Revert \"Changed ConnectivityService#getServiceInstance so its a singleton.\"\n\nThis reverts commit 28961cc02f350ccd1770fb5af2f0d4c9793e4aec which causes this exception:\n\nE/SystemServer( 2653): Failure starting Connectivity Service\nE/SystemServer( 2653): java.lang.IllegalMonitorStateException: object not locked by thread before wait()\nE/SystemServer( 2653): at java.lang.Object.wait(Native Method)\nE/SystemServer( 2653): at java.lang.Object.wait(Object.java:358)\nE/SystemServer( 2653): at com.android.server.ConnectivityService$ConnectivityThread.getServiceInstance(ConnectivityService.java:186)\nE/SystemServer( 2653): at com.android.server.ConnectivityService.getInstance(ConnectivityService.java:200)\nE/SystemServer( 2653): at com.android.server.ServerThread.run(SystemServer.java:262)\n\nChange-Id: Idd139e426e61a1913b0bf343e2f0a0b1990ba8bb\n" }, { "commit": "bc4603b0b1f1242387655274e39649882ca391d1", "tree": "2fa809bcb70cae54ca0a5fae704bade74d728c64", "parents": [ "5486dcb00a44f6367a880cf7ea7f699bfa1e15cb" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Mon Aug 30 21:21:34 2010 -0700" }, "committer": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Wed Sep 01 21:00:30 2010 -0700" }, "message": "Fix 2579224: Add a separate timeout for lockscreen vs display\n\nThis change adds a second timeout to the SecuritySettings page\nseparate from the standard display timeout.\n\nChange-Id: I41fe10e31688308f52695ad3ee30a4b0507112bd\n" }, { "commit": "f83d4f1779eb4801275a56023c343459a95009af", "tree": "4add9c90e3b09babc77834b85e6dc89b5053def3", "parents": [ "53d7765eac58f496355147f167fb345e825d6d54", "3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 02 09:56:04 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 02 09:56:04 2010 +0800" }, "message": "resolved conflicts for merge of 3e4975a5 to master\n\nChange-Id: Icd382fc43c8a1975801ab42eb184b633520149c7\n" }, { "commit": "3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1", "tree": "627a3c5879f88b207af0f806d233b8c1e763ab71", "parents": [ "fd0eed007d99178092ede56ec2c4799046615f70", "3424c02e6b931a8bbd651ae75217bebd008b2605" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Sep 01 18:01:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 18:01:31 2010 -0700" }, "message": "am 3424c02e: Add software features for SIP and VOIP\n\nMerge commit \u00273424c02e6b931a8bbd651ae75217bebd008b2605\u0027 into gingerbread-plus-aosp\n\n* commit \u00273424c02e6b931a8bbd651ae75217bebd008b2605\u0027:\n Add software features for SIP and VOIP\n" }, { "commit": "3424c02e6b931a8bbd651ae75217bebd008b2605", "tree": "f8113a62a05f612a54da4c277661542edbcb9773", "parents": [ "a2511da9d65b11be7f59ed3f525f77e85aeb4bef" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Aug 27 18:08:19 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 02 08:10:13 2010 +0800" }, "message": "Add software features for SIP and VOIP\n\nand block SipService creation and SIP API if the feature is not available.\n\nChange-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc\n" }, { "commit": "59f6b0da29034747bb66466739cb565047c912b8", "tree": "217ab23e4f7ba97f390e2bfc7ccbc48a033f7366", "parents": [ "188aa566e6a46889d4d453e912750c1263c9d2fa", "9088a3d153ef28dfa383fda0935d99bdc0c2b2f6" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 01 16:57:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 16:57:52 2010 -0700" }, "message": "am 9088a3d1: am 7c1bd7fd: Fix logic error in downgrade of system apps\n\nMerge commit \u00279088a3d153ef28dfa383fda0935d99bdc0c2b2f6\u0027\n\n* commit \u00279088a3d153ef28dfa383fda0935d99bdc0c2b2f6\u0027:\n Fix logic error in downgrade of system apps\n" }, { "commit": "188aa566e6a46889d4d453e912750c1263c9d2fa", "tree": "26d6f45d9ebc7246718d2ff36f784f9aae2c2b83", "parents": [ "b3e6d570a9904c07d96f783076b719e529c78a69", "11d12f7efc588b0e945c42952e67d96f2421dc26" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 01 16:57:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 16:57:42 2010 -0700" }, "message": "am 11d12f7e: am fca5677a: Merge \"Add null check for package settings\" into gingerbread\n\nMerge commit \u002711d12f7efc588b0e945c42952e67d96f2421dc26\u0027\n\n* commit \u002711d12f7efc588b0e945c42952e67d96f2421dc26\u0027:\n Add null check for package settings\n" }, { "commit": "e90aa5e97e3a5502a8334ed6ceb98305f6e01361", "tree": "1dc469b39c929858f7e0d023a4c981c46c771142", "parents": [ "276e8d44a4e29c86712c3ccb60dc8dc057b209d0" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Wed Sep 01 11:34:05 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Wed Sep 01 15:25:51 2010 -0700" }, "message": "Add a default dns entry if none is provided\n\nFixes part of emulator which isn\u0027t telling us about dns servers.\nGets some stuff running, but browser is still broken.\n\nbug:2961703\nChange-Id: I53b946eba434aca1bb524c2acaf77922377948d1\n" }, { "commit": "9088a3d153ef28dfa383fda0935d99bdc0c2b2f6", "tree": "82b4e7ec13a8e54b4ba44e6864ddd6c7e2886347", "parents": [ "11d12f7efc588b0e945c42952e67d96f2421dc26", "7c1bd7fdbf9ac539c9832693b403511b2fc7bac7" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 01 14:52:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 14:52:54 2010 -0700" }, "message": "am 7c1bd7fd: Fix logic error in downgrade of system apps\n\nMerge commit \u00277c1bd7fdbf9ac539c9832693b403511b2fc7bac7\u0027 into gingerbread-plus-aosp\n\n* commit \u00277c1bd7fdbf9ac539c9832693b403511b2fc7bac7\u0027:\n Fix logic error in downgrade of system apps\n" }, { "commit": "28961cc02f350ccd1770fb5af2f0d4c9793e4aec", "tree": "58ed79150bf83ce544347b41e0197847325ea4aa", "parents": [ "173a86b6d7b10aa48efaf2a57828a693e652a661" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Wed Sep 01 14:48:29 2010 -0700" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Wed Sep 01 14:48:29 2010 -0700" }, "message": "Changed ConnectivityService#getServiceInstance so its a singleton.\n\nChange-Id: I27b5688a50917b01fb2fcd1c124da77ccae226b5\n" }, { "commit": "11d12f7efc588b0e945c42952e67d96f2421dc26", "tree": "1c595ec2cde80152fc620616861515f69dad01bd", "parents": [ "6fb81376b6e062d9b0ce4d91e23c2a88572b8186", "fca5677aeefc3b9cbaecefbb10d5ccbaff974391" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 01 14:12:26 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 14:12:26 2010 -0700" }, "message": "am fca5677a: Merge \"Add null check for package settings\" into gingerbread\n\nMerge commit \u0027fca5677aeefc3b9cbaecefbb10d5ccbaff974391\u0027 into gingerbread-plus-aosp\n\n* commit \u0027fca5677aeefc3b9cbaecefbb10d5ccbaff974391\u0027:\n Add null check for package settings\n" }, { "commit": "7c1bd7fdbf9ac539c9832693b403511b2fc7bac7", "tree": "94709083ad4790f053717189587c326f74c50f42", "parents": [ "fca5677aeefc3b9cbaecefbb10d5ccbaff974391" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 01 13:44:11 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 01 14:10:36 2010 -0700" }, "message": "Fix logic error in downgrade of system apps\n\nA logic error would allow not deleting data when uninstalling a system\napp upgrade that\u0027s of a newer release than the on on the system\npartition. If the system app had a database upgrade and this happened,\nyou might be in trouble.\n\nLuckily it appears no one ever does this in code. You\u0027d have to manually\nget there doing:\n\nadb uninstall -k updated.system.package\n\nChange-Id: I3110fedf2d147975a0635c71898d985dd642a2c1\n" }, { "commit": "9ee9274e5ebd131cef02d543fdb5cd1c1ae9a9f6", "tree": "b63990a7fd4a5a2faf88d894dab89781367265f9", "parents": [ "1751086360056bc60d00f2ed2988bc82be9e7bd9" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 01 13:40:57 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 01 13:59:02 2010 -0700" }, "message": "Add null check for package settings\n\nA few lines down \"ps\" is run through a null check, so apparently there\ncould be some screwy system conditions where this is encountered. And,\nin fact, this was encountered through an updated system pacakge that\nmanaged to delete the package from /system/app during testing. It left\nthe PackageSetting in mDisabledSysPackages which would cause a deference\nof a null variable.\n\nChange-Id: Ic7faca569abd16a87a8a69c20df08c11a274a001\n" }, { "commit": "2394c164a76f6d3f8ad9f1c1517f58f72adab9d7", "tree": "f0cee0035a0983071d2cdd713d77eacc156dab36", "parents": [ "633524731b2a7a0871aabfabc60459ac27f0e5ab", "ec438e1448ebc578ee5a4c4beb1e26292cdedd6e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Aug 31 19:06:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 31 19:06:25 2010 -0700" }, "message": "am ec438e14: am 361199b5: Add PackageManager API to get information about a provider component.\n\nMerge commit \u0027ec438e1448ebc578ee5a4c4beb1e26292cdedd6e\u0027\n\n* commit \u0027ec438e1448ebc578ee5a4c4beb1e26292cdedd6e\u0027:\n Add PackageManager API to get information about a provider component.\n" }, { "commit": "ec438e1448ebc578ee5a4c4beb1e26292cdedd6e", "tree": "029494a6012249306fdf95bfe66bbc4c16f52ae3", "parents": [ "3f124cc5ec31024acac057d0f848125f8da5e905", "361199b5e742c6635d4d7a03de6cf37b31cf442c" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Aug 31 19:03:36 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 31 19:03:36 2010 -0700" }, "message": "am 361199b5: Add PackageManager API to get information about a provider component.\n\nMerge commit \u0027361199b5e742c6635d4d7a03de6cf37b31cf442c\u0027 into gingerbread-plus-aosp\n\n* commit \u0027361199b5e742c6635d4d7a03de6cf37b31cf442c\u0027:\n Add PackageManager API to get information about a provider component.\n" }, { "commit": "1bfdac8c6da0a9c6d5bdfa22c5bca674b904febc", "tree": "12f3df29c8b093176e75eb0bf7816d8402bf46b3", "parents": [ "ecd369699c29187ab327ec76b8aad56e0d93639d", "3f124cc5ec31024acac057d0f848125f8da5e905" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Aug 31 19:02:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 31 19:02:02 2010 -0700" }, "message": "am 3f124cc5: am 22cd420b: Merge \"Improve debug output when an ANR happens.\" into gingerbread\n\nMerge commit \u00273f124cc5ec31024acac057d0f848125f8da5e905\u0027\n\n* commit \u00273f124cc5ec31024acac057d0f848125f8da5e905\u0027:\n Improve debug output when an ANR happens.\n" }, { "commit": "361199b5e742c6635d4d7a03de6cf37b31cf442c", "tree": "170d0ba61242ba04a3491a98f894f3a2e416bbe7", "parents": [ "22cd420bfa431b4ad55e699afadf109dcc54f201" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Aug 30 17:42:07 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Aug 31 18:59:04 2010 -0700" }, "message": "Add PackageManager API to get information about a provider component.\n\nKind-of useful when all you have is a ComponentName.\n\nChange-Id: I9a99f12daabb29e97e882e09c43ca0df70c00651\n" }, { "commit": "3f124cc5ec31024acac057d0f848125f8da5e905", "tree": "02974eec9b43d62f2161ae46ab9bb591054ec9bf", "parents": [ "ff46a5c9bd55c492925ffcb608510a0a3dd8a969", "22cd420bfa431b4ad55e699afadf109dcc54f201" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Aug 31 18:58:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 31 18:58:47 2010 -0700" }, "message": "am 22cd420b: Merge \"Improve debug output when an ANR happens.\" into gingerbread\n\nMerge commit \u002722cd420bfa431b4ad55e699afadf109dcc54f201\u0027 into gingerbread-plus-aosp\n\n* commit \u002722cd420bfa431b4ad55e699afadf109dcc54f201\u0027:\n Improve debug output when an ANR happens.\n" }, { "commit": "6b1afebdaca6c27d49a243c4283e5e2e4924de8c", "tree": "da5c6e37a15b708d10ab9e5198d5f4b55c4a33f8", "parents": [ "f560ceabe11b4f541c568bead61a5ec8f527151c" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Aug 31 15:40:21 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Aug 31 18:51:27 2010 -0700" }, "message": "Improve debug output when an ANR happens.\n\n- Collect data at better times.\n- Collect per-thread CPU usage as soon as possible after the ANR, and print\n in log.\n- Based on new per-thread CPU usage, limit the number of processes we\n collect stacks from to not include inactive not interesting procs.\n- Improve the way ProcessStats compute and reports its data.\n\nChange-Id: I12b17fb47d593d175be69bb792c1f57179bf4fdf\n" }, { "commit": "43c926da089ba2c7ed9935e4015f65bd7c9d0eba", "tree": "cdc36ff5d283f0aaf2f44b24b6254a5099d3364b", "parents": [ "990ac5294477fe3f427ef0a12caba68119ce0ea3", "d6a5f2dff9c9db3e154a461127a7cfcea05c1f90" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 31 12:47:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 31 12:47:35 2010 -0700" }, "message": "am d6a5f2df: am d3e803ae: Revert \"Shutdown when capacity is 0% and no charging or when battery is dead\"\n\nMerge commit \u0027d6a5f2dff9c9db3e154a461127a7cfcea05c1f90\u0027\n\n* commit \u0027d6a5f2dff9c9db3e154a461127a7cfcea05c1f90\u0027:\n Revert \"Shutdown when capacity is 0% and no charging or when battery is dead\"\n" }, { "commit": "d6a5f2dff9c9db3e154a461127a7cfcea05c1f90", "tree": "6b70f1f4c03c0e7d2e2654e5d583b4be7e8307c4", "parents": [ "18551815e5a45f236f9898ce4abc9b99f5fc6ae4", "d3e803ae28c369996f9acf6036ea99af5561949c" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 31 12:45:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 31 12:45:02 2010 -0700" }, "message": "am d3e803ae: Revert \"Shutdown when capacity is 0% and no charging or when battery is dead\"\n\nMerge commit \u0027d3e803ae28c369996f9acf6036ea99af5561949c\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d3e803ae28c369996f9acf6036ea99af5561949c\u0027:\n Revert \"Shutdown when capacity is 0% and no charging or when battery is dead\"\n" }, { "commit": "d3e803ae28c369996f9acf6036ea99af5561949c", "tree": "3f2aa4474ca70b5d6efe5630c5e852894a11dd0b", "parents": [ "12dbee827353ecdb690d27c3f52e26afc71e0774" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 31 12:29:16 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 31 12:32:55 2010 -0700" }, "message": "Revert \"Shutdown when capacity is 0% and no charging or when battery is dead\"\n\nThis reverts commit fd04143a47770256dabcfa4d8447127b3ec8b2bf.\n\nThis break most automated tests because with this change, if the\ndevice is fully charged, it will simply turn off the screen, regardless\nif USB is connected to hsot PC or not; so for our tests, most of them\nare always connected to host PC, and fully charged 99% of the time,\nas soon as the screen turns off, the front-end test Activity will be\nsuspended.\n\nChange-Id: I1e6590611af43812f1bac223dd31570d1d90cfc5\n" }, { "commit": "22f5ee93746f37823265b8cb9b1e94e572607514", "tree": "269e105935875e8453c0bd33792fdeedd4c928ee", "parents": [ "02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd", "36f0cb26cbb4ef62995ff2e5a540cf8814e7f030" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Aug 30 18:29:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 30 18:29:12 2010 -0700" }, "message": "am 36f0cb26: am 8d60866e: Input device calibration and capabilities.\n\nMerge commit \u002736f0cb26cbb4ef62995ff2e5a540cf8814e7f030\u0027\n\n* commit \u002736f0cb26cbb4ef62995ff2e5a540cf8814e7f030\u0027:\n Input device calibration and capabilities.\n" }, { "commit": "02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd", "tree": "f2bd88e08646217e026f469eec0e90c40a506c37", "parents": [ "91b2eb933cbafbce13e2afa2220cd72d363be947", "734d270769c609c7d3a1f2ec46e1d329d9682ab4" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Aug 30 18:25:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 30 18:25:02 2010 -0700" }, "message": "am 734d2707: am bb660d7e: Merge \"Renaming SharedPreferences.startCommit to apply\" into gingerbread\n\nMerge commit \u0027734d270769c609c7d3a1f2ec46e1d329d9682ab4\u0027\n\n* commit \u0027734d270769c609c7d3a1f2ec46e1d329d9682ab4\u0027:\n Renaming SharedPreferences$Editor.startCommit to apply\n" }, { "commit": "36f0cb26cbb4ef62995ff2e5a540cf8814e7f030", "tree": "02861c4660c46bdd3fb5afbd5887426da1f7111e", "parents": [ "734d270769c609c7d3a1f2ec46e1d329d9682ab4", "8d60866e2100db70ecf0502c14768a384514d7e9" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Aug 30 18:22:32 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 30 18:22:32 2010 -0700" }, "message": "am 8d60866e: Input device calibration and capabilities.\n\nMerge commit \u00278d60866e2100db70ecf0502c14768a384514d7e9\u0027 into gingerbread-plus-aosp\n\n* commit \u00278d60866e2100db70ecf0502c14768a384514d7e9\u0027:\n Input device calibration and capabilities.\n" } ], "next": "734d270769c609c7d3a1f2ec46e1d329d9682ab4" }