Commit Graph

3707 Commits

Author SHA1 Message Date
Automerger Merge Worker
b58d1b9087 Merge "Merge "Camera: add proper null check for mRemoteDevice" into rvc-dev am: ab59e9af27 am: 99a251f707" into rvc-d1-dev-plus-aosp am: 954f80cc77 am: f94000604e
Change-Id: I40bc234b91d79af87a40382b59690d5d7048b225
2020-05-01 18:58:03 +00:00
Yin-Chia Yeh
50d66c86e1 Merge "Camera: add proper null check for mRemoteDevice" into rvc-dev am: ab59e9af27 am: 99a251f707
Change-Id: I5f642372f6ee9d928cc87a205f8b50e3a3e373c1
2020-05-01 18:22:04 +00:00
Yin-Chia Yeh
ab59e9af27 Merge "Camera: add proper null check for mRemoteDevice" into rvc-dev 2020-05-01 18:05:49 +00:00
Eino-Ville Talvala
86ef24ea3c Merge "Camera: Improve metadata access JNI performance" into rvc-dev am: 2a4de9cf21 am: 3f0603afe1 am: b12cdffb49 am: 156a50db6c
Change-Id: Ic75c0de8cd7850eb2529603a4629bdd03a94dbe3
2020-04-30 23:22:55 +00:00
Eino-Ville Talvala
b12cdffb49 Merge "Camera: Improve metadata access JNI performance" into rvc-dev am: 2a4de9cf21 am: 3f0603afe1
Change-Id: I1c85ce5ae765581590707738f4bcde3ccbae32fd
2020-04-30 22:48:30 +00:00
Eino-Ville Talvala
2a4de9cf21 Merge "Camera: Improve metadata access JNI performance" into rvc-dev 2020-04-30 22:19:13 +00:00
Eino-Ville Talvala
d95058f1cd Camera: Improve metadata access JNI performance
- Don't use reverse-JNI to access metadata ptr, pass it as an arg instead
- Use @FastNative since the calls are short and bounded in time

Performance improvement:
- On a 10-second trace of camera app running on sargo, percentage of
  time used in CameraMetadataNative.get went from 4.36% to 3.77%, a 15%
  reduction in time.

Test: atest CtsCameraTestCases
Bug: 150214459
Change-Id: I28d9428beaa7eada6292e24fe6ca1dbd9c2ff153
2020-04-30 12:59:06 -07:00
TreeHugger Robot
9a65d1ceff Merge "Handle exceptions on attach" into rvc-dev am: d5a777965b am: a206357d45 am: c8621cce48 am: a6a1980501
Change-Id: I14bc61583b15bac376bc3efbd993a6443b286ea6
2020-04-30 01:48:10 +00:00
TreeHugger Robot
a206357d45 Merge "Handle exceptions on attach" into rvc-dev am: d5a777965b
Change-Id: Icbe7913740cd40e96ad82ccca0a873a6c2963328
2020-04-30 01:17:59 +00:00
Ytai Ben-Tsvi
b6f88a7af7 Handle exceptions on attach
attach() may throw various kinds of runtime exceptions, and since there
is no way to represent them in attach() other than returning null (it
is not supposed to throw), we should catch them here and log them.

Bug: 153332815
Change-Id: Icbb7643c3abf6c6b0edc9d1eb9a74c38c731acdf
2020-04-29 14:54:29 -07:00
Kevin Chyn
e2f1133022 Merge changes from topic "authsession-ize"
* changes:
  Check for null HAT and add logging
  6/n: Move logging into AuthSession
  5/n: Remove requireConfirmation round trip
  4/n: Remove unused parameter
  3/n: Add AuthSession#STATE_AUTH_PAUSED_RESUMING
  2/n: AuthSession should manage its own state
  1/n: Move confirmationRequired logic into sub-modules
2020-04-29 02:44:06 +00:00
Kevin Chyn
f6c1ae3246 5/n: Remove requireConfirmation round trip
<Biometric>Service(s) only need to know about requireConfirmation
for FrameworkStatsLog logging. On the same note, AuthSession is the
source of truth for requireConfirmation, so <Biometric>Service(s) do
not need to pass the value back.

Bug: 149067920

Test: atest com.android.server.biometrics

