Merge "remove unused private fields and unnecessary TODOs" (e4df2f6c) · Commits · e / os / android_frameworks_base

services/backup/java/com/android/server/backup/UserBackupManagerService.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -2431,7 +2431,6 @@ public class UserBackupManagerService {
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP,
		"setAncestralSerialNumber");
		Slog.v(TAG, "Setting ancestral work profile id to " + ancestralSerialNumber);
		// TODO (b/124359804)
		try (RandomAccessFile af = getAncestralSerialNumberFile()) {
		af.writeLong(ancestralSerialNumber);
		} catch (IOException e) {
		@@ -2444,7 +2443,6 @@ public class UserBackupManagerService {
		* {@link #setAncestralSerialNumber(long)}. Will return {@code -1} if not set.
		*/
		public long getAncestralSerialNumber() {
		// TODO (b/124359804)
		try (RandomAccessFile af = getAncestralSerialNumberFile()) {
		return af.readLong();
		} catch (IOException e) {
		@@ -2570,7 +2568,6 @@ public class UserBackupManagerService {
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "adbBackup");

		final int callingUserHandle = UserHandle.getCallingUserId();
		// TODO: http://b/22388012
		if (callingUserHandle != UserHandle.USER_SYSTEM) {
		throw new IllegalStateException("Backup supported only for the device owner");
		}
		@@ -2708,7 +2705,6 @@ public class UserBackupManagerService {
		mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "adbRestore");

		final int callingUserHandle = UserHandle.getCallingUserId();
		// TODO: http://b/22388012
		if (callingUserHandle != UserHandle.USER_SYSTEM) {
		throw new IllegalStateException("Restore supported only for the device owner");
		}

services/tests/servicestests/src/com/android/server/backup/BackupManagerServiceTest.java

+0 −30

Original line number	Diff line number	Diff line
		@@ -34,9 +34,6 @@ import static org.mockito.Mockito.when;
		import android.Manifest;
		import android.annotation.UserIdInt;
		import android.app.backup.BackupManager;
		import android.app.backup.IBackupManagerMonitor;
		import android.app.backup.IBackupObserver;
		import android.app.backup.IFullBackupRestoreObserver;
		import android.app.backup.ISelectBackupTransportCallback;
		import android.app.job.JobScheduler;
		import android.content.ComponentName;
		@@ -44,8 +41,6 @@ import android.content.Context;
		import android.content.pm.PackageManager;
		import android.content.pm.UserInfo;
		import android.os.ConditionVariable;
		import android.os.IBinder;
		import android.os.ParcelFileDescriptor;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.UserHandle;
		@@ -77,23 +72,8 @@ import java.util.concurrent.TimeUnit;
		@Presubmit
		@RunWith(AndroidJUnit4.class)
		public class BackupManagerServiceTest {
		private static final String PACKAGE_NAME = "some.package.name";
		private static final String TRANSPORT_NAME = "some.transport.name";
		private static final String CURRENT_PASSWORD = "current_password";
		private static final String NEW_PASSWORD = "new_password";
		private static final String ENCRYPTION_PASSWORD = "encryption_password";
		private static final CharSequence DATA_MANAGEMENT_LABEL = "data_management_label";
		private static final String DESTINATION_STRING = "destination_string";
		private static final String[] PACKAGE_NAMES =
		new String[]{"some.package.name._1", "some.package.name._2"};
		private static final String[] TRANSPORTS =
		new String[]{"some.transport.name._1", "some.transport.name._2"};
		private static final ComponentName TRANSPORT_COMPONENT_NAME = new ComponentName("package",
		"class");
		private static final ComponentName[] TRANSPORT_COMPONENTS = new ComponentName[]{
		new ComponentName("package1", "class1"),
		new ComponentName("package2", "class2")
		};
		private static final int NON_USER_SYSTEM = UserHandle.USER_SYSTEM + 1;
		private static final int UNSTARTED_NON_USER_SYSTEM = UserHandle.USER_SYSTEM + 2;

		@@ -104,16 +84,6 @@ public class BackupManagerServiceTest {
		@Mock
		private Context mContextMock;
		@Mock
		private IBinder mAgentMock;
		@Mock
		private ParcelFileDescriptor mParcelFileDescriptorMock;
		@Mock
		private IFullBackupRestoreObserver mFullBackupRestoreObserverMock;
		@Mock
		private IBackupObserver mBackupObserverMock;
		@Mock
		private IBackupManagerMonitor mBackupManagerMonitorMock;
		@Mock
		private PrintWriter mPrintWriterMock;
		@Mock
		private UserManager mUserManagerMock;