Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8850e61 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

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
parent 7a242216

services/core/java/com/android/server/om/IdmapManager.java

+0 −16
Original line number Diff line number Diff line
@@ -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;

        }

    }

}