Commit Graph

1508 Commits

Author SHA1 Message Date
Eino-Ville Talvala
779d43a75b Merge "Camera2: Fix spelling mistake" into mnc-dev 2015-05-21 18:15:30 +00:00
Eino-Ville Talvala
bd7f34f151 Camera2: Fix spelling mistake
Change-Id: I8c764d4c2ada34b126cb0097e8eefb710a08e310
2015-05-21 11:10:51 -07:00
Eino-Ville Talvala
842568eceb Merge "Camera2: Fix CaptureRequest @see links" into mnc-dev 2015-05-21 18:09:40 +00:00
Jim Miller
0a17fb4e56 Merge "Move from native FingerprintService implementation to fingerprintd" into mnc-dev 2015-05-21 00:57:44 +00:00
Jim Miller
be67542182 Move from native FingerprintService implementation to fingerprintd
This adds a new service, fingerprintd, that manages fingerprint
hardware from a separate process.  It provides a binder interface that
FingerprintManager uses to talk to the fingerprint HAL.

Change-Id: I84d8e407c1f1a7d1a396e246c382459ad38810ae
2015-05-20 14:56:06 -07:00
Ruben Brunk
f082bb2a7f Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-dev 2015-05-20 20:44:28 +00:00
Eino-Ville Talvala
0aa2bdeaa0 Camera2: Fix CaptureRequest @see links
And add a few more for reprocess capture requests.

Bug: 19129270
Change-Id: I57ba3ff606f0496f16a3162352e49b9dfa1da806
2015-05-19 17:44:23 -07:00
Ruben Brunk
6664aee15a camera: Add AIDL interface for CameraServiceProxy.
- Adds an AIDL interface to allow the proxy camera service
  running in system server to accept RPCs from the camera
  service running in mediaserver.
- Request an update to the valid user set from the proxy
  camera service when mediaserver restarts to initialize
  properly + avoid DOS after a crash.

Bug: 21267484
Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
2015-05-19 17:20:24 -07:00
Eino-Ville Talvala
1975b0a4be Merge "Camera2: Fix session close callback" into mnc-dev 2015-05-19 19:39:12 +00:00
Eino-Ville Talvala
77545f6a19 Merge "Camera2: Add SDK annotations" into mnc-dev 2015-05-19 17:55:37 +00:00
Eino-Ville Talvala
8b905578b5 Camera2: Add SDK annotations
- Annotate everything with @NonNull, @Nullable
- Annotate a few @IntRange
- Annotate a few @IntDef
  - Most metadata enums probably canont be annotated usefully,
    since get/set() are generic and the annotation system
    can't yet manage that.
  - Plus metadata annotations need to be auto-generated anyway
- Also add explicit null check to prepare's surface argument
- Also update docs of getCameraCharacteristics to match reality

Bug: 21029463
Change-Id: Ifd81b2a782e29ad069fe25c7db4a1fda73dabcd7
2015-05-19 10:31:06 -07:00
Eino-Ville Talvala
937c93c47d Camera2: Fix session close callback
If a session is directly replaced, it no longer will receive state
change callbacks from the device. That means it'll never hear about
abort or idle transitions.

Fix this to signal onClose earlier, after sequences complete. This is
reliable to wait on.

Remove the unconfigure drainer, as we have nothing to do after
null-stream configuration completes, now, so no point in triggering
anything for it.

Bug: 19666551
Change-Id: Ied6fb40126b79886cdbcb27d40a76a1646273dd2
2015-05-18 16:25:38 -07:00
Zhijun He
125ff3cacd Camera2: stop log spamming when closing a closed camera
Bug: 21268174
Change-Id: I711380c52f5ce9829a660c6e1b999b0377ea6c7b
2015-05-18 13:04:34 -07:00
Zhijun He
99dc89961f Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-dev 2015-05-15 16:03:31 +00:00
Ruben Brunk
096c11dc37 Merge "camera2: Fix work-profile eviction handling." into mnc-dev 2015-05-15 01:45:19 +00:00
Ruben Brunk
7f75da2405 camera2: Fix work-profile eviction handling.
Bug: 20124384

Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
2015-05-14 18:39:50 -07:00
Zhijun He
527d522f34 Camera2: get ride of sceneModeOverrides in API doc
sceneModeOverrides isn't public API.

