summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fixed a bug where the secure camera would flash when rotated" into ↵Selim Cinek2015-08-311-2/+3
|\ | | | | | | mnc-dr-dev
| * Fixed a bug where the secure camera would flash when rotatedSelim Cinek2015-08-281-2/+3
| | | | | | | | | | Bug: 23602571 Change-Id: I9608a004d97ad27a0f4c6da8e9d955dc644b4941
* | am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" ↵Bart Sears2015-08-311-1/+1
|\ \ | | | | | | | | | | | | | | | | | | into mnc-dev * commit '0e2e85898743a070a0c42036fa9d841694819a00': Don't throttle "while idle" alarms while not dozing
| * \ Merge "Don't throttle "while idle" alarms while not dozing" into mnc-devBart Sears2015-08-311-1/+1
| |\ \
| | * | Don't throttle "while idle" alarms while not dozingChristopher Tate2015-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, reduce the non-doze "while idle" minimum interval to be the same as the generally-enforced minimum futurity of new alarms. Bug 21602742 Change-Id: I044deaedc2daeff5d6f418f0fe091fea85f73fcf
* | | | am 4cb113ed: Merge "Fix a NPE when shutting down instrumentation" into mnc-devSvetoslav Ganov2015-08-311-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4cb113ed72b771d3148c00a025eb8bc949ff6a41': Fix a NPE when shutting down instrumentation
| * | | Merge "Fix a NPE when shutting down instrumentation" into mnc-devSvetoslav Ganov2015-08-311-2/+4
| |\ \ \
| | * | | Fix a NPE when shutting down instrumentationSvet Ganov2015-08-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:23657953 Change-Id: I7187c3d911de24abe20a2c462a10352dd741efed
* | | | | Merge "Run callbacks from fingerprintd through handler." into mnc-dr-devJim Miller2015-08-291-31/+62
|\ \ \ \ \
| * | | | | Run callbacks from fingerprintd through handler.Jim Miller2015-08-291-31/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a potential race condition on the client monitors where an async event from fingerprintd could change the state and disrupt communication with the clients. Fixes bug 23633702 Change-Id: I69635ab768f1e8abefd0b0d8b8e73bb81e7b5695
* | | | | | am 3c227bf2: Merge "Show the ResolverActivity in dock mode" into mnc-devIan Pedowitz2015-08-291-6/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '3c227bf2418c6d1b6831f0fa7ad0442b0fcbdc07': Show the ResolverActivity in dock mode
| * | | | | Merge "Show the ResolverActivity in dock mode" into mnc-devIan Pedowitz2015-08-291-6/+8
| |\ \ \ \ \
| | * | | | | Show the ResolverActivity in dock modeChristopher Tate2015-08-271-6/+8
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are multiple dock apps present the end result should be the disambiguation UI, not a fast-forward to the 'normal' home app. Bug 23501598 Change-Id: Iebc106b136cb1e446d1e93935738335504f5b812
* | | | | | am 82d14d60: Merge "Crashing the system process is inadvisable" into mnc-devChris Tate2015-08-281-4/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '82d14d60e7a772ecf45b637fd51a2335ad2a40cf': Crashing the system process is inadvisable
| * | | | | Merge "Crashing the system process is inadvisable" into mnc-devChris Tate2015-08-281-4/+6
| |\ \ \ \ \
| | * | | | | Crashing the system process is inadvisableChristopher Tate2015-08-281-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When asking for the set of services published by a package, it's quite possible that there are none, in which case the returned List<> is null rather than valid-but-empty. Don't bother looking at it when it's null. Bug 23614440 Change-Id: Ibebb26b9c3f75ec810a95f1b9d2663e884cb98bc
* | | | | | | Merge "Fix deadlock when updating rotation" into mnc-dr-devChong Zhang2015-08-281-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix deadlock when updating rotationChong Zhang2015-08-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post a runnable in MyOrientationListener.onProposedRotationChanged for the updateRotation() so that it doesn't acquire WM lock while holding WindowOrientationListener lock. It could cause deadlock if WM is is performing a relayout and try to access WindowOrientationListener. bug: 23507268 Change-Id: I5775f5a13cae0283fef64877801bf8a39dfc90a4
* | | | | | | | am d88152b4: Merge "Give shell permission to move apps." into mnc-devJeff Sharkey2015-08-281-3/+8
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'd88152b4d910fa5e79908dcb6f14cd56ad03b21a': Give shell permission to move apps.
| * | | | | | | Give shell permission to move apps.Jeff Sharkey2015-08-281-3/+8
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clear identity when measuring ASEC sizes to relax a second permission requirement. Bug: 23600574 Change-Id: Ib3a104426758e0e8f35dff0e504fe874bed7311f
* | | | | | | Merge "Fix NPE in AR hardware binding sequence. b/22772433" into mnc-dr-devAnatol Pomazau2015-08-281-0/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix NPE in AR hardware binding sequence.destradaa2015-08-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/22772433 To keep the old Watcher binding sequence backwards compatible, it is required to ensure that the callback is only invoked if the feature is supported by the platform, and an instance is available. Change-Id: I0a6335f10647184abdad3ee1583b505160a3308f
* | | | | | | Merge "Added event log for camera launch gesture." into mnc-dr-devZhentao Sun2015-08-272-3/+101
|\ \ \ \ \ \ \
| * | | | | | | Added event log for camera launch gesture.Zhentao Sun2015-08-262-3/+101
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed b/23523554. Logs time duration when the underlying sensor was turned on to detect camera launch gesture. The goal is to diagnose the power consumption of the camera launch gesture. Change-Id: Ie9554e0ba1c5b290c451f951472575289bae85c7
* | | | | | | am 8f1ea834: Handle the -a flag for dumpsys appops.Tim Kilbourn2015-08-271-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit '8f1ea834f9af5ccf6cea1f529f63e727cd13b6a8': Handle the -a flag for dumpsys appops.
| * | | | | Handle the -a flag for dumpsys appops.Tim Kilbourn2015-08-261-0/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 23017449 Change-Id: I6ce9ac368e2739153867c246893eb544d052834f
* | | | | Merge "Migrate camera vibration to the systemUI" into mnc-dr-devSelim Cinek2015-08-261-6/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Migrate camera vibration to the systemUISelim Cinek2015-08-261-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make sure the device is awake before vibrating. Bug: 23200352 Change-Id: I63d04a82a4b8d9fa3e8f9deff5dd71295c82c930
* | | | | Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." ↵Daniel Estrada Alva2015-08-262-25/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mnc-dr-dev
| * | | | | Cherry-pick: Add callback-based support for HW Activity Recognition.destradaa2015-08-242-25/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a callback-based mechanism for GmsCore to connect to Hardware Activity Recognition. This allows GmsCore to stop polling to identify if the Android platform supports the functionality or not. Bug: 17112184 Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
* | | | | | Merge "Launching the camera now from systemUI including animations" into ↵Selim Cinek2015-08-264-28/+21
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | mnc-dr-dev
| * | | | | Launching the camera now from systemUI including animationsSelim Cinek2015-08-264-28/+21
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GestureLaunchService now informs systemUI that a launch has been requested and the systemUI, depending on its state will launch the Camera in the correct mode, including animations. Bug: 22957192 Bug: 22958025 Change-Id: I815437c8bd33638245ac61a750f64af74fe3e1e3
* | | | | Merge "Update rotation without holding the WOL lock." into mnc-dr-devMichael Wright2015-08-261-5/+16
|\ \ \ \ \
| * | | | | Update rotation without holding the WOL lock.Michael Wright2015-08-251-5/+16
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure to only ever update the orientation of the device from WindowOrientationListener when we're not holding the WOL class lock, otherwise we can deadlock when WMS calls into us to set the orientation based on an apps preference. Bug: 23491348 Change-Id: Ifeded4d5d1dc923fa2ce0473bc4b7fe950dc0cfd
* | | | | Merge "Disable fingerprint after user lockout" into mnc-dr-devAdrian Roos2015-08-261-0/+6
|\ \ \ \ \
| * | | | | Disable fingerprint after user lockoutAdrian Roos2015-08-251-0/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 22677859 Change-Id: I38b918d2e40b5bb423f2e5c171fe65bed8d440a6
* | | | | am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-devTodd Kennedy2015-08-261-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb': Allow extra slop in battery stats
| * | | | Merge "Allow extra slop in battery stats" into mnc-devTodd Kennedy2015-08-261-2/+2
| |\ \ \ \
| | * | | | Allow extra slop in battery statsTodd Kennedy2015-08-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current slop of 30ms was causing too many WTFs to be thrown. Increase the slop to 750ms. Bug: 23391894 Change-Id: Ica5be9b00745bfe58872d43be8c32f8c147075ed
* | | | | | Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-devJim Miller2015-08-251-0/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Handle driver errors from remove, enroll and auth.Jim Miller2015-08-211-0/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FingerprintService expects callbacks from the HAL to happen over the provided notify() method. However, there are some circumstances when errors can't be propagated (i.e. the driver cannot be loaded). In this case, the call to the method (remove(), enroll(), authenticate()) fails and we get a return status != 0. When this happens, FingerprintService now sends an error response to the client. In general, this will mean the driver is unavailable, so we send FINGERPRINT_ERROR_HW_UNAVAILABLE. Fixes bug 23183484 Change-Id: Ifb40ba6fb1d960810043749fd8478ba37c968405
* | | | | am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.Nicolas Prevot2015-08-251-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'd34ecae444867b78be06bb5a6b0fb2a66c2e30aa': Don't set a null filter to a cross-profile ResolveInfo.
| * | | | Don't set a null filter to a cross-profile ResolveInfo.Nicolas Prevot2015-08-251-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | ResolverActivity expects the filter not to be null. BUG:23395395 Change-Id: Ie7081daba1ad138b1a3903ef9dd1b649806c8d0e
* | | | Merge "instrument fingerprint crypto token service" into mnc-dr-devChris Wren2015-08-251-0/+1
|\ \ \ \
| * | | | instrument fingerprint crypto token serviceChris Wren2015-08-241-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Histogram counts number of calls with and without a token. Bug: 22951001 Change-Id: Idaabee389bfa33eb009d48bb9a0edae146bcc217
* | | | Fix issues with light status bar and fp wake-and-unlockJorim Jaggi2015-08-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When wake-and-unlocking, make sure to skip the light status bar transition. - Fix race condition with window manager when unlocking when device is interactive for supplying the timings for the light status bar transition. - Fix media artwork when wake-and-unlocking while pulsing. Bug: 23365544 Change-Id: I209ca1e6684811f5f313354ca1614a0ebd49388c
* | | | am def6896d: Fix shifted wallpaper after OTAAdrian Roos2015-08-241-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'def6896d10ce4869831bf91eb73709e8a9714b27': Fix shifted wallpaper after OTA
| * | | Fix shifted wallpaper after OTAAdrian Roos2015-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where WindowManager's and SurfaceFlinger's view of the wallpaper's position could get out of sync. Bug: 13020924 Change-Id: Iad17b0f516fffacd2877ceac40fcc8e2647c06b2
* | | | Remove window from mWaitingForDrawn when policy hiddenJorim Jaggi2015-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing a wake-and-unlock sequence and the app underneath hides the status bar, we are dismissing Keyguard, the app gets focus, the app hides the status bar BUT we haven't finished drawn yet, so we are waiting until the timeout because w.hasDrawnLw() always returns false. Remove window from pending list if it gets policy hidden. Bug: 23431343 Change-Id: I27e8c6d4efb435a4d3b632a4a37c0de5b021c2e7
* | | | Camera: Add support for notifying NFC stack when camera is activeEino-Ville Talvala2015-08-211-11/+125
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | On some devices, NFC full poll operation and camera operation interfere. Add a system property ro.camera.notify_nfc. When set to > 0, the NFC adapter will be notified to disable polling whenever the camera is active. Bug: 23393557 Change-Id: I7e22018900970cbbd3d34bd8b3974e0b1cc98a8d