From ab6d409772175bde7aa399fdb30743f370e43c57 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 22 Feb 2018 18:07:16 +0000
Subject: packages/providers/DownloadProvider: Set LOCAL_SDK_VERSION where
 possible.

This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: Ic2019b11a0dfb30b2dedb840011b365228e7786a
---
 Android.mk                         | 1 +
 tests/Android.mk                   | 1 +
 tests/permission/Android.mk        | 1 +
 tests/public_api_access/Android.mk | 1 +
 ui/Android.mk                      | 1 +
 5 files changed, 5 insertions(+)

diff --git a/Android.mk b/Android.mk
index 084aea48..8d3c7b4a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := DownloadProvider
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := media
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_STATIC_JAVA_LIBRARIES := guava
diff --git a/tests/Android.mk b/tests/Android.mk
index b654e12c..43cbafb6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -13,6 +13,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     mockito-target \
     legacy-android-test
 LOCAL_PACKAGE_NAME := DownloadProviderTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_COMPATIBILITY_SUITE := device-tests
 LOCAL_CERTIFICATE := media
 
diff --git a/tests/permission/Android.mk b/tests/permission/Android.mk
index 62f4d024..b3658df3 100644
--- a/tests/permission/Android.mk
+++ b/tests/permission/Android.mk
@@ -10,6 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_JAVA_LIBRARIES := android.test.runner
 LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
 LOCAL_PACKAGE_NAME := DownloadProviderPermissionTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 include $(BUILD_PACKAGE)
 
diff --git a/tests/public_api_access/Android.mk b/tests/public_api_access/Android.mk
index 66f2f101..39f3c79d 100644
--- a/tests/public_api_access/Android.mk
+++ b/tests/public_api_access/Android.mk
@@ -10,6 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_JAVA_LIBRARIES := android.test.runner
 LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
 LOCAL_PACKAGE_NAME := DownloadPublicApiAccessTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 include $(BUILD_PACKAGE)
 
diff --git a/ui/Android.mk b/ui/Android.mk
index 9a545550..0768a30a 100644
--- a/ui/Android.mk
+++ b/ui/Android.mk
@@ -10,6 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     ../src/com/android/providers/downloads/RawDocumentsHelper.java
 
 LOCAL_PACKAGE_NAME := DownloadProviderUi
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := media
 
 include $(BUILD_PACKAGE)
-- 
cgit v1.2.3