213170 Commits

Author SHA1 Message Date
Chad Brubaker
bdd13f02bc Implement checkClientTrusted
Bug: 25885029
Change-Id: I07ef11a556f1a1a65456ae5e3904c56902c6e82a
2015-11-25 12:22:06 -08: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
Alex Klyubin
d976c5a4ee Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
This makes Android Keystore's Cipher implementation use a custom
implementation of engineUpdate(ByteBuffer, ByteBuffer) and
engineDoFinal(ByteBuffer, ByteBuffer). The implementation is
explicitly designed around the fact that Android Keystore transmits
input and receives output via Binder and thus there's no need to
attempt any optimizations to avoid copying input and output.

Bug: 25863382
Change-Id: I311072891f02f5e7a283628b51b8d6058b55231c
2015-11-24 17:22:27 -08:00
Jim Kaye
e579edc76b Merge "Extend the \'qwerty\' key layout"
am: 9a83f115ad

* commit '9a83f115ade900a816f0fa2beae2cdd6f54bfc54':
  Extend the 'qwerty' key layout
2015-11-24 19:33:57 +00:00
Jim Kaye
9a83f115ad Merge "Extend the 'qwerty' key layout" 2015-11-24 19:27:46 +00:00
Sergio Giro
d9942006e4 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
am: d5a5d547d0

* commit 'd5a5d547d05eee9d626db1d7977c11acbf83b0c7':
  ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
2015-11-24 15:43:06 +00:00
Sergio Giro
d5a5d547d0 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" 2015-11-24 11:14:24 +00:00
Jim Kaye
b45d99d7d9 Extend the 'qwerty' key layout
Add the App Switch (Recents) key.
Add media control keys.

These are needed to support Emulator UI
buttons for these functions.

Change-Id: I3e9479bb49e21400f7bfd1435c50886038bbe0ff
2015-11-23 12:22:59 -08:00
Sergio Giro
46972b2d82 ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Needed by AbstractVerifier in framework/base

DistinguishedNameParser taken from libcore, commit
b5259fcf87994ee18658f07887156aef3cab3b56

Change-Id: I924dc7cd21262e5e91857edf178e46c9916f3f6b
2015-11-23 15:46:15 +00:00
riddle_hsu
40b300fd80 Fix race condition when collecting op callback.
Other threads may change mOpModeWatchers, mPackageModeWatchers
by startWatchingMode, stopWatchingMode.

Change-Id: Id260172979ddfc2df9331880805d16ee13e183eb
2015-11-23 13:22:03 +08:00
Chris Tate
b5a38f6da5 Merge "Don\'t back up / restore EAP network definitions"
am: 14a0981fde

* commit '14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
  Don't back up / restore EAP network definitions
2015-11-20 18:05:04 +00:00
Chris Tate
14a0981fde Merge "Don't back up / restore EAP network definitions" 2015-11-20 18:01:10 +00:00
Robin Lee
5145df278b DevicePolicy: Always send ACTION_PASSWORD_CHANGED
The old check looks a lot like an equality check, but it's not valid
because two passwords can share the same parameters.

For example:
  '11Aa' and
  'Y99z'

Are not different according to the old logic.

Bug: 25319928
Change-Id: Ia69861d9103670d1fc1dbf0130516e18e85e8de0
2015-11-19 19:45:44 +00:00
Nicolas Geoffray
9da4055766 Merge "Update framework code after new ART options."
am: d7d2817ade

* commit 'd7d2817ade8459a8f6872ff814d3208613502858':
  Update framework code after new ART options.
2015-11-19 15:54:21 +00:00
Nicolas Geoffray
d7d2817ade Merge "Update framework code after new ART options." 2015-11-19 15:48:01 +00:00
Nicolas Geoffray
cdf1dfff8f Update framework code after new ART options.
Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59
2015-11-19 14:31:23 +00:00
Christopher Tate
9bc2f472e9 Don't back up / restore EAP network definitions
Bug 25725016

Change-Id: Idfef9dd53f2403bbe4c950493a0ab8fa66a3b7d4
2015-11-18 13:42:04 -08:00
Andreas Gampe
a7e9f174c1 Merge "Frameworks/base: Make RuntimeAbort more expressive"
am: b61d3dd8a7

* commit 'b61d3dd8a773be393c738675cff28fc799497535':
  Frameworks/base: Make RuntimeAbort more expressive
2015-11-18 17:47:52 +00:00
Andreas Gampe
b61d3dd8a7 Merge "Frameworks/base: Make RuntimeAbort more expressive" 2015-11-18 17:16:59 +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 9abbf45c8dcdb2e5b13b615e5138ad996fe8afa3)

Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
2015-11-18 10:07:53 +00:00
Andreas Gampe
b053cce7ae Frameworks/base: Make RuntimeAbort more expressive
Pass a message to FatalError, which will be more prominent in
aborts than "RuntimeAbort."

Change-Id: Icb3b8f50ca0cc15fd1346c530cd8e6452e951879
2015-11-17 16:38:59 -08:00
Stephen Hines
5a0a713147 Merge "Remove unsupported RS graphics API tests."
am: 7ea808b177

* commit '7ea808b17736f690eb8d23729f33e9a612b0492c':
  Remove unsupported RS graphics API tests.
2015-11-17 22:28:45 +00:00
Stephen Hines
7ea808b177 Merge "Remove unsupported RS graphics API tests." 2015-11-17 22:16:35 +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
Svetoslav Ganov
60cb22008c Merge "Handle renamed packages during default grants"
am: 140b101fcd

