summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mårten Kongstad <marten.kongstad@sony.com> 2017-01-26 09:54:21 +0100
committer Mårten Kongstad <marten.kongstad@sony.com> 2017-08-31 14:50:10 +0200
commite8850e61c3e60224075746ca03a48c9a3077f24c (patch)
treecd11446c9d8e4290870fde82e8caeba8a811757a
parent7a242216a9de2d33007375d0f88cda15b4b3173e (diff)
Remove unused methods from OMS
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
-rw-r--r--services/core/java/com/android/server/om/IdmapManager.java16
1 files changed, 0 insertions, 16 deletions
diff --git a/services/core/java/com/android/server/om/IdmapManager.java b/services/core/java/com/android/server/om/IdmapManager.java
index 04d91f882d04..807c343d0d10 100644
--- a/services/core/java/com/android/server/om/IdmapManager.java
+++ b/services/core/java/com/android/server/om/IdmapManager.java
@@ -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;
- }
- }
}