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

Commit 0a112d52 authored by Xin Li's avatar Xin Li
Browse files

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 

Bug: 166295507
Merged-In: Id18cb0e2d2f3e776a42b566c4a1af2e250890896
Change-Id: Iba7cab32ab3aa6f47952c840ff6dc8492e8d0704
parents ebd6a0f3 8ac68188

adb/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -752,6 +752,8 @@ cc_test { 
        "mdns_test.cpp",

    ],



    test_config: "adb_test.xml",



    shared_libs: [

        "liblog",

    ],

adb/adb_test.xml

0 → 100644
+37 −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.

-->

<!-- This test config file is auto-generated. -->

<configuration description="Runs adbd_test.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-native" />



    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push" value="adbd_test->/data/local/tmp/adbd_test" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="adbd_test" />

    </test>



    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

      <option name="mainline-module-package-name" value="com.google.android.adbd" />

    </object>

</configuration>

adb/apex/apex_manifest.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.adbd",

  "version": 1

  "version": 300000000

}

adb/client/incremental_utils.cpp

+2 −1
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ static std::pair<ZipArchiveHandle, std::unique_ptr<android::base::MappedFile>> o 
static std::vector<int32_t> InstallationPriorityBlocks(borrowed_fd fd, Size fileSize) {

    static constexpr std::array<std::string_view, 3> additional_matches = {

            "resources.arsc"sv, "AndroidManifest.xml"sv, "classes.dex"sv};



    auto [zip, _] = openZipArchive(fd, fileSize);

    if (!zip) {

        return {};
@@ -358,7 +359,7 @@ static std::vector<int32_t> InstallationPriorityBlocks(borrowed_fd fd, Size file 


std::vector<int32_t> PriorityBlocksForFile(const std::string& filepath, borrowed_fd fd,

                                           Size fileSize) {

    if (!android::base::EndsWithIgnoreCase(filepath, ".apk"sv)) {

    if (!android::base::EndsWithIgnoreCase(filepath, ".apk")) {

        return {};

    }

    off64_t signerOffset = SignerBlockOffset(fd, fileSize);

adb/daemon/adb_wifi.cpp

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ static struct adisconnect adb_disconnect = {adb_disconnected, nullptr}; 


static void adb_disconnected(void* unused, atransport* t) {

    LOG(INFO) << "ADB wifi device disconnected";

    adbd_auth_tls_device_disconnected(auth_ctx, kAdbTransportTypeWifi, t->auth_id);

    CHECK(t->auth_id.has_value());

    adbd_auth_tls_device_disconnected(auth_ctx, kAdbTransportTypeWifi, t->auth_id.value());

}



// TODO(b/31559095): need bionic host so that we can use 'prop_info' returned