Skip to content

Commit 7bda091

Browse files
committed
make sure frameworkDirectory is never null
1 parent af8db06 commit 7bda091

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,7 @@ public String getAttributeValue(int index) {
439439

440440
try {
441441
String stringBlockValue = valueRaw != -1
442-
? ResXmlEncoders.escapeXmlChars(mStringBlock.getString(valueRaw))
443-
: null;
442+
? ResXmlEncoders.escapeXmlChars(mStringBlock.getString(valueRaw)) : null;
444443
String resourceMapValue = null;
445444

446445
// Ensure we only track down obfuscated values for reference/attribute type values. Otherwise, we might

brut.apktool/apktool-lib/src/main/java/brut/androlib/src/SmaliBuilder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ public SmaliBuilder(File smaliDir, int apiLevel) {
4141

4242
public void build(File dexFile) throws AndrolibException {
4343
try {
44-
DexBuilder dexBuilder = mApiLevel > 0
45-
? new DexBuilder(Opcodes.forApi(mApiLevel))
46-
: new DexBuilder(Opcodes.getDefault());
44+
DexBuilder dexBuilder = new DexBuilder(
45+
mApiLevel > 0 ? Opcodes.forApi(mApiLevel) : Opcodes.getDefault());
4746

4847
for (String fileName : mSmaliDir.getDirectory().getFiles(true)) {
4948
buildFile(fileName, dexBuilder);

0 commit comments

Comments
 (0)