Bug: 20152738
Change-Id: I4024b152c47c1d0184971539c99a2f1cc1b1c1a0
2015-05-14 15:36:04 -07:00
Yin-Chia Yeh
a0807a65e9 Merge "Camera: tonemap linkify update" into mnc-dev 2015-05-14 22:12:43 +00:00
Chien-Yu Chen
3b7bc569e6 Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev 2015-05-14 20:46:38 +00:00
Alex Klyubin
a1fb2cf6a6 Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev 2015-05-14 15:51:01 +00:00
Jorim Jaggi
6a587acd1d Merge "Fix fingerprint for multiuser" into mnc-dev 2015-05-14 00:36:03 +00:00
Jorim Jaggi
aa4d32add7 Fix fingerprint for multiuser
Change-Id: Iab18c4de9764da1a65490b186b33535f8e79e1e5
2015-05-13 16:35:56 -07:00
Alex Klyubin
dcdaf87ed0 Move Android Keystore impl to android.security.keystore.
This moves the non-public API classes backing Android Keystore from
android.security to android.security.keystore, a package specially
created for Android Keystore.

Bug: 18088752
Change-Id: Ibf04d6a26c54d310b0501fc5e34f37b1176324ad
2015-05-13 16:17:40 -07:00
Chien-Yu Chen
8062d31d27 Camera2: Fix reprocessing API naming and docs
Rename reprocessible to reprocessable and OPAQUE reprocessing to
PRIVATE reprocessing. Also fix a few broken links in reprocessing
APIs.

Bug: 21044522
Change-Id: I155b62d8743b036bd4b46f0da87749ce4e20b467
2015-05-13 16:02:46 -07:00
Nick Kralevich
9831fad676 Merge "Modify how USB connections are handled." into mnc-dev 2015-05-13 22:31:57 +00:00
Nick Kralevich
fcf10f7c12 Modify how USB connections are handled.
* Introduce a new "charger only" mode. In this mode, MTP is disabled,
and no file transfers can occur.
* Make charger only mode the default.
* Modify "persist.sys.usb.config" so it now only holds the adb status.
* Make the USB settings non-persistent. Unplugging the USB connection will
reset the device back to "charger only" mode.
* Fixup wording per UI guidelines.

TODO: Re-implement MDM restrictions for USB / MTP access controls.

Bug: 18905620
Change-Id: I99a50d9132a81e98187f431166fd9fef4d437e4f
2015-05-13 14:28:13 -07:00
Jorim Jaggi
ee77cebc1a Persist fingerprint names
Bug: 20469328
Change-Id: I8f4a988687bfb78c36cc7cf187103a9d93ed4535
2015-05-13 13:25:26 -07:00
Ruben Brunk
4143fbcfa8 Merge "camera2: Fix crop selection in LEGACY." into mnc-dev 2015-05-13 00:09:50 +00:00
Chien-Yu Chen
4f6615a30c Merge "Camera2: stream configs for reprocessible session" into mnc-dev 2015-05-12 20:09:15 +00:00
P.Y. Laligand
e6c47686f6 Merge "DO NOT MERGE - Display mode switches." into mnc-dev 2015-05-12 17:39:57 +00:00
P.Y. Laligand
b3b9eb3cfc DO NOT MERGE - Display mode switches.
Knowledge of the various modes of a display is now available to apps, and they can request a specific mode for their windows.

b/18241736

Change-Id: I8eb16ff713e878512faca3ca6662254f08a9be7f
(cherry picked from commit 5c7773d864)
2015-05-11 15:02:07 -07:00
Nick Kralevich
d9c7f24569 UsbManager / UsbService / UsbDeviceManager: delete unused code
These functions are never called.

Change-Id: Ic436e1036bed717d2c64701fddd9a810abb9443e
2015-05-10 21:57:56 -07:00
Chien-Yu Chen
f723db7f9d Camera2: stream configs for reprocessible session
Add the guaranteed stream configurations for creating
reprocessible capture sessions to the docs.

