summaryrefslogtreecommitdiff
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* docs: Clarified how to find out when a switch is toggledAndrew Solovay2015-07-091-1/+1
* docs: Changed link in Java source code comment to repair 404Robert Schaub2015-06-301-1/+1
* am 1ad5c813: Fix typo in TtsSpan.John Spurlock2015-06-151-1/+1
|\
| * Fix typo in TtsSpan.John Spurlock2015-06-151-1/+1
| * cherrypick from lmp-mr1-dev. Fixed broken link in UiAutomation.setRunAsMonkey...Quddus Chong2015-04-081-1/+1
* | docs: Add text to JavaDocs regarding browser file access vulnerabilityJoe Fernandez2015-04-221-2/+6
* | DO NOT MERGE Revert "Load libraries directly from apk"Kris Giesing2015-04-202-23/+3
* | DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"Kris Giesing2015-04-202-16/+7
* | am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-161-2/+2
|\ \
| * \ Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."Alex Klyubin2015-04-161-2/+2
| |\ \
| | * | Add Keymaster KM_ORIGIN_UNKNOWN constant.Alex Klyubin2015-04-141-2/+2
* | | | am b9a78c79: Merge "Add IV-related Keymaster error codes."Alex Klyubin2015-04-161-0/+4
|\| | |
| * | | Add IV-related Keymaster error codes.Alex Klyubin2015-04-151-0/+4
* | | | am 6a47a861: Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
|\| | |
| * | | Merge "Add getPrefixAids()."Martijn Coenen2015-04-151-1/+14
| |\ \ \
| | * | | Add getPrefixAids().Martijn Coenen2015-04-151-1/+14
* | | | | am 82992b72: Merge "Fix javadoc error in Debug.getRuntimeStats()."Hiroshi Yamauchi2015-04-151-1/+1
|\| | | |
| * | | | Fix javadoc error in Debug.getRuntimeStats().Hiroshi Yamauchi2015-04-141-1/+1
* | | | | am e38ee9df: Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
|\| | | |
| * | | | Add Debug.getRuntimeStat().Hiroshi Yamauchi2015-04-141-0/+90
| | |/ / | |/| |
* | | | am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-142-7/+16
|\| | |
| * | | Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-142-7/+16
| |\ \ \
| | * | | Add android.net.IpPrefix#contains()Erik Kline2015-04-142-7/+16
* | | | | am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests."Alex Klyubin2015-04-132-0/+62
|\| | | |
| * | | | Merge "Use JCA names for block modes, paddings, and digests."Alex Klyubin2015-04-132-0/+62
| |\ \ \ \
| | * | | | Use JCA names for block modes, paddings, and digests.Alex Klyubin2015-04-132-0/+62
* | | | | | am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring pro...Wale Ogunwale2015-04-131-24/+42
|\| | | | |
| * | | | | Merge "Clean-up state if we have an exception when acquiring provider"Wale Ogunwale2015-04-131-24/+42
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Clean-up state if we have an exception when acquiring providerWale Ogunwale2015-04-101-24/+42
| | | |/ / | | |/| |
* | | | | am 97fce66f: Merge "Make several key crypto parameters repeatable"Shawn Willden2015-04-101-6/+6
|\| | | |
| * | | | Make several key crypto parameters repeatableChad Brubaker2015-04-101-6/+6
| | |/ / | |/| |
* | | | am a270264c: Merge "Track more changes to keymaster_defs.h"Alex Klyubin2015-04-101-18/+1
|\| | |
| * | | Track more changes to keymaster_defs.hAlex Klyubin2015-04-101-18/+1
* | | | am ba2836e6: Merge "Track recent keymaster_defs.h changes."Alex Klyubin2015-04-101-19/+1
|\| | |
| * | | Track recent keymaster_defs.h changes.Alex Klyubin2015-04-091-19/+1
| |/ /
* | | am 0c5752be: am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomati...Quddus Chong2015-04-081-1/+1
|\ \ \
| * \ \ am c736e8cf: am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMo...Quddus Chong2015-04-081-1/+1
| |\ \ \
| | * \ \ am f0ab39c1: Merge "Fixed broken link in UiAutomation.setRunAsMonkey() method...Quddus Chong2015-04-081-1/+1
| | |\ \ \
| | | * | | Fixed broken link in UiAutomation.setRunAsMonkey() method description.Quddus Chong2015-04-071-1/+1
| | | | |/ | | | |/|
| * | | | Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1...Kenny Root2015-03-312-2/+2
| |\ \ \ \
| | * | | | Revert "Track change to Conscrypt" DO NOT MERGE ANYWHEREKenny Root2015-03-312-2/+2
* | | | | | am 393f89f2: Merge "[ActivityManager] Avoid NullPointerException if no crash ...Olawale Ogunwale2015-04-081-2/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | [ActivityManager] Avoid NullPointerException if nolouis_chang2015-04-081-2/+6
* | | | | | am 80e455e3: Merge "Prevent possible memory leak in SpanSet"Romain Guy2015-04-081-3/+10
|\| | | | |
| * | | | | Merge "Prevent possible memory leak in SpanSet"Romain Guy2015-04-081-3/+10
| |\ \ \ \ \
| | * | | | | Prevent possible memory leak in SpanSetRomain Guy2015-04-071-3/+10
* | | | | | | am 7a3c8c70: Merge "Fixed memory leak in ExtractEditLayout finish()"Adam Powell2015-04-071-0/+2
|\| | | | | |
| * | | | | | Merge "Fixed memory leak in ExtractEditLayout finish()"Adam Powell2015-04-071-0/+2
| |\ \ \ \ \ \
| | * | | | | | Fixed memory leak in ExtractEditLayout finish()Johan8 Persson22015-03-271-0/+2
* | | | | | | | am 8391e03b: Merge "ProgressBar: Fix error of process bar cannot update on so...Adam Powell2015-04-071-3/+1
|\| | | | | | |