Merge "[Backup cleanup] remove unused (and no-op) method setBackupProvisioned" (9dc26b0f) · Commits · e / os / android_frameworks_base

core/java/android/app/backup/IBackupManager.aidl

+0 −7

Original line number	Diff line number	Diff line
		@@ -179,13 +179,6 @@ interface IBackupManager {
		*/
		void setAutoRestore(boolean doAutoRestore);

		/**
		* Indicate that any necessary one-time provisioning has occurred.
		*
		* <p>Callers must hold the android.permission.BACKUP permission to use this method.
		*/
		void setBackupProvisioned(boolean isProvisioned);

		/**
		* Report whether the backup mechanism is currently enabled.
		*

+0 −7

Original line number	Diff line number	Diff line
		@@ -385,13 +385,6 @@ public class Trampoline extends IBackupManager.Stub {
		setAutoRestoreForUser(binderGetCallingUserId(), doAutoRestore);
		}

		@Override
		public void setBackupProvisioned(boolean isProvisioned) throws RemoteException {
		/*
		* This is now a no-op; provisioning is simply the device's own setup state.
		*/
		}

		@Override
		public boolean isBackupEnabledForUser(@UserIdInt int userId) throws RemoteException {
		BackupManagerService svc = mService;

+0 −13

Original line number	Diff line number	Diff line
		@@ -509,19 +509,6 @@ public class TrampolineTest {
		verify(mBackupManagerServiceMock).setAutoRestore(mUserId, true);
		}

		@Test
		public void setBackupProvisioned_calledBeforeInitialize_ignored() throws RemoteException {
		mTrampoline.setBackupProvisioned(true);
		verifyNoMoreInteractions(mBackupManagerServiceMock);
		}

		@Test
		public void setBackupProvisioned_forwarded() throws RemoteException {
		mTrampoline.initializeService();
		mTrampoline.setBackupProvisioned(true);
		verifyNoMoreInteractions(mBackupManagerServiceMock);
		}

		@Test
		public void isBackupEnabled_calledBeforeInitialize_ignored() throws RemoteException {
		assertFalse(mTrampoline.isBackupEnabled());