Merge "Merge "Remove unused methods from OMS" am: fd5cdfc924 am: 55a2494df3... (552bb1b0) · Commits · e / os / android_frameworks_base

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;
		}
		}
		}