Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
213,679 Commits 3 Branches 0 Tags
d441dca72bfdf5cf4eb79fdd77b2fab0e4e598ff
Commit Graph

51593 Commits

Author SHA1 Message Date
Michael Wright
37c8bcbcc9 Merge "Add support for locking the screen when the lid is closed" am: 9dc3c36c9c 
am: 4d9e6190b1

* commit '4d9e6190b186f1d2e1cd25defd0d6e12dd833b38':
  Add support for locking the screen when the lid is closed
 2015-12-08 10:55:07 +00:00
Prashant Malani
54909b8e6b Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 am: 6344cb8144 
am: 3ebd5ceb90

* commit '3ebd5ceb90137572262efeda12cdce4b503ddded':
  Add rotary encoder input source
 2015-12-08 01:43:27 +00:00
Prashant Malani
3ebd5ceb90 Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 
am: 6344cb8144

* commit '6344cb8144647e4e49bc69cbf34a084ca7712115':
  Add rotary encoder input source
 2015-12-08 01:37:05 +00:00
Prashant Malani
487f0d3d15 Merge "Add rotary encoder input source" into cw-e-dev 2015-12-08 01:27:18 +00:00
Samuel Tan
e769f25fa4 Merge "Add support for reading and writing double array values" am: 61c0b7cd4d 
am: ff8ef28e73

* commit 'ff8ef28e73c0959a4993fea975d0bdefbc27a20b':
  Add support for reading and writing double array values
 2015-12-07 23:38:14 +00:00
Michael Wright
4d9e6190b1 Merge "Add support for locking the screen when the lid is closed" 
am: 9dc3c36c9c

* commit '9dc3c36c9cd796d90b65543567495d910d266e4c':
  Add support for locking the screen when the lid is closed
 2015-12-07 23:19:53 +00:00
Samuel Tan
ff8ef28e73 Merge "Add support for reading and writing double array values" 
am: 61c0b7cd4d

* commit '61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
  Add support for reading and writing double array values
 2015-12-07 23:15:15 +00:00
Michael Wright
9dc3c36c9c Merge "Add support for locking the screen when the lid is closed" 2015-12-07 21:34:59 +00:00
Samuel Tan
61c0b7cd4d Merge "Add support for reading and writing double array values" 2015-12-07 18:56:01 +00:00
Eino-Ville Talvala
dd00ed1554 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 am: e2d516fd4b 
am: 5794dbb1a5

* commit '5794dbb1a5f54b116911526c1086efda5dfb63f7':
  Camera: codegen doc update
 2015-12-04 16:36:06 -08:00
Eino-Ville Talvala
5794dbb1a5 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 am: 7417f70ac6 
am: e2d516fd4b

* commit 'e2d516fd4b77352919d1c40971678909e3f4a15d':
  Camera: codegen doc update
 2015-12-05 00:28:38 +00:00
Eino-Ville Talvala
7417f70ac6 Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d 
am: add4b91d41

* commit 'add4b91d41d3ba810b6b25c14d7c13050394f201':
  Camera: codegen doc update
 2015-12-05 00:11:43 +00:00
Eino-Ville Talvala
add4b91d41 Merge "Camera: codegen doc update" into mnc-dev 
am: 69c5e7143d

* commit '69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
  Camera: codegen doc update
 2015-12-04 16:03:23 -08:00
Edward Savage-Jones
7def60daa0 Add support for locking the screen when the lid is closed 
This commit adds configurable support for lockscreen
behaviour when the user has a device cover/lid.  This
is intended for lids with a viewing window so that the
user can see the time and interact with apps via the
window.

Change-Id: Id71883f66d1a180c4732912b3b59cabf9f4d7b6e
 2015-12-04 18:26:31 +01:00
Christine Hallstrom
c1a79e7bd2 Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am: 7fb263c472 am: 67d068b5ec 
am: 9355a0420e

* commit '9355a0420e3324ae42ac1a5ca108730c5990dcbf':
  Log API calls to createBond(), cancelBondProcess(), removeBond()
 2015-12-03 20:52:44 +00:00
Christine Hallstrom
9355a0420e Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am: 7fb263c472 
am: 67d068b5ec

* commit '67d068b5ec7ca3739047f0c5a162f9317171f784':
  Log API calls to createBond(), cancelBondProcess(), removeBond()
 2015-12-03 20:42:35 +00:00
Christine Hallstrom
044b8f3f03 Log API calls to createBond(), cancelBondProcess(), removeBond() 
In an attempt to better be able to debug Bluetooth-related parts of
the system, add info-level logging including calling process and
thread whenever the aforementioned functions are called.

Bug: 25996120
Change-Id: I5a72b2ab929f805ec1c43cc54879ed079a8dfe34
 2015-12-03 19:08:17 +00:00
Jeff Sharkey
a9c2218940 Merge "Avoid a double decrease of reference counter for unstable provider" am: e8651aed4b 
am: aae0a49c16

* commit 'aae0a49c164e9eeb19d46967c84697cd1a3a6783':
  Avoid a double decrease of reference counter for unstable provider
 2015-12-03 17:16:30 +00:00
Jeff Sharkey
630f658108 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789 
am: af588a31bc

* commit 'af588a31bc62b791014b3cc4e655107e9446e3d0':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:13:43 +00:00
Jeff Sharkey
aae0a49c16 Merge "Avoid a double decrease of reference counter for unstable provider" 
am: e8651aed4b

* commit 'e8651aed4b8a2c6703589069e26f5be750b2a947':
  Avoid a double decrease of reference counter for unstable provider
 2015-12-03 17:07:50 +00:00
Jeff Sharkey
af588a31bc Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
 2015-12-03 17:06:24 +00:00
Jeff Sharkey
e8651aed4b Merge "Avoid a double decrease of reference counter for unstable provider" 2015-12-03 16:59:58 +00:00
Jeff Sharkey
29e0b6e789 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 2015-12-03 16:59:13 +00:00
Ben Fennema
e9970bc981 Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" 
This reverts commit ad75169628.

Change-Id: Ic2f003fc200c077391d18bef9d5b79a98601769c
 2015-12-02 01:05:25 +00:00
Chad Brubaker
bb670fc3ea Merge "Expose findTrustAnchorBySubjectAndPublicKey" am: 6fea66116c 
am: 3c096b3a88

* commit '3c096b3a88617aa21bcb5cd1e496760f5898dd34':
  Expose findTrustAnchorBySubjectAndPublicKey
 2015-12-01 20:27:47 +00:00
Chad Brubaker
e83b773bf5 Merge "Make NetworkSecurityConfigProvider.install lazy" am: 73c06b1dbe 
am: a2388beca1

* commit 'a2388beca16898a1928fbf61a28aee2ff88ab46c':
  Make NetworkSecurityConfigProvider.install lazy
 2015-12-01 20:26:21 +00:00
Chad Brubaker
3c096b3a88 Merge "Expose findTrustAnchorBySubjectAndPublicKey" 
am: 6fea66116c

* commit '6fea66116c79ecb5232a1c7ae66ae2a6e62c1c12':
  Expose findTrustAnchorBySubjectAndPublicKey
 2015-12-01 20:21:35 +00:00
Chad Brubaker
a2388beca1 Merge "Make NetworkSecurityConfigProvider.install lazy" 
am: 73c06b1dbe

* commit '73c06b1dbe08b3fc3786a3fab007f26398111f6a':
  Make NetworkSecurityConfigProvider.install lazy
 2015-12-01 20:20:11 +00:00
Chad Brubaker
6fea66116c Merge "Expose findTrustAnchorBySubjectAndPublicKey" 2015-12-01 20:13:40 +00:00
Chad Brubaker
73c06b1dbe Merge "Make NetworkSecurityConfigProvider.install lazy" 2015-12-01 20:13:23 +00:00
Jani Suonpera
ad75169628 DO NOT MERGE ANYWHERE Add new interface for sensor physical data 
This is special solution only for emerald branch.

Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.

Change-Id: Id19226d7d3ac0628488a0f005f2b1c44bafcf9b6
Signed-off-by: Ben Fennema <fennema@google.com>
 2015-11-30 21:24:48 -08:00
Chad Brubaker
d3af962081 Expose findTrustAnchorBySubjectAndPublicKey 
This allows for faster lookups of TrustAnchors when checking pin
overrides without needing to iterate over all certificates.

Currently only the system and user trusted certificate store are
optimized to avoid reading the entire source before doing the trust
anchor lookup, improvements to the resource source will come in a later
commit.

This also refactors System/UserCertificateSource to avoid code
duplication.

Change-Id: Ice00c5e047140f3d102306937556b761faaf0d0e
 2015-11-30 17:20:00 -08:00
Yin-Chia Yeh
5fdf0a1af0 Camera: codegen doc update 
Bug: 25427163
Change-Id: I9e552a7ad365f2a45e5ebb74234b9dfb8eb1225c
 2015-11-30 14:25:37 -08:00
