Commit Graph

1943 Commits

Author SHA1 Message Date
Android Build Merger (Role)
c2cfe453f2 [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc
Change-Id: I19c512999a0eae233e2cc7c4d31d0c62556e4ffd
2018-07-06 22:55:14 +00:00
Android Build Merger (Role)
77e6e34644 [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4
Change-Id: I26b97af90ef6ea8b640ff7198b2883297d4fb03e
2018-07-06 22:55:02 +00:00
Android Build Merger (Role)
2895b320b4 [automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a
Change-Id: Ieb925f073b80e4d624552e738d49b0996f0485ae
2018-07-06 22:54:55 +00:00
Arthur Ishiguro
abe5a73a4a Resolve inconsistent parcel read in NanoAppFilter
Bug: 77599679
Test: Compile only
Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266
2018-07-06 22:54:52 +00:00
Dave Friedman
f125662db1 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb
am: 2d642f9e2d

Change-Id: I5257f51a37e6e45a928befea94b2ecdb0cf01f45
2017-04-13 17:19:36 +00:00
Dave Friedman
4eff74f8cb Docs: Fixes broken link in Javadoc. am: df0fd34d50
am: 506a8b39fb

Change-Id: If60b7db71fe92508daaec1255c637927432d7b55
2017-04-13 17:00:44 +00:00
Dave Friedman
506a8b39fb Docs: Fixes broken link in Javadoc.
am: df0fd34d50

Change-Id: I76ed5361426065d5e532c5a11c2d11f28ba8c2d7
2017-04-13 16:48:41 +00:00
Dave Friedman
df0fd34d50 Docs: Fixes broken link in Javadoc.
Bug: 37198106
Change-Id: If005bf563f7bd97f794261e03d46c7b092955a89
2017-04-10 14:50:24 -07:00
Charles He
15b8313d1b Merge "Fingerprint: get auth id for non-current user." into nyc-mr2-dev 2017-02-07 01:15:24 +00:00
Charles He
aae60473e1 Fingerprint: get auth id for non-current user.
Previously, getAuthenticatorId() simply returns the authenticator id
corresponding to the currently active user in FingerprintService.
However, this can cause bugs when, for example, KeyStore calls the
method before storing a fingerprint-bound key for a non-current user. In
such cases, the authenticator id of the calling user is desired, which
is not necessarily the same as the "current user" in FingerprintService.
This CL ensures the FingerprintService always returns the authenticator
id of the calling user.

Bug: 33459191
Test: manual
Change-Id: Ia9d6b869d16bd37f45358ba839cd12901ebc1076
Merged-In: I35c5a3a7082cffb8941eeaa219c8e20948ad41a9
2017-02-07 01:02:51 +00:00
Justin Klaassen
614f40ea01 Remove experimental twilight-based automatic brightness
Bug: 31602449
Test: verified adaptive brightness no longer varies with twilight with
"brightness_use_twilight" set to "1".

Merged-In: I6b5f7310020b2128c2b292414a205b6052270a0a
Change-Id: Ife9bf6d0f76df791cb7e6a22505d9f551da19731
2017-02-02 09:23:49 -08:00
Elliot Waite
de2557f369 Fix @links in reference docs. am: 54de77470d
am: ab978c035e

Change-Id: Ibec2b85708f9ff923156f4d867c9c2f71c75d41c
2017-01-26 04:39:53 +00:00
Elliot Waite
54de77470d Fix @links in reference docs.
Change-Id: I40cea46efd80c448640ff69753698fe8404da40b
2017-01-25 17:00:55 -08:00
Jerry Zhang
4882496232 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Bug: 31814300
Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit 7a396be6d5)
2017-01-24 13:26:51 -08:00
Santos Cordon
d6a5660a2c Add Brightness setting for VR Mode.
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.

Bug: 30984614
Change-Id: If3c3e81b592e0c6fd037e5783559683e5cb58379
2017-01-09 17:33:14 -08:00
Selim Cinek
966045d070 DO NOT MERGE Revert "Add Brightness setting for VR Mode."
This reverts commit 84980c7a93.

Bug: 33895226
Bug: 30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
2016-12-27 18:28:40 +00:00
Santos Cordon
84980c7a93 Add Brightness setting for VR Mode.
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.

Bug: 30984614
Merged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
2016-12-22 23:26:49 +00:00
Philip P. Moltmann
5201f1e61c Do not access MTP devices when disabled.
The USB data transfer is disabled we should not allow access MTP devices
(e.g.
usb sticks). We have two ways of accessing them: Either by mounting them
or by creating a MTPDevice in an app.

Of course an app could implement implement their own MTPDevice
implementation. In this case we cannot enforce the policy without
completely suppressing all MTP USB devices which would be too
restrictive.

Note: When the policy is set we do _not_ disconnect already connected
MTP devices

Fixes: 31472955
Change-Id: I6080c48c49657102774b2b3b4d89ff030245a266
2016-09-30 22:24:23 +00:00
Eino-Ville Talvala
4e3bb26f64 Merge "DngCreator: Do not cache timezone in static initializer" into nyc-mr1-dev 2016-09-28 21:20:21 +00:00
Eino-Ville Talvala
ec727411d2 DngCreator: Do not cache timezone in static initializer
The static initializer for a pre-loaded framework class is run
no later than at zygote startup, which happens at device boot.

Which means that if the timezone later changes, DngCreator will use
an incorrect cached timezone until the next reboot.  This is especially
evident in freshly wiped devices, where initial setup will typically
change the timezone.

Instead, read the timezone each time DngCreator is created, which is
also when we query the current time for constructing the timestamps.

Test: android.hardware.camera2.cts.DngCreatorTest#testSingleImageThumbnail
Bug: 31743060
Change-Id: I83a4eac762650e5f904f3b8fa779c094cef30562
2016-09-28 11:10:00 -07:00
Greg Kaiser
1983f9b05b ContextHubService: Hack around 32-bit app ID
The NanoApp.java class has a bug (b/30808791) where the API treats
app IDs as 32-bits, instead of 64-bits.  We are too late in the
Android N release cycle to change this API.

We previously put in a hack to fix this only for Google nanoapps.
However, our GTS nanoapps need this to work, and there are other
partners who need this to work in the N timeframe.  So we make
a more robust hack which parses the full 64-bit app ID out of
the header binary.

Test: Compiles and runs GTS
Bug: 31767599
Change-Id: Ic43f1f62c685fb99aac08d08767d1a67c329503f
2016-09-27 15:01:48 -07:00
Chien-Yu Chen
dd6629ef86 Camera2: Support early finished tasks
Add support to track finished tasks before it starts.

Bug: 30117138
Change-Id: I42eb0377f719d57d820d9c1b2484600116c8807a
2016-09-23 17:23:45 -07:00
Eino-Ville Talvala
3fc21ef78b DngCreator: Fix calculation of date/time stamps
Converting the sensor timestamp to date/time requires checking
what the timebase of those timestamps is; getting it wrong will
create drift that increases with device uptime.

Test: android.hardware.camera2.cts.
      DngCreatorTest#testSingleImageThumbnail
Bug: 30125412
Change-Id: Ia5db86012bc9e1c06463b8dc4434d3e063f62cf5
2016-09-18 17:11:41 -07:00
Greg Kaiser
143aaa6d05 Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev 2016-08-29 17:43:31 +00:00
Brian Duddie
73f511e471 Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev 2016-08-26 18:20:19 +00:00
Greg Kaiser
5817ce0c13 ContextHubService: Hack in Google vendor value
To workaround b/30808791 without changing the NanoApp API,
we make the assumption that if the most significant byte
of our four-byte app ID is a lower-case 'L', then this
is a Google Nanoapp and thus we should use "Googl" for
our vendor ID, and set the most significant four bytes
of our eight byte app ID accordingly.

Bug: 30922112
Change-Id: I155dff58cdda1ef36a68e6d25df1e9059b1252f1
2016-08-25 23:18:16 -07:00
Greg Kaiser
f8d61675ac Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev 2016-08-26 03:34:39 +00:00
Greg Kaiser
1e07e392c3 Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev 2016-08-26 03:30:19 +00:00
Greg Kaiser
3be73d3950 ContextHubManager: Document InstanceInfo bug
Our getNanoAppInstanceInfo() method returns incorrect information
for several fields in many cases.  We're too late in the release
cycle to fix the core of this issue, but we can at least document
it so users aren't surprised.

Bug: 30944457
Change-Id: I9330c3b77d08c36befbe20258c6cc45dc640f103
2016-08-19 11:09:01 -07:00
Greg Kaiser
3907049080 NanoAppFilter: Workaround HubId issues
There's no API to set mContextHubId, but testMatch() uses this.

We can't add API at this point of the release cycle, so instead
we default mContextHubId to HUB_ANY, which makes it always match.

Bug:30018518
Change-Id: I4e08afc65889dc109a4da1bd99a027345da865ca
2016-08-19 11:04:32 -07:00
Greg Kaiser
fac5be2ace ContextHubManager: Fix API documentation.
Most notably, the loadNanoApp() claimed it was returning the
nano app instance handle on success, when it actually was just
returning 0 on success.

Bug: 30475803
Change-Id: I436255f0103a743a02f40c41ee4c6f653d007d89
2016-08-19 11:02:10 -07:00
Greg Kaiser
fe6d4f518a ContextHubService: Don't double report app loads
Our logs would show us loading apps twice, when in reality we
load them once, and then update our caches with the app
version later.

There are other issues around how this code works (for example,
b/30970527), but this is an appropriate approach at this
stage of the release.

Bug: 30836667
Change-Id: I2e2a65bc8a2ef4d1703df0a0586a8ed251607af7
2016-08-19 10:24:07 -07:00
Yin-Chia Yeh
58b4623d1f Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev 2016-08-11 00:32:15 +00:00
Yin-Chia Yeh
b0025e1f68 Camera: ensure lock ordering (device->session)
On close/abort calls, which are more likely to run in parallel
with CameraDevice APIs.

Bug: 30742426
Change-Id: I6550283d1026373d48bb730164e65b25c7037bab
2016-08-10 12:50:19 -07:00
Jim Miller
837fa7e56d Bind fingerprint when we start authentication
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.

Fixes bug 30744668

Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
2016-08-08 20:16:22 -07:00
TreeHugger Robot
f8bc27d968 Merge "Rename color transform to color mode and persist the value." into nyc-mr1-dev 2016-07-20 17:21:35 +00:00
Kevin Hufnagle
87a8e5eebd Merge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52 am: b9487874fe
am: 55b52a2b3f

Change-Id: I8c9a6fe4778a3344e8c6270f865567ba4bf05dbb
2016-07-20 01:28:59 +00:00
Kevin Hufnagle
55b52a2b3f Merge \\\\"docs: Updated descriptions of device orientation angles.\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52
am: b9487874fe

Change-Id: I034ce5c4a115fa4b694569c66a7e764543191cf7
2016-07-20 01:20:20 +00:00
Kevin Hufnagle
b9487874fe Merge \\\"docs: Updated descriptions of device orientation angles.\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d
am: a812012c52

Change-Id: Ifff8f0ca783a601dab3b4968a0e9708e34aa83f4
2016-07-20 01:12:40 +00:00
Michael Wright
1c9977b762 Rename color transform to color mode and persist the value.
Also, standardize on a set of possible modes for the displays to
enter and separate the configuration of the color mode from the
configuration of the display mode.

Bug: 29044347

Change-Id: I6af0a7d1f11bc72d4cefc380f115c1fb00788864
2016-07-18 19:49:18 +01:00
Ashutosh Joshi
118644056f Loading NanoApps now works.
Fixing transaction handling for loading/unloading nanoApps.

Bug: 30165105
Change-Id: I540243d730040e70b2d104ccd9ea5a0baaa0d97d
2016-07-15 13:46:22 -07:00
Ashutosh Joshi
54787a5f9f Add state for loading/unloading apps
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.
Fix Build Breakage due to uninitalized variables.

Bug: 29193948
Change-Id: Ibebecf704bb3ad2583e110f1fcf05400a53b1b4c
2016-07-13 15:28:16 -07:00
Mark Lu
3e15a43732 Merge \"docs: fixed broken link in UsbManager javadocs\" into nyc-dev
am: 162a6fad72

Change-Id: If11947a089756b7ca72f6a579d4b1cbe54535185
2016-07-11 20:20:31 +00:00
Eino-Ville Talvala
62deabcc4f Camera2: Add @hide variant for openCamera for UID forwarding
Trusted services may open a camera device on behalf of some client
of theirs; such services need to forward the UID of their client to
the camera service for validation of permissions, etc.

Add a variant of openCamera that makes this simple, only accessible
to unbundled services for now.  Only services explicitly trusted
by the camera service can pass an argument other than USE_CALLING_UID
to this method.

Bug: 27616192
Change-Id: Idb06112201b805a8b5c979b5f0761fec1c6994a3
2016-07-08 12:11:11 -07:00
Mark Lu
8b739903a9 docs: fixed broken link in UsbManager javadocs
Bug: 29236606
Change-Id: I07fc82d741c106b6a679b7881757d4293359d384
2016-06-28 11:27:23 -07:00
Peng Xu
0ad55d5769 Merge \"Sensor: Make getId() more varied\" into nyc-dev
am: 94b61cb340

Change-Id: I896ed5531533d55bd1ed3f2e3f21d21be04a1f5f
2016-06-23 03:32:46 +00:00
Peng Xu
716866d565 Sensor: Make getId() more varied
Apps from different developers will now receive a different
ID for the same dynamic sensor.  Additionally, all apps
will now receive a different/new ID for the same dynamic
sensor after a factory reset.

Bug: 28775590, 29547335
Change-Id: I15b48b974cbb1d53cc33dfdb7b9eb5f1b562190c
2016-06-22 13:28:29 -07:00
Adrian Roos
9918234dcf Enable tap-to-pulse only when needed
- Adds InputManager.setPulseEnabled().
- Adds a config overlay for the file controlling touch-to-pulse.
- Hooks up DreamManagerService with InputManager.setPulseEnabled().

Bug: 29253550
Change-Id: I4892311cc30e97d31f7be778930397fbe5c03945
2016-06-20 08:59:48 -07:00
Brian Duddie
93a2410f2d Merge \"Send VR mode notification to AR app on context hub\" into nyc-dev
am: 9a31e8be48

Change-Id: Ied704de01ddc2b9754a5a2d88b7b9624d711dd11
2016-06-15 21:28:52 +00:00
Brian Duddie
c3d8a529c6 Send VR mode notification to AR app on context hub
Bug: 28793778
Change-Id: I7417ba7f696dc61689687bd56b165a81aea1715a
2016-06-15 11:36:09 -07:00