joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't clobber the net hostname if it's already set.

Browse source 
Be a good citizen.

Change-Id: Ic58aeab013e2ff34201be71e01e399390edbbb5f
This commit is contained in:
Robert Greenwalt 2010-12-06 09:30:17 -08:00
commit 82cde1324d
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
services/java/com/android/server/ConnectivityService.java
View file

@ -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