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

Commit 65984f35 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android-framework.lnx.2.0-00018. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1078788   I78484c59e4de1dff685ab91a0a8e7a756fffd9bf   Only return password for account session flow if the cal
1078792   I887de32d156e672ec44aa0b286cd7ea7f9f8ad55   Fix setPairingConfirmation permissions issue (2/2)
1078771   I6d3f9faec32d54360caa6706d17405e20b50966c   Ensure munmap matches mmap
1078699   I115a42601c774062485974042464abb0d65c35e9   DO NOT MERGE) ExifInterface: Make saveAttributes throw a
1078772   I141ecf90b5f0e708a21d27141b6fec6074e5d475   DO NOT MERGE Stop work challenge freeform bypass
1078784   I2a9e78196ba7455324e485f098f095d03b47ee15   DO NOT MERGE Check caller for sending media key to globa
1078907   I0b613f8ce0f014320c5ac1bf445699ea2702a0a2   Catch all exceptions when parsing IME meta data
1078404   I5dcbb92d4539c77ef302b1b7e0fb72c0fd044b03   config: operator specific domestic roaming list

Change-Id: I028c22619805da789a98c2add3af36b23e094e30
CRs-Fixed: 1078404, 1078699, 1078792, 1078784, 1078907, 1078772, 1078771, 1078788
parents 8348db2f 4e760828

core/java/android/accounts/AccountManager.java

+0 −4
Original line number Diff line number Diff line
@@ -2702,8 +2702,6 @@ public class AccountManager { 
     *         <ul>

     *         <li>{@link #KEY_ACCOUNT_SESSION_BUNDLE} - encrypted Bundle for

     *         adding the the to the device later.

     *         <li>{@link #KEY_PASSWORD} - optional, the password or password

     *         hash of the account.

     *         <li>{@link #KEY_ACCOUNT_STATUS_TOKEN} - optional, token to check

     *         status of the account

     *         </ul>
@@ -2791,8 +2789,6 @@ public class AccountManager { 
     *         <ul>

     *         <li>{@link #KEY_ACCOUNT_SESSION_BUNDLE} - encrypted Bundle for

     *         updating the local credentials on device later.

     *         <li>{@link #KEY_PASSWORD} - optional, the password or password

     *         hash of the account

     *         <li>{@link #KEY_ACCOUNT_STATUS_TOKEN} - optional, token to check

     *         status of the account

     *         </ul>

core/java/android/bluetooth/BluetoothDevice.java

+2 −2
Original line number Diff line number Diff line
@@ -1164,12 +1164,12 @@ public final class BluetoothDevice implements Parcelable { 


    /**

     * Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}.

     *

     * @return true confirmation has been sent out

     *         false for error

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setPairingConfirmation(boolean confirm) {

        if (sService == null) {

            Log.e(TAG, "BT not enabled. Cannot set pairing confirmation");

core/jni/android/graphics/Bitmap.cpp

+3 −3
Original line number Diff line number Diff line
@@ -150,12 +150,12 @@ Bitmap::Bitmap(void* address, void* context, FreeFunc freeFunc, 
    mPixelRef->unref();

}



Bitmap::Bitmap(void* address, int fd,

Bitmap::Bitmap(void* address, int fd, size_t mappedSize,

            const SkImageInfo& info, size_t rowBytes, SkColorTable* ctable)

        : mPixelStorageType(PixelStorageType::Ashmem) {

    mPixelStorage.ashmem.address = address;

    mPixelStorage.ashmem.fd = fd;

    mPixelStorage.ashmem.size = ashmem_get_size_region(fd);

    mPixelStorage.ashmem.size = mappedSize;

    mPixelRef.reset(new WrappedPixelRef(this, address, info, rowBytes, ctable));

    // Note: this will trigger a call to onStrongRefDestroyed(), but

    // we want the pixel ref to have a ref count of 0 at this point
@@ -1026,7 +1026,7 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) { 


        // Map the pixels in place and take ownership of the ashmem region.

        nativeBitmap = GraphicsJNI::mapAshmemPixelRef(env, bitmap.get(),

                ctable, dupFd, const_cast<void*>(blob.data()), !isMutable);

                ctable, dupFd, const_cast<void*>(blob.data()), size, !isMutable);

        SkSafeUnref(ctable);

        if (!nativeBitmap) {

            close(dupFd);

core/jni/android/graphics/Bitmap.h

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ public: 
            const SkImageInfo& info, size_t rowBytes, SkColorTable* ctable);

    Bitmap(void* address, void* context, FreeFunc freeFunc,

            const SkImageInfo& info, size_t rowBytes, SkColorTable* ctable);

    Bitmap(void* address, int fd, const SkImageInfo& info, size_t rowBytes,

            SkColorTable* ctable);

    Bitmap(void* address, int fd, size_t mappedSize, const SkImageInfo& info,

            size_t rowBytes, SkColorTable* ctable);



    const SkImageInfo& info() const;

core/jni/android/graphics/Graphics.cpp

+5 −4
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ android::Bitmap* GraphicsJNI::allocateAshmemPixelRef(JNIEnv* env, SkBitmap* bitm 
        return nullptr;

    }



    android::Bitmap* wrapper = new android::Bitmap(addr, fd, info, rowBytes, ctable);

    android::Bitmap* wrapper = new android::Bitmap(addr, fd, size, info, rowBytes, ctable);

    wrapper->getSkBitmap(bitmap);

    // since we're already allocated, we lockPixels right away

    // HeapAllocator behaves this way too
@@ -623,7 +623,7 @@ android::Bitmap* GraphicsJNI::allocateAshmemPixelRef(JNIEnv* env, SkBitmap* bitm 
}



android::Bitmap* GraphicsJNI::mapAshmemPixelRef(JNIEnv* env, SkBitmap* bitmap,

        SkColorTable* ctable, int fd, void* addr, bool readOnly) {

        SkColorTable* ctable, int fd, void* addr, size_t size, bool readOnly) {

    const SkImageInfo& info = bitmap->info();

    if (info.colorType() == kUnknown_SkColorType) {

        doThrowIAE(env, "unknown bitmap configuration");
@@ -633,7 +633,8 @@ android::Bitmap* GraphicsJNI::mapAshmemPixelRef(JNIEnv* env, SkBitmap* bitmap, 
    if (!addr) {

        // Map existing ashmem region if not already mapped.

        int flags = readOnly ? (PROT_READ) : (PROT_READ | PROT_WRITE);

        addr = mmap(NULL, ashmem_get_size_region(fd), flags, MAP_SHARED, fd, 0);

        size = ashmem_get_size_region(fd);

        addr = mmap(NULL, size, flags, MAP_SHARED, fd, 0);

        if (addr == MAP_FAILED) {

            return nullptr;

        }
@@ -643,7 +644,7 @@ android::Bitmap* GraphicsJNI::mapAshmemPixelRef(JNIEnv* env, SkBitmap* bitmap, 
    // attempting to compute our own.

    const size_t rowBytes = bitmap->rowBytes();



    android::Bitmap* wrapper = new android::Bitmap(addr, fd, info, rowBytes, ctable);

    android::Bitmap* wrapper = new android::Bitmap(addr, fd, size, info, rowBytes, ctable);

    wrapper->getSkBitmap(bitmap);

    if (readOnly) {

        bitmap->pixelRef()->setImmutable();