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

48633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
bdcf1fe2ba Merge changes I0d9f18d1,Ib96c9161 
* changes:
  Add a --color option to dumpsys SurfaceFlinger
  clean-up/simplify all dump() APIs
 2013-04-24 10:25:34 +00:00
Matthew Xie
1e5baa4e7d am ae5fa5a2: am 3cf12f41: Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev 
* commit 'ae5fa5a2f790d5691f52b8000d4a8708d596ccbc':
  Add hardware feature android.hardware.bluetooth.le xml file
 2013-04-23 15:54:56 -07:00
Matthew Xie
ae5fa5a2f7 am 3cf12f41: Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev 
* commit '3cf12f4112167cb3372cbdba2b66d48a5d56dc4b':
  Add hardware feature android.hardware.bluetooth.le xml file
 2013-04-23 15:52:54 -07:00
Matthew Xie
3cf12f4112 Merge "Add hardware feature android.hardware.bluetooth.le xml file" into jb-mr2-dev 2013-04-23 22:47:36 +00:00
Matthew Xie
3dacc3f1a3 Add hardware feature android.hardware.bluetooth.le xml file 
The feature is used to differ platforms that support bluetooth low
engery radio
bug 8369273

Change-Id: I8714b6b03a4e5692d4573ea7c156b002b7ee42dd
 2013-04-23 11:58:44 -07:00
Mathias Agopian
6bbd8e30b5 am 3cf76aff: am e692ab9a: fix uninitialized variables in GLConsumer 
* commit '3cf76affd3ef28759789622e9e0134bdb045418b':
  fix uninitialized variables in GLConsumer
 2013-04-23 11:16:44 -07:00
Mathias Agopian
3cf76affd3 am e692ab9a: fix uninitialized variables in GLConsumer 
* commit 'e692ab9a6be63193c5b52a6562d85d06c40463b8':
  fix uninitialized variables in GLConsumer
 2013-04-23 03:50:30 -07:00
Mathias Agopian
3e25fd8609 Add a --color option to dumpsys SurfaceFlinger 
colorize a bit the output of dumpsys SurfaceFlinger to
make it easier to read. Right now it will bold the
title of each section and use green for the name of
each layer.

Change-Id: I0d9f18d115401cb45109d244ef3a278481f68cc6
 2013-04-22 21:51:28 +02:00
Mathias Agopian
74d211ae26 clean-up/simplify all dump() APIs 
remove the scratch buffer parameter and use
String8::appendFormat() instead.

Change-Id: Ib96c91617c8e7292de87433d15cf6232b7d591b0
 2013-04-22 21:51:28 +02:00
Mathias Agopian
e692ab9a6b fix uninitialized variables in GLConsumer 
mDefaultWidth, mDefaultHeight and mCurrentScallingMode are now
initialized to the same default value that BufferQueue uses.

Change-Id: I0d4da2022b06419d12745716d8ddbd48c8869953
 2013-04-22 11:24:02 +02:00
Mathias Agopian
dfc11ac5c2 am 93a9e03d: am bd115338: allow dumpsys SurfaceFlinger in user builds from the shell user 
* commit '93a9e03d2a7458398a17f2dc7434d7b385ed31d7':
  allow dumpsys SurfaceFlinger in user builds from the shell user
 2013-04-18 18:15:58 -07:00
Mathias Agopian
93a9e03d2a am bd115338: allow dumpsys SurfaceFlinger in user builds from the shell user 
* commit 'bd1153382e7a9d89922bea999a52ca21d46d6caa':
  allow dumpsys SurfaceFlinger in user builds from the shell user
 2013-04-18 18:11:55 -07:00
Mathias Agopian
bd1153382e allow dumpsys SurfaceFlinger in user builds from the shell user 
Bug: 8659013
Change-Id: I1de43bb5808cb8c1103cfc73dca59ff70fc13f91
 2013-04-18 16:41:04 -07:00
Jaikumar Ganesh
4390825a6f am 7c043486: am 379f0f04: Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev 
* commit '7c0434861eb2ac6c408e5f56b5c8ced6da1beaf3':
  Fix activation issue with auto disabled sensors.
 2013-04-17 22:00:50 -07:00
Jaikumar Ganesh
7c0434861e am 379f0f04: Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev 
* commit '379f0f04cca66b5fe3dcd96ef81b267d8fc0de03':
  Fix activation issue with auto disabled sensors.
 2013-04-17 21:58:12 -07:00
Jaikumar Ganesh
379f0f04cc Merge "Fix activation issue with auto disabled sensors." into jb-mr2-dev 2013-04-18 04:56:29 +00:00
Jaikumar Ganesh
4c01b1ad80 Fix activation issue with auto disabled sensors. 
Auto disabled sensors get auto disabled after trigger.
An activation after this wasn't working because the
state was not being reset.

b/8609561

Change-Id: If72c9f27345e91671d7ad0a7a066f6dc3d255b78
 2013-04-17 14:58:22 -07:00
