85 Commits

Author SHA1 Message Date
Nick Pelly
3267062d9c Merge branch 'readonly-p4-master' 2009-04-08 19:24:05 -07:00
Nick Pelly
babf19136c AI 145203: am: CL 145201 Hold wakelock while delaying for audio route switch after headset unplug.
Fixes bug where we go to sleep before switching audio, and we lose audio until the apps CPU wakes up again.
  Original author: npelly

Automated import of CL 145203
2009-04-08 19:22:53 -07:00
Mike Lockwood
c92bb0cfe3 Merge branch 'readonly-p4-master' 2009-04-06 10:53:41 -07:00
Mike Lockwood
c1e8aa4c44 AI 144664: am: CL 144663 Use Binder interfaces between NetworkLocationManager and LocationManagerService.
This fixes a hack that was added when NetworkLocationManager was moved out of the framework.
  This also lays the groundwork for supporting location providers outside of the system process.
  BUG=1729031
  Original author: lockwood

Automated import of CL 144664
2009-04-06 10:52:24 -07:00
Mike Lockwood
113853c3f8 Merge branch 'readonly-p4-master' 2009-04-06 05:19:27 -07:00
Mike Lockwood
a3e952e325 AI 144621: am: CL 144620 Clean up interface between NetworkLocationProvider and LocationManagerService (part 1)
Move broadcast receivers for wifi scan results and battery status
  from LocationManagerService to NetworkLocationProvider
  Add a Service for the NetworkLocationProvider, so we can install it from its
  own thread rather than from BOOT_COMPLETED or callback from LocationManagerService.
  (this Service was also required for receiving Intents in NetworkLocationProvider)
  BUG=1729031
  Original author: lockwood

Automated import of CL 144621
2009-04-06 05:18:03 -07:00
Mike Lockwood
50e4aa3ccf Merge branch 'readonly-p4-master' 2009-04-05 14:54:19 -07:00
Mike Lockwood
33aa27856f AI 144600: am: CL 144599 Location Manager cleanup:
Move PhoneStateListener for listening to cell location changes from LocationManagerService
  to the NetworkLocationProvider.
  Move CellState class out of the core framework to the NetworkLocationProvider service.
  NetworkLocationManager now notifies the collector of its state, rather than LocationManagerService.
  BUG=1729031
  Original author: lockwood

Automated import of CL 144600
2009-04-05 14:53:07 -07:00
Mike Lockwood
b91f71d49d Merge branch 'readonly-p4-master' 2009-04-03 08:26:05 -07:00
Mike Lockwood
f6f9792d44 AI 144453: am: CL 144452 More Location Manager cleanup:
Remove 1 Hz "heartbeat" polling of location providers from LocationManagerService.
  Now location providers report their location to LocationManagerService via
  LocationManager.setLocation() rather than waiting to be polled.
  This reduces GPS fix latency by up to one second.
  Remove LocationProvderImpl.getLocation().
  Since we are no longer polling, this method is no longer necessary.
  BUG=1729031
  Original author: lockwood

Automated import of CL 144453
2009-04-03 08:24:47 -07:00
Mike Lockwood
48554fc78e Merge branch 'readonly-p4-master' 2009-04-02 23:42:42 -07:00
Mike Lockwood
bd2a7126e5 AI 144415: am: CL 144372 Cleanup Settings support for enabling and disabling location providers:
LocationManagerService now listens for changes to settings,
  making LocationManager.updateProviders() unnecessary.
  Removed LocationManager.updateProviders()
  Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
  of enabling or disabling a single location provider.
  This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
  BUG=1729031
  Original author: lockwood

Automated import of CL 144415
2009-04-02 23:41:33 -07:00
Evan Millar
f6afef350a Merge branch 'readonly-p4-master' 2009-04-02 23:29:53 -07:00
Evan Millar
0ba31ed95e AI 144410: am: CL 144333 Change the way the battery level tracking code works in BatteryStats. Before we simply kept track of the last
2 levels as recorded at plug and unplug events. During charge cycles this would be useful because it would tell us
  what the start and end levels were in the last discharge cycle. However during a discharge cycle this information could
  be misleading as it would give you the level at the last unplug event (beginning the the discharge cycle) and last plug
  event (end of the previous discharge cycle).
  Now we are still keeping track of 2 values, but they are "discharge cycle start level" and "discharge cycle current level".
  During a discharge cycle this will give you the level the current discharge cycle started at, and the current level. During
  a charge cycle the same data will be supplied as before (the start/end of the last discharge cycle).
  Original author: emillar

