Merge "Destroys the Presence Service when service is down."
diff --git a/rcs/presencepolling/Android.mk b/rcs/presencepolling/Android.mk
index a536825..5ff4e2a 100644
--- a/rcs/presencepolling/Android.mk
+++ b/rcs/presencepolling/Android.mk
@@ -36,6 +36,7 @@
LOCAL_REQUIRED_MODULES := com.android.ims.rcsmanager
LOCAL_PACKAGE_NAME := PresencePolling
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
#LOCAL_MODULE_TAGS := optional
diff --git a/rcs/presencepolling/tests/Android.mk b/rcs/presencepolling/tests/Android.mk
index 3cecc58..06486c8 100644
--- a/rcs/presencepolling/tests/Android.mk
+++ b/rcs/presencepolling/tests/Android.mk
@@ -28,6 +28,7 @@
legacy-android-test
LOCAL_PACKAGE_NAME := PresencePollingTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_INSTRUMENTATION_FOR := PresencePolling
LOCAL_CERTIFICATE := platform
LOCAL_MODULE_TAGS := optional
diff --git a/rcs/rcsservice/Android.mk b/rcs/rcsservice/Android.mk
index 281f178..f3dbb86 100644
--- a/rcs/rcsservice/Android.mk
+++ b/rcs/rcsservice/Android.mk
@@ -33,6 +33,7 @@
include $(CLEAR_VARS)
# This is the target being built. (Name of APK)
LOCAL_PACKAGE_NAME := RcsService
+LOCAL_PRIVATE_PLATFORM_APIS := true
# Only compile source java files in this apk.
LOCAL_SRC_FILES := \
$(call all-java-files-under, src)