)]}' { "log": [ { "commit": "2079843412ef2e56c17cb5d96a31785938e97da5", "tree": "2307772569d8f2128cd67eb75dca739b7165a9cc", "parents": [ "5a474a2bb8bc23fcc8d05e8b9ec3f4306dd63db1", "45a83a896701f61f72082f7116b85d1537ebf4cb" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:57:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:57:08 2010 -0700" }, "message": "am 45a83a89: am fccd5bc7: Fix build.\n\nMerge commit \u002745a83a896701f61f72082f7116b85d1537ebf4cb\u0027\n\n* commit \u002745a83a896701f61f72082f7116b85d1537ebf4cb\u0027:\n Fix build.\n" }, { "commit": "45a83a896701f61f72082f7116b85d1537ebf4cb", "tree": "ee3fc8ec828b89a354a2e97ae3e21c7c7e752e1a", "parents": [ "44669d31d1d5b094d7b7d3e393281440ea0c9536", "fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:52:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:52:35 2010 -0700" }, "message": "am fccd5bc7: Fix build.\n\nMerge commit \u0027fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f\u0027 into gingerbread-plus-aosp\n\n* commit \u0027fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f\u0027:\n Fix build.\n" }, { "commit": "6cf8f64be3c079ef76d708a56b55a2b7ca6dbd2f", "tree": "40a63d05fe88dc6e6442c60edeb22975fcf3cae7", "parents": [ "031d8786824a385fa47750e5e8aa75f40d70cae9", "c5027642ff3909911d27e4abaa5e3abf1615b38d" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:47:37 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:47:37 2010 -0700" }, "message": "am c5027642: am 025a39af: SIP: misc fixes\n\nMerge commit \u0027c5027642ff3909911d27e4abaa5e3abf1615b38d\u0027\n\n* commit \u0027c5027642ff3909911d27e4abaa5e3abf1615b38d\u0027:\n SIP: misc fixes\n" }, { "commit": "031d8786824a385fa47750e5e8aa75f40d70cae9", "tree": "a9f52087b62eb2b194502b82447b5bc6d2e94fbb", "parents": [ "2b0fa71c1a9e588fc31944baa5a21c362a0ab1ca", "fe2d279c5ef571340f20d433badd9f68072299af" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:47:32 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:47:32 2010 -0700" }, "message": "am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error\n\nMerge commit \u0027fe2d279c5ef571340f20d433badd9f68072299af\u0027\n\n* commit \u0027fe2d279c5ef571340f20d433badd9f68072299af\u0027:\n SipService: handle cross-domain authentication error\n" }, { "commit": "c5027642ff3909911d27e4abaa5e3abf1615b38d", "tree": "1d49c6875b5146f026834cb995a0133d6076668d", "parents": [ "fe2d279c5ef571340f20d433badd9f68072299af", "025a39af346f39743c1e384b9000ce1baee36562" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:20:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:20:30 2010 -0700" }, "message": "am 025a39af: SIP: misc fixes\n\nMerge commit \u0027025a39af346f39743c1e384b9000ce1baee36562\u0027 into gingerbread-plus-aosp\n\n* commit \u0027025a39af346f39743c1e384b9000ce1baee36562\u0027:\n SIP: misc fixes\n" }, { "commit": "fe2d279c5ef571340f20d433badd9f68072299af", "tree": "e3835837ff38012748401290a495a0863b28119a", "parents": [ "c6581a1046b062d0e06e50e9b09e6c12a8e54efc", "00a22064efef4f574e439079aae2deae1a087a31" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 11:20:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 11:20:24 2010 -0700" }, "message": "am 00a22064: SipService: handle cross-domain authentication error\n\nMerge commit \u002700a22064efef4f574e439079aae2deae1a087a31\u0027 into gingerbread-plus-aosp\n\n* commit \u002700a22064efef4f574e439079aae2deae1a087a31\u0027:\n SipService: handle cross-domain authentication error\n" }, { "commit": "fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f", "tree": "45a5a3c1e1c844d58d63520b7ef1c3941d9ebed6", "parents": [ "fd144d7667d9d050b7fb158276ae4623d4ea83b8" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 02:16:32 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 02:16:32 2010 +0800" }, "message": "Fix build.\n\nChange-Id: Ie47b63f02764e8a1ca1d36f502b6b4134859ff0d\n" }, { "commit": "025a39af346f39743c1e384b9000ce1baee36562", "tree": "159ecd150d8ff4343ffb079eb400728aaba67c9c", "parents": [ "00a22064efef4f574e439079aae2deae1a087a31" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 23 11:35:05 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Tue Sep 28 01:52:42 2010 +0800" }, "message": "SIP: misc fixes\n\n+ check REQUEST_TERMINATED response on INVITE not CANCEL,\n+ check if a TransactionTerminatedEvent matches the ongoing transaction,\n+ add log to track SipConnection disconnect events.\n\nChange-Id: I28325be62ac44e4a7507d3c4b5b78b066c0ea2ad\n" }, { "commit": "00a22064efef4f574e439079aae2deae1a087a31", "tree": "13083f04f2bccaf3475b7f959c9d2d17d9775734", "parents": [ "4e9751f0770c8bfe6f7d57465cba754af5aa942b" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Sat Sep 25 23:21:23 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Mon Sep 27 10:45:24 2010 -0700" }, "message": "SipService: handle cross-domain authentication error\n\nand add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK\nDisconnectCause.\n\nhttp://b/issue?id\u003d3020185\n\nChange-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978\n" }, { "commit": "831f898756daef932ec2502d3965d4184217e726", "tree": "29720a9369e9cc94e5369fe18ba77ffe52a86135", "parents": [ "e6147f0c4bf8f6f1acf77831673cf5fe8fdd02c3", "8f767774230cba9b5cfc298f2e24972a79cd0182" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Sep 27 08:28:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 08:28:07 2010 -0700" }, "message": "am 8f767774: am 465618ed: Merge \"Use buffered output during packages.xml write\" into gingerbread\n\nMerge commit \u00278f767774230cba9b5cfc298f2e24972a79cd0182\u0027\n\n* commit \u00278f767774230cba9b5cfc298f2e24972a79cd0182\u0027:\n Use buffered output during packages.xml write\n" }, { "commit": "8f767774230cba9b5cfc298f2e24972a79cd0182", "tree": "7b6de28b5fadd9e366cd1db009bcabac7316a7e1", "parents": [ "514a455f2a63d6b3366b848a585d99e8680f69aa", "465618ed567c418442890fcf91b6ee361b22b88b" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Sep 27 08:15:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 27 08:15:57 2010 -0700" }, "message": "am 465618ed: Merge \"Use buffered output during packages.xml write\" into gingerbread\n\nMerge commit \u0027465618ed567c418442890fcf91b6ee361b22b88b\u0027 into gingerbread-plus-aosp\n\n* commit \u0027465618ed567c418442890fcf91b6ee361b22b88b\u0027:\n Use buffered output during packages.xml write\n" }, { "commit": "9f306d78a4adae80989eecb411af454225ff55a9", "tree": "8cc6e5af4c5c03aafa6c8b455d224d8d95731392", "parents": [ "d45a33554ca6c18ed81e45320998b9e4f4680379" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 26 11:19:47 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 26 11:19:47 2010 -0700" }, "message": "Use buffered output during packages.xml write\n\nFileOutputStream writes data one byte at a time, so use the\nBufferedOutputStream to wrap it and write once all the XML serialization\nis done.\n\nChange-Id: I419a6fcac2ac9a72a6cf41d4ca6e7ab6c7505618\n" }, { "commit": "22ba86cfafaedab650a3bb85417ed4d9c0c57675", "tree": "c2f8597c091e5d5508be2f0bbc705c69fb2148cb", "parents": [ "e9d51c4e887ed92698b308dbe9f6afb9a911de82", "ca25d2c31dc20f69597be8f34d6da9167d53b4d0" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Sep 24 16:14:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 16:14:08 2010 -0700" }, "message": "am ca25d2c3: am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.\n\nMerge commit \u0027ca25d2c31dc20f69597be8f34d6da9167d53b4d0\u0027\n\n* commit \u0027ca25d2c31dc20f69597be8f34d6da9167d53b4d0\u0027:\n Fixed some timeout and lock reentrance issues with broadcasts.\n" }, { "commit": "ca25d2c31dc20f69597be8f34d6da9167d53b4d0", "tree": "82094be6d67ccadc5552202cc9ca784b70d860f7", "parents": [ "ffe477263c503ce75d609d5360cf5e0c72a1363f", "4d94a766c3f7cf32dd3f5d543048fa801ad22813" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Sep 24 16:07:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 16:07:24 2010 -0700" }, "message": "am 4d94a766: Fixed some timeout and lock reentrance issues with broadcasts.\n\nMerge commit \u00274d94a766c3f7cf32dd3f5d543048fa801ad22813\u0027 into gingerbread-plus-aosp\n\n* commit \u00274d94a766c3f7cf32dd3f5d543048fa801ad22813\u0027:\n Fixed some timeout and lock reentrance issues with broadcasts.\n" }, { "commit": "4d94a766c3f7cf32dd3f5d543048fa801ad22813", "tree": "c3be1a7c71ee4a7969d079b6caaec5449b462284", "parents": [ "e78fc18b339bfe2915e61aef2013a17f0a9ede33" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Sep 23 11:33:28 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Sep 24 16:00:25 2010 -0700" }, "message": "Fixed some timeout and lock reentrance issues with broadcasts.\n\nWhen starting a broadcast, the ActivityManagerService posts a delayed\nBROADCAST_TIMEOUT_MSG to handle timeouts. If a premature timeout occurs,\nwe post a new BROADCAST_TIMEOUT_MSG to extend the timeout time for the\ncurrent receiver. However, if the current receiver does timeout, the\nmessage is consumed and no replacement is ever posted.\n\nTo fix the dropped timeouts, we track whether we have a pending broadcast\ntimeout message and setup a new one when we begin working on the next receiver.\n\nAs a last resort, performNextBroadcast contains code to detect whether\na broadcast appears to be hung (timeout handling failed). If so, it\ncalls broadcastTimeout to cause it to timeout immediately.\nHowever, performNextBroadcast is holding on to the ActivityManagerService\nlock while doing this but broadcastTimout expected to be called\nwhile the lock was not held since after updating the broadcast record state,\nit calls appNotResponding.\n\nTo fix the unintentended lock reentrance, changed broadcastTimeout to\nassume the lock is already held (and the callers ensure this) then\nadded code to perform the ANR asynchronously.\n\nRenamed a few methods to add \"Locked\" suffixes where appropriate and added\na few comments for tricky areas uncovered during review.\n\nChange-Id: I3cb5b06d6b6a4a338f32c0998db721f6acf3b082\n" }, { "commit": "405e012681aa563b1d7b66c671c90ed2deb26e41", "tree": "6687aa617fea8213148702c68e4da9083122eb0c", "parents": [ "3011b6617232d1ef7c1687d1db9e780fce978d30", "deaa8ff1b10d38add4f7c276e7be2ffc19359a14" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 15:58:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 15:58:25 2010 -0700" }, "message": "am deaa8ff1: am a7ef18fc: Merge \"Some debugging support.\" into gingerbread\n\nMerge commit \u0027deaa8ff1b10d38add4f7c276e7be2ffc19359a14\u0027\n\n* commit \u0027deaa8ff1b10d38add4f7c276e7be2ffc19359a14\u0027:\n Some debugging support.\n" }, { "commit": "3011b6617232d1ef7c1687d1db9e780fce978d30", "tree": "548e2f9a62ba24e5784175b4b947c0e75dc3fbef", "parents": [ "a7936a5d6d3c989055fffa74f6c5a4b4a8c83114", "d6d83279183db749de07bfdac79fe4180fc848d0" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 15:58:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 15:58:09 2010 -0700" }, "message": "am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling\n\nMerge commit \u0027d6d83279183db749de07bfdac79fe4180fc848d0\u0027\n\n* commit \u0027d6d83279183db749de07bfdac79fe4180fc848d0\u0027:\n SIP: longer timeout for making call, shorter for cancelling\n" }, { "commit": "deaa8ff1b10d38add4f7c276e7be2ffc19359a14", "tree": "711d6a68fb7f203e709d0407f15fcaa88d04ef49", "parents": [ "d6d83279183db749de07bfdac79fe4180fc848d0", "a7ef18fca50d0db99a161d8c7e2d8979f0445503" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 15:32:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 15:32:51 2010 -0700" }, "message": "am a7ef18fc: Merge \"Some debugging support.\" into gingerbread\n\nMerge commit \u0027a7ef18fca50d0db99a161d8c7e2d8979f0445503\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a7ef18fca50d0db99a161d8c7e2d8979f0445503\u0027:\n Some debugging support.\n" }, { "commit": "a7ef18fca50d0db99a161d8c7e2d8979f0445503", "tree": "32d3ee6fd26528d8c55e50144b17ae16be5fe6b5", "parents": [ "194bbcce9ba15634500f542b9ea017b2cf154b45", "f123e49bf0708719b51a7064ae134c097abe4a54" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 15:28:34 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 24 15:28:34 2010 -0700" }, "message": "Merge \"Some debugging support.\" into gingerbread" }, { "commit": "d6d83279183db749de07bfdac79fe4180fc848d0", "tree": "2cbc5865af610175b59ba3c6a9b2ef4cc3f63a17", "parents": [ "f3ae63eef2d7f55c793b2e76d1371f82cea0aab7", "194bbcce9ba15634500f542b9ea017b2cf154b45" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 15:19:05 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 15:19:05 2010 -0700" }, "message": "am 194bbcce: SIP: longer timeout for making call, shorter for cancelling\n\nMerge commit \u0027194bbcce9ba15634500f542b9ea017b2cf154b45\u0027 into gingerbread-plus-aosp\n\n* commit \u0027194bbcce9ba15634500f542b9ea017b2cf154b45\u0027:\n SIP: longer timeout for making call, shorter for cancelling\n" }, { "commit": "194bbcce9ba15634500f542b9ea017b2cf154b45", "tree": "d91fc2516d703c6d2b41178ae7e12d143128b0ac", "parents": [ "52f58e96a723a56e6619c237c814a07503745de9" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 03:01:25 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Sat Sep 25 06:09:00 2010 +0800" }, "message": "SIP: longer timeout for making call, shorter for cancelling\n\nhttp://b/3021865\n\nChange-Id: I354ebcc00f1ac68e4b7b466745c36aeb314f9138\n" }, { "commit": "f333123d50776507891b90a6eda4a3b8fa305bb6", "tree": "32f36bd788a96e89aa362f8252cbfbfb9e08cdfb", "parents": [ "369b43a935d08f1d9991a80a5859c65c394e9a02", "2d457a32a653ad06487cf0fef9ef400f3055099a" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Sep 24 14:32:21 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Sep 24 14:47:06 2010 -0700" }, "message": "resolved conflicts for merge of 2d457a32 to master\n\nChange-Id: I08fc7881010083407a102f471483cd6d5b9774b4\n" }, { "commit": "f123e49bf0708719b51a7064ae134c097abe4a54", "tree": "73c218afbbede522ca5c7d70b1399cf55609ca5d", "parents": [ "6d8fae722cfb2833dd542b2a5e613582a9096fc6" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 11:16:23 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 24 13:11:55 2010 -0700" }, "message": "Some debugging support.\n\n- New feature to \"am monitor\" to have it automatically launch\n gdbserv for you when a crash/ANR happens, and tell you how to\n run the client.\n\n- Update dumpstate to match new location of binder debug logs\n\n- Various commented out logs that are being used to track down\n issues.\n\nChange-Id: Ia5dd0cd2df983a1fc6be697642a4590aa02a26a5\n" }, { "commit": "2d457a32a653ad06487cf0fef9ef400f3055099a", "tree": "ddc2f5743ce0fa4bcf576eb3038167862fdd02b7", "parents": [ "f2af2d924df3d444c9a1bcac9f30e0d05ea5086d", "8f97fe551e7bd95abf395eed303b975eaa8f0158" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Sep 24 11:09:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 24 11:09:29 2010 -0700" }, "message": "am 8f97fe55: Merge \"Move long Connectivity tasks to handler thread.\" into gingerbread\n\nMerge commit \u00278f97fe551e7bd95abf395eed303b975eaa8f0158\u0027 into gingerbread-plus-aosp\n\n* commit \u00278f97fe551e7bd95abf395eed303b975eaa8f0158\u0027:\n Move long Connectivity tasks to handler thread.\n" }, { "commit": "8f97fe551e7bd95abf395eed303b975eaa8f0158", "tree": "c2e51b493755d421221a375e509f14bc659317f5", "parents": [ "4318ab058629b701e225bb7ead9dd2b229c9354b", "8dcc28be065bb5997ed97d58c9592324b891023a" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Sep 24 10:42:46 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 24 10:42:46 2010 -0700" }, "message": "Merge \"Move long Connectivity tasks to handler thread.\" into gingerbread" }, { "commit": "50d9f32506d1cf3f8b21caa1f34780db6b80abd5", "tree": "ff4740715e7a8ce1b5c7a926b981550f796be127", "parents": [ "22a62d1342a973ed7d38bb7d1751a472365e2897", "33460d836fc2a062290d72ebcfb73af51ffa9c36" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Sep 23 22:50:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 22:50:10 2010 -0700" }, "message": "am 33460d83: am 658bec95: SDP: remove dead code.\n\nMerge commit \u002733460d836fc2a062290d72ebcfb73af51ffa9c36\u0027\n\n* commit \u002733460d836fc2a062290d72ebcfb73af51ffa9c36\u0027:\n SDP: remove dead code.\n" }, { "commit": "22a62d1342a973ed7d38bb7d1751a472365e2897", "tree": "f9033e819ded5b8e7f5eed79a68848fd1d8b835c", "parents": [ "2184624db15088bcd230d1e8da1ad7d9bca91c90", "ee813baee49c94f87916d6a179bd5d16837e228a" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 13:45:43 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Sep 24 13:45:43 2010 +0800" }, "message": "resolved conflicts for merge of ee813bae to master\n\nChange-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68\n" }, { "commit": "77cf6f29f97f9ef6213a0a9b8b6ec2215fff20ff", "tree": "d1ba109d5715de471708206af10928c2678a6aa4", "parents": [ "01a411326e8d3370643ca181966ae3214ea700fd", "982c07e908c4cb66db224ccfd0810bf8bd449835" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 21:40:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 21:40:24 2010 -0700" }, "message": "am 982c07e9: am cbb7b05e: Merge \"Crash apps when they provide bad notifications instead of crashing the system process.\" into gingerbread\n\nMerge commit \u0027982c07e908c4cb66db224ccfd0810bf8bd449835\u0027\n\n* commit \u0027982c07e908c4cb66db224ccfd0810bf8bd449835\u0027:\n Crash apps when they provide bad notifications instead of crashing the system process.\n" }, { "commit": "01a411326e8d3370643ca181966ae3214ea700fd", "tree": "c4df49b8c36077bcf93763f67015c9b03d0f6113", "parents": [ "0eb74130ac1fa7e5dd1c943c5a0a119053f23408", "1e2df14a85f098d63b618531db733a21429d4037" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 23 21:39:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 21:39:49 2010 -0700" }, "message": "am 1e2df14a: am f43ac911: Merge \"Handle OPTIONS requests from SIP servers.\" into gingerbread\n\nMerge commit \u00271e2df14a85f098d63b618531db733a21429d4037\u0027\n\n* commit \u00271e2df14a85f098d63b618531db733a21429d4037\u0027:\n Handle OPTIONS requests from SIP servers.\n" }, { "commit": "846df9f5171c4ef32f038cca651b6b9c0b6c3083", "tree": "e14bba46d6af691a2832907f6b3f64caac3c736c", "parents": [ "fea28c9367c9d1a48ae56c554dd51a428f2d1b03", "8952a4488e81205e3013b6b456dec503e05eebd0" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 19:08:08 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 20:33:19 2010 -0700" }, "message": "resolved conflicts for merge of 8952a448 to master\n\nChange-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b\n" }, { "commit": "33460d836fc2a062290d72ebcfb73af51ffa9c36", "tree": "2db05ebf2b0af132c8af7a89691f2589ac32be2e", "parents": [ "ee813baee49c94f87916d6a179bd5d16837e228a", "658bec956785e074edc4f6c9fe739c366e37be33" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Sep 23 19:22:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 19:22:12 2010 -0700" }, "message": "am 658bec95: SDP: remove dead code.\n\nMerge commit \u0027658bec956785e074edc4f6c9fe739c366e37be33\u0027 into gingerbread-plus-aosp\n\n* commit \u0027658bec956785e074edc4f6c9fe739c366e37be33\u0027:\n SDP: remove dead code.\n" }, { "commit": "658bec956785e074edc4f6c9fe739c366e37be33", "tree": "744b92adc28b04e5429b6856d6bfb749b3e09fbe", "parents": [ "84a357bb6a8005e1c5e924e96a8ecf310e77c47c" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Thu Sep 23 17:11:02 2010 +0800" }, "committer": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Fri Sep 24 10:17:42 2010 +0800" }, "message": "SDP: remove dead code.\n\nChange-Id: I2a5764a2b9cabc54b0ac18666e494c1cb39c4e9b\n" }, { "commit": "ee813baee49c94f87916d6a179bd5d16837e228a", "tree": "3ec87c6b2ae82d2598d85b468990ab010ba63f92", "parents": [ "4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e", "84a357bb6a8005e1c5e924e96a8ecf310e77c47c" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 23 19:10:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 19:10:49 2010 -0700" }, "message": "am 84a357bb: Refactoring SIP classes to get ready for API review.\n\nMerge commit \u002784a357bb6a8005e1c5e924e96a8ecf310e77c47c\u0027 into gingerbread-plus-aosp\n\n* commit \u002784a357bb6a8005e1c5e924e96a8ecf310e77c47c\u0027:\n Refactoring SIP classes to get ready for API review.\n" }, { "commit": "84a357bb6a8005e1c5e924e96a8ecf310e77c47c", "tree": "7562523105a05d9ac3ca03b333c1aa70e08a3b7b", "parents": [ "524a6d8e9bb4df9cec0520ac1d9733642b13e76f" ], "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 Sep 24 10:06:59 2010 +0800" }, "message": "Refactoring SIP classes to get ready for API review.\n\n+ replace SipAudioCall and its Listener interfaces with real implementations,\n + remove SipAudioCallImpl.java, most of it is has become part of SipAudioCall,\n+ add SipSession and its Listener classes to wrap ISipSession and ISipSessionListener,\n+ move SipSessionState to SipSession.State,\n+ make SipManager keep context and remove the context argument from many methods of its,\n+ rename SipManager.getInstance() to newInstance(),\n+ rename constant names for action strings and extra keys to follow conventions,\n+ set thread names for debugging purpose.\n\nChange-Id: Ie1790dc0e8f49c06c7fc80d33fec0f673a9c3044\n" }, { "commit": "982c07e908c4cb66db224ccfd0810bf8bd449835", "tree": "77dca2699bb14a30155083611f77430f558011b3", "parents": [ "1e2df14a85f098d63b618531db733a21429d4037", "cbb7b05e35368b104c27089f5f16640680f567c2" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 16:55:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 16:55:22 2010 -0700" }, "message": "am cbb7b05e: Merge \"Crash apps when they provide bad notifications instead of crashing the system process.\" into gingerbread\n\nMerge commit \u0027cbb7b05e35368b104c27089f5f16640680f567c2\u0027 into gingerbread-plus-aosp\n\n* commit \u0027cbb7b05e35368b104c27089f5f16640680f567c2\u0027:\n Crash apps when they provide bad notifications instead of crashing the system process.\n" }, { "commit": "cbb7b05e35368b104c27089f5f16640680f567c2", "tree": "8db251a8b7e45f5616d8c47fa5fadcad9d7c2f3e", "parents": [ "f43ac911379c15b6a1a240a931b0f3cbfb2fae53", "eaa0718780a29df8fbe42c59beecee5557fdf785" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 16:52:28 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 16:52:28 2010 -0700" }, "message": "Merge \"Crash apps when they provide bad notifications instead of crashing the system process.\" into gingerbread" }, { "commit": "eaa0718780a29df8fbe42c59beecee5557fdf785", "tree": "b4caca99201bbcff4799c0f1a542ab926de5fc11", "parents": [ "f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 16:49:20 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu Sep 23 16:49:20 2010 -0700" }, "message": "Crash apps when they provide bad notifications instead of crashing the system process.\n\nBug: 2958415\nChange-Id: I9cbef340fb20a64eca8493950b814399c26ce197\n" }, { "commit": "8dcc28be065bb5997ed97d58c9592324b891023a", "tree": "47debb7da669c8c41cfd24841533041c162d6a4a", "parents": [ "49a8bbf4eacbf0bde71bab05be0ab40488df109c" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 10:05:56 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 16:43:21 2010 -0700" }, "message": "Move long Connectivity tasks to handler thread.\n\nReduce ANR potential.\nbug:2942829\n\nChange-Id: I21610b462d5ab91821015cd16eecd86d2c0580d1\n" }, { "commit": "1e2df14a85f098d63b618531db733a21429d4037", "tree": "406d6784efea98a53f1ff0b5e3cebd5b2b601631", "parents": [ "8952a4488e81205e3013b6b456dec503e05eebd0", "f43ac911379c15b6a1a240a931b0f3cbfb2fae53" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 23 16:40:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 16:40:09 2010 -0700" }, "message": "am f43ac911: Merge \"Handle OPTIONS requests from SIP servers.\" into gingerbread\n\nMerge commit \u0027f43ac911379c15b6a1a240a931b0f3cbfb2fae53\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f43ac911379c15b6a1a240a931b0f3cbfb2fae53\u0027:\n Handle OPTIONS requests from SIP servers.\n" }, { "commit": "f43ac911379c15b6a1a240a931b0f3cbfb2fae53", "tree": "9928ffea9030f04b27e1a67258d9973309a0057d", "parents": [ "287952c35e148811c106bc0f5036eabf20f71562", "0b4d2fb11405e2e785ec30cabe7bb311c654c0d2" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 23 16:36:18 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 16:36:18 2010 -0700" }, "message": "Merge \"Handle OPTIONS requests from SIP servers.\" into gingerbread" }, { "commit": "8952a4488e81205e3013b6b456dec503e05eebd0", "tree": "44370605866624d20b30ff4a167869ce9fa296cd", "parents": [ "00cb6417dcaea2b1d02f47b3afb60c435712161b", "287952c35e148811c106bc0f5036eabf20f71562" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 16:04:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 16:04:23 2010 -0700" }, "message": "am 287952c3: Fix issue #3022508: Crash during media scan\n\nMerge commit \u0027287952c35e148811c106bc0f5036eabf20f71562\u0027 into gingerbread-plus-aosp\n\n* commit \u0027287952c35e148811c106bc0f5036eabf20f71562\u0027:\n Fix issue #3022508: Crash during media scan\n" }, { "commit": "287952c35e148811c106bc0f5036eabf20f71562", "tree": "baf7ae1e8a086c6e14138536caa925b2a793ce69", "parents": [ "f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 22 22:34:31 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 15:59:28 2010 -0700" }, "message": "Fix issue #3022508: Crash during media scan\n\nDon\u0027t kill processes for excessive wake lock use, even if they\nare in the background, as long as they have running services.\n\nAlso fix some problems with this, such as not noting the kill\nin battery stats.\n\nAnd add killing of processes for cpu usage as well, along with\nsome optimizations to computing CPU usage.\n\nAnd fix BatteryWaster to be better behaving for testing these\ncases.\n\nAdd new \"monitor\" command to am to watch as the activity manager\ndoes stuff (so we can catch things at the point of ANR).\n\nFinally some miscellaneous debug output for the stuff here, as\nwell as in progress debugging of an ANR.\n\nChange-Id: Ib32f55ca50fb7486b4be4eb5e695f8f60c882cd1\n" }, { "commit": "eecb5b9873bf2c2e61929a35c2762f03dd2bfeb0", "tree": "b35beb1798596e811b443eabc7410ee5ed179448", "parents": [ "6f27ab8bd4aca5a43f6bf93cd68c43dde825bfa1", "2983e038d189a257f1e5abb9c120bd1feb253773" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 14:20:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 14:20:48 2010 -0700" }, "message": "am 2983e038: am 045398e6: Merge \"Fix a deadlock I ran into.\" into gingerbread\n\nMerge commit \u00272983e038d189a257f1e5abb9c120bd1feb253773\u0027\n\n* commit \u00272983e038d189a257f1e5abb9c120bd1feb253773\u0027:\n Fix a deadlock I ran into.\n" }, { "commit": "2983e038d189a257f1e5abb9c120bd1feb253773", "tree": "28f3aa4fd25201f07bdb9993777f47dafe2e0de6", "parents": [ "9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7", "045398e6243fa4e83fb6435df4e8ffc6a7487a70" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 14:17:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 14:17:54 2010 -0700" }, "message": "am 045398e6: Merge \"Fix a deadlock I ran into.\" into gingerbread\n\nMerge commit \u0027045398e6243fa4e83fb6435df4e8ffc6a7487a70\u0027 into gingerbread-plus-aosp\n\n* commit \u0027045398e6243fa4e83fb6435df4e8ffc6a7487a70\u0027:\n Fix a deadlock I ran into.\n" }, { "commit": "045398e6243fa4e83fb6435df4e8ffc6a7487a70", "tree": "350f47f38b2d20d8ae288ea7303e17116ff89a86", "parents": [ "37cedce14bc0e68e8bf27c2cecb181728226e6ed", "0674069aa4fb75064d4617466cb625699c44e04d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Sep 23 14:15:45 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 14:15:45 2010 -0700" }, "message": "Merge \"Fix a deadlock I ran into.\" into gingerbread" }, { "commit": "c6c9a7df582f68a924238592573a45674d3fd0ce", "tree": "3a1dc7283627fae63d32fc35ac833a9628f4bf18", "parents": [ "9b7ff13bfbe9a4e95184418f99379ec61d8b8e5f", "5ee89800bee7c6c755778795a536e0e2f12b85ff" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu Sep 23 11:33:49 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 11:33:49 2010 -0700" }, "message": "Merge \"Add Wifi Protected Setup support\"" }, { "commit": "0b4d2fb11405e2e785ec30cabe7bb311c654c0d2", "tree": "ee8de4fcee755068a9c3ead8f424b3a22454c996", "parents": [ "0b7d6de1559a4a78af76ab501e0a15afc396c2b9" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Sep 23 23:27:00 2010 +0800" }, "committer": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Fri Sep 24 00:53:10 2010 +0800" }, "message": "Handle OPTIONS requests from SIP servers.\n\nChange-Id: I849d5ea4c4c56a06d25ccdc6b959274c59c47200\n" }, { "commit": "35dcaece115e2f8e227c2e579d38c42b65ead85e", "tree": "f82fc685865c90dd152858db15b5e08c4c0ba18a", "parents": [ "27a835f8d8faf962d978cf7e1e3b562fa0715d60", "9c38a6dc13ba55fccb9c66f347307a1b4ae68105" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 09:40:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 09:40:20 2010 -0700" }, "message": "am 9c38a6dc: am e87ebb08: Merge \"Cleanup Netd to prevent getting hung.\" into gingerbread\n\nMerge commit \u00279c38a6dc13ba55fccb9c66f347307a1b4ae68105\u0027\n\n* commit \u00279c38a6dc13ba55fccb9c66f347307a1b4ae68105\u0027:\n Cleanup Netd to prevent getting hung.\n" }, { "commit": "5ee89800bee7c6c755778795a536e0e2f12b85ff", "tree": "383d40f410fe859f218456e8aa006dd090fadc0b", "parents": [ "e59c69dc3b1f2fa206aa22698c4aa31498438a5e" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu Sep 16 17:53:34 2010 -0700" }, "committer": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu Sep 23 09:13:34 2010 -0700" }, "message": "Add Wifi Protected Setup support\n\nAdd WPS PBC and WPS pin method support with pin obtained\nfrom AP\n\nBug: 2277571\n\nChange-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610\n" }, { "commit": "9c38a6dc13ba55fccb9c66f347307a1b4ae68105", "tree": "65d8a779716c89a9520dae82a5c43e6a95d8f2de", "parents": [ "c0f2d9522ea5891352e219c4ca8f85ac59287604", "e87ebb08fba88628a65eae88fc5bc7911cfa7d97" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 08:48:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 23 08:48:14 2010 -0700" }, "message": "am e87ebb08: Merge \"Cleanup Netd to prevent getting hung.\" into gingerbread\n\nMerge commit \u0027e87ebb08fba88628a65eae88fc5bc7911cfa7d97\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e87ebb08fba88628a65eae88fc5bc7911cfa7d97\u0027:\n Cleanup Netd to prevent getting hung.\n" }, { "commit": "e87ebb08fba88628a65eae88fc5bc7911cfa7d97", "tree": "d4a26347541897b6c0477afebadcbe7649549c71", "parents": [ "0b7d6de1559a4a78af76ab501e0a15afc396c2b9", "e5c3afb29241fd3faae309f973645d7f6a7ed111" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Sep 23 08:41:21 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 23 08:41:21 2010 -0700" }, "message": "Merge \"Cleanup Netd to prevent getting hung.\" into gingerbread" }, { "commit": "ab751aa085433e9f735d2e7603459c6c7e9d2fb0", "tree": "ad5d37b0f1cad3297adef5b93d43e52c4a5b9381", "parents": [ "6b762aaa8d24e9dcd91c69eaced417f688894add" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Tue Sep 14 19:17:36 2010 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Thu Sep 23 16:25:07 2010 +0900" }, "message": "Add methods for managing subtypes\n\n- added showInputMethodSubtypePicker to public API\n-- show the selector dialog for subtypes\n- added getter, setter and event handler to InputMethodManagerService\n- extract InputMethodSubtype to the top level class for using it in aidl\n- TODO: make an enabler for input method subtypes\n- TODO: handle the event of changing an input method subtype in LatinIME\n\nChange-Id: I49f8c6675ac4b06511635d14a37bd398738eff33\n" }, { "commit": "0674069aa4fb75064d4617466cb625699c44e04d", "tree": "fa2dcbc2ffe585c4b3c88706461b43fbe447fe99", "parents": [ "dd62a056b8d746c620218a68bb476382f02d8174" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 22 22:46:21 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 22 22:46:21 2010 -0700" }, "message": "Fix a deadlock I ran into.\n\nActivity manager was calling into the backup service (and other\nthings) with its lock held.\n\nChange-Id: Id55093e09cc5fe81b73b85968184816d956e0ae8\n" }, { "commit": "40d073cf87b6339810d5e66f2ce9dd0f3af57ef1", "tree": "fb8ac3dfbdf4dd223b76a4488bbf61d1c57e9408", "parents": [ "5eb22e2ce1cb46d18ce0c8e68e10a7f64bed01ea", "1c3846979a657e4e2b1f7864fa6defb65b3bbf42" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Wed Sep 22 18:37:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 18:37:11 2010 -0700" }, "message": "am 1c384697: am 89647b11: Don\\\u0027t do single byte writes in DropBoxManagerService\n\nMerge commit \u00271c3846979a657e4e2b1f7864fa6defb65b3bbf42\u0027\n\n* commit \u00271c3846979a657e4e2b1f7864fa6defb65b3bbf42\u0027:\n Don\u0027t do single byte writes in DropBoxManagerService\n" }, { "commit": "1c3846979a657e4e2b1f7864fa6defb65b3bbf42", "tree": "80ec331b8b4000bd8748fc4736a6ac7f7973a37d", "parents": [ "19c4b29d46aece70dbe532ba9078c904fbc62502", "89647b1172cdf40a3681922150122b0bd2ea83f1" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Wed Sep 22 18:33:46 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 18:33:46 2010 -0700" }, "message": "am 89647b11: Don\\\u0027t do single byte writes in DropBoxManagerService\n\nMerge commit \u002789647b1172cdf40a3681922150122b0bd2ea83f1\u0027 into gingerbread-plus-aosp\n\n* commit \u002789647b1172cdf40a3681922150122b0bd2ea83f1\u0027:\n Don\u0027t do single byte writes in DropBoxManagerService\n" }, { "commit": "89647b1172cdf40a3681922150122b0bd2ea83f1", "tree": "02baee4ef6b06306c868eb53c3699bb9256822cd", "parents": [ "8310b42fbc086b0f05fc8ef45ac34c7e099c485e" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Wed Sep 22 17:49:16 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Wed Sep 22 17:49:16 2010 -0700" }, "message": "Don\u0027t do single byte writes in DropBoxManagerService\n\nBug: 3018772\nChange-Id: I6990041f059aeb2a4c29e59b1a3d78d19bf9b02f\n" }, { "commit": "483c4b1d1fca7695a3af8d0ad8402f9f452ac41b", "tree": "07118c71c59376787542fd69de7c8d010f7a3879", "parents": [ "c188b3d0773a00929178f124ecac93457ddd1422", "abdd2c7f03651e95424133c2be948238c6dc7bf6" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Wed Sep 22 17:06:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 17:06:48 2010 -0700" }, "message": "am abdd2c7f: am 95f600b5: Merge \"Fix NPE in PowerManagerService on boot, if some settings are corrupted.\" into gingerbread\n\nMerge commit \u0027abdd2c7f03651e95424133c2be948238c6dc7bf6\u0027\n\n* commit \u0027abdd2c7f03651e95424133c2be948238c6dc7bf6\u0027:\n Fix NPE in PowerManagerService on boot, if some settings are corrupted.\n" }, { "commit": "e5c3afb29241fd3faae309f973645d7f6a7ed111", "tree": "8ab1130fe1363493df7df19d938c71a12b9ecd82", "parents": [ "b2044da3f9f9ad74f0dffd5ae024e558f8a9a89a" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Wed Sep 22 14:32:35 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Wed Sep 22 16:43:23 2010 -0700" }, "message": "Cleanup Netd to prevent getting hung.\n\nIf the sending of the command fails we should note it and not wait forever\nfor the response.\n\nWe should also not say we\u0027re ready until we actually are.\n\nbug:2993205\nChange-Id: I380f0312ac4693ad184a526b330fdfa23f6ac558\n" }, { "commit": "abdd2c7f03651e95424133c2be948238c6dc7bf6", "tree": "7b524ddc70900bdbd1264ac3c76ec2f2606e7d51", "parents": [ "11746caaa852984ff186bf5b8807e2c14cd7c1bc", "95f600b55f617fcc94985fee07927aff48160362" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Wed Sep 22 16:35:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 16:35:11 2010 -0700" }, "message": "am 95f600b5: Merge \"Fix NPE in PowerManagerService on boot, if some settings are corrupted.\" into gingerbread\n\nMerge commit \u002795f600b55f617fcc94985fee07927aff48160362\u0027 into gingerbread-plus-aosp\n\n* commit \u002795f600b55f617fcc94985fee07927aff48160362\u0027:\n Fix NPE in PowerManagerService on boot, if some settings are corrupted.\n" }, { "commit": "8b61983ee81f4819319d22e05ddf473a9c64be77", "tree": "3e84806bdbd27b8b3532afee1f5a908165a8e142", "parents": [ "4374b23d6be406710b91be746229e6c548613410" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Wed Sep 22 16:11:59 2010 -0700" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Wed Sep 22 16:11:59 2010 -0700" }, "message": "Fix NPE in PowerManagerService on boot, if some settings are corrupted.\n\nBug: 2715038\nChange-Id: I10c08b359ff3cde732c37eb6dff0877cdb021cd9\n" }, { "commit": "00ec86940370bdeb4b255fd5f8bb2e1da9c8ac17", "tree": "d1b8e6d460968ecdf0297fc2f63b4a00cd3e8137", "parents": [ "bb205456698053b1f77891ee1a94e3ddebee1f10", "6cec0dc0e47459553a3a6572abd28a8e49ce5875" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Sep 22 10:01:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 10:01:48 2010 -0700" }, "message": "am 6cec0dc0: am 32371695: Merge \"GpsLocationProvider: Fix race condition while bringing up APN for SUPL.\" into gingerbread\n\nMerge commit \u00276cec0dc0e47459553a3a6572abd28a8e49ce5875\u0027\n\n* commit \u00276cec0dc0e47459553a3a6572abd28a8e49ce5875\u0027:\n GpsLocationProvider: Fix race condition while bringing up APN for SUPL.\n" }, { "commit": "6cec0dc0e47459553a3a6572abd28a8e49ce5875", "tree": "84c86882bcb38ea40ab3e9d7b234ff9aa5482de8", "parents": [ "8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a", "32371695daf917701f78a86224b58bfda0381e27" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Sep 22 09:57:50 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 09:57:50 2010 -0700" }, "message": "am 32371695: Merge \"GpsLocationProvider: Fix race condition while bringing up APN for SUPL.\" into gingerbread\n\nMerge commit \u002732371695daf917701f78a86224b58bfda0381e27\u0027 into gingerbread-plus-aosp\n\n* commit \u002732371695daf917701f78a86224b58bfda0381e27\u0027:\n GpsLocationProvider: Fix race condition while bringing up APN for SUPL.\n" }, { "commit": "32371695daf917701f78a86224b58bfda0381e27", "tree": "6b45e1b73731bfa3a1f50e5bf126dcf6076aa47c", "parents": [ "ca54cdaf66449cd4f81d8887ec603392b8f3779c", "2acfd34ccbd39258422333c9c66c586297c97683" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Sep 22 09:54:53 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 22 09:54:53 2010 -0700" }, "message": "Merge \"GpsLocationProvider: Fix race condition while bringing up APN for SUPL.\" into gingerbread" }, { "commit": "bb205456698053b1f77891ee1a94e3ddebee1f10", "tree": "028169bdf2bee47ea6f0547a2e0f906e034e5a8f", "parents": [ "48ff0daae3db57f8d1cb7bff8de299b92e386cd5", "8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Sep 22 09:45:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 09:45:41 2010 -0700" }, "message": "am 8f05b5c8: am ca54cdaf: Merge \"SipService: fix thread/socket leak\" into gingerbread\n\nMerge commit \u00278f05b5c8d3c310bc70a3eff04911ea9cf4eba87a\u0027\n\n* commit \u00278f05b5c8d3c310bc70a3eff04911ea9cf4eba87a\u0027:\n SipService: fix thread/socket leak\n" }, { "commit": "8f05b5c8d3c310bc70a3eff04911ea9cf4eba87a", "tree": "bfbf1d1f5e0cf4d7a5394606b8545fc82c68dafc", "parents": [ "b35f36f08ddc59fb0e264aff9de4d465321b26ca", "ca54cdaf66449cd4f81d8887ec603392b8f3779c" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Sep 22 09:41:17 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 22 09:41:17 2010 -0700" }, "message": "am ca54cdaf: Merge \"SipService: fix thread/socket leak\" into gingerbread\n\nMerge commit \u0027ca54cdaf66449cd4f81d8887ec603392b8f3779c\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ca54cdaf66449cd4f81d8887ec603392b8f3779c\u0027:\n SipService: fix thread/socket leak\n" }, { "commit": "ca54cdaf66449cd4f81d8887ec603392b8f3779c", "tree": "53b1f2801b6f8915675589a751d1e661251f940f", "parents": [ "4f294558aa23bc155988838ef153dca731efe707", "fc51f2c972c7a3a829f556c4c19f16c60c87d7e7" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Sep 22 09:35:35 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 22 09:35:35 2010 -0700" }, "message": "Merge \"SipService: fix thread/socket leak\" into gingerbread" }, { "commit": "2acfd34ccbd39258422333c9c66c586297c97683", "tree": "bc763f83b431bdb69f7fb068fbced751cb661664", "parents": [ "dd62a056b8d746c620218a68bb476382f02d8174" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Sep 22 12:13:39 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed Sep 22 12:22:26 2010 -0400" }, "message": "GpsLocationProvider: Fix race condition while bringing up APN for SUPL.\n\nIf handleUpdateNetworkState() is called before\nConnectivityManager.startUsingNetworkFeature() returns, then we will not\ncall native_agps_data_conn_open() to inform the GPS that the APN is up.\nSo we now set mAGpsDataConnectionState to AGPS_DATA_CONNECTION_OPENING\nbefore calling ConnectivityManager.startUsingNetworkFeature() to avoid\nthis problem.\n\nChange-Id: I5e1597d6494dc8ab68e608911c546a7a04f2ea07\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "fc51f2c972c7a3a829f556c4c19f16c60c87d7e7", "tree": "6bbb492a344fb639bcbd9ca0fc0f8d783fdabc27", "parents": [ "8544560ccc43de7ff49d91866f461f5572f0b147" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Sep 22 23:51:57 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 23 00:02:34 2010 +0800" }, "message": "SipService: fix thread/socket leak\n\nShould call SipSessionGroup.close() instead of closeNotToReceiveCalls() to stop\nthe SIP stack (which will stop the MessageProcessor thread and close its socket).\n\nMight be related to ANR\u0027s reported by:\nhttp://b/issue?id\u003d3021924\nhttp://b/issue?id\u003d3021927\n\nChange-Id: I4ead1d81fc9abac983f5753b825d20bc1cc79866\n" }, { "commit": "adaba84ad76f70d833e140d5c28a0de58c8f19d2", "tree": "108753beb7101d987e7f83ee777c8bdf49087ade", "parents": [ "1198ac4ac6f27cd59db9dbbe369748f38b64731f", "625ac271f80777668f832a344486a6fcdc06d0ae" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 21 22:17:52 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 21 22:17:52 2010 -0700" }, "message": "Merge \"Work on fragments in layouts.\"" }, { "commit": "625ac271f80777668f832a344486a6fcdc06d0ae", "tree": "d9646d9a22d407ef7745cc39fa161488433a8e6e", "parents": [ "6cf08937a11851403e63908b937c9de0dff5a8cf" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 17 18:29:22 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 21 22:08:50 2010 -0700" }, "message": "Work on fragments in layouts.\n\n- Change semantics if IDs associated with these fragments, to\n work correctly when placed in a container. If the container\n has an ID or you have supplied a tag, the fragment\u0027s ID is\n optional.\n\n- To do this, there is a new LayoutInflater API that allows code\n creating views to access the parent container that view will\n be in.\n\n- Fix issues with state management around these fragments. Now\n correctly retains state when switching to a layout that doesn\u0027t\n include the fragment.\n\nAlso:\n\n- Add new simple list layouts for items that want to show an\n activated state.\n- Add new Activity.dump() that can be invoked with adb shell\n dumpsys; the default implementation dumps fragment state.\n\nChange-Id: I192f35e3ea8c53fbd26cf909095f2a994abfc1b6\n" }, { "commit": "a7553c5e330a6f743f6a62d610373214b1001663", "tree": "41d65cd070d4b8262af19c3aac553a3609f5f780", "parents": [ "6cf08937a11851403e63908b937c9de0dff5a8cf", "77d9a5a55fa52074f18012cf997854a82500fd59" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Sep 21 20:21:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 20:21:27 2010 -0700" }, "message": "am 77d9a5a5: am 98bcb41d: Merge \"Fix race reading input configuration during system startup.\" into gingerbread\n\nMerge commit \u002777d9a5a55fa52074f18012cf997854a82500fd59\u0027\n\n* commit \u002777d9a5a55fa52074f18012cf997854a82500fd59\u0027:\n Fix race reading input configuration during system startup.\n" }, { "commit": "77d9a5a55fa52074f18012cf997854a82500fd59", "tree": "c88e74f67dced24e7bd1af3f5abf2abebbc216ae", "parents": [ "770a681b2f5b00e699920317bff04a24676ae143", "98bcb41d9b434bbe486b33681d9d091d6072d1f1" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Sep 21 18:39:39 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 18:39:39 2010 -0700" }, "message": "am 98bcb41d: Merge \"Fix race reading input configuration during system startup.\" into gingerbread\n\nMerge commit \u002798bcb41d9b434bbe486b33681d9d091d6072d1f1\u0027 into gingerbread-plus-aosp\n\n* commit \u002798bcb41d9b434bbe486b33681d9d091d6072d1f1\u0027:\n Fix race reading input configuration during system startup.\n" }, { "commit": "57c59376f4432bdb285acb242bd9b3bec81f6bca", "tree": "ea68bafcc2b79df9129ff83e2225efc808e8c6bb", "parents": [ "a6dc4699222a484222d1c54d5319f302a02e406b" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Sep 21 18:22:55 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Sep 21 18:22:55 2010 -0700" }, "message": "Fix race reading input configuration during system startup.\n\nChange-Id: I9360c4ec5c29937fce06b44ffc71fca58c8b3d5f\n" }, { "commit": "d404a9be14715efdea447ec4ed3e7677ab72e641", "tree": "d966e1cfdefc94112df84a5e1f6f76073186407c", "parents": [ "b745ec954272a3c09cca354ad84e2e08b54c8544", "0859b764719735e4b9aea5df6051ece13e212841" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Tue Sep 21 12:59:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 12:59:34 2010 -0700" }, "message": "am 0859b764: Make wifi scan async. (don\\\u0027t auto-merge)\n\nMerge commit \u00270859b764719735e4b9aea5df6051ece13e212841\u0027 into gingerbread-plus-aosp\n\n* commit \u00270859b764719735e4b9aea5df6051ece13e212841\u0027:\n Make wifi scan async. (don\u0027t auto-merge)\n" }, { "commit": "0859b764719735e4b9aea5df6051ece13e212841", "tree": "da697b11222755e32a9abbfadb72ef6dfa9981db", "parents": [ "173ea0912af296c6e80d14b764046534b316d21f" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Mon Sep 06 15:34:50 2010 -0700" }, "committer": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Tue Sep 21 12:38:09 2010 -0700" }, "message": "Make wifi scan async. (don\u0027t auto-merge)\n\nWhen an entity (NLP for example) acquires\na WifiLock and initiates a scan, scan can\nget blocked until driver starts.\n\nscan returns no useful info, scan results\nare broadcast when obtained.\n\nBug: 2964633\nChange-Id: Iaefc32bb6b82f0718285a18ac600e6bbbb096e77\n" }, { "commit": "19531dacfee9fcfd527ab04223fb91ae019ec05c", "tree": "4c53ab894a11dae00a78781ae4c8d780fd266f4d", "parents": [ "5e6ec0aeea7ec39cdf1f622da2da53a95eaea5fa", "f532e9583ec0111b1c198e895ed1b2fd83c3d5cf" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue Sep 21 10:44:26 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 10:44:26 2010 -0700" }, "message": "am f532e958: am 6548f395: Merge \"Inet status bug fix\" into gingerbread\n\nMerge commit \u0027f532e9583ec0111b1c198e895ed1b2fd83c3d5cf\u0027\n\n* commit \u0027f532e9583ec0111b1c198e895ed1b2fd83c3d5cf\u0027:\n Inet status bug fix\n" }, { "commit": "5e6ec0aeea7ec39cdf1f622da2da53a95eaea5fa", "tree": "d1c7a69439def24b2ec163c4cbe7b9a84cc1164d", "parents": [ "cef2590bda374ef90caba770c2d97b82202f16ef", "e665698ffe539bdb99122dcf83e19844ebea92b8" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 21 10:44:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 10:44:13 2010 -0700" }, "message": "am e665698f: am 6f33b65f: Merge \"Fix issue #2999757: \"Application Redirected\" dialogue showing up erratically\" into gingerbread\n\nMerge commit \u0027e665698ffe539bdb99122dcf83e19844ebea92b8\u0027\n\n* commit \u0027e665698ffe539bdb99122dcf83e19844ebea92b8\u0027:\n Fix issue #2999757: \"Application Redirected\" dialogue showing up erratically\n" }, { "commit": "1bbef40e406814b327e7a987edf9cb56180c3512", "tree": "76de345b34ff0b466ec89f824725b1f9e81aa1b9", "parents": [ "6b15ecf2787dd0fa8e119785495112a84c30afe0", "2d19a676860bf773c984315fe03d9568913f9314" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 21 10:43:36 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 10:43:36 2010 -0700" }, "message": "am 2d19a676: am 51aaab3d: Merge \"Fix #2999258: ANR in Settings after every reboot\" into gingerbread\n\nMerge commit \u00272d19a676860bf773c984315fe03d9568913f9314\u0027\n\n* commit \u00272d19a676860bf773c984315fe03d9568913f9314\u0027:\n Fix #2999258: ANR in Settings after every reboot\n" }, { "commit": "4524c6244884d4b3aff0b6b00372427b6a42ebd8", "tree": "4d104e141465a60cffe0a713fc4e04e779c64e9b", "parents": [ "141e00c212ab1cd9d6def55edadc3e709d88f9d5", "749e6bc5cc429b4db2353c264413f229f2694aa6" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue Sep 21 10:27:59 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue Sep 21 10:27:59 2010 -0700" }, "message": "resolved conflicts for merge of 749e6bc5 to master\n\nChange-Id: Ica492307505d53e57863d4363b5f75abd798bcd8\n" }, { "commit": "f532e9583ec0111b1c198e895ed1b2fd83c3d5cf", "tree": "a43471c448bfa851e9f260aa0efee2b3ab38a040", "parents": [ "e665698ffe539bdb99122dcf83e19844ebea92b8", "6548f395a974d2a8dcefe29b3a498d1ca87d8aef" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue Sep 21 08:22:59 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 08:22:59 2010 -0700" }, "message": "am 6548f395: Merge \"Inet status bug fix\" into gingerbread\n\nMerge commit \u00276548f395a974d2a8dcefe29b3a498d1ca87d8aef\u0027 into gingerbread-plus-aosp\n\n* commit \u00276548f395a974d2a8dcefe29b3a498d1ca87d8aef\u0027:\n Inet status bug fix\n" }, { "commit": "6548f395a974d2a8dcefe29b3a498d1ca87d8aef", "tree": "d1d97c03e18697ec890de7a94330ec3dd051003b", "parents": [ "6f33b65f8033cf8644eb4ba727421b90bd4c0ae9", "029be81302c7a00901e0af34afc06ddabb2805ef" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue Sep 21 08:06:15 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 21 08:06:15 2010 -0700" }, "message": "Merge \"Inet status bug fix\" into gingerbread" }, { "commit": "029be81302c7a00901e0af34afc06ddabb2805ef", "tree": "0b1fbf7acb477fab4b81715581f6d6e864ebfe5a", "parents": [ "313af5a3b5ba51eb75dea35eb568c841aa4beb6a" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Sep 20 18:01:43 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue Sep 21 05:38:36 2010 -0700" }, "message": "Inet status bug fix\n\nDon\u0027t wipe out the connected status every time we get a cellular status change.\nDon\u0027t filter out disconnect event for wifi - we need them.\n\nbug:3009923\nChange-Id: I68cadac5f44d6eb4e0fe711fda7c5d218abb45bd\n" }, { "commit": "e665698ffe539bdb99122dcf83e19844ebea92b8", "tree": "7b3de1511e21ec1e5172d18e1b3180fdab9b4dc0", "parents": [ "83af4fbb0e5c28506a77fc508056c5022b9a71eb", "6f33b65f8033cf8644eb4ba727421b90bd4c0ae9" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Sep 21 00:27:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 21 00:27:06 2010 -0700" }, "message": "am 6f33b65f: Merge \"Fix issue #2999757: \"Application Redirected\" dialogue showing up erratically\" into gingerbread\n\nMerge commit \u00276f33b65f8033cf8644eb4ba727421b90bd4c0ae9\u0027 into gingerbread-plus-aosp\n\n* commit \u00276f33b65f8033cf8644eb4ba727421b90bd4c0ae9\u0027:\n Fix issue #2999757: \"Application Redirected\" dialogue showing up erratically\n" }, { "commit": "034093a4ae94c0363cad36c60b41d41ea59420b1", "tree": "8c083c80f3e371a1b4a49d0f0861a9dbb6c596b0", "parents": [ "51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 22:24:38 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 22:24:38 2010 -0700" }, "message": "Fix issue #2999757: \"Application Redirected\" dialogue showing up erratically\n\nGive up on this for now.\n\nChange-Id: Ic66a36d468f8bcb313d9bde2809124cdfd74adb3\n" }, { "commit": "2d19a676860bf773c984315fe03d9568913f9314", "tree": "de4e05a76aad32361e699991905ce9df1ee1f165", "parents": [ "232bc085fc901b6234d47c4ee4e3ee4fc88431e7", "51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 22:22:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 20 22:22:54 2010 -0700" }, "message": "am 51aaab3d: Merge \"Fix #2999258: ANR in Settings after every reboot\" into gingerbread\n\nMerge commit \u002751aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d\u0027 into gingerbread-plus-aosp\n\n* commit \u002751aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d\u0027:\n Fix #2999258: ANR in Settings after every reboot\n" }, { "commit": "51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d", "tree": "f0f21c5a1cca8c61815b6563e48d9c1d74c979a6", "parents": [ "708e42512a8b14202cd872d96d1f071ccb4cf915", "8891fdc1da12993d23c7039ee82ffc243d071ce5" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 22:19:47 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 20 22:19:47 2010 -0700" }, "message": "Merge \"Fix #2999258: ANR in Settings after every reboot\" into gingerbread" }, { "commit": "749e6bc5cc429b4db2353c264413f229f2694aa6", "tree": "94c8bec6ee4daf595e5fcefd60c66abf23edc83f", "parents": [ "d23329df879993c71d9ba2d1e695f2dca8ef571c", "313af5a3b5ba51eb75dea35eb568c841aa4beb6a" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Sep 20 21:31:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 20 21:31:29 2010 -0700" }, "message": "am 313af5a3: Merge \"Add Inet Condition log to bugreports\" into gingerbread\n\nMerge commit \u0027313af5a3b5ba51eb75dea35eb568c841aa4beb6a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027313af5a3b5ba51eb75dea35eb568c841aa4beb6a\u0027:\n Add Inet Condition log to bugreports\n" }, { "commit": "313af5a3b5ba51eb75dea35eb568c841aa4beb6a", "tree": "4b537da2771804f5dfb032da1d1a1f87cc80e0c7", "parents": [ "df59f257583730470085db65c7faf44960c3b32e", "4e8dfefb06227a911eb5abfcb2591d8eae5db42b" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Sep 20 21:29:02 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 20 21:29:02 2010 -0700" }, "message": "Merge \"Add Inet Condition log to bugreports\" into gingerbread" }, { "commit": "8891fdc1da12993d23c7039ee82ffc243d071ce5", "tree": "3afda0fe315583d12c07b8e00bb1fd6c356ed03e", "parents": [ "df59f257583730470085db65c7faf44960c3b32e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 20:44:46 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 20:52:51 2010 -0700" }, "message": "Fix #2999258: ANR in Settings after every reboot\n\nThe main problem here was in the error recovery when we are waiting\nfor a process to start but it has failed for some reason. The code\nwas just setting mPendingBroadcast to null, but this would cause\nan eventual ANR because the state was not set back to IDLE so we\nwould continue waiting for the broadcast without trying to restart\nits process.\n\nNow we set it to idle. We also need to reset the \"nextReceiver\"\nindex, so there is a new mPendingBroadcastRecvIndex variable holding\nwhat it should be set back to.\n\nWhile digging into this, I found a number of other lesser problems:\n\n- There is a race when booting the system where we set mSystemReady\nto true before restarting the upgrade processes. This could allow\na broadcast to happen between those two and its process to immediately\nbe removed. To fix this, there is a new mProcessesReady that is set\nonce we are truly ready to start launching processes.\n\n- There were various places where we were calling sendBroadcastLocked()\nwithout the flag to send only to receivers... if this is called before\nmProcessesReady is set, then we would end up sticking any process for\nthe broadcast on the holding list to not get launched until later\n(and hang up all broadcasts as they want for it). Now we always make\nsure to set this appropriately.\n\n- sendBroadcastInPackage() was not doing all of the validation that\nsendBroadcast() does.\n\nAnd of course a bunch of new debugging logs that were done in the\ncourse of tracking this down.\n\nChange-Id: I6134bbd94fdb73db8b693507b29499eae012d543\n" }, { "commit": "141e00c212ab1cd9d6def55edadc3e709d88f9d5", "tree": "0f29f09a0873d668f0bcffd455860a11e6dd0b70", "parents": [ "f2c4edba065f535aa766d9a7f024dc387b5a077e" ], "author": { "name": "Marc Blank", "email": "mblank@google.com", "time": "Mon Sep 20 20:35:09 2010 -0700" }, "committer": { "name": "Marc Blank", "email": "mblank@google.com", "time": "Mon Sep 20 20:35:09 2010 -0700" }, "message": "Fix broken build due to rename of Geocoder.isImplemented\n\nChange-Id: I350d560bc99661550f939f70b6abcb40bbe44bfc\n" }, { "commit": "537ce32c71284f7bef40371778926f34d41f277e", "tree": "fa74b1f1e6db182562a07967c8a5dca951a34dd0", "parents": [ "caa9aa08aaa5d3e879fcccad5c4bcb1c79fba6e3", "24956d36f46dd7be0b029a7b2b43c1020ae8a4c5" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Sep 20 19:33:58 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 20 19:33:58 2010 -0700" }, "message": "am 24956d36: am 307aef01: Merge \"LocationManager: Hide location provider and geocode provider APIs.\" into gingerbread\n\nMerge commit \u002724956d36f46dd7be0b029a7b2b43c1020ae8a4c5\u0027\n\n* commit \u002724956d36f46dd7be0b029a7b2b43c1020ae8a4c5\u0027:\n LocationManager: Hide location provider and geocode provider APIs.\n" }, { "commit": "fde5e965d48b2f3f8672f720e8a95ad647c7a214", "tree": "abb5462ea7c8ebbd632578d11e659bb44b502d24", "parents": [ "cd155a067246c2c9cc052ecae46fde776a470ca7", "65b5a65e790458be0d6f70fafa9e151ba22a9e2e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 19:33:46 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 20 19:33:46 2010 -0700" }, "message": "am 65b5a65e: am 4db643eb: Merge \"In theory the package manager now scans /vendor/app\" into gingerbread\n\nMerge commit \u002765b5a65e790458be0d6f70fafa9e151ba22a9e2e\u0027\n\n* commit \u002765b5a65e790458be0d6f70fafa9e151ba22a9e2e\u0027:\n In theory the package manager now scans /vendor/app\n" }, { "commit": "48a781a0a5f83da7c81cf0e7230151a751740a09", "tree": "acfac4a85213466e7dd5b54c8a67e05971de4903", "parents": [ "5b138e59843d2acb9c722b88afe8425ad9a8a839", "4b187e804fdfdbc825e17646e82e0218e316a339" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 19:33:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 20 19:33:06 2010 -0700" }, "message": "am 4b187e80: am 8e1b84e7: Merge \"Some battery improvements:\" into gingerbread\n\nMerge commit \u00274b187e804fdfdbc825e17646e82e0218e316a339\u0027\n\n* commit \u00274b187e804fdfdbc825e17646e82e0218e316a339\u0027:\n Some battery improvements:\n" }, { "commit": "24956d36f46dd7be0b029a7b2b43c1020ae8a4c5", "tree": "36d5eddbe53c1c424844017a74fb97cbf0b01ae9", "parents": [ "0ce12e210eaef554e96752af2553dadc431d6d09", "307aef01257cbba42f095f7020a4a3b753f3807b" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Sep 20 17:19:04 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 20 17:19:04 2010 -0700" }, "message": "am 307aef01: Merge \"LocationManager: Hide location provider and geocode provider APIs.\" into gingerbread\n\nMerge commit \u0027307aef01257cbba42f095f7020a4a3b753f3807b\u0027 into gingerbread-plus-aosp\n\n* commit \u0027307aef01257cbba42f095f7020a4a3b753f3807b\u0027:\n LocationManager: Hide location provider and geocode provider APIs.\n" }, { "commit": "307aef01257cbba42f095f7020a4a3b753f3807b", "tree": "a93354e8c7a27ed579d535c197b607be6b65ab6c", "parents": [ "e25a264c4e3739913798d9b7d91af5dc964b0f15", "e15735a9e0c0b1448b68f2d6b3247404fc1df417" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Sep 20 17:16:03 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 20 17:16:03 2010 -0700" }, "message": "Merge \"LocationManager: Hide location provider and geocode provider APIs.\" into gingerbread" }, { "commit": "e15735a9e0c0b1448b68f2d6b3247404fc1df417", "tree": "6fd1cf74181abfc926c730bf451af4cb6b42b49f", "parents": [ "4db643eb8430d063b1adc4ba164bfa1c1281bdf3" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Sep 20 17:48:47 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Sep 20 20:14:34 2010 -0400" }, "message": "LocationManager: Hide location provider and geocode provider APIs.\n\nAlso rename Geocoder.isImplemented() to Geocoder.isPresent()\n\nBUG: 3000738\nBUG: 3001413\n\nChange-Id: I56bb4e9a9c59f8b79de585eeb168f74c3ff1a853\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "0ce12e210eaef554e96752af2553dadc431d6d09", "tree": "43a0e7184071d5b5f08c9387095ac2227e2371f0", "parents": [ "65b5a65e790458be0d6f70fafa9e151ba22a9e2e", "e25a264c4e3739913798d9b7d91af5dc964b0f15" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 17:06:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 20 17:06:12 2010 -0700" }, "message": "am e25a264c: Merge \"DO NOT MERGE. Wifi service now blames apps for its wake lock use.\" into gingerbread\n\nMerge commit \u0027e25a264c4e3739913798d9b7d91af5dc964b0f15\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e25a264c4e3739913798d9b7d91af5dc964b0f15\u0027:\n DO NOT MERGE. Wifi service now blames apps for its wake lock use.\n" }, { "commit": "e25a264c4e3739913798d9b7d91af5dc964b0f15", "tree": "571f171a47fbc0a78524a8145f2b801aca0fbd4c", "parents": [ "4db643eb8430d063b1adc4ba164bfa1c1281bdf3", "c8314b05b4f283873e65df9209f3426a201ca6ad" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 17:03:15 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 20 17:03:15 2010 -0700" }, "message": "Merge \"DO NOT MERGE. Wifi service now blames apps for its wake lock use.\" into gingerbread" }, { "commit": "c8314b05b4f283873e65df9209f3426a201ca6ad", "tree": "e3de77e0a1a2aa028aa45df63a016c5626432c22", "parents": [ "4258bfb7a9fb18907fbfbe79ec0a937b4e7382b1" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 11:34:11 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 16:58:41 2010 -0700" }, "message": "DO NOT MERGE. Wifi service now blames apps for its wake lock use.\n\nChange-Id: Ic57d8f77527bbfea6a129b8f348fe9108157b4d8\n" }, { "commit": "65b5a65e790458be0d6f70fafa9e151ba22a9e2e", "tree": "38d0f2c060fc7882448961f698123e09a746c63f", "parents": [ "aac4630cc5b3076e3cd6f65c52c8ff5f8f921957", "4db643eb8430d063b1adc4ba164bfa1c1281bdf3" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 20 16:57:05 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 20 16:57:05 2010 -0700" }, "message": "am 4db643eb: Merge \"In theory the package manager now scans /vendor/app\" into gingerbread\n\nMerge commit \u00274db643eb8430d063b1adc4ba164bfa1c1281bdf3\u0027 into gingerbread-plus-aosp\n\n* commit \u00274db643eb8430d063b1adc4ba164bfa1c1281bdf3\u0027:\n In theory the package manager now scans /vendor/app\n" } ], "next": "4db643eb8430d063b1adc4ba164bfa1c1281bdf3" }