Commit Graph

3635 Commits

Author SHA1 Message Date
Andrei-Valentin Onea
86e8065132 Merge "Add method to greylist" into rvc-dev am: 1775d16adb am: 4a9ceaaf48 am: a1857a831f am: e2a545b71f
Change-Id: I812553d72b6c1e02d54d856a7f43686afd344af8
2020-04-09 12:25:10 +00:00
Andrei-Valentin Onea
a1857a831f Merge "Add method to greylist" into rvc-dev am: 1775d16adb am: 4a9ceaaf48
Change-Id: I4126c395c7fd9d479901dd9c6e548fc129f01a60
2020-04-09 11:59:03 +00:00
Andrei-Valentin Onea
1775d16adb Merge "Add method to greylist" into rvc-dev 2020-04-09 11:17:11 +00:00
Andrei Onea
a8766420c6 Add method to greylist
Add Landroid/hardware/camera2/CameraMetadata;->getNativeMetadataPtr()J
to greylist so that
CameraManagerTest#testCameraCharacteristicsNdkFromSdk no longer needs
to forego hidden api checks.

Bug: 149594233
Test: atest CameraManagerTest#testCameraCharacteristicsNdkFromSdk
Test: adb install -r -g CtsCameraTestCases.apk && \
      adb  shell am instrument -e class \
	'android.hardware.camera2.cts.CameraManagerTest#testCameraCharacteristicsNdkFromSdk' \
	-w 'android.camera.cts/androidx.test.runner.AndroidJUnitRunner'
Change-Id: Ibd53dd198efc5722e20f153ef5cc9433e5b7539d
2020-04-08 19:56:52 +01:00
Chavi Weingarten
34be502873 Merge "Added displayPosition in LogicalDisplay" into rvc-dev am: ae1c541a6f am: a0ee54d355
Change-Id: I6906c731e01a0d959f7ef38f5607e7992e84e8be
2020-04-06 18:39:36 +00:00
Chavi Weingarten
ae1c541a6f Merge "Added displayPosition in LogicalDisplay" into rvc-dev 2020-04-06 18:29:05 +00:00
Jacky Kao
45d6353363 Merge "Supporting multi-display for takeScreenshot()" into rvc-dev am: aa8f5cb671
Change-Id: I03c220f6be59a041015f9959bb7905e7e328bf20
2020-04-06 09:12:22 +00:00
Jacky Kao
aa8f5cb671 Merge "Supporting multi-display for takeScreenshot()" into rvc-dev 2020-04-06 09:03:42 +00:00
chaviw
945f7301f0 Added displayPosition in LogicalDisplay
Allow WindowManager to get display position from DisplayManager. This
will allow display animations to work since we need to know the initial
position of the display to correctly handle animations

Test: LogicalDisplayTest
Bug: 149490428

Change-Id: I5de2495982294ffa0437d8e87a43bf1d2fd0d86a
2020-04-03 13:51:03 -07:00
TreeHugger Robot
b1b2fcabf1 Merge "[wm] VirtualDisplayConfig to mirror the non-default display" into rvc-dev am: 8885e4f115 am: 86dfd4b316 am: 0e6d4cf00f am: 9b3bf34b5b
Change-Id: Ie349cdbc66fa01a0e36a33a8193344ccdcd0a9cb
2020-04-03 20:22:11 +00:00
TreeHugger Robot
0e6d4cf00f Merge "[wm] VirtualDisplayConfig to mirror the non-default display" into rvc-dev am: 8885e4f115 am: 86dfd4b316
Change-Id: I478c0dd98b4f24969ef637ea11339bc3d90dbca2
2020-04-03 19:42:59 +00:00
TreeHugger Robot
005e8990a9 Merge "[wm] VirtualDisplayConfig to mirror the non-default display" into rvc-dev am: 8885e4f115
Change-Id: I7e24db3e8ff19e90cdcd890246ba8c0d1c0906aa
2020-04-03 19:20:06 +00:00
b0202.jung
925435c18d [wm] VirtualDisplayConfig to mirror the non-default display
The application can request to mirror default display by using MediaProjection.
However, there is no way to mirror the specific display on multi-display enviroment.

Now, the application can set displayIdToMirror through VirtualDisplayConfig class.

Test: atest FrameworksServicesTests:DisplayManagerServiceTest
Bug : 127687569

