Snap for 9710098 from 44225373c739b2d733f7033cfacaafc77b283e8b to mainline-tzdata5-release

Change-Id: I03d433f0b3862fe5bb0e14b9bdf5c7e9176ffeeb

5 files changed, 66 insertions, 37 deletions

diff --git a/Android.bp b/Android.bp
index bd7cc5f..87aa1f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,18 @@
+package {
+    default_applicable_licenses: ["hardware_nxp_uwb_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "hardware_nxp_uwb_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    // large-scale-change unable to identify any license_text files
+}
+
 cc_library_shared {
     name: "uwb_uci.helios",
     defaults: [
diff --git a/aidl/Android.bp b/aidl/Android.bp
index ec75f74..63aa403 100644
--- a/aidl/Android.bp
+++ b/aidl/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "hardware_nxp_uwb_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["hardware_nxp_uwb_license"],
+}
+
 cc_binary {
     name: "android.hardware.uwb-service.nxp",
     relative_install_path: "hw",
diff --git a/extns/inc/uci_defs.h b/extns/inc/uci_defs.h
index 736a11c..85a8003 100644
--- a/extns/inc/uci_defs.h
+++ b/extns/inc/uci_defs.h
@@ -1,17 +1,18 @@
 /*
-*
-* Copyright 2018-2022 NXP.
-*
-* NXP Confidential. This software is owned or controlled by NXP and may only be
-* used strictly in accordance with the applicable license terms. By expressly
-* accepting such terms or by downloading,installing, activating and/or otherwise
-* using the software, you are agreeing that you have read,and that you agree to
-* comply with and are bound by, such license terms. If you do not agree to be
-* bound by the applicable license terms, then you may not retain, install, activate
-* or otherwise use the software.
-*
-*/
-
+ * Copyright 2018-2022 NXP
+ *
+ * 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.
+ */
 /******************************************************************************
  *
  *  This file contains the definition from UCI specification
diff --git a/halimpl/fwd/sr1xx/phNxpUciHal_fwd.cc b/halimpl/fwd/sr1xx/phNxpUciHal_fwd.cc
index 22cb824..ee70ba3 100644
--- a/halimpl/fwd/sr1xx/phNxpUciHal_fwd.cc
+++ b/halimpl/fwd/sr1xx/phNxpUciHal_fwd.cc
@@ -1,16 +1,18 @@
 /*
-*
-* Copyright 2018-2020 NXP.
-*
-* NXP Confidential. This software is owned or controlled by NXP and may only be
-* used strictly in accordance with the applicable license terms. By expressly
-* accepting such terms or by downloading,installing, activating and/or otherwise
-* using the software, you are agreeing that you have read,and that you agree to
-* comply with and are bound by, such license terms. If you do not agree to be
-* bound by the applicable license terms, then you may not retain, install, activate
-* or otherwise use the software.
-*
-*/
+ * Copyright 2018-2022 NXP
+ *
+ * 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.
+ */
 
 
 /*************************************************************************************/
diff --git a/halimpl/fwd/sr1xx/phNxpUciHal_fwd.h b/halimpl/fwd/sr1xx/phNxpUciHal_fwd.h
index b0aa5c7..effdb04 100644
--- a/halimpl/fwd/sr1xx/phNxpUciHal_fwd.h
+++ b/halimpl/fwd/sr1xx/phNxpUciHal_fwd.h
@@ -1,16 +1,18 @@
 /*
-*
-* Copyright 2018-2020 NXP.
-*
-* NXP Confidential. This software is owned or controlled by NXP and may only be
-* used strictly in accordance with the applicable license terms. By expressly
-* accepting such terms or by downloading,installing, activating and/or otherwise
-* using the software, you are agreeing that you have read,and that you agree to
-* comply with and are bound by, such license terms. If you do not agree to be
-* bound by the applicable license terms, then you may not retain, install, activate
-* or otherwise use the software.
-*
-*/
+ * Copyright 2018-2022 NXP
+ *
+ * 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.
+ */
 
 #ifndef _PHNXPUCIHAL_FW_H
 #define _PHNXPUCIHAL_FW_H