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

Commit 59227924 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't use String8::empty" into main am: d8ac0c19 am: 1c7d5fb9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2707675



Change-Id: Id1b87ffb8ef2ae6e805e7e1f97e0f859e87674a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8439eec7 1c7d5fb9

tools/aapt/Command.cpp

+2 −2
Original line number Diff line number Diff line
@@ -353,8 +353,8 @@ static void printCompatibleScreens(ResXMLTree& tree, String8* outError) { 
}



static void printUsesPermission(const String8& name, bool optional=false, int maxSdkVersion=-1,

        const String8& requiredFeature = String8::empty(),

        const String8& requiredNotFeature = String8::empty()) {

        const String8& requiredFeature = String8(),

        const String8& requiredNotFeature = String8()) {

    printf("uses-permission: name='%s'", ResTable::normalizeForOutput(name.string()).string());

    if (maxSdkVersion != -1) {

         printf(" maxSdkVersion='%d'", maxSdkVersion);