Dianne Hackborn
5048bb9f67
am 9ed9c0e4: am d93df9ca: am b37abe38: am d3cc4967: Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
2010-04-07 19:10:13 -07:00
Dianne Hackborn
28606319e6
am d93df9ca: am b37abe38: am d3cc4967: Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
2010-04-07 19:00:35 -07:00
Dianne Hackborn
e7e4dd436b
am b37abe38: am d3cc4967: Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
...
Merge commit 'b37abe3867d582d68918d38f0684783f457543bb' into kraken
* commit 'b37abe3867d582d68918d38f0684783f457543bb':
Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app
2010-04-07 18:57:33 -07:00
Dianne Hackborn
b5e539d0a3
am 2b973a6b: am 90dd6462: am 48879933: am 390022b2: Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
2010-04-07 18:43:08 -07:00
Dianne Hackborn
8b19a84593
am d3cc4967: Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
...
Merge commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed' into froyo-plus-aosp
* commit 'd3cc4967605e6c6b243a447d569fbb5b988a30ed':
Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app
2010-04-07 18:41:42 -07:00
Dianne Hackborn
16aa0f03d2
am 90dd6462: am 48879933: am 390022b2: Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
2010-04-07 18:40:15 -07:00
Dianne Hackborn
0947ffa2bd
am 48879933: am 390022b2: Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
...
Merge commit '4887993381af1068cb0c68b4eca29ed83ebf47bd' into kraken
* commit '4887993381af1068cb0c68b4eca29ed83ebf47bd':
Fix issue #2528537 : android.os.DeadObjectException
2010-04-07 18:37:12 -07:00
Dianne Hackborn
aba899bb7d
Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
2010-04-07 18:37:04 -07:00
Dianne Hackborn
7aed49313c
am 390022b2: Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
...
Merge commit '390022b23b2c53119ff0bde4b14d14728bc48bb2' into froyo-plus-aosp
* commit '390022b23b2c53119ff0bde4b14d14728bc48bb2':
Fix issue #2528537 : android.os.DeadObjectException
2010-04-07 18:33:23 -07:00
Grace Kloba
71c6c2acc1
am d0010038: am c020ec57: am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
2010-04-07 18:31:37 -07:00
Dianne Hackborn
0f606ea702
Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
2010-04-07 18:31:06 -07:00
Grace Kloba
901853b85d
am c020ec57: am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
2010-04-07 18:28:43 -07:00
Grace Kloba
23d57bd5c3
am edee621f: am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
...
Merge commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293' into kraken
* commit 'edee621f5cdfa72437aa16a804ffc872f8ddf293':
Cherry-pick https://android-git.corp.google.com/g/#change,38305
2010-04-07 18:26:38 -07:00
Grace Kloba
6b76ae1c2d
am faa2d970: Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
...
Merge commit 'faa2d970058557fa31d06d168b402d592c368aaf' into froyo-plus-aosp
* commit 'faa2d970058557fa31d06d168b402d592c368aaf':
Cherry-pick https://android-git.corp.google.com/g/#change,38305
2010-04-07 18:23:25 -07:00
Grace Kloba
2768afff40
Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
2010-04-07 18:18:17 -07:00
John Wang
c98ddc1fe1
am cdb60148: am 90f2a71e: am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
2010-04-07 18:06:57 -07:00
John Wang
b4fc8dfd61
am 90f2a71e: am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
2010-04-07 18:02:56 -07:00
John Wang
443e448d27
am 7ecf08fa: am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
...
Merge commit '7ecf08faa9da7d372dd319aac8b1e5760a116601' into kraken
* commit '7ecf08faa9da7d372dd319aac8b1e5760a116601':
Add emergencyOnly indicator in ServiceState.
2010-04-07 17:58:53 -07:00
John Wang
8551b6600d
am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
...
Merge commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656' into froyo-plus-aosp
* commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656':
Add emergencyOnly indicator in ServiceState.
2010-04-07 17:54:27 -07:00
John Wang
0a8cf0b36b
Merge "Add emergencyOnly indicator in ServiceState." into froyo
2010-04-07 17:51:41 -07:00
San Mehat
d0ead8ebb7
am cf1a7a77: am 12ebde61: am 692329cf: am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
2010-04-07 16:45:31 -07:00
Suchi Amalapurapu
c03284678d
am 4cdd682c: am 070e1ecf: am a137cf2a: am 4b18ced6: Merge "Fix 2578016." into froyo
2010-04-07 16:45:27 -07:00
San Mehat
1a56917d22
am 12ebde61: am 692329cf: am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
2010-04-07 16:40:49 -07:00
Suchi Amalapurapu
91e361f244
am 070e1ecf: am a137cf2a: am 4b18ced6: Merge "Fix 2578016." into froyo
2010-04-07 16:40:45 -07:00
San Mehat
8f4995fc1d
am 692329cf: am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
...
Merge commit '692329cf3f1512b3f0475b619058f9a10d9950a8' into kraken
* commit '692329cf3f1512b3f0475b619058f9a10d9950a8':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
2010-04-07 16:36:07 -07:00
Suchi Amalapurapu
3bfed658ba
am a137cf2a: am 4b18ced6: Merge "Fix 2578016." into froyo
...
Merge commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe' into kraken
* commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe':
Fix 2578016.
2010-04-07 16:35:57 -07:00
San Mehat
232106be56
am fd998a0c: Merge "NetworkManagementService: Remove \'maxkbs\' parameter from throttle API" into froyo
...
Merge commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85' into froyo-plus-aosp
* commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
2010-04-07 16:32:29 -07:00
Suchi Amalapurapu
e8c087e789
am 4b18ced6: Merge "Fix 2578016." into froyo
...
Merge commit '4b18ced6b5409bb9dd4013c06b9562b76a062939' into froyo-plus-aosp
* commit '4b18ced6b5409bb9dd4013c06b9562b76a062939':
Fix 2578016.
2010-04-07 16:32:26 -07:00
San Mehat
25d9df20a2
Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo
2010-04-07 15:32:44 -07:00
Suchi Amalapurapu
60e514bfb4
Merge "Fix 2578016." into froyo
2010-04-07 15:25:51 -07:00
Christopher Tate
d4c716f65b
am 5247bbd5: am 3b045eb0: am 560607ca: am 98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
2010-04-07 14:31:03 -07:00
Christopher Tate
ad1729397a
am 3b045eb0: am 560607ca: am 98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
2010-04-07 14:28:28 -07:00
Christopher Tate
7743458a44
am 560607ca: am 98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
...
Merge commit '560607ca530d88869ac87e5875de7efdcd0f7b85' into kraken
* commit '560607ca530d88869ac87e5875de7efdcd0f7b85':
Add Backup/Restore sample to the SDK docs
2010-04-07 14:24:48 -07:00
Christopher Tate
079edce86d
am 98e26575: Merge "Add Backup/Restore sample to the SDK docs" into froyo
...
Merge commit '98e26575373461dc16c749d1f756403e46a909d4' into froyo-plus-aosp
* commit '98e26575373461dc16c749d1f756403e46a909d4':
Add Backup/Restore sample to the SDK docs
2010-04-07 14:22:23 -07:00
Christopher Tate
727b5ff4e6
Merge "Add Backup/Restore sample to the SDK docs" into froyo
2010-04-07 14:19:44 -07:00
Marco Nelissen
e53f6e4966
am 92431300: am 724f3008: am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
2010-04-07 13:53:07 -07:00
Ray Chen
135b99d12a
am e4b62c23: am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
2010-04-07 13:52:52 -07:00
Dianne Hackborn
a9059f5e30
am c24a1498: am 7aed1e14: am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
2010-04-07 13:52:46 -07:00
Dianne Hackborn
a43062d2ca
am 9004f5b8: am d00fb429: am 03e352a2: am 8258fda1: Fix issue #2576268 : There is no uiMode config change constant for the manifest
2010-04-07 13:52:42 -07:00
Marco Nelissen
0f02c803ac
am 724f3008: am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
2010-04-07 13:40:38 -07:00
Marco Nelissen
86f84b7653
am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
...
Merge commit 'ca9a083bcf1ad753812e14f506c210a2104342c5' into kraken
* commit 'ca9a083bcf1ad753812e14f506c210a2104342c5':
Don't check whether a specific named activity supports mp3 playback,
2010-04-07 13:37:21 -07:00
Marco Nelissen
eabd04795a
am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
...
Merge commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda' into froyo-plus-aosp
* commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda':
Don't check whether a specific named activity supports mp3 playback,
2010-04-07 13:33:11 -07:00
Marco Nelissen
138da33e45
Merge "Don't check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
2010-04-07 13:28:51 -07:00
Ray Chen
083e0f4d0b
am 84d12f3f: am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
2010-04-07 12:17:57 -07:00
Ray Chen
5f6e847ad2
am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
...
Merge commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken
* commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2010-04-07 12:14:49 -07:00
Ray Chen
34e03df4e9
am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
...
Merge commit '25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp
* commit '25c2dd60d43298c18b9459abd6ff33046d675fe6':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2010-04-07 12:09:42 -07:00
Ray Chen
5560ff353d
Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
2010-04-07 12:05:58 -07:00
Dianne Hackborn
f225c59376
am 7aed1e14: am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
2010-04-07 12:03:05 -07:00
Dianne Hackborn
4a8ddbd1e5
am d00fb429: am 03e352a2: am 8258fda1: Fix issue #2576268 : There is no uiMode config change constant for the manifest
2010-04-07 12:03:00 -07:00
Dianne Hackborn
291d0fb7d1
am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
...
Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken
* commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
Maybe fix issue #2568615 : System server crashed in SyncStorageEngine
2010-04-07 11:58:21 -07:00