drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
213,723 Commits 1 Branch 0 Tags
Commit Graph

213723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Fennema
7154bbf2d4 Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am: 4d70e6a3c0 -s ours am: 8780f07b5c -s ours 
am: ceec3dab7c  -s ours

* commit 'ceec3dab7cb7fcee6d367382fae11c9855263474':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
 2015-12-02 01:27:25 +00:00
Ben Fennema
ceec3dab7c Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev am: 4d70e6a3c0 -s ours 
am: 8780f07b5c  -s ours

* commit '8780f07b5c2a318cb28c172f9eac47b975793c90':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
 2015-12-02 01:20:15 +00:00
Ben Fennema
8780f07b5c Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev 
am: 4d70e6a3c0  -s ours

* commit '4d70e6a3c044c4e29d84835a026b3e70b44b66e8':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
 2015-12-02 01:12:04 +00:00
Ben Fennema
4d70e6a3c0 Merge "Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"" into cw-e-dev 2015-12-02 01:06:12 +00:00
Ben Fennema
e9970bc981 Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" 
This reverts commit ad75169628589a275fb869a813ea697336e0c0aa.

Change-Id: Ic2f003fc200c077391d18bef9d5b79a98601769c
 2015-12-02 01:05:25 +00:00
Ben Fennema
1b574b3d45 Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am: ec7180f733 -s ours am: b98383291f -s ours 
am: e90efd9153  -s ours

* commit 'e90efd91536b5bf7904336f78f258d63ba2cc904':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data
 2015-12-02 00:41:56 +00:00
Ben Fennema
e90efd9153 Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev am: ec7180f733 -s ours 
am: b98383291f  -s ours

* commit 'b98383291f32d0152cb291855aa00f016d526a4a':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data
 2015-12-02 00:34:14 +00:00
Ben Fennema
b98383291f Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev 
am: ec7180f733  -s ours

* commit 'ec7180f7333777582e642fc54f7106d500b7da33':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data
 2015-12-02 00:26:19 +00:00
Ben Fennema
ec7180f733 Merge "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" into cw-e-dev 2015-12-02 00:01:55 +00:00
Chris Elliott
1709832d47 Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2 am: c54aa0c3f7 
am: 767e2b39db

* commit '767e2b39db78e41241998b7b3941a15d68c6b4f2':
  MediaPlayer: Disable acquiring wakelocks based on property.
 2015-12-01 23:37:28 +00:00
Chris Elliott
767e2b39db Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev am: 50276adde2 
am: c54aa0c3f7

* commit 'c54aa0c3f7660a6a35c5ea396ef89f95eefb7c13':
  MediaPlayer: Disable acquiring wakelocks based on property.
 2015-12-01 21:27:33 +00:00
Chris Elliott
c54aa0c3f7 Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev 
am: 50276adde2

* commit '50276adde24c55394c0023ef49d01f054303dc87':
  MediaPlayer: Disable acquiring wakelocks based on property.
 2015-12-01 21:19:54 +00:00
Chris Elliott
50276adde2 Merge "MediaPlayer: Disable acquiring wakelocks based on property." into cw-e-dev 2015-12-01 21:12:15 +00:00
Chad Brubaker
725fefb38a Use a custom TrustedCertificateStore 
Providing a TrustedCertificateStore to TrustManagerImpl avoids loading
all of the trusted certificates into memory and indexing them. This
is mainly for the system certificate store where loading all of the
store into memory is wasteful for most applications.

Change-Id: I9e6057f6a13d38ea7762fcac2f62bd3ff475af39
 2015-12-01 12:44:57 -08: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
Bryce Lee
155a44cee0 Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 085796bdf5 -s ours am: 4ecf963e77 -s ours 
am: 8f95fe4b71  -s ours

* commit '8f95fe4b71b54ee920d71b6b689b0e7f53994f00':
  DO NOT MERGE ANYWHERE
 2015-12-01 15:57:07 +00:00
Bryce Lee
8f95fe4b71 Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 085796bdf5 -s ours 
am: 4ecf963e77  -s ours

