Skip to content

DG: Switch to using HashMapOf #3239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mar-v-in merged 4 commits into from
Mar 30, 2026
+4 −16
Merged

DG: Switch to using HashMapOf #3239

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4382fae
DG: Switch to using HashMapOf
DaVinci9196 Jan 19, 2026
03e3c03
Merge branch 'master' into fix_pi_and_dg_error
mar-v-in Mar 30, 2026
bf57263
Drop non-static cache, now that static cache is no longer weak
mar-v-in Mar 30, 2026
4cf1977
Use map itself as lock
mar-v-in Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions play-services-droidguard/src/main/kotlin/org/microg/gms/droidguard/HandleProxyFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ import java.security.cert.Certificate
import java.util.*

open class HandleProxyFactory(private val context: Context) {
@GuardedBy("CLASS_LOCK")
protected val classMap = hashMapOf<String, Class<*>>()

fun createHandle(vmKey: String, pfd: ParcelFileDescriptor, extras: Bundle): HandleProxy {
fetchFromFileDescriptor(pfd, vmKey)
return createHandleProxy(vmKey, extras)
Expand Down Expand Up @@ -79,18 +76,12 @@ open class HandleProxyFactory(private val context: Context) {
}

protected fun loadClass(vmKey: String, bytes: ByteArray = ByteArray(0)): Class<*> {
synchronized(CLASS_LOCK) {
val cachedClass = classMap[vmKey]
synchronized(CLASS_MAP) {
val cachedClass = CLASS_MAP[vmKey]
if (cachedClass != null) {
updateCacheTimestamp(vmKey)
return cachedClass
}
val weakClass = weakClassMap[vmKey]
if (weakClass != null) {
classMap[vmKey] = weakClass
updateCacheTimestamp(vmKey)
return weakClass
}
if (!isValidCache(vmKey)) {
throw BytesException(bytes, "VM key $vmKey not found in cache")
}
Expand All @@ -100,18 +91,15 @@ open class HandleProxyFactory(private val context: Context) {
}
val loader = DexClassLoader(getTheApkFile(vmKey).absolutePath, getOptDir(vmKey).absolutePath, null, context.classLoader)
val clazz = loader.loadClass(CLASS_NAME)
classMap[vmKey] = clazz
weakClassMap[vmKey] = clazz
CLASS_MAP[vmKey] = clazz
return clazz
}
}

companion object {
const val CLASS_NAME = "com.google.ccc.abuse.droidguard.DroidGuard"
const val CACHE_FOLDER_NAME = "cache_dg"
val CLASS_LOCK = Object()
@GuardedBy("CLASS_LOCK")
val weakClassMap = WeakHashMap<String, Class<*>>()
private val CLASS_MAP = hashMapOf<String, Class<*>>()
val PROD_CERT_HASH = byteArrayOf(61, 122, 18, 35, 1, -102, -93, -99, -98, -96, -29, 67, 106, -73, -64, -119, 107, -5, 79, -74, 121, -12, -34, 95, -25, -62, 63, 50, 108, -113, -103, 74)
}
}