diff options
| author | Etan Cohen <etancohen@google.com> | 2016-12-24 12:46:35 -0800 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-01-06 15:26:44 -0800 |
| commit | cecebde8ef6445860c111f252c9dbb02e15e42d7 (patch) | |
| tree | a7a490f7f6df20d54db2efed8c0c94e076fc991d /service | |
| parent | 66c17d08de5b28134f172317c87132d1818f30f0 (diff) | |
[AWARE] Remove reason from discovery session terminate callback
Only valid reason is per request (destroy or timeout/count).
Bug: 32670068
Test: unit tests & integration tests (sl4a) passing
Change-Id: I2d773beffe590456a302b682f2861007315d1619
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/aware/WifiAwareNative.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareNative.java b/service/java/com/android/server/wifi/aware/WifiAwareNative.java index cdab1a118..90663d1f2 100644 --- a/service/java/com/android/server/wifi/aware/WifiAwareNative.java +++ b/service/java/com/android/server/wifi/aware/WifiAwareNative.java @@ -18,7 +18,6 @@ package com.android.server.wifi.aware; import android.net.wifi.aware.Characteristics; import android.net.wifi.aware.ConfigRequest; -import android.net.wifi.aware.DiscoverySessionCallback; import android.net.wifi.aware.PublishConfig; import android.net.wifi.aware.SubscribeConfig; import android.os.Bundle; @@ -821,10 +820,7 @@ public class WifiAwareNative { private static void onPublishTerminated(int publishId, int status) { if (VDBG) Log.v(TAG, "onPublishTerminated: publishId=" + publishId + ", status=" + status); - sWifiAwareStateManager.onSessionTerminatedNotification(publishId, - status == AWARE_STATUS_SUCCESS - ? DiscoverySessionCallback.TERMINATE_REASON_DONE - : DiscoverySessionCallback.TERMINATE_REASON_FAIL, true); + sWifiAwareStateManager.onSessionTerminatedNotification(publishId, status, true); } // callback from native @@ -833,10 +829,7 @@ public class WifiAwareNative { Log.v(TAG, "onSubscribeTerminated: subscribeId=" + subscribeId + ", status=" + status); } - sWifiAwareStateManager.onSessionTerminatedNotification(subscribeId, - status == AWARE_STATUS_SUCCESS - ? DiscoverySessionCallback.TERMINATE_REASON_DONE - : DiscoverySessionCallback.TERMINATE_REASON_FAIL, false); + sWifiAwareStateManager.onSessionTerminatedNotification(subscribeId, status, false); } // callback from native |