base: Use the new useMicroGBuildType boolean to not sign gms on Gapps build
It's prevent to sign the GMS packages on the GAPPS build and failed to boot
Fix:
E System : ************ Failure starting system services
E System : java.lang.NullPointerException: Attempt to get length of null array
E System : at android.content.pm.SigningDetails.toSigningKeys(SigningDetails.java:944)
E System : at com.android.server.pm.ComputerEngine.generatePackageInfo(ComputerEngine.java:1554)
E System : at com.android.server.pm.ComputerEngine.getPackageInfoInternalBody(ComputerEngine.java:1672)
E System : at com.android.server.pm.ComputerEngine.getPackageInfoInternal(ComputerEngine.java:1647)
E System : at com.android.server.pm.ComputerEngine.getPackageInfo(ComputerEngine.java:1630)
E System : at com.android.server.pm.PackageManagerService.ensureSystemPackageName(PackageManagerService.java:3751)
E System : at com.android.server.pm.PackageManagerService.<init>(PackageManagerService.java:2310)
E System : at com.android.server.pm.PackageManagerService.main(PackageManagerService.java:1754)
E System : at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:1278)
E System : at com.android.server.SystemServer.run(SystemServer.java:949)
E System : at com.android.server.SystemServer.main(SystemServer.java:672)
E System : at java.lang.reflect.Method.invoke(Native Method)
E System : at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:591)
E System : at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:849)
E Zygote : System zygote died with fatal exception
Change-Id: I5cb85669c84f920a5fd27351dbe0105382fd5443
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/services/core/java/com/android/server/pm/ComputerEngine.java b/services/core/java/com/android/server/pm/ComputerEngine.java
index 83ddb9f..b51c1e5 100644
--- a/services/core/java/com/android/server/pm/ComputerEngine.java
+++ b/services/core/java/com/android/server/pm/ComputerEngine.java
@@ -443,6 +443,7 @@
* The Google signature faked by microG.
*/
private static final String MICROG_FAKE_SIGNATURE = "308204433082032ba003020102020900c2e08746644a308d300d06092a864886f70d01010405003074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964301e170d3038303832313233313333345a170d3336303130373233313333345a3074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f696430820120300d06092a864886f70d01010105000382010d00308201080282010100ab562e00d83ba208ae0a966f124e29da11f2ab56d08f58e2cca91303e9b754d372f640a71b1dcb130967624e4656a7776a92193db2e5bfb724a91e77188b0e6a47a43b33d9609b77183145ccdf7b2e586674c9e1565b1f4c6a5955bff251a63dabf9c55c27222252e875e4f8154a645f897168c0b1bfc612eabf785769bb34aa7984dc7e2ea2764cae8307d8c17154d7ee5f64a51a44a602c249054157dc02cd5f5c0e55fbef8519fbe327f0b1511692c5a06f19d18385f5c4dbc2d6b93f68cc2979c70e18ab93866b3bd5db8999552a0e3b4c99df58fb918bedc182ba35e003c1b4b10dd244a8ee24fffd333872ab5221985edab0fc0d0b145b6aa192858e79020103a381d93081d6301d0603551d0e04160414c77d8cc2211756259a7fd382df6be398e4d786a53081a60603551d2304819e30819b8014c77d8cc2211756259a7fd382df6be398e4d786a5a178a4763074310b3009060355040613025553311330110603550408130a43616c69666f726e6961311630140603550407130d4d6f756e7461696e205669657731143012060355040a130b476f6f676c6520496e632e3110300e060355040b1307416e64726f69643110300e06035504031307416e64726f6964820900c2e08746644a308d300c0603551d13040530030101ff300d06092a864886f70d010104050003820101006dd252ceef85302c360aaace939bcff2cca904bb5d7a1661f8ae46b2994204d0ff4a68c7ed1a531ec4595a623ce60763b167297a7ae35712c407f208f0cb109429124d7b106219c084ca3eb3f9ad5fb871ef92269a8be28bf16d44c8d9a08e6cb2f005bb3fe2cb96447e868e731076ad45b33f6009ea19c161e62641aa99271dfd5228c5c587875ddb7f452758d661f6cc0cccb7352e424cc4365c523532f7325137593c4ae341f4db41edda0d0b1071a7c440f0fe9ea01cb627ca674369d084bd2fd911ff06cdbf2cfa10dc0f893ae35762919048c7efc64c7144178342f70581c9de573af55b390dd7fdb9418631895d5f759f30112687ff621410c069308a";
+
/**
* List of packages which require signature spoofing.
*/
@@ -1523,6 +1524,10 @@
// Allow microG GmsCore and FakeStore to spoof signature
final boolean isMicroG = MICROG_FAKE_SIGNATURE_PACKAGES.contains(p.getPackageName());
+ // OmniLib ressources overlay enabled by the ROM_BUILDTYPE MicroG
+ final boolean mUseMicroGBuildType = mContext.getResources().getBoolean(
+ org.omnirom.omnilib.R.bool.config_useMicroGBuildType);
+
// Compute installed permissions only if requested
final Set<String> installedPermissions = ((flags & PackageManager.GET_PERMISSIONS) == 0
|| ArrayUtils.isEmpty(p.getPermissions())) ? Collections.emptySet()
@@ -1530,14 +1535,14 @@
// Compute granted permissions only if package has requested permissions
// or we matched a microg package
final Set<String> grantedPermissions = (((flags & PackageManager.GET_PERMISSIONS) == 0
- || ArrayUtils.isEmpty(p.getRequestedPermissions())) && !isMicroG) ? Collections.emptySet()
+ || ArrayUtils.isEmpty(p.getRequestedPermissions())) && !isMicroG && !mUseMicroGBuildType ) ? Collections.emptySet()
: mPermissionManager.getGrantedPermissions(ps.getPackageName(), userId);
PackageInfo packageInfo = PackageInfoUtils.generate(p, gids, flags,
state.getFirstInstallTimeMillis(), ps.getLastUpdateTime(), installedPermissions,
grantedPermissions, state, userId, ps);
- if (isMicroG) {
+ if (isMicroG && mUseMicroGBuildType) {
packageInfo = mayFakeSignature(p, packageInfo, grantedPermissions);
}
@@ -1545,7 +1550,7 @@
return null;
}
- if (isMicroG) {
+ if (isMicroG && mUseMicroGBuildType) {
try {
packageInfo.signingInfo = new SigningInfo(
new SigningDetails(