* commit '140b101fcdbdf413b914b5625b19577784ad9d88':
  Handle renamed packages during default grants
2015-11-17 20:06:21 +00:00
Svetoslav Ganov
140b101fcd Merge "Handle renamed packages during default grants" 2015-11-17 19:55:37 +00:00
Svet Ganov
f443384d9e Handle renamed packages during default grants
If an L device has a privileged app on the system image which was
updated and an M OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.

bug:25687380

Change-Id: I4f2ebcaf471e4bd1696298eab4716b50c52ca5c4
2015-11-17 11:53:31 -08:00
Colin Cross
358ad4980f Merge "Vibra: Add loading of the vibrator hardware module."
am: 5603eca33c

* commit '5603eca33c8e322997029d3101fd2442df3c274e':
  Vibra: Add loading of the vibrator hardware module.
2015-11-17 19:51:57 +00:00
Colin Cross
5603eca33c Merge "Vibra: Add loading of the vibrator hardware module." 2015-11-17 19:31:19 +00:00
Chad Brubaker
e2caaea951 Merge "Dedupe trust anchors"
am: 690b5f6c0a

* commit '690b5f6c0a0820411d72235b11f75e1c87b24031':
  Dedupe trust anchors
2015-11-17 18:57:06 +00:00
Chad Brubaker
690b5f6c0a Merge "Dedupe trust anchors" 2015-11-17 18:51:38 +00:00
Eino-Ville Talvala
be1a3f8b66 Merge "Don\'t use timestamps with all zero"
am: 9574e58027

* commit '9574e58027f8edeb539ecedf2988c1a302887807':
  Don't use timestamps with all zero
2015-11-17 02:00:53 +00:00
Eino-Ville Talvala
9574e58027 Merge "Don't use timestamps with all zero" 2015-11-17 01:55:38 +00:00
Chad Brubaker
fd0d31a3f4 Add NetworkSecurityConfigProvider.install
This method is not currently called.

Change-Id: I73fd166b03009526868e0d9b5b209a9adaa4232f
2015-11-16 12:49:36 -08:00
Alex Klyubin
5995579f5f Merge "Insert Android Keystore JCA Provider at the correct position."
am: 887d348d7e

* commit '887d348d7ed5e1c2a1687eb774db46d571a8f43d':
  Insert Android Keystore JCA Provider at the correct position.
2015-11-16 20:22:51 +00:00
Alex Klyubin
887d348d7e Merge "Insert Android Keystore JCA Provider at the correct position." 2015-11-16 20:14:43 +00:00
Alex Klyubin
8e028e6507 Insert Android Keystore JCA Provider at the correct position.
Security.insertProviderAt uses 1-based positions whereas the
AndroidKeyStoreProvider.install code was incorrectly passing in
0-based positions, thus installing the AndroidKeyStoreBCWorkaround
provider one level higher than intended. This change fixes the issue
in AndroidKeyStoreProvider.

Bug: 25399691
Change-Id: I4a66bf37c0d151edb9a2349db9d91939064c0574
2015-11-16 10:11:50 -08:00
Mark Salyzyn
c53dad8d16 Merge "Revert "jni: is loggable speedup, not within signal""
am: 3c54ed00f3

* commit '3c54ed00f390e0ce9c555eb517594628b362705f':
  Revert "jni: is loggable speedup, not within signal"
2015-11-16 16:35:58 +00:00
Mark Salyzyn
3c54ed00f3 Merge "Revert "jni: is loggable speedup, not within signal"" 2015-11-16 16:30:57 +00:00
Mark Salyzyn
421d434818 Revert "jni: is loggable speedup, not within signal"
This reverts commit c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.

Bug: 25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
2015-11-16 16:26:44 +00:00
Calin Juravle
e20120031f Merge "Remove obsolete profile handling from AndroidRuntime."
am: 360e95a90d

* commit '360e95a90dab2c2522aa3ba13c6b2a3df737e626':
  Remove obsolete profile handling from AndroidRuntime.
2015-11-16 11:20:55 +00:00
Calin Juravle
360e95a90d Merge "Remove obsolete profile handling from AndroidRuntime." 2015-11-16 11:08:06 +00:00
Yang Ni
7ee861abae Merge "Various fixes in setting globals in a script group"
am: c011ffd842

* commit 'c011ffd84296700df4c28b9fc9fa84da9081de41':
  Various fixes in setting globals in a script group
2015-11-13 21:17:33 +00:00
Yang Ni
c011ffd842 Merge "Various fixes in setting globals in a script group" 2015-11-13 21:11:25 +00:00
Yang Ni
263cc90345 Various fixes in setting globals in a script group
Bug: 25602504

1) Passing floating point values into a script group was broken,
since they were casted to long values. Fixed that in the frameworks
implementation by taking the raw bits instead.

2) Passing 64-bit values into a script group was broken on 32-bit
platforms, since they were casted to pointer-sized integers
(uintptr_t) in the JNI code. Fixed that by casting to int64_t
instead.

3) Setting global variables of Allocation type in a script group was
broken. The special size value -1 was used to indicate the value is an
Allocation. However, size was casted to size_t in the JNI code.
Fixed that by using signed integers.

Change-Id: Ifff099a76be7707df7b67c388395f5a00f9cae66
2015-11-13 10:00:12 -08:00