Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4897c7d authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Add nullability anotations" am: 7e3b406f 

am: 8123e5cc

Change-Id: Id776e88e7669f78d845c77b80ad1d671efa08f71
parents 0e7175db 8123e5cc

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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();

core/java/android/os/UpdateEngine.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -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) {