Cleanup some obsolete TODOs and unused code. (01178b4f) · Commits · e / os / android_frameworks_base

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -694,6 +694,7 @@ package android.content.pm {
		method public void setEnableRollback(boolean);
		method @RequiresPermission("android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS") public void setGrantedRuntimePermissions(String[]);
		method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setInstallAsApex();
		method public void setRequestDowngrade(boolean);
		method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setStaged();
		}

		@@ -795,6 +796,7 @@ package android.content.rollback {
		}

		public final class RollbackManager {
		method @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS) public void blockRollbackManager(long);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_ROLLBACKS, android.Manifest.permission.TEST_MANAGE_ROLLBACKS}) public void commitRollback(int, @NonNull java.util.List<android.content.pm.VersionedPackage>, @NonNull android.content.IntentSender);
		method @RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS) public void expireRollbackForPackage(@NonNull String);
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_ROLLBACKS, android.Manifest.permission.TEST_MANAGE_ROLLBACKS}) public java.util.List<android.content.rollback.RollbackInfo> getAvailableRollbacks();

+1 −1

Original line number	Diff line number	Diff line
		@@ -1565,7 +1565,7 @@ public class PackageInstaller {
		}

		/** {@hide} */
		@SystemApi
		@SystemApi @TestApi
		public void setRequestDowngrade(boolean requestDowngrade) {
		if (requestDowngrade) {
		installFlags \|= PackageManager.INSTALL_REQUEST_DOWNGRADE;

+2 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,8 @@ public class PackageParser {

		/** @hide */
		public static final String APK_FILE_EXTENSION = ".apk";
		/** @hide */
		public static final String APEX_FILE_EXTENSION = ".apex";

		/** @hide */
		public static class NewPermissionInfo {

+4 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import android.content.IntentSender;
		interface IRollbackManager {

		ParceledListSlice getAvailableRollbacks();
		ParceledListSlice getRecentlyExecutedRollbacks();
		ParceledListSlice getRecentlyCommittedRollbacks();

		void commitRollback(int rollbackId, in ParceledListSlice causePackages,
		String callerPackageName, in IntentSender statusReceiver);
		@@ -51,4 +51,7 @@ interface IRollbackManager {
		// Used by the staging manager to notify the RollbackManager of the apk
		// session for a staged session.
		void notifyStagedApkSession(int originalSessionId, int apkSessionId);

		// For test purposes only.
		void blockRollbackManager(long millis);
		}

+22 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ public final class RollbackManager {
		})
		public @NonNull List<RollbackInfo> getRecentlyCommittedRollbacks() {
		try {
		return mBinder.getRecentlyExecutedRollbacks().getList();
		return mBinder.getRecentlyCommittedRollbacks().getList();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -250,4 +250,25 @@ public final class RollbackManager {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Block the RollbackManager for a specified amount of time.
		* This API is meant to facilitate testing of race conditions in
		* RollbackManager. Blocks RollbackManager from processing anything for
		* the given number of milliseconds.
		*
		* @param millis number of milliseconds to block the RollbackManager for
		* @throws SecurityException if the caller does not have appropriate permissions.
		*
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.TEST_MANAGE_ROLLBACKS)
		@TestApi
		public void blockRollbackManager(long millis) {
		try {
		mBinder.blockRollbackManager(millis);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}