Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2bbb80e1: Merge change 5994 into donut

Browse Source 
Merge commit '2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac'

* commit '2bbb80e183c6492689f8b10b2d0f5dfe9872a6ac':
  Less logging in some places.  More in others.
This commit is contained in:
Android (Google) Code Review
2009-07-03 08:18:22 -07:00
committed by The Android Open Source Project
parent 28dda652a2 2bbb80e183
commit 7a91dc11ac
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/audioflinger/AudioFlinger.cpp
View File

@@ -499,7 +499,8 @@ status_t AudioFlinger::setRouting(int mode, uint32_t routes, uint32_t mask)
}
#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 &&
(mask & AudioSystem::ROUTE_BLUETOOTH_A2DP)) {
AutoMutex lock(&mLock);
@@ -900,7 +901,7 @@ void AudioFlinger::handleRouteDisablesA2dp_l(int routes)
}
LOGV("mA2dpDisableCount decremented to %d", mA2dpDisableCount);
} else {
LOGE("mA2dpDisableCount is already zero");
LOGV("mA2dpDisableCount is already zero");
}
}
}

15
services/java/com/android/server/BackupManagerService.java
View File

@@ -391,6 +391,7 @@ class BackupManagerService extends IBackupManager.Stub {
case MSG_RUN_RESTORE:
{
RestoreParams params = (RestoreParams)msg.obj;
Log.d(TAG, "MSG_RUN_RESTORE observer=" + params.observer);
(new PerformRestoreThread(params.transport, params.observer, params.token)).start();
break;
}
@@ -837,6 +838,7 @@ class BackupManagerService extends IBackupManager.Stub {
PerformRestoreThread(IBackupTransport transport, IRestoreObserver observer,
long restoreSetToken) {
mTransport = transport;
Log.d(TAG, "PerformRestoreThread mObserver=" + mObserver);
mObserver = observer;
mToken = restoreSetToken;
@@ -850,7 +852,8 @@ class BackupManagerService extends IBackupManager.Stub {
@Override
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:
*
@@ -1011,6 +1014,8 @@ class BackupManagerService extends IBackupManager.Stub {
Log.e(TAG, "Error finishing restore", e);
}
Log.d(TAG, "finishing restore mObserver=" + mObserver);
if (mObserver != null) {
try {
mObserver.restoreFinished(error);
@@ -1026,6 +1031,8 @@ class BackupManagerService extends IBackupManager.Stub {
// !!! TODO: actually run the restore through mTransport
final String packageName = app.packageName;
Log.d(TAG, "processOneRestore packageName=" + packageName);
// !!! TODO: get the dirs from the transport
File backupDataName = new File(mDataDir, packageName + ".restore");
backupDataName.delete();
@@ -1186,7 +1193,7 @@ class BackupManagerService extends IBackupManager.Stub {
// Report the name of the currently active transport
public String getCurrentTransport() {
mContext.enforceCallingPermission("android.permission.BACKUP", "getCurrentTransport");
Log.v(TAG, "getCurrentTransport() returning " + mCurrentTransport);
Log.v(TAG, "... getCurrentTransport() returning " + mCurrentTransport);
return mCurrentTransport;
}
@@ -1314,6 +1321,8 @@ class BackupManagerService extends IBackupManager.Stub {
throws android.os.RemoteException {
mContext.enforceCallingPermission("android.permission.BACKUP", "performRestore");
Log.d(TAG, "performRestore token=" + token + " observer=" + observer);
if (mRestoreSets != null) {
for (int i = 0; i < mRestoreSets.length; i++) {
if (token == mRestoreSets[i].token) {
@@ -1333,6 +1342,8 @@ class BackupManagerService extends IBackupManager.Stub {
mContext.enforceCallingPermission("android.permission.BACKUP",
"endRestoreSession");
Log.d(TAG, "endRestoreSession");
mRestoreTransport.finishRestore();
mRestoreTransport = null;
synchronized(BackupManagerService.this) {

3
services/java/com/android/server/HeadsetObserver.java
View File

@@ -35,6 +35,7 @@ import java.io.FileNotFoundException;
*/
class HeadsetObserver extends UEventObserver {
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_STATE_PATH = "/sys/class/switch/h2w/state";
@@ -61,7 +62,7 @@ class HeadsetObserver extends UEventObserver {
@Override
public void onUEvent(UEventObserver.UEvent event) {
Log.v(TAG, "Headset UEVENT: " + event.toString());
if (LOG) Log.v(TAG, "Headset UEVENT: " + event.toString());
try {
update(event.get("SWITCH_NAME"), Integer.parseInt(event.get("SWITCH_STATE")));