diff options
author | Steve Block <steveblock@google.com> | 2011-12-20 16:23:08 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-03 22:38:27 +0000 |
commit | 5baa3a62a97544669fba6d65a11c07f252e654dd (patch) | |
tree | 109755e1595b438873d34b981e31f84ea64bd2a5 /libs/storage | |
parent | 173ab4d61077c49f115b82eff34f97fda5a7273a (diff) | |
download | frameworks_base-5baa3a62a97544669fba6d65a11c07f252e654dd.zip frameworks_base-5baa3a62a97544669fba6d65a11c07f252e654dd.tar.gz frameworks_base-5baa3a62a97544669fba6d65a11c07f252e654dd.tar.bz2 |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
Diffstat (limited to 'libs/storage')
-rw-r--r-- | libs/storage/IMountService.cpp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/libs/storage/IMountService.cpp b/libs/storage/IMountService.cpp index 8ddbeae..4ec8b25 100644 --- a/libs/storage/IMountService.cpp +++ b/libs/storage/IMountService.cpp @@ -66,12 +66,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeStrongBinder(listener->asBinder()); if (remote()->transact(TRANSACTION_registerListener, data, &reply) != NO_ERROR) { - LOGD("registerListener could not contact remote\n"); + ALOGD("registerListener could not contact remote\n"); return; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("registerListener caught exception %d\n", err); + ALOGD("registerListener caught exception %d\n", err); return; } } @@ -82,12 +82,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeStrongBinder(listener->asBinder()); if (remote()->transact(TRANSACTION_unregisterListener, data, &reply) != NO_ERROR) { - LOGD("unregisterListener could not contact remote\n"); + ALOGD("unregisterListener could not contact remote\n"); return; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("unregisterListener caught exception %d\n", err); + ALOGD("unregisterListener caught exception %d\n", err); return; } } @@ -97,12 +97,12 @@ public: Parcel data, reply; data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); if (remote()->transact(TRANSACTION_isUsbMassStorageConnected, data, &reply) != NO_ERROR) { - LOGD("isUsbMassStorageConnected could not contact remote\n"); + ALOGD("isUsbMassStorageConnected could not contact remote\n"); return false; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("isUsbMassStorageConnected caught exception %d\n", err); + ALOGD("isUsbMassStorageConnected caught exception %d\n", err); return false; } return reply.readInt32() != 0; @@ -114,12 +114,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeInt32(enable != 0); if (remote()->transact(TRANSACTION_setUsbMassStorageEnabled, data, &reply) != NO_ERROR) { - LOGD("setUsbMassStorageEnabled could not contact remote\n"); + ALOGD("setUsbMassStorageEnabled could not contact remote\n"); return; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("setUsbMassStorageEnabled caught exception %d\n", err); + ALOGD("setUsbMassStorageEnabled caught exception %d\n", err); return; } } @@ -129,12 +129,12 @@ public: Parcel data, reply; data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); if (remote()->transact(TRANSACTION_isUsbMassStorageEnabled, data, &reply) != NO_ERROR) { - LOGD("isUsbMassStorageEnabled could not contact remote\n"); + ALOGD("isUsbMassStorageEnabled could not contact remote\n"); return false; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("isUsbMassStorageEnabled caught exception %d\n", err); + ALOGD("isUsbMassStorageEnabled caught exception %d\n", err); return false; } return reply.readInt32() != 0; @@ -146,12 +146,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(mountPoint); if (remote()->transact(TRANSACTION_mountVolume, data, &reply) != NO_ERROR) { - LOGD("mountVolume could not contact remote\n"); + ALOGD("mountVolume could not contact remote\n"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("mountVolume caught exception %d\n", err); + ALOGD("mountVolume caught exception %d\n", err); return err; } return reply.readInt32(); @@ -165,12 +165,12 @@ public: data.writeInt32(force ? 1 : 0); data.writeInt32(removeEncryption ? 1 : 0); if (remote()->transact(TRANSACTION_unmountVolume, data, &reply) != NO_ERROR) { - LOGD("unmountVolume could not contact remote\n"); + ALOGD("unmountVolume could not contact remote\n"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("unmountVolume caught exception %d\n", err); + ALOGD("unmountVolume caught exception %d\n", err); return err; } return reply.readInt32(); @@ -182,12 +182,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(mountPoint); if (remote()->transact(TRANSACTION_formatVolume, data, &reply) != NO_ERROR) { - LOGD("formatVolume could not contact remote\n"); + ALOGD("formatVolume could not contact remote\n"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("formatVolume caught exception %d\n", err); + ALOGD("formatVolume caught exception %d\n", err); return err; } return reply.readInt32(); @@ -199,12 +199,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(mountPoint); if (remote()->transact(TRANSACTION_getStorageUsers, data, &reply) != NO_ERROR) { - LOGD("getStorageUsers could not contact remote\n"); + ALOGD("getStorageUsers could not contact remote\n"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("getStorageUsers caught exception %d\n", err); + ALOGD("getStorageUsers caught exception %d\n", err); return err; } const int32_t numUsers = reply.readInt32(); @@ -221,12 +221,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(mountPoint); if (remote()->transact(TRANSACTION_getVolumeState, data, &reply) != NO_ERROR) { - LOGD("getVolumeState could not contact remote\n"); + ALOGD("getVolumeState could not contact remote\n"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("getVolumeState caught exception %d\n", err); + ALOGD("getVolumeState caught exception %d\n", err); return err; } return reply.readInt32(); @@ -243,12 +243,12 @@ public: data.writeString16(key); data.writeInt32(ownerUid); if (remote()->transact(TRANSACTION_createSecureContainer, data, &reply) != NO_ERROR) { - LOGD("createSecureContainer could not contact remote\n"); + ALOGD("createSecureContainer could not contact remote\n"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("createSecureContainer caught exception %d\n", err); + ALOGD("createSecureContainer caught exception %d\n", err); return err; } return reply.readInt32(); @@ -260,12 +260,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(id); if (remote()->transact(TRANSACTION_finalizeSecureContainer, data, &reply) != NO_ERROR) { - LOGD("finalizeSecureContainer couldn't call remote\n"); + ALOGD("finalizeSecureContainer couldn't call remote\n"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("finalizeSecureContainer caught exception %d\n", err); + ALOGD("finalizeSecureContainer caught exception %d\n", err); return err; } return reply.readInt32(); @@ -277,12 +277,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(id); if (remote()->transact(TRANSACTION_destroySecureContainer, data, &reply) != NO_ERROR) { - LOGD("destroySecureContainer couldn't call remote"); + ALOGD("destroySecureContainer couldn't call remote"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("destroySecureContainer caught exception %d\n", err); + ALOGD("destroySecureContainer caught exception %d\n", err); return err; } return reply.readInt32(); @@ -296,12 +296,12 @@ public: data.writeString16(key); data.writeInt32(ownerUid); if (remote()->transact(TRANSACTION_mountSecureContainer, data, &reply) != NO_ERROR) { - LOGD("mountSecureContainer couldn't call remote"); + ALOGD("mountSecureContainer couldn't call remote"); return -1; } int32_t err = reply.readExceptionCode(); // What to do... if (err < 0) { - LOGD("mountSecureContainer caught exception %d\n", err); + ALOGD("mountSecureContainer caught exception %d\n", err); return err; } return reply.readInt32(); @@ -314,12 +314,12 @@ public: data.writeString16(id); data.writeInt32(force ? 1 : 0); if (remote()->transact(TRANSACTION_getSecureContainerPath, data, &reply) != NO_ERROR) { - LOGD("unmountSecureContainer couldn't call remote"); + ALOGD("unmountSecureContainer couldn't call remote"); return -1; } int32_t err = reply.readExceptionCode(); // What to do... if (err < 0) { - LOGD("unmountSecureContainer caught exception %d\n", err); + ALOGD("unmountSecureContainer caught exception %d\n", err); return err; } return reply.readInt32(); @@ -331,12 +331,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(id); if (remote()->transact(TRANSACTION_isSecureContainerMounted, data, &reply) != NO_ERROR) { - LOGD("isSecureContainerMounted couldn't call remote"); + ALOGD("isSecureContainerMounted couldn't call remote"); return false; } int32_t err = reply.readExceptionCode(); // What to do... if (err < 0) { - LOGD("isSecureContainerMounted caught exception %d\n", err); + ALOGD("isSecureContainerMounted caught exception %d\n", err); return false; } return reply.readInt32() != 0; @@ -349,12 +349,12 @@ public: data.writeString16(oldId); data.writeString16(newId); if (remote()->transact(TRANSACTION_renameSecureContainer, data, &reply) != NO_ERROR) { - LOGD("renameSecureContainer couldn't call remote"); + ALOGD("renameSecureContainer couldn't call remote"); return -1; } int32_t err = reply.readExceptionCode(); // What to do... if (err < 0) { - LOGD("renameSecureContainer caught exception %d\n", err); + ALOGD("renameSecureContainer caught exception %d\n", err); return err; } return reply.readInt32(); @@ -366,12 +366,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(id); if (remote()->transact(TRANSACTION_getSecureContainerPath, data, &reply) != NO_ERROR) { - LOGD("getSecureContainerPath couldn't call remote"); + ALOGD("getSecureContainerPath couldn't call remote"); return false; } int32_t err = reply.readExceptionCode(); // What to do... if (err < 0) { - LOGD("getSecureContainerPath caught exception %d\n", err); + ALOGD("getSecureContainerPath caught exception %d\n", err); return false; } path = reply.readString16(); @@ -384,12 +384,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(id); if (remote()->transact(TRANSACTION_getSecureContainerList, data, &reply) != NO_ERROR) { - LOGD("getSecureContainerList couldn't call remote"); + ALOGD("getSecureContainerList couldn't call remote"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("getSecureContainerList caught exception %d\n", err); + ALOGD("getSecureContainerList caught exception %d\n", err); return err; } const int32_t numStrings = reply.readInt32(); @@ -406,12 +406,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeStrongBinder(observer->asBinder()); if (remote()->transact(TRANSACTION_shutdown, data, &reply) != NO_ERROR) { - LOGD("shutdown could not contact remote\n"); + ALOGD("shutdown could not contact remote\n"); return; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("shutdown caught exception %d\n", err); + ALOGD("shutdown caught exception %d\n", err); return; } reply.readExceptionCode(); @@ -422,12 +422,12 @@ public: Parcel data, reply; data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); if (remote()->transact(TRANSACTION_finishMediaUpdate, data, &reply) != NO_ERROR) { - LOGD("finishMediaUpdate could not contact remote\n"); + ALOGD("finishMediaUpdate could not contact remote\n"); return; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("finishMediaUpdate caught exception %d\n", err); + ALOGD("finishMediaUpdate caught exception %d\n", err); return; } reply.readExceptionCode(); @@ -443,12 +443,12 @@ public: data.writeStrongBinder(token->asBinder()); data.writeInt32(nonce); if (remote()->transact(TRANSACTION_mountObb, data, &reply) != NO_ERROR) { - LOGD("mountObb could not contact remote\n"); + ALOGD("mountObb could not contact remote\n"); return; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("mountObb caught exception %d\n", err); + ALOGD("mountObb caught exception %d\n", err); return; } } @@ -463,12 +463,12 @@ public: data.writeStrongBinder(token->asBinder()); data.writeInt32(nonce); if (remote()->transact(TRANSACTION_unmountObb, data, &reply) != NO_ERROR) { - LOGD("unmountObb could not contact remote\n"); + ALOGD("unmountObb could not contact remote\n"); return; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("unmountObb caught exception %d\n", err); + ALOGD("unmountObb caught exception %d\n", err); return; } } @@ -479,12 +479,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(filename); if (remote()->transact(TRANSACTION_isObbMounted, data, &reply) != NO_ERROR) { - LOGD("isObbMounted could not contact remote\n"); + ALOGD("isObbMounted could not contact remote\n"); return false; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("isObbMounted caught exception %d\n", err); + ALOGD("isObbMounted caught exception %d\n", err); return false; } return reply.readInt32() != 0; @@ -496,12 +496,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(filename); if (remote()->transact(TRANSACTION_getMountedObbPath, data, &reply) != NO_ERROR) { - LOGD("getMountedObbPath could not contact remote\n"); + ALOGD("getMountedObbPath could not contact remote\n"); return false; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("getMountedObbPath caught exception %d\n", err); + ALOGD("getMountedObbPath caught exception %d\n", err); return false; } path = reply.readString16(); @@ -514,12 +514,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(password); if (remote()->transact(TRANSACTION_decryptStorage, data, &reply) != NO_ERROR) { - LOGD("decryptStorage could not contact remote\n"); + ALOGD("decryptStorage could not contact remote\n"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("decryptStorage caught exception %d\n", err); + ALOGD("decryptStorage caught exception %d\n", err); return err; } return reply.readInt32(); @@ -531,12 +531,12 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(password); if (remote()->transact(TRANSACTION_encryptStorage, data, &reply) != NO_ERROR) { - LOGD("encryptStorage could not contact remote\n"); + ALOGD("encryptStorage could not contact remote\n"); return -1; } int32_t err = reply.readExceptionCode(); if (err < 0) { - LOGD("encryptStorage caught exception %d\n", err); + ALOGD("encryptStorage caught exception %d\n", err); return err; } return reply.readInt32(); |