Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9919024d authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Refactor android.backup => android.app.backup"

parents 0dce6687 4528186e

Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IWallpaperManager.aidl \

	core/java/android/app/IWallpaperManagerCallback.aidl \

	core/java/android/app/admin/IDevicePolicyManager.aidl \

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

	core/java/android/backup/IRestoreObserver.aidl \

	core/java/android/backup/IRestoreSession.aidl \

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

	core/java/android/app/backup/IRestoreObserver.aidl \

	core/java/android/app/backup/IRestoreSession.aidl \

	core/java/android/bluetooth/IBluetooth.aidl \

	core/java/android/bluetooth/IBluetoothA2dp.aidl \

	core/java/android/bluetooth/IBluetoothCallback.aidl \

api/current.xml

+682 −682

File changed.

Preview size limit exceeded, changes collapsed.

cleanspec.mk

+2 −0
Original line number Diff line number Diff line 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/os/IDropBoxService.java)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/backup)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/backup)

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+4 −4
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


package com.android.commands.bmgr;



import android.backup.IBackupManager;

import android.backup.IRestoreObserver;

import android.backup.IRestoreSession;

import android.backup.RestoreSet;

import android.app.backup.RestoreSet;

import android.app.backup.IBackupManager;

import android.app.backup.IRestoreObserver;

import android.app.backup.IRestoreSession;

import android.os.RemoteException;

import android.os.ServiceManager;

core/java/android/app/ActivityThread.java

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.app;



import android.app.backup.BackupAgent;

import android.content.BroadcastReceiver;

import android.content.ComponentCallbacks;

import android.content.ComponentName;