Snap for 4496165 from 68422047b3b55087d1aa67a4921c1513c2e78581 to pi-release
Change-Id: Id05a66d3b2d4bf47396a7ea181c51f50ca3d89db
diff --git a/src/com/android/mail/utils/HelpUrl.java b/src/com/android/mail/utils/HelpUrl.java
index 46d5395..607bc98 100644
--- a/src/com/android/mail/utils/HelpUrl.java
+++ b/src/com/android/mail/utils/HelpUrl.java
@@ -70,7 +70,7 @@
final String packageName = context.getApplicationInfo().packageName;
try {
final PackageInfo pi = context.getPackageManager().getPackageInfo(packageName, 0);
- return String.valueOf(pi.versionCode);
+ return String.valueOf(pi.getLongVersionCode());
} catch (PackageManager.NameNotFoundException e) {
LogUtils.e(LOG_TAG, "Error finding package name for application" + packageName);
throw new IllegalStateException("unable to determine package name for application");
diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index 4efbccc..c4689a7 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -200,7 +200,7 @@
try {
sVersionCode = String.valueOf(context.getPackageManager()
.getPackageInfo(context.getPackageName(), 0 /* flags */)
- .versionCode);
+ .getLongVersionCode());
} catch (NameNotFoundException e) {
LogUtils.e(Utils.LOG_TAG, "Error finding package %s",
context.getApplicationInfo().packageName);