Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "A bunch more cleanups" | John Reck | 2015-04-15 | 3 | -69/+17 |
|\ | |||||
| * | A bunch more cleanups | John Reck | 2015-04-14 | 3 | -69/+17 |
* | | Merge "Added watchdog monitor for Binder threads availability." | Wale Ogunwale | 2015-04-15 | 2 | -2/+11 |
|\ \ | |||||
| * | | Added watchdog monitor for Binder threads availability. | Wale Ogunwale | 2015-04-14 | 2 | -2/+11 |
* | | | Merge changes from topic 'no_internet' | Lorenzo Colitti | 2015-04-15 | 2 | -6/+131 |
|\ \ \ | |||||
| * | | | Prompt if a network without an Internet connection is selected | Lorenzo Colitti | 2015-04-15 | 2 | -6/+131 |
* | | | | am 6fb80b70: am 99e23088: am 150e0e87: Merge "fix return value scale of notif... | Michael Wright | 2015-04-15 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | am 150e0e87: Merge "fix return value scale of notifyANR()" | Michael Wright | 2015-04-15 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | fix return value scale of notifyANR() | baik.han | 2015-04-15 | 1 | -1/+1 |
* | | | | | | Merge "Fix a SecurityException in setKeyguardEnabledState" | Benjamin Franz | 2015-04-15 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix a SecurityException in setKeyguardEnabledState | Benjamin Franz | 2015-04-14 | 1 | -4/+4 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge "Several fixes to Fingerprint code after large merge - route fingerprin... | Jim Miller | 2015-04-15 | 2 | -156/+230 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Several fixes to Fingerprint code after large merge | Jim Miller | 2015-04-14 | 2 | -156/+230 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge "Persist nickname and flags for volumes." | Jeff Sharkey | 2015-04-15 | 1 | -1/+226 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Persist nickname and flags for volumes. | Jeff Sharkey | 2015-04-14 | 1 | -1/+226 |
* | | | | | | Fix build | Andres Morales | 2015-04-14 | 1 | -1/+1 |
* | | | | | | Merge "Checkpoint of storage notifications." | Jeff Sharkey | 2015-04-15 | 1 | -4/+14 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Checkpoint of storage notifications. | Jeff Sharkey | 2015-04-14 | 1 | -4/+14 |
* | | | | | | Merge "Don't verify signatures in ConfigUpdateInstallReceiver" | Ben Gruver | 2015-04-14 | 1 | -54/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't verify signatures in ConfigUpdateInstallReceiver | Ben Gruver | 2015-04-13 | 1 | -54/+3 |
* | | | | | | | Add notify keystore method to FPS JNI | Andres Morales | 2015-04-14 | 2 | -2/+30 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge "Fingerprint: Add hw token to the enroll() function." | Sasha Levitskiy | 2015-04-14 | 1 | -5/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fingerprint: Add hw token to the enroll() function. | Sasha Levitskiy | 2015-04-14 | 1 | -5/+9 |
* | | | | | | | Merge "Handle null package argument" | Amith Yamasani | 2015-04-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Handle null package argument | Amith Yamasani | 2015-04-14 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge "Add versioning to FLP HAL." | David Christie | 2015-04-14 | 3 | -1/+37 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add versioning to FLP HAL. | David Christie | 2015-04-14 | 3 | -1/+37 |
* | | | | | | | Merge "Zen: Enter alarms only on volume down from vibrate." | John Spurlock | 2015-04-14 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Zen: Enter alarms only on volume down from vibrate. | John Spurlock | 2015-04-14 | 2 | -2/+3 |
* | | | | | | | Merge "Fixes to idle alarm scheduling, package importance." | Dianne Hackborn | 2015-04-14 | 4 | -39/+104 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixes to idle alarm scheduling, package importance. | Dianne Hackborn | 2015-04-14 | 4 | -39/+104 |
* | | | | | | | | Merge changes from topic 'lss-update' | Andres Morales | 2015-04-14 | 4 | -62/+355 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Add challenge to IGateKeeperService | Andres Morales | 2015-04-13 | 1 | -32/+117 |
| * | | | | | | | Wire up GateKeeper to LockSettingsService | Andres Morales | 2015-04-13 | 4 | -51/+259 |
* | | | | | | | | Merge "Introduce device owner API to disable the keyguard" | Benjamin Franz | 2015-04-14 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Introduce device owner API to disable the keyguard | Benjamin Franz | 2015-04-14 | 1 | -0/+22 |
* | | | | | | | | | Merge "Revert "Load WebView from one out of a list of packages."" | Gustav Sennton | 2015-04-14 | 1 | -18/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Revert "Load WebView from one out of a list of packages." | Gustav Sennton | 2015-04-14 | 1 | -18/+3 |
* | | | | | | | | | Merge "Load WebView from one out of a list of packages." | Gustav Sennton | 2015-04-14 | 1 | -3/+18 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Load WebView from one out of a list of packages. | Gustav Sennton | 2015-04-08 | 1 | -3/+18 |
* | | | | | | | | | Merge "Add setOtaPolicy/getOtaPolicy API in DPMS" | Rubin Xu | 2015-04-14 | 2 | -0/+52 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add setOtaPolicy/getOtaPolicy API in DPMS | Rubin Xu | 2015-04-14 | 2 | -0/+52 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Add Bluetooth Contacts Sharing policy in DevicePolicyManager" | Ricky Wai | 2015-04-14 | 1 | -0/+54 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add Bluetooth Contacts Sharing policy in DevicePolicyManager | Ricky Wai | 2015-04-14 | 1 | -0/+54 |
* | | | | | | | | | Add ability to flush FLP HAL batched locations buffer. | David Christie | 2015-04-13 | 3 | -0/+23 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge "Add a status callback for location batching in FLP HAL" | David Christie | 2015-04-14 | 2 | -1/+34 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add a status callback for location batching in FLP HAL | David Christie | 2015-04-13 | 2 | -1/+34 |
* | | | | | | | | | Merge "Delay syncs for idle apps" | Amith Yamasani | 2015-04-14 | 4 | -1/+160 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Delay syncs for idle apps | Amith Yamasani | 2015-04-13 | 4 | -1/+160 |
* | | | | | | | | | Merge "Add capability callback for FLP HAL." | David Christie | 2015-04-14 | 2 | -2/+75 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | |