Commit Graph

1879 Commits

Author SHA1 Message Date
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
f9d9ce7705 DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.

Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
2016-05-17 18:02:32 +01:00
Chris Thornton
d9729d1df8 Fix NPE in KeyphraseEnrollmentInfo.toString()
If there are no enrollment applications on the system, but someone still
makes a KeyphraseEnrollmentInfo and tries to print it, it would generate
a NPE on a map object. Instead of setting the map to null when we don't
find any enrollment applications, we can just set it to an empty map.

Bug:28622866
Change-Id: I023e6fd90effd3143c19817a0d6637a013bebc31
2016-05-05 17:20:44 -07:00
Daniel Estrada Alva
60f2c17e27 Merge "Fixes on handling messages from apps to host." into nyc-dev 2016-04-29 19:24:18 +00:00
destradaa
6469c233fb Fixes on handling messages from apps to host.
- Ensure that app to host events are not filtered out
- Populates the app handle appropriately for clients to reference the
  nano app sending the event

Bug: 28273520
Bug: 28272149

Change-Id: I7373fc84abcadc2ab17109484f2d04b02a474593
2016-04-28 19:12:56 -07:00
Yin-Chia Yeh
0d7bddcbde Merge "Camera: codegen doc update (dynamic black level)" into nyc-dev 2016-04-27 20:40:27 +00:00
Peng Xu
7b0a3be001 Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev 2016-04-27 19:37:59 +00:00
Yin-Chia Yeh
a37d265df9 Camera: codegen doc update (dynamic black level)
Dynamic black level is capture result key.

Bug: 28276885
Change-Id: I3594813d0a46fc58fb55d9ed3e90266ce2033fd7
2016-04-26 14:03:29 -07:00
Peng Xu
b85b1fed45 Intialize Java Sensor object uuid in JNI
This fixed an "invoke method on null object" error, because of
Sensor.mUuid field is uninitialized.

Bug: 28305085
Change-Id: Ic0139986b3d623c198068585a411814ab4f5f83a
2016-04-22 22:23:05 -07:00
Yohei Yukawa
d67a1ca49b Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 2016-04-21 17:11:55 +00:00
Yohei Yukawa
46ac35d09b Accept null subtype in InputMethodSubtypeHandle.
There are two types of IMEs:
 A. IMEs that have one or more subtypes
 B. IMEs that have no subtype

The initial implementation to update hardware keyboard layout per
subtype change of layout (See Bug 25752812) has supported IMEs in the
category A only, and IMEs in the category B are just ignored in both
system and Settings app.

In order to support IMEs in the category B, InputMethodSubtypeHandle and
related methods need to accept null InputMethodSubtype. Technically
this is a straightforward change, because in InputMethodManagerService
we have already used InputMethodUtils.NOT_A_SUBTYPE_ID for those IMEs in
the category B.  We also need to update Setting App, which will be done
by a different CL [1].

  [1]: I46b9c5b018f08e3eaa4614a0893db0be91652f3c

Bug: 28182650
Change-Id: Ia013784a594ad3beaf30976d047f5ac0fa8185be
2016-04-20 16:59:45 -07:00
Eino-Ville Talvala
5856779c3a Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev 2016-04-20 23:55:11 +00:00
Eino-Ville Talvala
7e71896561 Camera2: Ignore exception on double-completed capture sequences.
As a workaround for b/27870771, convert fatal exception into a
warning.

Duplicate calls to finishPendingSequence with the same sequenceId
are seen in user crash reports, but with no further context and
inability to reproduce after testing various hypothesis, just
warn about it happening.

Bug: 27870771
Change-Id: Icd7d408887e04b94092689ce61809d6c664d8e3a
2016-04-20 15:05:40 -07:00
Jim Miller
54c4374b4a Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev 2016-04-20 21:33:15 +00:00
Jim Miller
8f2aca0ee4 Fix bug where fingerprint for wrong userId was attempted to be removed.
- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.

Fixes bug 28268635

Change-Id: I9507723c1a763152775f2feff76c16762f23cf2d
2016-04-20 13:34:11 -07:00
Daniel Estrada Alva
fdb26b90cb Merge "Add support for multiple callback registration in." into nyc-dev 2016-04-20 19:22:10 +00:00
Trevor Johns
59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev
2016-04-20 18:35:57 +00:00
destradaa
78cebca720 Add support for multiple callback registration in.
- Allows several callbacks from different processes to register with
  the ContextHub service.
- Add an 'internal' callback that can be used for primary clients.
- Fix issue with parceling NanoApp info

Change-Id: Iec203e8b8bc847cb9274f3f4157d0773984dd87c
2016-04-19 17:45:18 -07:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Keisuke Kuroyanagi
c81b726ed1 Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev 2016-04-19 04:11:16 +00:00
Narayan Kamath
a09b4d2a61 Remove unnecessary allocation+unboxing of objects.
Transforming String->int can be done with 0 allocations
using Integer.parseInt.

bug: 28078871
Change-Id: I8d9f322d7154728849dde61ef282046032858d60
2016-04-18 09:55:59 +01:00
Keisuke Kuroyanagi
07ff292dcd Define equals and hashCode for InputDeviceIdentifier.
This CL fixes that physical keyboard layout is not changed when user
changes it in settings.  This happened because we compare
InputDeviceIdentifier instances by using Object#equals to choose
specified input device. However, one of them has been serialized and
deserialized, so it never be true.

Bug: 27747115
Change-Id: Ied84c510ccb8e2de919ba8bb326e0355a065e604
2016-04-17 21:43:56 +09:00
Chien-Yu Chen
dfe920d3bb Merge "Camera2: Stop repeating request for abandoned output" into nyc-dev 2016-04-15 23:38:14 +00:00
Chien-Yu Chen
2da496f1ce Camera2: Stop repeating request for abandoned output
Stop repeating request if any of its output stream is abandoned
and notify that repeating request has been stopped.

Update binder tests for binder interface changes.

Update CameraDeviceImpl to expect an exception when canceling
a repeating request that is already stopped.

Bug: 21270879
Change-Id: I9fa72ae7218948aac88cb1a8e57839bd022c4a5e
2016-04-15 16:04:18 -07:00
Jim Miller
cb2ce6f1f0 Fix bug where fingerprint events can be delivered to the wrong client
- Make FingerprintService more closely track the expected state of fingerprintd.
- Don't switch to a new operation until fingerprintd completes previous operation.
- Refactor clients into separate classes and add tracking logic.
- Add missing enumerate()/cancelEnumeration() methods to IFingerprintDaemon
- Make late-binding decision of "foregroundness" of activity so that it's
decided in the order the events are actually handled.
- Add more logging so we can determine FingerprintService state when errors occur.
- Cache a copy of authenticator_id from the last time it was set so we don't
interrupt the driver during actual authentication.
- Don't allow clients to access authenticator_id unless they're current.

Fixes: 27902478, 26273819
Change-Id: Ic1f9e30bd89bcdbb8fe7f69e0545e68339317721
2016-04-14 17:53:45 -07:00
Zhijun He
15aac69c8f Merge "Camera: clarify lens shading map" into nyc-dev 2016-04-14 05:20:45 +00:00
Yin-Chia Yeh
11aade9f6e Merge "Camera: update expectation of post RAW sensitivity control" into nyc-dev 2016-04-13 20:33:48 +00:00
Zhijun He
43210fe2e8 Camera: clarify lens shading map
Lens shading correction should be full correction that
corrects both color shading and vignetting.

Bug: 18175853
Change-Id: Ia552345b2bd78b1b2eed2472096ebae80680d70b
2016-04-12 23:15:23 -07:00
Eino-Ville Talvala
777c4e7644 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 2016-04-13 00:08:09 +00:00
Eino-Ville Talvala
fa5e2a156d Camera/Surface: Update OutputConfiguration API
- Rename "surface set ID" to "surface group ID"
- Remove setSurfaceSetId
- Use constructor overloads to set surface group ID, make
  OutputConfiguration immutable
- Add Surface.getConsumerDescriptor to make it possible to verify
  if two Surfaces have the same backing consumer
