summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move ScopedFd from libcore to libnativehelper (part 2)Brian Carlstrom2013-05-141-46/+0
| | | | Change-Id: Idd1aca43a2315398d52fec7c8fba8906e970d8cb
* Merge "Expose Throwable changes."Elliott Hughes2013-05-141-26/+9
|\
| * Expose Throwable changes.Elliott Hughes2013-05-141-26/+9
|/ | | | | Bug: 3484927 Change-Id: If4d39c9af3a7b0bd60f31ad7e969baa6b27e3d86
* Merge "Fix java.lang.Throwable's protected constructor."Elliott Hughes2013-05-142-44/+76
|\
| * Fix java.lang.Throwable's protected constructor.Elliott Hughes2013-05-132-44/+76
|/ | | | | Bug: 3484927 Change-Id: Ib8088ec50a767390b6416b73a0e66887ece5c719
* Merge "Un-@hide various APIs."Conley Owens2013-05-1322-92/+37
|\
| * Un-@hide various APIs.Elliott Hughes2013-05-1322-92/+37
|/ | | | | Bug: 3484927 Change-Id: I4cda326a31240135d883528d9cb976a9db084234
* Merge "Fix build."Elliott Hughes2013-05-131-1/+1
|\
| * Fix build.Elliott Hughes2013-05-131-1/+1
|/ | | | Change-Id: Ibfbba9fdb1d5ca00aad55cc1c62766821175f384
* Merge "Fix Short.compare."Elliott Hughes2013-05-131-1/+1
|\
| * Fix Short.compare.Elliott Hughes2013-05-131-1/+1
|/ | | | | Bug: 3484927 Change-Id: I53fbed8d7060556ade960174d567e975ebc70928
* Merge "Improve java.lang.reflect.Modifier documentation."Elliott Hughes2013-05-131-109/+22
|\
| * Improve java.lang.reflect.Modifier documentation.Elliott Hughes2013-05-131-109/+22
| | | | | | | | Change-Id: I514ab7668a933f7ce724408d95464ef25d76b53b
* | Merge "Move some files with dalvik dependencies to libdvm"Brian Carlstrom2013-05-1330-0/+3
|\ \ | |/ |/|
| * Move some files with dalvik dependencies to libdvmBrian Carlstrom2013-05-1330-0/+3
| | | | | | | | Change-Id: I04498d8d8c4b065dbda8d7b30b8b77ce53e63a77
* | Merge "Fix String.replace("", x) for strings with non-0 offsets."Elliott Hughes2013-05-132-2/+13
|\ \ | |/ |/|
| * Fix String.replace("", x) for strings with non-0 offsets.Elliott Hughes2013-05-132-2/+13
|/ | | | | | | Also fix the sizing of the StringBuilder. Bug: https://code.google.com/p/android/issues/detail?id=55129 Change-Id: Ic56763ef90451a25a0adfbe649b0a766e9b930f9
* Merge "Clean up two unnecessary 'implements' clauses."Elliott Hughes2013-05-112-2/+2
|\
| * Clean up two unnecessary 'implements' clauses.Elliott Hughes2013-05-102-2/+2
| | | | | | | | | | Bug: 3484927 Change-Id: I29ce16d47f880399894c84940dbe9f091831fa06
* | Merge "Add @SafeVarargs."Elliott Hughes2013-05-114-0/+38
|\ \
| * | Add @SafeVarargs.Elliott Hughes2013-05-104-0/+38
| |/ | | | | | | | | Bug: 3484927 Change-Id: I3c235502d6542767a2f5818b203ff7520073a053
* | Merge "Tracking libnativehelper dependencies"Brian Carlstrom2013-05-111-0/+1
|\ \ | |/ |/|
| * Tracking libnativehelper dependenciesBrian Carlstrom2013-05-101-0/+1
| | | | | | | | Change-Id: Icf5c2a3989f4bf8adf084bcb03001b53189c0309
* | Merge "Move more utility classes from libcore to libnativehelper (part 2)"Brian Carlstrom2013-05-107-669/+0
|\ \
| * | Move more utility classes from libcore to libnativehelper (part 2)Brian Carlstrom2013-05-107-669/+0
| |/ | | | | | | Change-Id: If23ff812f5283c15aeb2ca3a5d82f685f78d540d
* | Merge "Finish off AutoCloseable."Conley Owens2013-05-108-15/+21
|\ \ | |/ |/|
| * Finish off AutoCloseable.Elliott Hughes2013-05-108-15/+21
|/ | | | | Bug: 3484927 Change-Id: Ia0f5ad3db9807459ce6cda05bc2f53564b63b375
* Merge "Remove duplicate JNIHelp.h import"Brian Carlstrom2013-05-101-1/+0
|\
| * Remove duplicate JNIHelp.h importBrian Carlstrom2013-05-101-1/+0
|/ | | | Change-Id: Ib119fd7c5c7cb5f682aab08c7916806c95a73d2b
* Merge "Ensure array_ is initialized."Brian Carlstrom2013-05-101-1/+1
|\
| * Ensure array_ is initialized.Ian Rogers2013-05-101-1/+1
|/ | | | | | | | Always read in destructor. (cherry picked from commit 5c4fb07217923c70b368b058f5337e4d9217cc1f) Change-Id: I6ac68373750c3c864e9e401fa85f6336e93df435
* Merge changes Ie07e5901,I8a154f8bBrian Carlstrom2013-05-1014-447/+122
|\ | | | | | | | | | | * changes: resolved conflicts for merge of f78109f6 to dalvik-dev Some of our helpers have moved into libnativehelpers.
| * resolved conflicts for merge of f78109f6 to dalvik-devElliott Hughes2013-05-095-29/+118
| | | | | | | | | | | | (git cherry-pick -m 1 8a6e388c11d8ee72a0af23e6091239e2f58bc968) Change-Id: Ie07e5901d5a127b6d6840b05da5dfd5c2b967048
| * Some of our helpers have moved into libnativehelpers.Elliott Hughes2013-05-0910-418/+4
|/ | | | | | (cherry picked from commit 4b5012a6cd5f7f32f33a776c9e2c94ca3f3eb1d5) Change-Id: I8a154f8b6e39b8ed0a633fab9ba31d557b545bb5
* Merge "Improve ProcessManager."Elliott Hughes2013-05-072-340/+283
|\
| * Improve ProcessManager.Elliott Hughes2013-05-072-340/+283
| | | | | | | | | | | | | | | | | | | | Previously we'd leave zombies around if chdir(2) or execvp(2) failed. We also used to unnecessarily make 32Ki close(2) calls for every child. This patch fixes both problems and makes the tests less meaningless. Bug: https://code.google.com/p/android/issues/detail?id=55017 Change-Id: I23ecc84aedd6650dbe6df19b4b0c2e6429578e50
* | Merge "NativeCrypto: Fix a lot of random doc bugs"Kenny Root2013-05-0725-69/+37
|\ \
| * | NativeCrypto: Fix a lot of random doc bugsKenny Root2013-05-0725-69/+37
| | | | | | | | | | | | | | | | | | | | | | | | Remove lots of empty javadoc tags that were unused or invalid. Remove some unused imports. Mark a few input streams as intentionally unclosed. Change-Id: I04d8642abd2b0f2e9be02e227658a1b9bd192d24
* | | Merge "NativeCrypto: use strings instead of loading class"Kenny Root2013-05-071-65/+63
|\ \ \
| * | | NativeCrypto: use strings instead of loading classKenny Root2013-05-071-65/+63
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the Foo.class.getName() forces the class to be loaded when it's not necessarily ever used. Using a String for the class's name instead allows the class to be loaded lazily. All the classes used to appear in preloaded-classes when it wasn't ever really used in practice. Change-Id: I9f2acf60bed25f5c9b162c62023aef42e7859cf4
* | | Merge "NativeCrypto: make our own X.509 key class"Kenny Root2013-05-072-2/+87
|\ \ \ | |/ / |/| |
| * | NativeCrypto: make our own X.509 key classKenny Root2013-05-072-2/+87
| | | | | | | | | | | | | | | | | | | | | Make a key class that just holds the encoded key bytes along with the algorithm identifier. Eclipse IDE made the entire class. Change-Id: I40b198e0f01121d77bfd26b3420068700ab69614
* | | Merge changes Ided7a6bf,I61339e02Kenny Root2013-05-071-3/+5
|\ \ \ | |/ / |/| | | | | | | | | | | * changes: NativeCrypto: inline call to peekInt NativeCrypto: remove unused import
| * | NativeCrypto: inline call to peekIntKenny Root2013-05-061-2/+5
| | | | | | | | | | | | | | | | | | Remove dependency on libcore by inlining a copy of Memory#peekInt Change-Id: Ided7a6bf111ca507df985c45f4c2cf43bca0e471
| * | NativeCrypto: remove unused importKenny Root2013-05-061-1/+0
|/ / | | | | | | Change-Id: I61339e0250ce949c633545d509a4991cc97e2c7a
* | Merge "NativeCrypto: remove dep on Android host verifier"Kenny Root2013-05-061-3/+48
|\ \
| * | NativeCrypto: remove dep on Android host verifierKenny Root2013-05-061-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | DefaultHostnameVerifier on Android actually does something, but it doesn't do anything on other JVMs. Copy out the method we need instead of relying on the implementation in Android's libcore. Change-Id: Ic623c366cbba957597021786045094de3cba82d7
* | | Merge "NativeCrypto: pull in copy of EmptyArray"Kenny Root2013-05-0611-10/+45
|\ \ \
| * | | NativeCrypto: pull in copy of EmptyArrayKenny Root2013-05-0611-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull in our own copy of EmptyArray so we don't depend on libcore's version. Change-Id: I9d90ac4f196a66a022241ed974a7dc78cb9babda
* | | | Merge "Make it clearer that a new MockWebServer is created for each test run"Brian Carlstrom2013-05-061-2/+2
|\ \ \ \ | |/ / / |/| | |