summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove unused imports in frameworks/base."John Spurlock2015-03-023-3/+0
|\
| * Remove unused imports in frameworks/base.John Spurlock2015-02-283-3/+0
* | Annotate Bundle with @NullableScott Kennedy2015-03-013-94/+135
|/
* Add Context.getSystemService(Class<?>).Jeff Brown2015-02-251-7/+10
* resolved conflicts for merge of 57bb5f5c to masterChad Jones2015-02-231-0/+15
|\
| * 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 836e4413: am c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObs...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
* | | | Disable checking bootimage build fingerprint against vendorDaniel Rosenberg2015-02-201-0/+2
* | | | Merge "Add some detailed data as part of battery history."Dianne Hackborn2015-02-201-0/+188
|\ \ \ \
| * | | | Add some detailed data as part of battery history.Dianne Hackborn2015-02-191-0/+188
* | | | | Merge "Improve the documentation of DISALLOW_CONFIG_BLUETOOTH."Nicolas Prevot2015-02-191-0/+1
|\ \ \ \ \
| * | | | | Improve the documentation of DISALLOW_CONFIG_BLUETOOTH.Nicolas Prevot2015-02-181-0/+1
| |/ / / /
* | | | | Merge "Decouple package manager lock and bitmap decoding"Adrian Roos2015-02-182-3/+16
|\ \ \ \ \
| * | | | | Decouple package manager lock and bitmap decodingAdrian Roos2015-02-172-3/+16
| |/ / / /
* | | | | Fix typoAdrian Roos2015-02-181-1/+1
|/ / / /
* | | | Merge "check bootloader and baseband version"Andres Morales2015-02-101-3/+26
|\ \ \ \
| * | | | check bootloader and baseband versionAndres Morales2015-02-091-3/+26
* | | | | am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1...Filip Gruszczynski2015-02-061-0/+15
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 c46b68c7: am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few ty...John Spurlock2015-02-051-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | 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
* | | | | | Add ProcessInfoService to activity manager.Ruben Brunk2015-01-301-0/+29
* | | | | | Introduce new MNC API version.Dianne Hackborn2015-01-281-0/+5
* | | | | | Merge "check bootimage version string against system"Andres Morales2015-01-231-2/+2
|\ \ \ \ \ \
| * | | | | | check bootimage version string against systemAndres Morales2015-01-231-2/+2
* | | | | | | Public API for StrictMode cleartext detection.Jeff Sharkey2015-01-221-4/+1
|/ / / / / /
* | | | | | am 66bbfb6b: am 17f50f81: am d8beca64: Merge "Remove support for --classpath ...Narayan Kamath2015-01-191-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 2488c0ad: am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s lon...Narayan Kamath2015-01-161-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | am c2ae6fb9: Merge commit \'605eb79c9519307147fc1795d0eb155638a7f542\' into m...Jeff Sharkey2015-01-162-30/+181
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 97c18827: am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY...Nicolas Prevot2015-01-151-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 fce232b4: am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump...Dianne Hackborn2015-01-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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