summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use audio_source_t consistently"Glenn Kasten2012-01-272-3/+7
|\
| * Use audio_source_t consistentlyGlenn Kasten2012-01-262-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was a mix of audio_source_t, uint8_t, and int. Related fixes: - fix comments in MediaRecorder.java - AudioPolicyService server side was not checking source parameter at all, so if the client wrapper was bypassed, invalid values could be passed into audio HAL - JNI android_media_AudioRecord_setup was checking source for positive values, but not negative values. This test is redundant, since already checked at Java and now checked by AudioPolicyService also, but might as well make it correct. Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
* | Merge "AudioStreamIn and AudioStreamOut"Glenn Kasten2012-01-272-9/+15
|\ \
| * | AudioStreamIn and AudioStreamOutGlenn Kasten2012-01-262-9/+15
| | | | | | | | | | | | | | | | | | | | | These are immutable, so make the fields const. getOutput() and getInput() methods are now const. Change-Id: I128246ebd56ea50b3e542be43f2aa1bcb55f1373
* | | Merge "Declare methods in binder opcode order"Glenn Kasten2012-01-272-10/+10
|\ \ \
| * | | Declare methods in binder opcode orderGlenn Kasten2012-01-262-10/+10
| | |/ | |/| | | | | | | | | | | | | This makes it easier to compare interface and implementation. Change-Id: Ie060e43dec348902abcf40f5a610cec639d6d0d3
* | | Merge "Use enum effect_state consistently"Glenn Kasten2012-01-271-3/+3
|\ \ \
| * | | Use enum effect_state consistentlyGlenn Kasten2012-01-261-3/+3
| | |/ | |/| | | | | | | | | | | | | Also fix indentation Change-Id: I393ef9e37ffceed5ad4a78df439726ae1fe139df
* | | Merge "Use enum track_state consistently"Glenn Kasten2012-01-272-3/+3
|\ \ \
| * | | Use enum track_state consistentlyGlenn Kasten2012-01-262-3/+3
| |/ / | | | | | | | | | Change-Id: Ie5ebb7befa092e1de1e4df9c6e2d51e6bcfd176a
* | | Use enum mixer_state consistentlyGlenn Kasten2012-01-262-8/+8
|/ / | | | | | | Change-Id: I5b71ed20f939dfc4b98143334b7aa064d282f584
* | Merge "Add additional debug"Wink Saville2012-01-251-1/+5
|\ \
| * | Add additional debugWink Saville2012-01-251-1/+5
| | | | | | | | | | | | | | | | | | | | | When ConnectivityService#startUsingNetworkFeature is called and the special network is not available output some additional information. Change-Id: I34b226a208596fa6418f1f37a0feec1d274d493c
* | | am 535b0264: am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time ↵Eric Laurent2012-01-251-3/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | logic" into ics-mr1 * commit '535b0264a4cfa790e549bd9cd09980788f1375f4': AudioFlinger: refine mixer sleep time logic
| * \ \ am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1Eric Laurent2012-01-241-3/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839': AudioFlinger: refine mixer sleep time logic
| | * \ \ Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1Eric Laurent2012-01-241-3/+6
| | |\ \ \
| | | * | | AudioFlinger: refine mixer sleep time logicEric Laurent2012-01-231-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an AudioTrack is in underrun state, the AudioFlinger mixer will sleep for a short period of time to give the app a chance to fill the AudioTrack buffer. If the AudioTrack is still not ready during next mixing round, the mixer will proceed with other tracks. If an application keeps a steady underrun condition, the AudioFlinger mixer will alternate between ready and not ready states. In the longer term this will cause the audio HAL to underrun. There is a mechanism to reduce the sleep period if the mixer is not ready several times in a row but this mechanism is defeated by the alternating ready/not ready conditions. The fix consists in only increasing sleep time if the mixer is ready for at least two consecutive times. Issue 5904527. Change-Id: Id0139bca9be8c4e425ec6d428515c4d8f718e8c9
| * | | | | am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track ↵Eric Laurent2012-01-242-6/+21
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only when really ready (2)""" into ics-mr1 * commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2': DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
| | * | | | Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ↵Eric Laurent2012-01-242-6/+21
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | ready (2)""" into ics-mr1
| | | * | | DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready ↵Eric Laurent2012-01-232-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (2)"" This reverts commit b918035d34422a2041b6ec8c09c566bb93345b40. Change-Id: I093bcfa56ad54a080b930208b6b79169d33581fb
| * | | | | am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1Robert Greenwalt2012-01-241-6/+18
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f449ea9e96162698f4ec6d62c70750eb50744da7': Use the carrier-given dns addrs for tethering.
| | * | | | Merge "Use the carrier-given dns addrs for tethering." into ics-mr1Robert Greenwalt2012-01-241-6/+18
| | |\ \ \ \
| | | * | | | Use the carrier-given dns addrs for tethering.Robert Greenwalt2012-01-231-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a complaint from carriers (that we used 8.8.8.8), but also fixes the case where there is only room for one live radio connection: the secondary connection (tethering) doesn't have a default route to prevent on-device traffic from slipping out on the tethering connection, but tethered dns is proxied through dnsmasq, so it is appearing as on-device traffic and is unroutable. By switching to the carrier-indicated dns servers we can use the host-routes already set for those and kill two bugs with one fix. bug:5898904 Change-Id: Ida8777687994f353b2d4f2c7db5d6ea4b6ac3882
* | | | | | | improve SurfaceFlinger dumpsysMathias Agopian2012-01-249-131/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to say: dumpsys SurfaceFlinger --latency to print latency information about all windows dumpsys SurfaceFlinger --latency window-name to print the latency stats of the specified window for instance: dumpsys SurfaceFlinger --latency SurfaceView The data consists of one line containing global stats, followed by 128 lines of tab separated timestamps in nanosecond. The first line currently contains the refresh period in nanosecond. Each 128 following line contains 3 timestamps, of respectively the app draw time, the vsync timestamp just prior the call to set and the timestamp of the call to set. Change-Id: Ib6b6da1d7e2e6ba49c282bdbc0b56a7dc203343a
* | | | | | | hack up frame latency measurementJamie Gennis2012-01-244-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6d9a466a23285304f0e229a5649815636ab5d6af
* | | | | | | Merge "Move network stats to FileRotator pattern."Jeff Sharkey2012-01-249-1030/+1354
|\ \ \ \ \ \ \
| * | | | | | | Move network stats to FileRotator pattern.Jeff Sharkey2012-01-249-1030/+1354
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split existing network stats into two separate classes: a recorder which generates historical data based on periodic counter snapshots, and a collection of historical data with persistance logic. Recorder keeps a pending history in memory until outstanding data crosses a specific threshold. Persisting is handled through a given FileRotator. This pattern significantly reduces disk churn and memory overhead. Separate UID data from UID tag data, enabling a shorter rotation cycle. Migrate existing stats into new structure. Remove "xt" stats until iptables hooks are ready. Avoid consuming Entry values when recording into NetworkStatsHistory. Assign operation counts to default route interface. Introduce "Rewriter" interface in FileRotator with methods to enable rewriteAll(). Introduce IndentingPrintWriter to handle indenting in dump() methods. Bug: 5386531 Change-Id: Ibe086230a17999a197206ca62d45f266225fdff1
* | | | | | | | am a5853595: am 47163685: Merge "Another attempt at issue #5823276: home ↵Dianne Hackborn2012-01-242-7/+23
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | repaints after full-screen app is exited" into ics-mr1 * commit 'a5853595165a6395ca41bbc17a3dd88e12259ad1': Another attempt at issue #5823276: home repaints after full-screen app is exited
| * | | | | | am 47163685: Merge "Another attempt at issue #5823276: home repaints after ↵Dianne Hackborn2012-01-242-7/+23
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full-screen app is exited" into ics-mr1 * commit '47163685eb90f9520e7ae0ac0984b4e1535e8e5b': Another attempt at issue #5823276: home repaints after full-screen app is exited
| | * | | | | Merge "Another attempt at issue #5823276: home repaints after full-screen ↵Dianne Hackborn2012-01-242-7/+23
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | app is exited" into ics-mr1
| | | * | | | Another attempt at issue #5823276: home repaints after full-screen app is exitedDianne Hackborn2012-01-232-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is between the two previous attempts. I returned the part from the original that was breaking gallery, but have some new code to detect when something about the window params has changed that would require a layout pass to make sure we still do a layout then, even if the window is not currently visible. Change-Id: I07745e1f66022583e3076b84cc8bbe8bd2acd48f
* | | | | | | am 9f080e2a: am 44760b10: Merge "Revert "Fix 5797764: Increase lock ↵Jim Miller2012-01-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen\'s thread priority"" into ics-mr1 * commit '9f080e2a5bc6a268934e32201c69ea8a86900396': Revert "Fix 5797764: Increase lock screen's thread priority"
| * | | | | | am 44760b10: Merge "Revert "Fix 5797764: Increase lock screen\'s thread ↵Jim Miller2012-01-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | priority"" into ics-mr1 * commit '44760b106a4bafcf83fb356bf91683db40e0e5a2': Revert "Fix 5797764: Increase lock screen's thread priority"
| | * | | | | Merge "Revert "Fix 5797764: Increase lock screen's thread priority"" into ↵Jim Miller2012-01-231-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | ics-mr1
| | | * | | | Revert "Fix 5797764: Increase lock screen's thread priority"Jim Miller2012-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6d6a70a33746ef5147ab146f1802f0db424dd2f1 This doesn't appear to have a measurable impact for this issue.
| * | | | | | am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when ↵Justin Ho2012-01-232-21/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | really ready (2)"" into ics-mr1 * commit 'fee5a860a8355cda071ff23644e943414ba7f65d': DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
| | * | | | | DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"Justin Ho2012-01-232-21/+6
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 71c4496a9757438afd30b4404824f296f6158a49. Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
* | | | | | New screen rotation animation design.Dianne Hackborn2012-01-232-125/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have an animation that can start as soon as we detect to rotate the screen, and have a different phase once the new UI is ready to complete the transition into it. Change-Id: I05b9c12a699232acbddc36b4a994a4452db71476
* | | | | | New brightness setting to adjust auto-brightness mode.Dianne Hackborn2012-01-231-31/+94
| |_|_|/ / |/| | | | | | | | | | | | | | Change-Id: Icfec22be99d8c79e9ff5720b80fb9dacbba36134
* | | | | Merge "Use Map.Entry, not HashMap.Entry"Andy McFadden2012-01-232-5/+6
|\ \ \ \ \
| * | | | | Use Map.Entry, not HashMap.EntryAndy McFadden2012-01-202-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map.Entry is the defined return value from entrySet(). HashMap.Entry shouldn't be used directly. Change-Id: Ia21598c6a73fe7eb22179ce114095f779c903084
* | | | | | am b1c7785c: am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread ↵Jim Miller2012-01-231-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | priority" into ics-mr1 * commit 'b1c7785c1110e171d3dd3deb259b1caeed0b9da6': Fix 5797764: Increase lock screen's thread priority
| * | | | | am eaa11a72: Merge "Fix 5797764: Increase lock screen\'s thread priority" ↵Jim Miller2012-01-201-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit 'eaa11a723150f1ea79446d7ba4bf77eb47b73337': Fix 5797764: Increase lock screen's thread priority
| | * | | | Merge "Fix 5797764: Increase lock screen's thread priority" into ics-mr1Jim Miller2012-01-201-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fix 5797764: Increase lock screen's thread priorityJim Miller2012-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This increases lock screen's thread priority from THREAD_PRIORITY_FOREGROUND to THREAD_PRIORITY_DISPLAY to ensure it runs before other activities that might stall lock screen when the screen turns on. Change-Id: I14cf9f3f5c092817bc6cf2d0a254001a5d34f744
* | | | | | resolved conflicts for merge of 892d11f4 to masterDianne Hackborn2012-01-201-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
| * | | | | am 1bae8066: Merge "Fix issue #5823276 again: home repaints after ↵Dianne Hackborn2012-01-202-14/+28
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full-screen app is exited" into ics-mr1 * commit '1bae80668cc1d12bb4a4b93bce1960b2601de131': Fix issue #5823276 again: home repaints after full-screen app is exited
| | * | | | Merge "Fix issue #5823276 again: home repaints after full-screen app is ↵Dianne Hackborn2012-01-202-14/+28
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | exited" into ics-mr1
| | | * | | | Fix issue #5823276 again: home repaints after full-screen app is exitedDianne Hackborn2012-01-202-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't consider a window as a candidate for the top fullscreen window if it is not going to be a candiate for layout. This fix does not include the change to ignore app tokens that are hidden. This causes problems in some dialogs that stay hidden until their app is ready to display, but need to perform a series of relayouts during that time to get to the right size. Dropping this part of the change still (mostly?) seems to allow us to avoid the bad states. Change-Id: Ic052cb1499d3287f47e9ffeac5cd2470ee5a308c
| * | | | | | am 5d58eb06: Merge "Fix a few memory leaks in the input dispatcher. (DO NOT ↵Jeff Brown2012-01-202-6/+27
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE)" into ics-mr1 * commit '5d58eb06bcc8671bae72fb2389a9929e106131cc': Fix a few memory leaks in the input dispatcher. (DO NOT MERGE)