- Cache initial surface generation ID in OutputConfiguration so that
  changes in a Surface's internals will label it is as a
  new output
- Add sample use case for surface group IDs

Bug: 27950763
Bug: 28076469
Change-Id: I13251d1dd3d26a978ffbedc519966524e93bc61c
2016-04-12 14:51:17 -07:00
Yin-Chia Yeh
33052d3359 Camera: update expectation of post RAW sensitivity control
Codegen update.

Bug: 27950762
Change-Id: Icff6086c8bb3961247e876d9caae45b95d31cbf8
2016-04-11 17:45:14 -07:00
Greg Kaiser
7c0393abdf Merge "NanoApp: Make indentation consistent" into nyc-dev 2016-04-11 21:21:37 +00:00
Greg Kaiser
1f3560e75e NanoApp: Make indentation consistent
Four spaces is our style standard.

Change-Id: I94f4493268e29b7de5d4fc0f5ef98637997b3957
2016-04-11 12:49:21 -07:00
Greg Kaiser
f4d380537a Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev 2016-04-11 17:23:48 +00:00
Chris Thornton
9e928c1f71 Merge "Support multiple Enrollment APKs" into nyc-dev 2016-04-11 16:40:43 +00:00
Greg Kaiser
cb83bd04b7 ContextHubManager: Avoid bad NanoApp objects
We provide a preferred constructor for the user which will
always generate a serializable NanoApp object.  While we
still support the other path, we throw a specific exception
when trying to serialize a bad NanoApp object to ease
debugging.

Change-Id: I7ee610f0fce2f0dd489526e4819f66035281024b
2016-04-11 08:27:10 -07:00
Zhijun He
b0fe2a9637 Merge "Camera2: update API per API council review" into nyc-dev 2016-04-08 23:30:41 +00:00
Zhijun He
0034743236 Camera2: update API per API council review
Per API concil recommendation, made below API change:
* change method name from createCaptureSessionByOutputConfiguration to
createCaptureSessionByOutputConfigurations
* Change method name from
createReprocessableCaptureSessionWithConfigurations to
createReprocessableCaptureSessionByConfigurations

Bug: 27950067
Change-Id: I8346d384210556a40bc2544c3660cc4819f304a1
2016-04-08 23:21:06 +00:00
Ricky Wai
f86f986728 Delete all work fingerprints when unified lock changes to None/Swipe
Bug: 27551139
Change-Id: Ida398a922d9c42e65001b0a10e13552505824d2d
2016-04-07 15:40:54 +00:00
Ashutosh Joshi
7d4a7fa333 Merge "Add dumpsys capabilities for context hub service" into nyc-dev 2016-04-07 14:00:49 +00:00
Ashutosh Joshi
6239cc6fe1 Add dumpsys capabilities for context hub service
Add useful debug hook for context hub service.
Fix constants
Use helper functions to address OS

Change-Id: Iba5f24a9a1fd809c3d83752953389d373ff334ca
2016-04-06 21:21:34 -07:00
Chris Thornton
1cba0696bd Support multiple Enrollment APKs
Previously, the KeyphraseEnrollmentInfo would iterate through the list
of Enrollment APKs and just use the first one for a list of supported
keywords (of which there only could be one). Now, all APKs will be
enumerated and the enrollment APK that provides the given
keyphrase/locale will be used for the enrollment intent.

Change-Id: I78b0ef758c6c024b5787603bba5907a646f3c3f1
2016-04-06 20:41:26 -07:00
Andrii Kulian
48143f7ec5 Merge "Caps Lock toggle with Meta + Alt (2/2)" into nyc-dev 2016-04-07 01:43:03 +00:00
Andrii Kulian
112d05678b Caps Lock toggle with Meta + Alt (2/2)
Caps Lock implementation in frameworks/base

Bug: 27482276
Change-Id: Ie0d8145c049197d4591e012832a710e4f751d2ac
2016-04-06 12:36:33 -07:00
Eino-Ville Talvala
255490c33c Merge "Camera: Null check remote binder interface" into nyc-dev 2016-04-06 01:19:13 +00:00