diff --git a/src/main/java/com/reandroid/lib/arsc/chunk/PackageBlock.java b/src/main/java/com/reandroid/lib/arsc/chunk/PackageBlock.java index aa46525..548721a 100755 --- a/src/main/java/com/reandroid/lib/arsc/chunk/PackageBlock.java +++ b/src/main/java/com/reandroid/lib/arsc/chunk/PackageBlock.java @@ -57,7 +57,7 @@ package com.reandroid.lib.arsc.chunk; private final SpecTypePairArray mSpecTypePairArray; private final LibraryBlock mLibraryBlock; - private final StagedAlias mStagedAlias; + private final BlockList mStagedAliasList; private final BlockList mOverlayableList; private final BlockList mOverlayablePolicyList; @@ -85,13 +85,13 @@ package com.reandroid.lib.arsc.chunk; this.mSpecTypePairArray=new SpecTypePairArray(); this.mLibraryBlock=new LibraryBlock(); - this.mStagedAlias=new StagedAlias(); + this.mStagedAliasList=new BlockList<>(); this.mOverlayableList=new BlockList<>(); this.mOverlayablePolicyList=new BlockList<>(); this.mPackageLastBlocks = new PackageLastBlocks( mSpecTypePairArray, mLibraryBlock, - mStagedAlias, + mStagedAliasList, mOverlayableList, mOverlayablePolicyList); @@ -113,8 +113,8 @@ package com.reandroid.lib.arsc.chunk; addChild(mPackageLastBlocks); } - public StagedAlias getStagedAlias(){ - return mStagedAlias; + public BlockList getStagedAliasList(){ + return mStagedAliasList; } public BlockList getOverlayableList(){ return mOverlayableList; diff --git a/src/main/java/com/reandroid/lib/arsc/container/PackageLastBlocks.java b/src/main/java/com/reandroid/lib/arsc/container/PackageLastBlocks.java index 9fa1611..d644ea0 100755 --- a/src/main/java/com/reandroid/lib/arsc/container/PackageLastBlocks.java +++ b/src/main/java/com/reandroid/lib/arsc/container/PackageLastBlocks.java @@ -26,23 +26,23 @@ public class PackageLastBlocks extends FixedBlockContainer { private final SpecTypePairArray mSpecTypePairArray; private final LibraryBlock mLibraryBlock; - private final StagedAlias mStagedAlias; + private final BlockList mStagedAliasList; private final BlockList mOverlayableList; private final BlockList mOverlayablePolicyList; public PackageLastBlocks(SpecTypePairArray specTypePairArray, LibraryBlock libraryBlock, - StagedAlias stagedAlias, + BlockList stagedAliasList, BlockList overlayableList, BlockList overlayablePolicyList){ super(5); this.mSpecTypePairArray=specTypePairArray; this.mLibraryBlock=libraryBlock; - this.mStagedAlias=stagedAlias; + this.mStagedAliasList=stagedAliasList; this.mOverlayableList=overlayableList; this.mOverlayablePolicyList=overlayablePolicyList; addChild(0, mSpecTypePairArray); addChild(1, mLibraryBlock); - addChild(2, mStagedAlias); + addChild(2, mStagedAliasList); addChild(3, mOverlayableList); addChild(4, mOverlayablePolicyList); } @@ -88,7 +88,7 @@ public class PackageLastBlocks extends FixedBlockContainer { private void readStagedAlias(BlockReader reader) throws IOException{ StagedAlias stagedAlias = new StagedAlias(); stagedAlias.readBytes(reader); - mStagedAlias.addStagedAliasEntries(stagedAlias); + mStagedAliasList.add(stagedAlias); } private void readOverlayable(BlockReader reader) throws IOException{ Overlayable overlayable = new Overlayable();