summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-29Bump up the uncrypt timeout to 30 min.android-6.0.1_r68marshmallow-dr1.6-releaseTao Bao
Bug: 30490464 Change-Id: I9b65afb10134d79b2f5b5275a6d81065a04e91b9 (cherry picked from commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded)
2016-08-01DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.android-6.0.1_r67Sudheer Shanka
Bug: 29189712 Bug: 30317026 Bug: 30235113 Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
2016-08-01DO NOT MERGE: Fix CTS regressionSungsoo Lim
Bug: 30297223, Bug: 30437363 Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
2016-07-21DO NOT MERGE: Remove the use of JHEAD in ExifInterfaceSungsoo Lim
Bug: 29270469 Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f
2016-07-21DO NOT MERGE Block the user from entering safe boot modeBenjamin Franz
Block the user from entering safe boot mode if the DISALLOW_SAFE_BOOT policy is set. Bug: 26251884 Change-Id: I4945d5d676928346c11ea305a5b6a2e1a42e94e6
2016-07-21Add bound checks to utf16_to_utf8Sergio Giro
Test: ran libaapt2_tests64 Bug: 29250543 Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3 (cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
2016-07-21Check caller's uid before allowing notification policy access.Julia Reynolds
Bug: 29421441 Change-Id: I7460268595e932d54660b02007bcd68b95fe8aec
2016-07-21Fix string equality comparisonPaul Stewart
Don't use "==" to compare strings. Bug: 25624963 Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
2016-07-21WifiEnterpriseConfiguration: Do not print credentials in toStringPaul Stewart
BUG:25624963 Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
2016-06-24Add pm operation to set user restrictions.android-6.0.1_r62Sudheer Shanka
Bug: 29189712 Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
2016-06-24Reduce shell power over user management.Sudheer Shanka
Remove MANAGE_USERS permission from shell and whitelist it for some specific functionality. Bug: 29189712 Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
2016-06-24DO NOT MERGE Disable app pinning when emergency call button pressedHall Liu
Also disables app pinning when the "return to call" button is pressed and brings up the in-call screen when app pinning is stopped if there is an existing call. Combination of ag/1091397 and ag/1085584 adapted for MNC. Bug: 28558307 Bug: 28761672 Change-Id: I82ec4042bff387c845ce571b197a4a86e1dd5ec8
2016-06-24DO NOT MERGE Fix intent filter prioritiesTodd Kennedy
Since this is a backport, there is only one rule that guards intent filter priorities: 1) Updates will NOT be granted a priority greater than the priority defined on the system image. Bug: 27450489 Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-06-24Don't trust callers to supply app info to bindBackupAgent()Christopher Tate
Get the canonical identity and metadata about the package from the Package Manager at time of usage rather than rely on the caller to have gotten things right, even when the caller has the system uid. Bug 28795098 Change-Id: I215786bc894dedf7ca28e9c80cefabd0e40ca877 Merge conflict resolution for ag/1133474 (referencing ag/1148862) - directly to mnc-mr2-release Change-Id: I199a4eb2236c2ab1bfd5e61a18a96599478f1497
2016-05-27Backport of backup transport whitelistandroid-6.0.1_r54android-6.0.1_r53Christopher Tate
Sysconfig define a whitelist of permitted backup transports Previously any apk bundled in priv-app could insert a backup transport. Reduce risk surface by giving the OEM explicit control over who is allowed to handle backup data. Bug 28406080 Backport of 494df791728f4d42d67e935c327910975993ad29 from N Change-Id: I9f90e324169a68720d608f74754d284a7e59cf87
2016-05-27Backport ChooserTarget package source check from NAdam Powell
Fix a bug where a ChooserTargetService could supply a ChooserTarget pointing at a non-exported activity outside of its own package and have it launch. Bug 28384423 Change-Id: I3f5854f91c5695ad9253d71055ef58224df47008
2016-05-27Don't pass URL path and username/password to PAC scriptsPaul Jensen
The URL path could contain credentials that apps don't want exposed to a potentially malicious PAC script. Bug: 27593919 Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed
2016-05-27Fix missing permission check when saving pattern/passwordJim Miller
Fixes bug 28163930 Change-Id: Ic98ef20933b352159b88fdef331e83e9ef6e1f20
2016-04-21Add new, hidden MotionEvent flag for partially obscured windows.android-6.0.1_r45Michael Wright
Bug: 26677796 Change-Id: Ic4219b883bb760495e6172ef61e84e9725876ef6
2016-03-25[DO NOT MERGE] Disallow guest user from changing Wifi settingsandroid-6.0.1_r25Samuel Tan
Disallow existing and newly created guest users from changing Wifi settings. BUG: 27411179 TEST: Flashed device, switched to existing guest user, and verified that Wifi settings are disabled. TEST: Flashed device, created new guest user, and verified that Wifi settings are disabled. Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3
2016-03-18DO NOT MERGE Add new ConnectionEvent API (hide) to send a notification to ↵Tyler Gunn
Telecom Connection event used to inform Telecom that it should play or stop the on hold tone. This is used to play or stop a tone when the peer puts the current call on hold. BUG=25357778 Change-Id: I2669f8f5062449784a712b9dd28e576326fcc679
2016-03-01NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05Shreyas Basarge
am: 58048c1f17 * commit '58048c1f17d54166c6a048af2365d17dd32f4d57': NPE fix for SyncStorageEngine read authority
2016-03-01Redact Account info from getCurrentSyncsMatthew Williams
BUG:26094635 If the caller to ContentResolver#getCurrentSyncs does not hold the GET_ACCOUNTS permission, return a SyncInfo object that does not contain any Account information. Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314 (cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
2016-02-02Import translations. DO NOT MERGEandroid-6.0.1_r22android-6.0.1_r21Geoff Mendal
Auto-generated-cl: translation import Bug: 26887781 Change-Id: I2f77e533633815badf267419addb9d5f7686a200
2016-02-01Import translations. DO NOT MERGEGeoff Mendal
Auto-generated-cl: translation import Bug: 26887782 Change-Id: If6bc1bd3f277f0289aecb7c063f899363079c248
2016-02-01Hack to get devices booting again.Jeff Sharkey
If we try scheduling a pass before the system is ready, record a pending event and dispatch once we're actually ready. Bug: 26863668 Change-Id: I028285383c8bbe8b653aeaa7544eefe3d41277bc (cherry picked from commit 538c11cf2175d4e30337e8776401bfede85866be)
2016-01-28Don't change screen on time on time changesAdam Lesinski
Screen on time should be measured in elapsed realtime, not wallclock. Cause a checkIdleStates to occur when reloading stats (on rollover and on time change). When time changes occur in the negative direction, the new stats file we create can overlap the previous one with regards to its end timestamp. Use the begin timestamp to determine which of the latest stats to merge. (b/22716352) Bug: 26488100 Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7
2016-01-22Check apps idle states on time changesAmith Yamasani
And ensure that the listeners are informed of app standby transitions that might occur during time changes. Fix for apps that sometimes don't have network access until reboot. Bug: 26488100 Change-Id: Ic342c188a6cd19faee88f50b2c6a342a6968cb23
2016-01-22Don't assume kernel tick is 100HzThierry Strudel
Bug: 26729731 Change-Id: I094d5fd0e611349becb91d4460bc2e4af255d125
2016-01-21Debug logging for when getActiveNetworkInfo returns BLOCKED.Lorenzo Colitti
Bug: 26488100 Change-Id: I991581732d35aed18392bed2f3d69ca8fb231f5e
2016-01-21Fix SystemUI animator leakJorim Jaggi
When there was a state change or layout when there was an animation set as the mobile icon in the status bar, we never stopped the old animation, which was infinite. This was using more and more CPU because the animations never got stopped. To fix this, we don't update the drawable when a layout happens and we stop the previous animation when replacing the icon. Bug: 26616870 Change-Id: If501155d1a99d587e50a1b77ebb03a21c940662b
2016-01-20Revert "Get animation update timing for AVD"Doris Liu
This reverts commit fc8e3cb768b7dfd7c0ed0fb93dd9d735887e8d45. Bug: 26616870 Change-Id: I2f018cb34f014f4ebb635e18cd940997507a4a4d
2016-01-19merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger
2016-01-18Import translations. DO NOT MERGEmarshmallow-dr1.5-devGeoff Mendal
Change-Id: I0ff7336ca90107f45266090de0ffc634daa54722 Auto-generated-cl: translation import
2016-01-15merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger
2016-01-15Merge "Supply content description for QS disconnect buttons" into mnc-dr1.5-devThierry Strudel
2016-01-15Merge "Stop leaking Notifications when they change groupKeys." into ↵Daniel Sandler
mnc-dr1.5-dev
2016-01-15Stop leaking Notifications when they change groupKeys.Dan Sandler
If a Notification changes groups (either from one group to another, or gets a group key for the first time, which takes it out of its implicit singleton group) it should be removed from the old group in NotificationGroupManager's mGroupMap and re-inserted under the new one. Unfortunately we were passing the *new* notification in the oldNotification argument, so we would always attempt (and fail) to remove it from the *new* group, leaving a strong reference to the Notification inside mGroupMap under an obsolete group key. Bug: 26561365 Change-Id: Ie5cdceb4f843dbd363652e00fbc0f3ac6f6ef247
2016-01-14Don't verify the scrollbar drawableAlan Viverette
Avoids infinite invalidations caused by re-use of scrollbar drawable during a single draw() pass. Does not address the general problem of drawable reuse causing unnecessary invalidations as a result of calls to setBounds() invoking invalidateSelf(). Bug: 26533725 Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
2016-01-14Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into ↵Ian Pedowitz
mnc-dr1.5-dev
2016-01-14Don't verify the scrollbar drawableAlan Viverette
Avoids infinite invalidations caused by re-use of scrollbar drawable during a single draw() pass. Does not address the general problem of drawable reuse causing unnecessary invalidations as a result of calls to setBounds() invoking invalidateSelf(). Bug: 26533725 Change-Id: I99e9c2dfe4ddfc833569e40e7268dcb03e931fc9
2016-01-14Supply content description for QS disconnect buttonsDan Sandler
Bug: 26555270 Change-Id: I3803c7ad78a64894eca5c36f5d9ecf7fc4a6ad92
2016-01-14DO NOT MERGE Fix for syncs being dropped when appIdle is onShreyas Basarge
Syncs were being dropped when appIdleMode was on for an app. This CL backs off the sync instead of dropping it. When the app becomes non-idle, backoff is cleared and the sync is performed. Bug: 26355386 Change-Id: I2040dfd847011d3ca902e66a8cd52b2a429177c1
2016-01-14Merge "Fix race condition when setting default ringtones" into mnc-dr1.5-devJustin Harrison
2016-01-14Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" ↵Amit Mahajan
into mnc-dr1.5-dev
2016-01-14Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into ↵Amit Mahajan
mnc-dr1.5-dev
2016-01-13Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]Vinit Deshpande
Bug: 24147407 Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
2016-01-14Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-devChenjie Luo
am: 4a577bff96 * commit '4a577bff9674f4bc748ab76bf48ac6e7d3e567cc': Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
2016-01-14Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-devChenjie Luo
2016-01-14DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGEAmit Mahajan
Bug: 24147407 Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 19:49:01 +0000