Change-Id: I1ef94bfa79e103d0a4a05a10fc8705ed3bbcc0c9
2020-04-01 08:50:18 -07:00
Kevin Chyn
c81ace7708 Merge "Send "early canceled" to privileged clients" into rvc-dev am: f825133d01 am: 0c33ac343f am: d69afab3e0 am: 05f8a0e8f2
Change-Id: I2ddb2414e37ea85870f8afc861c8f199a6e74bff
2020-03-28 00:47:11 +00:00
Kevin Chyn
e2ddf8416d Merge "Send "early canceled" to privileged clients" into rvc-dev am: f825133d01
Change-Id: Ibb24c6076b97bcdf90fa188f6a4055626c57442d
2020-03-28 00:12:30 +00:00
Kevin Chyn
d69afab3e0 Merge "Send "early canceled" to privileged clients" into rvc-dev am: f825133d01 am: 0c33ac343f
Change-Id: Id79ff808d6d2b025b12be46a323c3bb3d2f7c1e0
2020-03-28 00:07:04 +00:00
Kevin Chyn
f825133d01 Merge "Send "early canceled" to privileged clients" into rvc-dev 2020-03-28 00:05:59 +00:00
Nicholas Ambur
18e789c83a remove SoundTrigger public member variables am: 1e43767f10 am: f5bd2f0b5c am: 71a34a2072 am: cf40afdfa0
Change-Id: If14954ed779a4874b7abada226cdd0bd94d4aa84
2020-03-27 22:38:25 +00:00
Kevin Chyn
0a45b662b0 Send "early canceled" to privileged clients
The navigation bar dismissal animation caused by "activity finish"
should be invoked in some cases immediately when the user
cancels authentication. Add a "early user cancel" message
for ConfirmDeviceCredentialActivity to subscribe to. This
message is sent immediately when the user invokes a back gesture or
cancels authentication.

Bug: 148273355

Test: Set up work profile with separate password and biometric
      Unlock work profile
      Lock screen
      Open work profile app
      Cancel authentication at various states in various ways
      Notice no navigation bar jank

Test: atest com.android.systemui.biometrics

Change-Id: I89c5b5e2782339cae15f936268e6e7b8ad4e5359
2020-03-27 14:44:08 -07:00
Nicholas Ambur
f5bd2f0b5c remove SoundTrigger public member variables am: 1e43767f10
Change-Id: I7c8e9ae9196b66447aaa8fed019aaf5261d409da
2020-03-27 21:19:14 +00:00
Nicholas Ambur
95ee3d7ad5 Merge "remove SoundTrigger public member variables" into rvc-dev 2020-03-27 20:54:22 +00:00
Nicholas Ambur
1e43767f10 remove SoundTrigger public member variables
Bug: 150127026
Test: boot and verify soundtrigger hotword is functional

Change-Id: I04061cdb3eba02aac0f08de96f957e2b74c70a12
2020-03-26 19:44:31 +00:00
Leon Scroggins
2a1b63c7df Merge "Convert ScreenshotGraphicBuffer to ScreenshotHardwareBuffer" 2020-03-26 17:29:14 +00:00
Kevin Chyn
c3fc095f38 Merge changes I704914b2,I51560dfc,I866e84b2 into rvc-dev am: 127e3957d6 am: 39989372b5 am: 33167f98ca am: b0c0739e07
Change-Id: I1cb2b3500059e99fd6181c9d4c847044003eca2a
2020-03-25 22:47:11 +00:00
Kevin Chyn
39989372b5 Merge changes I704914b2,I51560dfc,I866e84b2 into rvc-dev am: 127e3957d6
Change-Id: Iab9bb3ed728bd18373fd2aae27160cc8f6139280
2020-03-25 22:12:17 +00:00
Kevin Chyn
127e3957d6 Merge changes I704914b2,I51560dfc,I866e84b2 into rvc-dev
* changes:
  Allow BIOMETRIC_CONVENIENCE to register with BiometricService
  Improve AuthService logging
  Only BIOMETRIC_STRONG HATs should be sent to KeyStore
2020-03-25 22:10:14 +00:00
Leon Scroggins III
46c927ed33 Convert ScreenshotGraphicBuffer to ScreenshotHardwareBuffer
Bug: 150395371
Test: make && flashall

Bitmap is replacing methods that use a hidden GraphicBuffer with ones
that use the public HardwareBuffer. ScreenshotGraphicBuffer is just a
holder for GraphicBuffer and some metadata; switch it to hold a
HardwareBuffer (and rename to match).

