am cdf96f75: am 8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo

Merge commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3' into kraken

* commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3':
  Fix typo when parsing external platform version from Settings.
This commit is contained in:
Dianne Hackborn
2010-04-23 15:25:09 -07:00
committed by Android Git Automerger

View File

@@ -8838,7 +8838,7 @@ class PackageManagerService extends IPackageManager.Stub {
} }
String external = parser.getAttributeValue(null, "external"); String external = parser.getAttributeValue(null, "external");
if (external != null) { if (external != null) {
mInternalSdkPlatform = Integer.parseInt(external); mExternalSdkPlatform = Integer.parseInt(external);
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
} }
@@ -9988,4 +9988,3 @@ class PackageManagerService extends IPackageManager.Stub {
android.provider.Settings.Secure.DEFAULT_INSTALL_LOCATION, PackageHelper.APP_INSTALL_AUTO); android.provider.Settings.Secure.DEFAULT_INSTALL_LOCATION, PackageHelper.APP_INSTALL_AUTO);
} }
} }