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

Commit cb2dce03 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge \"Remove \"starting apps\" boot message.\" into nyc-mr1-dev 

am: bb2d9ab9

Change-Id: Ie4b072d38eaa281b6292ac70eb366734013c907d
parents 16805079 bb2d9ab9

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -6661,8 +6661,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
    @Override

    public void showBootMessage(final CharSequence msg, final boolean always) {

        if (Binder.getCallingUid() != Process.myUid()) {

            // These days only the core system can call this, so apps can't get in

            // the way of what we show about running them.

            throw new SecurityException();

        }

        mWindowManager.showBootMessage(msg, always);

    }

services/java/com/android/server/SystemServer.java

+0 −8
Original line number Diff line number Diff line
@@ -727,14 +727,6 @@ public final class SystemServer { 
        }

        Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);



        try {

            ActivityManagerNative.getDefault().showBootMessage(

                    context.getResources().getText(

                            com.android.internal.R.string.android_upgrading_starting_apps),

                    false);

        } catch (RemoteException e) {

        }



        if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) {

            if (!disableNonCoreServices) {

                traceBeginAndSlog("StartLockSettingsService");