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

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

Snap for 12667701 from 72ddf9b3 to 25Q2-release 

Change-Id: Id55d03d36d3f5a643655df965375a71cd62d5777
parents 724b9004 72ddf9b3

AconfigFlags.bp

+17 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ aconfig_declarations_group { 
        "android.service.dreams.flags-aconfig-java",

        "android.service.notification.flags-aconfig-java",

        "android.service.appprediction.flags-aconfig-java",

        "android.service.quickaccesswallet.flags-aconfig-java",

        "android.service.voice.flags-aconfig-java",

        "android.speech.flags-aconfig-java",

        "android.systemserver.flags-aconfig-java",
@@ -111,6 +112,7 @@ aconfig_declarations_group { 
        "framework_graphics_flags_java_lib",

        "hwui_flags_java_lib",

        "interaction_jank_monitor_flags_lib",

        "keystore2_flags_java-framework",

        "libcore_exported_aconfig_flags_lib",

        "libcore_readonly_aconfig_flags_lib",

        "libgui_flags_java_lib",
@@ -1774,3 +1776,18 @@ java_aconfig_library { 
    aconfig_declarations: "aconfig_settingslib_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Quick Access Wallet

aconfig_declarations {

    name: "android.service.quickaccesswallet.flags-aconfig",

    package: "android.service.quickaccesswallet",

    exportable: true,

    container: "system",

    srcs: ["core/java/android/service/quickaccesswallet/flags.aconfig"],

}



java_aconfig_library {

    name: "android.service.quickaccesswallet.flags-aconfig-java",

    aconfig_declarations: "android.service.quickaccesswallet.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

Android.bp

+11 −3
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ filegroup { 
        ":android.hardware.radio.data-V3-java-source",

        ":android.hardware.radio.network-V3-java-source",

        ":android.hardware.radio.voice-V3-java-source",

        ":android.hardware.security.keymint-V3-java-source",

        ":android.hardware.security.secureclock-V1-java-source",

        ":android.hardware.thermal-V3-java-source",

        ":android.hardware.tv.tuner-V3-java-source",
@@ -116,7 +115,6 @@ filegroup { 
        ":android.security.legacykeystore-java-source",

        ":android.security.maintenance-java-source",

        ":android.security.metrics-java-source",

        ":android.system.keystore2-V4-java-source",

        ":android.hardware.cas-V1-java-source",

        ":credstore_aidl",

        ":dumpstate_aidl",
@@ -149,7 +147,16 @@ filegroup { 
        ":statslog-framework-java-gen", // FrameworkStatsLog.java

        ":statslog-hwui-java-gen", // HwuiStatsLog.java

        ":audio_policy_configuration_V7_0",

    ] + select(release_flag("RELEASE_ATTEST_MODULES"), {

        true: [

            ":android.hardware.security.keymint-V4-java-source",

            ":android.system.keystore2-V5-java-source",

        ],

        default: [

            ":android.hardware.security.keymint-V3-java-source",

            ":android.system.keystore2-V4-java-source",

        ],

    }),

}



java_library {
@@ -398,6 +405,7 @@ java_defaults { 
        "bouncycastle-repackaged-unbundled",

        "com.android.sysprop.foldlockbehavior",

        "com.android.sysprop.view",

        "configinfra_framework_flags_java_lib",

        "framework-internal-utils",

        "dynamic_instrumentation_manager_aidl-java",

        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

FF_LEADS_OWNERS

0 → 100644
+10 −0
Original line number Diff line number Diff line 
bills@google.com

carmenjackson@google.com

nalini@google.com

nosh@google.com

olilan@google.com

philipcuadra@google.com

rajekumar@google.com

shayba@google.com

timmurray@google.com

zezeozue@google.com

apct-tests/perftests/windowmanager/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
// limitations under the License.



package {

    default_team: "trendy_team_input_framework",

    default_team: "trendy_team_windowing_animations_transitions",

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

apex/jobscheduler/framework/java/android/app/JobSchedulerImpl.java

+12 −0
Original line number Diff line number Diff line
@@ -25,11 +25,13 @@ import android.app.job.JobInfo; 
import android.app.job.JobScheduler;

import android.app.job.JobSnapshot;

import android.app.job.JobWorkItem;

import android.app.job.PendingJobReasonsInfo;

import android.content.Context;

import android.content.pm.ParceledListSlice;

import android.os.RemoteException;

import android.util.ArrayMap;



import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.Set;
@@ -182,6 +184,16 @@ public class JobSchedulerImpl extends JobScheduler { 
        }

    }



    @Override

    @NonNull

    public List<PendingJobReasonsInfo> getPendingJobReasonsHistory(int jobId) {

        try {

            return mBinder.getPendingJobReasonsHistory(mNamespace, jobId);

        } catch (RemoteException e) {

            return Collections.EMPTY_LIST;

        }

    }



    @Override

    public boolean canRunUserInitiatedJobs() {

        try {