2703 Commits

Author SHA1 Message Date
Mike Lockwood
a42f4c249f am 0b6e30d2: am c5859388: am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 2010-05-17 15:08:48 -07:00
Mike Lockwood
c5859388bd am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
Merge commit '3e9e9696f147c8df1236c1d7aa9496124864a81c' into kraken

* commit '3e9e9696f147c8df1236c1d7aa9496124864a81c':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
2010-05-17 14:59:39 -07:00
Mike Lockwood
3e9e9696f1 am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp

* commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
2010-05-17 14:56:53 -07:00
Mike Lockwood
eb9cbb8fdd Resurrect flashlight support in obsolete IHardwareService Binder API.
This is to avoid flashlight apps that had been using reflection to access
this API after this class was removed after eclair.

Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-17 17:47:20 -04:00
Chung-yih Wang
c324d3365a am c7163cbf: am 533844d9: am c7388e35: am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo 2010-05-17 09:21:38 -07:00
Dianne Hackborn
7ac5618cc8 am 36bc4be0: am e0a19573: am 39c31bba: am aa77de13: Fix issue #2686193: Can\'t move apps to SD card 2010-05-17 09:21:19 -07:00
Chung-yih Wang
533844d968 am c7388e35: am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Merge commit 'c7388e3541c9f1d64dd13fc2de49ff77d8993fa5' into kraken

* commit 'c7388e3541c9f1d64dd13fc2de49ff77d8993fa5':
  Make the SSID field of WifiConfiguration consistent with API description.
2010-05-14 23:18:31 -07:00
Chung-yih Wang
c7388e3541 am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Merge commit '5f1beda18fc7709c2e61ace33607513770faf115' into froyo-plus-aosp

* commit '5f1beda18fc7709c2e61ace33607513770faf115':
  Make the SSID field of WifiConfiguration consistent with API description.
2010-05-14 23:16:31 -07:00
Chung-yih Wang
5f1beda18f Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo 2010-05-14 23:15:04 -07:00
Dianne Hackborn
e0a19573d7 am 39c31bba: am aa77de13: Fix issue #2686193: Can\'t move apps to SD card
Merge commit '39c31bbaf9bb07365a4b63144cdf625483851a08' into kraken

* commit '39c31bbaf9bb07365a4b63144cdf625483851a08':
  Fix issue #2686193: Can't move apps to SD card
2010-05-14 23:13:30 -07:00
Dianne Hackborn
39c31bbaf9 am aa77de13: Fix issue #2686193: Can\'t move apps to SD card
Merge commit 'aa77de1348cbda3d5348b15734ab141cb9c7759c' into froyo-plus-aosp

* commit 'aa77de1348cbda3d5348b15734ab141cb9c7759c':
  Fix issue #2686193: Can't move apps to SD card
2010-05-14 23:11:33 -07:00
Dianne Hackborn
aa77de1348 Fix issue #2686193: Can't move apps to SD card
Change-Id: Icd84d8080d33fb8ce5103a0e726d50f0ec70092e
2010-05-14 22:33:54 -07:00
Chung-yih Wang
047076d170 Make the SSID field of WifiConfiguration consistent with API description.
Bug id http://b/issue?id=2684571

Change-Id: I809478991ba606252d69ef007339754ab2856416
2010-05-15 11:03:30 +08:00
Suchi Amalapurapu
4952aef1c5 am 8e8bb02f: am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:09:30 -07:00
Suchi Amalapurapu
3f5ed04f7f am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken

* commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810':
  Fix 2672155
2010-05-13 16:05:54 -07:00
Suchi Amalapurapu
b63ea5f784 am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp

* commit 'c928a11e34678296511d5ea34582292be7368618':
  Fix 2672155
2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
1ace5bc070 Fix 2672155
Check the code path when enabling disabling packages.

Add unit test

Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
2010-05-13 15:48:39 -07:00
Yuncheol Heo
8b70c9c1db Pick the default IME in case of a fresh install.
Bug: 2661261

Change-Id: Id8077ffddd8ddc5c3d3fd371afaad63698ef8d9e
2010-05-13 09:45:27 +09:00
The Android Open Source Project
381b55863e am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master 2010-05-12 15:25:07 -07:00
The Android Open Source Project
d6e24ca28b am 4adacd23: merge from open-source master
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken

* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
  Add support for EVDO Rev B
