diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 3 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index e5579e29c208..9fcbf53e0080 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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); } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index fa3479cca5e7..2236caebdc7c 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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"); |