Commit Graph

2360 Commits

Author SHA1 Message Date
rongliu
cabbceee5f Merge "Add comment about flag VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL as recommended." into oc-mr1-dev am: bf070a35cd
am: d6230d3d2a

Change-Id: I914a2a44a0828a6201af79ff467d024bf1460ddd
2017-10-06 23:51:49 +00:00
rongliu
d6230d3d2a Merge "Add comment about flag VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL as recommended." into oc-mr1-dev
am: bf070a35cd

Change-Id: I88f24ed82459b4cbc03c92a96774636a47509715
2017-10-06 23:42:27 +00:00
rongliu
3e9f972fde Add comment about flag VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL
as recommended.

Change-Id: I3778eed6f91e3ebf70683f40389c605648444b99
Bug: 67420451
Test: Only add comment.
2017-10-06 11:20:51 -07:00
rongliu
6400a40b34 Merge "Add a flag to virtual display to indicates that content on this display need to be destroyed once the display is removed. Then apply this flag to VR virtual display." into oc-mr1-dev am: 27378c64c7
am: 25b1093844

Change-Id: I0e2a64a72a9bbc14a1e8ef3a8b217d71b5eafb37
2017-10-06 15:12:11 +00:00
rongliu
25b1093844 Merge "Add a flag to virtual display to indicates that content on this display need to be destroyed once the display is removed. Then apply this flag to VR virtual display." into oc-mr1-dev
am: 27378c64c7

Change-Id: I45b685d99da325c627bf3f01b9038ddf81c781a1
2017-10-06 14:57:36 +00:00
rongliu
1e90fc38db Add a flag to virtual display to indicates that content on this
display need to be destroyed once the display is removed.
Then apply this flag to VR virtual display.

Change-Id: Icb5aa1280b6ebac5941afda1cc1b94b258ce44f4
Bug: 67420451
Test: Manually. "adb shell am stack list" does not show contents
from virtual display anymore after it's released.
2017-10-04 17:50:23 -07:00
Peng Xu
00ae599474 Merge changes from topic "equalizer_1" am: 1ba697e29b am: 46f2249f46 am: 01ad27a0eb
am: b855edc41f

Change-Id: I499360f6cb7ecdf5c8580faf066c9ac0c0aea59a
2017-09-26 12:49:03 +00:00
Peng Xu
b855edc41f Merge changes from topic "equalizer_1" am: 1ba697e29b am: 46f2249f46
am: 01ad27a0eb

Change-Id: Ie717da6b0e336701bdacc2949877bc0c1d71cb58
2017-09-26 12:38:01 +00:00
Peng Xu
46f2249f46 Merge changes from topic "equalizer_1"
am: 1ba697e29b

Change-Id: I0b5dabe42c0ab59fab63ea653392dd4d99b7d967
2017-09-26 11:07:28 +00:00
Peng Xu
62f2c87ee3 Fixing code formatting to comform to checkstyle
Fix following types of issue
  * over 100 char/line
  * missing space
  * trailing spaces
  * array bracket position
  * variable naming convention (some cases)
  * indentation
  * long expression wrapping operator position
  * missing curly brace for one line scope
  * function modifier order

Things not changed in this CL:
  * Redundant public modifiers.
  * A few local variable names.
  * Suggested @deprecate but function is actually @removed.

Test: m and m docs
Change-Id: I5c22648888487edaa5954026a166cfd810a8a912
2017-09-22 16:58:14 -07:00
Eino-Ville Talvala
8f7e9ab891 Merge "Camera: Add more documentation about thrown exceptions." into oc-mr1-dev am: a120e6b604
am: 5c8027a159

Change-Id: Ideb508436828aff5667777a526aeef4da1d51fab
2017-09-21 21:57:48 +00:00
TreeHugger Robot
a120e6b604 Merge "Camera: Add more documentation about thrown exceptions." into oc-mr1-dev 2017-09-21 19:50:33 +00:00
Peng Xu
9ee042efa8 Update Java doc of SensorManager.createDirectChannel
Java doc was left out when addressing API reviewer comments.
This CL fix the discrepancy between the actual logic and java doc.

Bug: 36550285
Test: compiles
Change-Id: I6406892ecdcc5d02f11966fa3fb0b81ed8d3b285
Merged-In: I6406892ecdcc5d02f11966fa3fb0b81ed8d3b285
2017-09-20 17:03:27 -07:00
Alexey Polyudov
29ad6b3960 sensors: pass sensor handle along with injected event
Change-Id: I5e8eacfa940c082a14a9876f455c55b84b975086
Merged-In: I5e8eacfa940c082a14a9876f455c55b84b975086
2017-09-20 11:13:51 -07:00
Arthur Ishiguro
eb47fdc8e0 Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev am: 0853fe8a53
am: 7c5be53554

