Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29701aa1 authored Mar 09, 2020 by Automerger Merge Worker

Merge "Send offload status changed callback" into rvc-dev am: 0bba033e

Change-Id: I45074db76950500b924e82c53b1e5c13e628c84b

parents affd2660 0bba033e

api/module-lib-current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -87,6 +87,9 @@ package android.net {
	field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1		field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1
	field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3		field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3
	field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7		field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7
			field public static final int TETHER_HARDWARE_OFFLOAD_FAILED = 2; // 0x2
			field public static final int TETHER_HARDWARE_OFFLOAD_STARTED = 1; // 0x1
			field public static final int TETHER_HARDWARE_OFFLOAD_STOPPED = 0; // 0x0
	}		}

	public static interface TetheringManager.OnTetheringEntitlementResultListener {		public static interface TetheringManager.OnTetheringEntitlementResultListener {
	@@ -103,6 +106,7 @@ package android.net {
	ctor public TetheringManager.TetheringEventCallback();		ctor public TetheringManager.TetheringEventCallback();
	method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);		method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
	method public void onError(@NonNull String, int);		method public void onError(@NonNull String, int);
			method public void onOffloadStatusChanged(int);
	method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);		method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
	method public void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);		method public void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);
	method public void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);		method public void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);

api/system-current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6594,6 +6594,9 @@ package android.net {
	field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1		field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1
	field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3		field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3
	field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7		field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7
			field public static final int TETHER_HARDWARE_OFFLOAD_FAILED = 2; // 0x2
			field public static final int TETHER_HARDWARE_OFFLOAD_STARTED = 1; // 0x1
			field public static final int TETHER_HARDWARE_OFFLOAD_STOPPED = 0; // 0x0
	}		}

	public static interface TetheringManager.OnTetheringEntitlementResultListener {		public static interface TetheringManager.OnTetheringEntitlementResultListener {
	@@ -6610,6 +6613,7 @@ package android.net {
	ctor public TetheringManager.TetheringEventCallback();		ctor public TetheringManager.TetheringEventCallback();
	method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);		method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
	method public void onError(@NonNull String, int);		method public void onError(@NonNull String, int);
			method public void onOffloadStatusChanged(int);
	method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);		method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
	method public void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);		method public void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);
	method public void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);		method public void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);

api/test-current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1909,6 +1909,9 @@ package android.net {
	field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1		field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1
	field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3		field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3
	field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7		field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7
			field public static final int TETHER_HARDWARE_OFFLOAD_FAILED = 2; // 0x2
			field public static final int TETHER_HARDWARE_OFFLOAD_STARTED = 1; // 0x1
			field public static final int TETHER_HARDWARE_OFFLOAD_STOPPED = 0; // 0x0
	}		}

	public static interface TetheringManager.OnTetheringEntitlementResultListener {		public static interface TetheringManager.OnTetheringEntitlementResultListener {
	@@ -1925,6 +1928,7 @@ package android.net {
	ctor public TetheringManager.TetheringEventCallback();		ctor public TetheringManager.TetheringEventCallback();
	method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);		method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
	method public void onError(@NonNull String, int);		method public void onError(@NonNull String, int);
			method public void onOffloadStatusChanged(int);
	method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);		method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
	method public void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);		method public void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);
	method public void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);		method public void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);

packages/Tethering/common/TetheringLib/src/android/net/ITetheringEventCallback.aidl

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,4 +35,5 @@ oneway interface ITetheringEventCallback
	void onConfigurationChanged(in TetheringConfigurationParcel config);		void onConfigurationChanged(in TetheringConfigurationParcel config);
	void onTetherStatesChanged(in TetherStatesParcel states);		void onTetherStatesChanged(in TetherStatesParcel states);
	void onTetherClientsChanged(in List<TetheredClient> clients);		void onTetherClientsChanged(in List<TetheredClient> clients);
			void onOffloadStatusChanged(int status);
	}		}

packages/Tethering/common/TetheringLib/src/android/net/TetheringCallbackStartedParcel.aidl

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,4 +31,5 @@ parcelable TetheringCallbackStartedParcel {
	TetheringConfigurationParcel config;		TetheringConfigurationParcel config;
	TetherStatesParcel states;		TetherStatesParcel states;
	List<TetheredClient> tetheredClients;		List<TetheredClient> tetheredClients;
			int offloadStatus;
	}		}