commit 81ac4f188c64e0c6bbb960a0ee47ea03bee9d402
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:56:48 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:56:48 2023 +0000
tree 01bcd311503c9c8c595c780b41ee26f73943c38f
parent e5078f9a99591e7d5ea9df57f55fae046e4e0624
parent 482dbe4e20f2a54e150670b09591a538cceb3ed3

Snap for 10453563 from 482dbe4e20f2a54e150670b09591a538cceb3ed3 to mainline-mediaprovider-release

Change-Id: I8411464eff5ca36381c41325e1eae13a14a47a95

Android.bp

diff --git a/Android.bp b/Android.bp
index 6924ca2..5fd6b57 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,6 +21,11 @@
         "okio/src/jvmMain/**/*.kt",
         "okio/src/commonMain/**/*.kt",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.devicelock",
+        "com.android.permission",
+    ],
     static_libs: [
         "guava-android-annotation-stubs",
     ],
@@ -28,5 +33,5 @@
         "-Xmulti-platform",
     ],
     sdk_version: "current",
-    java_version: "1.7",
+    min_sdk_version: "30",
 }

OWNERS

diff --git a/OWNERS b/OWNERS
index 25abe55..f5df99d 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,2 @@
-arangelov@google.com
+file:platform/frameworks/base:/core/java/android/app/admin/WorkDeviceExperience_OWNERS
 stanleytfwang@google.com
-alexkershaw@google.com