Commit Graph

53483 Commits

Author SHA1 Message Date
Puneet Kumar
98d740d7d2 am 94973aeb: am a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit '94973aeb1961c5a07a5288ec56c7f79ab658bb8d':
  Inputflinger: hook up key event replacement processing
2015-10-08 09:15:33 +00:00
Puneet Kumar
b916390540 am ec1323db: am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
* commit 'ec1323dbd4558f9d4ff422c8547334fe13242ad0':
  Allow defining replacement key events in keymap
2015-10-08 09:15:32 +00:00
Puneet Kumar
94973aeb19 am a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit 'a2f78b44ee30839e2c047d07525dd6bc4fe50f1d':
  Inputflinger: hook up key event replacement processing
2015-10-08 09:08:32 +00:00
Puneet Kumar
ec1323dbd4 am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
* commit '2f3c3eb4e47d7cb6ef67e0fd2063e4b93e38e9ec':
  Allow defining replacement key events in keymap
2015-10-08 09:08:31 +00:00
Puneet Kumar
a2f78b44ee Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev 2015-10-08 08:16:58 +00:00
Puneet Kumar
2f3c3eb4e4 Merge "Allow defining replacement key events in keymap" into mnc-dr-dev 2015-10-08 08:16:31 +00:00
Baldev Sahu
dfab0ee254 SurfaceFlinger: Add support for MDP3
This change is porting of following commits related to MDP3

1) SurfaceFlinger: Change to support framebuffer flip for 2D blitters
- Surfaceflinger does not flip framebuffers when there are
  no layers marked for HWC_FRAMEBUFFER
- This change checks for the HWC_BLIT flag and will request a flip
  to a new FB_TARGET buffer even if there are no FRAMEBUFFER layers

  "Change-Id: I1cb44389a05c9ec049d7f0d39c288feccb11a91c"

2) SF: Avoid wormhole clear for BLIT calls
- Do not call GPU clear from SF when composition
  type is BLIT as it'll be taken care in HAL.

  "Change-Id: Ia613eb9b824c6484ecc8c8fa4ee883545d8541b8"

3) surfaceflinger: Allow gpu to render widevine level3
- Allow gpu to render widevine level3 but keep
  blocking screen shots.

  "Change-Id: I914232a062acbb7b17901dbf2b414973230e59d9"

Change-Id: I35eef9eb1597af21c195e07d5fe4c0c73ab3a269
2015-10-07 02:52:17 -07:00
Raj Kamal
67ec1ad104 sf: Avoid disabling DispSync resync
Avoid disabling DispSync resync if app and SF events aren't
using phase offsets. This prevents hardware VSYNC from turning
on always whenever something needs to be drawn, thereby
bringing down the power numbers.

Change-Id: I83c8f79eb46b9fdaa730ec32767ebed3286347b8
2015-10-06 03:22:28 -06:00
Dileep Marchya
24e0fdd93b SurfaceFlinger: Add dim layer information into HWC layer.
- Set dim layer flag = 0x80000000 to send dim layer hint to HWC.
- Clear HWC_SKIP_LAYER flag when dim layer flag is set.

Change-Id: I56904c65fb487e6e89d4c057015443730d727299
2015-10-06 03:22:28 -06:00
Baldev Sahu
a1288c979d libgui: Copyback all region except dirty region for newly allocated buffer
Inside Surface::lock if new buffer is allocated
and DirtyRegion does not cover complete buffer
bounds then copyback may not cover all remaining area
as it copyback only area covered by dirty regions
from other buffers. This will lead to left out
black area which may cause flicker.

Change-Id: I4a3f7a56fc5fbaf4af926584919577d8d34bed57
2015-10-06 03:22:27 -06:00
Omprakash Dhyade
8760f1673e fix copy back dirty region
Copyback dirty region logic does copyback,
even when its not necessary causing 2ms delay.
Fix the logic to copy back only what is necessary

CRs-fixed: 562334
Change-Id: I52de68258ac9f87d704ee5401f93417805fa6773
2015-10-06 03:22:27 -06:00
Ramkumar Radhakrishnan
cfd539bf4a sf: This is a combination of following changes.
Author: Prabhanjan Kandula<pkandula@codeaurora.org>
SF: Add support for inverse mounted panels.

