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

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

Snap for 14055258 from 41cf3967 to 25Q4-release 

Change-Id: I533c2459777d66a20bfcbe654d8323bdb883e5a7
parents f85aa39a 41cf3967

api/api.go

+23 −7
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
package api



import (

	"fmt"

	"slices"



	"github.com/google/blueprint/proptools"
@@ -446,14 +447,28 @@ func createMergedTxts( 
	baseTxtModulePrefix string,

	stubsTypeSuffix string,

	doDist bool,

	checkedIn bool,

) {



	if checkedIn && doDist {

		ctx.ModuleErrorf("Checked in api txt files cannot be disted.")

	}



	checkedInPrefix := ""

	if checkedIn {

		checkedInPrefix = "checked-in-"

	}



	var textFiles []MergedTxtDefinition



	tagSuffix := []string{".api.txt}", ".removed-api.txt}"}

	tagSuffix := []string{

		fmt.Sprintf(".%sapi.txt}", checkedInPrefix),

		fmt.Sprintf(".%sremoved-api.txt}", checkedInPrefix),

	}

	distFilename := []string{"android.txt", "android-removed.txt"}

	for i, f := range []string{"current.txt", "removed.txt"} {

		textFiles = append(textFiles, MergedTxtDefinition{

			TxtFilename:  f,

			TxtFilename:  checkedInPrefix + f,

			DistFilename: distFilename[i],

			BaseTxt:      ":" + baseTxtModulePrefix + f,

			Modules:      bootclasspath,
@@ -461,7 +476,7 @@ func createMergedTxts( 
			Scope:        "public",

		})

		textFiles = append(textFiles, MergedTxtDefinition{

			TxtFilename:  f,

			TxtFilename:  checkedInPrefix + f,

			DistFilename: distFilename[i],

			BaseTxt:      ":" + baseTxtModulePrefix + "system-" + f,

			Modules:      bootclasspath,
@@ -469,7 +484,7 @@ func createMergedTxts( 
			Scope:        "system",

		})

		textFiles = append(textFiles, MergedTxtDefinition{

			TxtFilename:  f,

			TxtFilename:  checkedInPrefix + f,

			DistFilename: distFilename[i],

			BaseTxt:      ":" + baseTxtModulePrefix + "module-lib-" + f,

			Modules:      bootclasspath,
@@ -477,7 +492,7 @@ func createMergedTxts( 
			Scope:        "module-lib",

		})

		textFiles = append(textFiles, MergedTxtDefinition{

			TxtFilename:  f,

			TxtFilename:  checkedInPrefix + f,

			DistFilename: distFilename[i],

			BaseTxt:      ":" + baseTxtModulePrefix + "system-server-" + f,

			Modules:      system_server_classpath,
@@ -496,8 +511,9 @@ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) { 
	if ctx.Config().VendorConfig("ANDROID").Bool("include_nonpublic_framework_api") {

		bootclasspath.AppendSimpleValue(a.properties.Conditional_bootclasspath)

	}

	createMergedTxts(ctx, bootclasspath, system_server_classpath, "non-updatable-", "-", false)

	createMergedTxts(ctx, bootclasspath, system_server_classpath, "non-updatable-exportable-", "-exportable-", true)

	createMergedTxts(ctx, bootclasspath, system_server_classpath, "non-updatable-", "-", false, false)

	createMergedTxts(ctx, bootclasspath, system_server_classpath, "non-updatable-", "-", false, true)

	createMergedTxts(ctx, bootclasspath, system_server_classpath, "non-updatable-exportable-", "-exportable-", true, false)



	createMergedPublicStubs(ctx, bootclasspath)

	createMergedSystemStubs(ctx, bootclasspath)

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -13758,7 +13758,6 @@ package android.content.pm { 
    field public static final String FEATURE_FINGERPRINT = "android.hardware.fingerprint";

    field public static final String FEATURE_FREEFORM_WINDOW_MANAGEMENT = "android.software.freeform_window_management";

    field public static final String FEATURE_GAMEPAD = "android.hardware.gamepad";

    field @FlaggedApi("com.android.microxr.xr_glasses_feature") public static final String FEATURE_GLASSES = "android.hardware.type.glasses";

    field public static final String FEATURE_HARDWARE_KEYSTORE = "android.hardware.hardware_keystore";

    field public static final String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors";

    field public static final String FEATURE_HOME_SCREEN = "android.software.home_screen";
@@ -13869,6 +13868,7 @@ package android.content.pm { 
    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String FEATURE_XR_INPUT_CONTROLLER = "android.hardware.xr.input.controller";

    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String FEATURE_XR_INPUT_EYE_TRACKING = "android.hardware.xr.input.eye_tracking";

    field @FlaggedApi("android.xr.xr_manifest_entries") public static final String FEATURE_XR_INPUT_HAND_TRACKING = "android.hardware.xr.input.hand_tracking";

    field @FlaggedApi("com.android.microxr.xr_glasses_feature") public static final String FEATURE_XR_PERIPHERAL = "android.hardware.type.xr_peripheral";

    field public static final int FLAG_PERMISSION_WHITELIST_INSTALLER = 2; // 0x2

    field public static final int FLAG_PERMISSION_WHITELIST_SYSTEM = 1; // 0x1

    field public static final int FLAG_PERMISSION_WHITELIST_UPGRADE = 4; // 0x4
@@ -30454,7 +30454,7 @@ package android.net.http { 
  public class X509TrustManagerExtensions {

    ctor public X509TrustManagerExtensions(javax.net.ssl.X509TrustManager) throws java.lang.IllegalArgumentException;

    method public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(java.security.cert.X509Certificate[], String, String) throws java.security.cert.CertificateException;

    method @FlaggedApi("android.security.certificate_transparency_configuration") @NonNull public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(@NonNull java.security.cert.X509Certificate[], @Nullable byte[], @Nullable byte[], @NonNull String, @NonNull String) throws java.security.cert.CertificateException;

    method @NonNull public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(@NonNull java.security.cert.X509Certificate[], @Nullable byte[], @Nullable byte[], @NonNull String, @NonNull String) throws java.security.cert.CertificateException;

    method public boolean isSameTrustConfiguration(String, String);

    method public boolean isUserAddedCertificate(java.security.cert.X509Certificate);

  }
@@ -40940,7 +40940,7 @@ package android.security { 














  public class NetworkSecurityPolicy {















    method public static android.security.NetworkSecurityPolicy getInstance();













    method @FlaggedApi("android.security.certificate_transparency_configuration") public boolean isCertificateTransparencyVerificationRequired(@NonNull String);













    method public boolean isCertificateTransparencyVerificationRequired(@NonNull String);















    method public boolean isCleartextTrafficPermitted();















    method public boolean isCleartextTrafficPermitted(String);















  }

























core/java/android/app/Activity.java



+30
−0




























Original line number
Diff line number
Diff line








@@ -26,6 +26,8 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;













import static android.app.WindowConfiguration.inMultiWindowMode;















import static android.os.Process.myUid;





























import static com.android.window.flags.Flags.predictiveBackStopKeycodeBackForwarding;





























import static java.lang.Character.MIN_VALUE;































import android.Manifest;










@@ -166,6 +168,8 @@ import android.view.translation.UiTranslationSpec;













import android.widget.AdapterView;















import android.widget.Toast;















import android.widget.Toolbar;













import android.window.BackEvent;













import android.window.ObserverOnBackAnimationCallback;















import android.window.OnBackInvokedCallback;















import android.window.OnBackInvokedDispatcher;















import android.window.SplashScreen;










@@ -822,6 +826,7 @@ public class Activity extends ContextThemeWrapper













    private static final int LOG_AM_ON_TOP_RESUMED_GAINED_CALLED = 30064;















    private static final int LOG_AM_ON_TOP_RESUMED_LOST_CALLED = 30065;















    private OnBackInvokedCallback mDefaultBackCallback;













    private ObserverOnBackAnimationCallback mObserverBackCallback;































    /**















     * After {@link Build.VERSION_CODES#TIRAMISU},










@@ -1923,6 +1928,27 @@ public class Activity extends ContextThemeWrapper













            mDefaultBackCallback = this::onBackInvoked;















            getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback);















        }













        if (predictiveBackStopKeycodeBackForwarding()) {













            mObserverBackCallback = new ObserverOnBackAnimationCallback() {













                    @Override













                    public void onBackStarted(@NonNull BackEvent backEvent) {













                        onUserInteraction();













                    }



























                    @Override













                    public void onBackInvoked() {













                        onUserInteraction();













                    }



























                    @Override













                    public void onBackCancelled() {}













                };













            // Register a ObserverOnBackAnimationCallback with PRIORITY_SYSTEM_NAVIGATION_OBSERVER













            // to get notified on every back navigation so that onUserInteraction can be called.













            getOnBackInvokedDispatcher().registerOnBackInvokedCallback(













                    OnBackInvokedDispatcher.PRIORITY_SYSTEM_NAVIGATION_OBSERVER,













                    mObserverBackCallback);













        }















    }































    /**










@@ -3010,6 +3036,10 @@ public class Activity extends ContextThemeWrapper













            getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(mDefaultBackCallback);















            mDefaultBackCallback = null;















        }













        if (mObserverBackCallback != null) {













            getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(mObserverBackCallback);













            mObserverBackCallback = null;













        }































        if (mCallbacksController != null) {















            mCallbacksController.clearCallbacks();

































core/java/android/app/ActivityManager.java



+19
−2




























Original line number
Diff line number
Diff line








@@ -3446,7 +3446,11 @@ public class ActivityManager {













        }















    }





























    /** @hide */













    /**













     * Information you can retrieve about a particular connection to a













     * Service that is currently running in the system.













     * @hide













     */















    @TestApi















    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.















    public static final class ConnectionInfo implements Parcelable {










@@ -3515,16 +3519,25 @@ public class ActivityManager {













            return 0;















        }





























        /**













         * Get the bind service flags for the connection.













         */















        @SuppressLint("UnflaggedApi") // @TestApi without associated feature.













        public long getFlags() {













        public @Context.BindServiceFlagsLongBits long getFlags() {















            return mFlags;















        }





























        /**













         * Get the process name of the client.













         */















        @SuppressLint("UnflaggedApi") // @TestApi without associated feature.















        public @NonNull String getProcessName() {















            return mProcessName;















        }





























        /**













         * Get the package name of the client.













         */















        @SuppressLint("UnflaggedApi") // @TestApi without associated feature.















        public @NonNull String getPackageName() {















            return mPackageName;









@@ -3548,6 +3561,10 @@ public class ActivityManager {





























    /**















     * Returns a list of ConnectionInfo for connections bound to a given service.













     * @param service The component name of the service to return ConnectionInfo













     * records for.













     * @return Returns a list of ConnectionInfo records describing each of













     * the service connections.















     * @hide















     */















    @TestApi

































core/java/android/app/admin/PolicyIdentifier.java



+3
−2




























Original line number
Diff line number
Diff line








@@ -92,8 +92,9 @@ public final class PolicyIdentifier<T> {













     */















    @FlaggedApi(FLAG_POLICY_STREAMLINING)















    @NonNull













    @PolicyDefinition













    @BooleanPolicyDefinition













    @BooleanPolicyDefinition(













            base = @PolicyDefinition













    )















    public static final PolicyIdentifier<Boolean> SCREEN_CAPTURE_DISABLED = new PolicyIdentifier<>(















            SCREEN_CAPTURE_DISABLED_KEY);















}