Merge "Stop setting net.hostname"
am: 5603f5aabc
Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62
This commit is contained in:
@@ -720,16 +720,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
||||
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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user