Add 180 rotation in SF to account for inverse mounted panels.
The framework will be unaffected and use policies for a 0 mounted
panel. SF changes the global transform and silently induces the H,V
flips. Similar flips are added to screenshots as well.

CRs-Fixed: 894147

Change-Id: I6e9576ee734ee85097491eaa1e8e94cfb3731e0f

Author: Ramkumar Radhakrishnan<ramkumar@codeaurora.org>
SF: Clear visible region of layer appropriately.

Clear visible region of layer having layer stack id different than
the display layer stack id to ensure that the layer won't be present
on the wrong display layer list.

Change-Id: I59289fea63ec7a2451d4715cfe7926ba34fdb8e3

Change-Id: I5ad08a6013aa173d621ee80c766a6e19e1086a35
2015-10-06 03:22:26 -06:00
Baldev Sahu
3652b23865 SurfaceFlinger: Add support for V4L2 based wfd solution.
This change add support for V4L2 based Wi-Fi display.

Change-Id: Ib3f3868eb0b7fa2bf7e58246fb2c5cd0ddceb7e1
2015-10-06 03:22:26 -06:00
Vinu Deokaran
bd170ee5b6 gui: add Tertiary display support in surface composer header
Add definition of Tertiary display into the enumeration list of
surface composer header file, to support third display for all
Surface Flinger APIs.

Change-Id: Ic932be4f7f1ac9c44a5a8f36d17eb9386135de87
2015-10-06 03:22:25 -06:00
Raj Kamal
20f9ced881 SurfaceFlinger: Add support for DisplayUtils
Add DisplayUtils class which uses the custom implementations
of ExLayer, ExSurfaceFlinger, ExHWComposer,
and ExVirtualDisplaySurface classes if needed

Change-Id: Ibdd8da5d3d0d602f42b76a15d0994c6aa98bee3f
2015-10-06 03:22:25 -06:00
Tatenda Chipeperekwa
8eaa19460d SurfaceFlinger: Support get/set ActiveConfigs
This includes the following two changes squashed into one and
retaining the change I182f41edbaf9226fc62d6d17ee964998cd9f21f7

sf: Fixes for resolution change in SurfaceFlinger

1. Use active config from HWC when querying display attributes

   When we query the display attributes we should use the active
   config as reported by HWC in cases where HWC version is 1.4.
   In all other cases we should revert to the default config,
   config 0, as the active config.

2. Set/update the display config if HWC config change was successful

   The new config should only be applied if HWC succeeded in changing
   the active config. This would otherwise cause failure or undefined
   behavior if the client sets an invalid/unsupported display config.

3. Set the active config at display creation time

   When a new display device is added update the active config by
   querying HWC.

   Change-Id: I182f41edbaf9226fc62d6d17ee964998cd9f21f7

sf: Initialize active config for non-virtual displays at boot time

When a non-virtual display device is added at boot time, update the
active config by querying HWC otherwise the default config (config 0)
will be used.

    Change-Id: I90f42fa1d20ed6176c4be464a10ae69a2f6a6d55

Change-Id: I182f41edbaf9226fc62d6d17ee964998cd9f21f7
2015-10-06 03:22:24 -06:00
Erik Wolsheimer
ddf5f2509b am 05c86225: do not dumpstate raft BUG: 24159112
* commit '05c862252d5021f55a69281473c67d76e7097422':
  do not dumpstate raft BUG: 24159112
2015-10-02 17:37:05 +00:00
Erik Wolsheimer
05c862252d do not dumpstate raft
BUG: 24159112

Change-Id: I344aa73808992b5f84cb0536201a3ab2eb6f2b3c
2015-10-02 10:02:24 -07:00
The Android Automerger
3492a21877 merge in mnc-dr-release history after reset to mnc-dr-dev 2015-10-02 05:52:22 -07:00
Andrew de los Reyes
c9b392395f am 6c51a07d: am de18f6c3: InputResampling: Don\'t extrapolate for very low frame rates.
* commit '6c51a07d30a3c4bed9675da88c5f6f24a741d9a2':
  InputResampling: Don't extrapolate for very low frame rates.
