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

56423 Commits

Author SHA1 Message Date
Chad Brubaker
f1870eee34 Merge "Expose findByIssuerAndSignature" 
am: b27d820920

* commit 'b27d8209206e0aad76a257636417341c6f69fbb5':
  Expose findByIssuerAndSignature
 2015-12-09 21:05:50 +00:00
Chad Brubaker
b27d820920 Merge "Expose findByIssuerAndSignature" 2015-12-09 20:52:50 +00:00
Chad Brubaker
cea1cf0185 Merge "Refactor NetworkSecurityPolicy to be pluggable" 
am: 224318aa13

* commit '224318aa13ad5b78d19087cc42dcbe2ae0bd0c3f':
  Refactor NetworkSecurityPolicy to be pluggable
 2015-12-09 18:54:06 +00:00
Chad Brubaker
224318aa13 Merge "Refactor NetworkSecurityPolicy to be pluggable" 2015-12-09 18:40:55 +00:00
Christopher Wiley
b7b3415899 Merge "Rethrow remote\'s ServiceSpecificException" 
am: 85eaca25fe

* commit '85eaca25fe2a89f883e9a87d8f411cfb315f3e03':
  Rethrow remote's ServiceSpecificException
 2015-12-08 23:26:40 +00:00
Christopher Wiley
85eaca25fe Merge "Rethrow remote's ServiceSpecificException" 2015-12-08 23:15:52 +00:00
Chad Brubaker
6568cf185d Refactor NetworkSecurityPolicy to be pluggable 
This allows us to keep the logic for the NetworkSecurityPolicy in the
framework instead of in libcore.

Change-Id: I4bf494f79c27729cb17d93d90a91319492270ce9
 2015-12-08 13:38:43 -08:00
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
6344cb8144 Merge "Add rotary encoder input source" into cw-e-dev 
am: 487f0d3d15

* commit '487f0d3d1556296ef53c449d7ec5de5a0dac1f83':
  Add rotary encoder input source
 2015-12-08 01:31:31 +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
Amit Mahajan
0dfeda60c0 Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev am: cd2cc9aa9b 
am: d515b124f7

* commit 'd515b124f7f966a3e4725dc6f6179ade869df636':
  Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
 2015-12-07 23:32:22 +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
Amit Mahajan
d515b124f7 Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev 
am: cd2cc9aa9b

* commit 'cd2cc9aa9bfdc21a06ffd7049a4b4ad07bbf6886':
  Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
 2015-12-07 23:10:55 +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
Amit Mahajan
cd2cc9aa9b Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev 2015-12-07 18:15:38 +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
e2d516fd4b Merge "Camera: codegen doc update" into mnc-dev am: 69c5e7143d am: add4b91d41 
am: 7417f70ac6

* commit '7417f70ac6aa6a59ab67bac959ce39aa3372e0ef':
  Camera: codegen doc update
 2015-12-04 16:20:47 -08: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
Christopher Wiley
80fd1208b9 Rethrow remote's ServiceSpecificException 
Certain system services would like to throw exceptions
with specific error codes, so that the framework can catch
these specific conditions and express them appropriately.

Bug: 25800533
Change-Id: I94b3d30fa131f5e14bba893c971615840085459f
 2015-12-04 16:06:08 -08: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
67d068b5ec Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev 
am: 7fb263c472

* commit '7fb263c472c9df98410b2b9dfe72e093e2d594e0':
  Log API calls to createBond(), cancelBondProcess(), removeBond()
 2015-12-03 20:35:39 +00:00
Yohei Yukawa
d42df4f68e Merge "Fix special handling of a fake language code "tl"." am: 9fd2af6b32 
am: 30e321b54a

* commit '30e321b54a589d33dc7f2dd7344bef95faaaf83d':
  Fix special handling of a fake language code "tl".
 2015-12-03 19:18:45 +00:00
Yohei Yukawa
30e321b54a Merge "Fix special handling of a fake language code "tl"." 
am: 9fd2af6b32

* commit '9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
  Fix special handling of a fake language code "tl".
 2015-12-03 19:10:30 +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
Yohei Yukawa
9fd2af6b32 Merge "Fix special handling of a fake language code "tl"." 2015-12-03 19:04:24 +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
Yohei Yukawa
ed65bc0c62 Fix special handling of a fake language code "tl". 
My previous CL 92280cd309 [1] had a silly
mistake that "tl" is converted to "fil" but "tl_PH" is not.

  [1] I94f203bddceb9c87710cb187cc3cc0ee6d9092a5

With this CL, the compatibility rewrite-rule from "tl" to "fil" starts
working regardless of the existence of countly/variant subtags in locale
string.  So far the only affected platfrom is API Level 23.

Bug: 20696126
Change-Id: Ica9cd2baac002c406f92331aadd7725d7424046a
 2015-12-02 18:22:41 -08: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
fa9beebb83 Expose findByIssuerAndSignature 
This will be used to create a custom conscrypt TrustedCertificateStore
to avoid loading all of the trusted certificates into memory in a
keystore.

Change-Id: Iaf54b691393ecadae6c7ff56b8adc6a2a2923d29
 2015-12-01 12:19:39 -08: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