diff options
Diffstat (limited to 'native')
| -rw-r--r-- | native/android/OWNERS | 3 | ||||
| -rw-r--r-- | native/android/asset_manager.cpp | 4 | ||||
| -rw-r--r-- | native/android/sensor.cpp | 6 | ||||
| -rw-r--r-- | native/android/storage_manager.cpp | 6 | ||||
| -rw-r--r-- | native/android/tests/performance_hint/OWNERS | 1 | ||||
| -rw-r--r-- | native/webview/OWNERS | 4 |
6 files changed, 14 insertions, 10 deletions
diff --git a/native/android/OWNERS b/native/android/OWNERS index d41652f2ad17..0b86909929b0 100644 --- a/native/android/OWNERS +++ b/native/android/OWNERS @@ -26,3 +26,6 @@ per-file surface_texture.cpp = file:/graphics/java/android/graphics/OWNERS # Input per-file input.cpp = file:/INPUT_OWNERS + +# PerformanceHint +per-file performance_hint.cpp = file:/ADPF_OWNERS diff --git a/native/android/asset_manager.cpp b/native/android/asset_manager.cpp index 69cf80477dde..1878716da3cd 100644 --- a/native/android/asset_manager.cpp +++ b/native/android/asset_manager.cpp @@ -118,7 +118,7 @@ const char* AAssetDir_getNextFileName(AAssetDir* assetDir) // the string to return and advance the iterator for next time. if (index < max) { assetDir->mCachedFileName = assetDir->mAssetDir->getFileName(index); - returnName = assetDir->mCachedFileName.string(); + returnName = assetDir->mCachedFileName.c_str(); index++; } @@ -134,7 +134,7 @@ void AAssetDir_rewind(AAssetDir* assetDir) const char* AAssetDir_getFileName(AAssetDir* assetDir, int index) { assetDir->mCachedFileName = assetDir->mAssetDir->getFileName(index); - return assetDir->mCachedFileName.string(); + return assetDir->mCachedFileName.c_str(); } void AAssetDir_close(AAssetDir* assetDir) diff --git a/native/android/sensor.cpp b/native/android/sensor.cpp index 968de34f5d69..bb8708bd1e5e 100644 --- a/native/android/sensor.cpp +++ b/native/android/sensor.cpp @@ -304,12 +304,12 @@ int ASensorEventQueue_requestAdditionalInfoEvents(ASensorEventQueue* queue, bool const char* ASensor_getName(ASensor const* sensor) { RETURN_IF_SENSOR_IS_NULL(nullptr); - return static_cast<Sensor const*>(sensor)->getName().string(); + return static_cast<Sensor const*>(sensor)->getName().c_str(); } const char* ASensor_getVendor(ASensor const* sensor) { RETURN_IF_SENSOR_IS_NULL(nullptr); - return static_cast<Sensor const*>(sensor)->getVendor().string(); + return static_cast<Sensor const*>(sensor)->getVendor().c_str(); } int ASensor_getType(ASensor const* sensor) { @@ -339,7 +339,7 @@ int ASensor_getFifoReservedEventCount(ASensor const* sensor) { const char* ASensor_getStringType(ASensor const* sensor) { RETURN_IF_SENSOR_IS_NULL(nullptr); - return static_cast<Sensor const*>(sensor)->getStringType().string(); + return static_cast<Sensor const*>(sensor)->getStringType().c_str(); } int ASensor_getReportingMode(ASensor const* sensor) { diff --git a/native/android/storage_manager.cpp b/native/android/storage_manager.cpp index 9e0a6eb476d3..6db87dfdd565 100644 --- a/native/android/storage_manager.cpp +++ b/native/android/storage_manager.cpp @@ -86,7 +86,7 @@ protected: return nullptr; } - String16 fileName(obbFile->getFileName()); + String16 fileName(canonicalPath); String16 packageName(obbFile->getPackageName()); size_t length; const unsigned char* salt = obbFile->getSalt(&length); @@ -175,7 +175,7 @@ public: String16 filename16(filename); String16 path16; if (mMountService->getMountedObbPath(filename16, path16)) { - return String8(path16).string(); + return String8(path16).c_str(); } else { return NULL; } @@ -183,7 +183,7 @@ public: }; void ObbActionListener::onObbResult(const android::String16& filename, const int32_t nonce, const int32_t state) { - mStorageManager->fireCallback(String8(filename).string(), nonce, state); + mStorageManager->fireCallback(String8(filename).c_str(), nonce, state); } diff --git a/native/android/tests/performance_hint/OWNERS b/native/android/tests/performance_hint/OWNERS new file mode 100644 index 000000000000..e3bbee92057d --- /dev/null +++ b/native/android/tests/performance_hint/OWNERS @@ -0,0 +1 @@ +include /ADPF_OWNERS diff --git a/native/webview/OWNERS b/native/webview/OWNERS index 580bb0fe8273..7e27dc8831a6 100644 --- a/native/webview/OWNERS +++ b/native/webview/OWNERS @@ -1,4 +1,4 @@ +# Bug component: 76427 boliu@google.com -changwan@google.com -tobiasjs@google.com +ntfschr@google.com torne@google.com |