summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * DO NOT MERGE) ExifInterface: Close the file when an exception happensSungsoo2016-12-121-1/+3
| | | | | | | | | | | | | | | | CYNGNOS-3312 Bug: 32068647, Bug: 30936376 Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f (cherry picked from commit cb17930077de640411407636eebc000e2d06dd9c) (cherry picked from commit 2c79cada8897dcb171b8227b4ea91c292400702f)
| * DO NOT MERGE Isolated processes don't get precached system service bindersChristopher Tate2016-12-121-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | More specifically, they get a PackageManager binder -- necessary for Android process startup and configuration -- but none of the other usual preloaded service binders. CYNGNOS-3312 Bug 30202228 Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05 (cherry picked from commit 2c61c57ac53cbb270b4e76b9d04465f8a3f6eadc) (cherry picked from commit f4d23f30c92bc80808f57677caab0282c8d28dc6) (cherry picked from commit 9357830a380c8174ce5130941a7a53915d680819)
* | Merge branch 'cm-13.0' of ↵Wolfgang Wiedmeyer2016-12-121522-6171/+101203
|\ \ | |/ | | | | https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0
| * Automatic translation importclyde@build012016-12-041-1/+1
| | | | | | | | | | Change-Id: If3346af7ccc0e84d99d03b1c50f6b9e413d984b7 Ticket: -
| * Support for MODE_ASK in commandlineamtlib-dot-dll2016-12-031-1/+8
| | | | | | | | Change-Id: Idaf46295aff58259c786de4a4fef9c475c363cff
| * AppOps: Do not prune apps that are not presentJorge Ruesga2016-12-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | Do not prune apps that are not currently present in the device (like USB memory ones). While booting, they are not available but must not be purged from AppOps, because they are still present in the Android app database. Issue-Id: CYAN-2811 Change-Id: I6680cbdf0022812b45d966dffee754399e92accb Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
| * Automatic translation importinky@build012016-12-027-17/+17
| | | | | | | | | | Change-Id: Ic80541e78c8570809868ce067a5176acb9d6a5a2 Ticket: -
| * Automatic translation importinky@build012016-11-2910-201/+21
| | | | | | | | | | Change-Id: I38a02ada64c66994c99ba5aee59a522931227337 Ticket: -
| * Themes: Don't cache explicitly themed resourcesBharadwaj Narasimha2016-11-281-26/+1
| | | | | | | | | | | | | | | | | | When a nav bar should be unchanged in the process of customization(like changing icons,fonts) the nav bar changes due to explicitly caching themed resources. Change-Id: I3135fac9df82a0551879908f6bf24deba0da0339
| * Build: use UserHandle.isApp for M compatibilityZhao Wei Liew2016-11-271-1/+1
| | | | | | | | Change-Id: Ie4511c547d9afe2697e1ac3519f41a9b19784f18
| * Make Build.TYPE and Build.FINGERPRINT consistent for apps.Danny Baumann2016-11-252-0/+43
| | | | | | | | | | | | | | | | | | | | Some apps (namely Android Wear) like to do comparisons between TYPE and FINGERPRINT and throw errors on inconsistencies. As our fingerprints are almost always taken from stock ROMs, they don't really match our builds, causing said comparisons to fail. Avoid those failures by taking build type out of fingerprint for apps. Change-Id: I8e8db64de7ea224572ecb3695c85abea91e0e29f
| * zygote: Allow device to append extra whitelisted pathsLuca Stefani2016-11-172-1/+35
| | | | | | | | Change-Id: Ic5b056d7ead520da8648db9be28e16a81ec27c73
| * SettingsLib: Fix possible NPEsMichael W2016-11-141-3/+6
| | | | | | | | | | | | | | | | | | getText() can return null, resulting in a NPE when trying to call toString(). Add a null check to prevent this. Additionally add a null check for packageInfo, as this can also be null. Change-Id: Ia76326522872f4de4702ef56640b2f7b357c2bb7 Reference: BugDumps 20161104-10 L#135
| * zygote: Add /proc/ged to the FD whitelistRicardo Cerqueira2016-11-121-1/+2
| | | | | | | | | | | | This is used by some platforms' gfx stack Change-Id: Ife6e1b0df30fc23eff7fb6a16ff95c3e7b16a9c7
| * frameworks/base: Addition of Changes for ZeroBalance featurePragnya Paramita2016-11-104-0/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --Addition of code to receive broadcast from ZeroBalanceHelper application for executing command to write block/unblock rule to Iptable. --Addition of ZeroBalanceHelper file to be accesible by other modules to notify ZeroBalanceHelper application about update on change of SIM balance. --Addition of rule to allow browser uid when rest all applications are in blocked state. --Addition of feature flag to control the zerobalance feature. CRs-Fixed: 927258 Change-Id: Ifdf4c46fd63ab78193047a9bc8b62bf41065a665
| * NotificationManager: Concentrate LED light capabilities at a single locationRicardo Cerqueira2016-11-106-14/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | We had(have) a bunch of individual boolean toggles for various LED behaviors and combinations, which end up getting used as a similarly sprawling bunch of getResource() calls across various locations. And they keep piling up... So... create a new overlayable array of LED capabilities (config_deviceLightCapabilities) where we can throw everything (and expand in the future). Also, create a helper to abstract usage of the old (multi-resource) and new (single resource array) formats to avoid breaking any deployed devices. Change-Id: I7d627914b058861048071fc15776031c4152157f
| * Add CMSDK resource APK to Zygote FD whitelistSteve Kondik2016-11-101-1/+2
| | | | | | | | Change-Id: Ica91b23e467db61f142b183316db4afee2a2a283
| * am: Fix mismergeBruno Martins2016-11-091-9/+0
| | | | | | | | | | | | | | * The removal of this code was missed out during merge of tag 'android-6.0.1_r74' Change-Id: I57dc035f79b7e20c09a21d5242c20370ad6d34ce
| * Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-0913-24/+662
| |\ | | | | | | | | | | | | | | | CYNGNOS-3303 Android 6.0.1 release 74
| | * Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 ↵Paul Jensen2016-09-271-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 Change-Id: Ib0023b44e521b936ab2f9450ad367b1feda64492
| | * Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into ↵Jeff Sharkey2016-09-271-3/+3
| | | | | | | | | | | | | | | | | | manual_merge_0a9d537 Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
| | * DO NOT MERGE Check caller for sending media key to global priority sessionJaewan Kim2016-09-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent sending media key events from the non-system app to the global priority session through the MediaSessionManager.dispatchMediaKeyEvent(). Note that any app can use the API indirectly with the public API AudioManager.dispatchMediaKeyEvent(). Bug: 29833954 Tested: Installed malicious apps and confirmed that they don't work. Tested: Run CtsTelecomTestCases and CtsMediaTestCases Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15 (cherry picked from commit c282c4f106bea5c5375fdb6062ffd4fdcf8563a7)
| | * Fix build break due to automerge of 7d2198b5Paul Jensen2016-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Bug: 30100884 Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f (cherry picked from commit baae57ab24db7d3b0bf7f84c05954173f1ee15fe)
| | * DO NOT MERGE: Catch all exceptions when parsing IME meta dataTadashi G. Takaoka2016-09-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 30568284 Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2 (manually cherry picked from 9b2997d22e6ce2a15065d8e7608dd77b316c2065) (cherry picked from commit 7bb4c825585d5a6afbb59484ec7db5f5dec1bdaf)
| | * DO NOT MERGE: Fix deadlock in AcitivityManagerService.Sudheer Shanka2016-09-271-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't hold mPidsSelfLocked lock when calling cleanUpApplicationRecordLocked. Bug: 31463143 Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98 (cherry picked from commit b59e73613bbaf252e2ee5892d7a95cbbd7d40b26)
| | * Ensure munmap matches mmapJohn Reck2016-09-274-10/+11
| | | | | | | | | | | | | | | | | | Bug: 31350622 Change-Id: I6d3f9faec32d54360caa6706d17405e20b50966c (cherry picked from commit aa394dd42c049479bface1991f11b863dc1a0922)
| | * Fix setPairingConfirmation permissions issue (2/2)Marie Janssen2016-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setPairingConfirmation was set to only require BLUETOOTH_ADMIN permission which shouldn't be able to set the confirmation itself. This is restricted to BLUETOOTH_PRIVILEGED permission. Bug: 29043989 Change-Id: I887de32d156e672ec44aa0b286cd7ea7f9f8ad55 (cherry picked from commit 93326cfd9fb8a20081baa9b975275772798cfd80)
| | * DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before ↵Sungsoo2016-09-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change ExifInterface object can be created with a unsupported file format. If saveAttribute is called with an unsupported file format, ExifInterface makes the file corrupted. This CL prevents those cases by throwing an exception before making any change on the file. Bug: 30936376 Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6 (cherry picked from commit 2ee53c82cc8c8b2e76a19910074672f6204a5d63)
| | * Backport changes to whitelist sockets opened by the zygote.Narayan Kamath2016-09-272-0/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the backport of the following commits : Commit c5f27a7cb2ec816f483a65255034a1b57a8aa22: ----------------------------------------------- Reopen whitelisted zygote file descriptors after a fork. We don't want these descriptors to be shared post-fork, so we'll have to close and reopen them when the zygote forks. The set of open descriptors is checked against a whitelist and it is a fatal error if a non whitelisted FD is opened. It is also a fatal error if anything other than a regular file / character device or socket is opened at the time of forking. This work is done in two stages : - An initial list of FDs is constructed and cached prior to the first zygote fork. - On each subsequent fork, we check whether the list of open FDs has changed. We are currently tolerant of changes, but in the longer term, it should be a fatal error if the set of open file descriptors in the zygote changes. - Post fork, we traverse the list of open descriptors and reopen them if necessary. bug: 30963384 Commit 3764a260f0c90dcb323caeda14baf903cc108759: ----------------------------------------------- Add a whitelist of sockets on fork. Maintain a whitelist of AF_UNIX sockets that are permitted to exist at the time of forking. If an open socket does not belong to the whitelist (or is not AF_UNIX), the process will abort. If an open socket is whitelisted, it will be redirected to /dev/null after a sucessful fork. This allows us to unify our handling of the special zygote sockets (/dev/socket/zygote[_secondary]) with the existing whitelist of non socket file descriptors. This change also removes non-fatal ALOGW messages since they have the side effect of reopening the logging socket. bug: 30963384 Commit 0b76d6a28e6978151bf245a775329cdae5e574d5: ----------------------------------------------- fd_utils: Fix broken usage of iterators. There were two separate issues here : - RestatInternal was using an iterator after a call to erase(). This will not work because it will be invalidated. - The "standard" for loop idiom for iterating over a map while making structural changes to it is broken. Switch to a while loop and treat cases where elements are erased differently from cases where they aren't. bug: 31092930 bug: 30963384 Plus additional changes: ----------------------------------------------- - add /dev/__properties__ to the whitelist. Change-Id: I709a7f4913e807a8fec8a58c81e98fe5b5222820 (cherry picked from commit 41ca1bce01af7e86aeff9009df54bbc81e3c77d0)
| | * DO NOT MERGE: Fix vulnerability where large GPS XTRA data can beDavid Christie2016-08-251-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | injected. -Can potentially crash system with OOM. Bug: 29555864 Change-Id: I7157f48dddf148a9bcab029cf12e26a58d8054f4 (cherry picked from commit 5439aabb165b5a760d1e580016bf1d6fd963cb65)
| | * Bind fingerprint when we start authentication - DO NOT MERGEJim Miller2016-08-254-18/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where it was possible to authenticate the wrong user. We now bind the userId when we start authentication and confirm it when authentication completes. Fixes bug 30744668 Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2 (cherry picked from commit b6f4b48df273d210d13631b4c2426482feb40c97)
| | * Process: Fix communication with zygote.Narayan Kamath2016-08-251-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't write partial requests, and don't return (or throw) early after partially reading a response. bug: 30143607 (cherry-picked from commit 448be0a62209c977593d81617853a8a428d013df) Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1 (cherry picked from commit e29c6493c07acf1a0b706917e9af0c8d761c8ae9)
| | * Fix vulnerability in LockSettings serviceJim Miller2016-08-252-2/+8
| | | | | | | | | | | | | | | | | | | | | Fixes bug 30003944 Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d (cherry picked from commit 2d71384a139ae27cbc7b57f06662bf6ee2010f2b)
| | * DO NOT MERGE: Clean up when recycling a pid with a pending launchAmith Yamasani2016-08-252-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for accidental launch of a broadcast receiver in an incorrect app instance. Bug: 30202481 Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f (cherry picked from commit d1eeb5b7b489d47994a71510f1ed5b97b8e32a7a)
| * | batteryservice: Remove remnants of CAF's HVDCP changesZhao Wei Liew2016-11-081-31/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit ce521ee7de0bf1264abe0cd399f59e505ff28005 removed the usage of isHvdcpPresent(), but did not remove the function itself. Remove isHvdcpPresent() as clean-up. This essentially reverts the rest of the following commits: 64deb448b8ac50587bc90e3506e639e4e1a066ed batteryservice: Avoid exception if device doesn't support HVDCP 4df4f532741d4aaa848d70c2465765a9a8b19d87 batteryservice: add support for charger led blinking Change-Id: Ie39c11ee9811f6af84a55ed85b72123cc449c735
| * | Fix zen priority mode vibration logic.Danny Baumann2016-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | Even if zen priority mode is active and vibration is allowed, we still want to keep notifications with score below the threshold silent. Change-Id: I0a60bbd787e7f98f721129902054ab37fb9f58a7
| * | SystemUI: Fix possible NPEMichael W2016-11-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | isTaskAboveTask() results in an NPE if the caller is null. Wrap with null checks on lauchTargetTask and launchTargetTask.group to prevent this Change-Id: I372ea7744c67ddd11d9731e6bee1858d4dd3318c Reference: BugDumps 20161021-27 L#77
| * | services: battery: Don't blink with an hvdcp chargerDiogo Ferreira2016-11-041-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quick charging doesn't really turn the device into a ticking time bomb so there is no use in frantically blinking the led while charging. This is a partial revert of the lights changes in a qualcomm commit (ec43b6d83). Change-Id: I42fdaa4a0af1bfa96c598b4209cbe9936d0de35d Ticket: MARMITE-441
| * | bootanimation: enable multithread decode by defaultDan Pasanen2016-11-031-1/+1
| | | | | | | | | | | | Change-Id: Icb17f58a1165b697465a8e3b780c54ff7784c9c6
| * | Use material icons in printer selection activity.Danny Baumann2016-10-302-2/+28
| | | | | | | | | | | | Change-Id: I4150e18d1a2e1c5ed8bad576ed3b21f2b5d7e60d
| * | Support enforcing a minimum delay between notification sounds of an app.Danny Baumann2016-10-203-1/+74
| | | | | | | | | | | | | | | | | | Useful e.g. for messenger apps. Change-Id: If8e8cc9e2f02d70537c1f9dc14f22bbd0ec1e9a6
| * | (Optionally) allow vibration during priority zen mode.Danny Baumann2016-10-194-18/+54
| | | | | | | | | | | | Change-Id: I6fb81c5898fbfe9e89a4af3fdc042266c8a9be6c
| * | Fix volume keys wakeup status handlingGabriele M2016-10-081-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same status flag is used for the three different volume keys, however nothing prevents users from pressing multiple keys at the same time. This allows to set the status flag with one volume key and clear it with the other volume key. Use one flag per key so that we never end up in an inconsistent state. This fixes the seldom power button issues that happen when the "volume wake" feature is enabled. Change-Id: I08f5f9ff696bef3dd840cff97d570e44ebe03e4e
| * | Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-0610-32/+103
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.1 Release 72 (M4B30X) # gpg: Signature made Tue 04 Oct 2016 09:47:40 AM PDT using DSA key ID 9AB10E78 # gpg: Can't check signature: public key not found
| | * | DO NOT MERGE: Fix vulnerability where large GPS XTRA data can beDavid Christie2016-08-261-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | injected. -Can potentially crash system with OOM. Bug: 29555864 Change-Id: I7157f48dddf148a9bcab029cf12e26a58d8054f4 (cherry picked from commit 5439aabb165b5a760d1e580016bf1d6fd963cb65)
| | * | Bind fingerprint when we start authentication - DO NOT MERGEJim Miller2016-08-264-18/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where it was possible to authenticate the wrong user. We now bind the userId when we start authentication and confirm it when authentication completes. Fixes bug 30744668 Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2 (cherry picked from commit b6f4b48df273d210d13631b4c2426482feb40c97)
| | * | Process: Fix communication with zygote.Narayan Kamath2016-08-261-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't write partial requests, and don't return (or throw) early after partially reading a response. bug: 30143607 (cherry-picked from commit 448be0a62209c977593d81617853a8a428d013df) Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1 (cherry picked from commit e29c6493c07acf1a0b706917e9af0c8d761c8ae9)
| | * | Fix vulnerability in LockSettings serviceJim Miller2016-08-262-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 30003944 Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d (cherry picked from commit 2d71384a139ae27cbc7b57f06662bf6ee2010f2b)
| | * | DO NOT MERGE: Clean up when recycling a pid with a pending launchAmith Yamasani2016-08-262-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for accidental launch of a broadcast receiver in an incorrect app instance. Bug: 30202481 Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f (cherry picked from commit d1eeb5b7b489d47994a71510f1ed5b97b8e32a7a)
| | * | Reduce shell power over user management.Sudheer Shanka2016-08-173-6/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove MANAGE_USERS permission from shell and whitelist it for some specific functionality. Bug: 29189712 Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
generated by cgit v1.1 at 2024-12-22 12:26:53 +0000