Commit Graph

14430 Commits

Author SHA1 Message Date
Suchi Amalapurapu
33409ed31f am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Merge commit 'c2461be6279137f872becf695befeb7ba8770a64' into froyo-plus-aosp

* commit 'c2461be6279137f872becf695befeb7ba8770a64':
  Fix 2579461
2010-04-07 21:29:05 -07:00
Suchi Amalapurapu
de14d8f178 Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 2010-04-07 21:24:36 -07:00
Dianne Hackborn
b50eb1d9db am 822a7e2d: am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser...
Merge commit '822a7e2defcfbd006a7840e1da19cf0827d46736' into kraken

* commit '822a7e2defcfbd006a7840e1da19cf0827d46736':
  Fix issue #2578244: playing audio file downloaded by the browser...
2010-04-07 19:13:22 -07:00
Dianne Hackborn
cad1d540bc am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser...
Merge commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp

* commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d':
  Fix issue #2578244: playing audio file downloaded by the browser...
2010-04-07 19:07:54 -07:00
Grace Kloba
f1d7190566 am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Merge commit '520d684093b50c25d06aac652ad4bca42ff7e862' into kraken

* commit '520d684093b50c25d06aac652ad4bca42ff7e862':
  Revert "Use the content width to calculate the zoom overview"
2010-04-07 19:05:32 -07:00
Grace Kloba
ec874971f5 am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Merge commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp

* commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
  Revert "Use the content width to calculate the zoom overview"
2010-04-07 19:00:40 -07:00
Grace Kloba
3d339a93b9 Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 18:57:52 -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
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
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
Dianne Hackborn
0f606ea702 Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 2010-04-07 18:31:06 -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
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
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
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
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
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
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
Dianne Hackborn
380126c824 am 03e352a2: am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest
Merge commit '03e352a2850d74cee11d3f0734938efb22cac351' into kraken

* commit '03e352a2850d74cee11d3f0734938efb22cac351':
  Fix issue #2576268: There is no uiMode config change constant for the manifest
2010-04-07 11:58:17 -07:00
Dianne Hackborn
651e63c4f7 am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit '4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp

* commit '4e7cacd3e44bd222a7892113336caff571a9983a':
  Maybe fix issue #2568615: System server crashed in SyncStorageEngine
2010-04-07 11:52:21 -07:00
Dianne Hackborn
3d47856532 am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest
Merge commit '8258fda17741b4969b93ffbe8796c76e427a9f27' into froyo-plus-aosp

* commit '8258fda17741b4969b93ffbe8796c76e427a9f27':
  Fix issue #2576268: There is no uiMode config change constant for the manifest
2010-04-07 11:52:17 -07:00
Dianne Hackborn
e098fb12b8 Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo 2010-04-07 11:49:37 -07:00
Andreas Huber
dd61da6deb am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Merge commit '01f78928228cd097bc6816ae03909a2b01d5c1d5' into kraken

* commit '01f78928228cd097bc6816ae03909a2b01d5c1d5':
  Report the requested seek time while seek is in progress.
2010-04-07 11:05:56 -07:00
Andreas Huber
ddb4ab191d am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Merge commit '567b57b68884c68e3c95834589e5f7921f380a45' into froyo-plus-aosp

* commit '567b57b68884c68e3c95834589e5f7921f380a45':
  Report the requested seek time while seek is in progress.
2010-04-07 11:02:11 -07:00
Andreas Huber
5bf9232cf2 Merge "Report the requested seek time while seek is in progress." into froyo 2010-04-07 10:58:05 -07:00
Xia Wang
1a5472e812 am b151f48a: am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit 'b151f48a06d9473a8ec079d928d4203d13e2568b' into kraken

* commit 'b151f48a06d9473a8ec079d928d4203d13e2568b':
  Fix bug2537659
2010-04-07 10:36:31 -07:00
Romain Guy
f7610d26ea am 2a9ec986: am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
Merge commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97' into kraken

* commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97':
  Search for focusable views only after layout has happened when the window is first created.
2010-04-07 10:36:28 -07:00
Xia Wang
f8f27eeccc am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit 'c93386cece18b8467c69004561e8f22b6b053d24' into froyo-plus-aosp

* commit 'c93386cece18b8467c69004561e8f22b6b053d24':
  Fix bug2537659
2010-04-07 10:32:38 -07:00
Romain Guy
31c09444e5 am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
Merge commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8' into froyo-plus-aosp

* commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8':
  Search for focusable views only after layout has happened when the window is first created.
2010-04-07 10:32:34 -07:00
Xia Wang
9a3965f1f8 Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo 2010-04-07 10:30:19 -07:00
Leon Scroggins
0f2d821d73 am efaee761: am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit 'efaee761022305d74e63237d87809582514bd5e2' into kraken

* commit 'efaee761022305d74e63237d87809582514bd5e2':
  Show the microphone when the search box is opened from browser
2010-04-07 10:13:28 -07:00
Leon Scroggins
3858f94f45 am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit '083c715d06a99951429b38c62484f8c3caf43cd1' into froyo-plus-aosp

* commit '083c715d06a99951429b38c62484f8c3caf43cd1':
  Show the microphone when the search box is opened from browser
2010-04-07 10:09:06 -07:00
Leon Scroggins
e5794f17df Merge "Show the microphone when the search box is opened from browser" into froyo 2010-04-07 10:04:50 -07:00