Bug: 20263562
Change-Id: Id46d6ec8ebe7a5fe7edcb7c15325c6b53f1bc589
2015-05-08 16:49:44 -07:00
Chien-Yu Chen
0dfb7ba4a8 Merge "camera2: allow mixing regular/reprocess requests" into mnc-dev 2015-05-07 20:24:52 +00:00
Ruben Brunk
607e4cb9ec camera2: Fix crop selection in LEGACY.
Bug: 20892101
Change-Id: Ied07096a539452505657e3313d09ea82f747731c
2015-05-07 10:46:12 -07:00
Ruben Brunk
0a323036e2 Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev 2015-05-06 21:02:36 +00:00
Chien-Yu Chen
4560df76eb camera2: allow mixing regular/reprocess requests
Allow mixing regular and reprocess requests in burst requests.
Create RequestLastFrameNumbersHolder to store the last regular
frame number and the last reprocess frame number in a capture
request list which can be used to determine if the capture
sequence is completed.

Bug: 20537735
Change-Id: I0880f8c845380e1c7ffe504225a556829dfeccf6
2015-05-06 10:28:40 -07:00
Yin-Chia Yeh
03d50da3b1 Camera: tonemap linkify update
Change-Id: I9e1688916c70af1ffef96407117566eac7236ce4
2015-05-06 00:10:11 -07:00
Svetoslav
fbf0ecabac Add camera app op - framework
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
2015-05-02 16:23:19 -07:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
Svet Ganov
b9d71a6f89 Add body sensors app op - framework base
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
2015-05-01 13:56:04 -07:00
Ruben Brunk
02cf079a64 Revert "camera: Start/stop preview before clearing surface."
This reverts commit 6faf98e235.

Change-Id: I349882643723bd97b19249ab34d3e61989bfb371
2015-05-01 18:33:50 +00:00
Ruben Brunk
0f2be13dc6 camera: Update Camera2 API for arbitration.
- Update documentation for new arbitration behavior.
- Ensure an appropriate error is thrown when calling
  open while an existing, higher-priority user holds
  the camera device.

Bug: 19186859
Change-Id: I486193c14b7fd5dc6ce30c1b7471669c009d64b3
2015-05-01 18:28:13 +00:00
Alex Klyubin
24e9e966a8 Fix thread affinity of FingerprintManager.
FingerprintManager internally creates a Handler which needs to be
bound to a Looper thread. Prior to this CL the Handler was bound to
the Looper of the current thread. This caused issues:
* Different instances of FingerprintManager could be bound to
  different Looper threads.
* Callbacks from FingerprintManager were invoked on arbitrary
  threads (or not at all if the Looper was there but wasn't running).
* FingerprintManager couldn't be obtained by apps on most non-main
  threads leading to java.lang.RuntimeException: Can't create handler
  inside thread that has not called Looper.prepare().

This CL fixes the issue by binding the FingerprintManager's Handler to
the Looper running on the main thread.

Bug: 20725228
Change-Id: I4a0382d6e11df9f23b8db9f0deec77369af31b5e
2015-04-30 13:34:58 -07:00
Eino-Ville Talvala
6faa3acaad Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev 2015-04-30 18:10:31 +00:00
Svetoslav
3327f3d688 Merge "Add use fingerprint app op - framework" into mnc-dev 2015-04-30 18:05:18 +00:00
Jim Miller
b62dc82b0c Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
Fixes bug 20660180

Change-Id: I421c246ef776847835ede4be1d72721c35cf951c
(cherry picked from commit 0ecd5c20d9)
2015-04-30 01:53:11 +00:00
Svetoslav
4af76a51d5 Add use fingerprint app op - framework
Change-Id: Ibbd1c70e1fc771b804a8b0099d29d4fbd8360966
2015-04-29 15:43:38 -07:00
Mike Lockwood
c9bb40ea95 UsbDevice: Add support for retrieving version string for a USB device
Change-Id: Ia8630f5ffd05f90347b971110a81f4927060cc4b
2015-04-29 13:05:55 -07:00
Eino-Ville Talvala
be6d985269 Camera2: LEGACY: Support prepare(), sort of.
It doesn't actually do any work, but pretends to.

Bug: 20537146
Change-Id: I48c08936b96ba1a0623cff19eb5c521d1dd50129
2015-04-29 12:55:16 -07:00