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

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

Snap for 13412669 from 42954a53 to 25Q3-release 

Change-Id: Ic94b0b0cec4233351aef84dc8700e702d916352c
parents 60776ca5 42954a53

cmds/incidentd/src/Privacy.cpp

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include <android/os/IncidentReportArgs.h>

#include <stdlib.h>

#include <strstream>

#include <sstream>





namespace android {
@@ -26,7 +26,6 @@ namespace os { 
namespace incidentd {



using namespace android::os;

using std::strstream;



uint64_t encode_field_id(const Privacy* p) { return (uint64_t)p->type << 32 | p->field_id; }
@@ -34,7 +33,7 @@ string Privacy::toString() const { 
    if (this == NULL) {

        return "Privacy{null}";

    }

    strstream os;

    std::ostringstream os;

    os << "Privacy{field_id=" << field_id << " type=" << ((int)type)

            << " children=" << ((void*)children) << " policy=" << ((int)policy) << "}";

    return os.str();

core/java/android/app/ContentProviderHolder.java

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ public class ContentProviderHolder implements Parcelable { 
        dest.writeStrongBinder(connection);

        dest.writeInt(noReleaseNeeded ? 1 : 0);

        dest.writeInt(mLocal ? 1 : 0);

        dest.writeInt(noReleaseNeededIfUnstable ? 1 : 0);

    }



    public static final @android.annotation.NonNull Parcelable.Creator<ContentProviderHolder> CREATOR
@@ -89,5 +90,6 @@ public class ContentProviderHolder implements Parcelable { 
        connection = source.readStrongBinder();

        noReleaseNeeded = source.readInt() != 0;

        mLocal = source.readInt() != 0;

        noReleaseNeededIfUnstable = source.readInt() != 0;

    }

}

core/java/android/os/Parcel.java

+17 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.internal.util.ArrayUtils; 


import dalvik.annotation.optimization.CriticalNative;

import dalvik.annotation.optimization.FastNative;

import dalvik.annotation.optimization.NeverInline;



import java.nio.BufferOverflowException;

import java.nio.ReadOnlyBufferException;
@@ -641,6 +642,21 @@ public final class Parcel { 
        }

    }



    @NeverInline

    private void errorUsedWhileRecycling() {

        String error = "Parcel used while recycled. "

                + Log.getStackTraceString(new Throwable())

                + " Original recycle call (if DEBUG_RECYCLE): ", mStack;

        Log.wtf(TAG, error);

        // TODO(b/381155347): harder error

    }



    // TODO: call in more places, it costs a _lot_ to use this in many

    // places, see b/390748425 for instance. Used as canary for now.

    private void assertNotRecycled() {

        if (mRecycled) errorUsedWhileRecycling();

    }



    /**

     * Set a {@link ReadWriteHelper}, which can be used to avoid having duplicate strings, for

     * example.
@@ -5203,6 +5219,7 @@ public final class Parcel { 
    @SuppressWarnings("unchecked")

    @Nullable

    private <T> T readParcelableInternal(@Nullable ClassLoader loader, @Nullable Class<T> clazz) {

        assertNotRecycled();

        Parcelable.Creator<?> creator = readParcelableCreatorInternal(loader, clazz);

        if (creator == null) {

            return null;

core/java/android/view/flags/view_flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -156,3 +156,13 @@ flag { 
    bug: "394397033"

    is_fixed_read_only: false

}



flag {

    name: "notify_gpu_load_up"

    namespace: "systemui"

    description: "Add an API to notify GPU load up."

    bug: "413723751"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -6232,6 +6232,8 @@ 
    <string name="accessibility_autoclick_long_press">Long press</string>

    <!-- Label for autoclick pause button [CHAR LIMIT=NONE] -->

    <string name="accessibility_autoclick_pause">Pause</string>

    <!-- Label for autoclick resume button [CHAR LIMIT=NONE] -->

    <string name="accessibility_autoclick_resume">Resume</string>

    <!-- Label for autoclick position button [CHAR LIMIT=NONE] -->

    <string name="accessibility_autoclick_position">Position</string>

    <!-- Label for autoclick scroll up button [CHAR LIMIT=NONE] -->