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

176774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Klyubin
f265bdbfc7 am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests." 
* commit 'd1af38a4783c1c0d1a5b7c76a7583beb02a88462':
  Use JCA names for block modes, paddings, and digests.
 2015-04-13 17:22:07 +00:00
Alex Klyubin
33454dd569 No need to specify EC curve name in EcIesParameterSpec. 
EC curve parameters will be obtained from the provided EC key.

Bug: 18088752
Change-Id: Ic99353a6566c8d4ce2b6b73d0309edaa40f84fa6
 2015-04-13 10:20:24 -07:00
Alex Klyubin
d1af38a478 Merge "Use JCA names for block modes, paddings, and digests." 2015-04-13 17:01:30 +00:00
Alex Klyubin
5927c9f1b1 Use JCA names for block modes, paddings, and digests. 
This replaces int-based enums from KeyStoreKeyConstraints with
String values commonly used in JCA API.

As part of under the hood refactoring:
* KeyStoreKeyCharacteristics and KeyStoreKeyConstraints have been
  merged into KeyStoreKeyProperties.
* KeymasterUtils methods operating on KeymasterArguments and
  KeymasterCharacteristics have been moved to their respective
  classes.

Bug: 18088752
Change-Id: I9c8b984cb3c28184adb617e34d87f2837bd1d3a1
 2015-04-13 09:59:04 -07:00
Wale Ogunwale
110919d995 am bd59764a: am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider" 
* commit 'bd59764a2c20deeebe945c5008abf9a62df09a1e':
  Clean-up state if we have an exception when acquiring provider
 2015-04-13 04:56:21 +00:00
Wale Ogunwale
bd59764a2c am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider" 
* commit '8f0e0c1f3d7c02dff6fe4877477af583e490e6ee':
  Clean-up state if we have an exception when acquiring provider
 2015-04-13 04:46:31 +00:00
Wale Ogunwale
8f0e0c1f3d Merge "Clean-up state if we have an exception when acquiring provider" 2015-04-13 04:25:29 +00:00
Geoff Mendal
dd804d908d am 55295c76: (-s ours) am 08c21adc: (-s ours) Import translations. DO NOT MERGE 
* commit '55295c76fd43930da196f4275c9f6e27b756692c':
  Import translations. DO NOT MERGE
 2015-04-11 10:08:46 +00:00
Geoff Mendal
55295c76fd am 08c21adc: (-s ours) Import translations. DO NOT MERGE 
* commit '08c21adc91058e97ee6761cfd3a250b64f567d39':
  Import translations. DO NOT MERGE
 2015-04-11 09:59:00 +00:00
Geoff Mendal
3de3bb22a6 Import translations. DO NOT MERGE 
Change-Id: Ia69d7347d0e753efa924d1b61b416b08affa3329
Auto-generated-cl: translation import
 2015-04-10 23:14:36 -07:00
Geoff Mendal
08c21adc91 Import translations. DO NOT MERGE 
Change-Id: I239fc7724d745a1abbac73e673ecfe408ce17c9b
Auto-generated-cl: translation import
 2015-04-10 23:07:04 -07:00
Alex Klyubin
651dbfde73 am ad48c4c9: am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto." 
* commit 'ad48c4c9c194d66dcc96e74e906825ca7b550e24':
  Add EcIesParameterSpec to enable ECIES crypto.
 2015-04-11 02:45:17 +00:00
Alex Klyubin
ad48c4c9c1 am c1c6528d: Merge "Add EcIesParameterSpec to enable ECIES crypto." 
* commit 'c1c6528d2b686d5a17e577e7864a319dcba7c224':
  Add EcIesParameterSpec to enable ECIES crypto.
 2015-04-11 02:35:45 +00:00
