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

Commit 69d195cf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "StatementService is not an Android system module" into main am: e4f7d268 am: 33a30959 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3546263



Change-Id: I26888b8d45d7f06af3824edf00bfef6d1cd6a013
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f7b4cb5 33a30959

data/etc/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -183,6 +183,14 @@ prebuilt_etc { 
    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.statementservice",

    system_ext_specific: true,

    sub_dir: "permissions",

    src: "com.android.statementservice.xml",

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.settings.intelligence",

    product_specific: true,

data/etc/com.android.statementservice.xml

0 → 100644
+23 −0
Original line number 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.statementservice">

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

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

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

    </privapp-permissions>

</permissions>

data/etc/privapp-permissions-platform.xml

+0 −6
Original line number Diff line number Diff line
@@ -623,12 +623,6 @@ applications that come with the platform 
        <permission name="android.permission.ACCESS_TEXT_CLASSIFIER_BY_TYPE"/>

    </privapp-permissions>



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

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

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

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

    </privapp-permissions>



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

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

    </privapp-permissions>

packages/StatementService/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -32,7 +32,11 @@ android_app { 
    },

    target_sdk_version: "29",

    platform_apis: true,

    system_ext_specific: true,

    privileged: true,

    required: [

        "privapp_whitelist_com.android.statementservice",

    ],

    certificate: "platform",

    static_libs: [

        "StatementServiceParser",