ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,753 Commits 2 Branches 0 Tags 54 MiB
Commit Graph

51753 Commits

Author SHA1 Message Date
Chih-Hung Hsieh ac5cd96fe2 am dbab409c: Merge "Avoid two warnings from clang." 
* commit 'dbab409c49ca5dd6686912d0b3eeb19ef1c37a3e':
  Avoid two warnings from clang.
 2014-11-04 01:24:07 +00:00
Naseer Ahmed 1b89fe0b81 am ff520bb9: am 7aa0c47e: sf: Add a NULL check in getDisplayConfigs 
* commit 'ff520bb93812f9892da526ace81efce9b0872503':
  sf: Add a NULL check in getDisplayConfigs
 2014-11-04 01:18:08 +00:00
Chih-Hung Hsieh dbab409c49 Merge "Avoid two warnings from clang." 2014-11-04 01:14:17 +00:00
Naseer Ahmed ff520bb938 am 7aa0c47e: sf: Add a NULL check in getDisplayConfigs 
* commit '7aa0c47e4205c6fca136c38f272d911c25c8a8fa':
  sf: Add a NULL check in getDisplayConfigs
 2014-11-03 22:31:50 +00:00
Michael Lentine dfd06b89a4 Fix for corruption when numFds or numInts is too large. 
Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
 2014-11-03 14:08:54 -08:00
Naseer Ahmed 7aa0c47e42 sf: Add a NULL check in getDisplayConfigs 
Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).

Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)

Change-Id: I1a12f43b7c375b9c01998dadd5b658275c733fb2
Acked-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
 2014-11-03 12:16:18 -08:00
The Android Automerger 1ece08100d merge in lmp-mr1-release history after reset to 793fc0e13d 2014-11-03 06:11:11 -08:00
The Android Automerger 9bb99b2f23 merge in lmp-mr1-release history after reset to 793fc0e13d 2014-11-02 06:10:50 -08:00
Aravind Akella b4373ac9f5 Add a timeout for releasing SensorService wake_lock. 
If SensorService is holding a wake_lock and there are no acknowledgements
 from ANY app within 5 seconds, release the wake_lock and reset the wake_lock
 refcounts for all connections.

Bug: 16874240
Change-Id: I5e950dd393c20173c439cbd5a4ba614ee09d61f4
 2014-11-01 18:19:25 -07:00
The Android Automerger ff6e40f889 merge in lmp-mr1-release history after reset to 793fc0e13d 2014-11-01 06:11:11 -07:00
Michael Lentine 001ed44536 am 54430ca2: am 793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev 
* commit '54430ca2a88f57c709ea2924ea0b78820ae62643':
  Fix crash when user provides large values in the Parcel.
 2014-11-01 00:41:16 +00:00
Michael Lentine 54430ca2a8 am 793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev 
* commit '793fc0e13d25bdecda1219999f8be2cb3c121d20':
  Fix crash when user provides large values in the Parcel.
 2014-11-01 00:33:29 +00:00
Michael Lentine 793fc0e13d Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev 2014-10-31 23:37:47 +00:00
Michael Lentine 8afa1c4ab8 Fix crash when user provides large values in the Parcel. 
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
 2014-10-31 16:08:44 -07:00
Michael Lentine fb66335bcc am 078794ed: am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev 
* commit '078794ed377e7080ee155a632482bb98f1c9ade7':
  Fix output of pointers for 64bit devices.
 2014-10-31 23:07:01 +00:00
Jesse Hall d8ad444c32 am b43a1c9b: am affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev 
* commit 'b43a1c9be2046345d61fb0d0a5fd06eda5cbe31e':
  surfaceflinger: fix -Wunused-parameter warning
 2014-10-31 23:07:01 +00:00
Jesse Hall d792acc531 am 18b846dd: am c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev 
* commit '18b846dda798709796be078a7978d885685df9a4':
  surfaceflinger: fix -Wsign-compare warnings
 2014-10-31 23:07:00 +00:00
Jesse Hall 8864e3e6cc am 9fc06c5e: am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev 
* commit '9fc06c5e2131cdf0d76a3838215c057f57da67e3':
  surfaceflinger: fix -Woverloaded-virtual warning
 2014-10-31 23:06:59 +00:00
Jesse Hall c091c0e945 am 31705817: resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp 
* commit '3170581704fa59a8672262c0e6c68f455d470214':
  surfaceflinger: fix -Wmismatched-tags warnings
 2014-10-31 22:58:46 +00:00
Michael Lentine 078794ed37 am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev 
* commit '9853685931298ba02066ebb50a8377ad4aa80f00':
  Fix output of pointers for 64bit devices.
 2014-10-31 22:58:19 +00:00
Jesse Hall b43a1c9be2 am affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev 
* commit 'affc4d809edbcb3b0e49e5ccc9821b9695a57d44':
  surfaceflinger: fix -Wunused-parameter warning
 2014-10-31 22:57:44 +00:00
Jesse Hall 18b846dda7 am c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev 
* commit 'c7636f606270a4b79d745ec1acf049daedfa0e2f':
  surfaceflinger: fix -Wsign-compare warnings
 2014-10-31 22:57:43 +00:00
Jesse Hall 9fc06c5e21 am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev 
* commit '6e74e3ccd972fe90d9998f6b683e25dca38f470d':
  surfaceflinger: fix -Woverloaded-virtual warning
 2014-10-31 22:57:42 +00:00
Jesse Hall 3170581704 resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp 
Change-Id: I83fdaf504ca37536c277a146c1d624e44cfe11b0
 2014-10-31 15:53:38 -07:00
