summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Improve the AndroidKeyStore-backed HMAC state machine."Alex Klyubin2015-04-022-10/+18
|\
| * Improve the AndroidKeyStore-backed HMAC state machine.Alex Klyubin2015-04-012-10/+18
| | | | | | | | | | | | | | | | | | This defers the start of a new KeyStore operation after Mac.doFinal until the next Mac.update or .doFinal. Previously, the a new KeyStore operation was started immediately, at the end of doFinal. Bug: 18088752 Change-Id: I2d594067ef261f519631d09f7a6087b715801656
* | Merge "Expose new key use constraints in KeyPairGeneratorSpec."Alex Klyubin2015-04-023-17/+458
|\ \
| * | Expose new key use constraints in KeyPairGeneratorSpec.Alex Klyubin2015-04-023-17/+458
| | | | | | | | | | | | | | | | | | | | | The constraints are currently ignored. Bug: 18088752 Change-Id: Iabd2018200afb2bf8ac1748d1def47af74bfb9d3
* | | Merge "Add exception types for AndroidKeyStore key validity issues."Alex Klyubin2015-04-024-0/+115
|\ \ \
| * | | Add exception types for AndroidKeyStore key validity issues.Alex Klyubin2015-04-014-0/+115
| | |/ | |/| | | | | | | | | | Bug: 18088752 Change-Id: I7494cb6a793e2b57bb849a4253bba2803778c161
* | | Merge "[ActivityManager] Avoid improper resume top activity."Olawale Ogunwale2015-04-022-14/+10
|\ \ \ | |_|/ |/| |
| * | [ActivityManager] Avoid improper resume top activity.riddle_hsu2015-04-022-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is a process died, only resume top if it contains visible activity. This can fix case 1 in https://android-review.googlesource.com/#/c/120901/ Change-Id: I45584e76f9e863980d04bbb593d7d26a8900acd0
* | | Merge "Early return in RemoteViewsAdapter is too late"Elliott Hughes2015-04-011-3/+3
|\ \ \ | |_|/ |/| |
| * | Early return in RemoteViewsAdapter is too lateHenrik Baard2014-11-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constuctor RemoteViewsAdapter implements an early return throwing an exception if intent is null. However the intent is used before it is checked. Moving early return before use of the intent. Change-Id: If847245b3b9f21111805f301717080c81474cad7
* | | Merge "Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString."Alex Klyubin2015-04-012-0/+57
|\ \ \
| * | | Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.Alex Klyubin2015-04-012-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the hidden API android.net.Uri.toSafeString omit most parts of HTTP, HTTPS, and FTP URLs to avoid leaking anything unsafe. Only the host and port are retained for these URLs. Bug: 19215516 Change-Id: I2e9e33d9afaa9de5dd07a40532d56f0a2179f62a
* | | | Merge "Use Keymaster-friendly validity dates."Alex Klyubin2015-04-013-27/+41
|\ \ \ \
| * | | | Use Keymaster-friendly validity dates.Alex Klyubin2015-04-013-27/+41
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keymaster HAL currently requires that key validity start and end dates always be specified. The framework API does not. This CL expresses the framework API's "not specified" instants to Keymaster as instants in distant past or future. Bug: 18088752 Change-Id: Ia9d66d5e57bfca30628cdef6e0925a2781a3acfb
* | | | Merge "Frameworks/base: Use system property for cache prune counter"Andreas Gampe2015-04-011-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Frameworks/base: Use system property for cache prune counterAndreas Gampe2015-04-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose ART's -Xzygote-max-boot-retry through a new system property dalvik.vm.zygote.max-boot-retry. Bug: 19983101 Change-Id: Ib88f807e0082d71292c14c7af38e02cca5a5602c
* | | | Merge "Hook in user authenticators and their exceptions."Alex Klyubin2015-04-019-30/+159
|\ \ \ \
| * | | | Hook in user authenticators and their exceptions.Alex Klyubin2015-03-319-30/+159
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18088752 Change-Id: I2835dbe51d09587a3081597c6aaf536aa1427e24
* | | | | Merge "A way to obtain KeyStore operation handle from crypto primitives."Alex Klyubin2015-04-014-3/+103
|\ \ \ \ \
| * | | | | A way to obtain KeyStore operation handle from crypto primitives.Alex Klyubin2015-03-314-3/+103
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds AndroidKeyStore.getKeyStoreOperationHandle method which can be used to obtain the KeyStore operation handle corresponding to the provided JCA cryto primitive (provided it's backed by AndroidKeyStore). Bug: 18088752 Change-Id: Iaa3b6f9b2281b2ec2de8fd5946d353dc7fdb3d2d
* | | | | Merge "[ActivityManager] Reduce report wrong anr activity"Olawale Ogunwale2015-04-012-15/+16
|\ \ \ \ \
| * | | | | [ActivityManager] Reduce report wrong anr activityriddle_hsu2015-04-012-15/+16
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symptom: Report ANR on wrong activity. Reproduce steps: (All launchMode, taskAffinity are default and without additional intent flag) Case 1: 1.Launch activity A from launcher. 2.Activity A starts B activity. 3.Press home key. 4.Launch activity A from launcher (B is top). 5.Press back key twice to finish B and A, A sleep 10s in onResume. 6.ANR will report on launcher. Case 2: 1.Launch activity A from launcher. 2.Press home key. 3.Kill process of A. 4.Launch activity A from launcher. 5.A sleep 10s in onResume, press back key immediately. 6.ANR will report on launcher. Possible root cause: Focused activity will not be updated every time when activity resumed. (the condition to call setFocusedActivityLocked) Case 1: Launcher was stopped and not waitingVisible due to launcher is not the previous one, then getWaitingHistoryRecordLocked has no chance to correct the real ANR activity. Case 2: Due to process of next activity is died, bring existed task will not set mResumedActivity (it will be set when its process is started), so when assigning waitingVisible from processStoppingActivitiesLocked, the return value of allResumedActivitiesVisible will be true even there is no mResumedActivity. That results set waitingVisible to false to previous activity (e.g. launcher), then also cannot correct ANR target as case 1. Change-Id: I0b24f46a8fab266382ebc6e2ed84ebeca9358768
* | | | | Merge "idmap: scan missing include for sys/stat.h"Mark Salyzyn2015-04-011-2/+3
|\ \ \ \ \
| * | | | | idmap: scan missing include for sys/stat.hMark Salyzyn2015-04-011-2/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scan.cpp gets sys/stat.h inherited from private/android_filesystem_config.h it should not rely on this in the future. The intent is to move fs_config function into libcutils and thus deprecate any need for sys/stat.h in this include file. Bug: 19908228 Change-Id: If547e86513b06c536972138ae571c3d9c714ffe9
* | | | | Merge "app_main missing include for sys/stat.h"Mark Salyzyn2015-04-011-5/+6
|\ \ \ \ \
| * | | | | app_main missing include for sys/stat.hMark Salyzyn2015-04-011-5/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app_main.c gets sys/stat.h inherited from private/android_filesystem_config.h it should not rely on this in the future. The intent is to move fs_config function into libcutils and thus deprecate any need for sys/stat.h in this include file. Bug: 19908228 Change-Id: I477b825e582742113f849aaa1df50c41e496b6f6
* | | | | Merge "[ActivityManager] Improve multi-thread access the same provider"Olawale Ogunwale2015-04-011-33/+69
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ActivityManager] Improve multi-thread access the same providerriddle_hsu2015-04-011-33/+69
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Application may use many threads to load data from provider. If the target provider needs to start process, each access will occupy one binder thread of system server until the provider process started and published. Sometimes application uses more than 16 threads to access the same provider, and the provider process needs a little long time to start, then all binder threads of system server are waiting. But when the provider is ready, it is unable to publish to notify those waiting threads because no availabe binder thread to use. And device will become almost hang. Improvement: If there is already a thread acquiring provider, let other threads (which try to acquire the same provider) wait the result of the first one. That reduces IPC to save binder thread of system server. Remove calling removeContentProvider in installProvider because we have ensured only get one provider holder for the same provider, the original race that gets a new useless holder will not happen. Change-Id: I521f2603db8ced56912f5dc54342a70451e68381
* | | | Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"Alex Klyubin2015-04-011-3/+4
|\ \ \ \ | |/ / / |/| | |
| * | | UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTHAlex Klyubin2015-03-311-3/+4
|/ / / | | | | | | | | | | | | | | | | | | This is to follow naming from keymaster_defs.h Bug: 18088752 Change-Id: If2bc91dde54f1cefcd4325d1f62d0e0b77fc5d59
* | | Merge "Add license banner to recently added AndroidKeyStore files."Alex Klyubin2015-03-3114-0/+224
|\ \ \ | |/ / |/| |
| * | Add license banner to recently added AndroidKeyStore files.Alex Klyubin2015-03-3114-0/+224
|/ / | | | | | | | | Bug: 18088752 Change-Id: I027f9530a02cca081aae8eb94833d2fdcb678e9a
* | Merge "Add SecretKeyFactory backed by AndroidKeyStore."Alex Klyubin2015-03-316-1/+445
|\ \
| * | Add SecretKeyFactory backed by AndroidKeyStore.Alex Klyubin2015-03-316-1/+445
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This factory provides a way to obtain information about a SecretKey backed by AndroidKeyStore. The information is provided in a form of an instance of KeyStoreKeySpec class. EXAMPLE SecretKeyFactory factory = SecretKeyFactory.getInstance( key.getAlgorithm(), "AndroidKeyStore"); KeyStoreKeySpec keySpec = factory.getKeySpec(key, KeyStoreKeySpec.class); Bug: 18088752 Change-Id: I26c9dd544f80230fe7039501eeb471eaf875452b
* | | Merge "Clear the previous states before setting the new app visibility"Craig Mautner2015-03-311-5/+5
|\ \ \
| * | | Clear the previous states before setting the new app visibilitytiger_huang2015-03-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If setAppVisibility() is called multiple times in a short interval while the screen is turned off between the calls, the visibility of the app would be wrong. For example, the user may see the app under the launcher, not the wallpaper under the launcher. The flow to the issue: 1. Screen is on. 2. AM calls setAppVisibility() token=App A's token, visible=true 3. Screen is turned off. 4. AM calls setAppVisibility() token=App A's token, visible=false Note: a. In 2., WM would put App A into mOpeningApps, and tell it to be visible. b. In 4., because the screen is off now, App A would not be removed from mOpeningApps. App A might be told to be invisible directly through setTokenVisibilityLocked(), but it would be told to be visible again in handleAppTransitionReadyLocked() later. Change-Id: Icf3d69031ea2822245008248ec8f12bd57218880
* | | | Merge "Fix value size data type in closure creation."Yang Ni2015-03-312-4/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix value size data type in closure creation.Yang Ni2015-03-302-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/19944127 Also added references to arguments and global values in a closure to keep them live in Java while native code may access them. Change-Id: I1179d34aa67f845578740e71cc2da4f82419f251
* | | | Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."Alex Klyubin2015-03-317-111/+758
|\ \ \ \
| * | | | Add unauthenticated AES ciphers backed by AndroidKeyStore.Alex Klyubin2015-03-317-111/+758
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the following AES transformations: * AES/ECB/NoPadding * AES/ECB/PKCS7Padding * AES/CBC/NoPadding * AES/CBC/PKCS7Padding * AES/CTR/NoPadding Bug: 18088752 Change-Id: I3e4702e59868f8f2225c31b1c159d20008b9999d
* | | | Merge "Include operation handle in OperationResult"Chad Brubaker2015-03-311-0/+3
|\ \ \ \
| * | | | Include operation handle in OperationResultChad Brubaker2015-03-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some authorization code needs to know the actual underlying operation handle, not simply a reference to it, so return it in case it is needed. Note that the handle cannot be used by the application to reference an operation. Change-Id: I4c883dde17168b7f6c1643d81741a4c2686d3159
* | | | | Merge "[ActivityManager] Fix index out of bounds when updating next pss time."Olawale Ogunwale2015-03-312-7/+13
|\ \ \ \ \
| * | | | | [ActivityManager] Fix index out of bounds when updating next pss time.riddle_hsu2015-03-312-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symptom: System server crash. Root Cause: The value curProcState for array index is -1 if the process has not attached yet. Solution: Skip computing for process which is not attached or curProcState is nonexistent state. Change-Id: I71aaf45bb78d73097ebe9dfebf76b72f2d243232
* | | | | | Merge "An updater for all timezone data on a device"Neil Fuller2015-03-314-35/+57
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | An updater for all timezone data on a deviceNeil Fuller2015-03-264-35/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing one, being deleted here, did not work properly: it only updated the file used by libcore and bionic, it did not update the ICU data. Most of the installation logic exists in code in libcore/tzdata that is independent of the server code so that it can be tested. Bug: 19941636 Change-Id: Id0985f8c5be2f12858ee8bf52acf52bdb2df8741
* | | | | | Merge "Frameworks/base: Support dex2oat threads system property"Andreas Gampe2015-03-311-0/+5
|\ \ \ \ \ \
| * | | | | | Frameworks/base: Support dex2oat threads system propertyAndreas Gampe2015-03-301-0/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART with "-j" as a compiler option, if found. Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to ART with "-j" as an image compiler option, if found. Bug: 19992386 Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
* | | | | | Merge "Add ProcessInfoService to activity manager."Olawale Ogunwale2015-03-304-1/+75
|\ \ \ \ \ \
| * | | | | | Add ProcessInfoService to activity manager.Ruben Brunk2015-03-304-1/+75
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds a new AIDL interface for querying process information from activity manager. Bug: 19186859 Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
generated by cgit v1.1 at 2025-02-15 18:24:49 +0000