diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-05-09 09:44:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-09 09:44:09 +0000 |
| commit | 9ac22697992649743d3835927ab924c4a1b0e1fd (patch) | |
| tree | 4be69c77cfe8452466ddc30e867619f6a69ece8a /native | |
| parent | b37a1990934b6cb209b79e84ed11ac41ff89e851 (diff) | |
| parent | b0648d607031b07c50df6e2a72ec5be2323d6937 (diff) | |
| download | base-9ac22697992649743d3835927ab924c4a1b0e1fd.tar.gz | |
Merge "Remove usage of mFileName in ObbInfo" am: 9568ba7399 am: b7c510225f am: 5c34b1be69 am: 781f0dd4a8 am: d74fc2ad01 am: b0648d6070
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2493876
Change-Id: Ibe9cab4b13debe223777a2494aaf816ecb7f80b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'native')
| -rw-r--r-- | native/android/storage_manager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/native/android/storage_manager.cpp b/native/android/storage_manager.cpp index 9e0a6eb476d3..294ca9cfd3b4 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); |