Change-Id: Iff30607c66ae8b42307bce3e42f7f9f3471e8d03
2017-09-19 20:50:59 +00:00
TreeHugger Robot
0853fe8a53 Merge "Adds handle to NanoAppInstanceInfo Parcel" into oc-mr1-dev 2017-09-19 20:32:56 +00:00
Arthur Ishiguro
9acb5402d0 Adds handle to NanoAppInstanceInfo Parcel
- Since mHandle (UID) was not recorded in writeToParcel, it always
returned 0 as the UID. This resulted in error messages claiming
mismatches between the reported and actual UID of nanoapps when called
from an external process.
- Also fixes the Parcel constructor to actually read the mContexthubId
field.

Bug: 37785458
Test: Compile and load, verify error message doesn't appear
Change-Id: I2ff75f510aae549c741786f5746862256ea5a877
2017-09-19 10:52:12 -07:00
Eino-Ville Talvala
20ed207f70 Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev am: 7c1f9cd750
am: 6e70e977df

Change-Id: I5d482de95a494d73667a6abbea42bf3f5e29c8aa
2017-09-18 20:17:20 +00:00
Eino-Ville Talvala
ace890aaae DngCreator: Don't use default locale for writing date/time into DNG
Explictly use Locale.US since EXIF/TIFF date/time fields require it.

Test: Switch to Arabic locale, verify no crash and resulting DNGs have valid metadata,
    plus CTS DngCreatorTest passes.
Bug: 65748590

Change-Id: I729ee6d849f7a39e5d396cfd8dd5d44325381822
2017-09-15 15:15:51 -07:00
Eino-Ville Talvala
06a771813b Camera: Add more documentation about thrown exceptions.
The deprecated camera API throws a lot of RuntimeExceptions, and many of the
methods don't mention this.

Test: Docs build and manual review
Bug: 64725721
Change-Id: I1c6dc2f984d0be8b0d4b5394bb0d7473dfec7949
2017-09-15 12:47:27 -07:00
Yin-Chia Yeh
efb5934683 Merge "Camera: fix race in onRepeatingRequestError callback" into oc-mr1-dev am: f23334869d
am: 811029f71d

Change-Id: Ib156c92bde8571cad70b1fe2cef0f03d9eae54b4
2017-09-08 23:59:32 +00:00
Yin-Chia Yeh
8cd12e9b7c Camera: fix race in onRepeatingRequestError callback
Test: CTS
Bug: 64180296
Change-Id: I72b76695d580d2cfddb02a6da9d7ab04cdcfb98a
2017-09-08 11:30:27 -07:00
Jim Miller
a507fc4b9e Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev am: fb8e9b9096
am: 8ad2bd4b53

Change-Id: Ic25a7a89485ec1791befafd4933a8cdd3741ce2e
2017-08-30 18:19:50 +00:00
TreeHugger Robot
fb8e9b9096 Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev 2017-08-30 17:47:46 +00:00
Michael Wright
f9c1757836 Merge "Add new system API for stable display size" into oc-mr1-dev am: c217d744b4
am: 9d9693e4af

Change-Id: I687f303f8d92be5ec0604761fa785fc20612633a
2017-08-25 21:21:13 +00:00
Michael Wright
eedcbf1504 Add new system API for stable display size
Fixes: 34388294
Test: manual
Change-Id: Ie380230bbd82370f507161b4cdb6f0d100b09f11
2017-08-25 20:56:00 +00:00
Andrii Kulian
d48474969e Merge "Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD" into oc-mr1-dev am: 7ee92d5291
am: a64529a989

Change-Id: I52a93678621d3d28e88cd7cdbfbfca3c2a96f0b2
2017-08-24 20:39:54 +00:00
Jim Miller
a8bc97cd70 Add a constant to allow system-provided fingerprint dialogs
This adds FINGERPRINT_ERROR_USER_CANCELED to the list of possible errors
returned by FingerprintManager.authenticate().

Fixes b/64540509

Test: documentation builds

Change-Id: I66b46d385ab10eb0bc8e982c06e7a60570a79165
2017-08-23 18:21:21 -07:00
Andrii Kulian
732a90a794 Apply API review comments for SHOW_WITH_INSECURE_KEYGUARD
Applied review comments but keeping the flag hidden for now.

Bug: 36555156
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testExternalDisplayActivityTurnPrimaryOff
Test: #testLaunchExternalDisplayActivityWhilePrimaryOff
Test: #testShowWhenLockedPublicVirtualDisplay
Change-Id: I1aa1289424d0d778bc0668c9ec69bc56f47891e3
2017-08-23 15:42:16 -07:00
Philip P. Moltmann
f3189e6836 Expose grantPermission via systemApi.
Test: none
Bug: 64200118
Change-Id: I9aad9959a48fb5dfb31114145c19cae1128cc33c
2017-08-17 08:38:00 -07:00
Shuzhen Wang
2899ed6fda Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev am: 4dde010145
am: 7ff3038385

Change-Id: I58077003219ed03ba08e5aab1475f2d46219825f
2017-08-12 00:29:10 +00:00
Sheng-Hao Tsao
b6109a64e2 Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev am: e22ecbdd61
am: 8bb38b555b

