summaryrefslogtreecommitdiffstats
path: root/services/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add finish() after timeout of Reqeust Arc operations."Jungshik Jang2014-05-221-0/+1
|\
| * Add finish() after timeout of Reqeust Arc operations.Jungshik Jang2014-05-211-0/+1
* | Merge "Delete the EthernetDataTracker."Lorenzo Colitti2014-05-221-4/+0
|\ \
| * | Delete the EthernetDataTracker.Lorenzo Colitti2014-05-211-4/+0
* | | Merge "Fix a typo in IpConfigStore."Lorenzo Colitti2014-05-211-1/+1
|\ \ \ | |/ /
| * | Fix a typo in IpConfigStore.Lorenzo Colitti2014-05-211-1/+1
* | | Merge "Small perf tweaks."Winson Chung2014-05-212-2/+2
|\ \ \
| * | | Small perf tweaks.Winson Chung2014-05-212-2/+2
| |/ /
* | | Merge "Don't exit lock task on sleep"Jason Monk2014-05-211-1/+0
|\ \ \
| * | | Don't exit lock task on sleepJason Monk2014-05-211-1/+0
* | | | am 82ec8c58: am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."narayan2014-05-211-10/+12
|\ \ \ \
| * | | | am ab3d85ab: am 838b1e22: Merge "Fix NPE in PackageManagerService."narayan2014-05-211-10/+12
| * | | | am 7509733c: Elide extras strings from noman dumpsys output.Dan Sandler2014-05-211-8/+7
| |\ \ \ \
| | * | | | Elide extras strings from noman dumpsys output.Dan Sandler2014-05-211-8/+7
* | | | | | Simplify NotificationListenerService APIChristoph Studer2014-05-211-24/+9
* | | | | | Merge changes I1cbdff1d,I23906b4cRoboErik2014-05-212-31/+181
|\ \ \ \ \ \
| * | | | | | Handle headsethook voice launchingRoboErik2014-05-201-28/+118
| * | | | | | Add 5s timeout to wakelockRoboErik2014-05-202-13/+73
* | | | | | | Use DeviecPolicyManager to authenticate lock taskjustinzhang2014-05-211-11/+19
| |_|_|/ / / |/| | | | |
* | | | | | Merge "Update InputMethodSubtypeSwitchingController correctly"Yohei Yukawa2014-05-211-2/+2
|\ \ \ \ \ \
| * | | | | | Update InputMethodSubtypeSwitchingController correctlyYohei Yukawa2014-05-211-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Add dumpsys facility and a history to TrustManagerService"Adrian Roos2014-05-213-10/+248
|\ \ \ \ \ \
| * | | | | | Add dumpsys facility and a history to TrustManagerServiceAdrian Roos2014-05-203-10/+248
* | | | | | | Elide extras strings from noman dumpsys output.Dan Sandler2014-05-211-8/+7
* | | | | | | Merge "add ranking information to the dumpsys info"Chris Wren2014-05-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | add ranking information to the dumpsys infoChris Wren2014-05-201-0/+2
* | | | | | | | am 77669abb: am 9beccf9f: Merge "Defer display ready until brightness ramp co...Jeff Brown2014-05-212-0/+35
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am 9beccf9f: Merge "Defer display ready until brightness ramp completes." int...Jeff Brown2014-05-212-0/+35
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Defer display ready until brightness ramp completes.Jeff Brown2014-05-202-0/+35
* | | | | | | | resolved conflicts for merge of fcc4fed3 to masterNarayan Kamath2014-05-211-8/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 6fb904bf: Merge "Make power button behavior configurable." into klp-modula...Jeff Brown2014-05-211-8/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Make power button behavior configurable.Jeff Brown2014-05-201-8/+14
| * | | | | | | am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids."Brian Carlstrom2014-05-211-26/+71
* | | | | | | | Merge "Disallow adb sideloading if UserManager flag is set for user."Sander Alewijnse2014-05-211-2/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Disallow adb sideloading if UserManager flag is set for user.Sander Alewijnse2014-05-211-2/+15
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Add several actions for ARC (Audio Return Channel)"Jungshik Jang2014-05-218-17/+516
|\ \ \ \ \ \ \
| * | | | | | | Add several actions for ARC (Audio Return Channel)Jungshik Jang2014-05-218-17/+516
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix NullPointerException on init of HdmiMhlController.Jungshik Jang2014-05-211-0/+1
* | | | | | | Improve ABI handling for shared user ids.Narayan Kamath2014-05-201-26/+71
* | | | | | | am ccf51bef: am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-...Jeff Brown2014-05-211-7/+24
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-devJeff Brown2014-05-211-7/+24
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | I'm feeling the good vibrations.Jeff Brown2014-05-201-7/+24
* | | | | | | am 8f120dd6: am 0702786d: Merge "Allow display timeouts to be set in config.x...Jeff Brown2014-05-211-16/+28
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp...Jeff Brown2014-05-211-16/+28
| |\ \ \ \ \ | | |/ / / /
| | * | | | Allow display timeouts to be set in config.xml.Jeff Brown2014-05-201-16/+28
* | | | | | Merge "Move IP config from WifiConfiguration to IpConfiguration."Lorenzo Colitti2014-05-202-0/+419
|\ \ \ \ \ \
| * | | | | | Move IP config from WifiConfiguration to IpConfiguration.Jaewan Kim2014-05-202-0/+419
* | | | | | | Merge "Fix the wrong conversion of byte to int."Yuncheol Heo2014-05-201-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix the wrong conversion of byte to int.Yuncheol Heo2014-05-201-3/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Per-user telephony restrictions"Amith Yamasani2014-05-201-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |