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

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

Snap for 13572966 from 14dd4f8a to 25Q3-release 

Change-Id: I0c8831c8266277a03c09fd48a652e14caebb4164
parents d0bbfde6 14dd4f8a

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -527,7 +527,8 @@ java_library { 
            "FlaggedApi",

        ],

    },

    header_jar_override: "framework-minus-apex-headers",

    // TODO(b/420930377): Reenable header_jar_override once it's properly working.

    // header_jar_override: "framework-minus-apex-headers",

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

    jarjar_shards: "10",

}

cmds/bu/src/com/android/commands/bu/Backup.java

+32 −15
Original line number Diff line number Diff line
@@ -203,20 +203,37 @@ public final class Backup { 
    }



    private static void showUsage() {

        System.err.println(" backup [-user USER_ID] [-f FILE] [-apk|-noapk] [-obb|-noobb] [-shared|-noshared]");

        System.err.println("        [-all] [-system|-nosystem] [-keyvalue|-nokeyvalue] [PACKAGE...]");

        System.err.println("     write an archive of the device's data to FILE [default=backup.adb]");

        System.err.println("     package list optional if -all/-shared are supplied");

        System.err.println("     -user: user ID for which to perform the operation (default - system user)");

        System.err.println("     -apk/-noapk: do/don't back up .apk files (default -noapk)");

        System.err.println("     -obb/-noobb: do/don't back up .obb files (default -noobb)");

        System.err.println("     -shared|-noshared: do/don't back up shared storage (default -noshared)");

        System.err.println("     -all: back up all installed applications");

        System.err.println("     -system|-nosystem: include system apps in -all (default -system)");

        System.err.println("     -keyvalue|-nokeyvalue: include apps that perform key/value backups.");

        System.err.println("         (default -nokeyvalue)");

        System.err.println(" restore [-user USER_ID] FILE       restore device contents from FILE");

        System.err.println("     -user: user ID for which to perform the operation (default - system user)");

        System.err.println("""

        Usage: bu <command> [options]



        Commands:

          backup [-user USER_ID] [-apk|-noapk] [-obb|-noobb] [-shared|-noshared]

                 [-all] [-system|-nosystem] [-widgets|-nowidgets]

                 [-compress|-nocompress] [-keyvalue|-nokeyvalue] [PACKAGE...]

            Write an archive of the device's data to stdout.

            The package list is optional if -all or -shared is supplied.

            Example: bu backup -all -apk > backup.ab



          restore [-user USER_ID]

            Restore device contents from stdin.

            Example: bu restore < backup.ab



        Global options:

          -user USER_ID: user ID for which to perform the operation (default - system user)



        Options for 'backup':

          -apk/-noapk: do/don't back up .apk files (default -noapk)

          -obb/-noobb: do/don't back up .obb files (default -noobb)

          -shared|-noshared: do/don't back up shared storage (default -noshared)

          -all: back up all installed applications

          -system|-nosystem: include system apps in -all (default -system)

          -widgets|-nowidgets: do/don't back up widget data (default: -nowidgets)

          -compress|-nocompress: enable/disable compression of the backup data (default: -compress)

          -keyvalue|-nokeyvalue: do/don't back up apps that are key/value based

                                 (default: -nokeyvalue)



        'restore' command does not take any package names or options other than -user.

                """);

    }



    private String nextArg() {

cmds/incidentd/src/report_directory.cpp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <sys/types.h>

#include <unistd.h>



#include <algorithm>

#include <vector>



namespace android {

core/api/current.txt

+8 −3
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ package android { 
    field public static final int allowBackup = 16843392; // 0x1010280

    field public static final int allowClearUserData = 16842757; // 0x1010005

    field public static final int allowClickWhenDisabled = 16844312; // 0x1010618

    field @FlaggedApi("android.security.asm_restrictions_enabled") public static final int allowCrossUidActivitySwitchFromBelow = 16844449; // 0x10106a1

    field public static final int allowCrossUidActivitySwitchFromBelow = 16844449; // 0x10106a1

    field public static final int allowEmbedded = 16843765; // 0x10103f5

    field public static final int allowGameAngleDriver = 16844376; // 0x1010658

    field public static final int allowGameDownscaling = 16844377; // 0x1010659
@@ -4684,7 +4684,7 @@ package android.app { 
    method @NonNull public final <T extends android.view.View> T requireViewById(@IdRes int);

    method public final void runOnUiThread(Runnable);

    method public void setActionBar(@Nullable android.widget.Toolbar);

    method @FlaggedApi("android.security.asm_restrictions_enabled") public void setAllowCrossUidActivitySwitchFromBelow(boolean);

    method public void setAllowCrossUidActivitySwitchFromBelow(boolean);

    method public void setContentTransitionManager(android.transition.TransitionManager);

    method public void setContentView(@LayoutRes int);

    method public void setContentView(android.view.View);
@@ -14422,7 +14422,7 @@ package android.content.res { 
    method public android.content.res.AssetFileDescriptor openRawResourceFd(@RawRes int) throws android.content.res.Resources.NotFoundException;

    method public void parseBundleExtra(String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;

    method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;

    method @FlaggedApi("android.content.res.register_resource_paths") public static void registerResourcePaths(@NonNull String, @NonNull android.content.pm.ApplicationInfo);

    method public static void registerResourcePaths(@NonNull String, @NonNull android.content.pm.ApplicationInfo);

    method public void removeLoaders(@NonNull android.content.res.loader.ResourcesLoader...);

    method @Deprecated public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);

    field @AnyRes public static final int ID_NULL = 0; // 0x0
@@ -33913,6 +33913,10 @@ package android.os { 
    method @Deprecated public static int getGlobalFreedCount();

    method @Deprecated public static int getGlobalFreedSize();

    method @Deprecated public static int getGlobalGcInvocationCount();

    method @FlaggedApi("android.os.count_class_instances_api") public static long getInstanceCount(@NonNull Class);

    method @FlaggedApi("android.os.count_class_instances_api") public static long getInstanceCount(@NonNull Class, boolean);

    method @FlaggedApi("android.os.count_class_instances_api") @NonNull public static long[] getInstanceCounts(@NonNull java.util.List<java.lang.Class>);

    method @FlaggedApi("android.os.count_class_instances_api") @NonNull public static long[] getInstanceCounts(@NonNull java.util.List<java.lang.Class>, boolean);

    method public static int getLoadedClassCount();

    method public static void getMemoryInfo(android.os.Debug.MemoryInfo);

    method public static long getNativeHeapAllocatedSize();
@@ -55128,6 +55132,7 @@ package android.view { 
    method @FlaggedApi("android.companion.virtualdevice.flags.viewconfiguration_apis") public float getScrollFrictionAmount();

    method public static int getTapTimeout();

    method @FlaggedApi("android.companion.virtualdevice.flags.viewconfiguration_apis") public int getTapTimeoutMillis();

    method @FlaggedApi("android.view.accessibility.text_cursor_blink_interval") public int getTextCursorBlinkIntervalMillis();

    method @Deprecated public static int getTouchSlop();

    method @Deprecated public static int getWindowTouchSlop();

    method public static long getZoomControlsTimeout();

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ package android.os { 
    method public static void invalidateCache(@NonNull String, @NonNull String);

    method @Nullable public Result query(@NonNull Query);

    method @FlaggedApi("android.os.ipc_data_cache_testmode_apis") public static void setCacheTestMode(boolean);

    field @FlaggedApi("android.os.ipc_data_cache_module_adservices") public static final String MODULE_ADSERVICES = "adservices";

    field public static final String MODULE_BLUETOOTH = "bluetooth";

  }