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

Commit 6b6a2d0d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4429796 from db3c6b74 to pi-release 

Change-Id: Ie424095de9968dff45b480cfcc74238fb85e73e1
parents 8be15873 db3c6b74

current.txt

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ fe3c3c2f572b72f15f8594c538b0577bd5c28722c31879cfe6231330cddb6747 android.hardwar 
150a338ce11fcec70757c9675d83cf6a5d7b40d0c812741b91671fecce59eac9 android.hardware.broadcastradio@1.0::types

dc7e6d4f537b9943e27edc4f86c5a03bb643b18f18f866f8c3c71c0ac4ea8cbc android.hardware.broadcastradio@1.0::types

760485232f6cce07f8bb05e3475509956996b702f77415ee5bff05e2ec5a5bcc android.hardware.dumpstate@1.0::IDumpstateDevice

78589343d8ee2e1b155acad3fbdc7fcbb6af94491aee968b2383c21627264f8b android.hardware.radio@1.0::IRadioResponse # Available in Android O, b/68061860

e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardware.radio@1.0::IRadioResponse

6e69adb24d7c0b0ca3a54a38c49a5625b161b3f5d5f7d6fda0befdbbfc8e9e06 android.hardware.radio@1.0::IRadioResponse

28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types

gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp

+20 −13
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase { 
          EXPECT_EQ(location_called_count_, 1);

      }

      if (location_called_count_ > 0) {

          CheckLocation(last_location_, checkAccuracies);

          // don't require speed on first fix

          CheckLocation(last_location_, checkAccuracies, false);

          return true;

      }

      return false;
