Merge "Add SDK library framework-pdf-v in MediaProvider" into main

9 files changed, 79 insertions, 1 deletions

diff --git a/apex/Android.bp b/apex/Android.bp
index 328307909..ebedce51b 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -16,7 +16,7 @@ apex_defaults {
     bootclasspath_fragments: ["com.android.mediaprovider-bootclasspath-fragment"],
     sh_binaries: [
         // MediaProvider CLI (cli/media_provider_cli_wrapper.sh)
-        "media_provider"
+        "media_provider",
     ],
     prebuilts: ["current_sdkinfo"],
     key: "com.android.mediaprovider.key",
@@ -54,6 +54,7 @@ bootclasspath_fragment {
     contents: [
         "framework-mediaprovider",
         "framework-pdf",
+        "framework-pdf-v",
     ],
     apex_available: ["com.android.mediaprovider"],
 
diff --git a/pdf/framework-v/Android.bp b/pdf/framework-v/Android.bp
new file mode 100644
index 000000000..59911d385
--- /dev/null
+++ b/pdf/framework-v/Android.bp
@@ -0,0 +1,45 @@
+// Copyright (C) 2019 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-v",
+    defaults: ["framework-module-defaults"],
+    srcs: [
+        ":framework-pdf-v-updatable-sources",
+    ],
+    permitted_packages: [
+        "android.graphics.pdf",
+    ],
+    apex_available: [
+        "com.android.mediaprovider",
+    ],
+    impl_library_visibility: [
+        "//packages/providers/MediaProvider:__subpackages__",
+    ],
+    min_sdk_version: "34", // should be 35 (making it 34 for compiling for `-next`)
+}
+
+filegroup {
+    name: "framework-pdf-v-updatable-sources",
+    defaults: ["framework-sources-module-defaults"],
+    srcs: [
+        "java/**/*.java",
+    ],
+    path: "java",
+}
diff --git a/pdf/framework-v/api/current.txt b/pdf/framework-v/api/current.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/pdf/framework-v/api/current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/pdf/framework-v/api/module-lib-current.txt b/pdf/framework-v/api/module-lib-current.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/pdf/framework-v/api/module-lib-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/pdf/framework-v/api/module-lib-removed.txt b/pdf/framework-v/api/module-lib-removed.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/pdf/framework-v/api/module-lib-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/pdf/framework-v/api/removed.txt b/pdf/framework-v/api/removed.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/pdf/framework-v/api/removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/pdf/framework-v/api/system-current.txt b/pdf/framework-v/api/system-current.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/pdf/framework-v/api/system-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/pdf/framework-v/api/system-removed.txt b/pdf/framework-v/api/system-removed.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/pdf/framework-v/api/system-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/pdf/framework-v/java/android/graphics/pdf/PlaceholderV.java b/pdf/framework-v/java/android/graphics/pdf/PlaceholderV.java
new file mode 100644
index 000000000..1d4348891
--- /dev/null
+++ b/pdf/framework-v/java/android/graphics/pdf/PlaceholderV.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 PlaceholderV {
+}