drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,155 Commits 1 Branch 0 Tags
Commit Graph

4580 Commits

Author SHA1 Message Date
Mathias Agopian
6b272b89b7 Merge "Fix a problem where hwc and GL composition could show a different buffer" 2010-12-15 14:38:57 -08:00
Eric Laurent
828b5a328c Merge "Change audio routing policy for HDMI" 2010-12-15 11:48:46 -08:00
Eric Laurent
2c61bee2b0 Change audio routing policy for HDMI 
HDMI device should have a higher priority than analog dock audio but a lower priority
than wired headsets.
Also modified AudioService so that HDMI is mapped to DEVICE_OUT_AUX_DIGITAL device and not
DEVICE_OUT_DGTL_DOCK_HEADSET as before to enable discrimination between SPDIF going to
digital dock and SPIDF going to HDMI.

Change-Id: I887d0c73479784dd2edaf41ce1a7d8d0bdcbb4bd
 2010-12-15 11:01:48 -08:00
Mathias Agopian
1ebaa3a379 Fix a problem where hwc and GL composition could show a different buffer 
if a surface's buffers are reallocated, the current active buffer will
end-up pointing on one of these until a new buffer is retired.

we're now keeping a reference to the actual buffer until we retire a
new one.

Change-Id: Ib1703947e7a0340694d846e0962576318863b935
 2010-12-14 20:30:37 -08:00
Mike Lockwood
00ffc9d6d2 Merge "Clean up USB notifications:" 2010-12-14 19:23:02 -08:00
Mathias Agopian
04a709e459 fix debug.sf.showbackground 
Change-Id: Ie4eeca006ad6d8030900d8cb0029e4d1c22474fb
 2010-12-14 18:38:36 -08:00
Mike Lockwood
b92df0f669 Clean up USB notifications: 
Add support for separate USB connected and configuration events

Include both USB connected/disconnected and configuration state
in USB_STATE Intent

Remove redundant USB_CONNECTED and USB_DISCONNECTED Intents
Now we just have the sticky USB_STATE broadcast

Move USB disconnnect rebouncing from Tethering to UsbService

Change-Id: Id13eb0c5d51152d2a538985d680ba1db7d2241dc
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-14 18:32:59 -08:00
Christopher Tate
e464fba4a4 Merge "Don't queue multiple pending backups for the same app" 2010-12-14 16:22:28 -08:00
Christopher Tate
c28083ab70 Don't queue multiple pending backups for the same app 
Repeated install/replace of an app before it ran its first backup pass
would wind up enqueueing multiple backup requests, all of which would
run back to back when the time came.  This no longer happens.

Also, if a backup request is queued for an app that is then uninstalled
before that request is honored, we no longer fail in expensive and log-
intensive ways; we now fail cleanly, early.

Bug 3133212

Change-Id: I745f5b2f966a1c874f34a0107a438ad42fa7f005
 2010-12-14 16:16:44 -08:00
Mathias Agopian
575eaf5498 fix [3223749] media server crashes when switching mode from video capture to still image capture 
there was an issue were in some situation SF would call prepare() on hwc
with a NULL handle and never call prepare again.
in this situation, we onw set the SKIP flag to make sure that hwc
won't process this layer and as soon as we receive our first buffer we
trigger a recompute of the visible regions which will end-up calling
prepare() again.

Change-Id: I6b400b2df79712408b9315a9859290c7fcb1609e
 2010-12-14 15:53:39 -08:00
Mathias Agopian
7537fd3c55 Merge "fix [3176642] Camera preview turns completely black for multiple toggles between camera and camcorder app" 2010-12-14 15:51:41 -08:00
Mathias Agopian
52e6ada69e Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so." 2010-12-14 15:51:32 -08:00
Robert Greenwalt
04808c2940 Fix some IpV4-only code. 
InterfaceConfiguration changed to use InetAddress and stop with the string->int->string
conversions.

bug:2542681
Change-Id: I11c4954547333c43bb840fa0469ddde57b0d043b
 2010-12-14 14:41:26 -08:00
