summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "Zen: Add a new level: alarms-only."John Spurlock2015-04-032-2/+18
|\
| * Zen: Add a new level: alarms-only.John Spurlock2015-04-022-2/+18
* | Merge "TIF: Add time shift APIs."Dongwon Kang2015-04-031-0/+154
|\ \
| * | TIF: Add time shift APIs.Dongwon Kang2015-04-021-0/+154
* | | Merge "Refactor KeySet code."dcashman2015-04-035-338/+364
|\ \ \
| * | | Refactor KeySet code.dcashman2015-03-315-338/+364
* | | | Do not clear a shared user's permissions on an app install.Svetoslav2015-04-022-2/+8
| |_|/ |/| |
* | | resolved conflicts for merge of 65073b91 to masterWale Ogunwale2015-04-022-14/+10
|\ \ \
| * \ \ am e4d4e22f: Merge "[ActivityManager] Avoid improper resume top activity."Olawale Ogunwale2015-04-022-14/+10
| |\ \ \
| | * \ \ Merge "[ActivityManager] Avoid improper resume top activity."Olawale Ogunwale2015-04-022-14/+10
| | |\ \ \
| | | * | | [ActivityManager] Avoid improper resume top activity.riddle_hsu2015-04-022-14/+10
* | | | | | Prepare to make Fingerprint API public.Jim Miller2015-04-013-6/+214
* | | | | | Merge "Deal with null characters in string options."Lorenzo Colitti2015-04-023-6/+135
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Deal with null characters in string options.Lorenzo Colitti2015-04-013-6/+135
* | | | | | Merge "Start searching the dimension configuration for atlas from the biggest...ztenghui2015-04-011-6/+7
|\ \ \ \ \ \
| * | | | | | Start searching the dimension configuration for atlas from the biggest value.ztenghui2015-04-011-6/+7
* | | | | | | am d7e349e8: am 7eeaad24: am 7a1454fe: Merge "Do not use the status bar as th...Bryce Lee2015-04-011-2/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Fixed NPE when trying to animate a windows whose display is gone.Wale Ogunwale2015-04-013-28/+30
* | | | | | | fixed build breakage due to bad merge. again...Wale Ogunwale2015-04-011-1/+1
* | | | | | | fixed build breakage due to bad merge.Wale Ogunwale2015-04-011-1/+0
* | | | | | | resolved conflicts for merge of 2094bf7b to masterWale Ogunwale2015-04-012-14/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 086071e7: Merge "[ActivityManager] Reduce report wrong anr activity"Olawale Ogunwale2015-04-012-15/+16
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | [ActivityManager] Reduce report wrong anr activityriddle_hsu2015-04-012-15/+16
| | | |_|/ / | | |/| | |
* | | | | | Converted more log points in AMS to use ActivityManagerDebugConfig.Wale Ogunwale2015-04-017-396/+405
| |_|_|/ / |/| | | |
* | | | | Merge "Revert "Add lockTaskOnLaunch attribute.""Craig Mautner2015-04-012-33/+11
|\ \ \ \ \
| * | | | | Revert "Add lockTaskOnLaunch attribute."Craig Mautner2015-04-012-33/+11
* | | | | | am a54f2b16: am 8bed4843: am d720dedb: Merge "Clear the previous states befor...Craig Mautner2015-04-011-0/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am d720dedb: Merge "Clear the previous states before setting the new app visi...Craig Mautner2015-04-011-5/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Clear the previous states before setting the new app visibility"Craig Mautner2015-03-311-5/+5
| | |\ \ \ \
| | | * | | | Clear the previous states before setting the new app visibilitytiger_huang2015-03-261-5/+5
* | | | | | | Merge "Add lockTaskOnLaunch attribute."Craig Mautner2015-04-012-11/+33
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Add lockTaskOnLaunch attribute.Craig Mautner2015-03-312-11/+33
* | | | | | | Merge "Data usage API: any uid is accessible to system apps running in any user"Qiwen Zhao2015-04-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Data usage API: any uid is accessible to system apps running in any userZoltan Szatmary-Ban2015-03-311-1/+1
* | | | | | | | Merge "Fix clobbered shared user install permissions."Svet Ganov2015-03-312-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix clobbered shared user install permissions.Svet Ganov2015-03-312-2/+2
* | | | | | | | | Merge "Clear the previous states before setting the new app visibility"Craig Mautner2015-03-311-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clear the previous states before setting the new app visibilitytiger_huang2015-03-311-5/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Support for nested bundles in setApplicationRestrictions"Fyodor Kupolov2015-03-312-78/+231
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support for nested bundles in setApplicationRestrictionsFyodor Kupolov2015-03-302-78/+231
* | | | | | | | | | Merge "Add CameraService to system server."Ruben Brunk2015-03-312-0/+71
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add CameraService to system server.Ruben Brunk2015-03-312-0/+71
* | | | | | | | | | | Merge "Fix WindowOrientationListener crash if no sensor present"Adrian Roos2015-03-311-2/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix WindowOrientationListener crash if no sensor presentAdrian Roos2015-03-311-2/+6
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge "[Auth:Last Credentials Timing] : Introducing API"Simranjit Singh Kohli2015-03-311-15/+95
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [Auth:Last Credentials Timing] : Introducing APISimranjit Singh Kohli2015-03-301-15/+95
* | | | | | | | | | | Merge "Fix not persisting activities with FLAG_ACTIVITY_RETAIN_IN_RECENTS."Wale Ogunwale2015-03-311-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix not persisting activities with FLAG_ACTIVITY_RETAIN_IN_RECENTS.Wale Ogunwale2015-03-271-3/+6
* | | | | | | | | | | | Merge "Fixes to full-backup scheduling edge cases"Christopher Tate2015-03-312-37/+81
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixes to full-backup scheduling edge casesChristopher Tate2015-03-302-37/+81