Commit Graph

621 Commits

Author SHA1 Message Date
Jeff Brown
7fa44e90ed am b6d9eb87: Merge "Add flag to force public virtual display to show own content." into klp-modular-dev
* commit 'b6d9eb875a0bf1bb655a90c88457689342eb0991':
  Add flag to force public virtual display to show own content.
2014-01-09 02:14:56 +00:00
Jeff Brown
b6d9eb875a Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 2014-01-09 02:12:59 +00:00
RoboErik
2dfae9bea1 Merge "b/12068020 Make kb layouts only unique to vendor/product" 2014-01-08 22:07:14 +00:00
Mike Lockwood
7b925fbb87 am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '43bc1c07d25b7f278a860bbb9118f46ac732593a':
  Added missing USB device descriptor fields needed for intent filters
2014-01-08 16:10:42 +00:00
Mike Lockwood
12ec2e6d71 am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"
* commit '992065938a95e5273b22dea009b8581bcc693e61':
  Added missing USB device descriptor fields needed for intent filters
2014-01-08 08:01:42 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Narayan Kamath
6bbda22e1c am 29eadb32: am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '29eadb328a71f912b0d479860286cd606ed3dc87':
  AArch64: Use long for pointers in hardware classes
2014-01-08 12:38:24 +00:00
Narayan Kamath
71cdc73d28 am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes"
* commit '53acc7ae00ba921e8c7afb9415dbf473785a3be6':
  AArch64: Use long for pointers in hardware classes
2014-01-08 03:58:17 -08:00
Ashok Bhat
4838e33812 AArch64: Use long for pointers in hardware classes
For storing pointers, long is used in hardware classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: Icdeb67f9273fb2d8f6d88ca68d7f7d0950796fc1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-01-08 10:17:21 +00:00
Jeff Brown
d14c8c9039 Add flag to force public virtual display to show own content.
Change-Id: I1039f2ef3154169ec90411a4c7ba2c94629f72c4
2014-01-07 19:30:07 -08:00
RoboErik
fb290df3c9 b/12068020 Make kb layouts only unique to vendor/product
Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.

There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.

Change-Id: Id0890d13e1c859eaf993d4831b7b1acbaf5df80f
2014-01-07 17:37:24 -08:00
Zhijun He
9e4b8e41fb Merge "Camera2: fix onClosed callback issue" 2014-01-03 00:46:55 +00:00
Zhijun He
b437428b3f Merge "Camera2: remove waitUntilIdle from Camera2 API" 2014-01-03 00:46:28 +00:00
Zhijun He
2db56026bf Camera2: fix onClosed callback issue
The camera isClosed status shouldn't be checked to fire onClosed callback,
otherwise, onClosed callback is almost never fired when camera close is called
because the camera device is already closed.

Change-Id: I987242d53a12082828a992404ed55ee8a378f93f
2014-01-02 15:12:00 -08:00
Eino-Ville Talvala
aa161c600d Merge "Camera2: Update android.blackLevel.lock" 2013-12-30 20:55:24 +00:00
Zhijun He
d842fcd3af Camera2: remove waitUntilIdle from Camera2 API
Change-Id: Id034573d8b50aa0bc93bf7f0e776eb55316746ed
2013-12-26 14:14:04 -08:00
Eino-Ville Talvala
0956af56a2 Camera2: Update android.blackLevel.lock
Change-Id: I4b3ebdf2043c4b242ac1c851a3be90f795f69a00
2013-12-26 13:19:10 -08:00
Zhijun He
5a9ff37923 Camera2: Update availableThumbnailSizes java doc
Bug: 12135317
Change-Id: I4012ed3e7cd6394c5e964aaeb3381b4932c44b11
2013-12-26 11:49:09 -08:00
Zhijun He
2807936f5d Camera2: Update metadata java docs
Java docs for below keys are updated:
- android.edge.mode
- android.noiseReduction.mode

Bug: 12135317
Change-Id: I950d46b90ece2f519e33719427801fc78b36b39c
2013-12-17 10:35:40 -08:00
Zhijun He
f353742124 camera2: update java docs for metadata tag spec update
Below tag spec java docs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode

Bug: 12135317
Change-Id: I83f24c1816dfba1cc042e120fba43c5beb1bd2ae
2013-12-16 16:56:35 -08:00
Igor Murashkin
7a9b30e9e3 camera2: Add support for embedding images into javadoc
- Also finishes specifying CaptureResult#LENS_SHADING_MAP family

