summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* BatteryStats: Fail gracefully on corrupt battery statsAdam Lesinski2015-07-083-39/+34
| | | | | Bug:22328963 Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
* Merge "UsbDeviceManager: Add back support for persistent property" into mnc-devVineeta Srivastava2015-07-071-6/+18
|\
| * UsbDeviceManager: Add back support for persistent propertyAjay Dudani2015-07-071-6/+18
| | | | | | | | | | | | | | | | | | Take into account the value of persist.sys.usb.config when updating sys.usb.config. The persistent prop can hold information regarding additional enumerations required for the device. Bug: 21929369 Change-Id: Ic11ebf62ce114f2d0a097ad4405de71173b23139
* | Merge "Clean up obsolete pending timeout after restoring package metadata" ↵Christopher Tate2015-07-071-1/+4
|\ \ | | | | | | | | | into mnc-dev
| * | Clean up obsolete pending timeout after restoring package metadataChristopher Tate2015-07-071-1/+4
| | | | | | | | | | | | | | | | | | Bug 22040047 Change-Id: I460dbcc50a45d794392beb9ff4a4358c05c87e07
* | | Merge "Clean up get sensorList." into mnc-devAravind Akella2015-07-072-19/+16
|\ \ \
| * | | Clean up get sensorList.Aravind Akella2015-07-012-19/+16
| | | | | | | | | | | | | | | | Change-Id: I46da79cc50b5130a3f21bd567f50b29bf22196f9
* | | | Always wait for the main app window before starting a transitionJorim Jaggi2015-07-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When waiting for all the windows that belong to an activity, we skipped the main window, in case it didn't had a surface yet. This was a problem because with SurfaceViews: They set it's visibility extremely early in the app visibility change cycle. Then, they use another thread to draw content. Thus, they have drawn their first frame pretty fast, where the main thread might still be in the activity lifecycle phases. Then, we don't even have a surface for the main window yet, but we start the app transition already because we think the only interesting window for this app token is the SurfaceView, which has already drawn. Bug: 22207948 Change-Id: I708add3aab00575ae1707b25622b9b4614472892
* | | | Merge "Fixed keyguard affordances" into mnc-devSelim Cinek2015-07-071-19/+2
|\ \ \ \
| * | | | Fixed keyguard affordancesSelim Cinek2015-07-061-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases, the keyguard affordances could not be launched due to a bug. This was because the targetedView was not properly reset sometimes. Bug: 22013726 Change-Id: I4525dc5adf07f4d023ef8553d3db0b16c8f754c4
* | | | | Merge "Simplify matrix copy constructor/load" into mnc-devChris Craik2015-07-072-6/+1
|\ \ \ \ \
| * | | | | Simplify matrix copy constructor/loadChris Craik2015-07-072-6/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | bug:22208220 Change-Id: Id096eb8de8da0dd1687d6af9456b16ce2a1a589b
* | | | | Merge "Support loading AES keys with authorized digests." into mnc-devAlex Klyubin2015-07-071-4/+0
|\ \ \ \ \
| * | | | | Support loading AES keys with authorized digests.Alex Klyubin2015-07-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug, Android Keystore failed to load AES keys authorized for use with one or more digests. This CL fixes this bug. Bug: 22300737 Change-Id: Ia49e27833dddb526565e4dc4977ed1e352e5836b
* | | | | | am 4357181d: am e44b86b2: docs: Removed READ_EXTERNAL_STORAGE from ↵Andrew Solovay2015-07-071-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \'normal\' permissions * commit '4357181d236bf189ea7855755803275160447423': docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissions
| * \ \ \ \ \ am e44b86b2: docs: Removed READ_EXTERNAL_STORAGE from \'normal\' permissionsAndrew Solovay2015-07-071-4/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e44b86b23bc15ccf2016e044bfa5d23c177a1d3b': docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissions
| | * | | | | | docs: Removed READ_EXTERNAL_STORAGE from 'normal' permissionsAndrew Solovay2015-07-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per communication from Ben, READ_EXTERNAL_STORAGE was incorrectly marked as a 'normal' permission in preview 1, and is properly changed to 'dangerous' for preview 2. Updating the docs accordingly. See first comment for doc stage location. Change-Id: I0f824fb9689d2e7323e505b0200fda23eaa71eed
* | | | | | | | Merge "Don't update DisplayLists when dumping" into mnc-devChris Craik2015-07-071-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't update DisplayLists when dumpingChris Craik2015-07-071-2/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22234438 Updating the displaylist is invalid since this debug method isn't called on the UI thread, and it defeats the purpose of seeing what the hierarchy is currently rendering. Change-Id: I10c5cc6dbae8d304559dfc6e863b0ede158d554f
* | | | | | | | Merge "wifi: Fix softAP turn-ON issue in statically loaded driver" into mnc-devxin He2015-07-071-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | wifi: Fix softAP turn-ON issue in statically loaded driverRavi Joshi2015-07-011-1/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftAP fails to turn-ON on some statically loaded driver models in which the network interfaces are not available until the firmware is reloaded in the AP mode. This change provides the fix to load the firmware earlier in the softAP start sequence to make wlan0 interface available. b/22236507 Change-Id: If2c4b28c704bc6e5acb2be70d5d9d84d6e98f747
* | | | | | | | Revert "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission"Ian Pedowitz2015-07-074-21/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d6b404c72da7e2475508c7d5948494b2e9b1a262. This CL seems to have broken the build, causing GMSCore to continuously crash. Bug: 22313634 Bug: 22312938 Bug: 22314605 Bug: 22308392 Bug: 22307889
* | | | | | | | Merge "Don't dismiss volume during animation" into mnc-devJason Monk2015-07-071-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't dismiss volume during animationJason Monk2015-07-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (sometimes this messes up the state and results in it getting stuck on the screen) Bug: 22169656 Change-Id: I7738be8f7f54fc72d68bf9831baed2821f362bb1
* | | | | | | | | Merge "Fix to work statusbar configs as mcc/mnc" into mnc-devJason Monk2015-07-072-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix to work statusbar configs as mcc/mncSungmin Choi2015-07-072-3/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call handleConfigurationChanged() at the end of PhoneStatusBar#onConfigurationChanged to update statusbar configs. BUG: 22215928 Change-Id: I7329d4949a8a47717ea037cf007ef0baa63507bd
* | | | | | | | | Merge "Adjust for pipeline stalls" into mnc-devJohn Reck2015-07-0711-26/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adjust for pipeline stallsJohn Reck2015-07-0611-26/+58
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20853441 Calculating duration that crosses the UI-RT sync point will now subtract out the time spent waiting in queue under the assumption that this time will be accounted for in the previous frame's metrics Change-Id: Ia8213f4410638840613f5ae439e98dfb77532a6a
* | | | | | | | | Merge "Update javadoc on DPM.setGlobalSetting" into mnc-devZoltan Szatmary-Ban2015-07-071-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update javadoc on DPM.setGlobalSettingZoltan Szatmary-Ban2015-07-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19967818 Change-Id: Id91c137f7b5200be8e8b581126a518f3b6be147e
* | | | | | | | | | Merge "Add WebView permission MIDI sysex" into mnc-devRichard Coles2015-07-073-0/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add WebView permission MIDI sysexTao Bai2015-06-233-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d27e8ca48ee35b02dddc5d85ecfebfdaa3ec8cb
* | | | | | | | | | | Merge "Notify the profile when cloned settings are changed." into mnc-devEsteban Talavera2015-07-071-0/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Notify the profile when cloned settings are changed.Nicolas Prevot2015-07-031-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SettingsProvider, for settings that are cloned from the parent to the profile: When the parent value is changed, notify ContentObservers in the profile as well. BUG:21414456 Change-Id: Ie0560d1332174499d067db9978553843b640a161
* | | | | | | | | | | | Merge "Drag handles persist after lost focus in extracted mode" into mnc-devAndrei Stingaceanu2015-07-072-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Drag handles persist after lost focus in extracted modeAndrei Stingaceanu2015-07-012-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If extracted mode is to be started and we already had a selection made do not start the action mode but only the selection. Non-extracted mode keeps the current behavior. Bug: 22100966 Change-Id: Iad9a95c28474a68dc4fbc7032cbab1dc6e234d45
* | | | | | | | | | | | | Merge "Final resource IDs." into mnc-devIan Pedowitz2015-07-073-226/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Final resource IDs.Dianne Hackborn2015-07-063-226/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6200a013375f1b3e196b6426a6c925f4e9dfe4b1
* | | | | | | | | | | | | | Merge "FloatingToolbar: Offset visible rect by the rootview's offset" into ↵Abodunrinwa Toki2015-07-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | | FloatingToolbar: Offset visible rect by the rootview's offsetAbodunrinwa Toki2015-06-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | windowSoftInputMode="adjustPan" config causes the root view to be offset if necessary when the soft keyboard is shown to keep the text selection visible. Account for this offset when calculating the global visible rect of the textview in relation to the screen. Bug: 21687644 Change-Id: Id44cad387d0a3f1f063880497c234052924717ea
* | | | | | | | | | | | | | | Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-devJan Nordqvist2015-07-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Changed config_wifi_hotspot2_enabled to false.Jan Nordqvist2015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22014284 Change-Id: I77f9963794742269701da00468c873bf6d8983c6
* | | | | | | | | | | | | | | | Merge "Fixed a bug where redacted notifications had the wrong height" into ↵Selim Cinek2015-07-071-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | | | Fixed a bug where redacted notifications had the wrong heightSelim Cinek2015-07-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When redacted notifications were added on the lockscreen, it's size might have been incorrect sometimes. Bug: 22235304 Change-Id: I30f665bc8e725cdd40a20051e995b10e77f96918
* | | | | | | | | | | | | | | | Merge "ImageUtils: fix image copy issue" into mnc-devZhijun He2015-07-071-2/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | ImageUtils: fix image copy issueZhijun He2015-07-061-2/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source and destination images may have different alignment requirements, therefore may have different strides. Copy row by row for such case. Bug: 21934891 Change-Id: Id53f45f1429d233032fa608f7ab9e2774e88c13b
* | | | | | | | | | | | | | | | | Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they ↵Adam Lesinski2015-07-072-10/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are not in use anymore" into mnc-dev
| * | | | | | | | | | | | | | | | | BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not ↵Adam Lesinski2015-07-062-10/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in use anymore Bug:22225933 Change-Id: I384a3c37ad45af981cca5fc3e92643da948d48d0
* | | | | | | | | | | | | | | | | | Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW ↵Billy Lau2015-07-074-4/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission" into mnc-dev
| * | | | | | | | | | | | | | | | | | Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permissionBilly Lau2015-07-074-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raised the protection level of WRITE_SETTINGS permission to appop and also allowed backwards compatibility with pre23 flag. Introduced new action to manage write system settings as a new API and renamed the string that describes the managing of overlay permission. Change-Id: I939a95b9a8b1ae75bf67aa6d8190c92a8d2001d3
generated by cgit v1.1 at 2025-02-13 22:57:24 +0000