Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused methods from OMS"

Browse Source
This commit is contained in:
Treehugger Robot
2017-08-31 21:31:31 +00:00
committed by Gerrit Code Review
parent 111c955d1d e8850e61c3
commit fd5cdfc924
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/om/IdmapManager.java
View File

@@ -92,26 +92,10 @@ class IdmapManager {
return new File(getIdmapPath(overlayPackage.applicationInfo.getBaseCodePath())).isFile(); return new File(getIdmapPath(overlayPackage.applicationInfo.getBaseCodePath())).isFile();
} }
boolean isDangerous(@NonNull final PackageInfo overlayPackage, final int userId) {
// unused userId: see comment in OverlayManagerServiceImpl.removeIdmapIfPossible
return isDangerous(getIdmapPath(overlayPackage.applicationInfo.getBaseCodePath()));
}
private String getIdmapPath(@NonNull final String baseCodePath) { private String getIdmapPath(@NonNull final String baseCodePath) {
final StringBuilder sb = new StringBuilder("/data/resource-cache/"); final StringBuilder sb = new StringBuilder("/data/resource-cache/");
sb.append(baseCodePath.substring(1).replace('/', '@')); sb.append(baseCodePath.substring(1).replace('/', '@'));
sb.append("@idmap"); sb.append("@idmap");
return sb.toString(); return sb.toString();
} }
private boolean isDangerous(@NonNull final String idmapPath) {
try (DataInputStream dis = new DataInputStream(new FileInputStream(idmapPath))) {
final int magic = dis.readInt();
final int version = dis.readInt();
final int dangerous = dis.readInt();
return dangerous != 0;
} catch (IOException e) {
return true;
}
}
} }