From 2e594cfe9848b56ad71a6f7bc4de13df7a36511c Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Tue, 28 Oct 2014 18:51:07 -0700 Subject: [PATCH] Change boot screen title to "Android is starting" when not upgrading. Bug: 17565501 Bug: 18247218 (cherry picked from commit 9f60c08a446e38f9e2d5271546ef69ca5941eba9) Change-Id: I1ec32b318b6221277fc3ffbc19966bf3330c2d93 --- core/java/android/app/ApplicationPackageManager.java | 12 ++++++++++++ core/java/android/content/pm/IPackageManager.aidl | 1 + core/java/android/content/pm/PackageManager.java | 7 +++++++ core/res/res/values/strings.xml | 3 +++ core/res/res/values/symbols.xml | 1 + .../internal/policy/impl/PhoneWindowManager.java | 6 +++++- .../com/android/server/pm/PackageManagerService.java | 9 ++++++++- .../src/android/test/mock/MockPackageManager.java | 8 ++++++++ 8 files changed, 45 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 1e1a6130bb186..1b499ccfa33bb 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1609,6 +1609,18 @@ final class ApplicationPackageManager extends PackageManager { return null; } + /** + * @hide + */ + @Override + public boolean isUpgrade() { + try { + return mPM.isUpgrade(); + } catch (RemoteException e) { + return false; + } + } + @Override public PackageInstaller getPackageInstaller() { synchronized (mLock) { diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index c37534aa0334c..0dc86ad0cabfc 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -436,6 +436,7 @@ interface IPackageManager { boolean isFirstBoot(); boolean isOnlyCoreApps(); + boolean isUpgrade(); void setPermissionEnforced(String permission, boolean enforced); boolean isPermissionEnforced(String permission); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index e5191630fa60b..edd0d2a016663 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3866,6 +3866,13 @@ public abstract class PackageManager { */ public abstract VerifierDeviceIdentity getVerifierDeviceIdentity(); + /** + * Returns true if the device is upgrading, such as first boot after OTA. + * + * @hide + */ + public abstract boolean isUpgrade(); + /** * Return interface that offers the ability to install, upgrade, and remove * applications on the device. diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 987b291f54858..81615e6df5fcc 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3513,6 +3513,9 @@ Android is upgrading\u2026 + + Android is starting\u2026 + Optimizing app %1$d of diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 18c3be5dc9916..fd3465a993ab7 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1493,6 +1493,7 @@ + diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 21d42978131a1..2ea18026775ac 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -5567,7 +5567,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { return true; } }; - mBootMsgDialog.setTitle(R.string.android_upgrading_title); + if (mContext.getPackageManager().isUpgrade()) { + mBootMsgDialog.setTitle(R.string.android_upgrading_title); + } else { + mBootMsgDialog.setTitle(R.string.android_start_title); + } mBootMsgDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); mBootMsgDialog.setIndeterminate(true); mBootMsgDialog.getWindow().setType( diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index b79e15756a112..7aba607867563 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -332,6 +332,7 @@ public class PackageManagerService extends IPackageManager.Stub { final DisplayMetrics mMetrics; final int mDefParseFlags; final String[] mSeparateProcesses; + final boolean mIsUpgrade; // This is where all application persistent data goes. final File mAppDataDir; @@ -1750,7 +1751,8 @@ public class PackageManagerService extends IPackageManager.Stub { // If this is first boot after an OTA, and a normal boot, then // we need to clear code cache directories. - if (!Build.FINGERPRINT.equals(mSettings.mFingerprint) && !onlyCore) { + mIsUpgrade = !Build.FINGERPRINT.equals(mSettings.mFingerprint); + if (mIsUpgrade && !onlyCore) { Slog.i(TAG, "Build fingerprint changed; clearing code caches"); for (String pkgName : mSettings.mPackages.keySet()) { deleteCodeCacheDirsLI(pkgName); @@ -1790,6 +1792,11 @@ public class PackageManagerService extends IPackageManager.Stub { return mOnlyCore; } + @Override + public boolean isUpgrade() { + return mIsUpgrade; + } + private String getRequiredVerifierLPr() { final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION); final List receivers = queryIntentReceivers(verification, PACKAGE_MIME_TYPE, diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java index afe1d5dba9e9f..665b3ce27cccd 100644 --- a/test-runner/src/android/test/mock/MockPackageManager.java +++ b/test-runner/src/android/test/mock/MockPackageManager.java @@ -729,6 +729,14 @@ public class MockPackageManager extends PackageManager { throw new UnsupportedOperationException(); } + /** + * @hide + */ + @Override + public boolean isUpgrade() { + throw new UnsupportedOperationException(); + } + /** * @hide */