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

Commit ee39ac1c authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Stop setting net.hostname" am: 06178a39 am: 35cc49e0 

am: da70b6b2

Change-Id: I9976537d761a761e9aeca5cb15298f689032664f
parents bf214587 da70b6b2

services/core/java/com/android/server/ConnectivityService.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -720,16 +720,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        mHandler = new InternalHandler(mHandlerThread.getLooper());

        mHandler = new InternalHandler(mHandlerThread.getLooper());

        mTrackerHandler = new NetworkStateTrackerHandler(mHandlerThread.getLooper());

        mTrackerHandler = new NetworkStateTrackerHandler(mHandlerThread.getLooper());





        // setup our unique device name

        if (TextUtils.isEmpty(SystemProperties.get("net.hostname"))) {

            String id = Settings.Secure.getString(context.getContentResolver(),

                    Settings.Secure.ANDROID_ID);

            if (id != null && id.length() > 0) {

                String name = new String("android-").concat(id);

                SystemProperties.set("net.hostname", name);

            }

        }



        mReleasePendingIntentDelayMs = Settings.Secure.getInt(context.getContentResolver(),

        mReleasePendingIntentDelayMs = Settings.Secure.getInt(context.getContentResolver(),

                Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS, 5_000);

                Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS, 5_000);