1070 Commits

Author SHA1 Message Date
Eric Fischer
94f3a36326 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 17:52:53 -07:00
Mike Lockwood
a4f6c96f1a am 348b92bd: Merge change Iee227ace into eclair
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-plus-aosp

* commit '348b92bd513087369ac682e29620d7829fa1381b':
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 15:10:25 -07:00
Brett Chabot
0221ec55ac Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 14:38:45 -07:00
Mike Lockwood
03d246779e GPS: Fix problem with SUPL when SUPL APN is already active.
Use ConnectivityManager.CONNECTIVITY_ACTION broadcast in LocationManagerService
to notify GPS when SUPL connection is ready instead of TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
which is not sent in all cases.
Expand LocationProvider.updateNetworkState() to include NetworkInfo object.

Fixes bug b/2155661

Change-Id: Iee227ace7d536b36cf7973e3e6a8b7a621ce6565
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-08 17:24:21 -04:00
John Wang
c6726351a6 am 33e21fcc: Control H icon display in Status bar.
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-plus-aosp

* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
  Control H icon display in Status bar.
2009-10-08 11:57:11 -07:00
John Wang
33e21fcc99 Control H icon display in Status bar.
Bug 2138275. Add a config setting to control if status bar
should show different icons for UMTS and HSPA connnection.
2009-10-08 11:46:53 -07:00
Daisuke Miyakawa
5f836334e3 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 10:53:26 -07:00
Joshua Bartel
cd6c33dec9 am bd324c9b: Merge change I50a321c9 into eclair
Merge commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-plus-aosp

* commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 10:41:13 -07:00
Android (Google) Code Review
bd324c9bd3 Merge change I50a321c9 into eclair
* changes:
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 12:58:48 -04:00
Joshua Bartel
080b61ba17 LocationManagerService: Fix race when removing LocationListener
In LocationManagerService if a LocationListener is removed while it has
a pending broadcast the wake lock held while pending broadcasts are
outstanding do not get cleared properly.

There are 2 cases of this race that are fixed:

1. locationCallbackFinished was changed to check the mReceivers HashMap
directly instead of calling getReceiver.  getReceiver would add the
ILocationListener as a new Receiver if it did not exist which caused
a receiver that was removed when it still had a broadcast pending to
be added back in a bad state when the pending broadcast completed.

2. removeUpdatesLocked was changed to decrement the pending broadcasts
when a Receiver is removed that has pending broadcasts.

Fixes bug b/2163871

Change-Id: I50a321c9b3359bf69845236dc4a4b9e38e847335
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-08 10:09:41 -04:00
Dianne Hackborn
c7ed01f401 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 22:13:28 -07:00
Dianne Hackborn
3f4313667e am b134b203: Merge change Id8c9cb2f into eclair
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-plus-aosp

* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-07 22:08:15 -07:00
Dianne Hackborn
3d163f073f More fix #2163209: alarm clock rings but is hidden behind lock screen
There was another way we could ignore the application windows flags
while the lock screen was displayed.  This is the infrastructure to
deal with that.

Change-Id: Id8c9cb2f7081df6757ccb797a7cde618e82f7b38
2009-10-07 21:26:57 -07:00
Grace Kloba
9136c39d49 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 21:19:12 -07:00
Doug Zongker
3253b16a0d am 9af53ea6: am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec' into eclair-plus-aosp

* commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec':
  when logging free space on /data, log /system and /cache as well
2009-10-07 18:22:05 -07:00
Doug Zongker
9af53ea6ef am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '3161795b2353171bb0636fb3ea6dab7dec80a4f4' into eclair

* commit '3161795b2353171bb0636fb3ea6dab7dec80a4f4':
  when logging free space on /data, log /system and /cache as well
2009-10-07 18:17:06 -07:00
Dianne Hackborn
fb256574b4 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 17:55:40 -07:00
Dianne Hackborn
496b8c5d6b am 568cae57: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-plus-aosp

* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
  Fix issue #2171460: Turn off background blurring of power dialog
2009-10-07 17:45:08 -07:00
Dianne Hackborn
568cae571a Fix issue #2171460: Turn off background blurring of power dialog
Change-Id: I521629e0ccd0116acf149eeb7476c8474fc7c74a
2009-10-07 17:37:16 -07:00
Doug Zongker
3161795b23 when logging free space on /data, log /system and /cache as well
Report space free on system and cache so we can estimate bad block
statistics for devices in the field.
2009-10-07 17:16:07 -07:00
Nick Pelly
b2ad0f18bc Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-07 16:41:37 -07:00
Nick Pelly
8af4d8797f am 7a865a5d: Merge change Ieed8be00 into eclair
Merge commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c' into eclair-plus-aosp

* commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c':
  Introduce BluetoothAdapter.getDefaultAdapter().
2009-10-07 16:36:23 -07:00
Nick Pelly
f242b7b931 Introduce BluetoothAdapter.getDefaultAdapter().
This is the main entry point to the Bluetooth APIs, and returns the default
local Bluetooth adapter.

It replaces context.getSystemService(Context.BLUETOOTH_SERVICE). This was
never in a public SDK release.

DrNo: eastham
Bug: 2158765
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
Change-Id: Ieed8be009ee5aba621cb69090ee8c8a9c19c840d
2009-10-08 00:27:17 +02:00
Dianne Hackborn
7a889217d7 am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-plus-aosp

* commit '0c3154d3fc54a1b3d8358a2932042cca729327b9':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 12:08:20 -07:00
Robert Greenwalt
c0565fb88c am 92b5caa4: Merge change Id8df149c into eclair
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-plus-aosp

* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
  Turn some logging back on in ConnectionManager
2009-10-07 11:57:26 -07:00
Suchi Amalapurapu
1d16200eef am 5163cd6d: Merge change I5be3d603 into eclair
Merge commit '5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-plus-aosp

* commit '5163cd6d1cb664977eb4473b98657c7e92ae430e':
  Make sdk version and code names static finals in PackageParser.
2009-10-07 11:54:44 -07:00
Dianne Hackborn
c4f52bd755 am 7e5c5d97: am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '7e5c5d975297ef76ae6640e06505a19fa8c0270e' into eclair-mr2-plus-aosp

* commit '7e5c5d975297ef76ae6640e06505a19fa8c0270e':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 11:52:39 -07:00
Robert Greenwalt
91f360869e am c24c0e9b: Merge change Ib8f16340 into eclair-mr2
Merge commit 'c24c0e9b5f81541af5d3094774eeebb4216655c5' into eclair-mr2-plus-aosp

* commit 'c24c0e9b5f81541af5d3094774eeebb4216655c5':
  Fix ConnectivityManager permissions check.
2009-10-07 11:52:32 -07:00
Dianne Hackborn
ae9fc51765 am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-plus-aosp

* commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
2009-10-07 11:49:01 -07:00
Dianne Hackborn
4083f8cf4d am 9830a4ac: Fix issue #2161169: onStop not being called.
Merge commit '9830a4ac42c9e16db91d1de6120cc2eb613fc946' into eclair-plus-aosp

* commit '9830a4ac42c9e16db91d1de6120cc2eb613fc946':
  Fix issue #2161169: onStop not being called.
2009-10-07 11:47:17 -07:00
Dianne Hackborn
031e4ac7dd am 48e6725c: Merge change Iaca22686 into eclair
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-plus-aosp

* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
  Work on issue #2163789: Way too much logging
2009-10-07 11:44:12 -07:00
Dianne Hackborn
463852db23 am cbc52b7b: Merge change Iee638412 into eclair
Merge commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910' into eclair-plus-aosp

* commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910':
  Fix issue #2161726: Car dock app bypasses setup wizard
2009-10-07 11:43:54 -07:00
Dianne Hackborn
7e5c5d9752 am 0c3154d3: Fix issue #2163654: deadlock, runtime restart
Merge commit '0c3154d3fc54a1b3d8358a2932042cca729327b9' into eclair-mr2

* commit '0c3154d3fc54a1b3d8358a2932042cca729327b9':
  Fix issue #2163654: deadlock, runtime restart
2009-10-07 11:41:19 -07:00
Dianne Hackborn
0c3154d3fc Fix issue #2163654: deadlock, runtime restart
Don't hold a lock when the activity thread is telling the activity manager
to release a provider.

This requires that the activity manager now keep a reference count on the
providers, because without the lock it is possible for activity thread to
call in to request the provider again before it has finished telling
about the release.

Change-Id: I5f912903891f4edae85e28819d4e6f14b8f2e688
2009-10-07 11:10:33 -07:00
Robert Greenwalt
b8f16340b5 Fix ConnectivityManager permissions check.
bug: 2160462
2009-10-06 17:52:40 -07:00
Robert Greenwalt
2a9b411d4e am e8830120: am 92b5caa4: Merge change Id8df149c into eclair
Merge commit 'e8830120c8e416a26520dfbbd0e386e77255dbda' into eclair-mr2-plus-aosp

