summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
Commit message (Expand)AuthorAgeFilesLines
* am 4af5bd7c: Merge "Add ProcessInfoService to activity manager."Olawale Ogunwale2015-03-301-0/+29
|\
| * Add ProcessInfoService to activity manager.Ruben Brunk2015-03-301-0/+29
* | am c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underl...Bryce Lee2015-03-252-0/+27
|\ \
| * \ Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value ch...Bryce Lee2015-03-252-0/+27
| |\ \
| | * | Add isScreenBrightnessBoosted and a broadcast when underlyingBryce Lee2015-03-172-0/+27
* | | | am 437ac8f8: Merge "Add JIT late override property"Mathieu Chartier2015-03-181-0/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Add JIT late override propertyMathieu Chartier2015-03-181-0/+3
* | | | am 86318d76: Merge "Option for going home when going to sleep for devices wit...Filip Gruszczynski2015-03-171-0/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Option for going home when going to sleep for devices without physical button.Filip Gruszczynski2015-03-161-0/+6
| | |/ | |/|
* | | am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""Andreas Gampe2015-03-161-1/+1
|\ \ \ | | |/ | |/|
| * | Revert "Frameworks/base: Fix a constructor"Andreas Gampe2015-03-161-1/+1
* | | am d61cbf9a: Merge "Frameworks/base: Fix a constructor"Andreas Gampe2015-03-161-1/+1
|\ \ \ | |/ /
| * | Frameworks/base: Fix a constructorAndreas Gampe2015-03-151-1/+1
* | | am 30fcd2aa: Merge "Drop unusable SELinux APIs."Nick Kralevich2015-03-131-28/+0
|\ \ \ | |/ /
| * | Drop unusable SELinux APIs.Stephen Smalley2015-03-131-28/+0
* | | am c0c39516: Merge "Hold a wake lock while dozing when display updates are pe...Joe LaPenna2015-02-241-0/+15
|\ \ \ | |/ / |/| / | |/
| * Hold a wake lock while dozing when display updates are pending.Jeff Brown2015-02-201-0/+15
* | am 6b492e78: Merge "Clean up Javadocs for UEventObserver"Narayan Kamath2015-02-231-4/+4
|\ \
| * | Clean up Javadocs for UEventObserverValter Strods2015-02-231-4/+4
* | | am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1...Filip Gruszczynski2015-02-061-0/+15
|\ \ \ | | |/ | |/|
| * | Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-devFilip Gruszczynski2015-02-051-0/+15
| |\ \
| | * | Add hidden shutdown method to PowerManager.Filip Gruszczynski2015-02-051-0/+15
* | | | am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel...John Spurlock2015-02-051-3/+3
|\ \ \ \ | |/ / /
| * | | am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.John Spurlock2015-02-051-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | am 42d3b66f: am e0852368: Fix a few typos in Parcel.java.John Spurlock2015-02-051-3/+3
| | |\ \
| | | * | Fix a few typos in Parcel.java.John Spurlock2015-02-041-3/+3
* | | | | am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --ru...Narayan Kamath2015-01-191-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Remove support for --classpath and make --runtime-init the default.Narayan Kamath2015-01-191-2/+2
* | | | | am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 c...Narayan Kamath2015-01-161-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix a property name that's longer than 31 chars.Narayan Kamath2015-01-161-1/+1
* | | | | Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmergeJeff Sharkey2015-01-152-30/+181
|\ \ \ \ \ | |/ / / /
| * | | | Offer to detect non-SSL/TLS network traffic.Jeff Sharkey2015-01-152-30/+181
* | | | | am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS...Nicolas Prevot2015-01-151-2/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-devNicolas Prevot2015-01-151-2/+4
| |\ \ \ \
| | * | | | Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDINGNicolas Prevot2015-01-131-2/+4
* | | | | | am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stat...Dianne Hackborn2015-01-151-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix issue android-app doc, bump battery stats checkin versionDianne Hackborn2015-01-141-1/+1
* | | | | | Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bdNicolas Prévot2015-01-131-3/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Clarify docs for user restrictionsAmith Yamasani2015-01-131-3/+20
| |/ / / /
* | | | | am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcastin...Dianne Hackborn2015-01-081-1/+8
|\ \ \ \ \ | |/ / / /
| * | | | Fix issue #18827122: system server crashed on broadcasting...Dianne Hackborn2015-01-081-1/+8
* | | | | am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces...Narayan Kamath2014-12-291-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."Narayan Kamath2014-12-291-1/+1
| |\ \ \ \
| | * | | | Fixed grammar in the comment that introduces the Debug.MemoryInfo class.justinmuller2013-10-161-1/+1
| * | | | | Add more -d dalvik details to dumpsysMathieu Chartier2014-12-081-1/+4
| * | | | | Tell installd when boot completes.Narayan Kamath2014-11-191-0/+14
| * | | | | am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-devDianne Hackborn2014-10-171-0/+19
| |\ \ \ \ \
| * \ \ \ \ \ am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-devAmith Yamasani2014-10-141-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-devDianne Hackborn2014-10-103-3/+34
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-083-8/+12
| |\ \ \ \ \ \ \ \