summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "It helps to catch the right exception."Jean-Baptiste Queru2013-04-011-1/+1
|\
| * It helps to catch the right exception.Jeff Sharkey2013-03-261-1/+1
| | | | | | | | | | Bug: 7238149 Change-Id: I7b60ec44d1d1d5ece8a871cb089f811b611f4a4a
* | Merge "Clarify the documentation of SparseArray.indexOfValue."Elliott Hughes2013-03-291-8/+10
|\ \
| * | Clarify the documentation of SparseArray.indexOfValue.Elliott Hughes2013-03-261-8/+10
| | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=53297 Change-Id: I28725a2d03d4c11948bfe4fb90d730c86bf41481
* | | Merge "KeyStore: add API to query storage type"Kenny Root2013-03-292-0/+29
|\ \ \
| * | | KeyStore: add API to query storage typeKenny Root2013-03-292-0/+29
|/ / / | | | | | | | | | | | | | | | | | | Add an API to keystore daemon to query what kind of storage is currently in use. Change-Id: I5a83ae92250ca63b691dcf1beb8b3e1703797745
* | | Merge "AndroidKeyStore: add Builder for param spec"Kenny Root2013-03-282-4/+160
|\ \ \
| * | | AndroidKeyStore: add Builder for param specKenny Root2013-03-282-4/+160
| | | | | | | | | | | | | | | | Change-Id: I13403197e1ac7ac607efa10979eb73bde0135a2a
* | | | Merge "Save off the seinfo value with packages.list."Geremy Condra2013-03-282-3/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Save off the seinfo value with packages.list.Robert Craig2013-03-262-3/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Patch adds the seinfo label per package to the file. This is of particular interest to the run-as program which uses the seinfo tag to correctly label the app security context before running the shell. Change-Id: I9d7ea47c920b1bc09a19008345ed7fd0aa426e87 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | Merge "Add ability to install credentials as other UID"Kenny Root2013-03-281-0/+8
|\ \ \
| * | | Add ability to install credentials as other UIDKenny Root2013-03-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need the ability to install from the system UID to wifi UID to explicitly bind WiFi credentials to the WiFi profile. This adds the ability for Wifi Settings to invoke installation of a PKCS12 file for the wifi UID. Bug: 8183258 Change-Id: I652b7e6fa93deda6d6d310be33f224e5a356c787
* | | | Merge "Correct executable bit for source files [Take 2]"Elliott Hughes2013-03-2856-0/+0
|\ \ \ \
| * | | | Correct executable bit for source files [Take 2]Chirayu Desai2013-03-2756-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Ieb51bafb46c895a21d2e83696f5a901ba752b2c5 left out some files, this fixes them. Change-Id: Ia949a8581668836ea0251602e048f09c852f5169
* | | | | Merge "Add data validation on seinfo labels."Geremy Condra2013-03-281-2/+24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add data validation on seinfo labels.Robert Craig2013-03-281-2/+24
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that policy contains a clean seinfo string. Where clean means no whitespace characters. Change-Id: I814411cbc8d16eaed99a1389f5487529e36e617b Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | Merge "Add interrupter library to simulate EINTR"Kenny Root2013-03-283-0/+153
|\ \ \ \
| * | | | Add interrupter library to simulate EINTRKenny Root2012-10-153-0/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To check for robustness against EINTR from syscalls, add an interrupter library that can be preloaded with LD_PRELOAD. Change-Id: I0a6cd8702ec5bc6b2927a5e223ee3cdc033860a2
* | | | | Merge "Two REMOVE_PROVIDER messages caused by race condition."Dianne Hackborn2013-03-271-0/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Two REMOVE_PROVIDER messages caused by race condition.Guobin Zhang2013-03-271-0/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in unstable ContentProvider. IllegalStateException: ref counts can't go to zero here: stable=0 unstable=0 IllegalStateException: unstable count < 0: -1 There is a race between main thread and background database thread. Main thread is responsible for handling the REMOVE_PROVIDER message. Database thread starts insert or query request again and again. acquireProvider in db thread will often snatch provider from the jaws of death, sometime it fails to remove REMOVE_PROVIDER which is already fired out from MessageQueue. But completeRemoveProvider in main thread gets suspended when trying to execute the critical section. If db thread released the provider before main thread resumes the execution, then two REMOVE_PROVIDER messages will be executed. Change-Id: I8588aa1d1a8bc444dcd2adf6f8bc3f055cebbdc4 Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
* | | | Merge "Remove dead DateUtils code that was never in an API level."Elliott Hughes2013-03-262-116/+17
|\ \ \ \
| * | | | Remove dead DateUtils code that was never in an API level.Elliott Hughes2013-03-262-116/+17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rewrite @deprecated comments to use an initial capital so they look right in the generated documentation. Also improve formatIpAddress documentation. Change-Id: I317ebe411ef76e16a4535318ce73e00b63af38da
* | | | Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."Elliott Hughes2013-03-261-85/+43
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.Elliott Hughes2013-03-261-85/+43
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | It was possible to overrun this buffer, and even if you did fill the buffer in a single read and exit the loop, the "string" still wouldn't be terminated. Bug: 8468088 Change-Id: Ia19f4d26dfd79e7b63807a7ec9540b932163d246
* | | Merge "BackupManagerService files need new security labeling."Geremy Condra2013-03-262-0/+17
|\ \ \
| * | | BackupManagerService files need new security labeling.rpcraig2012-12-042-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use restorecon to label files and directories specific to BMS. * /data/backup : provide default type labeling for all files/dirs used by BMS. * /data/secure/backup : provide default type labeling used by BMS when encrypted file system is enabled. * /cache/<package name>.{data|restore} : specifically target files opened and passed by BMS to apps that have backup capabilities. * /cache/backup : default labeling for the directory used by the LocalTransport that stores backup files for local testing. Change-Id: Id4d46e82cd13abc2e395e0c30c515f0a33df93e7 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | Merge "Proper security labeling of multi-user data directories."Geremy Condra2013-03-256-9/+13
|\ \ \ \
| * | | | Proper security labeling of multi-user data directories.rpcraig2013-03-256-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch covers 2 cases. When an app is installed and the resulting data directory is created for all existing users. And when a new user is created and all existing app data directories are created for the new user. Change-Id: Iacaba6d9d18d5337e65713960d14efe32006b330 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | | Merge "Add seinfo parsing to PackageManagerService."Geremy Condra2013-03-258-11/+311
|\ \ \ \ \ | |/ / / /
| * | | | Add seinfo parsing to PackageManagerService.Robert Craig2013-03-258-11/+311
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch set allows the PMS to parse the mac_permissions.xml file which contains the seinfo values. Each package that is installed on the device will be assigned an seinfo value based on policy. This seinfo value will help label the app process and data directory. Modifications include adjustments to ApplicationInfo.java to store the seinfo tag per package as well as adjustments to installd to communicate the seinfo tag to libselinux. Change-Id: I61ad1ea12fb6a9a6d0b108ec163bc4bf4c954b58 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
* | | | Merge "KeyStore: change migrate to duplicate"Kenny Root2013-03-213-14/+42
|\ \ \ \
| * | | | KeyStore: change migrate to duplicateKenny Root2013-03-213-14/+42
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | After discussion, it was determined that duplicate would be less disruptive and it still fit in the current HAL model. Change-Id: I2f9cae48d38ec7146511e876450fa39fc92cda55
* | | | Merge "Fix Watchdog HeartbeatHandler to run on correct thread"Wink Saville2013-03-211-1/+8
|\ \ \ \
| * | | | Fix Watchdog HeartbeatHandler to run on correct threadJohn Michelau2013-03-191-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HeartbeatHandler for the System Server Watchdog has been running on the wrong thread due to a race condition in initialization. It's designed to run on ServerThread, so that it can catch lockups in the main looper of the System Server. It has been running on ActivityManagerThread instead, so it does not detect lockups on the ServerThread as it should. ActivityManagerService is calling Watchdog.getInstance() before ServerThread calls Watchdog.getInstance().init(), so the handler is being bound to the ActivityManagerThread instead of the ServerThread. Explicitly bind HeartbeatHandler to ServerThread, so that the Watchdog catches lockups on this critical thread. Change-Id: Iccb184ac3adb817feb86ed4ee0e50e443bf74636
* | | | | Merge "Update SELinux JNI to use helpers"Kenny Root2013-03-201-352/+331
|\ \ \ \ \
| * | | | | Update SELinux JNI to use helpersKenny Root2013-03-201-352/+331
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Ifc707eafd1ecbba64c93fa2250c4334d0ce40005
* | | | | Merge changes I65f7a915,I32098dc0Kenny Root2013-03-205-41/+290
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | * changes: KeyStore: add "migrate" command KeyStore: add API to uid versions
| * | | | KeyStore: add "migrate" commandKenny Root2013-03-203-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support the WiFi service, we need to support migration from the system UID to the wifi UID. This adds a command to achieve the migration. Bug: 8122243 Change-Id: I65f7a91504c1d2a2aac22b9c3051adffd28d66c1
| * | | | KeyStore: add API to uid versionsKenny Root2013-03-205-41/+227
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In previous commits, we added the ability to specify which UID we want to target on certain operations. This commit adds the ability to reach those binder calls from the KeyStore class. Also fix a problem where saw() was not reading all the values returned via the Binder call. This changes the semantics to return a null instead of failing silently when it's not possible to search. Change-Id: I32098dc0eb42e09ace89f6b7455766842a72e9f4
* | | | Merge "Remove dead code from DateUtils."Elliott Hughes2013-03-191-82/+0
|\ \ \ \
| * | | | Remove dead code from DateUtils.Elliott Hughes2013-03-191-82/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | This stuff is @hide, @deprecated, unused, and was never in any API level. Change-Id: I87d132d77d7296a2de8527e05c2def362cab1c37
* | | | Merge "Fix times in debugging output to use H rather than k."Elliott Hughes2013-03-192-2/+2
|\ \ \ \
| * | | | Fix times in debugging output to use H rather than k.Elliott Hughes2013-03-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8359981 Change-Id: I4fccf3ed7e469b77f6e755dacbcd025005390505
* | | | | Merge "Fix build."Elliott Hughes2013-03-191-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix build.Elliott Hughes2013-03-181-2/+2
|/ / / / | | | | | | | | | | | | Change-Id: Icb7fb60f00251ab01c8f9844572bb349e45c6c41
* | | | Merge "Clean up (some of) our many clocks to use H instead of k."Elliott Hughes2013-03-194-67/+76
|\ \ \ \
| * | | | Clean up (some of) our many clocks to use H instead of k.Elliott Hughes2013-03-184-67/+76
|/ / / / | | | | | | | | | | | | | | | | Bug: 8359981 Change-Id: I3c0c38c2bf5adc4b5bdc11c3d10cf41dd8fb6462
* | | | Merge "Deliberately break DateFormat.format's formatting of 'k' for ↵Elliott Hughes2013-03-181-7/+20
|\ \ \ \ | | | | | | | | | | | | | | | compatibility."
| * | | | Deliberately break DateFormat.format's formatting of 'k' for compatibility.Elliott Hughes2013-03-181-7/+20
|/ / / / | | | | | | | | | | | | | | | | Bug: 8359981 Change-Id: I44ed816c644f94783c77952d544c5444b966868b
* | | | Merge "Correct the target app token for input method window"Craig Mautner2013-03-181-1/+5
|\ \ \ \ | |_|_|/ |/| | |
generated by cgit v1.1 at 2025-02-03 12:14:29 +0000