Merge "API cleanup: add NonNull annotation to Rollback API" (34b0c44a) · Commits · e / os / android_frameworks_base

api/system-current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -1823,18 +1823,18 @@ package android.content.rollback {

		public final class PackageRollbackInfo implements android.os.Parcelable {
		method public int describeContents();
		method public String getPackageName();
		method public android.content.pm.VersionedPackage getVersionRolledBackFrom();
		method public android.content.pm.VersionedPackage getVersionRolledBackTo();
		method @NonNull public String getPackageName();
		method @NonNull public android.content.pm.VersionedPackage getVersionRolledBackFrom();
		method @NonNull public android.content.pm.VersionedPackage getVersionRolledBackTo();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.content.rollback.PackageRollbackInfo> CREATOR;
		}

		public final class RollbackInfo implements android.os.Parcelable {
		method public int describeContents();
		method public java.util.List<android.content.pm.VersionedPackage> getCausePackages();
		method @NonNull public java.util.List<android.content.pm.VersionedPackage> getCausePackages();
		method public int getCommittedSessionId();
		method public java.util.List<android.content.rollback.PackageRollbackInfo> getPackages();
		method @NonNull public java.util.List<android.content.rollback.PackageRollbackInfo> getPackages();
		method public int getRollbackId();
		method public boolean isStaged();
		method public void writeToParcel(android.os.Parcel, int);
		@@ -1844,7 +1844,7 @@ package android.content.rollback {
		public final class RollbackManager {
		method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public void commitRollback(int, @NonNull java.util.List<android.content.pm.VersionedPackage>, @NonNull android.content.IntentSender);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public void expireRollbackForPackage(@NonNull String);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public java.util.List<android.content.rollback.RollbackInfo> getAvailableRollbacks();
		method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) @NonNull public java.util.List<android.content.rollback.RollbackInfo> getAvailableRollbacks();
		method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) @NonNull public java.util.List<android.content.rollback.RollbackInfo> getRecentlyCommittedRollbacks();
		method @RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS) public void reloadPersistedData();
		field public static final String EXTRA_STATUS = "android.content.rollback.extra.STATUS";

core/java/android/content/rollback/PackageRollbackInfo.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ public final class PackageRollbackInfo implements Parcelable {
		/**
		* Returns the name of the package to roll back from.
		*/
		@NonNull
		public String getPackageName() {
		return mVersionRolledBackFrom.getPackageName();
		}
		@@ -96,6 +97,7 @@ public final class PackageRollbackInfo implements Parcelable {
		/**
		* Returns the version of the package rolled back from.
		*/
		@NonNull
		public VersionedPackage getVersionRolledBackFrom() {
		return mVersionRolledBackFrom;
		}
		@@ -103,6 +105,7 @@ public final class PackageRollbackInfo implements Parcelable {
		/**
		* Returns the version of the package rolled back to.
		*/
		@NonNull
		public VersionedPackage getVersionRolledBackTo() {
		return mVersionRolledBackTo;
		}

core/java/android/content/rollback/RollbackInfo.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.content.rollback;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.content.pm.VersionedPackage;
		import android.os.Parcel;
		@@ -72,6 +73,7 @@ public final class RollbackInfo implements Parcelable {
		/**
		* Returns the list of package that are rolled back.
		*/
		@NonNull
		public List<PackageRollbackInfo> getPackages() {
		return mPackages;
		}
		@@ -105,6 +107,7 @@ public final class RollbackInfo implements Parcelable {
		* As provided to {@link #commitRollback} when the rollback was committed.
		* This is only applicable for rollbacks that have been committed.
		*/
		@NonNull
		public List<VersionedPackage> getCausePackages() {
		return mCausePackages;
		}

core/java/android/content/rollback/RollbackManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ public final class RollbackManager {
		* MANAGE_ROLLBACKS permission.
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_ROLLBACKS)
		@NonNull
		public List<RollbackInfo> getAvailableRollbacks() {
		try {
		return mBinder.getAvailableRollbacks().getList();