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

Commit 04f4cd21 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7360053 from 1aa8e74d to sc-release 

Change-Id: I8e8d63e220324929f758236171d9c1f8b4a36d74
parents 75eb1dd2 1aa8e74d

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

    ],

StubLibraries.bp

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ modules_public_stubs = [ 


modules_system_stubs = [

    "android.net.ipsec.ike.stubs.system",

    "art.module.public.api.stubs", // Only has public stubs

    "art.module.public.api.stubs",

    "conscrypt.module.public.api.stubs", // Only has public stubs

    "framework-appsearch.stubs.system",

    "framework-connectivity.stubs.system",

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. */