Christopher Tate
89f8d63a99 Merge "Time out orphaned / unresponsive restore sessions" 2010-12-14 10:32:05 -08:00
Christopher Tate
001667313f Merge "Don't restore wildly wrong sized wallpapers" 2010-12-14 10:31:56 -08:00
Dianne Hackborn
d2835935d2 Fix issue #3258849: Grab thumbnail when exiting an app via back 
Also issue #3281400: Rotating a retained instance fragment leaks the fragment manager

And turn off fragment debug logging.

Change-Id: Ibdd7db82bb35618021bcba421ba92ced7cd691c2
 2010-12-13 20:41:17 -08:00
Irfan Sheriff
32f4ab457d Merge "WPS fixes and refactor" 2010-12-13 19:25:59 -08:00
Christopher Tate
73a3cb3848 Time out orphaned / unresponsive restore sessions 
An app that fires up a restore session but then crashes or drops its
session reference will currently render restore functions totally
unavailable until the device is rebooted.  This CL introduces an
inactivity timeout [currently 60 seconds] on restore sessions, after
which the session is shut down and becomes unavailable to the app
who nominally still held it.

Synchronization between the timeout and the normal asynchronous
use of the session by the application is managed by running both
the timeout action and the normal teardown process on the backup
manager service's handler thread.

Bug 3276362

Change-Id: I1f63b83e96e66b0e7eb15a1e20e375049babf06e
 2010-12-13 19:09:47 -08:00
Mathias Agopian
5747bbc206 fix [3176642] Camera preview turns completely black for multiple toggles between camera and camcorder app 
There was a leak of Surface tokens when a surface was detached from a UserClient.
We now always detach a surface from its client before attaching to the new one,
this guarantees that its token is freed.

Change-Id: Icfad0b16286ed58155bdfafdf36ab161440aa485
 2010-12-13 16:49:05 -08:00
Mathias Agopian
06f9ebf4f6 minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. 
Change-Id: I3bdca74351c8e480a05084bc412a96c5f685221d
 2010-12-13 16:47:31 -08:00
Christopher Tate
3f64f8d8fc Don't restore wildly wrong sized wallpapers 
If the dimensions of the original are sufficiently different from the
device's preferred dimensions, just don't restore the image.  This
avoids bad letterboxing / clipping on e.g. phone <-> tablet data
migration.

The expansion/shrinkage ratios used here allow restores of saved
wallpaper images among HVGA devices, among WVGA variants, and
among tablets; but skip restoring wallpapers across those
categories (where severe clipping or letterboxing would occur).

Bug 3261863

Change-Id: I75e75d6401d18f1df10d75796ee04e21d2302cfa
 2010-12-13 16:41:24 -08:00
Dianne Hackborn
ccc7141313 resolved conflicts for merge of 78e9f4cb to master 
Change-Id: I1135361e6d66f524c3f349e2bf1f31bd4191c634
 2010-12-13 14:55:25 -08:00
Irfan Sheriff
02fb46a297 WPS fixes and refactor 
- Allow IP and proxy set up for WPS
- Use string for WPS pin to avoid losing leading zeros
- Add a seperate WPS state machine and WpsConfiguration class

Change-Id: I87f43fff8bba0ae8ff02e5fc495a8bc628a8c8cf
 2010-12-13 14:50:51 -08:00
Dianne Hackborn
78e9f4cbae am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> packages+ map 
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
  Fix issue #3154576: battery stats checkin should include UID -> packages+ map
 2010-12-13 14:37:09 -08:00
Dianne Hackborn
e4a5951925 Fix issue #3154576: battery stats checkin should include UID -> packages+ map 
Includes some other small fixes to battery collection and a few
other things.

Output of package info looks like this:

