Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd489c4c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Don't crash if there is no connectivity service." into ics-mr1

parents 1bef480b d4d32c59
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
@@ -3832,11 +3832,16 @@ public final class ActivityThread {
         * Initialize the default http proxy in this process for the reasons we set the time zone.
         */
        IBinder b = ServiceManager.getService(Context.CONNECTIVITY_SERVICE);
        if (b != null) {
            // In pre-boot mode (doing initial launch to collect password), not
            // all system is up.  This includes the connectivity service, so don't
            // crash if we can't get it.
            IConnectivityManager service = IConnectivityManager.Stub.asInterface(b);
            try {
                ProxyProperties proxyProperties = service.getProxy();
                Proxy.setHttpProxySystemProperty(proxyProperties);
            } catch (RemoteException e) {}
        }

        if (data.instrumentationName != null) {
            ContextImpl appContext = new ContextImpl();