diff options
| author | 2019-09-13 10:41:54 -0700 | |
|---|---|---|
| committer | 2019-09-13 10:41:54 -0700 | |
| commit | d4897c7dbfc395106653711ca049565b11d71129 (patch) | |
| tree | d7327fa2260d58e5b734ffba55f3909601d0f1bd | |
| parent | 0e7175db8868140c1fcc2cb583d3f5bc6d485fa9 (diff) | |
| parent | 8123e5cc50dcd9640b36593dea7a6e9a4ecca813 (diff) | |
Merge "Add nullability anotations" am: 7e3b406f26
am: 8123e5cc50
Change-Id: Id776e88e7669f78d845c77b80ad1d671efa08f71
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/UpdateEngine.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 8c222b6175c2..355f3fe3a97f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5471,7 +5471,7 @@ package android.os { public class UpdateEngine { ctor public UpdateEngine(); method public void applyPayload(String, long, long, String[]); - method public void applyPayload(java.io.FileDescriptor, long, long, String[]); + method public void applyPayload(@NonNull java.io.FileDescriptor, long, long, @NonNull String[]); method public boolean bind(android.os.UpdateEngineCallback, android.os.Handler); method public boolean bind(android.os.UpdateEngineCallback); method public void cancel(); diff --git a/core/java/android/os/UpdateEngine.java b/core/java/android/os/UpdateEngine.java index 29af17afc872..dd5e20e39904 100644 --- a/core/java/android/os/UpdateEngine.java +++ b/core/java/android/os/UpdateEngine.java @@ -16,6 +16,7 @@ package android.os; +import android.annotation.NonNull; import android.annotation.SystemApi; import android.os.IUpdateEngine; import android.os.IUpdateEngineCallback; @@ -320,8 +321,8 @@ public class UpdateEngine { * <p>See {@link #applyPayload(String)} for {@code offset}, {@code size} and * {@code headerKeyValuePairs} parameters. */ - public void applyPayload(FileDescriptor fd, long offset, long size, - String[] headerKeyValuePairs) { + public void applyPayload(@NonNull FileDescriptor fd, long offset, long size, + @NonNull String[] headerKeyValuePairs) { try { mUpdateEngine.applyPayloadFd(fd, offset, size, headerKeyValuePairs); } catch (RemoteException e) { |