From 16dfa6faa6eb4790665e422abd93e578eb60a1ed Mon Sep 17 00:00:00 2001 From: Alex Kershaw Date: Mon, 4 Mar 2019 12:30:58 +0000 Subject: Add @NonNull to parameter. Add @NonNull to second parameter of InstallSystemUpdateCallback. Fixes: 126701431 Test: Manual Change-Id: I5ced921b2c925e3318c564707fb2f83dfa31a386 --- api/current.txt | 2 +- core/java/android/app/admin/DevicePolicyManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index d1b77f2c1096..c406e230060e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6964,7 +6964,7 @@ package android.app.admin { public abstract static class DevicePolicyManager.InstallSystemUpdateCallback { ctor public DevicePolicyManager.InstallSystemUpdateCallback(); - method public void onInstallUpdateError(int, String); + method public void onInstallUpdateError(int, @NonNull String); field public static final int UPDATE_ERROR_BATTERY_LOW = 5; // 0x5 field public static final int UPDATE_ERROR_FILE_NOT_FOUND = 4; // 0x4 field public static final int UPDATE_ERROR_INCORRECT_OS_VERSION = 2; // 0x2 diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 9a4e2151dd3b..5d7e7793da2c 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2165,7 +2165,7 @@ public class DevicePolicyManager { * reported back to the IT admin to be read. */ public void onInstallUpdateError( - @InstallUpdateCallbackErrorConstants int errorCode, String errorMessage) { + @InstallUpdateCallbackErrorConstants int errorCode, @NonNull String errorMessage) { } } -- cgit v1.2.3-59-g8ed1b