diff options
author | Narayan Kamath <narayan@google.com> | 2014-04-10 09:45:18 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-10 09:45:18 +0000 |
commit | f148f36d140e995ec8f755e60bbb0b37f33c3da7 (patch) | |
tree | f23cb4b5def551a8072cf15939c3ef1b1c39cf5f /services/core/java/com/android/server/pm/PackageSettingBase.java | |
parent | d11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4 (diff) | |
parent | 9e289d70a8baaed0030413b5991653792e2a816d (diff) | |
download | frameworks_base-f148f36d140e995ec8f755e60bbb0b37f33c3da7.zip frameworks_base-f148f36d140e995ec8f755e60bbb0b37f33c3da7.tar.gz frameworks_base-f148f36d140e995ec8f755e60bbb0b37f33c3da7.tar.bz2 |
am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs"
* commit '9e289d70a8baaed0030413b5991653792e2a816d':
System services detect and register app CPU ABIs
Diffstat (limited to 'services/core/java/com/android/server/pm/PackageSettingBase.java')
-rw-r--r-- | services/core/java/com/android/server/pm/PackageSettingBase.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageSettingBase.java b/services/core/java/com/android/server/pm/PackageSettingBase.java index 2a5698b..c8af9d1 100644 --- a/services/core/java/com/android/server/pm/PackageSettingBase.java +++ b/services/core/java/com/android/server/pm/PackageSettingBase.java @@ -50,6 +50,7 @@ class PackageSettingBase extends GrantedPermissions { File resourcePath; String resourcePathString; String nativeLibraryPathString; + String requiredCpuAbiString; long timeStamp; long firstInstallTime; long lastUpdateTime; @@ -77,11 +78,11 @@ class PackageSettingBase extends GrantedPermissions { /* package name of the app that installed this package */ String installerPackageName; PackageSettingBase(String name, String realName, File codePath, File resourcePath, - String nativeLibraryPathString, int pVersionCode, int pkgFlags) { + String nativeLibraryPathString, String requiredCpuAbiString, int pVersionCode, int pkgFlags) { super(pkgFlags); this.name = name; this.realName = realName; - init(codePath, resourcePath, nativeLibraryPathString, pVersionCode); + init(codePath, resourcePath, nativeLibraryPathString, requiredCpuAbiString, pVersionCode); } /** @@ -98,6 +99,7 @@ class PackageSettingBase extends GrantedPermissions { resourcePath = base.resourcePath; resourcePathString = base.resourcePathString; nativeLibraryPathString = base.nativeLibraryPathString; + requiredCpuAbiString = base.requiredCpuAbiString; timeStamp = base.timeStamp; firstInstallTime = base.firstInstallTime; lastUpdateTime = base.lastUpdateTime; @@ -125,12 +127,13 @@ class PackageSettingBase extends GrantedPermissions { } void init(File codePath, File resourcePath, String nativeLibraryPathString, - int pVersionCode) { + String requiredCpuAbiString, int pVersionCode) { this.codePath = codePath; this.codePathString = codePath.toString(); this.resourcePath = resourcePath; this.resourcePathString = resourcePath.toString(); this.nativeLibraryPathString = nativeLibraryPathString; + this.requiredCpuAbiString = requiredCpuAbiString; this.versionCode = pVersionCode; } @@ -161,6 +164,7 @@ class PackageSettingBase extends GrantedPermissions { grantedPermissions = base.grantedPermissions; gids = base.gids; + requiredCpuAbiString = base.requiredCpuAbiString; timeStamp = base.timeStamp; firstInstallTime = base.firstInstallTime; lastUpdateTime = base.lastUpdateTime; |