2397 Commits

Author SHA1 Message Date
Robert Greenwalt
ac6ec41b67 resolved conflicts for merge of 4e33e9c1 to master
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
2010-04-08 13:54:58 -07:00
Robert Greenwalt
6646cf7af9 am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken

* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
  Add service to monitor/control the flow of data.
2010-04-08 12:49:38 -07:00
Robert Greenwalt
6f72a313a0 am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp

* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
  Add service to monitor/control the flow of data.
2010-04-08 12:45:51 -07:00
Robert Greenwalt
9e696c29f0 Add service to monitor/control the flow of data.
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
2010-04-08 12:34:45 -07:00
The Android Open Source Project
260fc5f9e4 am 5e78c1f4: am c9522c95: am 727cec02: merge from open-source master 2010-04-08 11:45:17 -07:00
The Android Open Source Project
c9522c95ef am 727cec02: merge from open-source master
Merge commit '727cec02daa66b5e984aff277185d503fabe5d51' into kraken

* commit '727cec02daa66b5e984aff277185d503fabe5d51':
  Fix reporting of window visibility in WindowManagerService.
2010-04-08 11:39:51 -07:00
The Android Open Source Project
727cec02da merge from open-source master
Change-Id: I0902959c7703bd3a1c41abfc6a8788b89d0aa977
2010-04-08 11:35:37 -07:00
Dianne Hackborn
40e8b1de9a 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
b921b37b1c 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
a327dbddcc 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
Dianne Hackborn
ecb0e63787 Fix issue #2541849: System crash when an app with active notifications...
...in status bar is installed on sdcard and device is powered down.

Don't do the GC until everyone has had a chance to take care of external
storage going away.

This is more correct, but doesn't completely fix the problem that
appears when shutting down.

Change-Id: I24b19337ba6262cfd8d010645dbf67e76ea03058
2010-04-07 22:19:55 -07:00
Suchi Amalapurapu
4baf4e6a74 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
3e543abbc1 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
a599469f90 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
c2461be627 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
Suchi Amalapurapu
40e472521a 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.

Change-Id: I80e97b3d24845adad7102f40dcbe238f00efa406
2010-04-07 20:43:54 -07:00
Dianne Hackborn
64c660ccd8 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
90dd6462db 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
4887993381 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
390022b23b Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo 2010-04-07 18:31:06 -07:00
John Wang
ada88000c9 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
90f2a71e1e 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
7ecf08faa9 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
815b8e4ac4 Merge "Add emergencyOnly indicator in ServiceState." into froyo 2010-04-07 17:51:41 -07:00
Dianne Hackborn
472ad8716e Fix issue #2528537: android.os.DeadObjectException
Nice.

Change-Id: I6142b12b5770b508ff4a43361da6f5e52bed2de9
2010-04-07 17:31:48 -07:00
San Mehat
a334389373 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
716abe5739 am 4cdd682c: am 070e1ecf: am a137cf2a: am 4b18ced6: Merge "Fix 2578016." into froyo 2010-04-07 16:45:27 -07:00
San Mehat
12ebde61a5 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
070e1ecfee 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
692329cf3f 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
a137cf2a18 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
John Wang
56c2d2ff27 Add emergencyOnly indicator in ServiceState.
For bug 2536842 to show signal strength in Emergency mode.

The STATE_EMERGENCY_ONLY of ServiceState is not in-use.

So add a hide interface to indicate Emergency mode.

Change-Id: I19398ac5e73a722dcaaf744347f961d1fa7513ac
2010-04-07 16:06:13 -07:00
San Mehat
fd998a0caf Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo 2010-04-07 15:32:44 -07:00
San Mehat
f0db6e1853 NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Change-Id: I1cfbdac7d06478243931c6acec462da8e257f42f
Signed-off-by: San Mehat <san@google.com>
2010-04-07 15:22:10 -07:00
Suchi Amalapurapu
30f775b12a Fix 2578016.
Add some checks before moving package.
Checkin test code.
Regenerate test apks

Change-Id: I769ece128fefd3429ce93208a77d887c7759d2e1
2010-04-07 11:43:31 -07:00
Dianne Hackborn
00cdbc6235 am 357bff46: am 710312b3: am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 2010-04-06 12:52:20 -07:00
Dianne Hackborn
357bff46b8 am 710312b3: am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Merge commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532' into kraken

* commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
2010-04-06 12:43:00 -07:00
Suchi Amalapurapu
1a456c142b am 728e4cc8: am e6fdab7f: am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo 2010-04-06 12:42:22 -07:00
Dianne Hackborn
710312b3bb am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Merge commit '48bce4515d948971a122a1e17fd1919f81297d77' into froyo-plus-aosp

* commit '48bce4515d948971a122a1e17fd1919f81297d77':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
2010-04-06 12:38:22 -07:00
Irfan Sheriff
656a66c364 am b6f7123b: am 7eeb44f2: am b2e6c01f: Disable tethering when airplane mode is enabled 2010-04-06 12:38:20 -07:00
Dianne Hackborn
48bce4515d Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 2010-04-06 11:18:01 -07:00
Dianne Hackborn
f22221fd19 Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
This is a quick and dirty solution to re-assign permissions after booting
from a platform update.  It is not great, because it means that an app
can have permissions that the user didn't get to see when they originally
installed it.  Unfortunately it's not clear what else to do here, nor is
there time to do anything significant.

Change-Id: I82faba141b5883c87212afa7febecf9860a413e3
2010-04-06 11:17:08 -07:00
Suchi Amalapurapu
728e4cc88f am e6fdab7f: am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo
Merge commit 'e6fdab7f005cc06df989c97907c3cc3060692121' into kraken

* commit 'e6fdab7f005cc06df989c97907c3cc3060692121':
  Forcibly unmount the sdcard after N retries.
2010-04-06 11:00:08 -07:00
Suchi Amalapurapu
e6fdab7f00 am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo
Merge commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c' into froyo-plus-aosp

* commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c':
  Forcibly unmount the sdcard after N retries.
2010-04-06 10:55:43 -07:00
Irfan Sheriff
b6f7123bd6 am 7eeb44f2: am b2e6c01f: Disable tethering when airplane mode is enabled
Merge commit '7eeb44f20527caaad618e28ba511e7661f5904cb' into kraken

* commit '7eeb44f20527caaad618e28ba511e7661f5904cb':
  Disable tethering when airplane mode is enabled
2010-04-06 10:52:52 -07:00
Suchi Amalapurapu
fede9aed2b Merge "Forcibly unmount the sdcard after N retries." into froyo 2010-04-06 10:50:56 -07:00
Irfan Sheriff
7eeb44f205 am b2e6c01f: Disable tethering when airplane mode is enabled
Merge commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6' into froyo-plus-aosp

* commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6':
  Disable tethering when airplane mode is enabled
2010-04-06 10:48:46 -07:00
Irfan Sheriff
b2e6c01f44 Disable tethering when airplane mode is enabled
Tethering should be disabled when
airplane mode is enabled. Additionally,
we should restore Wifi (if it was on
before tethering was enabled) when
airplane mode is disabled.

Bug: 2567099
Change-Id: Iba2031f5ecb207954fd155c47134b39ed0167fa0
2010-04-06 10:35:27 -07:00
Suchi Amalapurapu
7af074a612 Forcibly unmount the sdcard after N retries.
Don't rely on the ActivityManager's reported status about killing the
storage user process since the process might have gone away in between.

Change-Id: Ia7fa43eb34553329e7ff611ab6b99375b5ae673a
2010-04-06 10:02:34 -07:00
Dianne Hackborn
7a3a6dba21 am 5a0797a9: am c94dad83: am 6e52b5d7: 2568467 System crash when installing corrupt APK 2010-04-05 19:02:57 -07:00