summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* 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-212-9/+15
|\ \ \ \ \ | |/ / / /
| * | | | am 6fb904bf: Merge "Make power button behavior configurable." into klp-modula...Jeff Brown2014-05-212-9/+15
| |\ \ \ \ | | |/ / /
| | * | | Make power button behavior configurable.Jeff Brown2014-05-202-9/+15
| * | | | am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids."Brian Carlstrom2014-05-211-26/+71
| |\ \ \ \
| | * \ \ \ am ec71fed0: Merge "Improve ABI handling for shared user ids."Brian Carlstrom2014-05-211-26/+71
| | |\ \ \ \
| | | * | | | Improve ABI handling for shared user ids.Narayan Kamath2014-05-201-26/+71
* | | | | | | Merge "DPM: Disallow some DeviceAdmin policies for ProfileOwners"Robin Lee2014-05-211-0/+6
|\ \ \ \ \ \ \
| * | | | | | | DPM: Disallow some DeviceAdmin policies for ProfileOwnersRobin Lee2014-05-211-0/+6
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Per-user telephony restrictionsAmith Yamasani2014-05-201-0/+2
* | | | | | | | | | Merge "Add Device/Profile Owner gated apis for setting/getting blocked packag...Julia Reynolds2014-05-201-0/+87
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add Device/Profile Owner gated apis for setting/getting blocked packages.Julia Reynolds2014-05-201-0/+87
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Allow device/profile owners to update settings."Julia Reynolds2014-05-201-0/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow device/profile owners to update settings.Julia Reynolds2014-05-201-0/+39
| |/ / / / / / / / /
* | | | | | | | | | Merge "Fix a boot failure due to Wifi / Wifi Passpoint"Yuhao Zheng2014-05-201-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix a boot failure due to Wifi / Wifi PasspointYuhao Zheng2014-05-201-4/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge "AudioSystem: add new audio device definitions"Eric Laurent2014-05-201-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AudioSystem: add new audio device definitionsEric Laurent2014-05-191-1/+1
* | | | | | | | | | | Merge "Fixing transition to/from Recents with full screen apps."Winson Chung2014-05-202-5/+30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixing transition to/from Recents with full screen apps.Winson Chung2014-05-202-5/+30
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Delay the dispatching of non-wakeup alarms."Dianne Hackborn2014-05-203-127/+302
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Delay the dispatching of non-wakeup alarms.Dianne Hackborn2014-05-203-127/+302
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Fix a runtime break caused by merge conflict"Vinit Deshpande2014-05-201-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a runtime break caused by merge conflictVinit Deshpande2014-05-201-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Add NetworkFactory names and unregistration.Robert Greenwalt2014-05-201-25/+70
|/ / / / / / / /
* | | | | | | | Add ZEN and speedbump to NotificationListenerServiceChristoph Studer2014-05-201-58/+86