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

Commit 51812b98 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[RTT] Fix legacy API crash on invalid RTT results"

parents f75edefb fe18b1c6

wifi/java/android/net/wifi/RttManager.java

+11 −5
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ import android.net.wifi.rtt.WifiRttManager; 
import android.os.Handler;

import android.os.Handler;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.os.SystemClock;

import android.util.Log;

import android.util.Log;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;
@@ -986,11 +987,16 @@ public class RttManager { 
                        legacyResults[i] = new RttResult();

                        legacyResults[i] = new RttResult();

                        legacyResults[i].status = result.getStatus();

                        legacyResults[i].status = result.getStatus();

                        legacyResults[i].bssid = result.getMacAddress().toString();

                        legacyResults[i].bssid = result.getMacAddress().toString();

                        if (result.getStatus() == RangingResult.STATUS_SUCCESS) {

                            legacyResults[i].distance = result.getDistanceMm() / 10;

                            legacyResults[i].distance = result.getDistanceMm() / 10;

                            legacyResults[i].distanceStandardDeviation =

                            legacyResults[i].distanceStandardDeviation =

                                    result.getDistanceStdDevMm() / 10;

                                    result.getDistanceStdDevMm() / 10;

                            legacyResults[i].rssi = result.getRssi();

                            legacyResults[i].rssi = result.getRssi();

                            legacyResults[i].ts = result.getRangingTimestampUs();

                            legacyResults[i].ts = result.getRangingTimestampUs();

                        } else {

                            // just in case legacy API needed some relatively real timestamp

                            legacyResults[i].ts = SystemClock.elapsedRealtime() * 1000;

                        }

                    }

                    }

                    listener.onSuccess(legacyResults);

                    listener.onSuccess(legacyResults);

                }

                }