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

Commit c22ab7b3 authored Mar 09, 2020 by Automerger Merge Worker Committed by Mark Chien Mar 09, 2020

Send offload status changed callback

The callback would be fired when offload started, stopped, or failed.
If offload is not supported, "failed" callback would be fired when user
enable tethering. Enabling multiple tethering would not have multiple
offload status callbacks because offload should already be started or
failed.

Bug: 130596697
Test: -build, flash, boot
      -atest TetheringTests
      -ON/OFF hotspotf

Change-Id: Ifb16dcedc8081833fa95a39596fe5cdc309ededd
Merged-In: Ifb16dcedc8081833fa95a39596fe5cdc309ededd
Merged-In: Ia0398601144b0e5f61dc0c5771eacf13e7cfbb59
(cherry picked from commit cd266076)

parent 6f22413c

api/module-lib-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,9 @@ package android.net {
		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_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 {
		@@ -102,6 +105,7 @@ package android.net {
		ctor public TetheringManager.TetheringEventCallback();
		method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
		method public void onError(@NonNull String, int);
		method public void onOffloadStatusChanged(int);
		method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
		method public void onTetherableInterfacesChanged(@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	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_UNSUPPORTED = 3; // 0x3
		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 {
		@@ -6610,6 +6613,7 @@ package android.net {
		ctor public TetheringManager.TetheringEventCallback();
		method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
		method public void onError(@NonNull String, int);
		method public void onOffloadStatusChanged(int);
		method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
		method public void onTetherableInterfacesChanged(@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	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_UNSUPPORTED = 3; // 0x3
		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 {
		@@ -1925,6 +1928,7 @@ package android.net {
		ctor public TetheringManager.TetheringEventCallback();
		method public void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);
		method public void onError(@NonNull String, int);
		method public void onOffloadStatusChanged(int);
		method @Deprecated public void onTetherableInterfaceRegexpsChanged(@NonNull android.net.TetheringManager.TetheringInterfaceRegexps);
		method public void onTetherableInterfacesChanged(@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	Diff line number	Diff line
		@@ -35,4 +35,5 @@ oneway interface ITetheringEventCallback
		void onConfigurationChanged(in TetheringConfigurationParcel config);
		void onTetherStatesChanged(in TetherStatesParcel states);
		void onTetherClientsChanged(in List<TetheredClient> clients);
		void onOffloadStatusChanged(int status);
		}

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

+2 −1

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