summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "BatteryStats: Adds an additional condition to avoid ↵Ruchi Kandoi2015-04-141-1/+1
|\ | | | | | | ArrayIndexOutOfBounds."
| * BatteryStats: Adds an additional condition to avoidRuchi Kandoi2014-07-081-1/+1
| | | | | | | | | | | | | | | | | | ArrayIndexOutOfBounds. This change takes care of the case when the length of the array is 0. Bug: 16039301 Change-Id: Ideb3ccc723c5d720069760aeedae8abb91c6420d
* | Merge "Add a name to ScriptGroup2.Builder.create method"Yang Ni2015-04-131-1/+5
|\ \
| * | Add a name to ScriptGroup2.Builder.create methodYang Ni2015-04-131-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | The name is not used in any meaningful way yet, but would be used to name the file for generated code for fused kernels in other coming CLs. A script group name cannot be null or empty, or longer than 100 characters. It can only contain letters, digits, '-', or '_'. Change-Id: I95fdbf58e6689da91ca98c2057dfa1a803d3b27b
* | Merge "Use JCA names for block modes, paddings, and digests."Alex Klyubin2015-04-1317-1446/+1151
|\ \
| * | Use JCA names for block modes, paddings, and digests.Alex Klyubin2015-04-1317-1446/+1151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Clean-up state if we have an exception when acquiring provider"Wale Ogunwale2015-04-131-24/+42
|\ \ \
| * | | Clean-up state if we have an exception when acquiring providerWale Ogunwale2015-04-101-24/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Add EcIesParameterSpec to enable ECIES crypto."Alex Klyubin2015-04-111-0/+287
|\ \ \ \
| * | | | Add EcIesParameterSpec to enable ECIES crypto.Alex Klyubin2015-04-101-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: I597b019106c500188e0fbbc9608722668c08b421
* | | | | Merge "Fix testSaw_ungrantedUid_Bluetooth"Chad Brubaker2015-04-101-2/+2
|\ \ \ \ \
| * | | | | Fix testSaw_ungrantedUid_BluetoothChad Brubaker2015-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keystore.saw returns [] on no result, not null, so the test was incorrectly failing. Change-Id: I22dcf85c5d6c5c0368848bc784c3215c092d9ea8
* | | | | | Merge "Make several key crypto parameters repeatable"Shawn Willden2015-04-101-6/+6
|\ \ \ \ \ \
| * | | | | | Make several key crypto parameters repeatableChad Brubaker2015-04-101-6/+6
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 19509156 Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
* | | | | | Merge "Check caller status precisely when registering receiver."Olawale Ogunwale2015-04-101-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Check caller status precisely when registering receiver.riddle_hsu2015-04-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Track more changes to keymaster_defs.h"Alex Klyubin2015-04-102-27/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Track more changes to keymaster_defs.hAlex Klyubin2015-04-102-27/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyStoreTest needed to be adjusted because OCB is no longer supported. Bug: 18088752 Change-Id: I7594daaa5e97423d34726b07cc79e3ee28418d95
* | | | | Merge "Impose an ordering on created SELinuxMMAC Policy objects."Nick Kralevich2015-04-101-53/+164
|\ \ \ \ \
| * | | | | Impose an ordering on created SELinuxMMAC Policy objects.Robert Craig2015-04-101-53/+164
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge "Fix GL_INVALID_OPERATION in font renderer when font cache is limited."John Reck2015-04-101-0/+2
|\ \ \ \ \
| * | | | | Fix GL_INVALID_OPERATION in font renderer when font cache is limited.chaochen2014-08-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/17332126 This patch is to fix a false logic in FontRenderer when flashAllAndInValidate() happens. The flashAllAndInvalidate will trigger an issueDrawCommand which will set mDrawn to true even though there is no texture drawn. So that the step of unbinding buffer in GL is skipped. And when the second time issueDrawCommand get called, the glVertexAttribPointer will be trigger with GL_ARRAY_BUFFER wrongly bound and then finally lead to a GL_INVALID_OPERATION when glDrawElements() in FontRenderer:issueDrawCommand get called the second time. Change-Id: I1a996354a84db911ace0e7b39ca77cd0dd3d1555 Signed-off-by: Raj Mamadgi <r.mamadgi@samsung.com>
* | | | | | Merge "Fixing memory leak in RenderBufferCache"John Reck2015-04-101-0/+5
|\ \ \ \ \ \
| * | | | | | Fixing memory leak in RenderBufferCacheSamsung2014-09-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In our devices with higher resolution we have observed a memory leak in the HWUI code. When there is GC or tree modification and buffer size is greater than the default size, we make sure buffer is deleted. Change-Id: Idf7052ccaf43c8a784ce0e7bdab336dca29bffd8 Signed-off-by: Samsung <aosp@samsung.com>
* | | | | | | Merge "Add support for setting the cache directory."Tim Murray2015-04-102-0/+26
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add support for setting the cache directory.Tim Murray2015-04-092-0/+26
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I2bf1874705b877a8a8262ab49b47fe8241e603d5
* | | | | | Merge "Track recent keymaster_defs.h changes."Alex Klyubin2015-04-102-21/+3
|\ \ \ \ \ \
| * | | | | | Track recent keymaster_defs.h changes.Alex Klyubin2015-04-092-21/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
* | | | | | Merge "Split key origin into TEE/not and generated/imported."Alex Klyubin2015-04-093-15/+29
|\ \ \ \ \ \
| * | | | | | Split key origin into TEE/not and generated/imported.Alex Klyubin2015-04-093-15/+29
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to match the upcoming changes in Keymaster HAL API. Bug: 18088752 Change-Id: I602d56d1c29a839583be1d9efa681a6fab6642db
* | | | | | Merge "Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category""Mathieu Chartier2015-04-091-2/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add dalvik subitems for -d in dumpsys meminfo "Total PSS by category"Mathieu Chartier2015-04-091-2/+21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Start passing volume UUID to installd."Jeff Sharkey2015-04-091-2/+101
|\ \ \ \ \
| * | | | | Start passing volume UUID to installd.Jeff Sharkey2015-04-091-2/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Fix minor issues in new Javadocs of AndroidKeyStore."Alex Klyubin2015-04-093-21/+14
|\ \ \ \ \ \
| * | | | | | Fix minor issues in new Javadocs of AndroidKeyStore.Alex Klyubin2015-04-093-21/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: Ie84cc6066c82f2659da17a1eb158c2e3acf5094d
* | | | | | Merge "Add asymmetric crypto constants for AndroidKeyStore API."Alex Klyubin2015-04-091-5/+98
|\ \ \ \ \ \
| * | | | | | Add asymmetric crypto constants for AndroidKeyStore API.Alex Klyubin2015-04-091-5/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: Iee72a4c230f3a2cd30d9eb4d29c4301f3e113f31
* | | | | | | Merge "Add missing mapping between JCA and keystore HMAC names."Alex Klyubin2015-04-092-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Add missing mapping between JCA and keystore HMAC names.Alex Klyubin2015-04-092-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up to 70376a77280551791dae62586a6bb0c77ed9429a where I forgot to update this mapping. Bug: 18088752 Change-Id: I322a9abd642ddee3bd2b4f49379b121012e32836
* | | | | | | | Merge "Ensure alignment of Res_png_9patch."Dan Albert2015-04-091-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Ensure alignment of Res_png_9patch.Dan Albert2015-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't alter the alignment of the data within the struct, but enforces that this structure will be appropriately aligned when used. The image_info struct has this struct preceded by a bool, which causes odd alignment for the members of this struct. Change-Id: Ia2ef5c81b2f961c0f61858a10a7821d82f600919
* | | | | | | | Merge "Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired."Alex Klyubin2015-04-091-1/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Hide KeyStoreParameter.Builder.setRandomizedEncryptionRequired.Alex Klyubin2015-04-091-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This wasn't meant to be public API yet. Bug: 18088752 Change-Id: I40e57fd9121348086ae88ad9fa54f930547b77ba
* | | | | | | Merge "Require IND-CPA by default for new AndroidKeyStore keys."Alex Klyubin2015-04-096-12/+247
|\ \ \ \ \ \ \
| * | | | | | | Require IND-CPA by default for new AndroidKeyStore keys.Alex Klyubin2015-04-086-12/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: I01e44b7155df4326b5c9d83dda57f889c1f23ec7
* | | | | | | | Merge "Reuse dexopt method for both dex2oat and patchoat."Richard Uhler2015-04-095-124/+64
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Reuse dexopt method for both dex2oat and patchoat.Richard Uhler2015-04-035-124/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib9a6373f98474f1242367b5285086251a9d580e5
* | | | | | | | Merge "Re-enable -Wall and -Werror that were lost in a merge"Colin Cross2015-04-094-5/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Re-enable -Wall and -Werror that were lost in a mergeColin Cross2015-04-084-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wall and -Werror were lost during a merge when they were added to aaptCFLAGS instead of aaptCFlags. Fix the typo, and the warnings that crept in while it was disabled. Change-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2
generated by cgit v1.1 at 2025-02-09 20:02:59 +0000