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

Remove unused methods from OMS

Browse Source 
Remove the unused methods

  - IdmapManager.isDangerous(PackageInfo, int)
  - IdmapManager.isDangerous(String)

The concept of a dangerous overlay is currently not used, so remove any
trace of it.

Test: builds
Change-Id: I79ea00c05c0ee113733c20e982ae8f517bbbbd11
This commit is contained in:
Mårten Kongstad
2017-01-26 09:54:21 +01:00
parent 7a242216a9
commit e8850e61c3
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();
}
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) {
final StringBuilder sb = new StringBuilder("/data/resource-cache/");
sb.append(baseCodePath.substring(1).replace('/', '@'));
sb.append("@idmap");
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;
}
}
}