b/frameworks/base/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -339,6 +339,7 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
+
/**
* An entry in the history stack, representing an activity.
*/
@@ -5353,13 +5354,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
boolean wallpaperEnabled = mAtmService.mContext.getResources().getBoolean(
com.android.internal.R.bool.config_enableWallpaperService);
if(wallpaperEnabled){
- Log.d(TAG,"----Launcher drawn done,not keyguradk,has wallpaper,ummmmmm----");
+ Log.d(TAG,"Launcher drawn done,not keyguradk,has wallpaper,ummmmmm----");
try {
Thread.sleep(1000);
} catch (Exception e) {
}
}
- Log.d(TAG,"----launcher drawn done,exit bootanim----");
+ Log.d(TAG,"launcher drawn done,exit bootanim----");
SystemProperties.set("service.bootanim.exit", "1");
//SystemService.stop("bootanim");
try {
@@ -5388,10 +5389,41 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
if ("box".equals(SystemProperties.get("ro.target.product"))){
if(shortComponentName!=null && !shortComponentName.contains(".FallbackHome")
&& !"1".equals(SystemProperties.get("service.bootanim.exit"))){
+ Log.d(TAG,"Launcher----onWindowsDrawn----stopBootanim--");
stopBootanim();
}
}
+
+
+ if (isHomeIntent(intent) && shortComponentName != null && !shortComponentName.contains("FallbackHome")) {
+ SystemProperties.set("service.bootanim.exit", "1");
+ Log.d(TAG, "reportLaunchTimeLocked:real home..--Launcher..." + shortComponentName);
+ }
+
final TransitionInfoSnapshot info = mStackSupervisor
.getActivityMetricsLogger().notifyWindowsDrawn(this, timestampNs);
final boolean validInfo = info != null;
diff --git a/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java b/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
index 14b3d34dcd..53b4dcef9f 100755
--- a/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3465,7 +3465,7 @@ public class WindowManagerService extends IWindowManager.Stub
//box:skip FallbackHome to fix 2-3s black screen before launcher.
if (!"box".equals(SystemProperties.get("ro.target.product"))) {
- if (!mBootAnimationStopped) {
+ if (false) {
Trace.asyncTraceBegin(TRACE_TAG_WINDOW_MANAGER, "Stop bootanim", 0);
// stop boot animation
// formerly we would just kill the process, but we now ask it to exit so it
@@ -3473,7 +3473,7 @@ public class WindowManagerService extends IWindowManager.Stub
SystemProperties.set("service.bootanim.exit", "1");
mBootAnimationStopped = true;
}
diff --git a/frameworks/native/services/surfaceflinger/SurfaceFlinger.cpp b/frameworks/native/services/surfaceflinger/SurfaceFlinger.cpp
old mode 100644
new mode 100755
index 0ca8fdbdb3..8cf8427d47
--- a/frameworks/native/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/frameworks/native/services/surfaceflinger/SurfaceFlinger.cpp
@@ -613,7 +613,8 @@ void SurfaceFlinger::bootFinished()
// stop boot animation
// formerly we would just kill the process, but we now ask it to exit so it
// can choose where to stop the animation.
- property_set("service.bootanim.exit", "1");
+
+// property_set("service.bootanim.exit", "1");
const int LOGTAG_SF_STOP_BOOTANIM = 60110;
LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,