commit d6d8faa69068d92e0e4021fced181b448d4e8cbd
author Jorge Lucangeli Obes <jorgelo@google.com> Tue Jul 19 12:10:26 2016 -0400
committer Jorge Lucangeli Obes <jorgelo@google.com> Tue Jul 19 17:01:15 2016 -0400
tree 6e09f50dea3611cbdc9c59d67305766daba30812
parent ddbcecec3a28b0916c1f7f098c3e6995d46687de

sdcard: Use std::map.

Having CaseInsensitiveCompare use strcasecomp is not ideal, but other
solutions are not prettier.

Also, add a TODO to fix FUSE_TRACE, broken by the switch to C++.

Bug: 27147273

Change-Id: I0017c3a7d0254eb81abd128b97cd06c5ad0d1dff

sdcard/fuse.cpp

diff --git a/sdcard/fuse.cpp b/sdcard/fuse.cpp
index 1b6a5f1..9b1b190 100644
--- a/sdcard/fuse.cpp
+++ b/sdcard/fuse.cpp
@@ -275,8 +275,9 @@
     case PERM_ANDROID_DATA:
     case PERM_ANDROID_OBB:
     case PERM_ANDROID_MEDIA:
-        appid = (appid_t) (uintptr_t) hashmapGet(fuse->global->package_to_appid, node->name);
-        if (appid != 0) {
+        const auto& iter = fuse->global->package_to_appid->find(node->name);
+        if (iter != fuse->global->package_to_appid->end()) {
+            appid = iter->second;
             node->uid = multiuser_get_uid(parent->userid, appid);
         }
         break;