1091 Commits

Author SHA1 Message Date
Dianne Hackborn
8cbafb83b4 am 7fa61063: am f836acf2: Merge change I067d55ea into eclair
Merge commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6' into eclair-mr2-plus-aosp

* commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 11:21:04 -07:00
Dianne Hackborn
7fa610638b am f836acf2: Merge change I067d55ea into eclair
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2

* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
2009-10-12 11:11:30 -07:00
Dianne Hackborn
aa80b60b59 Fix issue #2179931: Power key to wake up frequently ignored when in dock app
The dock app is forcing the screen to a particular brightness level.  This
causes the window manager to often call into the power manager with the
new brightness.  This causes us to go in to updateLightsLocked() to figure
out and apply the real brightness to use.  When the screen is off the
real brightness always remains 0, but even if it didn't change from the
last one we would start an animation which would when done put the system
to sleep and fight with the user trying to turn the device on.

Now, if the new target brightness is the same as the last one, we leave the
animation as-is -- either running or not as appropriate.

Change-Id: I067d55ea2b39e294c5d5291587a4d8727c0b8083
2009-10-09 17:38:26 -07:00
David Krause
a614b948e1 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-09 01:28:12 -07:00
Robert Greenwalt
6105ea00a8 am 98e0b146: Make PhoneStateListeners not call TelephonyManager
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-plus-aosp

* commit '98e0b146b80670b52805b4b210ef5582dad6bb68':
  Make PhoneStateListeners not call TelephonyManager
2009-10-09 01:22:57 -07:00
Robert Greenwalt
2515cf85d5 am 98e0b146: Make PhoneStateListeners not call TelephonyManager
Merge commit '98e0b146b80670b52805b4b210ef5582dad6bb68' into eclair-mr2

* commit '98e0b146b80670b52805b4b210ef5582dad6bb68':
  Make PhoneStateListeners not call TelephonyManager
2009-10-09 01:22:22 -07:00
Robert Greenwalt
98e0b146b8 Make PhoneStateListeners not call TelephonyManager
Since the StatusBarPolicy is run in the System Process and shouldn't therefore call into
the Telephony process we decided to make sure all the needed info was passed along with the
original notifications.

bug: 2173053
2009-10-09 00:54:31 -07:00
James Dong
6195432b6f Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-08 19:18:48 -07:00
Dianne Hackborn
93939786f9 am 2c6c5e6e: Fix issue #2176944: Need API so browser, others can determine memory size of device
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-plus-aosp

* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
  Fix issue #2176944: Need API so browser, others can determine memory size of device
2009-10-08 19:09:38 -07:00
Dianne Hackborn
81aaf56f90 am 2c6c5e6e: Fix issue #2176944: Need API so browser, others can determine memory size of device
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-mr2

* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
  Fix issue #2176944: Need API so browser, others can determine memory size of device
2009-10-08 19:09:17 -07:00
Dianne Hackborn
0c35e6ff1d am d10d02f5: Merge change I490e01ba into eclair
Merge commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6' into eclair-mr2

* commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6':
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
2009-10-08 18:44:37 -07:00
Dianne Hackborn
374efe6a96 am d10d02f5: Merge change I490e01ba into eclair
Merge commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6' into eclair-plus-aosp

* commit 'd10d02f53ec00bfa9eb9f5accf6454e4a4bbb6a6':
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
2009-10-08 18:43:54 -07:00
Dianne Hackborn
2c6c5e6e49 Fix issue #2176944: Need API so browser, others can determine memory size of device
Change-Id: I65d91cdb70df91b67fe84297dd6a94d26a785131
2009-10-08 18:43:47 -07:00
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
d5b090b26b am 348b92bd: Merge change Iee227ace into eclair
Merge commit '348b92bd513087369ac682e29620d7829fa1381b' into eclair-mr2

* commit '348b92bd513087369ac682e29620d7829fa1381b':
  GPS: Fix problem with SUPL when SUPL APN is already active.
2009-10-08 17:32:31 -07:00
John Wang
2d4b58f29e am 33e21fcc: Control H icon display in Status bar.
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2

* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
  Control H icon display in Status bar.
2009-10-08 17:30:12 -07:00
Dianne Hackborn
3612487d61 Fix issue #2174566: HOT STABILITY: NPE in activity manager
- Don't crash if the service's app process doesn't have a thread (this
  can happen if we are currently starting the process and then try to
  start the service again).
- Be more robust about deciding to start a service's process: try each
  time it is started; the startProcess call will take care of ignoring
  it if the process is already started.
- Fix some issues where we would leave dead processes on the low memory
  list.

Change-Id: I490e01ba7b45adc191bab7ace377b6873e284897
2009-10-08 16:22:03 -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
Joshua Bartel
41ae5d5add am bd324c9b: Merge change I50a321c9 into eclair
Merge commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-mr2

* commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
  LocationManagerService: Fix race when removing LocationListener
2009-10-08 10:33:51 -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
8c815d9ded am b134b203: Merge change Id8c9cb2f into eclair
Merge commit 'b134b2038ecabcbec3f9b657834d45de27707068' into eclair-mr2

* commit 'b134b2038ecabcbec3f9b657834d45de27707068':
  More fix #2163209: alarm clock rings but is hidden behind lock screen
2009-10-07 22:07:54 -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
83b600803c am 9af53ea6: am 3161795b: when logging free space on /data, log /system and /cache as well
Merge commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec' into eclair-mr2

* commit '9af53ea6ef9a986bc65bcd11deb7994f1f4ba8ec':
  when logging free space on /data, log /system and /cache as well
2009-10-07 18:24:03 -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
d78fbdddea am 568cae57: Fix issue #2171460: Turn off background blurring of power dialog
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-mr2

* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
  Fix issue #2171460: Turn off background blurring of power dialog
2009-10-07 17:45:14 -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
d7ebc7a42d am 7a865a5d: Merge change Ieed8be00 into eclair
Merge commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c' into eclair-mr2

* commit '7a865a5de8214aa4975371b9d8a2165a01f6b69c':
  Introduce BluetoothAdapter.getDefaultAdapter().
2009-10-07 16:36:15 -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