2010-05-12 14:56:00 -07:00
The Android Open Source Project
4adacd23d4 merge from open-source master
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
2010-05-12 14:53:25 -07:00
The Android Open Source Project
38e6aa365e am 9a069c80: am 63ece47f: am 2a9ae01f: merge from open-source master 2010-05-12 12:47:45 -07:00
The Android Open Source Project
63ece47fec am 2a9ae01f: merge from open-source master
Merge commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69' into kraken

* commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69':
  Corrected repeat count for key repeat in input device.
2010-05-12 12:44:27 -07:00
The Android Open Source Project
2a9ae01f74 merge from open-source master
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
2010-05-12 12:33:35 -07:00
Dianne Hackborn
fafb3993ea am 5f1ebb9f: am bf00233b: am b6e1ec19: am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo 2010-05-12 09:25:13 -07:00
Mike Lockwood
105384e360 am 4d0c3083: am c7c856fb: am d2084bb6: am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo 2010-05-12 09:24:43 -07:00
Jean-Michel Trivi
9f7c4112ac am 11e26c28: am 9f35d39a: am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play not 2010-05-12 09:14:19 -07:00
Dianne Hackborn
bf00233b88 am b6e1ec19: am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo
Merge commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366' into kraken

* commit 'b6e1ec19dd73cb55baef538a9119bcac0f8b9366':
  Fix issue #2676378: Activity Manager Crash on FRF40
2010-05-12 07:56:19 -07:00
Mike Lockwood
c7c856fb85 am d2084bb6: am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Merge commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c' into kraken

* commit 'd2084bb689bb680eb886d5cfbd27adc6f2e9da1c':
  LocationManagerService: Call updateNetworkState on providers that are disabled.
2010-05-12 07:55:55 -07:00
Jean-Michel Trivi
9f35d39a05 am ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the comp
Merge commit 'ea37d9b489aac1a4a8de71887581fe712e26e144' into kraken

* commit 'ea37d9b489aac1a4a8de71887581fe712e26e144':
  Fix bug 2670395 and 2599698
2010-05-12 07:55:09 -07:00
Dianne Hackborn
b6e1ec19dd am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo
Merge commit '037cd3413a925c6f449050096a7cd4aab3207612' into froyo-plus-aosp

* commit '037cd3413a925c6f449050096a7cd4aab3207612':
  Fix issue #2676378: Activity Manager Crash on FRF40
2010-05-12 07:50:09 -07:00
Mike Lockwood
d2084bb689 am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp

* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
  LocationManagerService: Call updateNetworkState on providers that are disabled.
2010-05-12 07:49:45 -07:00
Jean-Michel Trivi
ea37d9b489 am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen
Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp

* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
  Fix bug 2670395 and 2599698
2010-05-12 07:48:50 -07:00
Dianne Hackborn
6f86c0e64b Fix issue #2676378: Activity Manager Crash on FRF40
D'oh!

Change-Id: If1b43ff5f230f9bf0de0887deb1b25dcf6aa6e66
2010-05-11 14:20:52 -07:00
Mike Lockwood
f19a785e15 LocationManagerService: Call updateNetworkState on providers that are disabled.
Fixes a problem with Network Location not working after SetupWizard until the
network state changes.

Change-Id: Ief81b76beb5cc90b2ca7d8aa2d4c99221898f01d
BUG: 2671347

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-05-11 15:35:09 -04:00
Dianne Hackborn
834910f51f am 217f2686: am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 2010-05-11 10:28:20 -07:00
Dianne Hackborn
7d5cea988b am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken

* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
  Hopefully fix issue #2662536: Why is launcher being killed?
2010-05-11 10:23:56 -07:00
Dianne Hackborn
7e76b6d191 am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp

* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
  Hopefully fix issue #2662536: Why is launcher being killed?
