summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2010-01-15 10:20:18 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-15 10:20:18 -0800
commit0894498712de1f15b6491fa5fe111b2da7fb7038 (patch)
tree380c74d989140d60d3395a06869c04d90ab88a10 /services/java/com
parentc5dfa70410121c63079ecd7e4945d774562c8998 (diff)
parentde8383ca312c03fa8e935ac1549ae31ce668652c (diff)
downloadframeworks_base-0894498712de1f15b6491fa5fe111b2da7fb7038.zip
frameworks_base-0894498712de1f15b6491fa5fe111b2da7fb7038.tar.gz
frameworks_base-0894498712de1f15b6491fa5fe111b2da7fb7038.tar.bz2
Merge "Set net.hostname sys property to our unique ID."
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/ConnectivityService.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 80129d0..6fa468a 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -180,6 +180,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private ConnectivityService(Context context) {
if (DBG) Log.v(TAG, "ConnectivityService starting up");
+
+ // 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);
+ }
+
mContext = context;
mNetTrackers = new NetworkStateTracker[
ConnectivityManager.MAX_NETWORK_TYPE+1];