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

Commit e802b592 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 

* commit '2107757d':
  Make AaptGroupEntry::getMncName accept mnc00
parents 3100207b 2107757d

tools/aapt/AaptAssets.cpp

+3 −5
Original line number Diff line number Diff line
@@ -685,13 +685,11 @@ bool AaptGroupEntry::getMncName(const char* name, 
    if (*c != 0) return false;

    if (c-val == 0 || c-val > 3) return false;



    int d = atoi(val);

    if (d != 0) {

        if (out) out->mnc = d;

        return true;

    if (out) {

        out->mnc = atoi(val);

    }



    return false;

    return true;

}



/*