5,0,i,uid,1000,com.android.settings
5,0,i,uid,1000,com.android.providers.subscribedfeeds
5,0,i,uid,1000,com.android.providers.settings
5,0,i,uid,1000,com.android.server.vpn
5,0,i,uid,1000,android
5,0,i,uid,1000,com.android.systemui
5,0,i,uid,1000,com.google.android.backup
5,0,i,uid,1001,com.android.phone
5,0,i,uid,1001,com.android.providers.telephony
5,0,i,uid,1022,com.android.nfc
5,0,i,uid,10021,com.google.android.location
5,0,i,uid,10021,com.google.android.syncadapters.calendar
5,0,i,uid,10021,com.google.android.gsf
5,0,i,uid,10021,com.google.android.syncadapters.contacts
5,0,i,uid,10026,com.android.providers.downloads.ui
5,0,i,uid,10026,com.android.providers.media
5,0,i,uid,10026,com.android.providers.drm
5,0,i,uid,10026,com.android.providers.downloads
5,0,i,uid,10032,com.android.launcher
5,0,i,uid,10039,com.google.android.gm
5,0,i,uid,10041,com.google.android.gallery3d
5,0,i,uid,10049,com.android.providers.calendar

Change-Id: I9e38f254eef146339113ad270f5c6e8b60fb7a1d
 2010-12-13 14:31:40 -08:00
Jean-Baptiste Queru
dd60ee728d am 6d13b146: am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master 
* commit '6d13b146e0444f40f45b9fe5812093c5e611b68e':
  Added dropbox broadcast notification
 2010-12-13 13:12:36 -08:00
Jean-Baptiste Queru
6d13b146e0 am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master 
* commit 'e78a000955c283509ee8a21b8b7e448060ac8dd8':
  Added dropbox broadcast notification
 2010-12-13 13:10:23 -08:00
Jean-Baptiste Queru
e78a000955 resolved conflicts for merge of 4b94c451 to stage-korg-master 
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
 2010-12-13 13:06:13 -08:00
Dianne Hackborn
30d7189067 Fix issue #3274841: Orientation change problem with a paused activity 
Plus a bunch of debug output improvements.

And some new Intent helpers for dealing with restarting an app.

Change-Id: I50ec56bca6a86c562156b13fe8a6fdf68038a12e
 2010-12-13 12:57:02 -08:00
Mathias Agopian
0cfb45a423 Merge "[3258939] Need snapshot to limit which layers are included" 2010-12-10 16:30:46 -08:00
Mathias Agopian
3dd25a6bf7 [3258939] Need snapshot to limit which layers are included 
Change-Id: Id7351a0e3f53dde99b291cffba553d89fd4d7ca9
 2010-12-10 16:22:31 -08:00
Dianne Hackborn
2008e06b9d Merge "Turn off screenshot capturing for thumbnails." 2010-12-10 13:44:13 -08:00
Eric Laurent
4f9e0f173e Fix audio mode log. 
Since the new audio mode IN_COMMUNICATION was added, the audio mode log
was broken.

Change-Id: I4fdafc3b98a1b0ceb55058a9e47fed99b3dbe6ad
 2010-12-10 11:46:12 -08:00
Dianne Hackborn
17d9550029 Turn off screenshot capturing for thumbnails. 
May reduce occurance of graphics hangs as a temporary stop-gap until
the real problem is fixed.

Change-Id: I57f831944cc621bcb1d1d2051bb48f14e53879b1
 2010-12-10 11:43:40 -08:00
James Dong
acaab2d77c Merge "We requires camera hal's implementation should not track the ref count of any outstanding video frames and ignore releaseRecordingFrame() call after it receives disableMsgType(CAMERA_MSG_VIDEO_FRAME)." 2010-12-10 07:33:13 -08:00
James Dong
74920cb1a8 We requires camera hal's implementation should not track the ref count of any outstanding video frames and ignore 
releaseRecordingFrame() call after it receives disableMsgType(CAMERA_MSG_VIDEO_FRAME).

Change-Id: I2ecb9b3b11dab6bf868ccf8effda1b8df5bcde3c
 2010-12-10 07:19:13 -08:00
Mike Lockwood
faa27f932e Merge "Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService" 2010-12-09 22:53:27 -08:00
Mike Lockwood
770126a678 Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService 
In preparation for an upcoming change that will make UsbService into a real system service