Remove GraphicBuffer#createFromExisting, which was only called by
ScreenshotGraphicBuffer#createFromNative. Also remove JNI references to
that method, which were no longer in use.

Switch uses of GraphicBuffer that retrieve it from a
ScreenshotGraphicBuffer to HardwareBuffer.

Changes are almost entirely mechanical:
- (Screenshot)GraphicBuffer -> (Screenshot)HardwareBuffer
- GraphicBuffer#destroy -> HardwareBuffer#close
- getGraphicBuffer -> getHardwareBuffer

When creating a Snapshot in SurfaceFreezer, use the ColorSpace of the
ScreenshotHardwareBuffer.

Remove GraphicBuffer#createFromExisting. This is no longer necessary,
and although it was marked UnsupportedAppUsage, go/nonsdk-dash shows no
usage.

Change-Id: I41cb03fb65432d208820a428783de82a9f152035
2020-03-25 13:45:12 -04:00
Jacky Kao
316477c399 Supporting multi-display for takeScreenshot()
Creating a new API, screenshotWithoutSecureLayer(), to get the
graphic buffer of screenshot for all displays including non-default
display and virtual one. We can use it to support multi-display
of takeScreenshot() API.

Bug: 145893483
Test: a11y CTS & unit tests
Test: manual testing to take screenshot of second display which is a
monitor with chrome cast

Change-Id: I474c71f7e01d57b5a318b2a5bfb690a2e01c128c
2020-03-25 13:46:11 +08:00
TreeHugger Robot
e033116583 Merge "Camera: Add visual samples for android.control.zoomRatio" into rvc-dev am: ff57d5cba0 am: c88d9243d7 am: b3a72c2bfc am: ac9e275f7b
Change-Id: I2918019acc6776121cb1f61f54b93a7d158ce3e4
2020-03-24 19:14:41 +00:00
TreeHugger Robot
b3a72c2bfc Merge "Camera: Add visual samples for android.control.zoomRatio" into rvc-dev am: ff57d5cba0 am: c88d9243d7
Change-Id: I42c1e1bba36143d3bd011d4733d824e27eed4157
2020-03-24 18:55:53 +00:00
TreeHugger Robot
e4bbe57c9f Merge "Camera: Add visual samples for android.control.zoomRatio" into rvc-dev am: ff57d5cba0
Change-Id: I26fbe65db79c9a8ec0f6af87c83f276d6dbf5433
2020-03-24 18:55:45 +00:00
TreeHugger Robot
ff57d5cba0 Merge "Camera: Add visual samples for android.control.zoomRatio" into rvc-dev 2020-03-24 18:37:39 +00:00
Automerger Merge Worker
af843aa4cf Merge "Merge "Camera: Improve docs for getOutputMinFrameDuration" into rvc-dev am: 174fd34cba am: 990429b7dc" into rvc-d1-dev-plus-aosp am: 5fe038bc10 am: 04bacd4732
Change-Id: Ic809ad03c06738eb1ab4df28a8b251de1a3e72ff
2020-03-24 03:16:44 +00:00
Eino-Ville Talvala
820c3c7950 Merge "Camera: Improve docs for getOutputMinFrameDuration" into rvc-dev am: 174fd34cba am: 990429b7dc
Change-Id: Iea1b77fefed54aac610dcc5bc51b6b7645e676d5
2020-03-23 23:16:39 +00:00
Eino-Ville Talvala
79c5024b45 Merge "Camera: Improve docs for getOutputMinFrameDuration" into rvc-dev am: 174fd34cba
Change-Id: I9f839095f93243ef15577186b5128d530ff114b7
2020-03-23 23:02:23 +00:00
Kevin Chyn
0f598aa9c0 Only BIOMETRIC_STRONG HATs should be sent to KeyStore
Bug: 150014844
Bug: 141025588
Bug: 151967372

Test: Configure a device to have weak biometrics only, then
      run CtsVerifier Weak Biometrics section
Test: com.android.server.biometrics

Change-Id: I866e84b2f88c24faeaf42452d44f651ec220858a
2020-03-23 15:40:09 -07:00
Chavi Weingarten
fa155b6db6 Merge "Added displayPosition in LogicalDisplay" 2020-03-23 22:34:48 +00:00
Shuzhen Wang
69cf0fd599 Camera: Add visual samples for android.control.zoomRatio
To better document how android.control.zoomRatio works, add diagrams to
illustrate its relationship with scalerCropRegion.

