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

Commit da1a54f3 authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Automerger Merge Worker
Browse files

Merge "Link framework-appsearch against the module_current SDK." into sc-dev am: c09e57ce 

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

Change-Id: I87b86120a6fd300116c9d81368f69f263fb0e844
parents 3e96f06b c09e57ce

Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ java_defaults { 
        "av-types-aidl-java",

        "tv_tuner_resource_manager_aidl_interface-java",

        "soundtrigger_middleware-aidl-java",

        "modules-utils-preconditions",

        "modules-utils-os",

        "framework-permission-aidl-java",

    ],
@@ -409,6 +410,7 @@ filegroup { 
    srcs: [

        // TODO: remove these annotations as soon as we can use andoid.support.annotations.*

        ":framework-annotations",

        ":modules-utils-preconditions-srcs",

        "core/java/android/net/DhcpResults.java",

        "core/java/android/util/IndentingPrintWriter.java",

        "core/java/android/util/LocalLog.java",
@@ -416,7 +418,6 @@ filegroup { 
        "core/java/com/android/internal/util/IndentingPrintWriter.java",

        "core/java/com/android/internal/util/IState.java",

        "core/java/com/android/internal/util/MessageUtils.java",

        "core/java/com/android/internal/util/Preconditions.java",

        "core/java/com/android/internal/util/RingBufferIndices.java",

        "core/java/com/android/internal/util/State.java",

        "core/java/com/android/internal/util/StateMachine.java",
@@ -446,11 +447,11 @@ java_library { 
    sdk_version: "module_current",

    min_sdk_version: "30",

    srcs: [

        ":modules-utils-preconditions-srcs",

        "core/java/android/os/HandlerExecutor.java",

        "core/java/com/android/internal/util/AsyncChannel.java",

        "core/java/com/android/internal/util/AsyncService.java",

        "core/java/com/android/internal/util/Protocol.java",

        "core/java/com/android/internal/util/Preconditions.java",

        "telephony/java/android/telephony/Annotation.java",

        ":net-utils-framework-wifi-common-srcs",

    ],

apex/appsearch/framework/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -52,14 +52,18 @@ filegroup { 
java_sdk_library {

    name: "framework-appsearch",

    srcs: [":framework-appsearch-sources"],

    sdk_version: "core_platform", // TODO(b/146218515) should be module_current

    impl_only_libs: ["framework-minus-apex"], // TODO(b/146218515) should be removed

    sdk_version: "module_current",

    static_libs: [

        // This list must be kept in sync with jarjar.txt

        "modules-utils-preconditions",

    ],

    libs: ["unsupportedappusage"], // TODO(b/181887768) should be removed

    defaults: ["framework-module-defaults"],

    permitted_packages: ["android.app.appsearch"],

    aidl: {

        include_dirs: ["frameworks/base/core/java"], // TODO(b/146218515) should be removed

    },

    jarjar_rules: "jarjar-rules.txt",

    apex_available: ["com.android.appsearch"],

    unsafe_ignore_missing_latest_api: true, // TODO(b/146218515) should be removed

}

apex/appsearch/framework/jarjar-rules.txt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# Rename all com.android.internal.util classes to prevent class name collisions

# between this module and the other versions of the utility classes linked into

# the framework.



# These must be kept in sync with the sources of framework-utils-appsearch

rule com.android.internal.util.Preconditions* android.app.appsearch.internal.util.Preconditions@1

apex/appsearch/framework/java/android/app/appsearch/AppSearchManager.java

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ public class AppSearchManager { 
        AppSearchSession.createSearchSession(

                searchContext,

                mService,

                mContext.getUserId(),

                mContext.getUser().getIdentifier(),

                getPackageName(),

                executor,

                callback);
@@ -228,7 +228,7 @@ public class AppSearchManager { 
        Objects.requireNonNull(executor);

        Objects.requireNonNull(callback);

        GlobalSearchSession.createGlobalSearchSession(

                mService, mContext.getUserId(), getPackageName(), executor, callback);

                mService, mContext.getUser().getIdentifier(), getPackageName(), executor, callback);

    }



    /** Returns the package name that should be used for uid verification. */

core/java/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ filegroup { 
filegroup {

    name: "framework-jobscheduler-shared-srcs",

    srcs: [

        ":modules-utils-preconditions-srcs",

        "com/android/internal/util/ArrayUtils.java",

        "com/android/internal/util/BitUtils.java",

        "com/android/internal/util/CollectionUtils.java",
@@ -178,7 +179,6 @@ filegroup { 
        "com/android/internal/util/FastXmlSerializer.java",

        "com/android/internal/util/FunctionalUtils.java",

        "com/android/internal/util/ParseUtils.java",

        "com/android/internal/util/Preconditions.java",

        "com/android/internal/util/RingBufferIndices.java",

        "com/android/internal/util/StatLogger.java",

        "com/android/internal/util/XmlUtils.java",
@@ -189,9 +189,9 @@ filegroup { 
filegroup {

    name: "framework-permission-s-shared-srcs",

    srcs: [

        ":modules-utils-preconditions-srcs",

        "com/android/internal/infra/AndroidFuture.java",

        "com/android/internal/infra/ServiceConnector.java",

        "com/android/internal/util/Preconditions.java",

        "com/android/internal/infra/AndroidFuture.aidl",

        "com/android/internal/infra/IAndroidFuture.aidl",

        "android/os/HandlerExecutor.java",
@@ -323,6 +323,7 @@ aidl_interface { 
filegroup {

    name: "framework-telephony-common-shared-srcs",

    srcs: [

        ":modules-utils-preconditions-srcs",

        "android/os/RegistrantList.java",

        "android/os/Registrant.java",

        "android/util/IndentingPrintWriter.java",
@@ -336,7 +337,6 @@ filegroup { 
        "com/android/internal/util/HexDump.java",

        "com/android/internal/util/IState.java",

        "com/android/internal/util/IndentingPrintWriter.java",

        "com/android/internal/util/Preconditions.java",

        "com/android/internal/util/State.java",

        "com/android/internal/util/StateMachine.java",

        "com/android/internal/util/UserIcons.java",
@@ -348,10 +348,10 @@ filegroup { 
filegroup {

    name: "framework-cellbroadcast-shared-srcs",

    srcs: [

        ":modules-utils-preconditions-srcs",

        "android/os/HandlerExecutor.java",

        "android/util/LocalLog.java",

        "com/android/internal/util/IState.java",

        "com/android/internal/util/Preconditions.java",

        "com/android/internal/util/State.java",

        "com/android/internal/util/StateMachine.java",

    ],
@@ -360,10 +360,10 @@ filegroup { 
filegroup {

    name: "framework-ims-common-shared-srcs",

    srcs: [

        ":modules-utils-preconditions-srcs",

        "android/os/RegistrantList.java",

        "android/os/Registrant.java",

        "com/android/internal/os/SomeArgs.java",

        "com/android/internal/util/Preconditions.java",

    ],

}