Snap for 7478067 from 54e0fac90467128ec18d06d8a3f994dc9dbbf7f8 to mainline-cellbroadcast-release
Change-Id: I9e927ff3e744f80e395c36212b2ff220e95b9a94
diff --git a/Android.bp b/Android.bp
index 817ece6..4045030 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,38 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: ["external_marisa-trie_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+ name: "external_marisa-trie_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-BSD-2-Clause",
+ "SPDX-license-identifier-LGPL",
+ "SPDX-license-identifier-LGPL-2.1+",
+ ],
+ license_text: [
+ "COPYING.md",
+ ],
+}
+
cc_library {
name: "marisa-trie",
sdk_version: "current",
diff --git a/METADATA b/METADATA
index 21a4d89..869970d 100644
--- a/METADATA
+++ b/METADATA
@@ -13,5 +13,5 @@
}
version: "v0.2.6"
last_upgrade_date { year: 2020 month: 7 day: 17 }
- license_type: NOTICE
+ license_type: RESTRICTED
}
diff --git a/include/marisa/scoped-array.h b/include/marisa/scoped-array.h
index 12b5b9e..34cefa4 100644
--- a/include/marisa/scoped-array.h
+++ b/include/marisa/scoped-array.h
@@ -16,7 +16,7 @@
}
void reset(T *array = NULL) {
- MARISA_THROW_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR);
+ MARISA_DEBUG_IF((array != NULL) && (array == array_), MARISA_RESET_ERROR);
scoped_array(array).swap(*this);
}
diff --git a/include/marisa/scoped-ptr.h b/include/marisa/scoped-ptr.h
index 63d7a3d..abf48d8 100644
--- a/include/marisa/scoped-ptr.h
+++ b/include/marisa/scoped-ptr.h
@@ -16,7 +16,7 @@
}
void reset(T *ptr = NULL) {
- MARISA_THROW_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR);
+ MARISA_DEBUG_IF((ptr != NULL) && (ptr == ptr_), MARISA_RESET_ERROR);
scoped_ptr(ptr).swap(*this);
}
