From 733c62909c1cca72be50094acb15dc1014b956ce Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Mon, 6 Dec 2010 09:30:17 -0800 Subject: Don't clobber the net hostname if it's already set. Be a good citizen. Change-Id: Ic58aeab013e2ff34201be71e01e399390edbbb5f --- services/java/com/android/server/ConnectivityService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'services') diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 7e76ea5..43c857a 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -264,11 +264,13 @@ public class ConnectivityService extends IConnectivityManager.Stub { mHandler = new MyHandler(handlerThread.getLooper()); // setup our unique device name - 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); + 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); + } } // read our default dns server ip -- cgit v1.1