Samuel Tan
a8036660ea Add support for reading and writing double array values 
Add support for reading and writing double arrays in
Parcel.readValue() and Parcel.writeValue.

Also, remove some trailing whitespaces in Parcel.java.

BUG: 25848659
Change-Id: Ib5430f492df4195051b83d9bf2b5163ec684bbff
 2015-11-30 13:14:01 -08:00
Chad Brubaker
19c7afab62 Merge "Remove isCertificateEntry check" am: 7d72975c5b 
am: 59919babe0

* commit '59919babe0763980ae0a3977e2701ad2d81a6cbe':
  Remove isCertificateEntry check
 2015-11-29 23:56:01 +00:00
Chad Brubaker
59919babe0 Merge "Remove isCertificateEntry check" 
am: 7d72975c5b

* commit '7d72975c5b3e6f18710f078199e7a9e3f9376c60':
  Remove isCertificateEntry check
 2015-11-29 23:50:33 +00:00
Chad Brubaker
7d72975c5b Merge "Remove isCertificateEntry check" 2015-11-29 23:45:47 +00:00
Chad Brubaker
9a0130865e Remove isCertificateEntry check 
This was returning false on some test keystores even when
getCertificate would correct return a certificate. Remove the check to
be consistent with how conscrypt loads trust anchors from the keystore.

Bug: 25897324
Change-Id: Ie87658a261ee7ba1cca6896e34b6c53b8abfba85
 2015-11-26 14:00:50 -08:00
Chad Brubaker
2075a3ebc0 Make NetworkSecurityConfigProvider.install lazy 
This defers looking up the meta-data from the install call to when the
rest of the config is lazily initialized.

Change-Id: I008a86f885e158ebe06a2bacdc358cd217635d05
 2015-11-25 13:15:59 -08:00
Chad Brubaker
52ae900a29 Merge "Implement checkClientTrusted" am: 8e19803a6a 
am: a4a6cf9b51

* commit 'a4a6cf9b51e903087e2c7f77f2dcb814a0b43fb8':
  Implement checkClientTrusted
 2015-11-25 20:48:25 +00:00
Chad Brubaker
a4a6cf9b51 Merge "Implement checkClientTrusted" 
am: 8e19803a6a

* commit '8e19803a6a10ac44ca59cf15a2ae1f2eedb13cf8':
  Implement checkClientTrusted
 2015-11-25 20:41:03 +00:00
Chad Brubaker
bdd13f02bc Implement checkClientTrusted 
Bug: 25885029
Change-Id: I07ef11a556f1a1a65456ae5e3904c56902c6e82a
 2015-11-25 12:22:06 -08:00
Nicolas Geoffray
5462e46d23 Merge "Remove DEBUG_JIT from Zygote flags." am: cf49583bd0 
am: 5485d81578

* commit '5485d815788e4037829d70d041fe4fc1a35416f3':
  Remove DEBUG_JIT from Zygote flags.
 2015-11-18 17:21:41 +00:00
Nicolas Geoffray
5485d81578 Merge "Remove DEBUG_JIT from Zygote flags." 
am: cf49583bd0

* commit 'cf49583bd02d01b5d7aa57912d5469b466722c65':
  Remove DEBUG_JIT from Zygote flags.
 2015-11-18 10:54:19 +00:00
Nicolas Geoffray
cf49583bd0 Merge "Remove DEBUG_JIT from Zygote flags." 2015-11-18 10:47:50 +00:00
Nicolas Geoffray
245ec92b65 Remove DEBUG_JIT from Zygote flags. 
The flag is being obsolete by the move to JIT.

(cherry picked from commit 9abbf45c8d)

Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
 2015-11-18 10:07:53 +00:00
Rom Lemarchand
7d1428d7f3 resolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp. 
Change-Id: If4a565a262befdc3d6e206c892e2be9711d52c0f
 2015-11-17 15:38:50 -08:00
Chad Brubaker
1627a091f4 Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 
am: 97f92ce41e

* commit '97f92ce41e66b54e56733f18bdaae056f08c0ae7':
  Add NetworkSecurityConfigProvider.install
 2015-11-17 21:18:12 +00:00
Chad Brubaker
97f92ce41e Merge "Add NetworkSecurityConfigProvider.install" 
am: 08181cf647

* commit '08181cf647b1a1e440528f3f58ef6bf4e98a4832':
  Add NetworkSecurityConfigProvider.install
 2015-11-17 20:59:04 +00:00
Chad Brubaker
08181cf647 Merge "Add NetworkSecurityConfigProvider.install" 2015-11-17 20:46:49 +00:00