Change-Id: I700178674fa12d088bdf2b1bb67ea1f12fb33b53
2017-08-12 00:08:10 +00:00
TreeHugger Robot
4dde010145 Merge "Camera2: Legacy: Add onRequestQueueEmpty callback" into oc-mr1-dev 2017-08-11 22:47:53 +00:00
TreeHugger Robot
e22ecbdd61 Merge "Fix a bug that SurfaceView loses transformation" into oc-mr1-dev 2017-08-11 21:49:22 +00:00
Yin-Chia Yeh
542edd6dcf Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev am: 0cfad57566
am: df7d855072

Change-Id: I945d6ef3bad30a96c1ff1457b793bf5270e6950e
2017-08-11 20:03:53 +00:00
Sheng-Hao Tsao
bb39c858c7 Fix a bug that SurfaceView loses transformation
SurfaceView created for on-screen preview sometimes loses
transformation information in the Camera2 API with HALv1
environment, and therefore produced wrongly transformed frames.

It's because in RequestThreadManager.configureOutputs(), the
transformation set by LegacyCameraDevice.setSurfaceOrientation()
is cleared at mGLThreadManager.setConfigurationAndWait().

The bug is fixed by setting transformation information again
after mGLThreadManager.setConfigurationAndWait().

BUG=63313861
TEST=Check on minnie with GCA and CameraIQTesting app. Preview always
displays correct transformation in Camera2<=>HALv1 environment.

Change-Id: Ic395047a120a21b3968dedb4314bdbe519c932e6
2017-08-11 16:54:20 +00:00
Shuzhen Wang
234ba3ef75 Camera2: Legacy: Add onRequestQueueEmpty callback
onRequestQueueEmpty callback needs to be supported for legacy HAL1
devices.

Test: Camera CTS
Bug: 64483624
Change-Id: I268a1fe7577788c4e4e13dfecd7bb7abe0d82e6c
2017-08-11 09:32:20 -07:00
Yin-Chia Yeh
daf20731ca Camera: fix legacy device CTS failure
Bug: 64259581
Test: emulator CTS failure is fixed
Change-Id: I9988ffb7877c3f5d62c82ab3c7b8744720824fba
2017-08-10 22:44:50 +00:00
Peng Xu
63bf36a211 Update GeomagneticField parameters according to WMM-2015
Test: compiles and corresponding cts test pass
Bug: 31216311
Change-Id: I36f26086b1e2f62f81974d81d90c9a9c315a3445
2017-08-09 21:14:37 -07:00
Kevin Chyn
76b71c0580 Update FINGERPRINT_ERROR_LOCKOUT documentation
Fixes: 64330785

Test: make -j56
Change-Id: I40f0e71b9fd7dcdd12340bc03bb077e56813f5b7
2017-08-08 12:00:08 -07:00
Tomasz Wasilczyk
d2b5cfbdaa Change VENDOR program types to range.
Bug: b/64331420
Test: instrumentation
Change-Id: If5c56f09e2b9e272a40f0ca074a590ca6ec3a703
2017-08-07 10:20:24 -07:00
TreeHugger Robot
b79eb54d36 Merge "Fix broken javadocs." into oc-mr1-dev 2017-08-06 16:28:58 +00:00
Jeff Sharkey
67f9d5070a Fix broken javadocs.
Bug: 64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
2017-08-06 07:37:08 -06:00
Tomasz Wasilczyk
162d14a1ea Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1.
Bug: b/64229617
Test: instrumentation
Change-Id: Ib4b20a6ebdd05a51f1a30447ccc3c2357df2a35d
2017-08-04 15:22:52 -07:00
Tomasz Wasilczyk
0f1776d08b Pass vendor-specific info as map.
This solves a problem of identifying, if a given application is talking
to a hardware that can handle format of these strings.

Bug: b/64229617
Test: VTS, instrumentation
Change-Id: I6f525be90105bfdc01a899feea2a3151719ec8d2
2017-08-03 18:21:22 -07:00
Tomasz Wasilczyk
36ea87b075 Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev 2017-08-03 16:52:31 +00:00
Chien-Yu Chen
cd1cb83314 Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89
am: 615f9e1277

Change-Id: I9ea51423e88f90648f480c55d4567db6cee6ef98
2017-08-02 22:58:15 +00:00
Chien-Yu Chen
615f9e1277 Merge "camera2: Fix template requirements" into oc-dev
am: 2976109d89

Change-Id: I20b68b33caf48afeead56116602c6a9b2a33ab26
2017-08-02 19:56:55 +00:00
Tomasz Wasilczyk
8316291cda Address Broadcast Radio HAL review notes.
Bug: b/64229617
Test: instrumentation
Change-Id: I4325c7b2cef030ce900d23af9468591c2fc1a19e
2017-08-01 10:52:58 -07:00
Tomasz Wasilczyk
f299ab10e7 Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev 2017-08-01 17:43:02 +00:00