)]}' { "log": [ { "commit": "deff9c85ec5c9884d731817e43058589d6fd4631", "tree": "529f8bd7d35ac29e177a3cd85daad94760c3e40c", "parents": [ "8ae409f50156394b517a86a8d171938e0aa32897" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Sat Sep 04 10:29:17 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Sat Sep 04 10:29:17 2010 -0400" }, "message": "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached.\n\nChange-Id: I24a24a49d2e3ddee8fbce590ef75ea323b3be97b\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\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": "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" }, { "commit": "734d270769c609c7d3a1f2ec46e1d329d9682ab4", "tree": "a6c455a9a3b31eb0ecdbc591b2750f4d29ff5b20", "parents": [ "03e83d4ad909f5c07fb2011e03348a413453e909", "bb660d7e1bed3a07a1804bd9641d9634bfaa4972" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Aug 30 18:18:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 30 18:18:54 2010 -0700" }, "message": "am bb660d7e: Merge \"Renaming SharedPreferences.startCommit to apply\" into gingerbread\n\nMerge commit \u0027bb660d7e1bed3a07a1804bd9641d9634bfaa4972\u0027 into gingerbread-plus-aosp\n\n* commit \u0027bb660d7e1bed3a07a1804bd9641d9634bfaa4972\u0027:\n Renaming SharedPreferences$Editor.startCommit to apply\n" }, { "commit": "8d60866e2100db70ecf0502c14768a384514d7e9", "tree": "514e46b4e4d58fd68cd52de93b93e7782fdf4e9f", "parents": [ "bb660d7e1bed3a07a1804bd9641d9634bfaa4972" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Aug 30 03:02:23 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Aug 30 18:16:43 2010 -0700" }, "message": "Input device calibration and capabilities.\n\nFinished the input device capability API.\nAdded a mechanism for calibrating touch devices to obtain more\naccurate information about the touch contact area.\nImproved pointer location to show new coordinates and capabilities.\nOptimized pointer location display and formatting to avoid allocating large\nnumbers of temporary objects. The GC churn was causing the application to\nstutter very badly when more than a couple of fingers were down).\nAdded more diagnostics.\n\nChange-Id: Ie25380278ed6f16c5b04cd9df848015850383498\n" }, { "commit": "66fce5068a8a3aeb28aaf713843891b286a75280", "tree": "12b92e7b95f0251c4edb67cdab6374c58cae9608", "parents": [ "2e86809b6c79375d23c0975914efc3b66e89ac90" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Aug 30 18:10:49 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Mon Aug 30 18:10:49 2010 -0700" }, "message": "Renaming SharedPreferences$Editor.startCommit to apply\n\nAlso removes the artifical restriction that only one apply() can be in\nflight at once. That was old from when I thought it\u0027d end up being\nrequired, but wasn\u0027t.\n\nChange-Id: I3540ea8be6e0760d6a51d218186f71655c2f3f55\n" }, { "commit": "37e65ebb7eb932e1a144b1cab262e11ca5fd109b", "tree": "8778822097d0ab67bc0a4c222cd7e01d2ade9082", "parents": [ "e82235ae7049badf6758ffef3c13080b135986f4" ], "author": { "name": "Robert Greenwalt", "email": "robdroid@android.com", "time": "Mon Aug 30 10:56:47 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Aug 30 15:54:37 2010 -0700" }, "message": "Rename NetworkProperties to LinkProperties\n\nAlso add copy constructors and use them when giving out data.\n\nChange-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615\n" }, { "commit": "6c8beb0cb4eb41e4d33dd928fd87c0d504495127", "tree": "8b3756b308ed72ccebd729f6e6637388ccf35e8d", "parents": [ "2ed7818129a636b2aa6691838b4716d71af8e7ab", "8a5ab396cf4f3bb76a3e820f16f946e313b73fcf" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Aug 30 15:24:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 30 15:24:45 2010 -0700" }, "message": "am 8a5ab396: am 2e86809b: Merge \"Native libraries on SD\" into gingerbread\n\nMerge commit \u00278a5ab396cf4f3bb76a3e820f16f946e313b73fcf\u0027\n\n* commit \u00278a5ab396cf4f3bb76a3e820f16f946e313b73fcf\u0027:\n Native libraries on SD\n" }, { "commit": "8a5ab396cf4f3bb76a3e820f16f946e313b73fcf", "tree": "bc2caaec066e3dd46eef27134bdbd6964a880fa9", "parents": [ "4421784895a58bb7bcf90236a9e443b372b5b80e", "2e86809b6c79375d23c0975914efc3b66e89ac90" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Aug 30 15:21:17 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 30 15:21:17 2010 -0700" }, "message": "am 2e86809b: Merge \"Native libraries on SD\" into gingerbread\n\nMerge commit \u00272e86809b6c79375d23c0975914efc3b66e89ac90\u0027 into gingerbread-plus-aosp\n\n* commit \u00272e86809b6c79375d23c0975914efc3b66e89ac90\u0027:\n Native libraries on SD\n" }, { "commit": "0ac83f5a7c05ff5b7e213e5953590bfbeb4efb43", "tree": "e341141f94dc0f43e8926c11bece5f671d20fab8", "parents": [ "858bb4f66ea1bd9c48b9817cb44a59c8b0394229" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Aug 30 15:12:24 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Aug 30 15:14:06 2010 -0700" }, "message": "Native libraries on SD\n\n* Add native library tests during package move\n\n* Fix omission that let PackageSettings and ApplicationInfo get out of\n sync.\n\nChange-Id: Ic4958f971cb2c9cfd270522fdc120b4031c1124a\n" }, { "commit": "ec959a7e38d4a6551bb18e096a912ff8c75c50b3", "tree": "31b372d59925a148239f02fd83864bebf007b298", "parents": [ "7dff1a72146ba549d51649ad786a0e1cc8b6897c", "1429f465f42bb9e3ef3ecfd1ee9af214901fc999" ], "author": { "name": "Imre Sunyi", "email": "imre.sunyi@sonyericsson.com", "time": "Mon Aug 30 13:28:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 30 13:28:16 2010 -0700" }, "message": "am 1429f465: am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead\n\nMerge commit \u00271429f465f42bb9e3ef3ecfd1ee9af214901fc999\u0027\n\n* commit \u00271429f465f42bb9e3ef3ecfd1ee9af214901fc999\u0027:\n Shutdown when capacity is 0% and no charging or when battery is dead\n" }, { "commit": "1429f465f42bb9e3ef3ecfd1ee9af214901fc999", "tree": "dd6d993ecddbea0d00e69ab5b0cc4769935e6e46", "parents": [ "a3faa923a0ac8d0d58409fcf7c99e8ff7b261ef4", "fd04143a47770256dabcfa4d8447127b3ec8b2bf" ], "author": { "name": "Imre Sunyi", "email": "imre.sunyi@sonyericsson.com", "time": "Mon Aug 30 10:33:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 30 10:33:35 2010 -0700" }, "message": "am fd04143a: Shutdown when capacity is 0% and no charging or when battery is dead\n\nMerge commit \u0027fd04143a47770256dabcfa4d8447127b3ec8b2bf\u0027 into gingerbread-plus-aosp\n\n* commit \u0027fd04143a47770256dabcfa4d8447127b3ec8b2bf\u0027:\n Shutdown when capacity is 0% and no charging or when battery is dead\n" }, { "commit": "44af754cf0c9ad9a8162e1bd2af60737e81a8beb", "tree": "dc82615fca74b557d74e5af807e43fc7c126a928", "parents": [ "8328578152fbfd23952a6cda4b2e60853d78eb74", "d02bdaab495641ab50e2123fdfd99a819cc40540" ], "author": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Fri Aug 27 20:00:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 27 20:00:29 2010 -0700" }, "message": "am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE\n\nMerge commit \u0027d02bdaab495641ab50e2123fdfd99a819cc40540\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d02bdaab495641ab50e2123fdfd99a819cc40540\u0027:\n Remove experimental immersive mode support. DO NOT MERGE\n" }, { "commit": "d02bdaab495641ab50e2123fdfd99a819cc40540", "tree": "63b4618d41b340ea2d4f01b98da2ce0ba478c032", "parents": [ "7046bd924f77c54585b9e0e0c95e5edd2ceb55a3" ], "author": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Thu Aug 26 10:28:46 2010 -0400" }, "committer": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Fri Aug 27 22:57:39 2010 -0400" }, "message": "Remove experimental immersive mode support. DO NOT MERGE\n\nBug: 2949215\n\nChange-Id: I7d998ef571ef7e149bb96261430e92150b80b77d\n" }, { "commit": "818c830c59fb8fb0fe7576f1e5a073ab599227c8", "tree": "ea75d8c4b837f29edb7d654cd631fbe3697d1bd7", "parents": [ "3d5c46ce0aab1a17c4949358f0ed0b6388f13839", "8328578152fbfd23952a6cda4b2e60853d78eb74" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Aug 27 18:11:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 27 18:11:06 2010 -0700" }, "message": "am 83285781: am 7046bd92: Merge \"Allow native shared libraries in ASEC containers\" into gingerbread\n\nMerge commit \u00278328578152fbfd23952a6cda4b2e60853d78eb74\u0027\n\n* commit \u00278328578152fbfd23952a6cda4b2e60853d78eb74\u0027:\n Allow native shared libraries in ASEC containers\n" }, { "commit": "59e61354801b378c074b85f0dea0da62481298c9", "tree": "422c065e738cbe1e99e5ae35482eede3a3760990", "parents": [ "769690e9ea87e00dee7c15d652333eaa2c6c5264", "d71021cb30bd20dabd6783f4235d5f245a7bd1a3" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Aug 27 18:10:38 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 27 18:10:38 2010 -0700" }, "message": "am d71021cb: am 0c731f99: Merge \"Send broadcast intent when configured location providers change.\" into gingerbread\n\nMerge commit \u0027d71021cb30bd20dabd6783f4235d5f245a7bd1a3\u0027\n\n* commit \u0027d71021cb30bd20dabd6783f4235d5f245a7bd1a3\u0027:\n Send broadcast intent when configured location providers change.\n" }, { "commit": "fc40701c8b170706a87eed9a758bf3307c572b99", "tree": "3376dba7a9b882863cc41e21f5ccfba561af11ee", "parents": [ "9841ae8245f718ecee995b4a6b32dc801df5bcc6", "585ac0fc8dde3fe35ec4c71c8f215f2c84139b8b" ], "author": { "name": "Robert Greenwalt", "email": "robdroid@android.com", "time": "Fri Aug 27 17:27:02 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 27 17:27:02 2010 -0700" }, "message": "Merge \"resolved conflicts for merge of 4ea54f44 to master\"" }, { "commit": "8328578152fbfd23952a6cda4b2e60853d78eb74", "tree": "9467164d24c5dba533a2d1f4b1f9e9b89a6536c7", "parents": [ "63b5b8701092de71e48b36cce8eb36f51f9d4d5e", "7046bd924f77c54585b9e0e0c95e5edd2ceb55a3" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Aug 27 16:45:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 27 16:45:45 2010 -0700" }, "message": "am 7046bd92: Merge \"Allow native shared libraries in ASEC containers\" into gingerbread\n\nMerge commit \u00277046bd924f77c54585b9e0e0c95e5edd2ceb55a3\u0027 into gingerbread-plus-aosp\n\n* commit \u00277046bd924f77c54585b9e0e0c95e5edd2ceb55a3\u0027:\n Allow native shared libraries in ASEC containers\n" }, { "commit": "85387d7ba36e56b291cbde87acb5a5b2200fe01c", "tree": "adea29b181a25c2ffd8ecaebded62fb4d2dc1a93", "parents": [ "4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Aug 26 10:13:11 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Aug 27 16:40:06 2010 -0700" }, "message": "Allow native shared libraries in ASEC containers\n\nThis change moves the native library handling earlier in the package\ninstallation process so that it may be inserted into ASEC containers\nbefore they are finalized in the DefaultContainerService.\n\nNote that native libraries on SD card requires that vold mount ASEC\ncontainers without the \"noexec\" flag on the mount point.\n\nChange-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba\n" }, { "commit": "7f7ce40f90cf00dc046fb9520d77d29e96b474d6", "tree": "a1417c53bcb4e35f1aa261686aa7b789ca8314c5", "parents": [ "6ff0dc0ad9a93a96262da3c0e40483137568de43", "28130baefb4fa6d1e0ff9c92337295ba74461cf7" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Aug 27 16:11:27 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Aug 27 16:11:27 2010 -0700" }, "message": "resolved conflicts for merge of 28130bae to master\n\nChange-Id: I13df8dc12092c3d2536e12216df9130d5914380a\n" }, { "commit": "d71021cb30bd20dabd6783f4235d5f245a7bd1a3", "tree": "54d69a563b72868911f5370c2a6d043618d5276a", "parents": [ "af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048", "0c731f99b05630e16dce572ac206ab75c90891cd" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Aug 27 16:10:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 27 16:10:06 2010 -0700" }, "message": "am 0c731f99: Merge \"Send broadcast intent when configured location providers change.\" into gingerbread\n\nMerge commit \u00270c731f99b05630e16dce572ac206ab75c90891cd\u0027 into gingerbread-plus-aosp\n\n* commit \u00270c731f99b05630e16dce572ac206ab75c90891cd\u0027:\n Send broadcast intent when configured location providers change.\n" }, { "commit": "0c5a04014d3833c9a82772a832d3bc6410fc52ac", "tree": "79831e18eee9d29207d199499a9ece7a7068fedc", "parents": [ "445ab76c49779998543bb78881f5d9f8ae81e598" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Aug 27 14:01:23 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Aug 27 14:01:23 2010 -0700" }, "message": "Send broadcast intent when configured location providers change.\n\nSee e.g. http://code.google.com/p/android/issues/detail?id\u003d10042\n\nThis is also needed by the power control widget, which has no reliable\nway otherwise of staying in-sync.\n\nChange-Id: I8f2b6b79b1843329bae952a25ea56f15e3cf92aa\n" }, { "commit": "28130baefb4fa6d1e0ff9c92337295ba74461cf7", "tree": "21c870a702d64402a8fa503353b82ae21bb50bee", "parents": [ "dfad42760f3c9c3b8439ff4b365256474471abe4", "6b50986a6b64fa3cbe4d527137134cd14d0ad6bd" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Aug 27 12:08:40 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Aug 27 12:08:40 2010 -0700" }, "message": "resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp\n\nChange-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718\n" }, { "commit": "41bfa37cb2ca244432061bddb1c8bf802545ae6e", "tree": "3bb3611fe922699927a7c1af755c5e1a3a2cdcad", "parents": [ "1040dc465cbf5ca8f834a87c949e476abefa3f76", "409b71201a982e188c05238d95a2eb53ea9e0cf7" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Aug 27 12:04:26 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Aug 27 12:04:26 2010 -0700" }, "message": "resolved conflicts for merge of 409b7120 to master\n\nChange-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538\n" }, { "commit": "1040dc465cbf5ca8f834a87c949e476abefa3f76", "tree": "98841629e182d19c19bc68835d7a4b2e426b883a", "parents": [ "59024f1697e09ea50d4349e9813d0c101411292b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Aug 26 22:11:06 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Aug 27 11:06:01 2010 -0700" }, "message": "Improve clipboard API.\n\n- Rename ClippedData to ClipData.\n- Introudce ClipDescription subclass.\n- Add convenience APIs for creating a ClipData.\n- Add ClipboardManager API to get just the ClipDescription.\n- Define MIME types associated with a clip.\n\nChange-Id: If97ef91aa99a4dd0ec74ccaea504345c9ef12b5c\n" }, { "commit": "585ac0fc8dde3fe35ec4c71c8f215f2c84139b8b", "tree": "257ca7032592dbd69e2d213bc8cca1ace651c8ac", "parents": [ "e73d10c6fb9013ee8e26f337384d4924f6db8a21" ], "author": { "name": "Robert Greenwalt", "email": "robdroid@android.com", "time": "Fri Aug 27 09:24:29 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri Aug 27 11:05:11 2010 -0700" }, "message": "resolved conflicts for merge of 4ea54f44 to master\n\nChange-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56\n" }, { "commit": "333b8cba996c8ebb8ca55ebfc5cc536bdd64af94", "tree": "1a38c262454903b6b976e4e27ce0f84160015116", "parents": [ "cc033bd367a445d5e3f8de919cd155505b25274c" ], "author": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Thu Aug 26 12:04:57 2010 -0700" }, "committer": { "name": "Brad Fitzpatrick", "email": "bradfitz@android.com", "time": "Fri Aug 27 09:10:11 2010 -0700" }, "message": "SharedPreferences$Editor.startCommit()\n\nAdds a fire-and-forget save method (startCommit) to the\nSharedPreferences.Editor, which is the way most people use it anyway.\n\nThis commit adds the implementation. The previous commit added the\ninterface and docs:\n\n previous change: Idf9934b445da1fb72b79f0192218b47c0a7f5a34\n git commit: edf32d01316bd3432c023f17747461b08ae36375\n\nIn addition, this change:\n\n-- adds a generic \"runPendingWorkFinishers\" mechanism to\n ActivityThread to wait on async operations that are still\n in flight and use it for this.\n\n-- ties runPendingWorkFinishers into Activity.onPause,\n BroadcastReceiver, and Service.\n\n-- makes sSharedPreferences keyed on name, not File, to avoid\n unnnecessary allocations\n\n-- documents and guarantees what thread\n OnSharedPreferenceChangeListener callbacks run on\n\n-- makes a few things in frameworks/base use startCommit(), notably\n Preference.java (which was ignoring the return value anyway)\n\nChange-Id: I1c8db60ad45643226fe6d246d3e513eeb7bd0ebd\n" }, { "commit": "1578bf109012c3cd20c1b41a9df533df485c8e27", "tree": "878f189542051fe5beb550077b32064cddbfddb4", "parents": [ "267f4d6a22aade4f63831e166312647212816a3d", "03b3de0faf7fe6b8e4bfbf828793767ac3e77a37" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 15:52:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 26 15:52:13 2010 -0700" }, "message": "am 03b3de0f: am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work.\n\nMerge commit \u002703b3de0faf7fe6b8e4bfbf828793767ac3e77a37\u0027\n\n* commit \u002703b3de0faf7fe6b8e4bfbf828793767ac3e77a37\u0027:\n Continue trying to make the turn off quickly after call feature work.\n" }, { "commit": "267f4d6a22aade4f63831e166312647212816a3d", "tree": "d2772e11497266e7246401198ff85b08000c29e1", "parents": [ "0add80b454c5fe99a158a9537666a4c8ab999359", "8f0f1b1e9defc61c2831e8856b18f2e00cfd789d" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 15:52:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 26 15:52:07 2010 -0700" }, "message": "am 8f0f1b1e: am 274ad982: Merge \"Just disable widgets that come from apps on sd cards, because they don\\\u0027t work anyway.\" into gingerbread\n\nMerge commit \u00278f0f1b1e9defc61c2831e8856b18f2e00cfd789d\u0027\n\n* commit \u00278f0f1b1e9defc61c2831e8856b18f2e00cfd789d\u0027:\n Just disable widgets that come from apps on sd cards, because they don\u0027t work anyway.\n" }, { "commit": "0add80b454c5fe99a158a9537666a4c8ab999359", "tree": "2b60688b2a7276b6fb44b3e9179a3284f136d0b8", "parents": [ "511d444be07905b0e45b51a43cc9eed499285c81", "32982c701cee6f73262200468419b80343a0bea7" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 15:52:01 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 26 15:52:01 2010 -0700" }, "message": "am 32982c70: am cc45381e: Merge \"Fix typo that makes apps on sd work better with app widgets.\" into gingerbread\n\nMerge commit \u002732982c701cee6f73262200468419b80343a0bea7\u0027\n\n* commit \u002732982c701cee6f73262200468419b80343a0bea7\u0027:\n Fix typo that makes apps on sd work better with app widgets.\n" }, { "commit": "409b71201a982e188c05238d95a2eb53ea9e0cf7", "tree": "4c3c7218be00f39a80a728c396480a69d287aa22", "parents": [ "8620ed1dd3ca13fd80bcd79090840055a34d90db", "02486b1327e3007c62d253dd89ba9db1852b87f8" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Aug 26 14:46:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 26 14:46:43 2010 -0700" }, "message": "am 02486b13: Hide heavy-weight API.\n\nMerge commit \u002702486b1327e3007c62d253dd89ba9db1852b87f8\u0027 into gingerbread-plus-aosp\n\n* commit \u002702486b1327e3007c62d253dd89ba9db1852b87f8\u0027:\n Hide heavy-weight API.\n" }, { "commit": "02486b1327e3007c62d253dd89ba9db1852b87f8", "tree": "ddf8f10dcf945aec5bbefbf0d13b936582b42de0", "parents": [ "bc5d9d2254ee751ff50fb91d4560098ab5edf01f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Aug 26 14:18:37 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Aug 26 14:41:58 2010 -0700" }, "message": "Hide heavy-weight API.\n\nAnd give it a better name, for when it is later un-hidden.\n\nChange-Id: Iae0d3054d44f873b9f953bc41d175a47802a185e\n" }, { "commit": "4e8620f868e2490782ebb960404140ea9482c91d", "tree": "306684e75e7c6a8268b0568c1e6cc88e7db1994f", "parents": [ "ba4da86add74aab16e3cf204dcf7ea25adbbaafa" ], "author": { "name": "Ben Dodson", "email": "bjdodson@google.com", "time": "Wed Aug 25 10:55:47 2010 -0700" }, "committer": { "name": "Ben Dodson", "email": "bjdodson@google.com", "time": "Thu Aug 26 14:02:20 2010 -0700" }, "message": "Updated documentation for upcoming fix for @code tags\n\nChange-Id: Id7b163179132b9cf180afecb4e9e10ee39bcd415\n" }, { "commit": "03b3de0faf7fe6b8e4bfbf828793767ac3e77a37", "tree": "2fd71afbf7e9597e6e8d42059c9a82c440767ba5", "parents": [ "8f0f1b1e9defc61c2831e8856b18f2e00cfd789d", "00d1772d8cfb94066b757034055ac38897d161da" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 12:05:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 26 12:05:54 2010 -0700" }, "message": "am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work.\n\nMerge commit \u002700d1772d8cfb94066b757034055ac38897d161da\u0027 into gingerbread-plus-aosp\n\n* commit \u002700d1772d8cfb94066b757034055ac38897d161da\u0027:\n Continue trying to make the turn off quickly after call feature work.\n" }, { "commit": "00d1772d8cfb94066b757034055ac38897d161da", "tree": "2eed76948df697d9c0d45725431491599925ebe2", "parents": [ "274ad9824a20b61dfbb785621567fd0414a965a4", "797e688b3bebbf1f50a8ad08528740b064f79153" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 12:02:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 26 12:02:51 2010 -0700" }, "message": "am 797e688b: Continue trying to make the turn off quickly after call feature work.\n\nMerge commit \u0027797e688b3bebbf1f50a8ad08528740b064f79153\u0027 into gingerbread\n\n* commit \u0027797e688b3bebbf1f50a8ad08528740b064f79153\u0027:\n Continue trying to make the turn off quickly after call feature work.\n" }, { "commit": "8f0f1b1e9defc61c2831e8856b18f2e00cfd789d", "tree": "630c41efa5fc13241036d7d1b4642ab1b670bf8a", "parents": [ "32982c701cee6f73262200468419b80343a0bea7", "274ad9824a20b61dfbb785621567fd0414a965a4" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 11:55:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 26 11:55:10 2010 -0700" }, "message": "am 274ad982: Merge \"Just disable widgets that come from apps on sd cards, because they don\\\u0027t work anyway.\" into gingerbread\n\nMerge commit \u0027274ad9824a20b61dfbb785621567fd0414a965a4\u0027 into gingerbread-plus-aosp\n\n* commit \u0027274ad9824a20b61dfbb785621567fd0414a965a4\u0027:\n Just disable widgets that come from apps on sd cards, because they don\u0027t work anyway.\n" }, { "commit": "32982c701cee6f73262200468419b80343a0bea7", "tree": "6f0444764816adc7741ff2c90d38ca40021c933a", "parents": [ "b318ef79d5018fdf492ba254438e2d9f1c0fff4c", "cc45381e596c6d2b351d2c5e9d07f4113e1d58b6" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 11:54:59 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 26 11:54:59 2010 -0700" }, "message": "am cc45381e: Merge \"Fix typo that makes apps on sd work better with app widgets.\" into gingerbread\n\nMerge commit \u0027cc45381e596c6d2b351d2c5e9d07f4113e1d58b6\u0027 into gingerbread-plus-aosp\n\n* commit \u0027cc45381e596c6d2b351d2c5e9d07f4113e1d58b6\u0027:\n Fix typo that makes apps on sd work better with app widgets.\n" }, { "commit": "274ad9824a20b61dfbb785621567fd0414a965a4", "tree": "dffbfce30b4319b66d209a70170bf21b88a88708", "parents": [ "cc45381e596c6d2b351d2c5e9d07f4113e1d58b6", "331fbdc7e9588018dac28de8b6196653cea1f08b" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 11:50:31 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 26 11:50:31 2010 -0700" }, "message": "Merge \"Just disable widgets that come from apps on sd cards, because they don\u0027t work anyway.\" into gingerbread" }, { "commit": "cc45381e596c6d2b351d2c5e9d07f4113e1d58b6", "tree": "189e02f19be0ab3c138b3c536966e071a6677de1", "parents": [ "62dbd82aad0f84c88212566321e3fb370affaf7c", "94258cd70438e444e139a26da12fd7e5a8782332" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 11:50:28 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 26 11:50:28 2010 -0700" }, "message": "Merge \"Fix typo that makes apps on sd work better with app widgets.\" into gingerbread" }, { "commit": "797e688b3bebbf1f50a8ad08528740b064f79153", "tree": "1886e10e83e0cccd9de435be643a332bb1bace93", "parents": [ "d5e601c2304610085e3d7a276c4bbcd984ac89f9" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 14:46:01 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Thu Aug 26 14:48:56 2010 -0400" }, "message": "Continue trying to make the turn off quickly after call feature work.\n\nThe previous implementation worked if the set timeout is short enough, which mine was. This one\ncarries the remaining amount of timeout override forward through all of the countdown steps.\n\nBug: 2844990\nChange-Id: I040df22f9f9ddf98c355ac6845b7624e95f84f33\n" }, { "commit": "4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b", "tree": "d99e1c759b2c3074032ad4980d21cd3ea3377f0b", "parents": [ "15edaceb2d46f18c32fb20a3d3dae556c1078bb6", "b21b62327c10e92baf1a88e77f1c6d5576a17d62" ], "author": { "name": "Robert Greenwalt", "email": "robdroid@android.com", "time": "Thu Aug 26 08:29:10 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 26 08:29:10 2010 -0700" }, "message": "Merge \"resolved conflicts for merge of b998f311 to gingerbread-plus-aosp\" into gingerbread-plus-aosp" }, { "commit": "15edaceb2d46f18c32fb20a3d3dae556c1078bb6", "tree": "233cb50e7cee61f894fa0191645fb7efb9a82de3", "parents": [ "cfc3e71eae0c7f4f1b824b00d64cf268e646f702", "913a8925c07e854a80bf5df87561f290d3a56d61" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Thu Aug 26 07:01:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 26 07:01:28 2010 -0700" }, "message": "am 913a8925: DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread\n\nMerge commit \u0027913a8925c07e854a80bf5df87561f290d3a56d61\u0027 into gingerbread-plus-aosp\n\n* commit \u0027913a8925c07e854a80bf5df87561f290d3a56d61\u0027:\n DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread\n" }, { "commit": "913a8925c07e854a80bf5df87561f290d3a56d61", "tree": "37193d674462f7ff7a8287ae947246d80193ac09", "parents": [ "0858806ffcb9ff34725abb79106aa1de27d1bf60" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Thu Aug 26 21:53:41 2010 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Thu Aug 26 22:53:07 2010 +0900" }, "message": "DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread\n\nChange-Id: Ied15b4f2f447ee3e3b858d4ca65c21c30dfa4eba\n" }, { "commit": "fd04143a47770256dabcfa4d8447127b3ec8b2bf", "tree": "b2b609b71ea40fadc807d662ce5a0c51ba4d2c57", "parents": [ "f3ee6f87a344b185d8bde12c77440c9020378510" ], "author": { "name": "Imre Sunyi", "email": "imre.sunyi@sonyericsson.com", "time": "Thu Aug 26 09:23:42 2010 +0200" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonyericsson.com", "time": "Thu Aug 26 09:23:42 2010 +0200" }, "message": "Shutdown when capacity is 0% and no charging or when battery is dead\n\nAndroid framework does not shutdown when battery capacity is 0% and a\ncharger is attached (USB or AC). This handling is incomplete since a\ncharger might very well be attached but charging has stopped because\nUSB suspended or the charging algorithm has stopped because of\nbattery safety handling. Also shutdown when battery is reported \u0027dead\u0027.\nThis might happen although charging is present.\n\nChange-Id: If328260ebf4d38f912e4d2fad204431cbb19c993\n" }, { "commit": "c8f8497b9cac63a923dbdb1c08e247ba32c19e5e", "tree": "cc65e71f2625e93876bd83dc2459b1dcd2d0cc74", "parents": [ "89bf83a87d7f624a87324a459cf2141c9e43ba2a", "66d633d208370c384db020daade975db1f3af736" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 23:14:44 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 23:14:44 2010 -0700" }, "message": "resolved conflicts for merge of 66d633d2 to master\n\nChange-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586\n" }, { "commit": "66d633d208370c384db020daade975db1f3af736", "tree": "4d89e5fd251e1d5a1a002e1efd289ba62674b37e", "parents": [ "91fe746437e1709b83b4eb4d113e5f435d7c6412", "3003a017d312a55e3804d6cf4a80044b1f1d7993" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 22:02:18 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 25 22:02:18 2010 -0700" }, "message": "am 3003a017: Merge \"Don\\\u0027t retain global ref to last inflated context.\" into gingerbread\n\nMerge commit \u00273003a017d312a55e3804d6cf4a80044b1f1d7993\u0027 into gingerbread-plus-aosp\n\n* commit \u00273003a017d312a55e3804d6cf4a80044b1f1d7993\u0027:\n Don\u0027t retain global ref to last inflated context.\n" }, { "commit": "3003a017d312a55e3804d6cf4a80044b1f1d7993", "tree": "bfd0910b8bde42c17967399981b5a347069eae18", "parents": [ "14e00621c81da6a0391da47afce77945b27c7231", "7e269644fcc319835f1e7f762f3cbd8087e3e22f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 22:00:28 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 25 22:00:28 2010 -0700" }, "message": "Merge \"Don\u0027t retain global ref to last inflated context.\" into gingerbread" }, { "commit": "7e269644fcc319835f1e7f762f3cbd8087e3e22f", "tree": "03577ffff09f0d25a66f731a9def4a769f6b785a", "parents": [ "50395e80718e77d27ec5e2d474b255e05de68d82" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 19:50:20 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 21:50:54 2010 -0700" }, "message": "Don\u0027t retain global ref to last inflated context.\n\nAlso rework URI permission granting to support upcoming\nclipboard use.\n\nChange-Id: I9842920350955531c5a511c2ecc5215e8c783343\n" }, { "commit": "6d92e3c9ad9deab11752944cca57107feb15bcbe", "tree": "3a3eeae57d48831cac0d2f529467a457d242f9df", "parents": [ "c3bee436205d09a45e9e0d89aca07a3731e87da3", "5e0d833710aaba2562f39eb8021a4289bc3bcc5a" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Aug 25 19:28:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 25 19:28:45 2010 -0700" }, "message": "am 5e0d8337: am ea52d35e: Merge \"Add dynamic uid info for tracking the sip service usage.\" into gingerbread\n\nMerge commit \u00275e0d833710aaba2562f39eb8021a4289bc3bcc5a\u0027\n\n* commit \u00275e0d833710aaba2562f39eb8021a4289bc3bcc5a\u0027:\n Add dynamic uid info for tracking the sip service usage.\n" }, { "commit": "5e0d833710aaba2562f39eb8021a4289bc3bcc5a", "tree": "0aa776e0c3d9eec85d1148304f9938f7b0acbed0", "parents": [ "5a54e98022d640900f94102c077d8dff447f3c76", "ea52d35e5685094f4d2cca5012239bde66f2c4fe" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Aug 25 19:26:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 25 19:26:31 2010 -0700" }, "message": "am ea52d35e: Merge \"Add dynamic uid info for tracking the sip service usage.\" into gingerbread\n\nMerge commit \u0027ea52d35e5685094f4d2cca5012239bde66f2c4fe\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ea52d35e5685094f4d2cca5012239bde66f2c4fe\u0027:\n Add dynamic uid info for tracking the sip service usage.\n" }, { "commit": "ea52d35e5685094f4d2cca5012239bde66f2c4fe", "tree": "018a3da69b5250e522632778fc1ef7cdd688a844", "parents": [ "6947cc594276df899a0c4662224455f40846bd0a", "5424c8dcacf1c227fe7deb0185510614122ab447" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Aug 25 19:25:02 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 25 19:25:02 2010 -0700" }, "message": "Merge \"Add dynamic uid info for tracking the sip service usage.\" into gingerbread" }, { "commit": "5424c8dcacf1c227fe7deb0185510614122ab447", "tree": "6706f881dccb2a6bc3b5f110fc95399ce541f8bc", "parents": [ "231a0005654d23284ab58a2d9ea892b995988c34" ], "author": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Wed Aug 25 19:02:18 2010 +0800" }, "committer": { "name": "Chung-yih Wang", "email": "cywang@google.com", "time": "Thu Aug 26 10:12:05 2010 +0800" }, "message": "Add dynamic uid info for tracking the sip service usage.\n\nChange-Id: Ibc340401b63799326b08aee6eba602a3e753b13f\n" }, { "commit": "b21b62327c10e92baf1a88e77f1c6d5576a17d62", "tree": "7420ddfb92ad8264edda6c240ace5b9a999661ee", "parents": [ "96dc45597e53742a2c8453f9ce03f7d501a75668", "b998f3111df82149567935138945500f33451b1a" ], "author": { "name": "Robert Greenwalt", "email": "robdroid@android.com", "time": "Wed Aug 25 17:48:47 2010 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "robdroid@android.com", "time": "Wed Aug 25 17:48:47 2010 -0700" }, "message": "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp\n\nChange-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505\n" }, { "commit": "261d509270d41508ca99d5a1a0d0dd8e7e4bd966", "tree": "c68ac2471d614cdd6f27c29459b545fde6e1c2f6", "parents": [ "ebe083efadcc3648fd75c64604ecc40c9a7cefb6", "5a54e98022d640900f94102c077d8dff447f3c76" ], "author": { "name": "Konstantin Lopyrev", "email": "klopyrev@google.com", "time": "Wed Aug 25 17:41:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 25 17:41:02 2010 -0700" }, "message": "am 5a54e980: am 6947cc59: Merge \"Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.\" into gingerbread\n\nMerge commit \u00275a54e98022d640900f94102c077d8dff447f3c76\u0027\n\n* commit \u00275a54e98022d640900f94102c077d8dff447f3c76\u0027:\n Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.\n" }, { "commit": "5a54e98022d640900f94102c077d8dff447f3c76", "tree": "9f67389d43875744005b2a9d8d83fb647a368a53", "parents": [ "d72c1172f669d0a50a5164672c354ec7fb4ac9aa", "6947cc594276df899a0c4662224455f40846bd0a" ], "author": { "name": "Konstantin Lopyrev", "email": "klopyrev@google.com", "time": "Wed Aug 25 17:37:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 25 17:37:45 2010 -0700" }, "message": "am 6947cc59: Merge \"Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.\" into gingerbread\n\nMerge commit \u00276947cc594276df899a0c4662224455f40846bd0a\u0027 into gingerbread-plus-aosp\n\n* commit \u00276947cc594276df899a0c4662224455f40846bd0a\u0027:\n Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.\n" }, { "commit": "6947cc594276df899a0c4662224455f40846bd0a", "tree": "7879b29d349d7b18230bfdce22e718391f9b7de9", "parents": [ "0c490839b2d25fec99f1ae86dcebc5f21a2df8bb", "43b9b48f792e0b1b166af7f7fb6a32172e7f11c2" ], "author": { "name": "Konstantin Lopyrev", "email": "klopyrev@google.com", "time": "Wed Aug 25 17:35:50 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 25 17:35:50 2010 -0700" }, "message": "Merge \"Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.\" into gingerbread" }, { "commit": "917d88213ecce0f0723186fff82b8163e57192a2", "tree": "0950697a53de9f2216ed0a5f8706c9c5aaff4ce9", "parents": [ "dcde3a8abec3d2d9c1261fef5fb6015c16382346", "fde7fdd38d45e6bdb12cba9917a23d18e9f3457c" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 16:40:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 25 16:40:55 2010 -0700" }, "message": "am fde7fdd3: am 50395e80: Merge \"Fix a fun bug with multiple service bindings from an activity.\" into gingerbread\n\nMerge commit \u0027fde7fdd38d45e6bdb12cba9917a23d18e9f3457c\u0027\n\n* commit \u0027fde7fdd38d45e6bdb12cba9917a23d18e9f3457c\u0027:\n Fix a fun bug with multiple service bindings from an activity.\n" }, { "commit": "fde7fdd38d45e6bdb12cba9917a23d18e9f3457c", "tree": "c913df5aadc552564b50ad3162cd83a3e1c160cd", "parents": [ "a62dfe9e49ea785c4be2173479e4472767771ce5", "50395e80718e77d27ec5e2d474b255e05de68d82" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 16:33:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 25 16:33:57 2010 -0700" }, "message": "am 50395e80: Merge \"Fix a fun bug with multiple service bindings from an activity.\" into gingerbread\n\nMerge commit \u002750395e80718e77d27ec5e2d474b255e05de68d82\u0027 into gingerbread-plus-aosp\n\n* commit \u002750395e80718e77d27ec5e2d474b255e05de68d82\u0027:\n Fix a fun bug with multiple service bindings from an activity.\n" }, { "commit": "43d9ac81f7722bb539ee67023f10b9f43abbf202", "tree": "e81f0d385b2b5f6b7d3965c32cf6e890d750770b", "parents": [ "8395b4625b96f2133e2e4f595fdc69fbe222e4fc" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 15:06:25 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Aug 25 15:09:17 2010 -0700" }, "message": "Fix a fun bug with multiple service bindings from an activity.\n\nThere was a flaw in the service management, when the same activity\nis doing a bindService() for the same service IBinder. In this case\nthe activity would correctly keep a list of all generated connections,\nhowever some other data structures would assume there is only one\nconnection per IBinder, and thus only remember the last.\n\nWhen that last connection was unbound, the service would be destroyed\nsince it thought there were no more connections. Then when the\nactivity was finished, it would try to destroy the service again and\nend up with an ANR because the service was already gone and would\nnot respond.\n\nChange-Id: I59bde38bc24e78147b90b0a7cd525c2a1d20489f\n" } ], "next": "43b9b48f792e0b1b166af7f7fb6a32172e7f11c2" }