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

176642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Craig
4caa6b1efb Impose an ordering on created SELinuxMMAC Policy objects. 
Imposing an order on Policy objects allows us to extend the
policy writers ability to union mac_permissions.xml files.
Policy developers can now create new mac_permissions.xml
entries under their device specific directories. This is
in contrast to current methods which only allow differing
stanzas to appear outside the base mac_permissions.xml.

Also, report on stanzas with duplicate input selectors and
treat these as errors. There are some ambiguities that can
arise otherwise.

Lastly, impose an XOR condition on signer stanzas w.r.t seinfo
and package tags. This finer distinction helps the union feature
of policy to become clearer and simpler to code.

Change-Id: Idd86df8ad9a63d1b8ba6e8270670814ca6cee8d2
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2015-04-10 11:14:37 -04:00
Tim Murray
72fcf9eb10 am af61d43d: am 6d718c2f: Merge "Add support for setting the cache directory." 
* commit 'af61d43d6ce065832f906757c2185c3dad74d489':
  Add support for setting the cache directory.
 2015-04-10 01:30:14 +00:00
Tim Murray
af61d43d6c am 6d718c2f: Merge "Add support for setting the cache directory." 
* commit '6d718c2f43f6be057f9a519bc02f6b123405b79d':
  Add support for setting the cache directory.
 2015-04-10 01:07:26 +00:00
Tim Murray
6d718c2f43 Merge "Add support for setting the cache directory." 2015-04-10 00:51:15 +00:00
Tim Murray
47f31582b6 Add support for setting the cache directory. 
Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
 2015-04-09 17:50:39 -07:00
Alex Klyubin
037dfb9423 am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes." 
* commit '5f8c17b9f6d574eca6a24ddb2f7cc98a37f5aaea':
  Track recent keymaster_defs.h changes.
 2015-04-10 00:35:55 +00:00
Alex Klyubin
5f8c17b9f6 am ba2836e6: Merge "Track recent keymaster_defs.h changes." 
* commit 'ba2836e6cf5a00855e470705741d9e4b9b1a9df9':
  Track recent keymaster_defs.h changes.
 2015-04-10 00:22:45 +00:00
Alex Klyubin
04a99c7b44 am 82cba6aa: am c6eb6288: Merge "Split key origin into TEE/not and generated/imported." 
* commit '82cba6aa3792b7d3b7eddf32c64cbf4a7a47e5a5':
  Split key origin into TEE/not and generated/imported.
 2015-04-10 00:06:25 +00:00
Alex Klyubin
ba2836e6cf Merge "Track recent keymaster_defs.h changes." 2015-04-10 00:01:19 +00:00
Alex Klyubin
862e6c7814 Track recent keymaster_defs.h changes. 
Bug: 18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
 2015-04-09 16:58:58 -07:00
Alex Klyubin
82cba6aa37 am c6eb6288: Merge "Split key origin into TEE/not and generated/imported." 
* commit 'c6eb62882b09cf06e1e70c14e7878593d1a76477':
  Split key origin into TEE/not and generated/imported.
 2015-04-09 23:55:47 +00:00
Mathieu Chartier
6951d555c2 am 56a6d371: am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" 
* commit '56a6d371bd4978bb7dfa7cce8bfbcc0bb13abd93':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
 2015-04-09 23:47:20 +00:00
Mathieu Chartier
56a6d371bd am da164973: Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" 
* commit 'da164973f35aa32e44d0b9336deef28df5b13544':
  Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"
 2015-04-09 23:36:06 +00:00
Alex Klyubin
c6eb62882b Merge "Split key origin into TEE/not and generated/imported." 2015-04-09 23:34:45 +00:00
Mathieu Chartier
da164973f3 Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"" 2015-04-09 23:14:28 +00:00
Mathieu Chartier
537691fc2d Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category" 
Example output of "adb shell dumpsys meminfo -d":

Total PSS by category:
   193605 kB: Dalvik
               87561 kB: .Heap
               77863 kB: .LOS
               15333 kB: .Zygote
               12848 kB: .NonMoving
                6770 kB: .GC
                2597 kB: .LinearAlloc
                1180 kB: .JITCache
                1180 kB: .IndirectRef
   103936 kB: EGL mtrack
   101827 kB: Native

Bug: 17643507

(cherry picked from commit 546edc5a31bb5a843048e11d8afb0b1f6441ddb4)

Change-Id: If34627cf93ba5305b428d2278f350a2649d63d5e
 2015-04-09 15:53:17 -07:00
Alex Klyubin
b503c52f07 Split key origin into TEE/not and generated/imported. 
This is to match the upcoming changes in Keymaster HAL API.

Bug: 18088752
Change-Id: I602d56d1c29a839583be1d9efa681a6fab6642db
 2015-04-09 15:50:17 -07:00
Jeff Sharkey
84debe2761 am e0001185: am 1d3c77a2: Merge "Start passing volume UUID to installd." 
* commit 'e000118549c10deaf17c27a14efa866184127b6d':
  Start passing volume UUID to installd.
 2015-04-09 22:07:29 +00:00
Alex Klyubin
4acc3392c3 am 8676a88e: am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore." 
* commit '8676a88e60ed342cfb5c576aef80960976e3c396':
  Fix minor issues in new Javadocs of AndroidKeyStore.
 2015-04-09 22:07:18 +00:00
Jeff Sharkey
e000118549 am 1d3c77a2: Merge "Start passing volume UUID to installd." 
* commit '1d3c77a21e9c8fc59200b42503d9f0effd3f1551':
  Start passing volume UUID to installd.
 2015-04-09 21:57:41 +00:00
Alex Klyubin
8676a88e60 am 97d2d7c4: Merge "Fix minor issues in new Javadocs of AndroidKeyStore." 
* commit '97d2d7c42752a52b5fe890cdb9a5dcbbf53837cc':
  Fix minor issues in new Javadocs of AndroidKeyStore.
 2015-04-09 21:57:35 +00:00
Jeff Sharkey
1d3c77a21e Merge "Start passing volume UUID to installd." 2015-04-09 21:41:12 +00:00
Alex Klyubin
97d2d7c427 Merge "Fix minor issues in new Javadocs of AndroidKeyStore." 2015-04-09 21:41:00 +00:00
Alex Klyubin
7882a7fcd4 Fix minor issues in new Javadocs of AndroidKeyStore. 
Bug: 18088752
Change-Id: Ie84cc6066c82f2659da17a1eb158c2e3acf5094d
 2015-04-09 14:33:11 -07:00
Jeff Sharkey
790a4ecac7 Start passing volume UUID to installd. 
This change adds new method overloads to provide volume UUID.  The
older methods remain for now, and pass through the "null" UUID to
reference internal storage.

Follows the existing pattern where null arguments are passed as "!".

Bug: 19993667
Change-Id: Ia1b7c8550cabc13e4f6e1182eabb650f2c33e44f
 2015-04-09 14:19:07 -07:00
Alex Klyubin
098833c59d am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API." 
* commit 'ec01623b0b456c9e8f43123f1f96fb2330a6615f':
  Add asymmetric crypto constants for AndroidKeyStore API.
 2015-04-09 20:24:28 +00:00
Alex Klyubin
c6112eb705 am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names." 
* commit '21c4e465f6a4783a9356bf1d88bda42192af022f':
  Add missing mapping between JCA and keystore HMAC names.
 2015-04-09 20:24:22 +00:00