summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling ↵Mike Lockwood2011-04-041-6/+11
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for accessory mode more robust" into gingerbread * commit 'a8731e1e922512e5c22485e48059f33b61ab93ea': DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
| | | * \ \ \ \ \ \ Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory ↵Mike Lockwood2011-03-301-6/+11
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode more robust" into gingerbread
| | | | * | | | | | | DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode ↵Mike Lockwood2011-03-291-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more robust Handle the case where the kernel driver is in accessory mode but we failed to initialize it at the framework level. On disconnnect, check to see if the accessory kernel driver is enabled rather than checking mCurrentAccessory. That way we will restore the USB state in the kernel even if mCurrentAccessory is null. Change-Id: I2c4f6edb34aae2064f4b62ec0461d1fdd8770541 Signed-off-by: Mike Lockwood <lockwood@android.com>
| | * | | | | | | | | am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" ↵Simon Wilson2011-04-041-0/+19
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit 'ec94472835787b66e1799110411d5077d0ef37cd': DO NOT MERGE Disable WiMAX when "Data Enabled" is off
| | | * | | | | | | | DO NOT MERGE Disable WiMAX when "Data Enabled" is offTK MUN2011-03-301-0/+19
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When user uncheck "Data Enabled" check box, WiMAX goes into "disconnected" state. Change-Id: I3b9bdbc16cc4ddbf7a1aac0c984cad8994c4e9f2 Signed-off-by: TK MUN <tk.mun@samsung.com>
* | | | | | | | | | Merge "You don't need to poke around inside FileDescriptor manually."Elliott Hughes2011-04-111-25/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | You don't need to poke around inside FileDescriptor manually.Elliott Hughes2011-04-111-25/+4
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can help you with that. Note also that getParcelFileDescriptorFD did no such thing. All its callers were passing in a regular java.io.FileDescriptor and expecting the int. No ParcelFileDescriptors involved. Change-Id: Idc233626f20c092e719f152562601f406cc1b64a
* | | | | | | | | | Merge "Add a sprite controller."Jeff Brown2011-04-1110-219/+904
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add a sprite controller.Jeff Brown2011-04-1110-219/+904
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored PointerController to extract the surface management code to a new component called a SpriteController so that it can be used to move finger tracking spots around the screen as well. The SpriteController is designed to fully decouple the client from any latency introduced by surface transactions and drawing. All sprite updates are performed asynchronously on the Looper using a copy of the sprite state. Added a stub SpotController implementation for touch pad UX. It will be implemented in a subsequent patch. Fixed a little bug in pointer orientation changes when entering DISPLAY_ORIENTATION_90 the x offset was clobbered. Change-Id: Ib25d162d577c9b354cb74d5d761c3c9f9f438d42
* | | | | | | | | | Merge "Package manager changes to store and update user information."Amith Yamasani2011-04-114-1/+419
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Package manager changes to store and update user information.Amith Yamasani2011-04-114-1/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some API stubs for managing users and storing their details. List of users is stored in an xml file. Each user's properties are stored in a separate xml file. Some unit tests for modifying the XML files. Change-Id: If2ce2420723111bd426f6762def3c2afc19a0ae5
* | | | | | | | | | Merge "Rework thumbnails in activity manager."Dianne Hackborn2011-04-085-62/+181
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rework thumbnails in activity manager.Dianne Hackborn2011-04-085-62/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now only keep a thumbnail for the task, not for each activity. However if you use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET, we will make a new secondary thumbnail for that series of activities. There is a new API for the app to get these secondary thumbnails. Also set a default thumbnail size for non-xlarge screens so we have thumbnails on phones. (We need some smarter code in the platform for computing the actual thumbnail dimensions of the current device). And add a test app to show recent tasks + thumbnails. Change-Id: Ic36759f6635522118a2cb7f156662229a610c492
* | | | | | | | | | | Add keychain user with special keystore access permissionsBrian Carlstrom2011-04-081-0/+5
| |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02fe5171add62c5cd9f57b01bc137f3bc1cb3a69
* | | | | | | | | | Remove the deprecated things from Config.java. These haven't been working ↵Joe Onorato2011-04-078-21/+13
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since before 1.0. Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
* | | | | | | | | Improve activity manager debug dumps.Dianne Hackborn2011-04-075-275/+700
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activity manager now does all dump requests into apps asynchronously, so it can nicely timeout if there is an app problem. Also lots of general cleanup of the am dump output. Change-Id: Id0dbccffb217315aeb85c964e379833e6aa3f5af
* | | | | | | | | am de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new ↵Wink Saville2011-04-071-18/+18
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | names for the NetConfig vars." into honeycomb-LTE * commit 'de1b950d2b07737e3d284ed2ada361737d8a5a1a': ConnectivityService needs to use the new names for the NetConfig vars.
| * | | | | | | | am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the ↵Wink Saville2011-04-071-18/+18
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetConfig vars." into honeycomb-LTE * commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1': ConnectivityService needs to use the new names for the NetConfig vars.
| | * | | | | | | ConnectivityService needs to use the new names for the NetConfig vars.Wink Saville2011-04-071-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I809a624057462871cd1849051286c2bffd5099e9
* | | | | | | | | am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aospRobert Greenwalt2011-04-071-70/+65
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21': Add external dependency API.
| * | | | | | | | resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aospRobert Greenwalt2011-04-071-70/+65
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
| | * | | | | | | Add external dependency API.Robert Greenwalt2011-04-071-71/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An APN will not be connected to if some external dependency is not met. bug:3486704 Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
* | | | | | | | | Merge "Coalesce input events that arrive faster than 333Hz."Jeff Brown2011-04-073-21/+101
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Coalesce input events that arrive faster than 333Hz.Jeff Brown2011-04-073-21/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some drivers report individual finger updates one at a time instead of all at once. When 10 fingers are down, this can cause the framework to have to handle 10 times as many events each with 10 times as much data. Applications like PointerLocation would get significantly bogged down by all of the redundant samples. This change coalesces samples that are closely spaced in time, before they are dispatched, as part of the motion event batching protocol. Increased the size of the InputChannel shared memory buffer so that applications can catch up faster if they accumulate a backlog of samples. Added logging code to help measure input dispatch and drawing latency issues in the view hierarchy. See ViewDebug.DEBUG_LATENCY. Change-Id: Ia5898f781f19901d2225c529a910c32bdf4f504f
* | | | | | | | | | Merge changes I4011db5c,I622bc5faJoe Onorato2011-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: less logging A system setting for "advanced settings."
| * | | | | | | | | | less loggingJoe Onorato2011-04-061-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4011db5c2a610e741a09e4e8fee68a86175769cc
* | | | | | | | | | Merge "Allow batching samples onto the pending motion event."Jeff Brown2011-04-061-0/+28
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | Allow batching samples onto the pending motion event.Jeff Brown2011-04-061-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enlarges the window of opportunity for batching to encompass time spent for the window to become ready (while it is busy processing the last event). Change-Id: I3fb5a394ab1b85d6591192678168ca6e35dd9d53
* | | | | | | | | Merge "Miscellaneous code cleanup in audio framework"Glenn Kasten2011-04-062-5/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Miscellaneous code cleanup in audio frameworkGlenn Kasten2011-04-062-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Move declaration of kClassPathName to top of file so it can be used in more than one place, instead of "android/media/AudioSystem". - Make private methods static. - Add comment to stream_type, audio_mode, force_use types that they must match values in AudioSystem.java. - Add comment about unused types mp3_sub_format and vorbis_sub_format. - Fix typos. - Use @ in javadoc comments. - Delete dead APIs setMode, getMode, setRouting, getRouting in AudioSystem.java (they are all hidden, deprecated, and unused by rest of framework) - Delete unused private log method. - Fix pathname for android_media_AudioSystem.cpp. - Improve code formatting for space after == and !=. - Add logging of delta for changing audio policy manager ref count. Change-Id: I18037c7beb8ab76d1fda08c11e589f6e591d36e1
* | | | | | | | | | Merge "remove more unused references to ISurface"Mathias Agopian2011-04-063-24/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove more unused references to ISurfaceMathias Agopian2011-04-053-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2201f1ca2bb8f203a081d94a0134f798778dfbef
* | | | | | | | | | | Merge "turn off log spew"Joe Onorato2011-04-062-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | turn off log spewJoe Onorato2011-04-062-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e5564e02460ff41829c9fd26d80032ea3104498
* | | | | | | | | | | | Add new resource configurations for screen width/height in "dp".Dianne Hackborn2011-04-061-0/+3
| |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now specify resource configuration variants "wNNNdp" and "hNNNdp". These are the minimum screen width/height in "dp" units. This allows you to do things like have your app adjust its layout based only on the about of horizontal space available. This introduces a new configuration change flag for screen size. Note that this configuration change happens each time the orientation changes. Applications often say they handle the orientation change to avoid being restarted at a screen rotation, and this will now cause them to be restarted. To address this, we assume the app can handle this new config change if its target SDK version is < ICS. Change-Id: I22f8afa136b4f274423978c570fa7c9855040496
* | | | | | | | | | | Merge "Don't use local ref for cached jclass reference in JNI code"Brian Carlstrom2011-04-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Don't use local ref for cached jclass reference in JNI codeBrian Carlstrom2011-04-061-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id45b2acb358a819f2fd332e99f3a095f6fc7299b related-to-bug: 4241138
* | | | | | | | | | Merge "Add support for supplicant SCAN_INTERVAL"Irfan Sheriff2011-04-061-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add support for supplicant SCAN_INTERVALIrfan Sheriff2011-04-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, allow scan interval for framework and supplicant to be configured at build time or run time Bug: 4144882 Change-Id: I877f4bcc872597b44d3f4da85cf2bc0f16e09444
* | | | | | | | | | Merge "MountService: Fix running media scanner at boot."Mike Lockwood2011-04-051-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | MountService: Fix running media scanner at boot.Mike Lockwood2011-04-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd1111b7ec6380011cd10a56f11f891f2e16abc2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | Merge "Fix deadlock in MountService"Mike Lockwood2011-04-051-17/+32
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fix deadlock in MountServiceMike Lockwood2011-04-051-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not safe to call into vold with a lock held on mVolumeStates since we will receive events back from vold on a different thread. So in the boot completed handler we make a copy of the volume list and then call vold to mount volumes after releasing the lock Change-Id: I0dee91f09e4056132aaaf0fb0a663148c65db1e4 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | New fix for issue 4111672: control block flagsEric Laurent2011-04-051-24/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first fix (commit 913af0b4) is problematic because it makes threads in mediaserver process block on the cblk mutex. This is not permitted as it can cause audio to skip or worse have a malicious application prevent all audio playback by keeping the mutex locked. The fix consists in using atomic operations when modifying the control block flags. Also fixed audio_track_cblk_t::framesReady() so that it doesn't block when called from AudioFlinger (only applies when a loop is active). Change-Id: Ibf0abb562ced3e9f64118afdd5036854bb959428
* | | | | | | | | | | Merge "Fix deadlock in BackupManagerService"Christopher Tate2011-04-041-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix deadlock in BackupManagerServiceChristopher Tate2011-04-041-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lock ordering bug. The fix is to avoid having to hold both locks simultaneously in one prong of the deadlock. (Further strengthening: the code path for potentially acquiring both simultaneously now begins at a common method, ensuring that lock ordering is always consistent.) Change-Id: If9433aff8326fec2ba0e97e96ad2d835b01e2cda
* | | | | | | | | | | Merge "StorageManager: Add getVolumeList() and getVolumeState() methods"Mike Lockwood2011-04-041-0/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | StorageManager: Add getVolumeList() and getVolumeState() methodsMike Lockwood2011-04-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf3301827dd27e8430bd44eaafde517a31ef035a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | | | | Merge "MountService: Add support for multiple volumes"Mike Lockwood2011-04-041-108/+111
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | / / / / / / / | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | MountService: Add support for multiple volumesMike Lockwood2011-04-041-108/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4eaa781cf302c7aaae170af2489b6b29120c0b81 Signed-off-by: Mike Lockwood <lockwood@android.com>