Bug: 12135317
Change-Id: I95ffd61872fefcf2c79cb4f5aa0740162ccc16ad
2013-12-16 11:43:49 -08:00
Igor Murashkin
ace5bf0412 CameraMetadata: updated generated code (with markdown support)
- also updates description of android.blackLevel.lock

Change-Id: I2d10c492bd6779bbb51672da9854252ba18d4327
2013-12-10 17:36:40 -08:00
Katie McCormick
d786a1900e resolved conflicts for merge of 37e4c405 to master
Change-Id: I7df89be84384369ef5e89bb3b924ca38c1b5d9bd
2013-12-02 12:37:58 -08:00
Katie McCormick
484b57a565 am 9d0a88bd: Merge "Doc updates: Javadoc fixes" into klp-docs
* commit '9d0a88bd4e07deac01d7759b70cdf160456be1c0':
  Doc updates: Javadoc fixes
2013-11-26 21:58:18 +00:00
Katie McCormick
f2ef28d840 Doc updates: Javadoc fixes
Change-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052
2013-11-26 13:52:48 -08:00
Jeff Brown
2ab3ec21c0 am 2458681b: am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed.
* commit '2458681b3ea4571d2f1254ef597475fe6a582907':
  Stop wifi display discovery when no longer needed.
2013-11-21 23:00:23 -08:00
Jeff Brown
ce468a35b3 Stop wifi display discovery when no longer needed.
Keep track of how many clients are requesting scans and scan
continuously until all of them are gone then explicitly terminate the
scan instead of letting it time out as before.

Suspend wifi display scans while connecting or connected to a remote
display.  This is handled by both the display manager and media router
since neither has complete information about what is happening.
Much of this code will no longer be needed once wifi display support
is integrated directly into the media router service.

Ensure that we don't attempt to scan or connect to wifi displays
while the wifi display feature is off.

Infer when a connection attempt fails and unselect the wifi display
route automatically so it doesn't appear to be connecting forever.

Fix issues around correctly canceling and retrying connection attempts.
Often we would cancel but not retry.

Improved connection reliability somewhat.  It seems that discovery must
already be in progress in order for a connection attempt to succeed.

Ensure QuickSettings uses exactly the same logic as the MediaRouteButton
to determine when the remote display tile should be made visible.

Bug: 11717053
Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e
2013-11-21 19:32:59 -08:00
John Spurlock
6090995951 Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
2013-11-20 11:31:47 -05:00
Jeff Brown
30cb5c3ffa am 2ea480ca: am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
* commit '2ea480cac89460ee2524cd080e90f6240e8eebf5':
  Disallow applications from initiating cast screen.
2013-11-15 00:42:46 -08:00
Jeff Brown
af574183c2 Disallow applications from initiating cast screen.
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.

As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.

Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
2013-11-15 00:29:43 -08:00
Zhijun He
e5d2af6be2 Merge "Camera2: Fix metadata unit test failures" 2013-11-14 20:13:22 +00:00
Zhijun He
2f1680be3d Camera2: Fix metadata unit test failures
The get/set override for special cases broke the metadata unit test, add proper
handling to fix the test failures.

Also make the key equals check both names and types.

Bug: 11259962
Change-Id: I00ff53115e7043212035cc4306e0481f9d113747
2013-11-14 12:11:32 -08:00
Eino-Ville Talvala
07177de6c7 am e7d825d8: am ed676b21: am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev
* commit 'e7d825d8b2a256ec6303f26318387538964c79f6':
  Camera2: Add support for partial result metadata quirk
2013-11-12 10:34:28 -08:00
Eino-Ville Talvala
7a31310439 Camera2: Add support for partial result metadata quirk
- Add new CaptureListener.onCapturePartial() callback for receiving
  partial result metadata sooner than the full result metadata will be sent
  in onCaptureComplete().
- Add hidden keys for the partial result quirk
- Dispatch results to onCapturePartial based on the partial result quirk

All additions are hidden for now.

Bug: 11115603
Change-Id: Ie9a3be640f147257ae22e5b5edf0974bddc1cb85
2013-11-11 13:47:46 -08:00
Ruben Brunk
5a78dc1cf5 am 913c0e38: am 70285910: am e73b41b2: camera2: Remove prior repeating request when setting.
* commit '913c0e38a1316f4a653563ba401a0095c54b71d0':
  camera2: Remove prior repeating request when setting.