Igor Murashkin
6ca04ca755 am f3d93d43: am 187edf93: Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev 
* commit 'f3d93d436373dcc39ff0b7f4aac938f4619421a2':
  BufferItemConsumer: add functions to set default buffer format/size
 2013-04-17 12:48:23 -07:00
Igor Murashkin
f3d93d4363 am 187edf93: Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev 
* commit '187edf93c6245bb8fb3187c49f2174492ed6e049':
  BufferItemConsumer: add functions to set default buffer format/size
 2013-04-17 12:44:23 -07:00
Igor Murashkin
187edf93c6 Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev 2013-04-17 19:39:53 +00:00
Mathias Agopian
e7e37a97a1 am cf73e1fd: am f31510a2: Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES 
* commit 'cf73e1fd8a0a3372ff91e0485b37680262f5df95':
  Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
 2013-04-16 23:40:05 -07:00
Mathias Agopian
cf73e1fd8a am f31510a2: Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES 
* commit 'f31510a2ac0807cf3d4224a73fc3f8f691f42f5a':
  Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
 2013-04-16 23:36:58 -07:00
Mathias Agopian
f31510a2ac Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES 
Bug: 8395618
Change-Id: I160d29699593b11058533ca753e275d5deeb3b54
 2013-04-16 23:32:38 -07:00
Mathias Agopian
5d4513ed3d am eb3610e4: am ed6d08b7: fix "traceGpuCompletion" debug feature 
* commit 'eb3610e4d0581e5b3a0bb6d4c4d02d24e453cc93':
  fix "traceGpuCompletion" debug feature
 2013-04-16 17:06:46 -07:00
Mathias Agopian
eb3610e4d0 am ed6d08b7: fix "traceGpuCompletion" debug feature 
* commit 'ed6d08b70d775852f4827471814c83eba3606aaa':
  fix "traceGpuCompletion" debug feature
 2013-04-16 17:04:42 -07:00
Mathias Agopian
ed6d08b70d fix "traceGpuCompletion" debug feature 
eglCreateSyncKHR requires a call to glFlush which we were not doing.
fixed by moving the code above eglSwapBuffers(), which both
fixes the problem and gives us a slightly better idea of when
the GPU is done drawing.

Change-Id: Ic826ef1fe25a6247742c3d49d0cb69f4031e3593
 2013-04-16 16:41:47 -07:00
Jesse Hall
33098d5643 am 29bdde08: am 2f67faeb: Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev 
* commit '29bdde08db2890f4197ae7f2b253f251468980ab':
  Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
  Special-case glGetActiveUniformBlockName
  Special-case glGetStringi
  Special-case glMapBufferRange
  Special-case glGetBufferPointerv
  Special-case glGetUniformIndices
  Special-case glGetTransformFeedbackVarying
  Special-case glTransformFeedbackVaryings
  Add buffer object versions of several functions
  Add *int64 and GLsync types and related functions
  Add ES3 functions and constants, difficult ones commented out
  Support "const GLChar*" and "const GLenum*" types
  Minor changes to ES3 functions inherited from ES2
  Generate GLES30 class, just a clone of GLES20 for now
 2013-04-16 14:33:32 -07:00
Jesse Hall
29bdde08db am 2f67faeb: Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev 
* commit '2f67faeb801dd6eb8fff8f8aab3843f2532c941d':
  Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
  Special-case glGetActiveUniformBlockName
  Special-case glGetStringi
  Special-case glMapBufferRange
  Special-case glGetBufferPointerv
  Special-case glGetUniformIndices
  Special-case glGetTransformFeedbackVarying
  Special-case glTransformFeedbackVaryings
  Add buffer object versions of several functions
  Add *int64 and GLsync types and related functions
  Add ES3 functions and constants, difficult ones commented out
  Support "const GLChar*" and "const GLenum*" types
  Minor changes to ES3 functions inherited from ES2
  Generate GLES30 class, just a clone of GLES20 for now
 2013-04-16 14:31:17 -07:00
Jesse Hall
2f67faeb80 Merge changes I66085c30,Ic9b3be9f,Icc6b23ab,I359a9511,I11a7394e,Ic8bcd03e,I40834d6f,I02a1548a,I638a36b0,I814befe2,Iaaef7d53,I349575e5,I0b5acc78,I6fad8803 into jb-mr2-dev 
* changes:
  Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX
  Special-case glGetActiveUniformBlockName
  Special-case glGetStringi
  Special-case glMapBufferRange
  Special-case glGetBufferPointerv
  Special-case glGetUniformIndices
  Special-case glGetTransformFeedbackVarying
  Special-case glTransformFeedbackVaryings
  Add buffer object versions of several functions
  Add *int64 and GLsync types and related functions
  Add ES3 functions and constants, difficult ones commented out
  Support "const GLChar*" and "const GLenum*" types
  Minor changes to ES3 functions inherited from ES2
  Generate GLES30 class, just a clone of GLES20 for now
 2013-04-16 21:29:39 +00:00
Igor Murashkin
87d1e3427b BufferItemConsumer: add functions to set default buffer format/size 
Bug: 8629088
Change-Id: I06f2e26a70d6dbcfcd70b08b4461e8e401f6e83f
 2013-04-16 11:24:40 -07:00
Jesse Hall
c0d184b8c1 Subclass GLES30 from GLES20, @Deprecate GL_STENCIL_INDEX 
Bug: 8566953
Change-Id: I66085c300a8658a4018796645257edb73be94719
 2013-04-15 16:42:21 -07:00
The Android Open Source Project
c1c27655ee am 987f727d: Reconcile with jb-mr2-release - do not merge 
* commit '987f727da2f90d428ae773a58cafc4ea67737aab':
  Improve screenshot performance on some devices (DO NOT MERGE)
 2013-04-15 10:48:58 -07:00
The Android Open Source Project
987f727da2 Reconcile with jb-mr2-release - do not merge 
Change-Id: I98befd6a263feb5235d4a8aa20abff47a2a8a097
 2013-04-15 10:46:12 -07:00
The Android Automerger
cec19a1d4f merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-15 05:55:54 -07:00
Jesse Hall
df9ac0fc06 am 0c3b9112: am 883daf6e: Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev 
* commit '0c3b91120788d2f09cf8e8617cfe7b9ee705ba44':
  Make gen more readable, use UNIX-style line endings
 2013-04-13 14:23:04 -07:00
Jesse Hall
0c3b911207 am 883daf6e: Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev 
* commit '883daf6eed36c11a7cb458f07a88e7a9cea29c27':
  Make gen more readable, use UNIX-style line endings
 2013-04-13 14:21:01 -07:00
Jesse Hall
883daf6eed Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev 2013-04-13 21:18:25 +00:00
Mathias Agopian
9b1eda7efa am d7932a62: am 48be3232: Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev 
* commit 'd7932a62d091df1559a47004670a951d8ab9c7f1':
  make sure to update the "current state" when we "fake" the transaction
 2013-04-12 18:05:40 -07:00
Jaikumar Ganesh
e53f19610c am e4f0dc30: am 2ea0c67d: Merge "Sensor changes." into jb-mr2-dev 
* commit 'e4f0dc300a22dbcd9081558d2844c6062b4cd380':
  Sensor changes.
 2013-04-12 18:05:35 -07:00
Mathias Agopian
d7932a62d0 am 48be3232: Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev 
* commit '48be323236f9fc41620a17e182eea800351812c5':
  make sure to update the "current state" when we "fake" the transaction
 2013-04-12 17:32:30 -07:00
Mathias Agopian
48be323236 Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev 2013-04-13 00:27:32 +00:00
Jaikumar Ganesh
e4f0dc300a am 2ea0c67d: Merge "Sensor changes." into jb-mr2-dev 
* commit '2ea0c67da6770a840d871a69c61bb52d73dadf2b':
  Sensor changes.
 2013-04-12 17:25:38 -07:00
Jaikumar Ganesh
2ea0c67da6 Merge "Sensor changes." into jb-mr2-dev 2013-04-13 00:22:39 +00:00
Dianne Hackborn
55821ac6d3 am 0c71bb90: am 9380d78c: Add new resources trace. 
* commit '0c71bb90f96f485940fd3b73c307fedee958042d':
  Add new resources trace.
 2013-04-12 17:10:04 -07:00
Dianne Hackborn
0c71bb90f9 am 9380d78c: Add new resources trace. 
* commit '9380d78c98d8b8fbce9ade5881fab7134fadc015':
  Add new resources trace.
 2013-04-12 17:06:29 -07:00
Dianne Hackborn
9380d78c98 Add new resources trace. 
Change-Id: Iab8c1ef51f491e818fb4bab0ba7a042f0d9bec9a
 2013-04-12 16:58:24 -07:00
Mathias Agopian
6c67f0fe45 make sure to update the "current state" when we "fake" the transaction 
this mimics the code we used for the size. basically we need to
also update the "current state" because it gets copied to the
"drawing state" when a transaction occurs, and it would
"undo" our change.

Bug: 8511430
Bug: 8581533
Change-Id: I08c02abbf21b7f168f7124cd14ee717d7d3d502c
 2013-04-12 16:58:11 -07:00
Jaikumar Ganesh
4342fdf14f Sensor changes. 
1. Some sensors can wake up the AP. Add wakelocks.
2. Handle backward compatibility for rotation vector
   heading accuracy.
3. Cleanup auto disabled sensors.
4. Fix race condition between enable and dispatch.

Change-Id: I39dddf12e208d83cd288201986ee994312555820
 2013-04-12 09:34:44 -07:00
Chet Haase
46c0909782 am 27ff54db: am 5e5bed60: Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev 
* commit '27ff54dbb4089626f694339ee0f54c38b8688537':
  DO NOT MERGE Make sure surfaces always have latest orientation info
 2013-04-12 07:16:28 -07:00
Chet Haase
27ff54dbb4 am 5e5bed60: Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev 
* commit '5e5bed60d03b5556ada351b010ed14ae8f1515ae':
  DO NOT MERGE Make sure surfaces always have latest orientation info
 2013-04-12 07:13:55 -07:00