From 9052c23faef5a29d425eff2424de3264d3a68b72 Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Fri, 1 Mar 2019 09:25:43 +0100
Subject: [PATCH] Add @NonNull annotation to ZygotePreload API.

Bug: 126701453
Test: builds
Change-Id: I27d71120788de443e59d54eda62188da4ccb4a8b
---
 api/current.txt                          | 2 +-
 core/java/android/app/ZygotePreload.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index c8f5662e11be8..26797b22b0e78 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6487,7 +6487,7 @@ package android.app {
   }
 
   public interface ZygotePreload {
-    method public void doPreload(android.content.pm.ApplicationInfo);
+    method public void doPreload(@NonNull android.content.pm.ApplicationInfo);
   }
 
 }
diff --git a/core/java/android/app/ZygotePreload.java b/core/java/android/app/ZygotePreload.java
index a295af352c0aa..eaaeb54586420 100644
--- a/core/java/android/app/ZygotePreload.java
+++ b/core/java/android/app/ZygotePreload.java
@@ -15,6 +15,7 @@
  */
 package android.app;
 
+import android.annotation.NonNull;
 import android.content.pm.ApplicationInfo;
 
 /**
@@ -27,8 +28,7 @@ import android.content.pm.ApplicationInfo;
  * {@link android.R.styleable#AndroidManifestService_useAppZygote android:useAppZygote} attribute
  * of the &lt;service&gt; tag set to <code>true</code>.
  *
- * Note that this implementations of this class must provide a default constructor with no
- * arguments.
+ * Note that implementations of this class must provide a default constructor with no arguments.
  */
 public interface ZygotePreload {
     /**
@@ -38,5 +38,5 @@ public interface ZygotePreload {
      *
      * @param appInfo The ApplicationInfo object belonging to the application
      */
-    void doPreload(ApplicationInfo appInfo);
+    void doPreload(@NonNull ApplicationInfo appInfo);
 }