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

Commit ba202308 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6157842 from 75df83e9 to rvc-release 

Change-Id: I911193369b7dec83749c1364c1e5907e8c2bedc8
parents 9a879d4a 75df83e9

cmds/cmd/cmd.cpp

+2 −1
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ int cmdMain(const std::vector<std::string_view>& argv, TextOutput& outputLog, Te 
    sp<MyResultReceiver> result = new MyResultReceiver();



#if DEBUG

    ALOGD("cmd: Invoking %s in=%d, out=%d, err=%d", cmd, in, out, err);

    ALOGD("cmd: Invoking %.*s in=%d, out=%d, err=%d",

          static_cast<int>(cmd.size()), cmd.data(), in, out, err);

#endif



    // TODO: block until a result is returned to MyResultReceiver.

data/etc/android.hardware.context_hub.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Features for devices supporting a Context Hub. -->

<permissions>

    <feature name="android.hardware.context_hub" />

</permissions>

data/etc/android.software.vulkan.deqp.level-2019-03-01.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- This is the standard feature indicating that the device passes Vulkan deQP

     tests associated with date 2019-03-01 (0x07E30301). -->

<permissions>

    <feature name="android.software.vulkan.deqp.level" version="132317953" />

</permissions>

data/etc/android.software.vulkan.deqp.level-2020-03-01.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- This is the standard feature indicating that the device passes Vulkan deQP

     tests associated with date 2020-03-01 (0x07E40301). -->

<permissions>

    <feature name="android.software.vulkan.deqp.level" version="132383489" />

</permissions>

include/android/bitmap.h

+3 −3
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ enum AndroidBitmapCompressFormat { 
 *  @param size Length in bytes of data to write.

 *  @return Whether the operation succeeded.

 */

typedef bool (*AndroidBitmap_compress_write_fn)(void* userContext,

typedef bool (*AndroidBitmap_CompressWriteFunc)(void* userContext,

                                                const void* data,

                                                size_t size) __INTRODUCED_IN(30);
@@ -205,7 +205,7 @@ typedef bool (*AndroidBitmap_compress_write_fn)(void* userContext, 
 *                 differently depending on the

 *                 {@link AndroidBitmapCompressFormat}.

 *  @param userContext User-defined data which will be passed to the supplied

 *                     {@link AndroidBitmap_compress_write_fn} each time it is

 *                     {@link AndroidBitmap_CompressWriteFunc} each time it is

 *                     called. May be null.

 *  @parm fn Function that writes the compressed data. Will be called each time

 *           the compressor has compressed more data that is ready to be
@@ -218,7 +218,7 @@ int AndroidBitmap_compress(const AndroidBitmapInfo* info, 
                           const void* pixels,

                           int32_t format, int32_t quality,

                           void* userContext,

                           AndroidBitmap_compress_write_fn fn) __INTRODUCED_IN(30);

                           AndroidBitmap_CompressWriteFunc fn) __INTRODUCED_IN(30);



struct AHardwareBuffer;