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

Commit c14d3842 authored by Justin Yun's avatar Justin Yun
Browse files

StatementService is not an Android system module 

StatementService is not installed when a target has GMS core.
As the installation of this app depends on the build target, move it to
system_ext. system image must not include target specific modules.

Bug: 401090620
Test: atest StatementServiceTests
Change-Id: I138981cd8fe98157098eba9efc3a0684d7ffbe76
parent 5dcfeb3f

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
@@ -608,12 +608,6 @@ applications that come with the platform 
        <permission name="android.permission.MANAGE_INTRUSION_DETECTION_STATE" />

    </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",