Change-Id: I5212da7db4fde0bec84eaee83fd25ed0f0225b9a
2020-04-28 17:07:13 -07:00
Marin Shalamanov
f4733dd8ac Merge "Change the type of display port from byte to int" 2020-04-28 12:25:33 +00:00
Marin Shalamanov
41cb66fa00 Change the type of display port from byte to int
Using byte for display port is error prone since ports
are in the range [0, 255] and bytes have the range [-128, 127].
This way we need to downcast from int to byte in order to write a
value to display port and also we need to call Byte.toUnsignedInt
every time we want to consume it.

Test: m services
Bug: 153334857
Change-Id: I4dce87c0a411c5d447f62cc5564eb4b8a8fb75f0
2020-04-27 22:11:29 +02:00
TreeHugger Robot
2682e47f9f Merge "CEC: Make HDMI CEC volume control configurable" into rvc-dev am: 77576fe964
Change-Id: I581946f1aea58a7f61dd8e9639862b8cf88cd95a
2020-04-27 12:34:59 +00:00
TreeHugger Robot
77576fe964 Merge "CEC: Make HDMI CEC volume control configurable" into rvc-dev 2020-04-27 12:26:23 +00:00
Marvin Ramin
da665a67f1 CEC: Make HDMI CEC volume control configurable
Add API (backed by Setting) to enable/disable volume changes via HDMI
CEC for HDMI CEC source devices.
This state is persisted via Settings.

If volume control is disabled, no incoming HDMI CEC commands related to
volume will be processed. If disabled, no HDMI CEC volume control
messages will be sent by the device.

Test: atest com.android.server.hdmi
Bug: 149800547

Merged-In: I83ae9b423122b540b9adb156fb1c6f5964dd6105
Change-Id: I83ae9b423122b540b9adb156fb1c6f5964dd6105
2020-04-27 12:35:56 +02:00
Nick Chalko
c2b6938c2e Merge "Use HdmiProperties class for ro.hdmi.*" 2020-04-26 17:18:44 +00:00
Ytai Ben-tsvi
5ac3773839 Merge "Deliver internal server errors to the client" into rvc-dev am: f7d789b0ed am: 62fa87cbf4 am: 503ee719e1 am: bedc04c1b1
Change-Id: I394e47e9ac387a24169e543f28a899438dc7d7d9
2020-04-25 02:46:16 +00:00
Ytai Ben-tsvi
503ee719e1 Merge "Deliver internal server errors to the client" into rvc-dev am: f7d789b0ed am: 62fa87cbf4
Change-Id: Iafb290d16686ab312326807cf9d2a33f59b0be8f
2020-04-25 02:08:26 +00:00
Ytai Ben-tsvi
20ec41785c Merge "Deliver internal server errors to the client" into rvc-dev am: f7d789b0ed
Change-Id: I3be1a7bdb367c9e583fb19fe92b973d1f658a921
2020-04-25 01:47:42 +00:00
Ytai Ben-Tsvi
458930753d Deliver internal server errors to the client
Due to a binder limitation (b/150808347), any unexpected exception
thrown by a binder service while processing an RPC call, will be
silently discarded and the client will get back a default-initialized
result parcelable (i.e. in most cases, won't know that anything wrong
happened).

We work around this issue by throwing a ServiceSpecificException,
which does get delivered, having a special code to designate an
internal error. Errors resulting from a HAL malfunctions will result
in a HAL reboot, which leads to recovery.

Bug: 154089179
Test: Manual verification of basic error recovery scenarios by
      injecting HAL error codes and crashes.
Change-Id: Ib5dbe08a362e545501c04204bebad5ab95f5d632
2020-04-24 16:39:36 -07:00
TreeHugger Robot
8f1f941d3c Merge "CEC: Make HDMI CEC volume control configurable" 2020-04-24 17:53:43 +00:00
TreeHugger Robot
e7a355291b Merge "Use Arrays.hashCode in DeviceProductInfo" into rvc-dev am: f0de93d7b2 am: 6cd7f6c60d am: 57e5456ddf am: 5a6aebd974
Change-Id: I61178029bcaf0e2738933059d8da586c59b93ba6
2020-04-24 15:07:02 +00:00
TreeHugger Robot
6cd7f6c60d Merge "Use Arrays.hashCode in DeviceProductInfo" into rvc-dev am: f0de93d7b2
Change-Id: Ie0e9c4b6717e87a1f1057318f93b7bfe9469c4bf
2020-04-24 14:37:20 +00:00
TreeHugger Robot
f0de93d7b2 Merge "Use Arrays.hashCode in DeviceProductInfo" into rvc-dev 2020-04-24 14:24:25 +00:00
Marvin Ramin
309efbc770 CEC: Make HDMI CEC volume control configurable
Add API (backed by Setting) to enable/disable volume changes via HDMI
CEC for HDMI CEC source devices.
This state is persisted via Settings.

If volume control is disabled, no incoming HDMI CEC commands related to
volume will be processed. If disabled, no HDMI CEC volume control
messages will be sent by the device.

Test: atest com.android.server.hdmi
Bug: 149800547

Change-Id: I83ae9b423122b540b9adb156fb1c6f5964dd6105
2020-04-24 16:14:23 +02:00
Marin Shalamanov
90fd0b19f8 Use Arrays.hashCode in DeviceProductInfo
Using arrays in Objects.hash() is error prone. Instead we
call Arrays.hashCode().

Test: m services
Bug: 154302664
Change-Id: Icf00fbaa465ef60951998659ae0333b2faf7042b
2020-04-24 13:02:35 +00:00
Kevin Chyn
3358b41ea0 4/n: Remove unused parameter
Bug: 11196423

Test: atest com.android.server.biometrics
Change-Id: I2fc015edd32215da076bd551fc6cafd59ff00a1f
2020-04-23 16:16:05 -07:00
Kevin Chyn
b53472abd2 2/n: AuthSession should manage its own state
1) State calculation, updating, side-effects, outputs are moved
   within AuthSession
2) StatusBarService invocations are all within AuthSession
3) PendingSession and CurrentSession are merged into CurrentSession.
   PendingSession was mostly the same as CurrentSession, with the
   two considerations:
     A) It's only ever valid in STATE_AUTH_CALLED (waiting for sensors
        to become ready)
     B) It's possible for new authentication to be requested while
        CurrentSession is in-progress.

Previously, the PendingSession would request <Biometric>Service(s)
to prepare for auth, which would cancel any existing authentications
and send ERROR_CANCELED to BiometricService, ending the CurrentSession
lifecycle. With this change, if authentication is requested while an
existing AuthSession is in progress, it will immediately send
ERROR_CANCELED to the previous caller and cancel sensors if necessary.
ERROR_CANCELED that are received from the sensors will not affect
the new AuthSession (as expected), since the cookies will no longer
match.

Bug: 149067920

Test: atest com.android.systemui.biometrics
Test: atest com.android.server.biometrics

Change-Id: Ia89920d2225eb9a71f25a5b9fbbd36f92a550127
2020-04-23 16:10:45 -07:00
TreeHugger Robot
4338456d82 Merge "Camera: Update physical camera request keys documentation" into rvc-dev am: 1a17016c70 am: 9a2db61b88 am: 8fa4061bce am: 6902350871
Change-Id: Ia926c96f1a7f9c0a6a827906e38c89c10e0d8a6b
2020-04-23 17:59:57 +00:00
TreeHugger Robot
8fa4061bce Merge "Camera: Update physical camera request keys documentation" into rvc-dev am: 1a17016c70 am: 9a2db61b88
Change-Id: I7fe48b83772c7b4c59bb5890ed0473cb148b68d3
2020-04-23 17:16:42 +00:00
TreeHugger Robot
81cb6b1d2a Merge "Camera: Update physical camera request keys documentation" into rvc-dev am: 1a17016c70
Change-Id: I59f9cca5ae09b266d1434bdd9f86cc3dc4889d90
2020-04-23 17:01:26 +00:00
TreeHugger Robot
1a17016c70 Merge "Camera: Update physical camera request keys documentation" into rvc-dev 2020-04-23 16:39:11 +00:00
Tarundeep Singh
1ef75267f6 Use HdmiProperties class for ro.hdmi.*
Bug: 141581191
Test: m services.core
Change-Id: Ieb32135d30b60ad04d5f3e673391e469c83b7f84
2020-04-23 07:49:47 -07:00
Emilian Peev
b30f4ef874 Camera: Update physical camera request keys documentation
Align physical camera request key documentation with the
camera service implementation. Specifically remove any
repeating request limitations.

Bug: 154673381
Test: Successful doc build
Change-Id: I563542e819ef57a99f762d7cfd653cced2423ebb
2020-04-22 09:11:01 -07:00
Marin Shalamanov
939dacea86 Merge "Add relative address to DeviceProductInfo." 2020-04-22 12:52:03 +00:00
Jacky Kao
cebd109abb Merge "Obtain correct screenshot based on device orientation" 2020-04-22 00:41:54 +00:00
Jacky Kao
4b4eec7813 Obtain correct screenshot based on device orientation
When taking the screenshot, passing the width and height
of the display, and the rotation according to the current
device orientation.

Bug: 153173726
Test: a11y CTS & unit tests
Test: manual test
Change-Id: I19eea2046da282155719b1dfdf9a3f53ad95e13b
2020-04-22 08:33:49 +08:00
Jacky Kao
ca6b2ab591 Merge "Obtain correct screenshot based on device orientation" into rvc-dev am: 538ee89f2b
Change-Id: I5b46e2f85dc074bbf0f835c6b7332eb5f36ade2d
2020-04-22 00:21:05 +00:00
Jacky Kao
538ee89f2b Merge "Obtain correct screenshot based on device orientation" into rvc-dev 2020-04-22 00:19:35 +00:00
Jacky Kao
333de4e7c3 Obtain correct screenshot based on device orientation
When taking the screenshot, passing the width and height
of the display, and the rotation according to the current
device orientation.

Bug: 153173726
Test: a11y CTS & unit tests
Test: manual test
Change-Id: I19eea2046da282155719b1dfdf9a3f53ad95e13b
2020-04-22 00:19:12 +00:00
TreeHugger Robot
75836b7847 Merge "Fix typo in HdmiSwitchClient documentation" 2020-04-21 06:53:48 +00:00
Jacky Kao
5dc99c6f58 Merge "Supporting multi-display for takeScreenshot() on master" 2020-04-20 23:35:58 +00:00
Marvin Ramin
9c98c368ef Fix typo in HdmiSwitchClient documentation
Fixing the typo by removing the parameter in the javadoc.
@CallbackExecutor will automatically generate documentation for this
parameter

Test: n/a
Change-Id: Ie78028d0b1fb1b48ee7b07585734a2301135636b
2020-04-20 20:17:14 +00:00
Kevin Chyn
dd094dd83a Merge changes I1597d000,I18026e79
* changes:
  Add BiometricService to dumpsys
  Split IBiometricServiceReceiverInternal between sensor and sysui
2020-04-18 23:05:11 +00:00
Nicholas Ambur
ac42a7c999 Merge "add KeyphraseEnrollmentInfo to TestApi" into rvc-dev am: 01b4d5cb13
Change-Id: I316ee034119f08155ac51cfc4a6e38a4287a4e35
2020-04-18 02:25:09 +00:00
Nicholas Ambur
d3c1f27b0c add KeyphraseEnrollmentInfo to TestApi
KeyphraseEnrollmentInfo is used for testing the system enrollment
application support within GTS.

Bug: 153264697
Test: gts-tradefed run gts-dev -m GtsAssistIntentTestCases \
-t com.google.android.assist.gts.KeyphraseModelManagerTest# \
testAllSystemKeyphrasesAndLocales

Change-Id: I66558cf849f2815f2c917d128f9f9cc0673750ef
Merged-In: I66558cf849f2815f2c917d128f9f9cc0673750ef
2020-04-17 22:12:13 +00:00
Nicholas Ambur
b766f2d8bf Merge "add KeyphraseEnrollmentInfo to TestApi" 2020-04-17 22:04:29 +00:00
Kevin Chyn
3be2c08966 Split IBiometricServiceReceiverInternal between sensor and sysui
Fixes: 151967372

Test: CtsVerifier
Test: atest com.android.server.biometrics
Test: atest com.android.systemui.biometrics

Change-Id: I18026e797abeac009e7993e3486368f0607a829d
2020-04-17 13:39:51 -07:00