David Friedman
d34b20e957 am a22125ff: am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit 'a22125ff98085c0fe662966cadfe4c889707db54':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 02:27:01 +00:00
Alex Klyubin
c1c6528d2b Merge "Add EcIesParameterSpec to enable ECIES crypto." 2015-04-11 02:17:01 +00:00
David Friedman
a22125ff98 am 23b5e508: am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '23b5e508adfb454552fda16d76d65b070a53f759':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 02:15:48 +00:00
David Friedman
23b5e508ad am 340a617e: am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '340a617ef42951446bbc730833cea207370307d0':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 02:05:57 +00:00
David Friedman
340a617ef4 am 746fed63: am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '746fed63567c548c7b55c14e1532d059753bfa52':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 01:55:32 +00:00
David Friedman
746fed6356 am 3a77a8ae: Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 
* commit '3a77a8aeea1a40ca5c2cdb0b66a877032118d89f':
  New build rule reflecting different masthead, side nav for NDK minisite.
 2015-04-11 01:46:19 +00:00
David Friedman
3a77a8aeea Merge "New build rule reflecting different masthead, side nav for NDK minisite." into lmp-docs 2015-04-11 01:36:57 +00:00
Mathieu Chartier
d92c6bde3f Update "Investigating your RAM usage" for ART 
Bug: 19884954
Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56
 2015-04-10 18:34:51 -07:00
Chad Brubaker
93976df800 am 3a9779b6: am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth" 
* commit '3a9779b6edf9b118d8907a8124cd53c05f72aa00':
  Fix testSaw_ungrantedUid_Bluetooth
 2015-04-10 22:17:00 +00:00
Chad Brubaker
3a9779b6ed am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth" 
* commit '386c4e9ea976377d87950427472a593c22b1b205':
  Fix testSaw_ungrantedUid_Bluetooth
 2015-04-10 22:09:18 +00:00
Shawn Willden
c88e1396db am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable" 
* commit '99f4ac144506d307b38ab112d1054e5fe18a7217':
  Make several key crypto parameters repeatable
 2015-04-10 22:01:15 +00:00
Alex Klyubin
0ee9376ef4 Add EcIesParameterSpec to enable ECIES crypto. 
Bug: 18088752
Change-Id: I597b019106c500188e0fbbc9608722668c08b421
 2015-04-10 14:57:28 -07:00
Shawn Willden
99f4ac1445 am 97fce66f: Merge "Make several key crypto parameters repeatable" 
* commit '97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f':
  Make several key crypto parameters repeatable
 2015-04-10 21:51:22 +00:00
Chad Brubaker
386c4e9ea9 Merge "Fix testSaw_ungrantedUid_Bluetooth" 2015-04-10 21:42:23 +00:00
Shawn Willden
97fce66f7d Merge "Make several key crypto parameters repeatable" 2015-04-10 21:21:37 +00:00
Chad Brubaker
6a5af8cf14 Fix testSaw_ungrantedUid_Bluetooth 
Keystore.saw returns [] on no result, not null, so the test was
incorrectly failing.

Change-Id: I22dcf85c5d6c5c0368848bc784c3215c092d9ea8
 2015-04-10 14:15:17 -07:00
Olawale Ogunwale
448cb9f9ee am 6159f6eb: am 4406568e: Merge "Check caller status precisely when registering receiver." 
* commit '6159f6eb231028bc6420edf4157fb335e78aca00':
  Check caller status precisely when registering receiver.
 2015-04-10 20:48:21 +00:00
Olawale Ogunwale
6159f6eb23 am 4406568e: Merge "Check caller status precisely when registering receiver." 
* commit '4406568ebac6f6bbf627aeb6909b409d948cecf4':
  Check caller status precisely when registering receiver.
 2015-04-10 20:37:00 +00:00
Olawale Ogunwale
4406568eba Merge "Check caller status precisely when registering receiver." 2015-04-10 20:14:54 +00:00
Bryce Lee
e0233e7e11 am 73b56873: am eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled. 
* commit '73b56873f1c39d29bc9f98e727b83b05bb74a44d':
  Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
 2015-04-10 20:02:01 +00:00
Bryce Lee
73b56873f1 am eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled. 
* commit 'eccaf7290ab833d12049a184747603cd74261490':
  Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
 2015-04-10 19:51:32 +00:00
Chad Brubaker
59f977c698 Make several key crypto parameters repeatable 
Bug: 19509156
Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
 2015-04-10 12:20:04 -06:00
