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

Commit 4cf95bee authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 23529 into eclair

* changes:
  Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
parents 75d9c2e9 75a3d0a2
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -3284,7 +3284,16 @@ bool ResTable::collectString(String16* outString,
                    break;
                }
                if (c == '\'' && (quoted == 0 || quoted == '\'')) {
                    break;
                    /*
                     * In practice, when people write ' instead of \'
                     * in a string, they are doing it by accident
                     * instead of really meaning to use ' as a quoting
                     * character.  Warn them so they don't lose it.
                     */
                    if (outErrorMsg) {
                        *outErrorMsg = "Apostrophe not preceded by \\";
                    }
                    return false;
                }
            }
            p++;