summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CleanupChris Craik2014-12-227-46/+19
| | | | Change-Id: I91ffb9c66697741116fdeaa31abdf6cfd79155df
* am ed27b72e: Merge "CEC: Allow no vendor-specific data for <Vendor Command ↵Jinsuk Kim2014-12-201-1/+1
|\ | | | | | | | | | | | | | | | | With ID>" into lmp-mr1-dev automerge: 2c8c47d automerge: f6ec9f5 * commit 'f6ec9f53639719b6d9ac981a2b9fb67716c00fc6': CEC: Allow no vendor-specific data for <Vendor Command With ID>
| * am ed27b72e: Merge "CEC: Allow no vendor-specific data for <Vendor Command ↵Jinsuk Kim2014-12-201-1/+1
| |\ | | | | | | | | | | | | | | | | | | With ID>" into lmp-mr1-dev automerge: 2c8c47d * commit 'ed27b72e581aea85d3c9db4284b07c560d326838': CEC: Allow no vendor-specific data for <Vendor Command With ID>
| | * Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into ↵Jinsuk Kim2014-12-201-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 2c8c47d * commit '2c8c47daefc881c5603689be39b10cb93a0cabdf': CEC: Allow no vendor-specific data for <Vendor Command With ID>
| | | * Merge "CEC: Allow no vendor-specific data for <Vendor Command With ID>" into ↵Jinsuk Kim2014-12-191-1/+1
| | | |\ | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | * CEC: Allow no vendor-specific data for <Vendor Command With ID>Jinsuk Kim2014-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed not to return <Feature Abort> if the command comes with any vendor-specific data, which is still valid. Bug: 18816046 Change-Id: I22204d167c7783a841f7bb560e900b525f9f036b
* | | | | Merge "Fix minor spelling and grammar errors in public JavaDoc"Kris Giesing2014-12-193-25/+25
|\ \ \ \ \
| * | | | | Fix minor spelling and grammar errors in public JavaDocKris Giesing2014-12-163-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18777215 Change-Id: I2403db4fb94144f0a71243c6b74076482defc9a4
* | | | | | am a1bd2d00: am 1ed9a88e: Merge "MediaSession: unmute stream when adjusting ↵Eric Laurent2014-12-192-11/+35
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | volume" into lmp-mr1-dev automerge: 6d1cb48 * commit '6d1cb48da45f70c2e8f73277bfb219e80a329778': MediaSession: unmute stream when adjusting volume
| * | | | | am a1bd2d00: am 1ed9a88e: Merge "MediaSession: unmute stream when adjusting ↵Eric Laurent2014-12-192-11/+35
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | volume" into lmp-mr1-dev * commit 'a1bd2d0008e5d9cb563936b7f044d8796c37fb2f': MediaSession: unmute stream when adjusting volume
| | * | | | am 1ed9a88e: Merge "MediaSession: unmute stream when adjusting volume" into ↵Eric Laurent2014-12-192-11/+35
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '1ed9a88ec3a1a1d9f418ae0b6f1e77e7b7dd99a3': MediaSession: unmute stream when adjusting volume
| | | * | | Merge "MediaSession: unmute stream when adjusting volume" into lmp-mr1-devEric Laurent2014-12-192-11/+35
| | | |\ \ \
| | | | * | | MediaSession: unmute stream when adjusting volumeEric Laurent2014-12-192-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18482488. Change-Id: I3411f78551cba31aa7f91b5223e015f0b8c1bbb2
* | | | | | | am 165fb8f5: am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-devJohn Reck2014-12-194-15/+22
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ed3c296 * commit 'ed3c2962be1e2966c3b46f20e81d2902a8302d8b': Tweak RT-animator scheduling
| * | | | | | am 165fb8f5: am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-devJohn Reck2014-12-194-15/+22
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '165fb8f5aa0709a8dc35f99a9b81f6906452a648': Tweak RT-animator scheduling
| | * | | | | am f89dac47: Merge "Tweak RT-animator scheduling" into lmp-mr1-devJohn Reck2014-12-194-15/+22
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'f89dac472366c547e535dfafa8df25bd2d031833': Tweak RT-animator scheduling
| | | * | | | Merge "Tweak RT-animator scheduling" into lmp-mr1-devJohn Reck2014-12-194-15/+22
| | | |\ \ \ \
| | | | * | | | Tweak RT-animator schedulingJohn Reck2014-12-194-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18226391 The issue occurs as a result of a dispatchFrame itself taking longer than 12ms, the alloted budget. The result is that a vsync request (which occured at the end) would miss the vsync that occured 1ms prior to the end of the frame. As a result it would end up waiting for the following vsync, essentially dropping to 30fps even though 60 could have been sustained. Fix this with a few tweaks. First, adjust the UI thread's delay bias from (now + 4ms) to (vsync + 4ms), this prevents RT animators from slowly drifting if the vsync occurs mid-task. Second, request a vsync preemptively prior to running callbacks. This way if any callbacks needs the next vsync and it takes "too long", we will catch that vsync. Finally, fix an issue where the display event queue was always drained & rejected at the end of a task loop. Instead, drain and reject all stale vsyncs. This still prevents the issue of both UI thread & RT thread trying to drive 2 frames in a single pulse, but also allows RT to notice that it missed a vsync pulse it needed and that it should speed-up a bit in response Change-Id: I9d6be037737e9283297898cac2e3563453e797cd
* | | | | | | | am f64d26fc: am e130d6c1: Merge "Remove a bad heuristic when determining ↵Svet Ganov2014-12-191-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | click location for accessibility." into lmp-mr1-dev automerge: 19ecc78 * commit '19ecc7847faf0f6800c342eab806358d68b610c1': Remove a bad heuristic when determining click location for accessibility.
| * | | | | | | am f64d26fc: am e130d6c1: Merge "Remove a bad heuristic when determining ↵Svet Ganov2014-12-191-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | click location for accessibility." into lmp-mr1-dev * commit 'f64d26fce002019f390b4f9f37c8edf965c362c5': Remove a bad heuristic when determining click location for accessibility.
| | * | | | | | am e130d6c1: Merge "Remove a bad heuristic when determining click location ↵Svet Ganov2014-12-191-2/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for accessibility." into lmp-mr1-dev * commit 'e130d6c14ae2d4a6f703ef452a7e5741d84936a0': Remove a bad heuristic when determining click location for accessibility.
| | | * | | | | Merge "Remove a bad heuristic when determining click location for ↵Svet Ganov2014-12-191-2/+1
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | accessibility." into lmp-mr1-dev
| | | | * | | | | Remove a bad heuristic when determining click location for accessibility.Svet Ganov2014-12-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a bride-gap solution to click on partially covered views in accessibility mode we compute a point on the screen where to send a down/up event pair. A heuristic we used was that if the action target is covered by a view that that has a touch listener we consider the target obscured by the one with the listener. However, this generates false positives, for example the target is covered by a view that observers touches for scrolling but not clicking. bug:18782023 Change-Id: I31ff34011d45667f1eddda47373ec00e4a23dbf6
* | | | | | | | | am a2bd0e55: am 02aca27f: Merge "Allow OEM to specify ↵Bart Sears2014-12-191-10/+37
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <unavailable-feature>." into lmp-mr1-dev automerge: d63dd3c * commit 'd63dd3c75b2d6d4af2b687e9a58822a983d97acd': Allow OEM to specify <unavailable-feature>.
| * | | | | | | | am a2bd0e55: am 02aca27f: Merge "Allow OEM to specify ↵Bart Sears2014-12-191-10/+37
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <unavailable-feature>." into lmp-mr1-dev * commit 'a2bd0e55997e1d8c956a616b376c5b7ccf8ed243': Allow OEM to specify <unavailable-feature>.
| | * | | | | | | am 02aca27f: Merge "Allow OEM to specify <unavailable-feature>." into ↵Bart Sears2014-12-191-10/+37
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '02aca27f8005ef94c906e599695243a9fd80f68a': Allow OEM to specify <unavailable-feature>.
| | | * | | | | | Merge "Allow OEM to specify <unavailable-feature>." into lmp-mr1-devBart Sears2014-12-191-10/+37
| | | |\ \ \ \ \ \
| | | | * | | | | | Allow OEM to specify <unavailable-feature>.Jeff Sharkey2014-12-191-10/+37
| | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some single-system-image builds may run on devices that lack certain hardware features. This change allows the OEM partition to mark a feature as "unavailable" which overrides the system image. Bug: 18801291 Change-Id: I0d81144ec92ee9a78c13b223bbba20a4aed23fa0
* | | | | | | | | am 7c580cab: am b5f1e878: Fix build breakage.Wink Saville2014-12-191-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 7478d51 * commit '7478d51f7042f6b78741058668060e87ce80a703': Fix build breakage.
| * | | | | | | | am 7c580cab: am b5f1e878: Fix build breakage.Wink Saville2014-12-191-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c580caba94ca3b917c887b9e8353809c7f320c7': Fix build breakage.
| | * | | | | | | am b5f1e878: Fix build breakage.Wink Saville2014-12-191-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5f1e878d1bc245b676a1a2504c30d21a311bf6c': Fix build breakage.
| | | * | | | | | Fix build breakage.Wink Saville2014-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I rebased a change and didn't compile, my mistake. Change-Id: Iad7fc609b08d53aa7b8b96af609e3ff9a4f0e889
* | | | | | | | | am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type.Wink Saville2014-12-191-17/+36
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 700b8f0 * commit '700b8f080ae39345b7174deea3c8acf6e1b51972': Update mapping between RAF and Network Type.
| * | | | | | | | am 57859d70: am f73c2d1f: Update mapping between RAF and Network Type.Wink Saville2014-12-191-17/+36
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57859d704ef2bc61798c172c4524596393f0beef': Update mapping between RAF and Network Type.
| | * | | | | | | am f73c2d1f: Update mapping between RAF and Network Type.Wink Saville2014-12-191-17/+36
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f73c2d1f0b6d55668c19493fba0088a69e6b128f': Update mapping between RAF and Network Type.
| | | * | | | | | Update mapping between RAF and Network Type.Wink Saville2014-12-191-17/+36
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:18754476 Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
* | | | | | | | Merge "Rename UsbAudioManager to UsbAlsaManager"Mike Lockwood2014-12-192-10/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename UsbAudioManager to UsbAlsaManagerMike Lockwood2014-12-192-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I53b084400ef3e0692415cc5af91c8b500ffd8346
* | | | | | | | | am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network ↵Wink Saville2014-12-191-3/+26
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type." into lmp-mr1-dev automerge: 7b727e2 * commit '7b727e2e0aedef50aba8e3d4081a643b79329497': Update mapping between RAF and Network Type.
| * | | | | | | | am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network ↵Wink Saville2014-12-191-3/+26
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type." into lmp-mr1-dev * commit 'aa40537ca56ce386edcdaed2d21a9e2f07975812': Update mapping between RAF and Network Type.
| | * | | | | | | am 63c79ce4: Merge "Update mapping between RAF and Network Type." into ↵Wink Saville2014-12-191-3/+26
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '63c79ce4bfef7e8de7939be3de8a539938d9fc4e': Update mapping between RAF and Network Type.
| | | * | | | | | Merge "Update mapping between RAF and Network Type." into lmp-mr1-devWink Saville2014-12-191-3/+26
| | | |\ \ \ \ \ \
| | | | * | | | | | Update mapping between RAF and Network Type.Stuart Scott2014-12-151-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:18754476 Change-Id: Ibca856fe10bc4a7dc620ab7936a70d1f0427fe56
* | | | | | | | | | am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into ↵Eric Laurent2014-12-191-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: b418537 * commit 'b4185370d22457e8893ab5da07870e6d56910fbe': AudioService: fix permission check.
| * | | | | | | | | am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into ↵Eric Laurent2014-12-191-0/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3': AudioService: fix permission check.
| | * | | | | | | | am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-devEric Laurent2014-12-191-0/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8d24fe235a6e8f44e32a56a05ab36ed5b35385df': AudioService: fix permission check.
| | | * | | | | | | Merge "AudioService: fix permission check." into lmp-mr1-devEric Laurent2014-12-191-0/+3
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | | * | | | | | AudioService: fix permission check.Eric Laurent2014-12-181-0/+3
| | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear caller identity before calling TelecomManager.isInCall(). Bug: 18702149. Change-Id: Ie057f3f261fc0a36dff51840cc8390408621d3bd
* | | | | | | | | am 796a1773: am 4fa039df: Merge "Layout the config-changed window if it has ↵Olawale Ogunwale2014-12-191-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surface" automerge: 9079259 * commit '9079259054359e45b9616afaa799439c9171c0e2': Layout the config-changed window if it has surface
| * | | | | | | | am 796a1773: am 4fa039df: Merge "Layout the config-changed window if it has ↵Olawale Ogunwale2014-12-191-1/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | surface" * commit '796a1773070fd13eca07bc4919f1c7cdf2d8a8e7': Layout the config-changed window if it has surface