Mike Lockwood
3676f26646
am 41285a71: am 5d12d197: Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
2010-05-21 12:19:00 -07:00
Kevin.KY Tsai
0881f4f933
Report number of satellites used in fix instead of total for GPS Location extra
...
Change-Id: Ibffc8d21b31b02a91c8506733002e4a778556978
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-05-21 15:10:39 -04:00
Mike Lockwood
4d252c484c
am dc0ca1d5: am 88262733: Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
2010-05-21 10:40:48 -07:00
Mike Lockwood
03ca216ac1
New Location Manager APIs for Criteria based requests and single shot mode.
...
Use MS-Assisted mode for single shot GPS fixes if it is supported.
Add finer grained control over accuracy to the android.location.Criteria class
and location criteria logic from LocationManager to LocationManagerService
Change-Id: I156b1f6c6a45d255c87ff917cf3e9726a6d7a75b
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-05-21 11:47:19 -04:00
Suchi Amalapurapu
6211c5690c
am 5f0e438b: am 3d802ef7: am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
2010-05-18 18:27:28 -07:00
Guang Zhu
864feb8dfa
disable emma instrumentation for framework, ext and services (DO NOT MERGE)
...
When these libraries are instrumented with emma instructions, runtime keeps
restarting on native crashes. To acheive a fully emma instrumented build,
we need to disable emma instrumentation on these libraries.
Change-Id: I51cb3bf71e0e348264fe5f21a27085fb2b9e6670
2010-05-18 16:02:28 -07:00
Suchi Amalapurapu
3d802ef73b
am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
...
Merge commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c' into kraken
* commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c':
Fix 2641875
2010-05-18 13:17:58 -07:00
Suchi Amalapurapu
aa4db173a2
am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
...
Merge commit '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp
* commit '9a212adcffbc4b32d51f512889b33ba584647aa9':
Fix 2641875
2010-05-18 13:16:13 -07:00
Suchi Amalapurapu
9a212adcff
Fix 2641875
...
Initialize the cache path only if the container exists.
This did exist before but was somehow removed.
Fix a known test failure as well.
Change-Id: I63219369b0e7abca4919fbde2a04035a0fea9e35
2010-05-18 11:31:50 -07:00
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
Johan Alfven
6c3da7fbc2
Corrected debug message in WindowManager
...
When WindowManager reports "Key dispatching timed out"
it prints out information about the window state that was
present at the time the key was sent to that window.
There is a minor error in the class representing the
recorded window state so that the currently focused window
is printed instead of the recorded focused window.
Change-Id: I29a5471ef725e30f812ffd57fd4597ce81c0c7f2
2010-05-12 09:01:56 +02:00
Sean Foy
26abeae75b
Remove ProximityAlerts Receiver when last ProximityAlert expires.
...
Remove the ProximityAlerts update Receiver when the last ProximityAlert expires.
Fixes issue 6900.
Change-Id: Ida1970c084e71df47b204c64986a065cb75d0c13
2010-05-11 14:24:26 -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
80131e4b9b
Merge "Corrected repeat count for key repeat in input device."
2010-05-11 12:07:32 -07: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