summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am c0c39516: Merge "Hold a wake lock while dozing when display updates are pe...Joe LaPenna2015-02-243-0/+46
|\
| * Hold a wake lock while dozing when display updates are pending.Jeff Brown2015-02-203-0/+46
* | am 1629f954: am 598f9b2a: Merge "Add Keymaster 0.4 binder API"Chad Brubaker2015-02-2316-0/+990
|\ \
| * \ am 598f9b2a: Merge "Add Keymaster 0.4 binder API"Chad Brubaker2015-02-2316-0/+990
| |\ \
| | * \ Merge "Add Keymaster 0.4 binder API"Chad Brubaker2015-02-2316-0/+990
| | |\ \
| | | * | Add Keymaster 0.4 binder APIChad Brubaker2015-02-2316-0/+990
* | | | | am c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObserver"Narayan Kamath2015-02-231-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 6b492e78: Merge "Clean up Javadocs for UEventObserver"Narayan Kamath2015-02-231-4/+4
| |\ \ \ \ | | |/ / /
| | * | | Clean up Javadocs for UEventObserverValter Strods2015-02-231-4/+4
| * | | | Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEADBill Yi2015-02-19377-8094/+17128
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 644ebc88: am 0a7936b7: Merge "Fix a couple of issues with system_server fo...Narayan Kamath2015-02-192-9/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix a couple of issues with system_server forking."Narayan Kamath2015-02-192-9/+13
| |\ \ \ \
| | * | | | Fix a couple of issues with system_server forking.Narayan Kamath2015-02-132-9/+13
* | | | | | am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
| |\ \ \ \ \
| | * \ \ \ \ am ffaee8bd: Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-181-12/+11
| | |\ \ \ \ \
| | | * \ \ \ \ Merge "Fix NPE" into lmp-mr1-devMarco Nelissen2015-02-171-12/+11
| | | |\ \ \ \ \
| | | | * | | | | Fix NPEMarco Nelissen2015-02-171-12/+11
* | | | | | | | | am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer a...Craig Mautner2015-02-173-27/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to a...Craig Mautner2015-02-173-27/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT M...Craig Mautner2015-02-173-27/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lm...Craig Mautner2015-02-173-27/+12
| | | |\ \ \ \ \ \
| | | | * | | | | | Do not make ActivityContainer available to apps. DO NOT MERGECraig Mautner2015-02-173-27/+12
| | | | |/ / / / /
* | | | | | | | | am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" ...Alan Viverette2015-02-171-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-devAlan Viverette2015-02-171-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-devAlan Viverette2015-02-171-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fix year picker initial rangeAlan Viverette2015-02-171-0/+1
| | | |/ / / / /
* | | | | | | | am 58524b2a: am e7e92381: Merge "Register DDM handlers at the beginning of ma...Piotr Jastrzebski2015-02-162-2/+4
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge "Register DDM handlers at the beginning of main method."Piotr Jastrzebski2015-02-162-2/+4
| |\ \ \ \ \ \
| | * | | | | | Register DDM handlers at the beginning of main method.Piotr Jastrzebski2015-02-132-2/+4
| | | |_|_|/ / | | |/| | | |
* | | | | | | am 83c804be: Merge "Prevent duplicated registration of OnComputeInternalInset...Yohei Yukawa2015-02-141-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Prevent duplicated registration of OnComputeInternalInsetsListener"Yohei Yukawa2015-02-141-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Prevent duplicated registration of OnComputeInternalInsetsListenerSeonggoo Kang2014-12-241-0/+1
* | | | | | | am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused an...Svetoslav2015-02-131-3/+29
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focus...Svetoslav2015-02-131-3/+29
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Accessibility: Ensure fresh accessilbity focused and input focused nodes.Svetoslav2015-02-131-3/+29
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Accessibility: Ensure fresh accessilbity focused and input focused nodes.Svetoslav2015-02-131-3/+29
| * | | | | | am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp...Ruben Brunk2015-02-131-5/+7
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode"Jeff Brown2015-02-131-13/+11
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Call startInput on return from sleep mode"Jeff Brown2015-02-131-13/+11
| |\ \ \ \ \ \
| | * | | | | | Call startInput on return from sleep modeMikael Gullstrand2015-01-261-13/+11
* | | | | | | | Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev auto...Ruben Brunk2015-02-131-5/+7
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-devRuben Brunk2015-02-131-5/+7
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-devRuben Brunk2015-02-131-5/+7
| | |\ \ \ \ \ \
| | | * | | | | | camera2: Fix legacy scaling factor application.Ruben Brunk2015-02-121-5/+7
* | | | | | | | | am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWOR...Jeremy Joslin2015-02-121-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-...Jeremy Joslin2015-02-121-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-devJeremy Joslin2015-02-121-0/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-devJeremy Joslin2015-02-121-0/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | Update Javadoc for EXTRA_NETWORK.Jeremy Joslin2015-02-111-0/+4