Commit Graph

50163 Commits

Author SHA1 Message Date
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
Etienne Le Grand
e284a90f50 Add wake gesture in Sensor.cpp
Change-Id: Ifb1744acffc2d57da43112fb9966261e8246d6de
2014-05-07 19:49:05 -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
Andy Hung
abec6ad341 Allow OMX pointer types to be forced to 32 bits
Enabled by #define.  Is used for 64 bit compilation to
force structs to use 32 bit pointer values for eventual
IPC to 32 bit OMX codecs.

May change later if we support 64 bit OMX codecs.

Change-Id: I0d12f86774f6f7ce9c39c8abea5d51988a7eef11
Signed-off-by: Andy Hung <hunga@google.com>
2014-05-07 11:12:34 -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
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
Francis Hart
378ef07760 Use asynchronous lock/unlock API
The gralloc API now provides a way for using lock/unlock with the Android
explicit synchronisation concept. This changes updates the GraphicBuffer class
to also expose this functionality, and updates the Surface class to make use of
in line with the dequeueBuffer/queueBuffer mechanism.

This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local
gralloc module does not support this then the existing synchronous lock/unlock
mechanism will be used.

Change-Id: I77daa1beb197b63b1c2f281b8414ac4ae4b5b03c
2014-05-02 13:28:14 -07:00
Andy McFadden
98e1ebc026 Merge "Improve SurfaceFlinger PTS estimation" 2014-05-02 17:59:23 +00:00
Andy McFadden
41d67d7ab4 Improve SurfaceFlinger PTS estimation
Get the next refresh time from DispSync instead of guessing based
on the current time.

Change-Id: I8dc72a3217bfd4e9b4c905034194d1a298cad69a
2014-05-02 10:56:54 -07:00
Narayan Kamath
bc6001b026 Change InputMessage.motion.pointerSize to a uint32_t.
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.

Change-Id: I66bb8b8d8664763e7dcbd489686051f563d5e1dc
2014-05-02 17:58:43 +01:00
Jesse Hall
9471c69773 Merge "Handle failed requestBuffer after successful dequeueBuffer" 2014-05-02 16:50:41 +00:00
Adam Lesinski
c526c35e73 am 1f9f945c: am 19f7cd5c: Merge "Remove some features from wearables" into klp-modular-dev
* commit '1f9f945c8d66aab510df82a931c2328b3f6a2acd':
  Remove some features from wearables
2014-05-01 21:37:35 +00:00
Adam Lesinski
1f9f945c8d am 19f7cd5c: Merge "Remove some features from wearables" into klp-modular-dev
* commit '19f7cd5c635b295e3e15ca2129a1f24fe9df98ec':
  Remove some features from wearables
2014-05-01 21:33:56 +00:00
Adam Lesinski
19f7cd5c63 Merge "Remove some features from wearables" into klp-modular-dev 2014-05-01 21:30:43 +00:00
Adam Lesinski
0cb8c48c4b Remove some features from wearables
It was incorrectly assumed that these devices must require
a device admin, camera, and network location.

Change-Id: I51942ece6c0b9f824bfc3ee82917a2496ae81788
2014-05-01 14:29:47 -07:00
Ruchi Kandoi
f52b3c88f1 SurfaceFlinger: Adds the functionality to reduce refresh rate to half of
the default.

Feature added for the low power mode.

Change-Id: I2849e5ea335c0d2509fea1c315392bce7f20451d
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2014-05-01 18:29:33 +00:00
Jesse Hall
0b63cd105c Handle failed requestBuffer after successful dequeueBuffer
If the virtual display consumer disconnects after the
VirtualDisplaySurface dequeues a buffer but before it requests it, the
request will fail. Previously the error was ignored, and the caller
would get a success result but a NULL buffer. Now the dequeued buffer
is cancelled and the error propagated to the caller.

Bug: 14140551
Change-Id: I91547885c2cf6063dc7a8f02d97f2df282cdde2c
2014-05-01 10:37:33 -07:00
Narayan Kamath
5d112a7dd6 am fc4e3788: am 44df726a: am cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit 'fc4e37887707588d18297188dd6922224901b8d0':
  Add instruction-set arguments to installd commands.
2014-05-01 14:31:14 +00:00
Narayan Kamath
fc4e378877 am 44df726a: am cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit '44df726a6cf4fe1119e146c9a18c78966a6305d3':
  Add instruction-set arguments to installd commands.
2014-05-01 14:05:10 +00:00
Narayan Kamath
44df726a6c am cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit 'cb079c899ac9d9c5ec90840249821f58c817406c':
  Add instruction-set arguments to installd commands.
2014-05-01 14:00:54 +00:00
Narayan Kamath
cb079c899a Merge "Add instruction-set arguments to installd commands." 2014-05-01 13:57:13 +00:00
Narayan Kamath
1b40032077 Add instruction-set arguments to installd commands.
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.

(cherry picked from commit 791781bfb8)

Change-Id: I43396b16f6eaecacf0fb7d052526fc5a239167ac
2014-05-01 11:38:02 +01:00
Nick Vaccaro
bd81c258c2 am 45fcfb48: am 85453ecc: dumpstate: increase poll timeout waiting for SIGQUIT logging
* commit '45fcfb48ef9e65747e7a3f35e1a4da232f6e161a':
  dumpstate: increase poll timeout waiting for SIGQUIT logging
2014-04-30 23:35:03 +00:00
Nick Vaccaro
45fcfb48ef am 85453ecc: dumpstate: increase poll timeout waiting for SIGQUIT logging
* commit '85453ecc90a94564e586f0f97c9ec2c0cf831501':
  dumpstate: increase poll timeout waiting for SIGQUIT logging
2014-04-30 20:35:15 +00:00
Nick Vaccaro
85453ecc90 dumpstate: increase poll timeout waiting for SIGQUIT logging
Increased the maximum time dumpstate will wait for SIGQUIT process
to finish dumping its thread stacks to the logfile to 5 seconds.

Bug: 14057177
Change-Id: I0b43004512855d202f2fe0ea7b0e934e77a3a070
2014-04-30 11:28:31 -07:00
Bill Yi
39c5e9f876 am b009280d: am e4f00b2a: (-s ours) Merge commit \'6d05ef2310bdc84811d5b0385b009ad11447a749\' into HEAD
* commit 'b009280d5acb85a7c7e51daf52a9834ba63a8ae7':
2014-04-30 12:17:24 +00:00
Narayan Kamath
791781bfb8 Add instruction-set arguments to installd commands.
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.

Change-Id: Ie480841b3e917dabe23ad4d5f4a0b08990500a51
2014-04-30 09:39:37 +01:00
Bill Yi
b009280d5a am e4f00b2a: (-s ours) Merge commit \'6d05ef2310bdc84811d5b0385b009ad11447a749\' into HEAD
* commit 'e4f00b2aaea069474c342e257a0e8e191245905a':
2014-04-30 00:58:53 +00:00
Conley Owens
2eefe69f9e Merge "Add TYPE_MAGNIFICATION_OVERLAY to isTrustedOverlay" 2014-04-30 00:09:36 +00:00
Michael Wright
32ccf558ce Merge "Move key attribute information out of native." 2014-04-29 22:31:18 +00:00
Bill Yi
e4f00b2aae Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD 2014-04-29 11:34:19 -07:00
Jun Jiang
abf8a2c608 Add error message for hints when exceptions occur during binder transactions.
It can help to detect some kind of error, such as why GraphicBuffer::flatten
will crash when handle is null.

Change-Id: I703cd035b96edb7afb324cf24d8230d4e55f4f52
Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
2014-04-29 14:22:10 +08:00