From 39f47e4e7bc61e0fc0fb7a5e19a16de485c54cc3 Mon Sep 17 00:00:00 2001
From: Nate Jiang <qiangjiang@google.com>
Date: Wed, 2 Dec 2020 21:04:17 -0800
Subject: Check version before calling new API

DiscoverySession, onServiceLost is on available after Android 12. Add
version check.

Bug: 173554495
Test: atest android.net.wifi
Change-Id: I7bc77123ce817d3438982a25ae16b01a3727c8a1
---
 wifi/java/android/net/wifi/aware/WifiAwareManager.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wifi/java/android/net/wifi/aware/WifiAwareManager.java b/wifi/java/android/net/wifi/aware/WifiAwareManager.java
index e19b095b27eb..540bf2a72b34 100644
--- a/wifi/java/android/net/wifi/aware/WifiAwareManager.java
+++ b/wifi/java/android/net/wifi/aware/WifiAwareManager.java
@@ -774,9 +774,13 @@ public class WifiAwareManager {
                                     (byte[]) msg.obj);
                             break;
                         case CALLBACK_MATCH_EXPIRED:
+                            if (!SdkLevel.isAtLeastS()) {
+                                break;
+                            }
                             mOriginalCallback
                                     .onServiceLost(new PeerHandle(msg.arg1),
                                             WIFI_AWARE_DISCOVERY_LOST_REASON_PEER_NOT_VISIBLE);
+                            break;
                     }
                 }
             };
-- 
cgit v1.2.3-59-g8ed1b