diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-04-23 15:22:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-23 15:22:55 -0700 |
| commit | cdf96f75da540d880ae6070d861aeb6adabbe9a3 (patch) | |
| tree | 6f2a95f739f0235a3c503fd38dadeecfae407af0 /services | |
| parent | f6adae7866e893afa05b5838bdd244648a66ac3f (diff) | |
| parent | 8b0047f82504ebc9b282ed950a85a758b59c4e14 (diff) | |
| download | frameworks_base-cdf96f75da540d880ae6070d861aeb6adabbe9a3.zip frameworks_base-cdf96f75da540d880ae6070d861aeb6adabbe9a3.tar.gz frameworks_base-cdf96f75da540d880ae6070d861aeb6adabbe9a3.tar.bz2 | |
am 8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo
Merge commit '8b0047f82504ebc9b282ed950a85a758b59c4e14' into froyo-plus-aosp
* commit '8b0047f82504ebc9b282ed950a85a758b59c4e14':
Fix typo when parsing external platform version from Settings.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 076b0e2..e9e83d9 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -8802,7 +8802,7 @@ class PackageManagerService extends IPackageManager.Stub { } String external = parser.getAttributeValue(null, "external"); if (external != null) { - mInternalSdkPlatform = Integer.parseInt(external); + mExternalSdkPlatform = Integer.parseInt(external); } } catch (NumberFormatException e) { } @@ -9952,4 +9952,3 @@ class PackageManagerService extends IPackageManager.Stub { android.provider.Settings.Secure.DEFAULT_INSTALL_LOCATION, PackageHelper.APP_INSTALL_AUTO); } } - |