Merge change 5994 into donut (2bbb80e1) · Commits · e / os / android_frameworks_base

libs/audioflinger/AudioFlinger.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -499,7 +499,8 @@ status_t AudioFlinger::setRouting(int mode, uint32_t routes, uint32_t mask)
	}		}

	#ifdef WITH_A2DP		#ifdef WITH_A2DP
	LOGD("setRouting %d %d %d, tid %d, calling tid %d\n", mode, routes, mask, gettid(), IPCThreadState::self()->getCallingPid());		LOGV("setRouting %d %d %d, tid %d, calling tid %d\n", mode, routes, mask, gettid(),
			IPCThreadState::self()->getCallingPid());
	if (mode == AudioSystem::MODE_NORMAL &&		if (mode == AudioSystem::MODE_NORMAL &&
	(mask & AudioSystem::ROUTE_BLUETOOTH_A2DP)) {		(mask & AudioSystem::ROUTE_BLUETOOTH_A2DP)) {
	AutoMutex lock(&mLock);		AutoMutex lock(&mLock);
	@@ -893,7 +894,7 @@ void AudioFlinger::handleRouteDisablesA2dp_l(int routes)
	}		}
	LOGV("mA2dpDisableCount decremented to %d", mA2dpDisableCount);		LOGV("mA2dpDisableCount decremented to %d", mA2dpDisableCount);
	} else {		} else {
	LOGE("mA2dpDisableCount is already zero");		LOGV("mA2dpDisableCount is already zero");
	}		}
	}		}
	}		}

services/java/com/android/server/BackupManagerService.java

+13 −2

Original line number	Original line	Diff line number	Diff line
	@@ -391,6 +391,7 @@ class BackupManagerService extends IBackupManager.Stub {
	case MSG_RUN_RESTORE:		case MSG_RUN_RESTORE:
	{		{
	RestoreParams params = (RestoreParams)msg.obj;		RestoreParams params = (RestoreParams)msg.obj;
			Log.d(TAG, "MSG_RUN_RESTORE observer=" + params.observer);
	(new PerformRestoreThread(params.transport, params.observer, params.token)).start();		(new PerformRestoreThread(params.transport, params.observer, params.token)).start();
	break;		break;
	}		}
	@@ -837,6 +838,7 @@ class BackupManagerService extends IBackupManager.Stub {
	PerformRestoreThread(IBackupTransport transport, IRestoreObserver observer,		PerformRestoreThread(IBackupTransport transport, IRestoreObserver observer,
	long restoreSetToken) {		long restoreSetToken) {
	mTransport = transport;		mTransport = transport;
			Log.d(TAG, "PerformRestoreThread mObserver=" + mObserver);
	mObserver = observer;		mObserver = observer;
	mToken = restoreSetToken;		mToken = restoreSetToken;

	@@ -850,7 +852,8 @@ class BackupManagerService extends IBackupManager.Stub {

	@Override		@Override
	public void run() {		public void run() {
	if (DEBUG) Log.v(TAG, "Beginning restore process");		if (DEBUG) Log.v(TAG, "Beginning restore process mTransport=" + mTransport
			+ " mObserver=" + mObserver + " mToken=" + mToken);
	/**		/**
	* Restore sequence:		* Restore sequence:
	*		*
	@@ -1011,6 +1014,8 @@ class BackupManagerService extends IBackupManager.Stub {
	Log.e(TAG, "Error finishing restore", e);		Log.e(TAG, "Error finishing restore", e);
	}		}

			Log.d(TAG, "finishing restore mObserver=" + mObserver);

	if (mObserver != null) {		if (mObserver != null) {
	try {		try {
	mObserver.restoreFinished(error);		mObserver.restoreFinished(error);
	@@ -1026,6 +1031,8 @@ class BackupManagerService extends IBackupManager.Stub {
	// !!! TODO: actually run the restore through mTransport		// !!! TODO: actually run the restore through mTransport
	final String packageName = app.packageName;		final String packageName = app.packageName;

			Log.d(TAG, "processOneRestore packageName=" + packageName);

	// !!! TODO: get the dirs from the transport		// !!! TODO: get the dirs from the transport
	File backupDataName = new File(mDataDir, packageName + ".restore");		File backupDataName = new File(mDataDir, packageName + ".restore");
	backupDataName.delete();		backupDataName.delete();
	@@ -1186,7 +1193,7 @@ class BackupManagerService extends IBackupManager.Stub {
	// Report the name of the currently active transport		// Report the name of the currently active transport
	public String getCurrentTransport() {		public String getCurrentTransport() {
	mContext.enforceCallingPermission("android.permission.BACKUP", "getCurrentTransport");		mContext.enforceCallingPermission("android.permission.BACKUP", "getCurrentTransport");
	Log.v(TAG, "getCurrentTransport() returning " + mCurrentTransport);		Log.v(TAG, "... getCurrentTransport() returning " + mCurrentTransport);
	return mCurrentTransport;		return mCurrentTransport;
	}		}

	@@ -1314,6 +1321,8 @@ class BackupManagerService extends IBackupManager.Stub {
	throws android.os.RemoteException {		throws android.os.RemoteException {
	mContext.enforceCallingPermission("android.permission.BACKUP", "performRestore");		mContext.enforceCallingPermission("android.permission.BACKUP", "performRestore");

			Log.d(TAG, "performRestore token=" + token + " observer=" + observer);

	if (mRestoreSets != null) {		if (mRestoreSets != null) {
	for (int i = 0; i < mRestoreSets.length; i++) {		for (int i = 0; i < mRestoreSets.length; i++) {
	if (token == mRestoreSets[i].token) {		if (token == mRestoreSets[i].token) {
	@@ -1333,6 +1342,8 @@ class BackupManagerService extends IBackupManager.Stub {
	mContext.enforceCallingPermission("android.permission.BACKUP",		mContext.enforceCallingPermission("android.permission.BACKUP",
	"endRestoreSession");		"endRestoreSession");

			Log.d(TAG, "endRestoreSession");

	mRestoreTransport.finishRestore();		mRestoreTransport.finishRestore();
	mRestoreTransport = null;		mRestoreTransport = null;
	synchronized(BackupManagerService.this) {		synchronized(BackupManagerService.this) {

services/java/com/android/server/HeadsetObserver.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ import java.io.FileNotFoundException;
	*/		*/
	class HeadsetObserver extends UEventObserver {		class HeadsetObserver extends UEventObserver {
	private static final String TAG = HeadsetObserver.class.getSimpleName();		private static final String TAG = HeadsetObserver.class.getSimpleName();
			private static final boolean LOG = false;

	private static final String HEADSET_UEVENT_MATCH = "DEVPATH=/devices/virtual/switch/h2w";		private static final String HEADSET_UEVENT_MATCH = "DEVPATH=/devices/virtual/switch/h2w";
	private static final String HEADSET_STATE_PATH = "/sys/class/switch/h2w/state";		private static final String HEADSET_STATE_PATH = "/sys/class/switch/h2w/state";
	@@ -61,7 +62,7 @@ class HeadsetObserver extends UEventObserver {

	@Override		@Override
	public void onUEvent(UEventObserver.UEvent event) {		public void onUEvent(UEventObserver.UEvent event) {
	Log.v(TAG, "Headset UEVENT: " + event.toString());		if (LOG) Log.v(TAG, "Headset UEVENT: " + event.toString());

	try {		try {
	update(event.get("SWITCH_NAME"), Integer.parseInt(event.get("SWITCH_STATE")));		update(event.get("SWITCH_NAME"), Integer.parseInt(event.get("SWITCH_STATE")));