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

Commit 4d4135f2 authored by William Loh's avatar William Loh
Browse files

Remove hidden api dependency in statementservice 

This will allow the statementservice app to be moved to the product
partition.

Bug: 404705846
Test: manual
Flag: EXEMPT refactor
Change-Id: I3f8261334fd1a6cd8052c4d41233e52d8b236367
parent c5ce7518

packages/StatementService/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ android_app { 
        proguard_flags_files: ["proguard.flags"],

    },

    target_sdk_version: "29",

    platform_apis: true,

    sdk_version: "system_current",

    system_ext_specific: true,

    privileged: true,

    required: [
@@ -40,6 +40,7 @@ android_app { 
    certificate: "platform",

    static_libs: [

        "StatementServiceParser",

        "androidx.annotation_annotation",

        "androidx.appcompat_appcompat",

        "androidx.collection_collection-ktx",

        "androidx.room_room-runtime",

packages/StatementService/Parser/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -23,4 +23,5 @@ android_library { 
        "src/**/*.kt",

    ],

    target_sdk_version: "29",

    sdk_version: "system_current",

}

packages/StatementService/src/com/android/statementservice/domain/DomainVerificationReceiverV1.kt

+12 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.statementservice.domain 


import android.content.Context

import android.content.Intent

import android.content.pm.PackageManager

import androidx.work.ExistingWorkPolicy

import androidx.work.WorkManager

import com.android.statementservice.domain.worker.CollectV1Worker
@@ -34,13 +33,21 @@ class DomainVerificationReceiverV1 : BaseDomainVerificationReceiver() { 
    companion object {

        private const val ENABLE_V1 = true

        private const val PACKAGE_WORK_PREFIX_V1 = "package_request_v1-"

        private const val ACTION_INTENT_FILTER_NEEDS_VERIFICATION =

            "android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION"

        private const val EXTRA_INTENT_FILTER_VERIFICATION_ID =

            "android.content.pm.extra.INTENT_FILTER_VERIFICATION_ID"

        private const val EXTRA_INTENT_FILTER_VERIFICATION_HOSTS =

            "android.content.pm.extra.INTENT_FILTER_VERIFICATION_HOSTS"

        private const val EXTRA_INTENT_FILTER_VERIFICATION_PACKAGE_NAME =

            "android.content.pm.extra.INTENT_FILTER_VERIFICATION_PACKAGE_NAME"

    }



    override val tag = DomainVerificationReceiverV1::class.java.simpleName



    override fun onReceive(context: Context, intent: Intent) {

        when (intent.action) {

            Intent.ACTION_INTENT_FILTER_NEEDS_VERIFICATION ->

            ACTION_INTENT_FILTER_NEEDS_VERIFICATION ->

                scheduleUnlockedV1(context, intent)

            else -> debugLog { "Received invalid broadcast: $intent" }

        }
@@ -52,12 +59,12 @@ class DomainVerificationReceiverV1 : BaseDomainVerificationReceiver() { 
        }



        val verificationId =

            intent.getIntExtra(PackageManager.EXTRA_INTENT_FILTER_VERIFICATION_ID, -1)

            intent.getIntExtra(EXTRA_INTENT_FILTER_VERIFICATION_ID, -1)

        val hosts =

            (intent.getStringExtra(PackageManager.EXTRA_INTENT_FILTER_VERIFICATION_HOSTS) ?: return)

            (intent.getStringExtra(EXTRA_INTENT_FILTER_VERIFICATION_HOSTS) ?: return)

                .split(" ")

        val packageName =

            intent.getStringExtra(PackageManager.EXTRA_INTENT_FILTER_VERIFICATION_PACKAGE_NAME)

            intent.getStringExtra(EXTRA_INTENT_FILTER_VERIFICATION_PACKAGE_NAME)

                ?: return



        debugLog { "Attempting v1 verification for $packageName" }

packages/StatementService/src/com/android/statementservice/retriever/DynamicAppLinkComponent.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.statementservice.retriever;



import android.annotation.Nullable;

import androidx.annotation.Nullable;



import java.util.Map;

packages/StatementService/src/com/android/statementservice/retriever/Relation.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.statementservice.retriever;



import android.annotation.NonNull;

import androidx.annotation.NonNull;



import java.util.regex.Pattern;