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

Commit 527bbc01 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-7.1.0_r7' of https://android.googlesource.com/platform/frameworks/base into HEAD 

Android 7.1.0 release 7

# gpg: Signature made Fri 04 Nov 2016 11:14:07 AM PDT
# gpg:                using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
parents 14d1cfdc 9a618958

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/app/DownloadManager.java

+3 −3
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ public class DownloadManager { 
            if (cursor.moveToFirst()) {

                int status = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_STATUS));

                if (DownloadManager.STATUS_SUCCESSFUL == status) {

                    return ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id);

                   return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);

                }

            }

        } finally {
@@ -1461,7 +1461,7 @@ public class DownloadManager { 
     * @hide

     */

    public Uri getDownloadUri(long id) {

        return ContentUris.withAppendedId(mBaseUri, id);

        return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);

    }



    /**
@@ -1555,7 +1555,7 @@ public class DownloadManager { 


            // return content URI for cache download

            long downloadId = getLong(getColumnIndex(Downloads.Impl._ID));

            return ContentUris.withAppendedId(mBaseUri, downloadId).toString();

            return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, downloadId).toString();

        }



        private long getReason(int status) {

core/java/android/bluetooth/BluetoothDevice.java

+2 −2
Original line number Diff line number Diff line
@@ -1167,12 +1167,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
@@ -151,12 +151,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
@@ -1027,7 +1027,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;