| commit | 724932b68c8d7da30be94f2c5b0da86d078a98a4 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Apr 04 23:41:59 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 04 23:41:59 2013 -0700 |
| tree | 0baec697516ce1cf354452d66a57a4bb4d7fa868 | |
| parent | c9ca1b50428ac5bf1c82f4cb0efd51310066b9ec [diff] | |
| parent | 77c4e48e80b989cb80599a40fbbad9a16745d89f [diff] |
am 77c4e48e: Merge "Fix CL split and build" * commit '77c4e48e80b989cb80599a40fbbad9a16745d89f': Fix CL split and build
diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp index 34cab24..760ec4d 100644 --- a/keystore/keystore.cpp +++ b/keystore/keystore.cpp
@@ -753,7 +753,7 @@ } bool isHardwareBacked() const { - return (mDevice->flags & KEYMASTER_SOFTWARE_ONLY) != 0; + return (mDevice->flags & KEYMASTER_SOFTWARE_ONLY) == 0; } private: