Merge remote-tracking branch 'origin/lineage-17.1' into v1-q (015b30d4) · Commits · e / os / android_packages_apps_FMRadio

Android.mk

+10 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,16 @@ LOCAL_USE_AAPT2 := true

		LOCAL_AAPT_FLAGS := --auto-add-overlay

		LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.fmradio.xml

		include $(BUILD_PACKAGE)

		include $(CLEAR_VARS)
		LOCAL_MODULE := privapp_whitelist_com.android.fmradio.xml
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
		LOCAL_SRC_FILES := $(LOCAL_MODULE)
		include $(BUILD_PREBUILT)

		include $(call all-makefiles-under,$(LOCAL_PATH))

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		ifneq ($(BOARD_HAVE_QCOM_FM),true)
		ifneq ($(BOARD_HAVE_BCM_FM),true)
		ifneq ($(BOARD_HAVE_SLSI_FM),true)

		LOCAL_PATH := $(call my-dir)

		@@ -39,5 +40,6 @@ LOCAL_MODULE_TAGS := optional

		include $(BUILD_SHARED_LIBRARY)

		endif # BOARD_HAVE_SLSI_FM
		endif # BOARD_HAVE_BCM_FM
		endif # BOARD_HAVE_QCOM_FM

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2017-2020 The LineageOS 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.
		-->
		<permissions>
		<privapp-permissions package="com.android.fmradio">
		<permission name="android.permission.ACCESS_FM_RADIO"/>
		<permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
		<permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
		</privapp-permissions>
		</permissions>

+0 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--Generated by crowdin.com-->
		<!--
		Copyright (C) 2014 The Android Open Source Project

+0 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--Generated by crowdin.com-->
		<!--
		Copyright (C) 2014 The Android Open Source Project