Commit Graph

14694 Commits

Author SHA1 Message Date
Dianne Hackborn
e312f161e3 am 48357eee: am b921b37b: am a327dbdd: am ecb0e637: Fix issue #2541849: System crash when an app with active notifications... 2010-04-07 22:48:22 -07:00
Dianne Hackborn
e14a2862ab am b921b37b: am a327dbdd: am ecb0e637: Fix issue #2541849: System crash when an app with active notifications... 2010-04-07 22:44:56 -07:00
Dianne Hackborn
f7dc4ca344 am a327dbdd: am ecb0e637: Fix issue #2541849: System crash when an app with active notifications...
Merge commit 'a327dbddccb002919b98bdfd7abd81619826a3b8' into kraken

* commit 'a327dbddccb002919b98bdfd7abd81619826a3b8':
  Fix issue #2541849: System crash when an app with active notifications...
2010-04-07 22:42:46 -07:00
Dianne Hackborn
356f09beba am ecb0e637: Fix issue #2541849: System crash when an app with active notifications...
Merge commit 'ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp

* commit 'ecb0e637870553f9c12dc6b9178de0512563af9c':
  Fix issue #2541849: System crash when an app with active notifications...
2010-04-07 22:39:18 -07:00
Wu-cheng Li
645c78914e am 1479d202: am 249c902c: am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review. 2010-04-07 22:10:18 -07:00
Wu-cheng Li
e607682fb7 am 249c902c: am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review. 2010-04-07 22:06:37 -07:00
Wu-cheng Li
051a9b3687 am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review.
Merge commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken

* commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db':
  Update API and javadoc according to API review.
2010-04-07 22:01:54 -07:00
Wu-cheng Li
ba00ad094e am 3f4639a6: Update API and javadoc according to API review.
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp

* commit '3f4639a6611222ae1ae5493de49213250d292139':
  Update API and javadoc according to API review.
2010-04-07 21:58:21 -07:00
Suchi Amalapurapu
f1af75602e am eb606ec9: am 3e543abb: am a599469f: 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 2010-04-07 21:40:29 -07:00
Suchi Amalapurapu
c530fdf60c am 3e543abb: am a599469f: 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 2010-04-07 21:36:43 -07:00
Suchi Amalapurapu
7b18bae449 am a599469f: 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 'a599469f9095532cac95a8e7600412f156b88f1c' into kraken

* commit 'a599469f9095532cac95a8e7600412f156b88f1c':
  Fix 2579461
2010-04-07 21:32:30 -07:00
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
2cb3b9f368 am f0dc083d: am d49c455c: am 822a7e2d: am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser... 2010-04-07 19:22:29 -07:00
Dianne Hackborn
104e3100eb am d49c455c: am 822a7e2d: am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser... 2010-04-07 19:17:45 -07:00
Grace Kloba
9d9e89f276 am 390aca99: am 962ebd1f: am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 19:17:37 -07:00
Grace Kloba
45f1793ada am 962ebd1f: am 520d6840: am 667543cd: Merge "Revert "Use the content width to calculate the zoom overview"" into froyo 2010-04-07 19:14:53 -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
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
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
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
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
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