Don\'t fail if the CE key isn\'t loaded in destroy_user_key

am: 71ee662

* commit '71ee662ec3f82db66f1a34579aff75cc27d4b205':
  Don't fail if the CE key isn't loaded in destroy_user_key

Change-Id: I7700f07dfa3421e57149aacf1a98b0a5eb8bf917

Ext4Crypt.cpp

@@ -443,7 +443,10 @@ bool e4crypt_destroy_user_key(userid_t user_id) {
     bool success = true;
     s_ce_keys.erase(user_id);
     std::string raw_ref;
-    success &= lookup_key_ref(s_ce_key_raw_refs, user_id, &raw_ref) && evict_key(raw_ref);
+    // If we haven't loaded the CE key, no need to evict it.
+    if (lookup_key_ref(s_ce_key_raw_refs, user_id, &raw_ref)) {
+        success &= evict_key(raw_ref);
+    }
     s_ce_key_raw_refs.erase(user_id);
     success &= lookup_key_ref(s_de_key_raw_refs, user_id, &raw_ref) && evict_key(raw_ref);
     s_de_key_raw_refs.erase(user_id);