Test: Build and read docs
Bug: 144780745
Change-Id: I90b93c4d516f6f1e2d427ed3d56e85b6c94befe8
2020-03-23 13:26:03 -07:00
Eino-Ville Talvala
585305da32 Camera: Improve docs for getOutputMinFrameDuration
The current text was misleading, since minimum frame duration of a
stream affects the aggregate minimum frame duration of a session
whether a stream is in use for a given request stream or not.

Test: Docs build
Bug: 147080626
Change-Id: Ic884cd0bb3ea184383944cb78e9713d6044b1959
2020-03-23 12:41:17 -07:00
chaviw
5e655dc7a1 Added displayPosition in LogicalDisplay
Allow WindowManager to get display position from DisplayManager. This
will allow display animations to work since we need to know the initial
position of the display to correctly handle animations

Test: LogicalDisplayTest
Bug: 149490428

Change-Id: I5de2495982294ffa0437d8e87a43bf1d2fd0d86a
2020-03-23 11:53:00 -07:00
TreeHugger Robot
c8cbf7365d Merge "Camera: Move bokeh mode to extendedSceneMode tag" into rvc-dev am: 2ecb17aa03 am: be22d5997d am: e89e76057f am: 53973d8684
Change-Id: I2d610d565b10cb5ef466e82fde0d441ec6d16eee
2020-03-21 05:42:49 +00:00
TreeHugger Robot
e89e76057f Merge "Camera: Move bokeh mode to extendedSceneMode tag" into rvc-dev am: 2ecb17aa03 am: be22d5997d
Change-Id: I48a1edda2e95733090b492402603db7501ad27e2
2020-03-21 05:02:03 +00:00
TreeHugger Robot
768ca03295 Merge "Camera: Move bokeh mode to extendedSceneMode tag" into rvc-dev am: 2ecb17aa03
Change-Id: Ic1d15836ecefac7197fde0e3219f5afefb48966b
2020-03-21 04:40:36 +00:00
TreeHugger Robot
2ecb17aa03 Merge "Camera: Move bokeh mode to extendedSceneMode tag" into rvc-dev 2020-03-21 04:25:09 +00:00
Nicholas Ambur
f6e171adcf Merge changes from topic "enrollment-app-permission" into rvc-dev am: aceabbf758 am: 55730e498c am: 9e3fe192b4 am: 4332def7be
Change-Id: Idd3b1e037b5e9f2d301861dbb769ceeb47351fc3
2020-03-21 01:42:45 +00:00
Nicholas Ambur
55730e498c Merge changes from topic "enrollment-app-permission" into rvc-dev am: aceabbf758
Change-Id: I5c2236bd27ffe708b7b590b96901f166aad1362d
2020-03-21 00:41:07 +00:00
Nicholas Ambur
aceabbf758 Merge changes from topic "enrollment-app-permission" into rvc-dev
* changes:
  fix enrollment application permission check
  add KEYPHRASE_ENROLLMENT_APPLICATION permission
2020-03-21 00:39:35 +00:00
Nicholas Ambur
64fb254c63 fix enrollment application permission check
Remove check associated with enrollment application UID, and allow
enrollment applications holding the KEYPHRASE_ENROLLMENT_APPLICATION
privledged permission to enroll.

Bug: 151405284
Test: Confirm enrollment from both enrollment application and active
voiceinteraction service. Confirm enrollment can still occurr after
system user switch.

Change-Id: I8686f705fe5405523004eef5de834282a7382464
2020-03-20 14:55:35 -07:00
Shuzhen Wang
796863a5ec Camera: Move bokeh mode to extendedSceneMode tag
Migrate BOKEH_MODE_STILL_CAPTURE and BOKEH_MODE_CONTINUOUS to be 2 enums
of CONTROL_EXTENDED_SCENE_MODE.

Test: Camera CTS, VTS
Bug: 151759402
Change-Id: I2373f3cb37bbca72cdf403b209f2375c1954fb9a
2020-03-20 12:15:48 -07:00
Ilya Matyukhin
d1c630d805 [DO NOT MERGE] Enable biometrics.fingerprint@2.2 am: 7f91123ea4
Change-Id: Ibf44c7ca3fb7c0264970fdc2bf72f23b2ae98754
2020-03-20 17:52:05 +00:00