summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Allow debugging only for apps forked from zygoteHEADmasterSebastien Hertz2015-10-191-19/+23
| | | | | | | | | | | | | | When starting the runtime from app_process, we only pass JDWP options if starting zygote. It prevents from opening a JDWP connection in non-zygote programs while Android apps (forked from zygote) remain debuggable. Bug: 23050463 (cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4) Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19 Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
* DO NOT MERGE: Ensure that unparcelling Region only reads the expected number ↵Leon Scroggins III2015-10-181-1/+6
| | | | | | | | | | of bytes bug: 20883006 Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce Conflicts: core/jni/android/graphics/Region.cpp
* Check that the parcel contained the expected amount of region data. DO NOT MERGELeon Scroggins III2015-10-181-2/+6
| | | | | | | | bug:20883006 Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b Conflicts: core/jni/android/graphics/Region.cpp
* Fix for CVE-2015-1536Wolfgang Wiedmeyer2015-10-181-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Port of upstream commit d44e5bde18a41beda39d49189bef7f2ba7c8f3cb from Leon Scroggins III <scroggo@google.com> Original commit message: Make Bitmap_createFromParcel check the color count. DO NOT MERGE When reading from the parcel, if the number of colors is invalid, early exit. Add two more checks: setInfo must return true, and Parcel::readInplace must return non-NULL. The former ensures that the previously read values (width, height, etc) were valid, and the latter checks that the Parcel had enough data even if the number of colors was reasonable. Also use an auto-deleter to handle deletion of the SkBitmap. Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6 BUG=19666945 Change-Id: Iab0d218c41ae0c39606e333e44cda078eef32291
* DO NOT MERGE Change to add STK_PERMISSION for stk related commands.Amit Mahajan2015-10-181-0/+5
| | | | | | | | Bug: 21697171 Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b Conflicts: core/res/AndroidManifest.xml
* Secure broadcasts.Robert Greenwalt2015-08-311-0/+1
| | | | | | | | | Prevents 3rd party spoofing. Bug: 7622253 Change-Id: I1e1a9887afe009d060205e349c31e3aefba2ea5b Signed-off-by: Robert Greenwalt <rgreenwalt@google.com> Tested-by: Moritz Bandemer <replicant@posteo.mx>
* Fix issue #8470131: Process thrash kills batteryDianne Hackborn2015-08-252-4/+18
| | | | | | | | | | | | | | Protect app widget broadcasts from abuse. In this case the app was sending an APPWIDGET_UPDATE broadcast without specifying a target, which (a) should not be allowed (you should not be able to send updates to other apps), and (b) resulted in every single potential app widget in the system being launched... which was about 75 of them. Change-Id: I9d48733610ce6d5a7c32e69a3e06b9f33bd79a34 Signed-off-by: Dianne Hackborn <hackbod@google.com> Tested-by: Moritz Bandemer <replicant@posteo.mx>
* LockPatternUtils: Method is not deprecated for no reasonPaul Kocialkowski2014-01-231-1/+0
| | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* Links corrections for javadocPaul Kocialkowski2013-11-161-2/+1
| | | | | Change-Id: I22188668bd4b2d82dcfb13d0b656db324b858858 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* Adapt hardware renderer and screen rotation animation for SoftwareGLPaul Kocialkowski2013-10-282-33/+45
| | | | | Change-Id: I0d7809e7ae408c4762982599576be9a78d54a2dc Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* Restore original adb icon and USB Mass Storage activity iconPaul Kocialkowski2013-10-284-0/+0
| | | | | Change-Id: I485ac3ee827aa0869b0173f94284bf0a1932c271 Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* PackageManager: allow build-time disabling of componentsPawit Pornkitprasan2013-09-012-0/+7
| | | | | | | | | | Allow components to be specified as disabled at build time (applied on boot). This allows stock OTA components to be marked as disabled in CM builds. Change-Id: I6e4499cc40a779792a5ea97a10137399dad7d69f
* frameworks_base: CA translationsarnau2013-08-221-0/+124
| | | | Change-Id: I202207397e92a47abf1d6eb254aa048d2762c2f4
* SystemUI & core: fixed FI translationsNiko Koivu2013-08-111-3/+21
| | | | Change-Id: Idfd709a6421a25f4df07b9ece91f25cfd3ac4bd4
* Revert "SystemUI & core: FI translations"Marco Brohet2013-08-111-21/+3
| | | | | | | | Derp This reverts commit d727d4cfb2ce739db8eb6c9d0bac321b88d2efb5. Change-Id: Ib4ab8cb19676221c11882e2bf10855ddacc101a2
* SystemUI & core: FI translationsNiko Koivu2013-08-101-3/+21
| | | | Change-Id: I137a23114dbe7e5e43aa7d8a5a2d914af1cfcbe7
* Merge "frameworks_base: Update Japanese translation" into cm-10.1Marco Brohet2013-08-091-0/+17
|\
| * frameworks_base: Update Japanese translationTakuo Kitame2013-08-061-0/+17
| | | | | | | | | | | | * Add many missing entries. Change-Id: Id13e5ec73944511ee450fab5d4bc901777d8b6ed
* | Merge "android_os_SELinux : Use empty array to instead of NULL to avoid the ↵Ricardo Cerqueira2013-08-081-11/+9
|\ \ | | | | | | | | | DevicePolicyManagerService cannot start when the SELinux is disabled." into cm-10.1
| * | android_os_SELinux : Use empty array to instead of NULL to avoid the ↵YuanQY2013-07-241-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DevicePolicyManagerService cannot start when the SELinux is disabled. Error log 07-24 10:32:14.408 F/SystemServer( 1676): BOOT FAILURE making Device Policy Service ready 07-24 10:32:14.408 F/SystemServer( 1676): java.lang.NullPointerException 07-24 10:32:14.408 F/SystemServer( 1676): at com.android.server.zh(DevicePolicyManagerService.java:2628) 07-24 10:32:14.408 F/SystemServer( 1676): at com.android.server.DevicePolicyManagerService.systemReady(DevicePolicyManagerService.java:1251) 07-24 10:32:14.408 F/SystemServer( 1676): at com.android.server.ServerThread.run(SystemServer.java:941) Patch Set 2: Append the error log. Change-Id: I31be031c356ef8e293de0395feefb34ced628341
* | | frameworks/base: Simplified Chinese TranslationsAndrew Jiang2013-08-051-1/+15
| |/ |/| | | | | Change-Id: If5212da117cbbd670432d4133e56c2a08b6e933b
* | Merge "Core+SystemUI: DA translation" into cm-10.1Danny Baumann2013-08-051-0/+16
|\ \
| * | Core+SystemUI: DA translationJacob Overgaard Madsen2013-08-031-0/+16
| | | | | | | | | | | | Change-Id: Id7a9c86fb3e0d481584c5d8ba550ee0510c17b26
* | | Core: Update German translationjackmu952013-08-031-0/+4
|/ / | | | | | | Change-Id: I420582b812de3d7f67e2434ee422ac1fc1658cb8
* | Core: NL translationEddy Witkamp2013-07-311-0/+4
| | | | | | | | | | | | | | | | | | | | ps2: move changes to cm_strings ps3: trigger fixed cid ps4/5: remove quotes Change-Id: I3b4a0fa8dbc8eac84aee9d5f59a8fbd5caa3fd82
* | Merge "Make notification-shade-collapse-after-dismiss behaviour ↵Danny Baumann2013-07-301-0/+13
|\ \ | | | | | | | | | configurable." into cm-10.1
| * | Make notification-shade-collapse-after-dismiss behaviour configurable.Danny Baumann2013-07-171-0/+13
| | | | | | | | | | | | Change-Id: I1be0be2753b479e6d2e4fc8e17d971d03ce01bb7
* | | Merge "Frameworks/base: Update italian translation" into cm-10.1Marco Brohet2013-07-301-0/+4
|\ \ \
| * | | Frameworks/base: Update italian translationrheeze2013-07-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed AOSP strings for SELinux PS2: ported strings to custom file cm_strings.xml (see http://review.cyanogenmod.org/#/c/45727) PS3: Cid trigger PS4: Cid trigger Change-Id: Iedafc7f598a80682dcabce4c71fb9c921bf3da25
* | | | Enable Estonian languageMarco Brohet2013-07-301-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | AOSP translations are present, but not activated Change-Id: I8cf7d0c128a5f12da5440882e6f2e8e91ccf57c5
* | | | Merge "Base-Core: CS translation" into cm-10.1Marco Brohet2013-07-281-0/+5
|\ \ \ \
| * | | | Base-Core: CS translationOndrej Zima2013-07-231-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | - added SELinux / MMAC policy Change-Id: I110a5871089989fa301830bfec5d67918852feda
* | | | Frameworks : FR translationDelphin PETER2013-07-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch set 1 : add new translation Patch set 2 : correction Change-Id: If4b5cc9695d129d3be3acc714c26ade87f35dcc8
* | | | Merge "frameworks_base: ES translations" into cm-10.1Marco Brohet2013-07-281-0/+4
|\ \ \ \
| * | | | frameworks_base: ES translationsdjMesias2013-07-231-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | - SELinux support Change-Id: I35de2435032bba44b077ddba9d5611443138c579
* | | | Merge "Core: HU translation" into cm-10.1Marco Brohet2013-07-281-0/+4
|\ \ \ \
| * | | | Core: HU translationTamas Toth2013-07-231-0/+4
| |/ / / | | | | | | | | | | | | Change-Id: I1612f9133f2037bc556db0630742ba2c87482bef
* | | | Merge "core/SystemUI: EL translations" into cm-10.1Marco Brohet2013-07-281-0/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | core/SystemUI: EL translationsMichael Bestas2013-07-231-0/+14
| |/ / | | | | | | | | | | | | | | | Signed-off-by: Michael Bestas <mikeioannina@gmail.com> Change-Id: I9666255a607cbce8ea8c4898ce929684e7b770bd
* | | android_os_FileUtils_getVolumeUUID: Fix the incorrect logical for call ↵YuanQY2013-07-231-10/+40
|/ / | | | | | | | | | | | | | | | | | | blkid_get_tag_value. There are two problems in here. 1. For the function blkid_get_tag_value third parameter is should be the device, not the mount pointer, in the MediaPrivader.attachVolume, it will pass the mount path to call this function. 2. The UUID for device is hex, so call atoi is not right. I think call strtol is better than atoi. Change-Id: I76598a0993f08add3e9c7541cbc082d8d85e9af4
* | Merge "Frameworks_base: PT-BR translations" into cm-10.1Marco Brohet2013-07-221-0/+4
|\ \
| * | Frameworks_base: PT-BR translationsGustavo2013-07-211-0/+4
| | | | | | | | | | | | Change-Id: I512d24bd517bc29be39ec93d31e722ed1a4a56ea
* | | Frameworks : move custom strings to cm_strings.xmlDelphin PETER2013-07-182-8/+9
|/ / | | | | | | Change-Id: Ie70f69474b9e83b6f9e2df4d34d6109008343356
* | Fix SELinux.java doc errorsRichard Haines2013-07-181-7/+5
| | | | | | | | | | | | | | | | This fixes five errors when building the Java docs. It also removes two obsolete lines. Signed-off-by: Richard Haines <richard_c_haines@btinternet.com> Change-Id: I814411cbc8d16eaed99a1389f5487529e36e647b
* | Drop "SE Android" from strings.Stephen Smalley2013-07-181-4/+4
| | | | | | | | | | Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Change-Id: I814411cbc8d16eaed99a1389f5487529e36e627b
* | Replace SEAndroid with SELinux.Stephen Smalley2013-07-182-5/+5
| | | | | | | | | | Change-Id: Ibbe544a9f025d71ad416bc01cee2145b62d7b2d4 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Move seinfo and install-time changes to inside PMS.Robert Craig2013-07-1848-2087/+0
| | | | | | | | | | | | | | Per request by Google, move the install-time checks entirely inside PMS. Change-Id: I01f2a9084dfe7886087b1497070b0d7f2ad8479e
* | Update location of policy filesWilliam Roberts2013-07-181-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | The location of policy files has changed from /data/system to /data/security. Also, a name change to mmac enforcing property name to place it under persist.mmac. namesepace. Adds api's for getting and setting the MMAC enforcing mode. Change-Id: I0e9468fe651cd6ec018d5c85d35d693e55479e89
* | Implement Device Admin API for MMACJoman Chu2013-07-185-4/+179
| | | | | | | | | | | | | | | | Conflicts: api/current.txt core/java/android/app/admin/DevicePolicyManager.java Change-Id: I1df507ced67fbcab8fdcde9cce78705b5e54e346
* | Apply MMAC changes from master.Stephen Smalley2013-07-1849-114/+1605
| | | | | | | | Change-Id: I01f2a9084dfe7886087b1497070b0d7f2ad8477e