remove unused private fields and unnecessary TODOs
1. the private members in BackupManagerServiceTest were all unused
2. remove TODO for b/124359804 which is marked as wont-fix.
3. remove adb backup multi-user TODOs as adb backup is deprecated and we
don't intend to extend multi-user support to it.
Bug: 136738613
Test: m -j
Change-Id: Ia4c6ebce7b9bb7ab8bfe1f6a18f9b67ec6098cd2
diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
index 56b345b..aab1efb 100644
--- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
@@ -2431,7 +2431,6 @@
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 @@
* {@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 @@
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 @@
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");
}
diff --git a/services/tests/servicestests/src/com/android/server/backup/BackupManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/backup/BackupManagerServiceTest.java
index 68b413f..9f8ca7f 100644
--- a/services/tests/servicestests/src/com/android/server/backup/BackupManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/backup/BackupManagerServiceTest.java
@@ -34,9 +34,6 @@
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.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 @@
@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 @@
@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;