summaryrefslogtreecommitdiffstats
path: root/core/java/com
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflicts of 87f5369 to master.Jorim Jaggi2015-01-151-9/+16
|\
| * am 657f9a68: am 1a6dd298: Merge "StateMachine.dump produces no output sometim...Wink Saville2015-01-141-9/+16
| |\
| | * Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-devWink Saville2015-01-141-9/+16
| | |\
| | | * StateMachine.dump produces no output sometimes.Wink Saville2015-01-131-9/+16
* | | | Merge "LockPatternUtils clean up continued"Adrian Roos2015-01-141-236/+165
|\ \ \ \
| * | | | LockPatternUtils clean up continuedAdrian Roos2015-01-141-236/+165
* | | | | Merge "Explicitly specify user on LPU's private methods"Adrian Roos2015-01-141-68/+46
|\ \ \ \ \ | |/ / / /
| * | | | Explicitly specify user on LPU's private methodsAdrian Roos2015-01-081-68/+46
* | | | | Merge "Directly dispatch USER_REMOVED to LockSettingsService"Adrian Roos2015-01-142-9/+0
|\ \ \ \ \ | |/ / / /
| * | | | Directly dispatch USER_REMOVED to LockSettingsServiceAdrian Roos2015-01-072-9/+0
* | | | | Merge "Purge biometric weak and keyguard widgets"Adrian Roos2015-01-141-418/+54
|\ \ \ \ \ | |/ / / /
| * | | | Purge biometric weak and keyguard widgetsAdrian Roos2015-01-071-418/+54
* | | | | am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix Res...Adam Powell2015-01-131-0/+59
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix Res...Adam Powell2015-01-131-0/+59
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLa...Adam Powell2015-01-131-0/+59
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Add API for nested pre-processing of a11y events; fix ResolverDrawerLayoutAdam Powell2015-01-071-0/+59
* | | | | am 2abf1f1c: Merge "Fix issue #18942959: Phone getting stuck then restarts af...Dianne Hackborn2015-01-091-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix issue #18942959: Phone getting stuck then restarts after unpluggin...Dianne Hackborn2015-01-091-4/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix issue #18942959: Phone getting stuck then restarts after unpluggin...Dianne Hackborn2015-01-091-4/+4
| | |\ \ \
| | | * | | Fix issue #18942959: Phone getting stuck then restarts after unplugging from ...Dianne Hackborn2015-01-091-4/+4
* | | | | | am 3968820f: am cb8d8e10: Merge "Fix issue #18827122: system server crashed o...Dianne Hackborn2015-01-082-2/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcastin...Dianne Hackborn2015-01-082-2/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix issue #18827122: system server crashed on broadcasting...Dianne Hackborn2015-01-082-2/+15
| | |/ / /
* | | | | Merge "Add popup window accessors for anchor overlap, gravity, window"Alan Viverette2015-01-081-1/+5
|\ \ \ \ \
| * | | | | Add popup window accessors for anchor overlap, gravity, windowAlan Viverette2015-01-071-1/+5
| | |_|_|/ | |/| | |
* | | | | Merge "Fix accessibility delegation"Alan Viverette2015-01-086-16/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix accessibility delegationAlan Viverette2015-01-076-16/+16
* | | | | am c2a17fff: am a517e81e: Merge "Fix crash on pasting text in a WebView" into...Paul Miller2015-01-071-0/+7
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am c2a17fff: am a517e81e: Merge "Fix crash on pasting text in a WebView" into...Paul Miller2015-01-071-0/+7
| |\ \ \ | | |/ /
| | * | Merge "Fix crash on pasting text in a WebView" into lmp-mr1-devPaul Miller2015-01-071-0/+7
| | |\ \ | | | |/ | | |/|
| | | * Fix crash on pasting text in a WebViewPaul Miller2015-01-061-0/+7
* | | | am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in ...Dianne Hackborn2015-01-051-0/+66
|\ \ \ \ | |/ / /
| * | | am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in ...Dianne Hackborn2015-01-051-0/+66
| |\ \ \ | | |/ /
| | * | Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-devDianne Hackborn2015-01-051-0/+66
| | |\ \
| | | * | Fix issue #18901214: APR: Frequent crash in androidDianne Hackborn2015-01-051-0/+66
| | | |/
* | | | am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless ...Alan Viverette2015-01-051-2/+2
|\ \ \ \ | |/ / /
| * | | am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless ...Alan Viverette2015-01-051-2/+2
| |\ \ \ | | |/ /
| | * | Don't override dialog icon drawable unless valid resource ID was setAlan Viverette2015-01-051-2/+2
| | |/
* | | am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." ...Elliott Hughes2014-12-182-60/+14
|\ \ \ | |/ /
| * | am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java."Elliott Hughes2014-12-182-60/+14
| |\ \
| | * | Move the remaining ZygoteInit native code over to Java.Elliott Hughes2014-12-172-60/+14
* | | | am 8b3df1f9: am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in J...Elliott Hughes2014-12-171-31/+26
|\ \ \ \ | |/ / /
| * | | am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java."Elliott Hughes2014-12-171-31/+26
| |\ \ \ | | |/ /
| | * | Merge "Rewrite selectReadable JNI in Java."Elliott Hughes2014-12-171-31/+26
| | |\ \
| | | * | Rewrite selectReadable JNI in Java.Elliott Hughes2014-12-161-31/+26
* | | | | am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API." ...Narayan Kamath2014-12-171-19/+18
|\ \ \ \ \ | |/ / / /
| * | | | am 6d41504d: Merge "Move frameworks users over to libcore hex encoding API."Narayan Kamath2014-12-171-19/+18
| |\ \ \ \ | | |/ / /
| | * | | Merge "Move frameworks users over to libcore hex encoding API."Narayan Kamath2014-12-171-19/+18
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Move frameworks users over to libcore hex encoding API.Narayan Kamath2014-12-161-19/+18
* | | | | Merge "Fix image conversion"Alexandra Gherghina2014-12-161-3/+6
|\ \ \ \ \
generated by cgit v1.1 at 2025-03-13 21:26:07 +0000