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

50244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
d16d98553e merge in master-release history after reset to 2f3dca149a 2014-05-10 05:50:30 -07:00
Greg Hackmann
2f3dca149a am 9493d492: am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" 
* commit '9493d4924a59f14b698389386337a9c07a7ea3c4':
  Revert "Use asynchronous lock/unlock API"
 2014-05-09 22:00:04 +00:00
Greg Hackmann
02528cf6aa am 4b46776f: am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API" 
* commit '4b46776ff88c5a365700b88e8b2b04e1b2c77e6e':
  Use asynchronous lock/unlock API
 2014-05-09 21:54:48 +00:00
Greg Hackmann
9493d4924a am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" 
* commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530':
  Revert "Use asynchronous lock/unlock API"
 2014-05-09 21:51:51 +00:00
Greg Hackmann
9eb142e34a am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API"" 
* commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232':
  Revert "Use asynchronous lock/unlock API"
 2014-05-09 21:46:44 +00:00
Greg Hackmann
a9d49f99e6 Merge "Revert "Use asynchronous lock/unlock API"" 2014-05-09 21:39:07 +00:00
Greg Hackmann
53ec72523a Revert "Use asynchronous lock/unlock API" 
This reverts commit 378ef07760.

Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
 2014-05-09 21:36:48 +00:00
Greg Hackmann
4b46776ff8 am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API" 
* commit '8a6cd189034ec4709a66e581b41deba56c028291':
  Use asynchronous lock/unlock API
 2014-05-09 21:13:16 +00:00
Greg Hackmann
8a6cd18903 am f60564a1: Merge "Use asynchronous lock/unlock API" 
* commit 'f60564a13e917877c76c99294194a621d872076b':
  Use asynchronous lock/unlock API
 2014-05-09 21:08:39 +00:00
Greg Hackmann
f60564a13e Merge "Use asynchronous lock/unlock API" 2014-05-09 21:02:21 +00:00
Andy McFadden
9f708e1094 am 39cde06a: (-s ours) am b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev 
* commit '39cde06aee5bc9338b1ed26513233cb54e9b446d':
  DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
 2014-05-09 18:00:54 +00:00
Andy McFadden
39cde06aee am b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev 
* commit 'b66019615da8750588f1233a77b9c686b0a248c3':
  DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
 2014-05-09 17:57:12 +00:00
Andy McFadden
b66019615d Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev 2014-05-09 17:54:29 +00:00
Andy McFadden
a7f75c0dfb Merge "Add "dumpsys SurfaceFlinger --dispsync"" 2014-05-09 17:49:33 +00:00
Andy McFadden
232f5bc675 DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync" 
Dumps the current DispSync state.

Bug 14651879

(this is a near-cherrypick of Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84)

Change-Id: I6e6c8452ede5c2d5098db1b884d28226e77d9a03
 2014-05-09 10:49:11 -07:00
Eino-Ville Talvala
fc4c0933ae am 127b798f: (-s ours) am 0b42423c: DO NOT MERGE: Add standard android.hardware.camera.external permission file. 
* commit '127b798ff9bd6a76c3a5a8816b59a92586e355d3':
  DO NOT MERGE: Add standard android.hardware.camera.external permission file.
 2014-05-09 15:55:44 +00:00
Eino-Ville Talvala
127b798ff9 am 0b42423c: DO NOT MERGE: Add standard android.hardware.camera.external permission file. 
* commit '0b42423c59a12674d954079a9eb1f58a55fc55a6':
  DO NOT MERGE: Add standard android.hardware.camera.external permission file.
 2014-05-09 15:48:02 +00:00
Andy McFadden
c751e92c56 Add "dumpsys SurfaceFlinger --dispsync" 
Dumps the current DispSync state.

Bug 14651879

Change-Id: Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84
 2014-05-08 16:14:41 -07:00
Andy McFadden
d0ed571be0 Merge "Add mutex" 2014-05-08 23:10:31 +00:00
Andy McFadden
150ecd8c1b Add mutex 
Change-Id: I81072031e74a5cca8384e4e8bce4babf2187d8bb
 2014-05-08 14:56:50 -07:00
Eino-Ville Talvala
0b42423c59 DO NOT MERGE: Add standard android.hardware.camera.external permission file. 
Any device that lists the android.hardware.camera.external feature
must also list android.hardware.camera.any feature.

Change-Id: I7accd27501e66e99a8addaeed890df709208fd13
 2014-05-08 21:48:57 +00:00
Eino-Ville Talvala
8090e6ae32 Merge "Add standard android.hardware.camera.external permission file." 2014-05-08 21:33:54 +00:00
Eino-Ville Talvala
72b9113d26 Add standard android.hardware.camera.external permission file. 
Any device that lists the android.hardware.camera.external feature
must also list android.hardware.camera.any feature.

Change-Id: I7accd27501e66e99a8addaeed890df709208fd13
 2014-05-08 11:43:53 -07:00
Ying Wang
f736f2f5da am 114d71ce: am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS." 
* commit '114d71ce7c6ec1ce0327c812a42966c4258b4a46':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 18:23:58 +00:00
The Android Automerger
8de2c652f7 merge in master-release history after reset to c6e0c64632 2014-05-08 05:50:26 -07:00
Ying Wang
114d71ce7c am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS." 
* commit '214b4a61ac3fa63e35c79157d3acf0d8b692b3ac':
  Remove unused LOCAL_LDLIBS.
 2014-05-07 23:01:19 +00:00
Ying Wang
214b4a61ac am 8155ce81: Merge "Remove unused LOCAL_LDLIBS." 
* commit '8155ce81d4b150e6e453d9443f9fea4cc2c546d2':
  Remove unused LOCAL_LDLIBS.
 2014-05-07 22:54:27 +00:00
Ying Wang
8155ce81d4 Merge "Remove unused LOCAL_LDLIBS." 2014-05-07 22:48:40 +00:00
Ying Wang
4a793fe952 Remove unused LOCAL_LDLIBS. 
Change-Id: I62904c410a66f256da8253764577acae18f964f8
 2014-05-07 15:26:38 -07:00
The Android Automerger
c6ba56cb9a merge in master-release history after reset to c6e0c64632 2014-05-07 09:11:10 -07:00
The Android Automerger
f9ae376f63 merge in master-release history after reset to 4522f5749d 2014-05-07 05:50:22 -07:00
Narayan Kamath
c6e0c64632 Merge "Fix InputEvent_test." 2014-05-07 08:16:44 +00:00
Dan Stoza
dd02391756 Merge "Enable changing display configuration" 2014-05-06 21:08:16 +00:00
The Android Automerger
5d595a3e6c merge in master-release history after reset to 4522f5749d 2014-05-06 05:50:25 -07:00
Narayan Kamath
b8290c2642 Fix InputEvent_test. 
Axis 0 sets the MSB and Axis 63 sets the LSB, and not
the other way round like the test expects.

This was broken by commit 38dcdff308 which moved this
code over to using BitSet.

Change-Id: I63a72abe7ce14720b0bf26e5f6d651bb42452f79
 2014-05-06 11:42:16 +01:00
Narayan Kamath
4522f5749d Merge "Change InputMessage.motion.pointerSize to a uint32_t." 2014-05-06 10:00:57 +00:00
Rachad
6900656b2d Merge "HEVC Support Added HEVC enums and structures to OMX header files" 2014-05-06 00:39:10 +00:00
Dan Stoza
7f7da32569 Enable changing display configuration 
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.

Bug: 14320401
Change-Id: I8c22165698950e5da32204c1c4da92122f91a715
 2014-05-05 16:45:26 -07:00
Jesse Hall
525e2f5de9 am 9fdfa60a: am 424b093a: am ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null" 
* commit '9fdfa60aaf477cc944013b637a2a35d357d4340f':
  fix GraphicBuffer::flatten crash issue when handle is null
 2014-05-05 22:53:55 +00:00
Jesse Hall
9fdfa60aaf am 424b093a: am ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null" 
* commit '424b093a58c9f428081da991afa347183bf07847':
  fix GraphicBuffer::flatten crash issue when handle is null
 2014-05-05 22:51:27 +00:00
Jesse Hall
424b093a58 am ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null" 
* commit 'ef923fcfd3db9ca1d7df48273cf9a6258aaf15c2':
  fix GraphicBuffer::flatten crash issue when handle is null
 2014-05-05 22:48:50 +00:00
Jesse Hall
ef923fcfd3 Merge "fix GraphicBuffer::flatten crash issue when handle is null" 2014-05-05 22:45:50 +00:00
Rachad
184077dee4 HEVC Support 
Added HEVC enums and structures to OMX header files

Change-Id: If4135c6df86df51098fc7a979543975ed70b0641
 2014-05-05 12:03:54 -07:00
Jesse Hall
13de7f1def am 57fdbbda: am 4314ccd1: am 70278fbf: Merge "Add error message for hints when exceptions occur during binder transactions." 
* commit '57fdbbda2c475d2abdd828177f942ddb6d164bef':
  Add error message for hints when exceptions occur during binder transactions.
 2014-05-05 17:33:01 +00:00
Jesse Hall
57fdbbda2c am 4314ccd1: am 70278fbf: Merge "Add error message for hints when exceptions occur during binder transactions." 
* commit '4314ccd1ba9fe773b0fc91f0a08dc536ebce8dfe':
  Add error message for hints when exceptions occur during binder transactions.
 2014-05-05 17:30:19 +00:00
Jesse Hall
4314ccd1ba am 70278fbf: Merge "Add error message for hints when exceptions occur during binder transactions." 
* commit '70278fbfe012c1fce3e63a41ffb9feaf1e53a64a':
  Add error message for hints when exceptions occur during binder transactions.
 2014-05-05 17:27:46 +00:00
Jesse Hall
70278fbfe0 Merge "Add error message for hints when exceptions occur during binder transactions." 2014-05-05 17:26:00 +00:00
The Android Automerger
bd32baacc4 merge in master-release history after reset to 98e1ebc026 2014-05-05 05:49:57 -07:00
The Android Automerger
cbec3d81f1 merge in master-release history after reset to 98e1ebc026 2014-05-04 05:49:50 -07:00
The Android Automerger
33953a3f49 merge in master-release history after reset to 98e1ebc026 2014-05-03 05:50:49 -07:00