Merge change Iaca22686 into eclair (48e6725c) · Commits · e / os / android_frameworks_base

core/java/android/content/SyncStorageEngine.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1028,7 +1028,7 @@ public class SyncStorageEngine extends Handler {
	ident++;		ident++;
	}		}
	}		}
	Log.d(TAG, "created a new AuthorityInfo for " + accountName		if (DEBUG) Log.v(TAG, "created a new AuthorityInfo for " + accountName
	+ ", provider " + authorityName);		+ ", provider " + authorityName);
	authority = new AuthorityInfo(accountName, authorityName, ident);		authority = new AuthorityInfo(accountName, authorityName, ident);
	account.authorities.put(authorityName, authority);		account.authorities.put(authorityName, authority);

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -973,8 +973,9 @@ public class PackageParser {
	return null;		return null;

	} else {		} else {
	Log.w(TAG, "Bad element under <manifest>: "		Log.w(TAG, "Unknown element under <manifest>: " + parser.getName()
	+ parser.getName());		+ " at " + mArchiveSourcePath + " "
			+ parser.getPositionDescription());
	XmlUtils.skipCurrentTag(parser);		XmlUtils.skipCurrentTag(parser);
	continue;		continue;
	}		}
	@@ -1729,8 +1730,9 @@ public class PackageParser {
	return null;		return null;
	}		}
	if (intent.countActions() == 0) {		if (intent.countActions() == 0) {
	Log.w(TAG, "Intent filter for activity " + intent		Log.w(TAG, "No actions in intent filter at "
	+ " defines no actions");		+ mArchiveSourcePath + " "
			+ parser.getPositionDescription());
	} else {		} else {
	a.intents.add(intent);		a.intents.add(intent);
	}		}
	@@ -1877,8 +1879,9 @@ public class PackageParser {
	return null;		return null;
	}		}
	if (intent.countActions() == 0) {		if (intent.countActions() == 0) {
	Log.w(TAG, "Intent filter for activity alias " + intent		Log.w(TAG, "No actions in intent filter at "
	+ " defines no actions");		+ mArchiveSourcePath + " "
			+ parser.getPositionDescription());
	} else {		} else {
	a.intents.add(intent);		a.intents.add(intent);
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,7 @@ import android.text.TextUtils;
	public class MobileDataStateTracker extends NetworkStateTracker {		public class MobileDataStateTracker extends NetworkStateTracker {

	private static final String TAG = "MobileDataStateTracker";		private static final String TAG = "MobileDataStateTracker";
	private static final boolean DBG = true;		private static final boolean DBG = false;

	private Phone.DataState mMobileDataState;		private Phone.DataState mMobileDataState;
	private ITelephony mPhoneService;		private ITelephony mPhoneService;

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,7 +41,6 @@ public class LocalTransport extends IBackupTransport.Stub {


	public LocalTransport(Context context) {		public LocalTransport(Context context) {
	if (DEBUG) Log.v(TAG, "Transport constructed");
	mContext = context;		mContext = context;
	mPackageManager = context.getPackageManager();		mPackageManager = context.getPackageManager();
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ import java.util.List;
	*/		*/
	public class ConnectivityService extends IConnectivityManager.Stub {		public class ConnectivityService extends IConnectivityManager.Stub {

	private static final boolean DBG = true;		private static final boolean DBG = false;
	private static final String TAG = "ConnectivityService";		private static final String TAG = "ConnectivityService";

	// Event log tags (must be in sync with event-log-tags)		// Event log tags (must be in sync with event-log-tags)