Merge "Don't call ConnectivityService when holding ActivityManagerService lock." into qt-dev (6dcb8220) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1073,9 +1073,8 @@ public final class ActivityThread extends ClientTransactionHandler {
	}		}

	public void updateHttpProxy() {		public void updateHttpProxy() {
	final ConnectivityManager cm = ConnectivityManager.from(		ActivityThread.updateHttpProxy(
	getApplication() != null ? getApplication() : getSystemContext());		getApplication() != null ? getApplication() : getSystemContext());
	Proxy.setHttpProxySystemProperty(cm.getDefaultProxy());
	}		}

	public void processInBackground() {		public void processInBackground() {
	@@ -6948,6 +6947,11 @@ public final class ActivityThread extends ClientTransactionHandler {
	return thread;		return thread;
	}		}

			public static void updateHttpProxy(@NonNull Context context) {
			final ConnectivityManager cm = ConnectivityManager.from(context);
			Proxy.setHttpProxySystemProperty(cm.getDefaultProxy());
			}

	@UnsupportedAppUsage		@UnsupportedAppUsage
	public final void installSystemProviders(List<ProviderInfo> providers) {		public final void installSystemProviders(List<ProviderInfo> providers) {
	if (providers != null) {		if (providers != null) {

services/core/java/com/android/server/am/ActivityManagerService.java

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1635,9 +1635,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	}		}
	} break;		} break;
	case UPDATE_HTTP_PROXY_MSG: {		case UPDATE_HTTP_PROXY_MSG: {
	synchronized (ActivityManagerService.this) {		mProcessList.setAllHttpProxy();
	mProcessList.setAllHttpProxyLocked();
	}
	} break;		} break;
	case PROC_START_TIMEOUT_MSG: {		case PROC_START_TIMEOUT_MSG: {
	ProcessRecord app = (ProcessRecord)msg.obj;		ProcessRecord app = (ProcessRecord)msg.obj;
	@@ -1826,7 +1824,7 @@ public class ActivityManagerService extends IActivityManager.Stub
	} break;		} break;
	}		}
	}		}
	};		}

	static final int COLLECT_PSS_BG_MSG = 1;		static final int COLLECT_PSS_BG_MSG = 1;

services/core/java/com/android/server/am/ProcessList.java

+17 −12

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,7 @@ import static com.android.server.am.ActivityManagerService.TAG_PSS;
	import static com.android.server.am.ActivityManagerService.TAG_UID_OBSERVERS;		import static com.android.server.am.ActivityManagerService.TAG_UID_OBSERVERS;

	import android.app.ActivityManager;		import android.app.ActivityManager;
			import android.app.ActivityThread;
	import android.app.AppGlobals;		import android.app.AppGlobals;
	import android.app.AppProtoEnums;		import android.app.AppProtoEnums;
	import android.app.IApplicationThread;		import android.app.IApplicationThread;
	@@ -2486,21 +2487,25 @@ public final class ProcessList {
	}		}
	}		}

	@GuardedBy("mService")		void setAllHttpProxy() {
	void setAllHttpProxyLocked() {		// Update the HTTP proxy for each application thread.
			synchronized (mService) {
	for (int i = mLruProcesses.size() - 1 ; i >= 0 ; i--) {		for (int i = mLruProcesses.size() - 1 ; i >= 0 ; i--) {
	ProcessRecord r = mLruProcesses.get(i);		ProcessRecord r = mLruProcesses.get(i);
	// Don't dispatch to isolated processes as they can't access		// Don't dispatch to isolated processes as they can't access ConnectivityManager and
	// ConnectivityManager and don't have network privileges anyway.		// don't have network privileges anyway. Exclude system server and update it
	if (r.thread != null && !r.isolated) {		// separately outside the AMS lock, to avoid deadlock with Connectivity Service.
			if (r.pid != ActivityManagerService.MY_PID && r.thread != null && !r.isolated) {
	try {		try {
	r.thread.updateHttpProxy();		r.thread.updateHttpProxy();
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	Slog.w(TAG, "Failed to update http proxy for: " +		Slog.w(TAG, "Failed to update http proxy for: "
	r.info.processName);		+ r.info.processName);
			}
	}		}
	}		}
	}		}
			ActivityThread.updateHttpProxy(mService.mContext);
	}		}

	@GuardedBy("mService")		@GuardedBy("mService")