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

Commit 340ca8b7 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Handle apps that share a UID with the system_server correctly. 

The system process does not explicitly declare any ABI, or
package any native code that it depends on but its ABI is
dictated by the zygote configuration. We need to account for
it correctly to have apps that share a UID with it work
correctly.

bug: 16317188

Change-Id: I84713c64409d7fdcc314114231e87a9263d5c5e7
parent 045e6489

services/core/java/com/android/server/pm/PackageManagerService.java

+10 −0
Original line number Diff line number Diff line
@@ -5226,6 +5226,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            // The system package is special.

            dataPath = new File (Environment.getDataDirectory(), "system");

            pkg.applicationInfo.dataDir = dataPath.getPath();















        } else {















            // This is a normal package, need to make its data directory.















            dataPath = getDataPathForPackage(pkg.packageName, 0);










@@ -5516,6 +5517,15 @@ public class PackageManagerService extends IPackageManager.Stub {













            }















        }



























        // This is a special case for the "system" package, where the ABI is













        // dictated by the zygote configuration (and init.rc). We should keep track













        // of this ABI so that we can deal with "normal" applications that run under













        // the same UID correctly.













        if (mPlatformPackage == pkg) {













            pkg.applicationInfo.primaryCpuAbi = VMRuntime.getRuntime().is64Bit() ?













                    Build.SUPPORTED_64_BIT_ABIS[0] : Build.SUPPORTED_32_BIT_ABIS[0];













        }



























        pkgSetting.primaryCpuAbiString = pkg.applicationInfo.primaryCpuAbi;















        pkgSetting.secondaryCpuAbiString = pkg.applicationInfo.secondaryCpuAbi;