Automated import of CL 144410
2009-04-02 23:28:45 -07:00
Amith Yamasani
9bb6ef5ad3 Merge branch 'readonly-p4-master' 2009-04-02 22:50:23 -07:00
Amith Yamasani
3e276b18b4 AI 144395: am: CL 144257 am: CL 144256 Need to show opt-in screen for location collection.
Added a screen to the setup wizard, after login, to ask user to
  opt-in for location collection.
  Added a dialog to Settings when user turns on Network location.
  Fixed a security permission issue in LocationManagerService related
  to this change.
  Original author: yamasani
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144395
2009-04-02 22:49:19 -07:00
The Android Open Source Project
d3af727927 Merge branch 'readonly-p4-master'
Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java
2009-04-02 12:18:20 -07:00
Wink Saville
04e71b3db8 AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:54 -07:00
The Android Open Source Project
caee1703fe Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:25 -07:00
Dianne Hackborn
7ac3f67c17 AI 143901: am: CL 143899 am: CL 143896 Fix issue #1748954 and #1737952:
#1748954 (New status bar fades into all white background): FrameLayout wasn't updating its foreground drawable when its padding changed, which would happen as the status bar is shown and hidden.  To fix this I also ended up fixing a problem in the view debug stuff where we couldn't get a bitmap for a view that is the full screen size because it is too big...  actually I just went ahead and added another function to snapshot the view hierarchy which works a lot better for us anyway.
  #1737952 (Home screen icons overlap with the notification bar after exiting any camera app): Originally I punted this because it only happened in rare situations, but now that home is always portrait it happens a lot more so it is more important to fix.  This involved a few things to clean up hiding/showing the status bar:
  - We now determine when to hide and show it during layout, which allows us to do this at the time it is actually needed rather than during animation after we can actually catch it for the initial display of a window.  This required tweaking the layout API so the policy can request a second layout pass if needed.
  - When doing layout, we are now much more aggressive about skipping the layout of windows.  Basically anything that we know will be hidden in the near future is ignored for layout, so that it doesn't glitch as it is transfered out of the screen.  The theory being that it is better to leave it as it was originally placed while we are transitioning it out, than to switch it to something slightly more correct.
  Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143901
2009-03-31 18:00:53 -07:00
Dianne Hackborn
bed30e1b6e AI 143823: am: CL 143800 am: CL 143748 Fix issue #1743326 (More battery stats)
Adds stats for:
  - Number of raw user events that have happened in the system.
  - Number of times user activity has been reported, dividied by UID and type of activity.
  - Duration of screen brightness levels in 4 buckets.
  - Per-UID tracking of who has turned on Wifi and how long we can attribute it being on because of them.
  Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143823
2009-03-31 14:46:20 -07:00
The Android Open Source Project
762d30a313 Merge branch 'open_source' into google_internal
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
2009-03-29 08:55:27 -07:00
Eric Shienbrood
eeced21302 AI 143395: am: CL 143266 am: CL 143124 Fix bug #1731826, in which auto-connect to remembered networks does not
take place.
  This has the same underlying cause as bug #1739874, so this fixes that
  bug as well. The problem was that if the supplicant was in the DORMANT
  state at the time a scan-only Wi-Fi lock was released, the command to
  stop the Wi-Fi driver would never be issued. This had two main results:
  first, the driver would stay awake when the screen was blank and it was
  supposed to be sleeping, leading to excessive battery drain, and second,
  when the screen was turned back on, there would be no DRIVER-STARTED
  event generated (because the driver was already running). The
  DRIVER-STARTED event is the trigger for the framework to issue a
  RECONNECT command to the supplicant to cause it leave the DORMANT state
  and look for available remembered networks.
  To assist in tracking down this problem, and any such problems in the
  future, I added four counters to keep track of how many times full and
  scan-only Wi-Fi locks are acquired and released. The counter values
  are output in the dump() method of WifiService. While doing this, I
  noticed that because of missing "break" statements, the battery stats
  that keep track of how much time Wi-Fi locks are held were including
  the time for full locks in the time reported for scan-only locks.
  Original author: ers
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143395
2009-03-27 19:54:50 -07:00
The Android Open Source Project
b41349409b Merge commit 'goog/cupcake' 2009-03-27 18:48:32 -07:00
Dianne Hackborn
052eb7131b AI 143323: am: CL 143173 am: CL 142879 Fix issue #1732012 (Only show screen rotation animation when triggered by sensor) -- set the new surface flag as appropriate.
Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143323
2009-03-27 18:13:57 -07:00
Dianne Hackborn
e4fbd6235c AI 143318: am: CL 143169 am: CL 142870 Fix issue #1724917 (Applications (browser, maps, gmail) fail to retain their landscape state after coming out of sleep mode). We now rely on the listeners last known orientation, and make sure to clear it when enabling/disabling.
Also do most of the work for issue #1732012 (Only show screen rotation animation when triggered by sensor).  This just needs to be hooked up to the surface flinger API when that appears.
  Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143318
