From d138adfdf63cae03bce8a563a6191e7e4c6af082 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Thu, 24 May 2018 16:17:03 +0900 Subject: [PATCH] com.android.media.tv.remoteprovider is built with java_sdk_library The com.android.media.tv.remoteprovider is built with java_sdk_library and api files are added by running "make update-api". The com.android.media.tv.remoteprovider is removed in platform.xml since it will be made auto generation by soong when the library is built with java_sdk_library. Bug:77577799 Test: make -j make checkapi Change-Id: If0f33bbdde42d891471cd7d3d295d433a88affec --- media/lib/tvremote/Android.bp | 24 ++++++++++ media/lib/tvremote/Android.mk | 46 ------------------- media/lib/tvremote/api/current.txt | 21 +++++++++ media/lib/tvremote/api/removed.txt | 0 media/lib/tvremote/api/system-current.txt | 0 media/lib/tvremote/api/system-removed.txt | 0 media/lib/tvremote/api/test-current.txt | 0 media/lib/tvremote/api/test-removed.txt | 0 .../com.android.media.tv.remoteprovider.xml | 20 -------- 9 files changed, 45 insertions(+), 66 deletions(-) create mode 100644 media/lib/tvremote/Android.bp delete mode 100644 media/lib/tvremote/Android.mk create mode 100644 media/lib/tvremote/api/current.txt create mode 100644 media/lib/tvremote/api/removed.txt create mode 100644 media/lib/tvremote/api/system-current.txt create mode 100644 media/lib/tvremote/api/system-removed.txt create mode 100644 media/lib/tvremote/api/test-current.txt create mode 100644 media/lib/tvremote/api/test-removed.txt delete mode 100644 media/lib/tvremote/com.android.media.tv.remoteprovider.xml diff --git a/media/lib/tvremote/Android.bp b/media/lib/tvremote/Android.bp new file mode 100644 index 0000000000000..5f101a3141c8c --- /dev/null +++ b/media/lib/tvremote/Android.bp @@ -0,0 +1,24 @@ +// +// Copyright (C) 2018 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. +// + +java_sdk_library { + name: "com.android.media.tv.remoteprovider", + srcs: ["java/**/*.java"], + api_packages: ["com.android.media.tv.remoteprovider"], + dex_preopt: { + enabled: false, + } +} diff --git a/media/lib/tvremote/Android.mk b/media/lib/tvremote/Android.mk deleted file mode 100644 index 1ffdd6241f6e0..0000000000000 --- a/media/lib/tvremote/Android.mk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2016 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. -# -LOCAL_PATH := $(call my-dir) - -# the tvremoteprovider library -# ============================================================ -include $(CLEAR_VARS) - -LOCAL_MODULE:= com.android.media.tv.remoteprovider -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-java-files-under, java) - -LOCAL_DEX_PREOPT := false - -include $(BUILD_JAVA_LIBRARY) - - -# ==== com.android.media.tvremote.xml lib def ======================== -include $(CLEAR_VARS) - -LOCAL_MODULE := com.android.media.tv.remoteprovider.xml -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE_CLASS := ETC - -# This will install the file in /system/etc/permissions -# -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions - -LOCAL_SRC_FILES := $(LOCAL_MODULE) - -include $(BUILD_PREBUILT) diff --git a/media/lib/tvremote/api/current.txt b/media/lib/tvremote/api/current.txt new file mode 100644 index 0000000000000..eea9e9c9c19cc --- /dev/null +++ b/media/lib/tvremote/api/current.txt @@ -0,0 +1,21 @@ +package com.android.media.tv.remoteprovider { + + public abstract class TvRemoteProvider { + ctor public TvRemoteProvider(android.content.Context); + method public void clearInputBridge(android.os.IBinder) throws java.lang.RuntimeException; + method public void closeInputBridge(android.os.IBinder) throws java.lang.RuntimeException; + method public android.os.IBinder getBinder(); + method public final android.content.Context getContext(); + method public void onInputBridgeConnected(android.os.IBinder); + method public void openRemoteInputBridge(android.os.IBinder, java.lang.String, int, int, int) throws java.lang.RuntimeException; + method public void sendKeyDown(android.os.IBinder, int) throws java.lang.RuntimeException; + method public void sendKeyUp(android.os.IBinder, int) throws java.lang.RuntimeException; + method public void sendPointerDown(android.os.IBinder, int, int, int) throws java.lang.RuntimeException; + method public void sendPointerSync(android.os.IBinder) throws java.lang.RuntimeException; + method public void sendPointerUp(android.os.IBinder, int) throws java.lang.RuntimeException; + method public void sendTimestamp(android.os.IBinder, long) throws java.lang.RuntimeException; + field public static final java.lang.String SERVICE_INTERFACE = "com.android.media.tv.remoteprovider.TvRemoteProvider"; + } + +} + diff --git a/media/lib/tvremote/api/removed.txt b/media/lib/tvremote/api/removed.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/media/lib/tvremote/api/system-current.txt b/media/lib/tvremote/api/system-current.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/media/lib/tvremote/api/system-removed.txt b/media/lib/tvremote/api/system-removed.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/media/lib/tvremote/api/test-current.txt b/media/lib/tvremote/api/test-current.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/media/lib/tvremote/api/test-removed.txt b/media/lib/tvremote/api/test-removed.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/media/lib/tvremote/com.android.media.tv.remoteprovider.xml b/media/lib/tvremote/com.android.media.tv.remoteprovider.xml deleted file mode 100644 index dcf479ac78b34..0000000000000 --- a/media/lib/tvremote/com.android.media.tv.remoteprovider.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file