summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* am 49138184: am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-1/+0
|\
| * am 9568307c: am 43a4a8c7: Fix redundant file backupsChristopher Tate2015-01-151-1/+0
| |\
| | * Fix redundant file backupsChristopher Tate2015-01-141-1/+0
* | | resolve merge conflicts of 87f5369 to master.Jorim Jaggi2015-01-151-10/+10
|\ \ \ | |/ /
| * | am 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent ...Nicolas Prevot2015-01-141-10/+10
| |\ \ | | |/
| | * Make documentation for cross-profile intent filters clearer.Nicolas Prevot2015-01-141-10/+10
* | | Force-commit changes on accept in spinner-style DatePickerDialogAlan Viverette2015-01-131-0/+3
* | | am 19c549fc: am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuc...Craig Mautner2015-01-131-2/+17
|\ \ \ | |/ /
| * | am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buf...Craig Mautner2015-01-131-2/+17
| |\ \
| | * \ Merge "Prevent system server dump stuck by pipe buffer full."Craig Mautner2015-01-131-2/+17
| | |\ \
| | | * | Prevent system server dump stuck by pipe buffer full.riddle_hsu2014-07-311-2/+17
* | | | | am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG recei...Olawale Ogunwale2015-01-134-7/+11
|\ \ \ \ \ | |/ / / /
| * | | | am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG recei...Olawale Ogunwale2015-01-124-7/+11
| |\ \ \ \ | | |/ / /
| | * | | Merge "[ActivityManager] Distinguish FG or BG receiver finished"Olawale Ogunwale2015-01-124-7/+11
| | |\ \ \
| | | * | | [ActivityManager] Distinguish FG or BG receiver finishedriddle_hsu2015-01-034-7/+11
* | | | | | am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-de...Jeff Sharkey2015-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-devJeff Sharkey2015-01-091-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Guard against MountService throwing NPE." into lmp-mr1-devJeff Sharkey2015-01-091-1/+1
| | |\ \ \ \
| | | * | | | Guard against MountService throwing NPE.Jeff Sharkey2015-01-081-1/+1
* | | | | | | Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45...Mathieu Chartier2015-01-091-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45eMathieu Chartier2015-01-091-0/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Call VMRuntime.clampGrowthLimit for small heap apps"Mathieu Chartier2015-01-091-0/+4
| | |\ \ \ \ \
| | | * | | | | Call VMRuntime.clampGrowthLimit for small heap appsMathieu Chartier2015-01-081-0/+4
| | | | |_|/ / | | | |/| | |
* | | | | | | am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by t...Christopher Tate2015-01-071-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by t...Christopher Tate2015-01-071-2/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Support single-package backup rejection by the transportChristopher Tate2015-01-061-2/+5
| | | |_|/ / | | |/| | |
* | | | | | am 442dcb17: am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSea...Amith Yamasani2015-01-071-9/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch"Amith Yamasani2015-01-071-9/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "NPE in SearchManager.triggerSearch"Amith Yamasani2015-01-071-9/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | NPE in SearchManager.triggerSearchYou Kim2013-08-291-9/+0
* | | | | | am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless ...Alan Viverette2015-01-051-1/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless ...Alan Viverette2015-01-051-1/+7
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Don't override dialog icon drawable unless valid resource ID was setAlan Viverette2015-01-051-1/+7
* | | | | | Remove deprecated version of setProfileOwner that takes packageNameEsteban Talavera2014-12-241-21/+0
* | | | | | Merge "Fix minor spelling and grammar errors in public JavaDoc"Kris Giesing2014-12-191-1/+1
|\ \ \ \ \ \
| * | | | | | Fix minor spelling and grammar errors in public JavaDocKris Giesing2014-12-161-1/+1
* | | | | | | am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition anim...Winson Chung2014-12-181-6/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition anim...Winson Chung2014-12-181-6/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-...Winson Chung2014-12-181-6/+10
| | |\ \ \ \ \
| | | * | | | | Bug 18784289: Fix issue with transition animation callback.Winson Chung2014-12-181-6/+10
* | | | | | | | am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" aut...Olawale Ogunwale2014-12-171-11/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 486a9942: Merge "[ActivityManager] Use synchronized to protect object"Olawale Ogunwale2014-12-171-11/+13
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "[ActivityManager] Use synchronized to protect object"Olawale Ogunwale2014-12-171-11/+13
| | |\ \ \ \ \ \
| | | * | | | | | [ActivityManager] Use synchronized to protect objectmark_chen2014-12-161-11/+13
* | | | | | | | | am 3a70523e: am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode"...Jorim Jaggi2014-12-171-2/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1...Jorim Jaggi2014-12-171-2/+8
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "Fix colored icons in doze mode" into lmp-mr1-devJorim Jaggi2014-12-171-2/+8
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix colored icons in doze modeJorim Jaggi2014-12-171-2/+8
* | | | | | | | | | am 237637e2: am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter."...Nicolas Prevot2014-12-171-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am f2bd50b2: Merge "Fix the doc of addCrossProfileIntentFilter." into lmp-mr1...Nicolas Prevot2014-12-171-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /