DO NOT MERGE - Mark RQ3A.210410.001 as merged
Bug: 190855093
Merged-In: Ifff61910819de4da66bc5558074a573651a5aec3
Change-Id: I5998bafe1eb4fd838ecb61878443ddd82e67f064
diff --git a/Android.bp b/Android.bp
index fa2fb50..0c29652 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,25 @@
// limitations under the License.
//
+package {
+ default_applicable_licenses: [
+ "packages_providers_CalendarProvider_license",
+ ],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+ name: "packages_providers_CalendarProvider_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ ],
+ license_text: [
+ "NOTICE",
+ ],
+}
+
android_app {
name: "CalendarProvider",
static_libs: [
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fd56187..84011cd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -54,26 +54,30 @@
android:readPermission="android.permission.READ_CALENDAR"
android:writePermission="android.permission.WRITE_CALENDAR" />
- <receiver android:name="CalendarReceiver">
+ <receiver android:name="CalendarReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
- <activity android:name="CalendarDebug" android:label="@string/calendar_info">
+ <activity android:name="CalendarDebug" android:label="@string/calendar_info"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name="CalendarDebugActivity" android:label="@string/calendar_info"
+ android:exported="true"
android:theme="@android:style/Theme.Holo.Dialog">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <receiver android:name="CalendarDebugReceiver">
+ <receiver android:name="CalendarDebugReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.provider.Telephony.SECRET_CODE" />
<data android:scheme="android_secret_code" android:host="225" />
@@ -81,7 +85,8 @@
</receiver>
<!-- Handles database upgrades after OTAs, then disables itself -->
- <receiver android:name="CalendarUpgradeReceiver">
+ <receiver android:name="CalendarUpgradeReceiver"
+ android:exported="true">
<!-- This broadcast is sent after the core system has finished
booting, before the home app is launched or BOOT_COMPLETED
is sent. -->
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/tests/Android.bp b/tests/Android.bp
index 4f57e37..3f49177 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,3 +1,14 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "packages_providers_CalendarProvider_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: [
+ "packages_providers_CalendarProvider_license",
+ ],
+}
+
android_test {
name: "CalendarProviderTests",
// Include all test java files.
