commit 10fbf9a3f5bd996b388b744b556903e38edd944a
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 02 00:42:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 02 00:42:42 2019 +0000
tree 1b6d6fe0a65b26902fe7f7e7fbf3f4f8c1c79e79
parent fac8c40ba59248b024fe3f5183909c24be29a933
parent b00bd621573245f92c602a86e55abf501760fc9a

Merge "Adds @NonNull to getChildSessionIds"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index d16f648..a0fd17d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11438,7 +11438,7 @@
     method @Nullable public android.graphics.Bitmap getAppIcon();
     method @Nullable public CharSequence getAppLabel();
     method @Nullable public String getAppPackageName();
-    method public int[] getChildSessionIds();
+    method @NonNull public int[] getChildSessionIds();
     method public int getInstallLocation();
     method public int getInstallReason();
     method @Nullable public String getInstallerPackageName();

core/java/android/content/pm/PackageInstaller.java

diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java
index 5d6867e..a96316b 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -2166,6 +2166,7 @@
          * Returns the set of session IDs that will be committed when this session is commited if
          * this session is a multi-package session.
          */
+        @NonNull
         public int[] getChildSessionIds() {
             return childSessionIds;
         }