* commit '4ecf963e770e0226c3fcef509ff5d7fb6c31ed0b':
  DO NOT MERGE ANYWHERE
 2015-12-01 15:50:14 +00:00
Bryce Lee
4ecf963e77 Merge "DO NOT MERGE ANYWHERE" into cw-e-dev 
am: 085796bdf5  -s ours

* commit '085796bdf5e106abd42db2d0ef7d3aee899a766b':
  DO NOT MERGE ANYWHERE
 2015-12-01 15:43:15 +00:00
Bryce Lee
085796bdf5 Merge "DO NOT MERGE ANYWHERE" into cw-e-dev 2015-12-01 15:37:30 +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
Bryce Lee
0ca7de9031 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am: 52bdf11583 am: b241487c16 
am: 64e41590d2

* commit '64e41590d246cf1fc548b72d40436bcd2fca7b06':
  Add callback for connections to be notified when the ringer is silenced.
 2015-11-30 19:09:17 +00:00
Bryce Lee
64e41590d2 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am: 52bdf11583 
am: b241487c16

* commit 'b241487c16976a3f0aa6592740bba15f489eab17':
  Add callback for connections to be notified when the ringer is silenced.
 2015-11-30 19:02:38 +00:00
Bryce Lee
b241487c16 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev 
am: 52bdf11583

* commit '52bdf11583366322ca14d69b895ac451a71245db':
  Add callback for connections to be notified when the ringer is silenced.
 2015-11-30 18:56:27 +00:00
Bryce Lee
52bdf11583 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev 2015-11-30 18:51:39 +00:00
Erik Wolsheimer
48543000e0 fix data race condition BUG: 25819358 am: 2242b4d2bd am: 1dbb0355dc 
am: 1d92c4538f

* commit '1d92c4538f8ed43a2e9c1e6d4694ddb3fb058741':
  fix data race condition BUG: 25819358
 2015-11-30 17:35:20 +00:00
Erik Wolsheimer
1d92c4538f fix data race condition BUG: 25819358 am: 2242b4d2bd 
am: 1dbb0355dc

* commit '1dbb0355dc89a9f878365ee793ec48f6cb0b1426':
  fix data race condition BUG: 25819358
 2015-11-30 17:28:44 +00:00
Erik Wolsheimer
1dbb0355dc fix data race condition BUG: 25819358 
am: 2242b4d2bd

* commit '2242b4d2bda7f83cf7813103ff95d9b4e244126f':
  fix data race condition BUG: 25819358
 2015-11-30 17:22:56 +00: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
Christopher Wiley
a94fc52437 Map Errors.h's UNEXPECTED_NULL to NullPointerException 
Many native services reject null references with this status_t.
Map it to an appropriate exception for Java Binder clients.

Bug: 25615695
Change-Id: I16a4f44da35839892fc4d332f95382f06485b2a7
 2015-11-28 14:25:35 -08: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
8e19803a6a Merge "Implement checkClientTrusted" 2015-11-25 20:33:31 +00:00
Chad Brubaker
bdd13f02bc Implement checkClientTrusted 
Bug: 25885029
Change-Id: I07ef11a556f1a1a65456ae5e3904c56902c6e82a
 2015-11-25 12:22:06 -08:00
Alex Klyubin
0540e1b127 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." am: e766e399c5 
am: 4bc1904119

* commit '4bc1904119875dd0e8c63f87106e8ab293cc9a7a':
  Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
 2015-11-25 19:13:21 +00:00
Alex Klyubin
4bc1904119 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." 
am: e766e399c5

* commit 'e766e399c59669156284c330ae3f38f79230d930':
  Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
 2015-11-25 19:05:09 +00:00
Alex Klyubin
e766e399c5 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." 2015-11-25 18:59:35 +00:00
Yury Zhauniarovich
4fab7fbeb0 Improved variable naming 
Variable name "appOpPerms" is substituted to "appOpPkgs", which is better
suited.

Change-Id: I038b93fdf5e539551c4aab12d9918c9937602e2d
Signed-off-by: Yury Zhauniarovich <y.zhalnerovich@gmail.com>
 2015-11-25 17:53:20 +03:00