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

Commit a47f6840 authored by Randy Pan's avatar Randy Pan
Browse files

resolve merge conflicts of 8c79fe5d to master. 

Change-Id: Id331e763f64ecbf8ed23764a487e32b94c4d3c09
parents bd0d9373 8c79fe5d

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -25759,7 +25759,6 @@ package android.net.wifi { 
    method public void writeToParcel(android.os.Parcel, int);

    field public int band;

    field public android.net.wifi.WifiScanner.ChannelSpec[] channels;

    field public int exponent;

    field public int maxPeriodInMs;

    field public int maxScansToCache;

    field public int numBssidsPerScan;

wifi/java/android/net/wifi/WifiScanner.java

+5 −11
Original line number Diff line number Diff line
@@ -170,18 +170,14 @@ public class WifiScanner { 
        public int maxScansToCache;

        /**

         * if maxPeriodInMs is non zero or different than period, then this bucket is

         * an exponential backoff bucket and the scan period will grow exponentially

         * as per formula: actual_period(N) = period ^ (N/(step_count+1))

         * to a maximum period of max_period.

         * a truncated binary exponential backoff bucket and the scan period will grow

         * exponentially as per formula: actual_period(N) = period * (2 ^ (N/stepCount))

         * to maxPeriodInMs

         */

        public int maxPeriodInMs;

        /**

         * for exponential back off bucket: multiplier: new_period=old_period*exponent

         */

        public int exponent;

        /**

         * for exponential back off bucket, number of scans performed at a given

         * period and until the exponent is applied

         * for truncated binary exponential back off bucket, number of scans to perform

         * for a given period

         */

        public int stepCount;
@@ -198,7 +194,6 @@ public class WifiScanner { 
            dest.writeInt(numBssidsPerScan);

            dest.writeInt(maxScansToCache);

            dest.writeInt(maxPeriodInMs);

            dest.writeInt(exponent);

            dest.writeInt(stepCount);



            if (channels != null) {
@@ -226,7 +221,6 @@ public class WifiScanner { 
                        settings.numBssidsPerScan = in.readInt();

                        settings.maxScansToCache = in.readInt();

                        settings.maxPeriodInMs = in.readInt();

                        settings.exponent = in.readInt();

                        settings.stepCount = in.readInt();

                        int num_channels = in.readInt();

                        settings.channels = new ChannelSpec[num_channels];