commit 06178a39f880a12f881bf1c4144b9e54601dfd4a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 14 07:51:00 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 14 07:51:00 2016 +0000
tree cf3e4235979ad36bcf2159397e839d038588c794
parent eef38717b9db3821024277a8c996535cac80042f
parent fc1b6a3f2abbcea391001165df2357c9b7397bbf

Merge "Stop setting net.hostname"

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

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 8108c4c..41eaa6a 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -720,16 +720,6 @@
         mHandler = new InternalHandler(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(),
                 Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS, 5_000);