Michael Lentine 9853685931 Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev 2014-10-31 18:39:23 +00:00
Chih-Hung Hsieh 8e5337de2c Avoid two warnings from clang. 
Clang compiler warns about undefined static functions like getReturnString
before all references are removed inside IF_LOG_COMMANDS.
To remove such warnings, we can leave those static functions defined
and the compiler will remove them at the end when they are not used.

Add a cast to long before converting from int to void*,
to avoid type cast warnings on 64 bit targets.

BUG: 17043248
Change-Id: Ica31101522279d2c8eacc90e2939767002fb827b
 2014-10-31 18:38:00 +00:00
Michael Lentine fae12d4fb4 Fix output of pointers for 64bit devices. 
Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0
 2014-10-31 11:08:19 -07:00
Jesse Hall affc4d809e Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev 2014-10-31 16:59:45 +00:00
Jesse Hall c7636f6062 Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev 2014-10-31 16:59:26 +00:00
Jesse Hall 6e74e3ccd9 Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev 2014-10-31 16:59:11 +00:00
Jesse Hall 04c9683aa1 Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev 2014-10-31 16:58:45 +00:00
Jesse Hall 7cd85979e8 surfaceflinger: fix -Wunused-parameter warning 
warning: unused parameter 'mustRecompose' [-Wunused-parameter]

Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
(cherry picked from d2e514f717)
 2014-10-31 09:52:42 -07:00
Jesse Hall 7844211607 surfaceflinger: fix -Wsign-compare warnings 
warning: comparison of integers of different signs: 'int' and 'size_t'
(aka 'unsigned int') [-Wsign-compare]

arning: comparison of integers of different signs: 'int32_t' (aka
'int') and 'const uint32_t' (aka 'const unsigned int')
[-Wsign-compare]

Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2
(cherry picked from f9bfdc6c94)
 2014-10-31 09:52:23 -07:00
Jesse Hall 9b901805ed surfaceflinger: fix -Woverloaded-virtual warning 
warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]

Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
(cherry picked from commit 382574d116)
 2014-10-31 09:52:08 -07:00
Jesse Hall 1495ceb885 surfaceflinger: fix -Wmismatched-tags warnings 
warning: struct 'HWComposer' was previously declared as a class
[-Wmismatched-tags]

warning: class 'DisplayInfo' was previously declared as a struct
[-Wmismatched-tags]

Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e
(cherry picked from commit 646f541050)
 2014-10-31 09:51:10 -07:00
Jeff Tinker 57481590b9 Add missing secure stop methods 
b/18053197
b/18076411

Change-Id: I42b97f7e39d6e9e58990b41a4c4b5a7c9b8a49cf
 2014-10-31 00:42:33 -07:00
Dan Stoza 0684ff9e65 am bc11bbf2: am 7b97351b: Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev 
* commit 'bc11bbf2f0bd38c0f271cb95c138a48d5d9a085b':
  Initialize ARect fields in default ctor
 2014-10-30 21:06:48 +00:00
Jesse Hall 82f3d66b1a am f12f1550: am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT 
* commit 'f12f15502a3092a9f7f28cf45b1a00e2efbd6eac':
  GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
 2014-10-30 21:06:47 +00:00
Dan Stoza 30d382613e am d7702163: am 1f3efb11: Don\'t run large virtual displays through HWC 
* commit 'd77021637e28e66be3fcc097b16869df69717df9':
  Don't run large virtual displays through HWC
 2014-10-30 21:06:46 +00:00
Dan Stoza bc11bbf2f0 am 7b97351b: Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev 
* commit '7b97351b68e96ea67380140266abb897fe1be57d':
  Initialize ARect fields in default ctor
 2014-10-30 20:58:44 +00:00
Jesse Hall f12f15502a am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT 
* commit '1834f8ea975e9a882b44dc479320fe02e306e630':
  GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
 2014-10-30 20:58:43 +00:00
Dan Stoza d77021637e am 1f3efb11: Don\'t run large virtual displays through HWC 
* commit '1f3efb11ff8c884a254f4272f0d1ee0b77ceff2f':
  Don't run large virtual displays through HWC
 2014-10-30 20:58:42 +00:00
The Android Automerger e47a752ac0 merge in lmp-mr1-release history after reset to 7b97351b68 2014-10-30 06:11:21 -07:00
Dan Stoza 298e6f92a4 am d23b34b3: am f3929d66: am e42cba8f: Merge "Initialize ARect fields in default ctor" 
* commit 'd23b34b3ac591d2c7bfb58bfc3ab673e775df496':
  Initialize ARect fields in default ctor
 2014-10-29 23:13:10 +00:00
Dan Stoza d23b34b3ac am f3929d66: am e42cba8f: Merge "Initialize ARect fields in default ctor" 
* commit 'f3929d6611bb8278e561fdd4b05a21915ac9de76':
  Initialize ARect fields in default ctor
 2014-10-29 23:08:21 +00:00
Dan Stoza f3929d6611 am e42cba8f: Merge "Initialize ARect fields in default ctor" 
* commit 'e42cba8feb2bbfe385f162a06e41e2c2c0f40c99':
  Initialize ARect fields in default ctor
 2014-10-29 23:04:05 +00:00
Dan Stoza e42cba8feb Merge "Initialize ARect fields in default ctor" 2014-10-29 22:58:49 +00:00
Dmitriy Ivanov bccab86174 Initialize ARect fields in default ctor 
So that we can use Rect() for update and such.

Bug: 18095940
Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f
 2014-10-29 15:48:28 -07:00
Dan Stoza 7b97351b68 Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev 2014-10-29 18:32:49 +00:00
Jesse Hall 1834f8ea97 GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT 
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
(cherry picked from commit 46a1f6b40e)
 2014-10-29 17:15:09 +00:00