Commit 100df0a6 authored May 15, 2018 by Chalard Jean

Fix: ConnectivityManager is initialized with a wrong context

ActivityThread#setHttpProxy uses a system context to get
a ConnectivityManager instance. If it's not already cached, the
system service registry will cache this instance initialized
with the system context, and subsequent calls to get this service
will return the bad instance.
This patch uses the application context instead, unless it's
not available for some unlikely reason.

A possible symptom of this issue is to have Bluetooth tethering
failing with a security exception, because it's requested by
the "android" package without system uid.

Bug: 73572062
Test: manual
Change-Id: I745707e4ffe564f6d201ec259fa6b5ee32fbeda6

parent 47a8ecce

core/java/android/app/ActivityThread.java

+2 −1

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

		public void setHttpProxy(String host, String port, String exclList, Uri pacFileUrl) {
		final ConnectivityManager cm = ConnectivityManager.from(getSystemContext());
		final ConnectivityManager cm = ConnectivityManager.from(
		getApplication() != null ? getApplication() : getSystemContext());
		final Network network = cm.getBoundNetworkForProcess();
		if (network != null) {
		Proxy.setHttpProxySystemProperty(cm.getDefaultProxy());