Change-Id: Id85d624cfc6b10b49a08105cfaaacc667a492c12
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-09 22:52:05 -08:00
Dianne Hackborn
a64f506941 Merge "Fix issue #3272051: Use backward transition when going backwards." 2010-12-09 19:25:17 -08:00
Dianne Hackborn
7da6ac33a9 Fix issue #3272051: Use backward transition when going backwards. 
Also know as:

Issue #3272051 Contacts edit view: Tapping the in-app back button
results in a forward transition

Yeah more complexity in deciding which animation to use.

Also reduce complexity in deciding which app's animation set to use,
to balance things out (and make it have less stupid behavior).

Change-Id: I78c6c5c5249a96206f7e03ce587c1dcb9a7dc14f
 2010-12-09 19:22:04 -08:00
Svetoslav Ganov
792be60c86 Merge "3205857 java.lang.ExceptionInInitializerError at java.lang.Class.newInstanceImpl(Native Method)" 2010-12-09 14:47:22 -08:00
Christopher Tate
a58fd15a5b Merge "Add a couple of transport-descriptive methods to IBackupManager" 2010-12-09 13:06:46 -08:00
Christopher Tate
f5e1c29637 Add a couple of transport-descriptive methods to IBackupManager 
Privileged callers can now ask the transport for a string describing
its current state, and for an Intent that can be passed to startActivity()
in order to bring up its exported configuration UI.  These will be used
in Settings in order to e.g. show the user the currently active account
being used for backup, and allow the user to choose an account.

The data being funnelled through IBackupManager here are the ones
already exposed by the transports in their implementation of the
IBackupTransport interface.

Bug: 2753632

Change-Id: I2227a2b111d8d0ddf221d63020e20c1316fff55b
 2010-12-09 12:58:24 -08:00
Svetoslav Ganov
383742c16d 3205857 java.lang.ExceptionInInitializerError at java.lang.Class.newInstanceImpl(Native Method) 
Change-Id: I72ab33da2f5cc0bbaa89f3b996ff4ac48deadf73
 2010-12-09 11:52:47 -08:00
Andy Stadler
c25f70a440 API CHANGE - Add hasGrantedPolicy() API 
* Allows an app to detect that it needs to have additional policies granted
* Add "refreshing" parameter to setActiveAdmin() to handle this case
* Minor cleanups to eliminate warnings (mostly for unused things)

Bug: 3253179
Change-Id: I4bf639bf560557130bf98e8cfb75f996fac416f1
 2010-12-09 09:22:06 -08:00
Mathias Agopian
ac843f28f6 [3211070] camera preview image is rendered offset from the UI overlay frame 
somehow this change got lost.

Change-Id: I36f6c7ef3f782918042b77e9dc91a4c811d84a40
 2010-12-08 17:40:28 -08:00
Mathias Agopian
8128ee86da fix [3260137] Sometimes front-facing camera mirroring is wrong 
make sure to take the buffer's orientation into account.

Change-Id: I9fef89e66368ad2dec1cb8c7b77ac2b3b4858efb
 2010-12-08 17:23:18 -08:00
Mathias Agopian
c3802d22f1 More clean-up. Get rid off the "blur" effect in SurfaceFlinger 
For multiple reason, this effect is not maintainable and was never
used due to its abysmal performance. it'll be resurected when it can be
implemented efficiently.

Change-Id: Id4222c9b86c629275cdec18873ef07be8723b6d2
 2010-12-08 17:13:19 -08:00
Mathias Agopian
a2c3b35587 am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread 
* commit '74da537f80ba36c1279c04fcb85d89fc38c246a6':
  [317580] fix issue where the screen wouldn't be rotated properly in bypass mode
 2010-12-08 16:15:08 -08:00
Mathias Agopian
d211230633 remove support for PUSH_BUFFER surfaces and overlays 
the same functionality is now supported through
the h/w composer HAL, and YUV support in the GPU.

Change-Id: I8146605449954b8e8fd7f78810b7d873c2d8f5bf
 2010-12-08 16:13:59 -08:00