tree 47af03e61d8b2122047c6f17cb69306cc15c2914
parent f256b722f427275e7d149aab2bad301fc6e04d49
author Matt Mower <mowerm@gmail.com> 1424658018 -0600
committer Ethan Yonker <dees_troy@teamw.in> 1434833876 -0500

Cleanup device_id retrieval

* If TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID is defined:
  - provide the header that defines property functions/constants
  - actually look for hardware_id before attempting to append it
* Perform string length checks rigorously.
* Only perform newline removal if string is used before sanitization.
* Copy changes to htcdumlock, but rely on cmdline only.

ps3: fix merge conflict in data.cpp includes

Change-Id: I720d3bc8416758f5f83782e8bc298b32eda1a573