summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
Commit message (Expand)AuthorAgeFilesLines
* Drop unusable SELinux APIs.Stephen Smalley2015-03-131-28/+0
* 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
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 41bb3455: Merge "Set the default user restrictions to disallow calling and...Amith Yamasani2014-10-071-0/+33
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 78cc93ec: Merge "Fix NPE in StrictMode handling." into lmp-devJohn Spurlock2014-10-061-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virt...Dianne Hackborn2014-10-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 7a73f2c5: Merge "SDK only: Update docs to reflect current implementation."...Dianne Hackborn2014-10-021-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 5aaabc0f: Merge "Send app permissions to netd." into lmp-devSreeram Ramachandran2014-10-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am c338784b: Merge "More work on issue #17656716: Unhandled exception in Wind...Dianne Hackborn2014-10-021-4/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" int...Narayan Kamath2014-10-011-2/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Wind...Dianne Hackborn2014-09-302-6/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Ma...Dianne Hackborn2014-09-302-1/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cbb94a27: Merge "More debugging for issue #17656716: Unhandled exception i...Dianne Hackborn2014-09-261-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 70c1f083: Merge "Set the system locale correctly even on an encrypted devi...Elliott Hughes2014-09-261-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0b1eb9d4: Merge "Work on issue #17656716: Unhandled exception in Window Ma...Dianne Hackborn2014-09-261-5/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 45ef18b6: Merge "Include reason when wiping data." into lmp-devJeff Sharkey2014-09-241-15/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aospAndreas Gampe2014-09-241-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b5a2f9ea: am 6974f6a9: Merge "Block address families with routes, not Netw...Lorenzo Colitti2014-09-241-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d2484f81: am ba108d11: Merge "Allow primary user profile owner to set devi...Amith Yamasani2014-09-191-16/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-09-10 21:30:55 +0000