Alex Klyubin
d31d4771d9 am c5f9683c: am a270264c: Merge "Track more changes to keymaster_defs.h" 
* commit 'c5f9683c065e6ddf906a354603d19ce57448993f':
  Track more changes to keymaster_defs.h
 2015-04-10 18:18:42 +00:00
Alex Klyubin
c5f9683c06 am a270264c: Merge "Track more changes to keymaster_defs.h" 
* commit 'a270264c61daa42a5b03bbb1e7f23e77780f8fc0':
  Track more changes to keymaster_defs.h
 2015-04-10 18:09:27 +00:00
Alex Klyubin
a270264c61 Merge "Track more changes to keymaster_defs.h" 2015-04-10 17:51:49 +00:00
Nick Kralevich
12a597a2bc am a55ec9c2: am 08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects." 
* commit 'a55ec9c2abfd8a8bd216f133ec925e9db1d69ae7':
  Impose an ordering on created SELinuxMMAC Policy objects.
 2015-04-10 16:42:25 +00:00
Wale Ogunwale
73e239bdc9 Clean-up state if we have an exception when acquiring provider 
We can get a number of exceptions (e.g. SecurityException) when
a process is acquiring a provider. We need to clean-up correctly
so that other threads that try to acquire the provider the progress.

Bug: 20122809
Change-Id: Icac1d391df7e8c24198be89035b1c5a23da834cf
 2015-04-10 09:32:26 -07:00
Nick Kralevich
a55ec9c2ab am 08d76a94: Merge "Impose an ordering on created SELinuxMMAC Policy objects." 
* commit '08d76a946b898af28f3c8125cdf4966195b718fb':
  Impose an ordering on created SELinuxMMAC Policy objects.
 2015-04-10 16:31:23 +00:00
Nick Kralevich
08d76a946b Merge "Impose an ordering on created SELinuxMMAC Policy objects." 2015-04-10 16:10:27 +00:00
Alex Klyubin
55f7c2770f Track more changes to keymaster_defs.h 
KeyStoreTest needed to be adjusted because OCB is no longer supported.

Bug: 18088752
Change-Id: I7594daaa5e97423d34726b07cc79e3ee28418d95
 2015-04-10 08:58:38 -07:00
John Reck
18ae2a020d am 32eafe9b: am a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited." 
* commit '32eafe9b715b08453eea213d7dcad174ac5e80d2':
  Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
 2015-04-10 15:55:33 +00:00
John Reck
6b6645c895 am 1a595833: am d56e087b: Merge "Fixing memory leak in RenderBufferCache" 
* commit '1a5958331ef5f51d7722682d7e980204a1c50a04':
  Fixing memory leak in RenderBufferCache
 2015-04-10 15:55:27 +00:00
John Reck
32eafe9b71 am a08f6a66: Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited." 
* commit 'a08f6a66e91c7bacd50e64c039aaaa6b9fe2625c':
  Fix GL_INVALID_OPERATION in font renderer when font cache is limited.
 2015-04-10 15:44:34 +00:00
John Reck
1a5958331e am d56e087b: Merge "Fixing memory leak in RenderBufferCache" 
* commit 'd56e087b550f7ee351f15ac6c5ff9d57a08387fc':
  Fixing memory leak in RenderBufferCache
 2015-04-10 15:44:26 +00:00
riddle_hsu
b15506f95e Check caller status precisely when registering receiver. 
Fine tune commit 9ac9609f.
Because process may reuse same process record to restart.
It is better to check below conditions to skip:
1. Simple dead and has been cleaned.
 => .thread will be null
2.The process has restarted with new pid but has not attached yet.
 => .thread will be null
3.The process has restarted and attached.
 => The IBinder will be different

Change-Id: Ic052f5025558ca93e1a6ab11bca61fe995126bb9
 2015-04-10 15:41:19 +00:00
John Reck
a08f6a66e9 Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited." 2015-04-10 15:32:01 +00:00
John Reck
d56e087b55 Merge "Fixing memory leak in RenderBufferCache" 2015-04-10 15:27:02 +00:00