summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" ...Dianne Hackborn2015-08-042-3/+5
|\
| * Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps ...Dianne Hackborn2015-08-032-3/+5
| |\
| | * Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping upDianne Hackborn2015-08-032-3/+5
* | | am 0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-devJeff Sharkey2015-08-041-4/+10
|\ \ \ | |/ /
| * | Merge "Avoid deadlock by broadcasting outside lock." into mnc-devJeff Sharkey2015-08-031-4/+10
| |\ \
| | * | Avoid deadlock by broadcasting outside lock.Jeff Sharkey2015-08-031-4/+10
| | |/
* | | am f8576979: Merge "Also consider task intent when trimming recent tasks" int...Wale Ogunwale2015-08-031-4/+6
|\ \ \ | |/ /
| * | Merge "Also consider task intent when trimming recent tasks" into mnc-devWale Ogunwale2015-08-031-4/+6
| |\ \
| | * | Also consider task intent when trimming recent tasksWale Ogunwale2015-08-021-4/+6
| | |/
* | | am 87920455: Merge "Fix NPE in AppOpsService" into mnc-devSvetoslav Ganov2015-08-031-2/+6
|\ \ \ | |/ /
| * | Merge "Fix NPE in AppOpsService" into mnc-devSvetoslav Ganov2015-08-031-2/+6
| |\ \
| | * | Fix NPE in AppOpsServiceSvet Ganov2015-08-021-2/+6
| | |/
* | | am 0855357c: Merge "User correct category for finding headless sync adapters"...Svetoslav Ganov2015-08-031-1/+1
|\ \ \ | |/ /
| * | Merge "User correct category for finding headless sync adapters" into mnc-devSvetoslav Ganov2015-08-031-1/+1
| |\ \ | | |/ | |/|
| | * User correct category for finding headless sync adaptersSvet Ganov2015-08-011-1/+1
* | | am 8dbd4848: Merge "Add per UID control to app ops." into mnc-devSvetoslav Ganov2015-08-011-58/+401
|\ \ \ | |/ /
| * | Merge "Add per UID control to app ops." into mnc-devSvetoslav Ganov2015-08-011-58/+401
| |\ \
| | * | Add per UID control to app ops.Svet Ganov2015-07-311-58/+401
| | |/
* | | Merge "Suppress camera launch gesture until setup is complete Bug: 22792563" ...Peng Xu2015-08-011-2/+14
|\ \ \
| * | | Suppress camera launch gesture until setup is completeKevin Gabayan2015-07-311-2/+14
* | | | am 00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-devFilip Gruszczynski2015-07-311-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Make enter reveal animation be zorder top." into mnc-devFilip Gruszczynski2015-07-311-0/+1
| |\ \ \
| | * | | Make enter reveal animation be zorder top.Filip Gruszczynski2015-07-311-0/+1
* | | | | am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.View...Dianne Hackborn2015-07-312-5/+14
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProp...Dianne Hackborn2015-07-312-5/+14
| |\ \ \ \
| | * | | | Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodePropertiesDianne Hackborn2015-07-312-5/+14
* | | | | | am ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode ch...Jean-Michel Trivi2015-07-311-1/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix that shutter sound does not play after ringer mode changes to vibr...Jean-Michel Trivi2015-07-311-1/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix that shutter sound does not play after ringer mode changes to vibratorSungmin Choi2015-07-311-1/+5
* | | | | | am f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition ani...Wale Ogunwale2015-07-311-3/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fixed issue with artifacts during scale-up transition animation" into ...Wale Ogunwale2015-07-311-3/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fixed issue with artifacts during scale-up transition animationWale Ogunwale2015-07-301-3/+12
* | | | | | am c1836bb0: Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-07-312-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-07-312-2/+2
| |\ \ \ \ \
| | * | | | | Change MNC codename to just M.Dianne Hackborn2015-07-292-2/+2
* | | | | | | am 9a81a182: Merge "Don\'t always transfer device owner status to other users...Rubin Xu2015-07-311-2/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Don't always transfer device owner status to other users." into mnc-devRubin Xu2015-07-311-2/+15
| |\ \ \ \ \ \
| | * | | | | | Don't always transfer device owner status to other users.Nicolas Prevot2015-07-311-2/+15
* | | | | | | | am d692fcf1: Merge "Add missing return statement" into mnc-devBenjamin Franz2015-07-311-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add missing return statement" into mnc-devBenjamin Franz2015-07-311-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Add missing return statementBenjamin Franz2015-07-301-0/+1
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing method...Lorenzo Colitti2015-07-311-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Stop supporting legacy ConnectivityManager routing methods in M." into...Lorenzo Colitti2015-07-311-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Stop supporting legacy ConnectivityManager routing methods in M.Lorenzo Colitti2015-07-311-1/+1
* | | | | | | | | am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-devHung-ying Tyan2015-07-311-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-devHung-ying Tyan2015-07-311-1/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Revise lockdown check in getLegacyVpnInfo()Hung-ying Tyan2015-07-301-1/+4
| | | |/ / / / / | | |/| | | | |
* | | | | | | | am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-devAmit Mahajan2015-07-302-10/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add OrSelf to privileged permission check." into mnc-devAmit Mahajan2015-07-302-10/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Add OrSelf to privileged permission check.Amit Mahajan2015-07-302-10/+13
| | | |_|_|/ / / | | |/| | | | |