self package targeting for side by side install revanced coregms#308
self package targeting for side by side install revanced coregms#308zappybiby wants to merge 11 commits intoReVanced:mainfrom
Conversation
This can be optimized with a compile time constant, sparing resolving the package name dynamically. Check if this reduces the amount of code changes needed. (BuildConfig.APPLICATION_ID like you already used works well) |
play-services-auth-api-phone/core/src/main/kotlin/org/microg/gms/auth/phone/SmsRetrieverCore.kt
Show resolved
Hide resolved
play-services-base/core/src/main/java/org/microg/gms/common/PackageUtils.java
Outdated
Show resolved
Hide resolved
play-services-core/src/main/java/com/google/android/gms/chimera/DynamiteContextFactory.java
Outdated
Show resolved
Hide resolved
play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
Outdated
Show resolved
Hide resolved
...rvices-core/src/main/kotlin/org/microg/gms/auth/credentials/identity/AuthorizationService.kt
Outdated
Show resolved
Hide resolved
play-services-maps/src/main/java/org/microg/gms/maps/MapsRemoteContextHolder.java
Outdated
Show resolved
Hide resolved
Stop using canonical package identity at self-targeting call sites that actually mean the installed GmsCore APK, while keeping the Maps change narrowly scoped to the Mapbox backend path. For Maps, keep the loader and other backends unchanged and only stop the Mapbox backend from reconstructing a canonical com.google.android.gms context. Resolve the package context from the serving runtime application id instead, and keep MultiArchLoader version/APK lookup aligned with that Mapbox context. Also drop the transient self-package helpers and use direct package resolution at each call site: BuildConfig.APPLICATION_ID in play-services-core, and inline self-package context resolution in library modules that do not have the app BuildConfig.
The package-rename diagnostics showed that the Vision/MLKit face detector creators were still using the canonical package context even though the actual detector helper and model asset are owned by the serving self APK. Apply that ownership decision to all four remaining Vision/MLKit face detector creators by resolving the installed self package directly from the incoming context instead of going through a shared helper.
Runtime checks showed these LoginActivity package targets are self-owned flows. The signup handoff already resolved to LoginActivity's internal MainActivity component; the remaining issue was that the package field still pointed at canonical com.google.android.gms instead of the serving GmsCore app. The post-login ACTION_GCM_REGISTER_ACCOUNT broadcast also needs to target the receiver in the serving GmsCore app, not a separate canonical GMS package. Because LoginActivity is in the app module, BuildConfig.APPLICATION_ID is the simplest self-package constant for both call sites.
5934c9d to
3fb21f2
Compare
|
Was this supposed to be closed? |
play-services-core/src/main/java/org/microg/gms/games/GamesStubService.java
Outdated
Show resolved
Hide resolved
play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt
Outdated
Show resolved
Hide resolved
play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt
Outdated
Show resolved
Hide resolved
...ervices-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt
Outdated
Show resolved
Hide resolved
|
Should the issues related to this PR be added to it so that they get automatically closed and so that people can more easily find it? |
|
In the opening message of this PR you can add "Closes #number" as many times as you want |
|
Does this PR also solve notifications, apparently people don't receive them currently |
I know but I did not create the PR so I can't edit the opening message. |
|
I don't want to pivot too far off the main focus of the PR, but I did see the patched YTM app did send me this notification, which I believe is remote? You can see in my screenshot that both the stock app and the patched app sent it (YT Music Revanced is the 9:34 notification) I'm not sure what exactly notification-wise wasn't working for users, I don't normally have notifications on. Remote notification diagnostic excerptIs there an existing issue for notifications to discuss that part more? And @oSumAtrIX do you have thoughts on the microg package constant I mentioned in my comments? The PR functionally is essentially complete for the scope I wanted to cover, I verified the call sites resolve to correct package. |
...re/src/main/kotlin/com/google/android/gms/vision/client/DynamiteNativeFaceDetectorCreator.kt
Outdated
Show resolved
Hide resolved
...-vision/core/src/main/kotlin/com/google/android/gms/vision/face/mlkit/FaceDetectorCreator.kt
Outdated
Show resolved
Hide resolved
Just to understand, you believe this is complete, but you can't verify it is? It's fine though, i think this second review you did should give enough confidence for completeness. |
What I did was the static analysis with androguard as I described. I also attached runtime probes to GmsCore and a diagnostic patch for Revanced YT/YTMusic to ensure call sites are being correctly resolved. I feel quite confident that all potential call sites have been addressed. Im not worried about the small things I saw that only have a stock gms functionality as I don't think they have any significant impact. I already verified that one notification finding is essentially an older API that isnt used in either YT or YTMusic. I am not familiar with tools like Frida so that kind of dynamic analysis is not something I could do. |
0195ac8 to
f294571
Compare
f294571 to
62ab6b5
Compare
In my testing, we don't need setpackage here at all, its redudant and removing it allows us to avoid the need for flavoring (compile time) or switching it to runtime compilation. In my diagnostic probe tool, I tested three scenarios: ``` component-only = keep the explicit component, but do not call setPackage(...) component + self package = keep the same explicit component, and set the package to the renamed/local package (BuildConfig.APPLICATION_ID) component + canonical com.google.android.gms package = keep the same explicit component, but set the package field to the canonical Google package instead ``` all three intent variants still resolved to the same UserConsentPromptActivity. This is because the component itself is doing the routing work. ``` 03-12 13:13:54.342 I PkgRenameDiag: Consent prompt component-only -> action=null | package=null | component=app.revanced.android.gms/org.microg.gms.auth.phone.UserConsentPromptActivity | activities=1 match(es): app.revanced.android.gms/org.microg.gms.auth.phone.UserConsentPromptActivity 03-12 13:13:54.342 I PkgRenameDiag: Consent prompt component+self package -> action=null | package=app.revanced.android.gms | component=app.revanced.android.gms/org.microg.gms.auth.phone.UserConsentPromptActivity | activities=1 match(es): app.revanced.android.gms/org.microg.gms.auth.phone.UserConsentPromptActivity 03-12 13:13:54.342 I PkgRenameDiag: Consent prompt component+canonical package -> action=null | package=com.google.android.gms | component=app.revanced.android.gms/org.microg.gms.auth.phone.UserConsentPromptActivity | activities=1 match(es): app.revanced.android.gms/org.microg.gms.auth.phone.UserConsentPromptActivity ``` I also looked at how PackageManager resolves intents: ``` 1. SmsRetrieverCore creates an explicit intent for UserConsentPromptActivity. 2. It attaches the google.messenger extra. 3. It places that intent into SmsRetriever.EXTRA_CONSENT_INTENT. 4. That extra is returned to the client app as part of the SMS User Consent API result. 5. Later, the client app launches that consent intent. ``` So for an explicit local activity intent, the component itself is already doing the main routing work.
|
With a specific commit or unrelated to this PR? |
|
I received that while having my PR Coregms installed to commit 12227d7 With Revanced Patches 6.1.0, Revanced YouTube 20.14.43 |
|
thats really good, hopefully its what fixes the notifications again, great work thanks! |
|
Pre-release for testing: |
I just wanted to say that I've tested the pre-release build today and confirm that YT Music works as intended on Android Auto. I have not tested notifications yet, I will write again if I get any. Anyway, good job @zappybiby , thank you! EDIT: Notifications doesn't work for me, but I am not sure why. That's what I see in microG settings:
EDIT 2: After some ADB debugging Gemini (AI) says that there may be issues with patches for Youtube app in regards to |
play-services-auth-api-phone/core/src/main/kotlin/org/microg/gms/auth/phone/SmsRetrieverCore.kt
Show resolved
Hide resolved
play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java
Outdated
Show resolved
Hide resolved
play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt
Outdated
Show resolved
Hide resolved
| versionName version | ||
| minSdkVersion androidMinSdk | ||
| targetSdkVersion androidTargetSdk | ||
| buildConfigField "String", "APPLICATION_ID", "\"com.google.android.gms\"" |
There was a problem hiding this comment.
Does upstream do this hack in other Gradle modules in the project as well, if not, how does it determine the current package name? If it doesnt do either, context.getPackageName() feels to be simpler. Check if upstream uses context.getPackageName() in such library modules where the package name cant be retrieved from the build script.
This comment was marked as duplicate.
This comment was marked as duplicate.
Sorry, something went wrong.
There was a problem hiding this comment.
context.getPackageName() is not equivalent here. In this maps flow, the Context passed into the Mapbox comes from the embedding app, not from GmsCore. That means context.getPackageName() would return the client app package, not the installed GmsCore package that createPackageContext(...) is trying to open.
Ah thats a problem, is there a context somewhere we can use that belongs to GmsCore?
There was a problem hiding this comment.
Not an existing one that upstream passes into Mapbox. In upstream, the Mapbox entry points receive the embedding app Context/Activity, and then the module constructs its own GmsCore-side MapContext locally via createPackageContext(...). So there is already a GmsCore-owned context, but it is derived from the caller context and still needs the installed GmsCore package name to create it.
Upstream:
- uses MapsContextLoader’s chosen context for classloading/init.
- But does not reuse that same chosen context as Mapbox’s runtime base context.
- Mapbox reconstructs a new base context from the caller context plus a package string.
I suspect this was done because the backend needs a hybrid context, not just the raw module context. It needs access to GmsCore resources and code, while still preserving caller-app behavior for things like getPackageName().
When MapsContextLoader was added, changing all backends to use the selected module Context directly would have been a much larger behavioral refactor. Upstream seems to have chosen the lower-risk approach of addng the new loader for Maps initialization, while keeping the wrapper behavior unchanged.
I don't see much in the way of a simple, parity-conserving solution:
- context.getPackageName() returns the host app package, not GmsCore.
- The library module’s own package name is also wrong, because it is just the code namespace, not the installed app package.
- Using the app module’s BuildConfig.APPLICATION_ID would be cleaner, but it would create the wrong dependency direction because the app module already depends on Maps.
I would say it would make sense for upstream to consider a flow that does:
1. MapsContextLoader picks the maps/module context.
2. Mapbox reuses that exact chosen context as its base, while still keeping caller-app behavior layered on top.
There was a problem hiding this comment.
In this case if there is no context to get the pkg name from, instead of the build system providing the constant, a new constant can be added in the Constants class next to Constants.GMS_PACKAGE_NAME for example called Constants.GMS_CORE_PACKAGE_NAME maybe?
I am not sure about the name GMS_CORE_PACKAGE_NAME because official gms is also technically GMS_CORE, so im open for suggestions. The issue with this is that once again we fragment the actual package name, for example changing the flavor would not be reflected in that constant correctly.
Now here is the question, as we know, GmsCore supports flavors. Assume we use the user flavor in upstream GmsCore. Mapbox would use Constants.GMS_PACKAGE_NAME. This doesn't look right. Shouldn't it point to the user flavor? Is this a bug in upstream or maybe its even intended to point to the real GMS package name?
If this is unclear, we might have to report this to upstream to sort this question out. If they say its intended, we can keep the constant as is, if they say its a bug, we can upstream a fix (e.g., your build flavor code).
There was a problem hiding this comment.
like you mentioned the upstream Mapbox path still uses Constants.GMS_PACKAGE_NAME for createPackageContext(...), so that path is not flavor-aware.
Because of that, I do not think a new hardcoded constant in Constants really fixes the issue. If it is not flavor-aware, if we make it flavor aware it just pushes the flavoring elsewhere.
I'm thinking we could ask upstream if they could consider not reconstructing the GmsCore context from a package string and instead letting MapsContextLoader provide the already-selected maps/module context to the backend.
then mapbox is build its wrapper from the caller app context and the selected maps/module context
There was a problem hiding this comment.
Okay so as i understand, this is actually an upstream issue. This part of the code is not flavor-aware. I will ask upstream about this. Lets see what they have to say to this.
There was a problem hiding this comment.
Actually, wouldn't this apply to all the places where the constant is hardcoded?
There was a problem hiding this comment.
microg#3367 opened an issue. Also I saw https://github.com/microg/GmsCore/blob/master/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java#L153. Is this not supposed to be changed too?
|
Rest lgtm! |
d9c36e5 to
7dafecf
Compare
This comment was marked as duplicate.
This comment was marked as duplicate.
Sorry, something went wrong.
play-services-auth-api-phone/core/src/main/kotlin/org/microg/gms/auth/phone/SmsRetrieverCore.kt
Show resolved
Hide resolved
play-services-auth-api-phone/core/src/main/kotlin/org/microg/gms/auth/phone/SmsRetrieverCore.kt
Show resolved
Hide resolved
play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java
Outdated
Show resolved
Hide resolved
play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt
Outdated
Show resolved
Hide resolved
| versionName version | ||
| minSdkVersion androidMinSdk | ||
| targetSdkVersion androidTargetSdk | ||
| buildConfigField "String", "APPLICATION_ID", "\"com.google.android.gms\"" |
This comment was marked as duplicate.
This comment was marked as duplicate.
Sorry, something went wrong.




Several call sites were still using GMS_PACKAGE_NAME even when they were really trying to target the currently installed GmsCore APK. This change switches those sites to runtime self-package resolution, while keeping the remaining explicit package cases unchanged.
Goals of the patch:
If a call site means "this installed GmsCore APK", use the runtime self package.
If a call site means the canonical Google package identity for protocol, network, spoofing, or compatibility, keep Constants.GMS_PACKAGE_NAME.
Do not use USER_MICROG_PACKAGE_NAME as a generic stand-in for "self".
Do not derive remote Maps / Dynamite resource contexts from a caller or embedding-app Context.
As part of the changes, the identified issue affecting patched YT Music app and Android Auto (DynamiteContextFactory) is fixed. DynamiteContextFactory no longer resolves the GmsCore package context through GMS_PACKAGE_NAME, and now uses BuildConfig.APPLICATION_ID instead. That keeps the YT Music on Android Auto Dynamite path working for renamed/repackaged installs.
Closes https://github.com/ReVanced/revanced-patches/issues/6602