* commit 'e8830120c8e416a26520dfbbd0e386e77255dbda':
  Turn some logging back on in ConnectionManager
2009-10-06 15:52:53 -07:00
Suchi Amalapurapu
5a535026bf am ef3c63ad: am 5163cd6d: Merge change I5be3d603 into eclair
Merge commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938' into eclair-mr2-plus-aosp

* commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938':
  Make sdk version and code names static finals in PackageParser.
2009-10-06 14:49:35 -07:00
Robert Greenwalt
d8df149cfb Turn some logging back on in ConnectionManager
Trimmed a bunch of logging out, but turned it on so we get the critical stuff.

bug: 2168291
2009-10-06 14:12:53 -07:00
Suchi Amalapurapu
8d5ae98549 Make sdk version and code names static finals in PackageParser.
Remove api to set these values.
    Remove an unused method in AppSecurityPermissions
2009-10-06 10:29:06 -07:00
Dianne Hackborn
4bc6158d6b am baad552d: am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit 'baad552dfd6e9d244659e7509ff958ec8f449c03' into eclair-mr2-plus-aosp

* commit 'baad552dfd6e9d244659e7509ff958ec8f449c03':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
2009-10-05 16:04:51 -07:00
Dianne Hackborn
68d881cf2d Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Tell the broadcast receiver whether it is getting an initial sticky value,
so it will be quiet about attempts to do ordered broadcast stuff.

Note that the original bug being reported was not actually a crash, just
an error log.  So all we are doing here is making the log quieter.

Change-Id: Iaf1b718d82093ec1197142410a64feff47eb3859
2009-10-05 15:52:32 -07:00
Dianne Hackborn
72650c31c7 am a4a8a88b: am 9830a4ac: Fix issue #2161169: onStop not being called.
Merge commit 'a4a8a88bf7aeec3413eda09c8a61c1df01c474ac' into eclair-mr2-plus-aosp

* commit 'a4a8a88bf7aeec3413eda09c8a61c1df01c474ac':
  Fix issue #2161169: onStop not being called.
2009-10-05 13:03:39 -07:00
Dianne Hackborn
9830a4ac42 Fix issue #2161169: onStop not being called.
There was a bug with the starting window where it could be added to
the app window list twice, so the buddy list would end up with one
left over after all was done.  This would result in visibility
changes not being delivered to it correctly, delaying the dispatch
of onStop.

Change-Id: If1993eaf9cfbba1f523ce5aaa478be0239d0c7db
2009-10-05 12:50:38 -07:00
Patrick Scott
8e20e88ba6 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-05 10:13:51 -07:00
Android (Google) Code Review
48e6725c82 Merge change Iaca22686 into eclair
* changes:
  Work on issue #2163789: Way too much logging
2009-10-04 18:35:24 -04:00
Dianne Hackborn
bd0a81ff1c Work on issue #2163789: Way too much logging
Dr.No from mcleron.

Change-Id: Iaca2268684f83fe8757e64db0b0e047a19755311
2009-10-04 14:48:47 -07:00
Dianne Hackborn
4949334d20 Fix issue #2161726: Car dock app bypasses setup wizard
We now just don't send out dock broadcasts/launches when the
device is not provisioned.  Good enough for our purposes.

Change-Id: Iee6384121675e0e9854745ec1168245e8a23a241
2009-10-02 12:38:34 -07:00
Romain Guy
436743075a am 9825ec61: Prevents the WindowManager from requesting empty or negative surfaces.
Merge commit '9825ec61b4a40ed92a5bb28019289e5bab9cfb56' into eclair-plus-aosp

* commit '9825ec61b4a40ed92a5bb28019289e5bab9cfb56':
  Prevents the WindowManager from requesting empty or negative surfaces.
2009-10-01 01:25:45 -07:00
Romain Guy
9825ec61b4 Prevents the WindowManager from requesting empty or negative surfaces.
Windows with a negative Y position can end up in createSurfaceLocked()
with mFrame containing a negative height, causing SurfaceFlinger to go
crazy when asked to create the surface. This change simply guards
against such a situation by instead asking for a 1x1 surface and relying
or later layout operations to resize the window to the appropriate size.

Change-Id: I66f2058f4cd1cf069b12d3d23e6fd340dc76b74e
2009-10-01 01:16:06 -07:00
Dianne Hackborn
41829e0138 am e88846ee: Semi-workaround for #2027266: app drawer showing up on the side of the screen
Merge commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6' into eclair-plus-aosp

* commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6':
  Semi-workaround for #2027266: app drawer showing up on the side of the screen
2009-09-30 23:42:37 -07:00