summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/am
Commit message (Expand)AuthorAgeFilesLines
* am 45e3c4f0: am 1409c99f: am 9c2a38ed: Merge "Fix resource reading for second...Amith Yamasani2012-10-072-0/+2
|\
| * Merge "Fix resource reading for secondary users" into jb-mr1-devAmith Yamasani2012-10-072-0/+2
| |\
| | * Fix resource reading for secondary usersAmith Yamasani2012-10-072-0/+2
* | | am 337aa27a: am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute t...Craig Mautner2012-10-072-8/+16
|\ \ \ | |/ /
| * | Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-devCraig Mautner2012-10-072-8/+16
| |\ \ | | |/ | |/|
| | * Adds showWhenLocked attribute to Activities.Craig Mautner2012-10-062-8/+16
* | | am 451d49b3: am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to b...Adam Cohen2012-10-041-1/+5
|\ \ \ | |/ /
| * | Plumbing to allow keyguard to be shown with user switcher (issue 7175023)Adam Cohen2012-10-041-1/+5
| |/
* | am a718bc86: am 7df202e2: am 8a229195: Merge "Fix issue #6968859: home not ex...Dianne Hackborn2012-10-0411-19/+78
|\ \ | |/
| * Fix issue #6968859: home not exiting an ANR'd dreamDianne Hackborn2012-10-0411-19/+78
* | am ebe28f51: am 30b07b50: am 6f354ed9: Merge "Fix issue #7226101: Secure imag...Dianne Hackborn2012-10-012-101/+113
|\ \ | |/
| * Merge "Fix issue #7226101: Secure image capture takes 5 seconds to start" int...Dianne Hackborn2012-10-012-101/+113
| |\
| | * Fix issue #7226101: Secure image capture takes 5 seconds to startDianne Hackborn2012-10-012-101/+113
* | | am b45ab722: am 30655e03: am b525c3cf: Merge "Fix broadcast to a specific use...Amith Yamasani2012-10-011-1/+1
|\ \ \ | |/ /
| * | Fix broadcast to a specific userAmith Yamasani2012-10-011-1/+1
| |/
* | am fbbd0072: am 3ff8e1a8: Merge "Fix issue #7211769 and #7244492, thrash arou...Dianne Hackborn2012-09-284-29/+109
|\ \ | |/
| * Merge "Fix issue #7211769 and #7244492, thrash around on #7226656." into jb-m...Dianne Hackborn2012-09-284-29/+109
| |\
| | * Fix issue #7211769 and #7244492, thrash around on #7226656.Dianne Hackborn2012-09-284-29/+109
* | | am ed7989e4: am 01996793: Merge "Remove user switcher from long-press power m...Amith Yamasani2012-09-281-0/+1
|\ \ \ | |/ /
| * | Remove user switcher from long-press power menuAmith Yamasani2012-09-281-0/+1
| |/
* | am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." int...Jeff Sharkey2012-09-281-2/+2
|\ \ | |/
| * Migrate more Secure settings to Global.Jeff Sharkey2012-09-271-2/+2
* | am ce56b399: am 2480bc12: Merge "Fix issue #7232952: Settings crash on tappin...Dianne Hackborn2012-09-271-2/+3
|\ \ | |/
| * Fix issue #7232952: Settings crash on tapping on Downloaded apps on a seconda...Dianne Hackborn2012-09-261-2/+3
* | am e440f47d: am e5215730: Merge "Maybe fix issue #7211766: bindService() to U...Dianne Hackborn2012-09-2613-157/+291
|\ \ | |/
| * Maybe fix issue #7211766: bindService() to User u0 While u10 is...Dianne Hackborn2012-09-2613-157/+291
* | am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-devJeff Brown2012-09-251-4/+4
|\ \ | |/
| * Update references to migrated global settings.Jeff Brown2012-09-251-4/+4
| * Fix buildAmith Yamasani2012-09-251-1/+1
| * Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-3/+6
| |\
* | | Fix buildAmith Yamasani2012-09-241-1/+1
* | | Merge "AppInfo from Notifications for secondary users" into jb-mr1-devAmith Yamasani2012-09-241-3/+6
|\ \ \ | | |/ | |/|
| * | AppInfo from Notifications for secondary usersAmith Yamasani2012-09-241-3/+6
* | | Merge "Fix issue #7215984: java.lang.RuntimeException: Unable to create..." i...Dianne Hackborn2012-09-242-46/+24
|\ \ \ | | |/ | |/|
| * | Fix issue #7215984: java.lang.RuntimeException: Unable to create...Dianne Hackborn2012-09-242-46/+24
| |/
* | Merge "Add NfcBarcode technology API." into jb-mr1-devMartijn Coenen2012-09-242-3/+13
|\ \ | |/ |/|
| * am 8bc3cfa3: am 11820f73: Merge "Allow acquiring ContentProviders across user...Jeff Sharkey2012-09-241-9/+9
| |\
| * \ am 2552e78a: am b939e352: Merge "Fix issue #7209355, #7214271." into jb-mr1-devDianne Hackborn2012-09-241-3/+2
| |\ \
| * \ \ am 6e40deb8: am 88923c97: Merge "Fix issue #7214462: Some recent thumbnails a...Dianne Hackborn2012-09-241-1/+4
| |\ \ \
| * \ \ \ am e6a5c571: am 74defbf2: Merge "Query users excluding any being removed" int...Amith Yamasani2012-09-202-5/+1
| |\ \ \ \
| * \ \ \ \ am b79d01ed: am 6de76d21: Merge "Implement multi-user PackageMonitor." into j...Dianne Hackborn2012-09-202-8/+43
| |\ \ \ \ \
| * \ \ \ \ \ am 7788b759: am 52716deb: Merge "Fix deadlock in LockPatternUtils by using lo...Dianne Hackborn2012-09-191-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 9b4d528d: am 09ad0832: Merge "Switch to showing top-most thumbnail of rece...Dianne Hackborn2012-09-194-26/+54
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 8f2ec436: am 1e5aeecb: Merge "Don\'t allow more than 3 actively running us...Dianne Hackborn2012-09-191-41/+76
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am e339f025: am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-devJeff Sharkey2012-09-181-3/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 596115b1: am c535d2f3: Merge "Fix dumb bug merging receivers for multiple ...Dianne Hackborn2012-09-182-5/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am c0b59093: am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail...Dianne Hackborn2012-09-182-20/+40
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 68128325: am 443e4748: Merge "Fix issue #7175553: GRANT_URI_PERMISSION doe...Dianne Hackborn2012-09-171-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 0fd909ba: am d65afc65: Merge "More multi-user stuff." into jb-mr1-devDianne Hackborn2012-09-172-97/+291
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 871e27ea: am 24271a8c: Merge "Use shared app gid for forward-locked proces...Kenny Root2012-09-131-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-08-12 13:29:07 +0000