Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83103430 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Move Settings/SystemUI permissions to separate files"

parents 49a275c5 c32be24d

data/etc/Android.mk

+19 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,25 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig 
LOCAL_SRC_FILES := $(LOCAL_MODULE)

LOCAL_SRC_FILES := $(LOCAL_MODULE)

include $(BUILD_PREBUILT)

include $(BUILD_PREBUILT)





########################

include $(CLEAR_VARS)

LOCAL_MODULE := privapp_whitelist_com.android.settings

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_RELATIVE_PATH := permissions

LOCAL_MODULE_STEM := com.android.settings.xml

LOCAL_SRC_FILES := com.android.settings.xml

include $(BUILD_PREBUILT)



########################

include $(CLEAR_VARS)

LOCAL_MODULE := privapp_whitelist_com.android.systemui

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_RELATIVE_PATH := permissions

LOCAL_MODULE_STEM := com.android.systemui.xml

LOCAL_SRC_FILES := com.android.systemui.xml

include $(BUILD_PREBUILT)





########################

########################

include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_MODULE := com.android.timezone.updater.xml

LOCAL_MODULE := com.android.timezone.updater.xml

data/etc/com.android.settings.xml

0 → 100644
+53 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ 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

  -->

<permissions>

    <privapp-permissions package="com.android.settings">

        <permission name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>

        <permission name="android.permission.ACCESS_NOTIFICATIONS"/>

        <permission name="android.permission.BACKUP"/>

        <permission name="android.permission.BATTERY_STATS"/>

        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>

        <permission name="android.permission.CHANGE_APP_IDLE_STATE"/>

        <permission name="android.permission.CHANGE_CONFIGURATION"/>

        <permission name="android.permission.DELETE_PACKAGES"/>

        <permission name="android.permission.FORCE_STOP_PACKAGES"/>

        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>

        <permission name="android.permission.MANAGE_DEBUGGING"/>

        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>

        <permission name="android.permission.MANAGE_FINGERPRINT"/>

        <permission name="android.permission.MANAGE_USB"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />

        <permission name="android.permission.MASTER_CLEAR"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>

        <permission name="android.permission.MOVE_PACKAGE"/>

        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>

        <permission name="android.permission.PACKAGE_USAGE_STATS"/>

        <permission name="android.permission.READ_SEARCH_INDEXABLES"/>

        <permission name="android.permission.REBOOT"/>

        <permission name="android.permission.SET_TIME"/>

        <permission name="android.permission.STATUS_BAR"/>

        <permission name="android.permission.TETHER_PRIVILEGED"/>

        <permission name="android.permission.USE_RESERVED_DISK"/>

        <permission name="android.permission.USER_ACTIVITY"/>

        <permission name="android.permission.WRITE_APN_SETTINGS"/>

        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

        <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" />

    </privapp-permissions>

</permissions>

data/etc/com.android.systemui.xml

0 → 100644
+62 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ 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

  -->

<permissions>

    <privapp-permissions package="com.android.systemui">

        <permission name="android.permission.BATTERY_STATS"/>

        <permission name="android.permission.BIND_APPWIDGET"/>

        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>

        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>

        <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>

        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>

        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>

        <permission name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS"/>

        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>

        <permission name="android.permission.CONTROL_VPN"/>

        <permission name="android.permission.DUMP"/>

        <permission name="android.permission.GET_APP_OPS_STATS"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/>

        <permission name="android.permission.MANAGE_DEBUGGING"/>

        <permission name="android.permission.MANAGE_SENSOR_PRIVACY"/>

        <permission name="android.permission.MANAGE_USB"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.MASTER_CLEAR"/>

        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>

        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>

        <permission name="android.permission.READ_DREAM_STATE"/>

        <permission name="android.permission.READ_FRAME_BUFFER"/>

        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>

        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>

        <permission name="android.permission.REAL_GET_TASKS"/>

        <permission name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE"/>

        <permission name="android.permission.START_ACTIVITY_AS_CALLER"/>

        <permission name="android.permission.START_TASKS_FROM_RECENTS"/>

        <permission name="android.permission.STATUS_BAR"/>

        <permission name="android.permission.STOP_APP_SWITCHES"/>

        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>

        <permission name="android.permission.TETHER_PRIVILEGED"/>

        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>

        <permission name="android.permission.USE_RESERVED_DISK"/>

        <permission name="android.permission.WRITE_DREAM_STATE"/>

        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>

        <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" />

    </privapp-permissions>

</permissions>

data/etc/privapp-permissions-platform.xml

+0 −81
Original line number Original line Diff line number Diff line
@@ -250,42 +250,6 @@ applications that come with the platform 
        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>

        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>

    </privapp-permissions>

    </privapp-permissions>





    <privapp-permissions package="com.android.settings">

        <permission name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>

        <permission name="android.permission.ACCESS_NOTIFICATIONS"/>

        <permission name="android.permission.BACKUP"/>

        <permission name="android.permission.BATTERY_STATS"/>

        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>

        <permission name="android.permission.CHANGE_APP_IDLE_STATE"/>

        <permission name="android.permission.CHANGE_CONFIGURATION"/>

        <permission name="android.permission.DELETE_PACKAGES"/>

        <permission name="android.permission.FORCE_STOP_PACKAGES"/>

        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>

        <permission name="android.permission.MANAGE_DEBUGGING"/>

        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>

        <permission name="android.permission.MANAGE_FINGERPRINT"/>

        <permission name="android.permission.MANAGE_USB"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE" />

        <permission name="android.permission.MASTER_CLEAR"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>

        <permission name="android.permission.MOVE_PACKAGE"/>

        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>

        <permission name="android.permission.PACKAGE_USAGE_STATS"/>

        <permission name="android.permission.READ_SEARCH_INDEXABLES"/>

        <permission name="android.permission.REBOOT"/>

        <permission name="android.permission.SET_TIME"/>

        <permission name="android.permission.STATUS_BAR"/>

        <permission name="android.permission.TETHER_PRIVILEGED"/>

        <permission name="android.permission.USE_RESERVED_DISK"/>

        <permission name="android.permission.USER_ACTIVITY"/>

        <permission name="android.permission.WRITE_APN_SETTINGS"/>

        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

        <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" />

    </privapp-permissions>



    <privapp-permissions package="com.android.settings.intelligence">

    <privapp-permissions package="com.android.settings.intelligence">

        <permission name="android.permission.MANAGE_FINGERPRINT"/>

        <permission name="android.permission.MANAGE_FINGERPRINT"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>
@@ -370,51 +334,6 @@ applications that come with the platform 
        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

    </privapp-permissions>

    </privapp-permissions>





    <privapp-permissions package="com.android.systemui">

        <permission name="android.permission.BATTERY_STATS"/>

        <permission name="android.permission.BIND_APPWIDGET"/>

        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>

        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>

        <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>

        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>

        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>

        <permission name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS"/>

        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>

        <permission name="android.permission.CONTROL_VPN"/>

        <permission name="android.permission.DUMP"/>

        <permission name="android.permission.GET_APP_OPS_STATS"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/>

        <permission name="android.permission.MANAGE_DEBUGGING"/>

        <permission name="android.permission.MANAGE_SENSOR_PRIVACY"/>

        <permission name="android.permission.MANAGE_USB"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.MASTER_CLEAR"/>

        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>

        <permission name="android.permission.MODIFY_PHONE_STATE"/>

        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>

        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>

        <permission name="android.permission.READ_DREAM_STATE"/>

        <permission name="android.permission.READ_FRAME_BUFFER"/>

        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>

        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>

        <permission name="android.permission.REAL_GET_TASKS"/>

        <permission name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE"/>

        <permission name="android.permission.START_ACTIVITY_AS_CALLER"/>

        <permission name="android.permission.START_TASKS_FROM_RECENTS"/>

        <permission name="android.permission.STATUS_BAR"/>

        <permission name="android.permission.STOP_APP_SWITCHES"/>

        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>

        <permission name="android.permission.TETHER_PRIVILEGED"/>

        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>

        <permission name="android.permission.USE_RESERVED_DISK"/>

        <permission name="android.permission.WRITE_DREAM_STATE"/>

        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>

        <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS" />

    </privapp-permissions>



    <privapp-permissions package="com.android.tv">

    <privapp-permissions package="com.android.tv">

        <permission name="android.permission.CHANGE_HDMI_CEC_ACTIVE_SOURCE"/>

        <permission name="android.permission.CHANGE_HDMI_CEC_ACTIVE_SOURCE"/>

        <permission name="android.permission.DVB_DEVICE"/>

        <permission name="android.permission.DVB_DEVICE"/>

packages/SystemUI/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -150,6 +150,7 @@ android_app { 
        "--extra-packages",

        "--extra-packages",

        "com.android.keyguard",

        "com.android.keyguard",

    ],

    ],

    required: ["privapp_whitelist_com.android.systemui"],





}

}