summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \
| * | Correct the target app token for input method windowCarrie Xu2013-03-181-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The root cause is: There is a defect in window manager service: When a new activity that can be ime target is added into window manager but the Z order of input method window don't need to be changed, then the target app token of input method window would not be updated to new one. This defect may cause that the layer of input method window is calculated incorrectly. The solution: Correct the target app token for input method window. Change-Id: I008311e3c9b1cf5fc320b614d8675c183c506d50
* | Merge "update APN version for MVNO"Robert Greenwalt2013-03-161-1/+1
|\ \
| * | update APN version for MVNOSungmin Choi2013-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | As adding MVNO feature, update APN version from 7 to 8. To recognize MVNO, use new elements, spn, imsi, gid, mvno_type. Bug: 8143480 Change-Id: Ib8e7370ebc99c1518e6d9337621e64966c128a0b
* | | Merge "app_process: don't pollute the environment"Nick Kralevich2013-03-151-0/+1
|\ \ \
| * | | app_process: don't pollute the environmentNick Kralevich2013-03-151-0/+1
|/ / / | | | | | | | | | | | | | | | Give a hoot — don't pollute! Change-Id: I30d6c05cecab483f0e9d8063907f7bc0ef2bb104
* | | Merge "Never call app_main more than once"Nick Kralevich2013-03-151-4/+3
|\ \ \
| * | | Never call app_main more than onceNick Kralevich2013-03-151-4/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different kernels seem to handle ADDR_COMPAT_LAYOUT differently, sometimes passing it to its children, sometimes not. If it's not passed to its child successfully, we can end up in a restart loop. Instead of testing for the presence of ADDR_COMPAT_LAYOUT, use an environment variable instead, which is handled more predictably. Bug: 8392487 Change-Id: Ia531dd2abb4e1cd46f3430d844e644f53581f530
* | | Merge "Don't use ADDR_COMPAT_LAYOUT on the emulator"Nick Kralevich2013-03-141-5/+10
|\ \ \
| * | | Don't use ADDR_COMPAT_LAYOUT on the emulatorNick Kralevich2013-03-141-5/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the emulator, we want people to see memory as it actually is, not how we're hacking around buggy apps. Don't set ADDR_COMPAT_LAYOUT on the emulator. For reasons that I don't understand, personality(ADDR_COMPAT_LAYOUT) does not persist across an exec on the emulator. app_main gets into a tight loop restarting itself because of this. This change also works around that bug. Change-Id: Ia73a7d2d623c25cf39d248145d97307945d554da
* | | Merge "Respawn app_main if ADDR_COMPAT_LAYOUT is not set"Nick Kralevich2013-03-141-1/+22
|\ \ \
| * | | Respawn app_main if ADDR_COMPAT_LAYOUT is not setNick Kralevich2013-03-141-1/+22
|/ / / | | | | | | | | | | | | Bug: 8358800 Change-Id: Id81aa26d74dfd16a49f0ee5926ea2cdb3c2106d8
* | | Merge "Fix NPE when pasting non-text from Clipboard"John Reck2013-03-121-1/+1
|\ \ \
| * | | Fix NPE when pasting non-text from ClipboardNils Holmström2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When copying a link from a bookmark and then pasting it into a textfield a NullPointerException will occur. A ClipData.Item is not guaranteed to always contain a text string and therefore getText() can be set to null. Using method coerceToText() instead of getText() makes sure that a text string is always returned. Change-Id: I81343c0371835a3a7a52045dcd1760e69e59a967
* | | | Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."Kenny Root2013-03-121-4/+4
|\ \ \ \
| * | | | Switch TLS Channel ID API from ECPrivateKey to PrivateKey.Alex Klyubin2013-03-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to accept both the "transparent" and "opaque" ECC private keys. "Transparent" keys provide structured access to their key material -- these are instances of ECPrivateKey. "Opaque" private keys are not required to provide structured (or even any) access to their key material -- these are instances of PrivateKey. Change-Id: Ib22e18b45b638b429f994ed965416c753226c4ee
* | | | | Merge ""[+>" more icon was never shown in PhoneStatusBar"Daniel Sandler2013-03-121-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | "[+>" more icon was never shown in PhoneStatusBarMats H Carlsson2013-03-121-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "[+>" more icon was never show in status bar because the member variable for this icon was not initialized from resources. This fix enables "[+>" icon to appear in status bar when the number of indications in status bar becomes large. Bug: 8368569 Change-Id: Ieb3412eed831052d69c0cf63c9b4230c38171e4a
* | | | Merge "Fix DateFormat k and h, and implement K and H for the first time."Elliott Hughes2013-03-111-7/+19
|\ \ \ \
| * | | | Fix DateFormat k and h, and implement K and H for the first time.Elliott Hughes2013-03-111-7/+19
|/ / / / | | | | | | | | | | | | | | | | Bug: 8359981 Change-Id: I52ef937a77e9e28f2719c2ee6f59e4b74514f0b2
* | | | Merge "use Calendar in DateUtils format method"Elliott Hughes2013-03-111-10/+28
|\ \ \ \
| * | | | use Calendar in DateUtils format methodSungmin Choi2013-03-111-10/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DatePickerDialog is using DateUtils to format the dialog's title and the DateUtils class does not work with dates outside to the specified range. For example, if user selects 2038-03-07, DatePickerDialog shows 1902-01-30 on Title. The reason for the DateUtils class not being able to format dates outside the range of 1902 and 2036 is because internally it is using the Time class which does not support such dates. To fix it, use Calendar class in DataUilts format method. Steps to reproduce: 1. Settings -> Date & time 2. uncheck Automatic date & time 3. Set Date 4. choose any date before 1902 or after 2037 5. update wrong date on Title Bug: https://code.google.com/p/android/issues/detail?id=13050 Change-Id: I003266765751b5c340426af84daef271f39f771e
* | | | Merge "update preloaded-classes"Elliott Hughes2013-03-111-16/+2
|\ \ \ \ | |/ / / |/| | |
| * | | update preloaded-classesSungmin Choi2013-03-111-16/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some preloaded-classes and fix typo for deleting log messages as the followings during booting. W/Zygote ( 163): Class not found for preloading: android.bluetooth. BluetoothAudioGateway W/Zygote ( 163): Class not found for preloading: android.bluetooth. HeadsetBase W/Zygote ( 163): Class not found for preloading: undroid.content.Ab stractThreadedSyncAdapter$SyncThread Change-Id: Id02e0cccaeb150f48e12d67b2d691df828842e4c
* | | Merge "Improve DateFormat.format."Elliott Hughes2013-03-083-260/+127
|\ \ \
generated by cgit v1.1 at 2025-02-13 13:25:13 +0000