2009-03-27 18:09:16 -07:00
Mike Lockwood
f8dd2e1d4b AI 143287: am: CL 143095 Location Manager cleanup: move MockProvider to a separate file.
BUG=1729031
  Original author: lockwood
  Merged from: //branches/donutburger/...

Automated import of CL 143287
2009-03-27 17:03:45 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake'
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
2009-03-27 15:38:40 -07:00
Eric Shienbrood
50108e9282 AI 143124: Fix bug #1731826, in which auto-connect to remembered networks does not
take place.
  This has the same underlying cause as bug #1739874, so this fixes that
  bug as well. The problem was that if the supplicant was in the DORMANT
  state at the time a scan-only Wi-Fi lock was released, the command to
  stop the Wi-Fi driver would never be issued. This had two main results:
  first, the driver would stay awake when the screen was blank and it was
  supposed to be sleeping, leading to excessive battery drain, and second,
  when the screen was turned back on, there would be no DRIVER-STARTED
  event generated (because the driver was already running). The
  DRIVER-STARTED event is the trigger for the framework to issue a
  RECONNECT command to the supplicant to cause it leave the DORMANT state
  and look for available remembered networks.
  To assist in tracking down this problem, and any such problems in the
  future, I added four counters to keep track of how many times full and
  scan-only Wi-Fi locks are acquired and released. The counter values
  are output in the dump() method of WifiService. While doing this, I
  noticed that because of missing "break" statements, the battery stats
  that keep track of how much time Wi-Fi locks are held were including
  the time for full locks in the time reported for scan-only locks.
  BUG=1731826,1739874

Automated import of CL 143124
2009-03-27 12:21:17 -07:00
Dianne Hackborn
cc95667b9c Automated import from //branches/cupcake/...@142879,142879 2009-03-26 00:04:52 -07:00
Dianne Hackborn
02771bcb5d Automated import from //branches/cupcake/...@142870,142870 2009-03-25 22:39:21 -07:00
Chris Tate
82a0c4615e Automated import from //branches/master/...@142785,142785 2009-03-25 16:27:34 -07:00
Chris Tate
0f8fc102b9 Automated import from //branches/cupcake/...@142783,142783 2009-03-25 16:22:54 -07:00
Dianne Hackborn
95518a712c Automated import from //branches/master/...@142765,142765 2009-03-25 16:16:10 -07:00
Dianne Hackborn
2f847b9e05 Automated import from //branches/cupcake/...@142651,142651 2009-03-25 15:25:33 -07:00
Fred Quintana
603073430b Automated import from //branches/master/...@142414,142414 2009-03-24 22:48:12 -07:00
Dianne Hackborn
d86c782127 Automated import from //branches/master/...@142402,142402 2009-03-24 22:46:14 -07:00
Dianne Hackborn
4840e143df Automated import from //branches/master/...@142348,142348 2009-03-24 22:40:29 -07:00
Ed Heyl
18523b6f31 Automated import from //branches/master/...@142240,142240 2009-03-24 22:23:14 -07:00
Suchi Amalapurapu
84108d918a Automated import from //branches/master/...@141959,141959 2009-03-24 21:15:12 -07:00
Romain Guy
3119a4522b Automated import from //branches/master/...@141525,141525 2009-03-24 20:28:20 -07:00
Joe Onorato
a9ccf3e799 Automated import from //branches/master/...@141410,141410 2009-03-24 20:13:57 -07:00
Chris Tate
8f91d2b5c9 Automated import from //branches/master/...@141392,141392 2009-03-24 20:11:39 -07:00
Dianne Hackborn
9d4de63623 Automated import from //branches/cupcake/...@142392,142392 2009-03-24 19:37:25 -07:00
Joe Onorato
95e4f70624 Automated import from //branches/master/...@141087,141087 2009-03-24 19:29:09 -07:00
Dianne Hackborn
99c6026218 Automated import from //branches/cupcake/...@142342,142342 2009-03-24 19:27:53 -07:00
Dianne Hackborn
79050e84fd Automated import from //branches/master/...@141080,141080 2009-03-24 19:27:29 -07:00
Joe Onorato
36197e77c3 Automated import from //branches/master/...@141000,141000 2009-03-24 19:10:48 -07:00
Jim Miller
2ce107ce31 Automated import from //branches/cupcake/...@142154,142154 2009-03-24 19:06:28 -07:00
Suchi Amalapurapu
7f0ed3c071 Automated import from //branches/cupcake/...@141957,141957 2009-03-24 18:43:00 -07:00