Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73577862 authored by Jeff Hao's avatar Jeff Hao Committed by Android Git Automerger
Browse files

am b1346d78: Merge "Change boot screen title to "Android is starting" when not... 

am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev

* commit 'b1346d78':
  Change boot screen title to "Android is starting" when not upgrading.
parents 7577f3dd b1346d78

core/java/android/app/ApplicationPackageManager.java

+12 −0
Original line number Diff line number Diff line
@@ -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) {

core/java/android/content/pm/IPackageManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -436,6 +436,7 @@ interface IPackageManager { 


    boolean isFirstBoot();

    boolean isOnlyCoreApps();

    boolean isUpgrade();



    void setPermissionEnforced(String permission, boolean enforced);

    boolean isPermissionEnforced(String permission);

core/java/android/content/pm/PackageManager.java

+7 −0
Original line number Diff line number Diff line
@@ -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.

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -3509,6 +3509,9 @@ 
    <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->

    <string name="android_upgrading_title">Android is upgrading\u2026</string>



    <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->

    <string name="android_start_title">Android is starting\u2026</string>



    <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->

    <string name="android_upgrading_apk">Optimizing app

        <xliff:g id="number" example="123">%1$d</xliff:g> of

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,7 @@ 
  <java-symbol type="layout" name="screen_title" />

  <java-symbol type="layout" name="screen_title_icons" />

  <java-symbol type="string" name="system_ui_date_pattern" />

  <java-symbol type="string" name="android_start_title" />

  <java-symbol type="string" name="android_upgrading_title" />

  <java-symbol type="string" name="bugreport_title" />

  <java-symbol type="string" name="bugreport_message" />