From 67f02a1fff020c64ce96d8d5d1a0545796b8bbe7 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Thu, 7 Mar 2019 09:05:44 -0800
Subject: [PATCH] Call notifyStartupCompleted from reportFullyDrawn

ART will now know when startup is startup is finished.

Test: manual
Bug: 120671223
Bug: 123377072

(cherry-picked from commit 63e14c10b3f7b2c9709b98cb9f128a2a817d4968)

Merged-In: I1134f66792bddc9ab33606fa4c2807b3918d5261
Change-Id: I1134f66792bddc9ab33606fa4c2807b3918d5261
---
 core/java/android/app/Activity.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 4b4611ee4f84..5f99d6a0d098 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -131,6 +131,8 @@ import com.android.internal.app.ToolbarActionBar;
 import com.android.internal.app.WindowDecorActionBar;
 import com.android.internal.policy.PhoneWindow;
 
+import dalvik.system.VMRuntime;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.lang.annotation.Retention;
@@ -2052,6 +2054,7 @@ public class Activity extends ContextThemeWrapper
             mDoReportFullyDrawn = false;
             try {
                 ActivityManager.getService().reportActivityFullyDrawn(mToken, mRestoredFromBundle);
+                VMRuntime.getRuntime().notifyStartupCompleted();
             } catch (RemoteException e) {
             }
         }
-- 
2.11.0