summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Un-remove legacy ConnectivityManager API.Robert Greenwalt2015-07-285-19/+7
| | | | | | | | These were @removed too soon. We need to keep them @deprecated until the bulk of devices support the new API and then we can remove them. bug:22728205 Change-Id: If1b46ff1878f1778517624112b195c461645ddd1
* Merge "Allow soft hyphens in languages without patterns" into mnc-devRaph Levien2015-07-271-11/+13
|\
| * Allow soft hyphens in languages without patternsRaph Levien2015-07-271-11/+13
| | | | | | | | | | | | | | | | | | | | This patch sets up an "empty" hyphenator, which it uses by default for locales in which there is no hyphenation pattern data. This has the effect of enabling soft hyphens (U+00AD), which were otherwise disabled, because the "no-hyphen" code path didn't consider them. Bug: 19605972 Change-Id: I4dcb95cee8edc48495f7c38736f5abf26fa04935
* | Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.Jeff Sharkey2015-07-271-8/+16
| | | | | | | | | | Bug: 22697024 Change-Id: Ib7277e8850a49909e5d8d5ad5502cd9315cddf0b
* | Merge "Added the content description for the fingerprint icon" into mnc-devSelim Cinek2015-07-274-0/+7
|\ \
| * | Added the content description for the fingerprint iconSelim Cinek2015-07-244-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Added a content description for the fingerprint icon, which should be used throughout the platform. Bug: 22616421 Change-Id: I8d65a568af926a692fd6be3e27d40b5d2dd6cbb1
* | | Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-devAdam Lesinski2015-07-271-19/+28
|\ \ \
| * | | BatteryStats: Prevent BatteryService from blockingAdam Lesinski2015-07-271-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BatteryService is a low level service, and we shouldn't have it block in BatteryStatsService while collecting external data from components like WiFi. Deadlocks can occur this way. Bug:22559655 Change-Id: I64026453d191695eb583a47163ab6f48f882b085
* | | | Merge "Allow Settings to set background data restrict on secondary users." ↵Julia Reynolds2015-07-271-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | into mnc-dev
| * | | | Allow Settings to set background data restrict on secondary users.Julia Reynolds2015-07-271-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22721091 Change-Id: Iadfbd25f75f233f2c3c080e0de05b0244572b6cd
* | | | | Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for ↵George Mount2015-07-271-270/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RC1." into mnc-preview-docs"" This reverts commit 01fe3f86b1c1e0eb3d8c9ab0b2251233f9164c5d, reversing changes made to b83b5fa641847ee1d533253ba5e1a3e13913b9d9. This change is valid for mnc-dev and other mnc branches.
* | | | | Merge "Fix QS switch accessibility problem" into mnc-devJason Monk2015-07-271-1/+3
|\ \ \ \ \
| * | | | | Fix QS switch accessibility problemJason Monk2015-07-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the switch state so it can be read back correctly. Bug: 22710906 Change-Id: I2bcba96e53813118eb2be8dcb7e0b7d547767550
* | | | | | Merge "Pass correct extras to the custom print options activity" into mnc-devSvetoslav Ganov2015-07-271-1/+1
|\ \ \ \ \ \
| * | | | | | Pass correct extras to the custom print options activitySvet Ganov2015-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22734138 Change-Id: Iea1bc32c3e863072b2021b823bef2cefa54fa540
* | | | | | | Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-devJorim Jaggi2015-07-275-82/+242
|\ \ \ \ \ \ \
| * | | | | | | Move PIN/Pattern appear animation to RenderThread (1/2)Jorim Jaggi2015-07-225-82/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22205322 Change-Id: I253f20a397ab89cb78254338a0254619232d7300
* | | | | | | | am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into ↵George Mount2015-07-271-462/+270
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs" * commit '1c964bece6ce1bbbf9f641d95df3bf2de01f6ab7': Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"
| * | | | | | | | Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"George Mount2015-07-271-462/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c571a9a1d026cbf262cf36a5348f99d1ca0ec835, reversing changes made to a29cfefe2c157a28b256771b1dce4653d405dcf1. This should fix the build break for LMP downstream branches. Change-Id: I22aac1dd0fb7965a2877bae224bccc8df8ee8e17
* | | | | | | | | Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-devFyodor Kupolov2015-07-271-4/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATIONFyodor Kupolov2015-07-241-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call to checkPermission(ACCESS_COARSE_LOCATION) should return PERMISSION_GRANTED, when package only has ACCESS_FINE_LOCATION permission Bug: 21852542 Change-Id: I53fe2945784213693f59e7bfccc524276ea8c189
* | | | | | | | | | Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-devChris Craik2015-07-271-0/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix bitmap get/set pixels for ALPHA_8Chris Craik2015-07-241-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:22724734 Change-Id: If8307854f6bad6fac9ee0b394bf0b044c61183e5
* | | | | | | | | | | Merge "MIDI: fix running status parser" into mnc-devPhil Burk2015-07-272-23/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MIDI: fix running status parserPhil Burk2015-07-242-23/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running status was being parsed incorrectly. This could cause stuck notes or exceptions when sending running status messages to a Bluetooth MIDI device. Bug: 22689606 Change-Id: I9f7abce9758927be587eead9614617d5b0076353 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | | | Merge "Revert "Invoke geolocation permissions callback with denied state by ↵Tim Volodine2015-07-271-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | default."" into mnc-dev
| * | | | | | | | | | | Revert "Invoke geolocation permissions callback with denied state by default."Tim Volodine2015-07-271-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 954d1333c478d4dba6c9a0536510da4fd94c0622. The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046 Bug: 22685046 Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe (cherry picked from commit 0bb7d2e46710932d09688a18d4c5836f9b1413a5)
* | | | | | | | | | | | am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into ↵George Mount2015-07-271-270/+462
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs * commit 'c571a9a1d026cbf262cf36a5348f99d1ca0ec835': Update data binding for RC1.
| * | | | | | | | | | | am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docsGeorge Mount2015-07-271-270/+462
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6397ae6a0aedb8c7d085bb8907fc46a0e5bd7065': Update data binding for RC1.
| | * \ \ \ \ \ \ \ \ \ \ Merge "Update data binding for RC1." into mnc-preview-docsGeorge Mount2015-07-271-270/+462
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Update data binding for RC1.George Mount2015-07-201-270/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 21660467 Bug 22561175 Change-Id: I9f7440000082c48094f3c243e03269b6e3c7756a
* | | | | | | | | | | | | | am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. ↵George Mount2015-07-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add data binding to built javadoc." into mnc-preview-docs * commit 'a29cfefe2c157a28b256771b1dce4653d405dcf1': DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
| * | | | | | | | | | | | am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to ↵George Mount2015-07-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | built javadoc." into mnc-preview-docs * commit '95e6ae3ad1ba8647494f0b5007b7beee76493e03': DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
| | * | | | | | | | | | | Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into ↵George Mount2015-07-271-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-preview-docs
| | | * | | | | | | | | | DO NOT MERGE ANYWHERE. Add data binding to built javadoc.George Mount2015-07-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 22175560 Change-Id: Ie57e0b77cade4b994ca2ef80cbf1a4c615a943f8
* | | | | | | | | | | | | Merge "decide interruptions based on current data, not previous data." into ↵Chris Wren2015-07-271-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | decide interruptions based on current data, not previous data.Chris Wren2015-07-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shouldInterrupt() now takes an optional StatusBarNotification object that will be used instead of the one on the entry. Bug:22462619 Change-Id: I5a1d9205b22ad733d5bc582693edad26518e1959
* | | | | | | | | | | | | | Merge "add ticker to enqueue message for easier debugging" into mnc-devChris Wren2015-07-271-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | add ticker to enqueue message for easier debuggingChris Wren2015-07-171-0/+3
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22462619 Change-Id: Iadb28d251b55c1a1f241c0d0a4fb8e117b8030c0
* | | | | | | | | | | | | Merge "Change to connectivitycheck.gstatic.com" into mnc-devErik Kline2015-07-272-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Change to connectivitycheck.gstatic.comErik Kline2015-07-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18869302 Bug: 22368233 Change-Id: Iaecb59e4ef13a0fa82a0a4a920689804d24044c8
* | | | | | | | | | | | | | Merge "Also check app-ops on path-permissions." into mnc-devJeff Sharkey2015-07-252-41/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Also check app-ops on path-permissions.Jeff Sharkey2015-07-242-41/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any place that we check permissions we also need to check any app-ops associated with those permissions. In the case of providers with both <provider> and <path-permission> permissions, track and report the strongest app-ops denial. Bug: 22718722 Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a
* | | | | | | | | | | | | | | Merge "Fixed wake to unlock when the device has never been unlocked" into ↵Selim Cinek2015-07-251-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | | | Fixed wake to unlock when the device has never been unlockedSelim Cinek2015-07-241-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the fingerprint could still unlock the device when waking up with the fingerprint sensor, since we were not checking if it is allowed. Bug: 22622999 Change-Id: I039a4e0701c1f161f227cf6f1d25e8147548db47
* | | | | | | | | | | | | | | | Fix ambient displayJorim Jaggi2015-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a refactoring for touch, wake and unlock for fingerprint devices PhoneWindowManager now waits for Keyguard to draw its first frame in all cases, including when screen turns on for pulsing. However, since in this case the device is not awake, we need to check for screen on instead of awakeness when proceeding with the wake-up sequence. Without this change, screen on was blocked forever in the pulsing case. Bug: 22605235 Change-Id: Ib6089fd14b673e62347f2c9108d9a6783caa26b7
* | | | | | | | | | | | | | | | Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-devAdam Lesinski2015-07-252-21/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | BatteryStats: Decode wakeup reasons in JavaAdam Lesinski2015-07-242-21/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wakeup reasons come from drivers and sometimes are malformed UTF-8. Decode them in Java so we can easily replace malformed characters and still have user visible strings. Bug:22368519 Change-Id: Ifade1a7fcdf6545e7e344d74390200c329430e14
* | | | | | | | | | | | | | | | | Merge "Adapted the behavior when unlocking with fingerprint is not allowed" ↵Selim Cinek2015-07-256-8/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | | | Adapted the behavior when unlocking with fingerprint is not allowedSelim Cinek2015-07-236-8/+46
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now keep the fingerprint running and switch to the bouncer when the user successfully authenticated. Bug: 21618072 Change-Id: If00061cb3914afd4d7a7d75964594484c792a890
generated by cgit v1.1 at 2024-07-03 04:27:16 +0000