diff --git a/api/system-current.txt b/api/system-current.txt index 219abdfabce08..99a4ad3c448a6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -31581,12 +31581,13 @@ package android.os { public class UpdateEngine { ctor public UpdateEngine(); - method public void applyPayload(java.lang.String, long, long, java.lang.String[]) throws android.os.RemoteException; - method public boolean bind(android.os.UpdateEngineCallback, android.os.Handler) throws android.os.RemoteException; - method public boolean bind(android.os.UpdateEngineCallback) throws android.os.RemoteException; - method public void cancel() throws android.os.RemoteException; - method public void resume() throws android.os.RemoteException; - method public void suspend() throws android.os.RemoteException; + method public void applyPayload(java.lang.String, long, long, java.lang.String[]); + method public boolean bind(android.os.UpdateEngineCallback, android.os.Handler); + method public boolean bind(android.os.UpdateEngineCallback); + method public void cancel(); + method public void resetStatus(); + method public void resume(); + method public void suspend(); } public static final class UpdateEngine.ErrorCodeConstants { diff --git a/core/java/android/os/UpdateEngine.java b/core/java/android/os/UpdateEngine.java index 80e61462873f2..bf03cce947e2a 100644 --- a/core/java/android/os/UpdateEngine.java +++ b/core/java/android/os/UpdateEngine.java @@ -87,7 +87,7 @@ public class UpdateEngine { } @SystemApi - public boolean bind(final UpdateEngineCallback callback, final Handler handler) throws RemoteException { + public boolean bind(final UpdateEngineCallback callback, final Handler handler) { IUpdateEngineCallback updateEngineCallback = new IUpdateEngineCallback.Stub() { @Override public void onStatusUpdate(final int status, final float percent) { @@ -118,31 +118,60 @@ public class UpdateEngine { } }; - return mUpdateEngine.bind(updateEngineCallback); + try { + return mUpdateEngine.bind(updateEngineCallback); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } @SystemApi - public boolean bind(final UpdateEngineCallback callback) throws RemoteException { + public boolean bind(final UpdateEngineCallback callback) { return bind(callback, null); } @SystemApi - public void applyPayload(String url, long offset, long size, String[] headerKeyValuePairs) throws RemoteException { - mUpdateEngine.applyPayload(url, offset, size, headerKeyValuePairs); + public void applyPayload(String url, long offset, long size, String[] headerKeyValuePairs) { + try { + mUpdateEngine.applyPayload(url, offset, size, headerKeyValuePairs); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } @SystemApi - public void cancel() throws RemoteException { - mUpdateEngine.cancel(); + public void cancel() { + try { + mUpdateEngine.cancel(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } @SystemApi - public void suspend() throws RemoteException { - mUpdateEngine.suspend(); + public void suspend() { + try { + mUpdateEngine.suspend(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } @SystemApi - public void resume() throws RemoteException { - mUpdateEngine.resume(); + public void resume() { + try { + mUpdateEngine.resume(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + @SystemApi + public void resetStatus() { + try { + mUpdateEngine.resetStatus(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } }