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

Commit c78f59fb authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12118079 from 5f8c2fb4 to 24Q4-release 

Change-Id: Iee3d66fc7f202ee72b56703751f1ea78c3e10fa6
parents 0260fd55 5f8c2fb4

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -417,7 +417,6 @@ java_defaults { 
        "modules-utils-fastxmlserializer",

        "modules-utils-preconditions",

        "modules-utils-statemachine",

        "modules-utils-synchronous-result-receiver",

        "modules-utils-os",

        "modules-utils-uieventlogger-interface",

        "framework-permission-aidl-java",

apct-tests/perftests/multiuser/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -38,3 +38,10 @@ android_test { 
    ],

    certificate: "platform",

}



filegroup {

    name: "multi_user_trace_config",

    srcs: [

        "trace_configs/trace_config_multi_user.textproto",

    ],

}

api/api.go

+0 −16
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ type CombinedApisProperties struct { 


type CombinedApis struct {

	android.ModuleBase

	android.DefaultableModuleBase



	properties CombinedApisProperties

}
@@ -74,7 +73,6 @@ func init() { 


func registerBuildComponents(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("combined_apis", combinedApisModuleFactory)

	ctx.RegisterModuleType("combined_apis_defaults", CombinedApisModuleDefaultsFactory)

}



var PrepareForCombinedApisTest = android.FixtureRegisterWithContext(registerBuildComponents)
@@ -576,7 +574,6 @@ func combinedApisModuleFactory() android.Module { 
	module := &CombinedApis{}

	module.AddProperties(&module.properties)

	android.InitAndroidModule(module)

	android.InitDefaultableModule(module)

	android.AddLoadHook(module, func(ctx android.LoadHookContext) { module.createInternalModules(ctx) })

	return module

}
@@ -613,16 +610,3 @@ func remove(s []string, v string) []string { 
	}

	return s2

}
 


// Defaults

type CombinedApisModuleDefaults struct {

	android.ModuleBase

	android.DefaultsModuleBase

}



func CombinedApisModuleDefaultsFactory() android.Module {

	module := &CombinedApisModuleDefaults{}

	module.AddProperties(&CombinedApisProperties{})

	android.InitDefaultsModule(module)

	return module

}

core/java/android/app/ActivityThread.java

+1 −2
Original line number Diff line number Diff line
@@ -2105,8 +2105,7 @@ public final class ActivityThread extends ClientTransactionHandler 
        @Override

        public void scheduleTaskFragmentTransaction(@NonNull ITaskFragmentOrganizer organizer,

                @NonNull TaskFragmentTransaction transaction) throws RemoteException {

            // TODO(b/260873529): ITaskFragmentOrganizer can be cleanup to be a IBinder token

            // after flag removal.

            // TODO(b/352665082): ITaskFragmentOrganizer can be cleanup to be a IBinder token

            organizer.onTransactionReady(transaction);

        }

core/java/android/window/flags/windowing_sdk.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -3,16 +3,6 @@ container: "system" 


# Project link: https://gantry.corp.google.com/projects/android_platform_windowing_sdk/changes



# Using a fixed read only flag because there are ClientTransaction scheduling before

# WindowManagerService creation.

flag {

    namespace: "windowing_sdk"

    name: "bundle_client_transaction_flag"

    description: "To bundle multiple ClientTransactionItems into one ClientTransaction"

    bug: "260873529"

    is_fixed_read_only: true

}



flag {

    namespace: "windowing_sdk"

    name: "activity_embedding_overlay_presentation_flag"