Robert Greenwalt
d1c3ea6a21
resolved conflicts for merge of 3cd6a3e3 to master
...
Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7
2010-05-26 10:37:48 -07:00
Robert Greenwalt
ac53a8a135
am 88ccecf5: am d1055a25: Make the NTP Cache max-age gservices-settable
...
Merge commit '88ccecf573a52648052bc9c7858f345776f76e0e' into kraken
* commit '88ccecf573a52648052bc9c7858f345776f76e0e':
Make the NTP Cache max-age gservices-settable
2010-05-25 16:15:37 -07:00
Robert Greenwalt
88ccecf573
am d1055a25: Make the NTP Cache max-age gservices-settable
...
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp
* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
Make the NTP Cache max-age gservices-settable
2010-05-25 16:13:22 -07:00
Robert Greenwalt
d1055a250c
Make the NTP Cache max-age gservices-settable
...
Trying to make Throttle polling more energy efficient.
bug:2708119
Change-Id: I2b75639e202dcbcee11047c43407a22de04ce350
2010-05-25 15:54:52 -07:00
Christian Mehlmauer
4136c98ecc
Replaced deprecated String Constructor
...
Change-Id: I91874093d69e230850c695b92da5f91391030d44
2010-05-25 20:04:09 +02:00
Marco Nelissen
584f137c19
Allow root to set the mount state as well, so that the simulator
...
can use the fake sd card.
Change-Id: I9ac5329f976a6e466ef2d7123ca70670975c30e3
2010-05-25 09:05:56 -07:00
Konstantin Lopyrev
3255823de0
Fix 2673731: Adding support for password history to Device Admin.
...
Change-Id: If3240048813e32b2bae79fe5cb8a73aea20ec56c
2010-05-24 17:13:18 -07:00
Irfan Sheriff
a6e559edb7
Fix escaping of characters
...
\ and " in SSID and password cause issues
with netd parsing. Fix it.
Bug: 2708960
Change-Id: I278ca21c0bbfd9dc430a2f9ae02828274a0d2376
2010-05-24 14:55:42 -07:00
Mark Vandevoorde
2b4140ef1b
am a5437f2d: am 88437284: Fix build error (Boolean -> boolean)
2010-05-24 13:47:47 -07:00
Mark Vandevoorde
884372842b
Fix build error (Boolean -> boolean)
...
Change-Id: I2f337e23f4b092de41523f1195546e9d65851c84
2010-05-24 13:40:22 -07:00
Mike Lockwood
7df535b976
am 749afee8: am 1e11e95f: Merge "Add Geocorder.isImplemented()" into kraken
2010-05-24 13:03:22 -07:00
Mike Lockwood
1e11e95f61
Merge "Add Geocorder.isImplemented()" into kraken
2010-05-24 12:59:27 -07:00
Daniel Sandler
8c8634b514
am c8a041f1: am 450da449: Merge "New shadowy status bar, direct from Z\'ha\'dum." into kraken
2010-05-24 05:49:05 -07:00
Mark Vandevoorde
01ac80b715
Add Geocorder.isImplemented()
...
The Geocorder interface is not part of the Android core. It
requires a backend service which may or may not be available
on a device. The new isImplemented static method allows
apps to discover whether the Geocorder is in fact available
on the device.
Change-Id: I2b5cf7bcc9cce4766bcbb156e91edf34b01f9296
2010-05-21 15:43:26 -07:00
Daniel Sandler
2c195f77a1
New shadowy status bar, direct from Z'ha'dum.
...
Artwork is FPO but serviceable enough. Many hardcoded font
colors & styles were moved to styles.xml where they belong.
AM/PM finally given the old heave-ho (but configurable in
StatusBarPolicy.java).
Notification content remains on a light-gray background for
now (so as not to screw up custom RemoteViews) but status
icons will definitely need across-the-board rework to look
better against a dark background.
Change-Id: Id9d5a699532f9336563cd6f9699bff3893735e4f
2010-05-21 15:46:54 -04:00
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