Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add nullability anotations"

Browse Source 
am: 7e3b406f26

Change-Id: I65423d6c48c93396dff54adf3f8c661ae2788686
This commit is contained in:
Tao Bao
2019-09-13 10:28:21 -07:00
committed by android-build-merger
parent a40f432ac6 7e3b406f26
commit 8123e5cc50
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -5471,7 +5471,7 @@ package android.os {
public class UpdateEngine { public class UpdateEngine {
ctor public UpdateEngine(); ctor public UpdateEngine();
method public void applyPayload(String, long, long, String[]); 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, android.os.Handler);
method public boolean bind(android.os.UpdateEngineCallback); method public boolean bind(android.os.UpdateEngineCallback);
method public void cancel(); method public void cancel();

5
core/java/android/os/UpdateEngine.java
View File

@@ -16,6 +16,7 @@
package android.os; package android.os;
import android.annotation.NonNull;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.os.IUpdateEngine; import android.os.IUpdateEngine;
import android.os.IUpdateEngineCallback; import android.os.IUpdateEngineCallback;
@@ -320,8 +321,8 @@ public class UpdateEngine {
* <p>See {@link #applyPayload(String)} for {@code offset}, {@code size} and * <p>See {@link #applyPayload(String)} for {@code offset}, {@code size} and
* {@code headerKeyValuePairs} parameters. * {@code headerKeyValuePairs} parameters.
*/ */
public void applyPayload(FileDescriptor fd, long offset, long size, public void applyPayload(@NonNull FileDescriptor fd, long offset, long size,
String[] headerKeyValuePairs) { @NonNull String[] headerKeyValuePairs) {
try { try {
mUpdateEngine.applyPayloadFd(fd, offset, size, headerKeyValuePairs); mUpdateEngine.applyPayloadFd(fd, offset, size, headerKeyValuePairs);
} catch (RemoteException e) { } catch (RemoteException e) {