Merge "API review fixes" into jb-dev (9669a0ce) · Commits · e / os / android_frameworks_base

api/current.txt

+38 −50

Original line number	Diff line number	Diff line
		@@ -12708,21 +12708,6 @@ package android.net.http {

		package android.net.nsd {

		public class DnsSdServiceInfo implements android.os.Parcelable {
		ctor public DnsSdServiceInfo();
		method public int describeContents();
		method public java.net.InetAddress getHost();
		method public int getPort();
		method public java.lang.String getServiceName();
		method public java.lang.String getServiceType();
		method public void setHost(java.net.InetAddress);
		method public void setPort(int);
		method public void setServiceName(java.lang.String);
		method public void setServiceType(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public class DnsSdTxtRecord implements android.os.Parcelable {
		ctor public DnsSdTxtRecord();
		ctor public DnsSdTxtRecord(byte[]);
		@@ -12739,53 +12724,56 @@ package android.net.nsd {
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public class NsdManager {
		method public void deinitialize(android.net.nsd.NsdManager.Channel);
		method public void discoverServices(android.net.nsd.NsdManager.Channel, java.lang.String, android.net.nsd.NsdManager.DnsSdDiscoveryListener);
		method public void initialize(android.content.Context, android.os.Looper, android.net.nsd.NsdManager.ChannelListener);
		method public void registerService(android.net.nsd.NsdManager.Channel, java.lang.String, java.lang.String, int, android.net.nsd.NsdManager.DnsSdRegisterListener);
		method public void resolveService(android.net.nsd.NsdManager.Channel, java.lang.String, java.lang.String, android.net.nsd.NsdManager.DnsSdResolveListener);
		method public void stopServiceDiscovery(android.net.nsd.NsdManager.Channel, android.net.nsd.NsdManager.ActionListener);
		method public void unregisterService(android.net.nsd.NsdManager.Channel, int, android.net.nsd.NsdManager.ActionListener);
		public final class NsdManager {
		method public void discoverServices(java.lang.String, int, android.net.nsd.NsdManager.DiscoveryListener);
		method public void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener);
		method public void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener);
		method public void stopServiceDiscovery(android.net.nsd.NsdManager.DiscoveryListener);
		method public void unregisterService(android.net.nsd.NsdManager.RegistrationListener);
		field public static final java.lang.String ACTION_NSD_STATE_CHANGED = "android.net.nsd.STATE_CHANGED";
		field public static final int ALREADY_ACTIVE = 3; // 0x3
		field public static final int BUSY = 2; // 0x2
		field public static final int ERROR = 0; // 0x0
		field public static final java.lang.String EXTRA_NSD_STATE = "nsd_state";
		field public static final int MAX_REGS_REACHED = 4; // 0x4
		field public static final int FAILURE_ALREADY_ACTIVE = 3; // 0x3
		field public static final int FAILURE_INTERNAL_ERROR = 0; // 0x0
		field public static final int FAILURE_MAX_LIMIT = 4; // 0x4
		field public static final int NSD_STATE_DISABLED = 1; // 0x1
		field public static final int NSD_STATE_ENABLED = 2; // 0x2
		field public static final int UNSUPPORTED = 1; // 0x1
		}

		public static abstract interface NsdManager.ActionListener {
		method public abstract void onFailure(int);
		method public abstract void onSuccess();
		field public static final int PROTOCOL_DNS_SD = 1; // 0x1
		}

		public static class NsdManager.Channel {
		public static abstract interface NsdManager.DiscoveryListener {
		method public abstract void onDiscoveryStarted(java.lang.String);
		method public abstract void onDiscoveryStopped(java.lang.String);
		method public abstract void onServiceFound(android.net.nsd.NsdServiceInfo);
		method public abstract void onServiceLost(android.net.nsd.NsdServiceInfo);
		method public abstract void onStartDiscoveryFailed(java.lang.String, int);
		method public abstract void onStopDiscoveryFailed(java.lang.String, int);
		}

		public static abstract interface NsdManager.ChannelListener {
		method public abstract void onChannelConnected(android.net.nsd.NsdManager.Channel);
		method public abstract void onChannelDisconnected();
		public static abstract interface NsdManager.RegistrationListener {
		method public abstract void onRegistrationFailed(android.net.nsd.NsdServiceInfo, int);
		method public abstract void onServiceRegistered(android.net.nsd.NsdServiceInfo);
		method public abstract void onServiceUnregistered(android.net.nsd.NsdServiceInfo);
		method public abstract void onUnregistrationFailed(android.net.nsd.NsdServiceInfo, int);
		}

		public static abstract interface NsdManager.DnsSdDiscoveryListener {
		method public abstract void onFailure(int);
		method public abstract void onServiceFound(android.net.nsd.DnsSdServiceInfo);
		method public abstract void onServiceLost(android.net.nsd.DnsSdServiceInfo);
		method public abstract void onStarted(java.lang.String);
		public static abstract interface NsdManager.ResolveListener {
		method public abstract void onResolveFailed(android.net.nsd.NsdServiceInfo, int);
		method public abstract void onServiceResolved(android.net.nsd.NsdServiceInfo);
		}

		public static abstract interface NsdManager.DnsSdRegisterListener {
		method public abstract void onFailure(int);
		method public abstract void onServiceRegistered(int, android.net.nsd.DnsSdServiceInfo);
		}

		public static abstract interface NsdManager.DnsSdResolveListener {
		method public abstract void onFailure(int);
		method public abstract void onServiceResolved(android.net.nsd.DnsSdServiceInfo);
		public final class NsdServiceInfo implements android.os.Parcelable {
		ctor public NsdServiceInfo();
		method public int describeContents();
		method public java.net.InetAddress getHost();
		method public int getPort();
		method public java.lang.String getServiceName();
		method public java.lang.String getServiceType();
		method public void setHost(java.net.InetAddress);
		method public void setPort(int);
		method public void setServiceName(java.lang.String);
		method public void setServiceType(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		}

core/java/android/app/ContextImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -387,7 +387,7 @@ class ContextImpl extends Context {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(NSD_SERVICE);
		INsdManager service = INsdManager.Stub.asInterface(b);
		return new NsdManager(service);
		return new NsdManager(ctx.getOuterContext(), service);
		}});

		// Note: this was previously cached in a static variable, but

core/java/android/net/nsd/NetworkServiceInfo.java

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net.nsd;

		/**
		* Interface for a network service.
		*
		* {@hide}
		*/
		public interface NetworkServiceInfo {

		String getServiceName();
		void setServiceName(String s);

		String getServiceType();
		void setServiceType(String s);

		}

core/java/android/net/nsd/NsdManager.java

+308 −369

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/net/nsd/DnsSdServiceInfo.java→core/java/android/net/nsd/NsdServiceInfo.java

+9 −13

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import java.net.InetAddress;
		* A class representing service information for network service discovery
		* {@see NsdManager}
		*/
		public class DnsSdServiceInfo implements NetworkServiceInfo, Parcelable {
		public final class NsdServiceInfo implements Parcelable {

		private String mServiceName;

		@@ -37,36 +37,32 @@ public class DnsSdServiceInfo implements NetworkServiceInfo, Parcelable {

		private int mPort;

		public DnsSdServiceInfo() {
		public NsdServiceInfo() {
		}

		/** @hide */
		public DnsSdServiceInfo(String sn, String rt, DnsSdTxtRecord tr) {
		public NsdServiceInfo(String sn, String rt, DnsSdTxtRecord tr) {
		mServiceName = sn;
		mServiceType = rt;
		mTxtRecord = tr;
		}

		/** Get the service name */
		@Override
		public String getServiceName() {
		return mServiceName;
		}

		/** Set the service name */
		@Override
		public void setServiceName(String s) {
		mServiceName = s;
		}

		/** Get the service type */
		@Override
		public String getServiceType() {
		return mServiceType;
		}

		/** Set the service type */
		@Override
		public void setServiceType(String s) {
		mServiceType = s;
		}
		@@ -132,10 +128,10 @@ public class DnsSdServiceInfo implements NetworkServiceInfo, Parcelable {
		}

		/** Implement the Parcelable interface */
		public static final Creator<DnsSdServiceInfo> CREATOR =
		new Creator<DnsSdServiceInfo>() {
		public DnsSdServiceInfo createFromParcel(Parcel in) {
		DnsSdServiceInfo info = new DnsSdServiceInfo();
		public static final Creator<NsdServiceInfo> CREATOR =
		new Creator<NsdServiceInfo>() {
		public NsdServiceInfo createFromParcel(Parcel in) {
		NsdServiceInfo info = new NsdServiceInfo();
		info.mServiceName = in.readString();
		info.mServiceType = in.readString();
		info.mTxtRecord = in.readParcelable(null);
		@@ -150,8 +146,8 @@ public class DnsSdServiceInfo implements NetworkServiceInfo, Parcelable {
		return info;
		}

		public DnsSdServiceInfo[] newArray(int size) {
		return new DnsSdServiceInfo[size];
		public NsdServiceInfo[] newArray(int size) {
		return new NsdServiceInfo[size];
		}
		};
		}