Merge "Marking isApex and isApkInApex as SystemApi" into main (b949272d) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -4598,6 +4598,8 @@ package android.content.rollback {
		method @NonNull public String getPackageName();
		method @NonNull public android.content.pm.VersionedPackage getVersionRolledBackFrom();
		method @NonNull public android.content.pm.VersionedPackage getVersionRolledBackTo();
		method @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") public boolean isApex();
		method @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") public boolean isApkInApex();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.content.rollback.PackageRollbackInfo> CREATOR;
		}

+10 −2

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

		package android.content.rollback;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.content.pm.PackageManager;
		@@ -145,7 +146,10 @@ public final class PackageRollbackInfo implements Parcelable {
		mPendingRestores.remove(ri);
		}

		/** @hide */
		/**
		* True if the package is an apex else false.
		*/
		@FlaggedApi(android.crashrecovery.flags.Flags.FLAG_ENABLE_CRASHRECOVERY)
		public boolean isApex() {
		return mIsApex;
		}
		@@ -154,7 +158,11 @@ public final class PackageRollbackInfo implements Parcelable {
		public @PackageManager.RollbackDataPolicy int getRollbackDataPolicy() {
		return mRollbackDataPolicy;
		}
		/** @hide */

		/**
		* True if the package is apk-in-apex else false.
		*/
		@FlaggedApi(android.crashrecovery.flags.Flags.FLAG_ENABLE_CRASHRECOVERY)
		public boolean isApkInApex() {
		return mIsApkInApex;
		}