diff options
| author | 2019-03-26 11:14:25 +0000 | |
|---|---|---|
| committer | 2019-03-26 11:14:25 +0000 | |
| commit | 2384444f7523ca1e5f6e238cee624b966c7d28da (patch) | |
| tree | a39181d2bdfac72a561cb834ea4a9da89b9c26e7 | |
| parent | 8c84b92e586bb4adbb0c208e8ee1eca625692ca7 (diff) | |
| parent | 16dfa6faa6eb4790665e422abd93e578eb60a1ed (diff) | |
Merge "Add @NonNull to parameter."
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | 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 04ba55f07d75..08332efb72ed 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6963,7 +6963,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 4c05497479c0..4b0c05f323cd 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2166,7 +2166,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) { } } |