summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-22merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devandroid-6.0.1_r24marshmallow-dr1.5-releaseThe Android Automerger
2016-03-17merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger
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
2016-01-14Add STEM_1, STEM_2 and STEM_3 key as wakeup keysChenjie Luo
Bug: 25860409 Change-Id: I3f525c9c8df81807d98391c70cd2d1f8c139c8f5
2016-01-14Merge "UsageStats: Use new settings key idle_duration2 for app idle" into ↵Adam Lesinski
mnc-dr1.5-dev
2016-01-13Pulling in https://android-review.googlesource.com/#/c/186482/1Nancy Zheng
am: 74dfcf90f1 * commit '74dfcf90f18d8d0e1128707a5986c4fa94d70350': Pulling in https://android-review.googlesource.com/#/c/186482/1
2016-01-13Pulling in https://android-review.googlesource.com/#/c/186482/1Nancy Zheng
Fix memory leak in HWUI std::unique_ptr::release just releases the ownership of the managed object. To delete the object, std::unique_ptr::reset function should be called. Bug: 26116596 Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
2016-01-13Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-devSelim Cinek
2016-01-13Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-devIan Pedowitz
2016-01-13Revert "Avoid drawable invalidation during draw()"Alan Viverette
This reverts commit e5e59c6da424096da8f57137cdc57d8bd410b079. Drawables expect to be able to call invalidateSelf() during draw() to pump animation frames. We shouldn't break this. Bug: 26533725 Change-Id: Ibe2871f2622faf836637225fc1e3e6f0ca6def47
2016-01-13Fixed a crash with the heads up managerSelim Cinek
Bug: 25693389 Change-Id: Id852e342000bff6de0ce19f442eb53b21e935b7b
2016-01-13UsageStats: Use new settings key idle_duration2 for app idleAdam Lesinski
Ignores the old, re-appropriated key "idle_duration" which is now set to a high value in order to force disable app idle on devices with bug b/26355386 Bug:26355386 Change-Id: Iff9de843ad6e547d29c1583687fc7f7ce7e15090
2016-01-13Merge "Add WiFi Calling overlays for T-Mobile's MCCMNCs" into mnc-dr1.5-devPavel Zhamaitsiak
2016-01-13Add WiFi Calling overlays for T-Mobile's MCCMNCsPavel Zhamaitsiak
Bug: 26024279 Change-Id: I71920fc45dec3e4fe5a3f4e349ff1ba3df703000
2016-01-13Tests for getPrimaryHorizontal with grapheme boundariesKeisuke Kuroyanagi
Bug: 25375561 Change-Id: I022473627499d7f18105e3a300754fae5be7da8e
2016-01-13Merge "UsageStats: Fix issue where initializing data for first time would ↵Adam Lesinski
cause crash" into mnc-dr1.5-dev
2016-01-12UsageStats: Fix issue where initializing data for first time would cause crashAdam Lesinski
With the updated rolling window of stats for app idleness, we need to make sure it is populated before we initialize some defaults. Now that we look at older entries to figure out idleness, if those entries are in the future (due to time change), set them to the current screen on time. Bug:26504153 Change-Id: Ia22add0e8eaf0f137002bbe3e91d747fef5b7d69
2016-01-12Merge "In CanvasContext::doFrame, make a separate call to ↵Matthew Bouyack
computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am: eebf168e43 * commit 'eebf168e43e4a455a74e949cc0d7e156b231a697': In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
2016-01-12Merge "In CanvasContext::doFrame, make a separate call to ↵Matthew Bouyack
computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev
2016-01-12In CanvasContext::doFrame, make a separate call to computeFrameTimeNanosMatthew Bouyack
and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments. The order of function argument evaluation is undefined in C++. Because the value returned from TimeLord::latestVsync may be changed by the preceding call to TimeLord::computeFrameTimeNanos the values of the arguments passed to UiFrameInfoBuilder::setVsync is also undefined. This change removes any ambiguity. Change-Id: Ie71ee453f9ccc725edfe5f7cc9b277f2a809dfdc
2016-01-12Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-devAlan Viverette
2016-01-12Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-devAlan Viverette