2013-11-08 11:19:47 -08:00
Ruben Brunk
e73b41b27f camera2: Remove prior repeating request when setting.
Bug: 11579778
Change-Id: Idb10662413ff5ee939adbdeab68a97cb34750fac
2013-11-07 19:30:43 -08:00
Ruben Brunk
23e1866700 am 57171905: am 6327136c: am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev
* commit '57171905216515a187ecb9931d402c3b09ab4b50':
  gcam: Avoid leaking repeating CaptureRequests.
2013-11-06 10:15:29 -08:00
Zhijun He
7f80d6f741 Camera2: hide some face related keys
STATISTICS_FACE_IDS, STATISTICS_FACE_LANDMARKS, STATISTICS_FACE_RECTANGLES and
STATISTICS_FACE_SCORES are redundant since STATISTICS_FACES can report face
info already.

Bug: 11082745
Change-Id: I8239cee8fdce8f5aea3cc26ca979e41251ca05fa
2013-11-04 10:18:05 -08:00
Ruben Brunk
decfe95fce gcam: Avoid leaking repeating CaptureRequests.
Bug: 11352359
Change-Id: I598416c08c0a7c3e5a8054a4d80ed29d82870bd2
2013-10-31 15:33:46 -07:00
Aravind Akella
62c49dffde am 11e0c0e6: am 1ba90786: am 28e26eb3: Merge "Fix for ClassCastException in SystemSensorManager." into klp-dev
* commit '11e0c0e63c70f8bdfb416661a56663a2da426f41':
  Fix for ClassCastException in SystemSensorManager.
2013-10-24 12:48:54 -07:00
Aravind Akella
31d14ce57c Fix for ClassCastException in SystemSensorManager.
Bug: 11068858
Change-Id: I074798a6978b91766b37dec32f2683d8e4adf5d3
2013-10-23 15:09:13 -07:00
Zhijun He
0257767041 am 98d1ba4b: am 650b4616: am 6355103b: Merge "Camera2: filter bad faces" into klp-dev
* commit '98d1ba4bd7e9f5b504ad0b7094c639df2c399734':
  Camera2: filter bad faces
2013-10-16 16:52:08 -07:00
Scott Main
842bc9c325 am 3d66877b: am 0763e156: am 89ec7c78: Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev
* commit '3d66877b93c037a81f40d896b74b507c57926c54':
  some javadoc improvements for virtual display and new meta tag name
2013-10-16 16:40:25 -07:00
Zhijun He
6355103bca Merge "Camera2: filter bad faces" into klp-dev 2013-10-16 23:39:24 +00:00
Zhijun He
844b3520cc Camera2: filter bad faces
Filter bad face score and ids.

Bug: 11257538
Change-Id: I9beb042e8c0d2f08a3efcd2877deee036b80482f
2013-10-16 16:13:50 -07:00
Scott Main
cc2195bb56 some javadoc improvements for virtual display and
new meta tag name

Change-Id: If9caba425f825652468a0f3e868f71ed1a778fb1
2013-10-16 14:08:07 -07:00
Zhijun He
813c8e45d9 am 2c31cf7c: am 549a9590: am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES
* commit '2c31cf7cc4d7fca56e5277df932b4e8ce671935d':
  Camera2: return CaptureResult.STATISTICS_FACES
2013-10-15 10:20:45 -07:00
Zhijun He
58216c2650 Camera2: return CaptureResult.STATISTICS_FACES
Changes included in this CL:

- remove the WAR for face detect mode null case.
- make the sanity check assert to warnings.
- make number of faces to be the minimal length of face metadata array length to
avoid out of bound access, since we relax the sanity check.

Bug: 11206459
Change-Id: Ifd9f7f79617039c1b3ad631f202b48076d775e09
2013-10-15 07:46:53 -07:00
Eino-Ville Talvala
ac61e030e5 am c80477e7: am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev
* commit 'c80477e7124264ff0a61f7e972244be03fc20d42':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals
2013-10-15 05:06:18 -07:00
Eino-Ville Talvala
615b75f335 Camera2: Fix face rectangle coordinate mapping, and use Key.equals
- Faces are reported differently from other rectangles, so the mapping
  has to be specialized for them

- Use Key.equals for key comparison.

Bug: 11206459
Change-Id: I9a2a408dad981c2911048191ec30977020953146
2013-10-14 18:20:43 -07:00