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

Commit 7ac68008 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "No need to std::move local variable to return value" into main... 

Merge "Merge "No need to std::move local variable to return value" into main am: 608316b4 am: 7db248a4" into main
parents 92277317 885500b0

libs/androidfw/Asset.cpp

+2 −4
Original line number Diff line number Diff line
@@ -309,9 +309,8 @@ Asset::Asset(void) 
        return NULL;

    }



    // We succeeded, so relinquish control of dataMap

    pAsset->mAccessMode = mode;

    return std::move(pAsset);

    return pAsset;

}



/*
@@ -328,9 +327,8 @@ Asset::Asset(void) 
      return NULL;

  }



  // We succeeded, so relinquish control of dataMap

  pAsset->mAccessMode = mode;

  return std::move(pAsset);

  return pAsset;

}



/*