@@ -178,26 +179,31 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase { 
   * CheckLocation:

   *   Helper function to vet Location fields

   */

  void CheckLocation(GnssLocation& location, bool checkAccuracies) {

  void CheckLocation(GnssLocation& location, bool checkAccuracies, bool checkSpeed) {

      EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_LAT_LONG);

      EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_ALTITUDE);

      if (checkSpeed) {

          EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_SPEED);

      }

      EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_HORIZONTAL_ACCURACY);

      // New uncertainties available in O must be provided,

      // at least when paired with modern hardware (2017+)

      if (checkAccuracies) {

          EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_VERTICAL_ACCURACY);

          if (checkSpeed) {

              EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_SPEED_ACCURACY);

              if (location.gnssLocationFlags & GnssLocationFlags::HAS_BEARING) {

                  EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_BEARING_ACCURACY);

              }

          }

      }

      EXPECT_GE(location.latitudeDegrees, -90.0);

      EXPECT_LE(location.latitudeDegrees, 90.0);

      EXPECT_GE(location.longitudeDegrees, -180.0);

      EXPECT_LE(location.longitudeDegrees, 180.0);

      EXPECT_GE(location.altitudeMeters, -1000.0);

      EXPECT_LE(location.altitudeMeters, 30000.0);

      if (checkSpeed) {

          EXPECT_GE(location.speedMetersPerSec, 0.0);

          EXPECT_LE(location.speedMetersPerSec, 5.0);  // VTS tests are stationary.
@@ -205,6 +211,7 @@ class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase { 
          if (location.speedMetersPerSec > 0.0) {

              EXPECT_TRUE(location.gnssLocationFlags & GnssLocationFlags::HAS_BEARING);

          }

      }



      /*

       * Tolerating some especially high values for accuracy estimate, in case of
@@ -356,7 +363,7 @@ TEST_F(GnssHalTest, GetLocation) { 
    for (int i = 1; i < LOCATIONS_TO_CHECK; i++) {

        EXPECT_EQ(std::cv_status::no_timeout, wait(LOCATION_TIMEOUT_SUBSEQUENT_SEC));

        EXPECT_EQ(location_called_count_, i + 1);

        CheckLocation(last_location_, checkMoreAccuracies);

        CheckLocation(last_location_, checkMoreAccuracies, true);

    }

  }

radio/1.2/Android.bp

+31 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ filegroup { 
    srcs: [

        "types.hal",

        "IRadio.hal",

        "IRadioIndication.hal",

        "IRadioResponse.hal",

        "ISap.hal",

    ],

}
@@ -19,6 +21,8 @@ genrule { 
    out: [

        "android/hardware/radio/1.2/types.cpp",

        "android/hardware/radio/1.2/RadioAll.cpp",

        "android/hardware/radio/1.2/RadioIndicationAll.cpp",

        "android/hardware/radio/1.2/RadioResponseAll.cpp",

        "android/hardware/radio/1.2/SapAll.cpp",

    ],

}
@@ -38,6 +42,16 @@ genrule { 
        "android/hardware/radio/1.2/BnHwRadio.h",

        "android/hardware/radio/1.2/BpHwRadio.h",

        "android/hardware/radio/1.2/BsRadio.h",

        "android/hardware/radio/1.2/IRadioIndication.h",

        "android/hardware/radio/1.2/IHwRadioIndication.h",

        "android/hardware/radio/1.2/BnHwRadioIndication.h",

        "android/hardware/radio/1.2/BpHwRadioIndication.h",

        "android/hardware/radio/1.2/BsRadioIndication.h",

        "android/hardware/radio/1.2/IRadioResponse.h",

        "android/hardware/radio/1.2/IHwRadioResponse.h",

        "android/hardware/radio/1.2/BnHwRadioResponse.h",

        "android/hardware/radio/1.2/BpHwRadioResponse.h",

        "android/hardware/radio/1.2/BsRadioResponse.h",

        "android/hardware/radio/1.2/ISap.h",

        "android/hardware/radio/1.2/IHwSap.h",

        "android/hardware/radio/1.2/BnHwSap.h",
@@ -84,12 +98,25 @@ genrule { 
        ":android.hardware.radio@1.2_hal",

    ],

    out: [

        "android/hardware/radio/V1_2/CellIdentityCdma.java",

        "android/hardware/radio/V1_2/CellIdentityGsm.java",

        "android/hardware/radio/V1_2/CellIdentityLte.java",

        "android/hardware/radio/V1_2/CellIdentityOperatorNames.java",

        "android/hardware/radio/V1_2/CellIdentityWcdma.java",

        "android/hardware/radio/V1_2/CellInfo.java",

        "android/hardware/radio/V1_2/CellInfoCdma.java",

        "android/hardware/radio/V1_2/CellInfoGsm.java",

        "android/hardware/radio/V1_2/CellInfoLte.java",

        "android/hardware/radio/V1_2/CellInfoWcdma.java",

        "android/hardware/radio/V1_2/IncrementalResultsPeriodicityRange.java",

        "android/hardware/radio/V1_2/MaxSearchTimeRange.java",

        "android/hardware/radio/V1_2/NetworkScanRequest.java",

        "android/hardware/radio/V1_2/NetworkScanResult.java",

        "android/hardware/radio/V1_2/RadioConst.java",

        "android/hardware/radio/V1_2/ScanIntervalRange.java",

        "android/hardware/radio/V1_2/IRadio.java",

        "android/hardware/radio/V1_2/IRadioIndication.java",

        "android/hardware/radio/V1_2/IRadioResponse.java",

        "android/hardware/radio/V1_2/ISap.java",

    ],

}
@@ -119,6 +146,8 @@ genrule { 
    ],

    out: [

        "android/hardware/radio/1.2/ARadio.cpp",

        "android/hardware/radio/1.2/ARadioIndication.cpp",

        "android/hardware/radio/1.2/ARadioResponse.cpp",

        "android/hardware/radio/1.2/ASap.cpp",

    ],

}
@@ -132,6 +161,8 @@ genrule { 
    ],

    out: [

        "android/hardware/radio/1.2/ARadio.h",

        "android/hardware/radio/1.2/ARadioIndication.h",

        "android/hardware/radio/1.2/ARadioResponse.h",

        "android/hardware/radio/1.2/ASap.h",

    ],

}

radio/1.2/IRadioIndication.hal

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.radio@1.2;



import @1.0::RadioIndicationType;

import @1.1::IRadioIndication;



/**

 * Interface declaring unsolicited radio indications.

 */

interface IRadioIndication extends @1.1::IRadioIndication {



    /**

     * Incremental network scan results

     */

    oneway networkScanResult_1_2(RadioIndicationType type, NetworkScanResult result);

};
 
 No newline at end of file

radio/1.2/IRadioResponse.hal

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.radio@1.2;



import @1.0::RadioResponseInfo;

import @1.1::IRadioResponse;



/**

 * Interface declaring response functions to solicited radio requests.

 */

interface IRadioResponse extends @1.1::IRadioResponse {



    /**

     * @param info Response info struct containing response type, serial no. and error

     * @param cellInfo List of current cell information known to radio

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:NO_MEMORY

     *   RadioError:INTERNAL_ERR

     *   RadioError:SYSTEM_ERR

     *   RadioError:MODEM_ERR

     *   RadioError:NO_NETWORK_FOUND

     *   RadioError:REQUEST_NOT_SUPPORTED

     *   RadioError:NO_RESOURCES

     *   RadioError:CANCELLED

     */

    oneway getCellInfoListResponse_1_2(RadioResponseInfo info, vec<CellInfo> cellInfo);

};