Merge "Add new framework-pdf jar inside MediaProvider module" into android13-dev
diff --git a/apex/Android.bp b/apex/Android.bp
index c735880..d742cc3 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -46,7 +46,10 @@
// Encapsulate the contributions made by the com.android.mediaprovider to the bootclasspath.
bootclasspath_fragment {
name: "com.android.mediaprovider-bootclasspath-fragment",
- contents: ["framework-mediaprovider"],
+ contents: [
+ "framework-mediaprovider",
+ "framework-pdf",
+ ],
apex_available: ["com.android.mediaprovider"],
// The bootclasspath_fragments that provide APIs on which this depends.
@@ -75,6 +78,7 @@
// modules. That can include private classes that are not part of the
// API.
split_packages: [
+ "android.graphics.pdf",
"android.provider",
],
},
diff --git a/apex/pdf/framework/Android.bp b/apex/pdf/framework/Android.bp
new file mode 100644
index 0000000..af52bd5
--- /dev/null
+++ b/apex/pdf/framework/Android.bp
@@ -0,0 +1,33 @@
+// Copyright (C) 2024 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 {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_sdk_library {
+ name: "framework-pdf",
+ defaults: ["framework-module-defaults"],
+ srcs: [
+ "java/**/*.java",
+ ],
+ permitted_packages: [
+ "android.graphics.pdf",
+ ],
+ apex_available: [
+ "com.android.mediaprovider",
+ ],
+ min_sdk_version: "31",
+}
diff --git a/apex/pdf/framework/api/current.txt b/apex/pdf/framework/api/current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/apex/pdf/framework/api/current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/apex/pdf/framework/api/module-lib-current.txt b/apex/pdf/framework/api/module-lib-current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/apex/pdf/framework/api/module-lib-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/apex/pdf/framework/api/module-lib-removed.txt b/apex/pdf/framework/api/module-lib-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/apex/pdf/framework/api/module-lib-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/apex/pdf/framework/api/removed.txt b/apex/pdf/framework/api/removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/apex/pdf/framework/api/removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/apex/pdf/framework/api/system-current.txt b/apex/pdf/framework/api/system-current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/apex/pdf/framework/api/system-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/apex/pdf/framework/api/system-removed.txt b/apex/pdf/framework/api/system-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/apex/pdf/framework/api/system-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/apex/pdf/framework/java/android/graphics/pdf/Placeholder.java b/apex/pdf/framework/java/android/graphics/pdf/Placeholder.java
new file mode 100644
index 0000000..26e3556
--- /dev/null
+++ b/apex/pdf/framework/java/android/graphics/pdf/Placeholder.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2024 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.graphics.pdf;
+
+/**
+ * Placeholder class for new PDF viewer inside MediaProvider module.
+*
+* @hide
+*
+*/
+public class Placeholder {
+}