2010-05-11 10:18:55 -07:00
Naveen Kalla
0a5174a6e9 Add support for EVDO Rev B
Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
2010-05-11 10:12:07 -07:00
Jean-Michel Trivi
392a2bbb52 Fix bug 2670395 and 2599698
When the user selects a "Silent" notification sound, the Uri encoded
    path is an empty string. Setting this Uri as the data source of the
    MediaPlayer used to play notifications caused the completion listener
    to not be called, which with the AudioFocus logic causes the Music
    app to pause and never resume. The NotificationPlayer modifications
    cause the MediaPlayer for the notification to only request audio
    focus when the data source is not empty.
    The audio focus code in AudioService is defensively synchronized
    against a unique lock, and the exception observed in bug 2670395
    is explicitely caught in case another edge case wasn't caught by
    this fix.
    The AudioFocus handling in AudioManager is modified so only the
    requestAudioFocus and abandonAudioFocus methods are meant to be
    used, as registerAudioFocusListener and unregisterAudioFocusListener
    provided no additional functionality over the request/abandon
    methods. abandonAudioFocus() also removes the listener from the
    map in AudioManager since after abandonning focus, the listener
    would no longer be called.

Change-Id: I3b553ee8a8163c25e01117d7e5479dd5fdfa7c6b
2010-05-11 09:20:49 -07:00
Robert Greenwalt
9e3983fbde Fix throttle datafile parsing.
"Optimization" yesterday was buggy.
bug:2674511

Change-Id: I3b1dde35a75b2017117c20905fcd82de405d41b5
2010-05-11 07:31:42 -07:00
Dianne Hackborn
6d00151c51 Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 2010-05-10 17:27:14 -07:00
Dianne Hackborn
906497c574 Hopefully fix issue #2662536: Why is launcher being killed?
It looks like there was a subtle bug where Process.setOomAdj() could
return false just because the given process doesn't exist, even though
it is documented to only return false if OOM killing is not supported
at all.  This would cause the activity manager to fall into its code
path of trying to clean up processes itself, which it does a much
poorer problem at.  I am thinking we may be seeing this problem more
now that the activity manager is killing background processes itself
when there are too many of them.

In addition, this change cleans up and reduces some of the logging
around killing processes.

Finally, try to improve process LRU management a bit by taking
into account process dependencies.  Any dependent processes are
pulled up in the LRU list with the processes that is actually
moving.  Also, we bring a process up if someone accesses its content
provider.

Change-Id: I34ea161f839679345578ffe681e8d9c5d26ab948
2010-05-10 17:19:58 -07:00
Robert Greenwalt
24488bd094 Fix build. Instantiate object before use.
bug:2673562
Change-Id: I1e39f7847c25c5c1923a7b7e864b402c94834528
2010-05-10 17:02:55 -07:00
Kristian Dreher
133bfdfa4a Corrected repeat count for key repeat in input device.
Previously the key event repeat count was always zero when the repeated
key down events was generated by the input device in the Linux kernel.

Change-Id: I86b7fd2a75880bc54d052ef404c3654b7ed14c52
2010-05-10 16:41:31 -07:00
Robert Greenwalt
39e163f45a Reduce lock contention
Reduce the amount of work done inside of synchronized blocks and
force the use of cached ntp data when publicly called.
bug:2662331

Change-Id: Ibafd29ea9e355fa8f875d06ce37870b0c01c57f4
2010-05-10 13:52:32 -07:00
Brad Larson
86568d705e Use isLocationProviderEnabled to test for enabled providers
LocationManagerService was just checking if the string of (comma-separated)
Location Providers contained the provider we were interested in.  This works
fine in normal cases, but breaks if we add a provider such as test_network.
Enabling test_network causes LocationManagerService to think that the network
provider is also enabled.

The code in Settings.Secure.isLocationProviderEnabled() checks for the commas
in the string as well, to make sure that a provider name which is a substring
of another provider name won't cause problems.  It also centralizes the code
which reads the string.

Signed-off-by: Brad Larson <brad.larson@garmin.com>

Change-Id: I00dfe7c2b09739ed4c8ed07c6167e409b0bf7d13
2010-05-07 11:35:15 -07:00
Robert Greenwalt
e491bd6f65 am 7c258c81: am caa63341: am d6d11517: am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo 2010-05-06 17:20:36 -07:00
Robert Greenwalt
caa63341a8 am d6d11517: am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit 'd6d115173a856fe28cf5a3087f6d7b0de77495c5' into kraken

* commit 'd6d115173a856fe28cf5a3087f6d7b0de77495c5':
  Fix ThrottleService wifi interaction
2010-05-06 17:17:51 -07:00
Robert Greenwalt
d6d115173a am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit 'f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp

* commit 'f9dc24de53890e0a8289a4349562ed4bd9611974':
  Fix ThrottleService wifi interaction
2010-05-06 17:16:04 -07:00