Commit Graph

1931 Commits

Author SHA1 Message Date
Michael Wright
bc702e5d42 Merge commit \'f8bc27d9683e4089cdfd778dcb61ae67f44665b7\' into manual_merge_f8bc27d
am: 49bcc5dd80

Change-Id: Iee2a7015eefd6a75be2968ec855334f68ec5f79e
2016-07-20 18:49:43 +00: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
8af36d225d Merge \\\\\\\"docs: Updated descriptions of device orientation angles.\\\\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52 am: b9487874fe am: 55b52a2b3f am: 87a8e5eebd
am: 6aa834498b

Change-Id: I9eb2556d72919f43e84336d57b6276028669f627
2016-07-20 03:02:15 +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
d51413ec49 Merge \\"Loading NanoApps now works.\\" into nyc-mr1-dev am: 095979b463
am: 820ab55e1c

Change-Id: Ib92f140990ed577483bcafdbdc87118f2528144e
2016-07-15 23:28:28 +00: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
5bcbe74198 Merge \"Merge \\"Add state for loading/unloading apps\\" into nyc-mr1-dev am: 2e42020eab\" into nyc-mr1-dev-plus-aosp
am: 5c99851d23

Change-Id: I0f52f1406840b9ddcfe9dd30c19c5ea01755039f
2016-07-13 23:46:22 +00:00
Ashutosh Joshi
0ce29c421e Merge \\"MediaPlayer: fix typo for OnInfoListener.\\" into nyc-mr1-dev am: ebc3c9ca3f
am: 3ed59e2fda

Change-Id: Ib10558712b5e7abe1b0a853eceb4c20beacd6153
2016-07-13 23:31:13 +00: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
Ashutosh Joshi
f6029bbbcf Revert "Add state for loading/unloading apps"
This reverts commit 00b351aeef.

Change-Id: Iee229adff8fec4f2407aa895886e63953f0d7d32
2016-07-13 22:15:19 +00:00
Ashutosh Joshi
49805052e8 Merge \\"Add state for loading/unloading apps\\" into nyc-mr1-dev am: a980cba4d8
am: f4ba21c420

Change-Id: I51c696280b4fd322cde7f4701bbf6b0042a7ab3e
2016-07-13 22:03:05 +00:00
Ashutosh Joshi
00b351aeef Add state for loading/unloading apps
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.

Bug: 29193948

Change-Id: I700f3bdbb8e84413455751dec02a812a639421b3
2016-07-13 12:29:19 -07:00
Mark Lu
9204bedc4a Merge \"Merge \\\"docs: fixed broken link in UsbManager javadocs\\\" into nyc-dev am: 162a6fad72 am: e67f00705f\" into nyc-mr1-dev-plus-aosp
am: 1a7791a1df

Change-Id: Id6f4e9bd53a64a03bb0339404e3dbc5c880e3fcc
2016-07-12 02:02:44 +00:00
Mark Lu
d6be96c21d Merge \\"docs: fixed broken link in UsbManager javadocs\\" into nyc-dev am: 162a6fad72
am: e67f00705f

Change-Id: I69478885b31789008b411c5ec3a06d820efcca3f
2016-07-11 20:28:17 +00: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
6d5c9de640 Merge \\"Camera2: Add @hide variant for openCamera for UID forwarding\\" into nyc-mr1-dev am: 8c22370331
am: 9b74b46034

Change-Id: I870e4adb3377dcd9ef4d51f15c7ebe23ef1b78e1
2016-07-08 21:21:43 +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
132c67b56f Merge \\\"Sensor: Make getId() more varied\\\" into nyc-dev am: 94b61cb340 am: 72c538707c
am: 15ad0dacbc

Change-Id: Ica9e7b68a791c13a5ccf90aff70a5f0e2c4d92b2
2016-06-23 03:44:48 +00:00
Greg Kaiser
15ad0dacbc Merge \\"Sensor: Make getId() more varied\\" into nyc-dev am: 94b61cb340
am: 72c538707c

Change-Id: Ied341984f903d341544be1bb0bf212a6ca34e059
2016-06-23 03:37:58 +00: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
53fe1b98fd Merge \"Merge \\"Enable tap-to-pulse only when needed\\" into nyc-mr1-dev am: d94a40f46d\" into nyc-mr1-dev-plus-aosp
am: 6ffddc03b7

Change-Id: I82b7c5fe4cd8178e1e8860fa02fd03aa69a0c00a
2016-06-20 18:52:06 +00: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
916e86e6fb Merge \\\"Send VR mode notification to AR app on context hub\\\" into nyc-dev am: 9a31e8be48 am: 93a2410f2d
am: a9edc2edf2

Change-Id: Ia356dd1453a4ebf320d3ce01dc6b4596c3507433
2016-06-15 23:07:10 +00: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
Eino-Ville Talvala
60687a729d Merge changes I069e2b7e,Ic5e9e58a into nyc-dev am: f4de8dd77c am: 2c21b5b651
am: be84d6da6c

Change-Id: Ieedb39cccef5223b1ef914d8f4f795e42861d8ae
2016-06-10 20:17:16 +00:00
Eino-Ville Talvala
2c21b5b651 Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
am: f4de8dd77c

Change-Id: I439643be2fd5699f1a98d8ca15d14167ea3ffde1
2016-06-10 20:02:20 +00:00
Eino-Ville Talvala
50eebe057b Camera2: Fix error codes for CameraDevice.StateCallback.onError()
Existing code assumed that ICameraDeviceCallbacks and
CameraDevice.StateCallback have the same error code values for matching
errors.

They do not.

Also remove duplicate error code definitions now present in the AIDL
file for ICameraDeviceCallbacks.

Bug: 29248704
Change-Id: I069e2b7ef3be7887634e128f1accb50b7558f3fd
2016-06-10 10:28:34 -07:00
Eino-Ville Talvala
4a2c7c5549 Camera2: Protect MarshalRegistry against concurrent access
Multiple CameraMetadataNative objects could be reading and writing
to the metadata marshaler registry simultaneously.

This can lead to an infinite loop in the HashMap in the worst case,
so add synchronization against this.

Bug: 29043079
Change-Id: Ic5e9e58a9333b99b4bea87bf790c9fbfadfbbea9
2016-06-10 10:28:34 -07:00
Michael Wright
93b5f434a4 Remove Pointer Capture API
The underlying implementation needs to be completely rethought. If a
process crashed while you were in pointer capture mode, you were
pretty much stuck in it. If the mouse happened to move outside of
your bounds right before you called the API, you'd never actually get
an event (whatever it was hovering over would). There's no easy way
for the system to tell you when you enter or exit this mode because
it doesn't actually track who the current request is from.

These are all solvable, but not in the N time frame. Maybe next time.

Bug: 26830970
Change-Id: I899649594c7ca8db5962fcdaa71c5b21d3aa42c3
2016-06-08 20:13:53 +00:00
Michael Wright
e051f6f1fd Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: I1be541a53e3943d06640169671824f7daea15462
2016-06-04 02:20:21 +01:00
Eino-Ville Talvala
bb133d595a Merge "Camera2: Update lensShadingMap documentation" into nyc-dev am: cd44a32dfe am: 02c43050af
am: 33c4afd13b

* commit '33c4afd13bd7875d598ebb1b0851ea06f07bf831':
  Camera2: Update lensShadingMap documentation

Change-Id: I4fc3e9d505bcb55b0a88f1056ed84a98140eb2fd
2016-06-03 18:17:36 +00:00
Eino-Ville Talvala
02c43050af Merge "Camera2: Update lensShadingMap documentation" into nyc-dev
am: cd44a32dfe

* commit 'cd44a32dfe6a5a39db496af6de7764e164cda6f5':
  Camera2: Update lensShadingMap documentation

Change-Id: I8011b348ebc133ab6664db5948066ded857d5285
2016-06-03 18:01:57 +00:00
Zhijun He
5745f4ce55 Merge "Camera2: add deferred output config support" into nyc-mr1-dev am: e8526a0105
am: f103fd540e

* commit 'f103fd540e54dddc370aa1049424a7644c889e08':
  Camera2: add deferred output config support

Change-Id: I7662286b333ccce5e18399fd84efb07e167936ea
2016-06-03 02:14:59 +00:00
Zhijun He
c8b181e95d Camera2: add deferred output config support
Allow surfaces to be deferred during session creation. Once the surfaces are ready,
the application can finish the deferred output configuration to be able to submit
requests with these surface targets.

Bug: 28323863
Change-Id: Id6634c3ef2ecc84422a88f63de0a19a0cb496e96
2016-06-02 17:30:20 -07:00
Eino-Ville Talvala
c62cea89ce Camera2: Update lensShadingMap documentation
Revert added language about shading map being the full flat-field
correction; it's actually the same correction as applied to camera
device-processed data.

Also fix a few other wording issues in the lens shading documentation.

Bug: 18175853
Change-Id: I27691925e6496afe18f3506084d89f2523b5555d
2016-06-02 14:21:27 -07:00
Michael Wright
28984d4d80 Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev
am: c396f0f70e

* commit 'c396f0f70ef40ea0fb42a0872a13f4c4e9a6a5f0':
  DO NOT MERGE Remove Pointer Capture API

Change-Id: I77cb742feacdd3b8af0cf33d4e7ab246f776417f
2016-05-26 14:38:56 +00:00
Michael Wright
c396f0f70e Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev 2016-05-26 14:03:47 +00:00
TreeHugger Robot
e1b53d7cab Merge "Add missing @Deprecated annotations." 2016-05-25 17:46:40 +00:00
Aurimas Liutikas
514c5ef8d5 Add missing @Deprecated annotations.
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.

Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
2016-05-24 15:22:55 -07:00
Johan Torås Halseth
f9d7e99834 Merge "Adding grantPermission for packageName" into nyc-mr1-dev am: b1f0e9705d
am: df296a7e68

* commit 'df296a7e68d1de4817d5176466e244b06b39a285':
  Adding grantPermission for packageName

Change-Id: Ibaa0ab46b56d1de9a0aa1a56b8e4c780239dae26
2016-05-24 22:13:56 +00:00
Johan T. Halseth
244259a063 Adding grantPermission for packageName
Adding a hidden API in UsbManager for system services to grant
permissions to a specific package for a USB device without showing a
user dialog.

Bug: 28760255
Change-Id: Ie68cfc784b7894e9db12ab61bab0f7e6bfa369e3
2016-05-24 22:34:35 +01:00
TreeHugger Robot
a1e0cebf3a Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev 2016-05-19 15:03:36 +00:00
Yohei Yukawa
23cbe85610 Move LocaleList to avoid layering violation.
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.

Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Michael Wright
778e3b91ac DO NOT MERGE Remove Pointer Capture API
The underlying implementation needs to be completely rethought. If a
process crashed while you were in pointer capture mode, you were
pretty much stuck in it. If the mouse happened to move outside of
your bounds right before you called the API, you'd never actually get
an event (whatever it was hovering over would). There's no easy way
for the system to tell you when you enter or exit this mode because
it doesn't actually track who the current request is from.

These are all solvable, but not in the N time frame. Maybe next time.

Bug: 26830970
Change-Id: I03efd63c499b86dc278491ca3284566c1965581f
2016-05-17 18:02:37 +01:00