diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-07-13 15:57:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-13 15:57:20 -0700 |
| commit | f5574e0f8ca5624c822737eae497e27b60e33662 (patch) | |
| tree | f639515cf04c39a41b0af38c2980b13291b582f4 /core | |
| parent | d11f6e6460dcc41597e3a7f6cd3023f116f8c696 (diff) | |
| parent | 706623ddb8314850c0551f0b66e24b5f0bd28620 (diff) | |
| download | frameworks_base-f5574e0f8ca5624c822737eae497e27b60e33662.zip frameworks_base-f5574e0f8ca5624c822737eae497e27b60e33662.tar.gz frameworks_base-f5574e0f8ca5624c822737eae497e27b60e33662.tar.bz2 | |
am 706623dd: am c0a7e690: Add Parcel::readExceptionCode() and Parcel::writeNoException()
Merge commit '706623ddb8314850c0551f0b66e24b5f0bd28620'
* commit '706623ddb8314850c0551f0b66e24b5f0bd28620':
Add Parcel::readExceptionCode() and Parcel::writeNoException()
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/ActivityManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/ActivityManager.cpp b/core/jni/ActivityManager.cpp index 8950dfb..0bd14fa 100644 --- a/core/jni/ActivityManager.cpp +++ b/core/jni/ActivityManager.cpp @@ -39,7 +39,7 @@ int openContentProviderFile(const String16& uri) data.writeString16(uri); status_t ret = am->transact(OPEN_CONTENT_URI_TRANSACTION, data, &reply); if (ret == NO_ERROR) { - int32_t exceptionCode = reply.readInt32(); + int32_t exceptionCode = reply.readExceptionCode(); if (!exceptionCode) { // Success is indicated here by a nonzero int followed by the fd; // failure by a zero int with no data following. |