backup: no-op code cleanup (b3bf0c63) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -24,15 +24,12 @@ import android.content.ComponentName;
		import android.content.Context;

		public class FullBackupJob extends JobService {
		private static final String TAG = "FullBackupJob";
		private static final boolean DEBUG = true;

		private static ComponentName sIdleService =
		new ComponentName("android", FullBackupJob.class.getName());

		private static final int JOB_ID = 0x5038;

		JobParameters mParams;
		private JobParameters mParams;

		public static void schedule(Context ctx, long minDelay, BackupManagerConstants constants) {
		JobScheduler js = (JobScheduler) ctx.getSystemService(Context.JOB_SCHEDULER_SERVICE);

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -13,8 +13,6 @@ import android.os.ParcelFileDescriptor;
		import android.os.RemoteException;
		import android.util.Slog;

		import com.android.server.backup.restore.PerformAdbRestoreTask;

		import libcore.io.IoUtils;

		import java.io.File;
		@@ -42,11 +40,10 @@ public class KeyValueAdbRestoreEngine implements Runnable {
		private final UserBackupManagerService mBackupManagerService;
		private final File mDataDir;

		FileMetadata mInfo;
		PerformAdbRestoreTask mRestoreTask;
		ParcelFileDescriptor mInFD;
		IBackupAgent mAgent;
		int mToken;
		private final FileMetadata mInfo;
		private final ParcelFileDescriptor mInFD;
		private final IBackupAgent mAgent;
		private final int mToken;

		public KeyValueAdbRestoreEngine(UserBackupManagerService backupManagerService,
		File dataDir, FileMetadata info, ParcelFileDescriptor inFD, IBackupAgent agent,

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

+18 −73

Original line number	Diff line number	Diff line
		@@ -208,8 +208,8 @@ public class UserBackupManagerService {

		public static final String RUN_BACKUP_ACTION = "android.app.backup.intent.RUN";
		public static final String RUN_INITIALIZE_ACTION = "android.app.backup.intent.INIT";
		public static final String BACKUP_FINISHED_ACTION = "android.intent.action.BACKUP_FINISHED";
		public static final String BACKUP_FINISHED_PACKAGE_EXTRA = "packageName";
		private static final String BACKUP_FINISHED_ACTION = "android.intent.action.BACKUP_FINISHED";
		private static final String BACKUP_FINISHED_PACKAGE_EXTRA = "packageName";

		// Bookkeeping of in-flight operations. The operation token is the index of the entry in the
		// pending operations list.
		@@ -247,25 +247,25 @@ public class UserBackupManagerService {
		private final TransportManager mTransportManager;
		private final HandlerThread mUserBackupThread;

		private Context mContext;
		private PackageManager mPackageManager;
		private IPackageManager mPackageManagerBinder;
		private IActivityManager mActivityManager;
		private final Context mContext;
		private final PackageManager mPackageManager;
		private final IPackageManager mPackageManagerBinder;
		private final IActivityManager mActivityManager;
		private PowerManager mPowerManager;
		private AlarmManager mAlarmManager;
		private IStorageManager mStorageManager;
		private BackupManagerConstants mConstants;
		private PowerManager.WakeLock mWakelock;
		private BackupHandler mBackupHandler;
		private final AlarmManager mAlarmManager;
		private final IStorageManager mStorageManager;
		private final BackupManagerConstants mConstants;
		private final PowerManager.WakeLock mWakelock;
		private final BackupHandler mBackupHandler;

		private IBackupManager mBackupManagerBinder;
		private final IBackupManager mBackupManagerBinder;

		private boolean mEnabled; // access to this is synchronized on 'this'
		private boolean mSetupComplete;
		private boolean mAutoRestore;

		private PendingIntent mRunBackupIntent;
		private PendingIntent mRunInitIntent;
		private final PendingIntent mRunBackupIntent;
		private final PendingIntent mRunInitIntent;

		private final ArraySet<String> mPendingInits = new ArraySet<>(); // transport names

		@@ -273,7 +273,7 @@ public class UserBackupManagerService {
		private final SparseArray<HashSet<String>> mBackupParticipants = new SparseArray<>();

		// Backups that we haven't started yet. Keys are package names.
		private HashMap<String, BackupRequest> mPendingBackups = new HashMap<>();
		private final HashMap<String, BackupRequest> mPendingBackups = new HashMap<>();

		// locking around the pending-backup management
		private final Object mQueueLock = new Object();
		@@ -340,7 +340,7 @@ public class UserBackupManagerService {
		private final SparseArray<Operation> mCurrentOperations = new SparseArray<>();
		private final Object mCurrentOpLock = new Object();
		private final Random mTokenGenerator = new Random();
		final AtomicInteger mNextToken = new AtomicInteger();
		private final AtomicInteger mNextToken = new AtomicInteger();

		// Where we keep our journal files and other bookkeeping.
		private final File mBaseStateDir;
		@@ -348,7 +348,7 @@ public class UserBackupManagerService {
		private final File mJournalDir;
		@Nullable
		private DataChangedJournal mJournal;
		private File mFullBackupScheduleFile;
		private final File mFullBackupScheduleFile;

		// Keep a log of all the apps we've ever backed up.
		private ProcessedPackagesJournal mProcessedPackagesJournal;
		@@ -571,10 +571,6 @@ public class UserBackupManagerService {
		return mPackageManager;
		}

		public void setPackageManager(PackageManager packageManager) {
		mPackageManager = packageManager;
		}

		public IPackageManager getPackageManagerBinder() {
		return mPackageManagerBinder;
		}
		@@ -583,27 +579,15 @@ public class UserBackupManagerService {
		return mActivityManager;
		}

		public void setActivityManager(IActivityManager activityManager) {
		mActivityManager = activityManager;
		}

		public AlarmManager getAlarmManager() {
		return mAlarmManager;
		}

		public void setAlarmManager(AlarmManager alarmManager) {
		mAlarmManager = alarmManager;
		}

		@VisibleForTesting
		void setPowerManager(PowerManager powerManager) {
		mPowerManager = powerManager;
		}

		public void setBackupManagerBinder(IBackupManager backupManagerBinder) {
		mBackupManagerBinder = backupManagerBinder;
		}

		public TransportManager getTransportManager() {
		return mTransportManager;
		}
		@@ -638,35 +622,18 @@ public class UserBackupManagerService {
		mWakelock.setWorkSource(workSource);
		}

		public void setWakelock(PowerManager.WakeLock wakelock) {
		mWakelock = wakelock;
		}

		public Handler getBackupHandler() {
		return mBackupHandler;
		}

		public void setBackupHandler(BackupHandler backupHandler) {
		mBackupHandler = backupHandler;
		}

		public PendingIntent getRunInitIntent() {
		return mRunInitIntent;
		}

		public void setRunInitIntent(PendingIntent runInitIntent) {
		mRunInitIntent = runInitIntent;
		}

		public HashMap<String, BackupRequest> getPendingBackups() {
		return mPendingBackups;
		}

		public void setPendingBackups(
		HashMap<String, BackupRequest> pendingBackups) {
		mPendingBackups = pendingBackups;
		}

		public Object getQueueLock() {
		return mQueueLock;
		}
		@@ -679,10 +646,6 @@ public class UserBackupManagerService {
		mBackupRunning = backupRunning;
		}

		public long getLastBackupPass() {
		return mLastBackupPass;
		}

		public void setLastBackupPass(long lastBackupPass) {
		mLastBackupPass = lastBackupPass;
		}
		@@ -691,10 +654,6 @@ public class UserBackupManagerService {
		return mClearDataLock;
		}

		public boolean isClearingData() {
		return mClearingData;
		}

		public void setClearingData(boolean clearingData) {
		mClearingData = clearingData;
		}
		@@ -715,11 +674,6 @@ public class UserBackupManagerService {
		return mActiveRestoreSession;
		}

		public void setActiveRestoreSession(
		ActiveRestoreSession activeRestoreSession) {
		mActiveRestoreSession = activeRestoreSession;
		}

		public SparseArray<Operation> getCurrentOperations() {
		return mCurrentOperations;
		}
		@@ -753,18 +707,10 @@ public class UserBackupManagerService {
		return mRng;
		}

		public Set<String> getAncestralPackages() {
		return mAncestralPackages;
		}

		public void setAncestralPackages(Set<String> ancestralPackages) {
		mAncestralPackages = ancestralPackages;
		}

		public long getAncestralToken() {
		return mAncestralToken;
		}

		public void setAncestralToken(long ancestralToken) {
		mAncestralToken = ancestralToken;
		}
		@@ -3129,8 +3075,7 @@ public class UserBackupManagerService {
		synchronized (mAgentConnectLock) {
		if (Binder.getCallingUid() == Process.SYSTEM_UID) {
		Slog.d(TAG, "agentConnected pkg=" + packageName + " agent=" + agentBinder);
		IBackupAgent agent = IBackupAgent.Stub.asInterface(agentBinder);
		mConnectedAgent = agent;
		mConnectedAgent = IBackupAgent.Stub.asInterface(agentBinder);
		mConnecting = false;
		} else {
		Slog.w(TAG, "Non-system process uid=" + Binder.getCallingUid()