2015-10-02 02:22:46 +00:00
Andrew de los Reyes
6c51a07d30 am de18f6c3: InputResampling: Don\'t extrapolate for very low frame rates.
* commit 'de18f6c32add6fb22065807a00ddc88b363df527':
  InputResampling: Don't extrapolate for very low frame rates.
2015-10-02 02:12:59 +00:00
Andrew de los Reyes
de18f6c32a InputResampling: Don't extrapolate for very low frame rates.
In very low framerate situations, extrapolation is generally going to
either cause no benefit or make a mistake. We can safely turn it off
with no user-visible negative impact.

BUG=https://buganizer.corp.google.com/u/0/issues/24550942
TEST=Scrolled very slowly and saw mispredictions on Angler. With change,
saw the log message that the mispredictions were suppressed.

Change-Id: Ic9747d3ff098d7918047ada2ed1c2d21282c65b0
2015-10-01 15:57:25 -07:00
Dmitry Torokhov
0faaa0bd7a Inputflinger: hook up key event replacement processing
Add handling of "replacement" key events in InputReader and EventHub by
consulting device's character key map (if exists) for presence of
replacement key code for given get code and meta state combination,
before passing it to InputDispatcher.

This enables defining special keys, such as ESC, on keyboards lacking
enough physical keys, via combination of normal keys and modifiers, for
example AltR + 1 => ESC.

Bug: 24504154

Change-Id: I7e36104808bedcf724436c1fbb63d37c35cca8af
2015-09-29 13:27:16 -07:00
Dmitry Torokhov
115f93eeeb Allow defining replacement key events in keymap
Currently keyboard maps allow to assign character sequences to key
events and allow specifying a so-called "fallback" key events that are
re-injected into input stream if target application indicates that it
was not able to handle the original key event. Unfortunately there is no
way to perform substitution before handing the event to applicationis.

This change adds a new keymap keyword "replace" that allows users query
"replacement" actions for key (if any), with the intent that such
replacement happens early in the event handling process.

Bug: 24504154

Change-Id: I3e6a2476c856524171df00ad22ff56f2018c1278
2015-09-29 13:26:30 -07:00
Naveen Leekha
846d747274 Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.

(Partial manual merge of master change
 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest
 to automerge from klp-dev)

For b/23696300

Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
2015-09-28 17:08:24 -07:00
Andreas Gampe
bcf2901af9 am 72da7fb7: Installd: Fully decouple pre- and post-bootcomplete properties
* commit '72da7fb77cc0aaeb272b0359679c841d02d5edfe':
  Installd: Fully decouple pre- and post-bootcomplete properties
2015-09-28 22:51:07 +00:00
Andreas Gampe
72da7fb77c Installd: Fully decouple pre- and post-bootcomplete properties
Do not fall back to dalvik.vm.dex2oat-threads if
dalvik.vm.boot-dex2oat-threads is not set. Also do not ever use
the value of dalvik.vm.image-dex2oat-threads. Instead use the
default behavior of dex2oat in that situation.

(cherry picked from commit 919461cbeef3e9f35388fc099a5fcdae1cb79cc6)

Bug: 24413760
Change-Id: I42e60996341414b95b8df2d243d5e07f7f5ff9b6
2015-09-28 22:12:13 +00:00
The Android Automerger
7cd0784ceb merge in mnc-dr-release history after reset to mnc-dr-dev 2015-09-25 01:03:27 -07:00
Naveen Leekha
bac4a44ac9 am 53aa7d80: am b0127aad: am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
* commit '53aa7d80cf64f2f2c0c935be8528a513b32341b2':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
2015-09-24 23:55:17 +00:00
Naveen Leekha
53aa7d80cf am b0127aad: am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
* commit 'b0127aadafbf3b314475e48772fdcc17939c5a9c':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
2015-09-24 23:44:56 +00:00
Naveen Leekha
b0127aadaf am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
* commit '69412a51f58fa9450f1cb077c8d4b6410128d993':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
2015-09-24 23:35:41 +00:00
Naveen Leekha
69412a51f5 am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
* commit 'c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
2015-09-24 23:27:31 +00:00
Naveen Leekha
c4bd721137 resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
Change-Id: I543df164076b44578b14d41031800bb62b81586d
2015-09-24 15:55:21 -07:00
Naveen Leekha
b062a7a10d am 62e5463e: am 83e60e42: am 571e27e2: am e889592e: am 73887c08: am b414255f: Initialize local variables to avoid data leak
* commit '62e5463e248d581ee4faa58c631541b994500793':
  Initialize local variables to avoid data leak
2015-09-24 22:40:55 +00:00
Naveen Leekha
62e5463e24 am 83e60e42: am 571e27e2: am e889592e: am 73887c08: am b414255f: Initialize local variables to avoid data leak
* commit '83e60e42573ebc1bb06a408170bcdac2824e8dd6':
  Initialize local variables to avoid data leak
2015-09-24 22:31:42 +00:00
Naveen Leekha
83e60e4257 am 571e27e2: am e889592e: am 73887c08: am b414255f: Initialize local variables to avoid data leak
* commit '571e27e20e30560985d7c3a3ba8885693695b0fc':
  Initialize local variables to avoid data leak
2015-09-24 22:26:22 +00:00
Naveen Leekha
571e27e20e am e889592e: am 73887c08: am b414255f: Initialize local variables to avoid data leak
* commit 'e889592e33891c9b88ff6ba655426118f8ef12ee':
  Initialize local variables to avoid data leak
2015-09-24 22:20:59 +00:00
Naveen Leekha
7534e4e63a am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
* commit '18165848e86feab8656bfdac3173bccf45a9a6df':
  Initialize local variables to avoid data leak
2015-09-24 22:20:05 +00:00
Naveen Leekha
e889592e33 am 73887c08: am b414255f: Initialize local variables to avoid data leak
* commit '73887c0864c9a928db6f66bd48c5aea4d31d9a8b':
  Initialize local variables to avoid data leak
2015-09-24 22:13:06 +00:00
Naveen Leekha
18165848e8 am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
* commit 'e2c4f4fb8b34e36a4f2760f3812c942604cabfb6':
  Initialize local variables to avoid data leak
2015-09-24 22:04:48 +00:00
Naveen Leekha
73887c0864 am b414255f: Initialize local variables to avoid data leak
* commit 'b414255f53b560a06e642251535b019327ba0d7b':
  Initialize local variables to avoid data leak
2015-09-24 22:00:33 +00:00
Naveen Leekha
e2c4f4fb8b am c1e6fbb5: Initialize local variables to avoid data leak
* commit 'c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4':
  Initialize local variables to avoid data leak
2015-09-24 22:00:13 +00:00
The Android Automerger
3c8571dc9b merge in mnc-dr-release history after reset to mnc-dr-dev 2015-09-24 01:04:52 -07:00
Michael Wright
dd71ee89af am 0a77df93: am ce92ce9b: Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
* commit '0a77df93cb06cbd51527db6420250085ca9dd132':
  DO NOT MERGE Cancel touches as well as pointer gestures.
2015-09-23 17:49:52 +00:00
Michael Wright
0a77df93cb am ce92ce9b: Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
* commit 'ce92ce9bef5942435bb49474f0e5e4b29cfc5e97':
  DO NOT MERGE Cancel touches as well as pointer gestures.
2015-09-23 17:25:00 +00:00
Michael Wright
bc16fb9887 am cff01363: Merge commit \'8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix
* commit 'cff01363fcbdae5486287540e1f8917244aaea90':
  DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
2015-09-23 16:44:23 +00:00
Michael Wright
cff01363fc Merge commit '8a196b5630a93a3eb6df4cbe461917731e54fb35' into merge-fix
Change-Id: Iae99c0f3a13d999f1ff093993008a7c720e99725
2015-09-23 17:36:41 +01:00
Michael Wright
ce92ce9bef Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev 2015-09-23 13:18:26 +00:00
Michael Wright
8a196b5630 Merge "DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"" into mnc-dr-dev 2015-09-23 13:15:33 +00:00
Naveen Leekha
b414255f53 Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.

(Partial manual merge of master change
 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest
 to automerge from klp-dev)

For b/23696300

Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
2015-09-22 18:04:44 -07:00