Merge "Quiet down a lot of logging." into jb-mr1.1-dev (68e0da7e) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -4421,12 +4421,14 @@ public final class ActivityThread {
		new ArrayList<IActivityManager.ContentProviderHolder>();

		for (ProviderInfo cpi : providers) {
		if (DEBUG_PROVIDER) {
		StringBuilder buf = new StringBuilder(128);
		buf.append("Pub ");
		buf.append(cpi.authority);
		buf.append(": ");
		buf.append(cpi.name);
		Log.i(TAG, buf.toString());
		}
		IActivityManager.ContentProviderHolder cph = installProvider(context, null, cpi,
		false /noisy/, true /noReleaseNeeded/, true /stable/);
		if (cph != null) {

core/java/android/app/ContextImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ class ReceiverRestrictedContext extends ContextWrapper {
		* context object for Activity and other application components.
		*/
		class ContextImpl extends Context {
		private final static String TAG = "ApplicationContext";
		private final static String TAG = "ContextImpl";
		private final static boolean DEBUG = false;

		private static final HashMap<String, SharedPreferencesImpl> sSharedPrefs =
		@@ -1715,7 +1715,7 @@ class ContextImpl extends Context {
		private void warnIfCallingFromSystemProcess() {
		if (Process.myUid() == Process.SYSTEM_UID) {
		Slog.w(TAG, "Calling a method in the system process without a qualified user: "
		+ Debug.getCallers(3));
		+ Debug.getCallers(5));
		}
		}

core/java/android/content/SyncStorageEngine.java

+35 −26

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ import java.util.List;
		public class SyncStorageEngine extends Handler {

		private static final String TAG = "SyncManager";
		private static final boolean DEBUG = false;
		private static final boolean DEBUG_FILE = false;

		private static final String XML_ATTR_NEXT_AUTHORITY_ID = "nextAuthorityId";
		@@ -443,7 +444,7 @@ public class SyncStorageEngine extends Handler {
		mChangeListeners.finishBroadcast();
		}

		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "reportChange " + which + " to: " + reports);
		}

		@@ -484,13 +485,17 @@ public class SyncStorageEngine extends Handler {

		public void setSyncAutomatically(Account account, int userId, String providerName,
		boolean sync) {
		if (DEBUG) {
		Log.d(TAG, "setSyncAutomatically: " + /* account + */" provider " + providerName
		+ ", user " + userId + " -> " + sync);
		}
		synchronized (mAuthorities) {
		AuthorityInfo authority = getOrCreateAuthorityLocked(account, userId, providerName, -1,
		false);
		if (authority.enabled == sync) {
		if (DEBUG) {
		Log.d(TAG, "setSyncAutomatically: already set to " + sync + ", doing nothing");
		}
		return;
		}
		authority.enabled = sync;
		@@ -532,13 +537,17 @@ public class SyncStorageEngine extends Handler {
		} else if (syncable < -1) {
		syncable = -1;
		}
		if (DEBUG) {
		Log.d(TAG, "setIsSyncable: " + account + ", provider " + providerName
		+ ", user " + userId + " -> " + syncable);
		}
		synchronized (mAuthorities) {
		AuthorityInfo authority = getOrCreateAuthorityLocked(account, userId, providerName, -1,
		false);
		if (authority.syncable == syncable) {
		if (DEBUG) {
		Log.d(TAG, "setIsSyncable: already set to " + syncable + ", doing nothing");
		}
		return;
		}
		authority.syncable = syncable;
		@@ -564,7 +573,7 @@ public class SyncStorageEngine extends Handler {

		public void setBackoff(Account account, int userId, String providerName,
		long nextSyncTime, long nextDelay) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "setBackoff: " + account + ", provider " + providerName
		+ ", user " + userId
		+ " -> nextSyncTime " + nextSyncTime + ", nextDelay " + nextDelay);
		@@ -615,7 +624,7 @@ public class SyncStorageEngine extends Handler {
		for (AuthorityInfo authorityInfo : accountInfo.authorities.values()) {
		if (authorityInfo.backoffTime != NOT_IN_BACKOFF_MODE
		\|\| authorityInfo.backoffDelay != NOT_IN_BACKOFF_MODE) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "clearAllBackoffs:"
		+ " authority:" + authorityInfo.authority
		+ " account:" + accountInfo.accountAndUser.account.name
		@@ -641,7 +650,7 @@ public class SyncStorageEngine extends Handler {

		public void setDelayUntilTime(Account account, int userId, String providerName,
		long delayUntil) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "setDelayUntil: " + account + ", provider " + providerName
		+ ", user " + userId + " -> delayUntil " + delayUntil);
		}
		@@ -677,7 +686,7 @@ public class SyncStorageEngine extends Handler {
		if (extras == null) {
		extras = new Bundle();
		}
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "addOrRemovePeriodicSync: " + account + ", user " + userId
		+ ", provider " + providerName
		+ " -> period " + period + ", extras " + extras);
		@@ -833,7 +842,7 @@ public class SyncStorageEngine extends Handler {

		public PendingOperation insertIntoPending(PendingOperation op) {
		synchronized (mAuthorities) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "insertIntoPending: account=" + op.account
		+ " user=" + op.userId
		+ " auth=" + op.authority
		@@ -865,7 +874,7 @@ public class SyncStorageEngine extends Handler {
		public boolean deleteFromPending(PendingOperation op) {
		boolean res = false;
		synchronized (mAuthorities) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "deleteFromPending: account=" + op.account
		+ " user=" + op.userId
		+ " auth=" + op.authority
		@@ -884,7 +893,7 @@ public class SyncStorageEngine extends Handler {
		AuthorityInfo authority = getAuthorityLocked(op.account, op.userId, op.authority,
		"deleteFromPending");
		if (authority != null) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "removing - " + authority);
		if (DEBUG) Log.v(TAG, "removing - " + authority);
		final int N = mPendingOperations.size();
		boolean morePending = false;
		for (int i=0; i<N; i++) {
		@@ -898,7 +907,7 @@ public class SyncStorageEngine extends Handler {
		}

		if (!morePending) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "no more pending!");
		if (DEBUG) Log.v(TAG, "no more pending!");
		SyncStatusInfo status = getOrCreateSyncStatusLocked(authority.ident);
		status.pending = false;
		}
		@@ -938,7 +947,7 @@ public class SyncStorageEngine extends Handler {
		*/
		public void doDatabaseCleanup(Account[] accounts, int userId) {
		synchronized (mAuthorities) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) Log.w(TAG, "Updating for new accounts...");
		if (DEBUG) Log.v(TAG, "Updating for new accounts...");
		SparseArray<AuthorityInfo> removing = new SparseArray<AuthorityInfo>();
		Iterator<AccountInfo> accIt = mAccounts.values().iterator();
		while (accIt.hasNext()) {
		@@ -946,8 +955,8 @@ public class SyncStorageEngine extends Handler {
		if (!ArrayUtils.contains(accounts, acc.accountAndUser.account)
		&& acc.accountAndUser.userId == userId) {
		// This account no longer exists...
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		Log.w(TAG, "Account removed: " + acc.accountAndUser);
		if (DEBUG) {
		Log.v(TAG, "Account removed: " + acc.accountAndUser);
		}
		for (AuthorityInfo auth : acc.authorities.values()) {
		removing.put(auth.ident, auth);
		@@ -993,7 +1002,7 @@ public class SyncStorageEngine extends Handler {
		public SyncInfo addActiveSync(SyncManager.ActiveSyncContext activeSyncContext) {
		final SyncInfo syncInfo;
		synchronized (mAuthorities) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "setActiveSync: account="
		+ activeSyncContext.mSyncOperation.account
		+ " auth=" + activeSyncContext.mSyncOperation.authority
		@@ -1021,7 +1030,7 @@ public class SyncStorageEngine extends Handler {
		*/
		public void removeActiveSync(SyncInfo syncInfo, int userId) {
		synchronized (mAuthorities) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "removeActiveSync: account=" + syncInfo.account
		+ " user=" + userId
		+ " auth=" + syncInfo.authority);
		@@ -1046,7 +1055,7 @@ public class SyncStorageEngine extends Handler {
		long now, int source, boolean initialization) {
		long id;
		synchronized (mAuthorities) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "insertStartSyncEvent: account=" + accountName + "user=" + userId
		+ " auth=" + authorityName + " source=" + source);
		}
		@@ -1068,7 +1077,7 @@ public class SyncStorageEngine extends Handler {
		mSyncHistory.remove(mSyncHistory.size()-1);
		}
		id = item.historyId;
		if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "returning historyId " + id);
		if (DEBUG) Log.v(TAG, "returning historyId " + id);
		}

		reportChange(ContentResolver.SYNC_OBSERVER_TYPE_STATUS);
		@@ -1096,7 +1105,7 @@ public class SyncStorageEngine extends Handler {
		public void stopSyncEvent(long historyId, long elapsedTime, String resultMessage,
		long downstreamActivity, long upstreamActivity) {
		synchronized (mAuthorities) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "stopSyncEvent: historyId=" + historyId);
		}
		SyncHistoryItem item = null;
		@@ -1358,7 +1367,7 @@ public class SyncStorageEngine extends Handler {
		AccountInfo accountInfo = mAccounts.get(au);
		if (accountInfo == null) {
		if (tag != null) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, tag + ": unknown account " + au);
		}
		}
		@@ -1367,7 +1376,7 @@ public class SyncStorageEngine extends Handler {
		AuthorityInfo authority = accountInfo.authorities.get(authorityName);
		if (authority == null) {
		if (tag != null) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, tag + ": unknown authority " + authorityName);
		}
		}
		@@ -1392,7 +1401,7 @@ public class SyncStorageEngine extends Handler {
		mNextAuthorityId++;
		doWrite = true;
		}
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.v(TAG, "created a new AuthorityInfo for " + accountName
		+ ", user " + userId
		+ ", provider " + authorityName);

core/java/android/content/pm/RegisteredServicesCache.java

+34 −19

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ import java.util.Map;
		*/
		public abstract class RegisteredServicesCache<V> {
		private static final String TAG = "PackageManager";
		private static final boolean DEBUG = false;

		public final Context mContext;
		private final String mInterfaceName;
		@@ -195,7 +196,7 @@ public abstract class RegisteredServicesCache<V> {
		}

		private void notifyListener(final V type, final int userId, final boolean removed) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		Log.d(TAG, "notifyListener: " + type + " is " + (removed ? "removed" : "added"));
		}
		RegisteredServicesCacheListener<V> listener;
		@@ -291,7 +292,9 @@ public abstract class RegisteredServicesCache<V> {
		* given {@link UserHandle}.
		*/
		private void generateServicesMap(int userId) {
		if (DEBUG) {
		Slog.d(TAG, "generateServicesMap() for " + userId);
		}

		final PackageManager pm = mContext.getPackageManager();
		final ArrayList<ServiceInfo<V>> serviceInfos = new ArrayList<ServiceInfo<V>>();
		@@ -322,6 +325,7 @@ public abstract class RegisteredServicesCache<V> {
		}

		StringBuilder changes = new StringBuilder();
		boolean changed = false;
		for (ServiceInfo<V> info : serviceInfos) {
		// four cases:
		// - doesn't exist yet
		@@ -334,19 +338,23 @@ public abstract class RegisteredServicesCache<V> {
		// - add, notify user that it was added
		Integer previousUid = user.persistentServices.get(info.type);
		if (previousUid == null) {
		if (DEBUG) {
		changes.append(" New service added: ").append(info).append("\n");
		}
		changed = true;
		user.services.put(info.type, info);
		user.persistentServices.put(info.type, info.uid);
		if (!(mPersistentServicesFileDidNotExist && firstScan)) {
		notifyListener(info.type, userId, false /* removed */);
		}
		} else if (previousUid == info.uid) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		if (DEBUG) {
		changes.append(" Existing service (nop): ").append(info).append("\n");
		}
		user.services.put(info.type, info);
		} else if (inSystemImage(info.uid)
		\|\| !containsTypeAndUid(serviceInfos, info.type, previousUid)) {
		if (DEBUG) {
		if (inSystemImage(info.uid)) {
		changes.append(" System service replacing existing: ").append(info)
		.append("\n");
		@@ -354,15 +362,19 @@ public abstract class RegisteredServicesCache<V> {
		changes.append(" Existing service replacing a removed service: ")
		.append(info).append("\n");
		}
		}
		changed = true;
		user.services.put(info.type, info);
		user.persistentServices.put(info.type, info.uid);
		notifyListener(info.type, userId, false /* removed */);
		} else {
		// ignore
		if (DEBUG) {
		changes.append(" Existing service with new uid ignored: ").append(info)
		.append("\n");
		}
		}
		}

		ArrayList<V> toBeRemoved = Lists.newArrayList();
		for (V v1 : user.persistentServices.keySet()) {
		@@ -371,22 +383,25 @@ public abstract class RegisteredServicesCache<V> {
		}
		}
		for (V v1 : toBeRemoved) {
		user.persistentServices.remove(v1);
		if (DEBUG) {
		changes.append(" Service removed: ").append(v1).append("\n");
		}
		changed = true;
		user.persistentServices.remove(v1);
		notifyListener(v1, userId, true /* removed */);
		}
		if (DEBUG) {
		if (changes.length() > 0) {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		Log.d(TAG, "generateServicesMap(" + mInterfaceName + "): " +
		serviceInfos.size() + " services:\n" + changes);
		}
		writePersistentServicesLocked();
		} else {
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		Log.d(TAG, "generateServicesMap(" + mInterfaceName + "): " +
		serviceInfos.size() + " services unchanged");
		}
		}
		if (changed) {
		writePersistentServicesLocked();
		}
		}
		}

core/java/android/server/search/SearchManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ public class SearchManagerService extends ISearchManager.Stub {
		Searchables searchables = mSearchables.get(userId);

		if (searchables == null) {
		Log.i(TAG, "Building list of searchable activities for userId=" + userId);
		//Log.i(TAG, "Building list of searchable activities for userId=" + userId);
		searchables = new Searchables(mContext, userId);
		searchables.buildSearchableList();
		mSearchables.append(userId, searchables);