Commit Graph

598 Commits

Author SHA1 Message Date
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
Eino-Ville Talvala
cd92588528 DO NOT MERGE: Hide new camera API.
Not yet ready.

Bug: 11141002

Change-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae
2013-10-11 19:26:08 +00:00
Aravind Akella
d9b09fa97e Merge "Fix registerListener and flush bugs." into klp-dev 2013-10-11 02:05:53 +00:00
Aravind Akella
4bdc37d315 Fix registerListener and flush bugs.
1) Fix registerListener to return false when called with a Trigger sensor. Correct java documentation.
2) Remove reservedFlags and FlushCompleteListener parameters from the public API.
3) Create SensorEventListener2 which extends SensorEventListener and has the onFlushCompleted callback.
3) Change flush(Sensor) API to flush(SensorEventListener).

Change-Id: I56ce4e0b6e329483e129a14ad7e8a0cd35665ffe
Bug: 10894703
2013-10-09 19:00:22 -07:00
Eino-Ville Talvala
7b01c5c4d2 Camera2: Properly copy over user tag when cloning requests
Bug: 11141002
Change-Id: Icc5c4150a6796d705f5c6c3bd1322597fc986af2
2013-10-08 19:46:02 -07:00
Alex Ray
69c66f4203 Merge "camera2: describe non-full hw level optional tag entries" into klp-dev 2013-10-07 23:25:24 +00:00
Igor Murashkin
46ea9b0b04 Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev 2013-10-07 22:38:37 +00:00
Igor Murashkin
e37885a8a3 camera2: Workaround for null FACE_DETECT_MODE crashing
Bug: 11118679
Change-Id: Id9b055744f6a2f502857b4cc0c5badb46b44a1f8
2013-10-07 15:29:58 -07:00
Zhijun He
04eceec132 Camera2: fix Face class java doc build break
Bug: 10406212
Change-Id: Ida4da1ee3f67e176e04d07f569e153d671fa9e40
2013-10-07 14:35:57 -07:00
Eino-Ville Talvala
ad45fa6438 Merge "Camera2: Fire all callbacks" into klp-dev 2013-10-07 21:10:41 +00:00
Eino-Ville Talvala
868d904306 Camera2: Fire all callbacks
- Allow configureOutputs to be called when device is
   actively working, and document what happens then.
 - At the managed level, trigger proper sequence of callbacks for
   device state changes, for all the callbacks that are not yet
   managed by the camera service.
 - Restructure CameraManager.openDevice to have the device itself fire the
   initial callbacks.
 - Make CameraDevice.configureOutputs(null) work.
 - Make CameraDeviec.configureOutputs(identical surfaces) work.
 - Ensure proper checking for camera closed state.

Bug: 10360518
Change-Id: I9db348ee9c5ce4d3fe02fd34e779acc85cba68dc
2013-10-07 12:40:49 -07:00
Zhijun He
b7bfdc7cf7 Camera2: add metadata override
There are interface difference between managed and native side for some
metadata, like Face and JPEG format. we need override them when they are set/get
between native and managed sides.

Also fix some issues in the CameraMetadataTest.

Bug: 10406212

Change-Id: Ibd8be0415968445e711b3ea89f45e1edfa193ee2
2013-10-07 08:02:25 -07:00
Eino-Ville Talvala
227c09f998 Fix build.
Change-Id: I1c3537d936fd467014b966179f5ed2a8c6a696da
2013-10-04 16:14:38 -07:00
Eino-Ville Talvala
51ca8d6bc0 Camera2: Verbosity is verboten.
Bug: 10360518
Change-Id: I155effad61099535bee77cc0d0e380420d96770d
2013-10-04 14:39:58 -07:00
Eino-Ville Talvala
e841d4e165 Camera2: Implement idle callbacks
- Rework camera callback binder interface
- Connect up idle, disconnect callbacks
- A few unit tests for shutter firing and idle use

Bug: 10549462
Change-Id: I8455a8a0561e366b7edeef6b101682be2ec44d79
2013-10-03 15:44:32 +00:00
Alex Ray
e83c4ebc62 camera2: describe non-full hw level optional tag entries
Bug: 10838063
Change-Id: I4880b306587a4a47172976dfb5c2b41e711c7371
2013-10-02 20:13:40 -07:00
Zhijun He
18fe0ae08d Camera2: return device list with the only supported device
Bug: 10360518
Change-Id: I823f0b6965728ddefc9b70f3df0f50259919cce5
2013-10-01 14:26:40 -07:00
Igor Murashkin
03fdb14ba8 camera2: Fix CameraMetadata#getKeys
Bug: 11007040
Change-Id: I08755bf45ae60ff00736af3672a9f6091f460496
2013-09-30 17:38:54 -07:00
Zhijun He
599be6182e Camera2: remove CameraDevice#getProperties
Also cleanup some unnecessary imports.

Bug: 10360518
Change-Id: Id54aa4c9e3dff2bd354e3ebb83687b000842ea3f
2013-09-27 14:31:41 -07:00
Zhijun He
c59b078acb Camera2: Fix focusRange type
It should be a pair of floats.

Bug: 10360518
Change-Id: Ic0aee6c08eee385ecbf634bafc769e08dc199c1f
2013-09-26 10:39:36 -07:00
Zhijun He
822ac0bada Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev 2013-09-25 23:57:24 +00:00
Zhijun He
2001188be3 Camera2: Implement CameraManager#getCameraCharacteristics
Bug: 10904541
Bug: 10360518
Change-Id: I1da0b0319703fda46789f15a232e56ed1d928bc3
2013-09-25 13:54:25 -07:00
Eino-Ville Talvala
9ca833f4a5 Merge "Camera2: Add PASSIVE_UNFOCUSED autofocus state." into klp-dev 2013-09-25 19:28:03 +00:00