Merge "Check version before calling new API"

2020-12-03 19:42:15 +00:00
parent c56b112f44 39f47e4e7b
commit 2b1787f2f5
1 changed files with 4 additions and 0 deletions
--- 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;
                    }
                }
            };