1 files changed, 7 insertions, 0 deletions
diff --git a/include/androidfw/AttributeFinder.h b/include/androidfw/AttributeFinder.h
index acf7056..be0f1bd 100644
--- a/include/androidfw/AttributeFinder.h
+++ b/include/androidfw/AttributeFinder.h
@@ -74,6 +74,7 @@ private:
 
     // Package Offsets (best-case, fast look-up).
     Iterator mFrameworkStart;
+    Iterator mCMFrameworkStart;
     Iterator mAppStart;
 
     // Worst case, we have shared-library resources.
@@ -99,6 +100,9 @@ void BackTrackingAttributeFinder<Derived, Iterator>::jumpToClosestAttribute(cons
         case 0x01:
             mCurrent = mFrameworkStart;
             break;
+        case 0x3f:
+            mCurrent = mCMFrameworkStart;
+            break;
         case 0x7f:
             mCurrent = mAppStart;
             break;
@@ -132,6 +136,9 @@ void BackTrackingAttributeFinder<Derived, Iterator>::markCurrentPackageId(const
         case 0x01:
             mFrameworkStart = mCurrent;
             break;
+        case 0x3f:
+            mCMFrameworkStart = mCurrent;
+            break;
         case 0x7f:
             mAppStart = mCurrent;
             break;