diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-04-06 19:24:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-06 19:24:24 -0700 |
| commit | 8a9196e8f26a7d657167df1ec9d3c9470f107e19 (patch) | |
| tree | e05ca660937dac134be15124cfda21c93db989b8 /res | |
| parent | c36a08f30db084076c7a353bedcb4eddd24aef14 (diff) | |
| parent | a70d2697103d1dd667aa0f067d263b75fe65c53c (diff) | |
| download | android_packages_apps_Snap-8a9196e8f26a7d657167df1ec9d3c9470f107e19.tar.gz android_packages_apps_Snap-8a9196e8f26a7d657167df1ec9d3c9470f107e19.tar.bz2 android_packages_apps_Snap-8a9196e8f26a7d657167df1ec9d3c9470f107e19.zip | |
Merge "SnapdragonCamera: Handle Camera device errors gracefully."
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/qcomstrings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 5bab9841b..0742577fc 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -886,5 +886,9 @@ <string name="text_tsmakeup_alert_quit">Quit</string> <string name="all_in_focus">All in Focus</string> + + <string name="camera_thermal_shutdown">Phone overheated, closing camera.</string> + <string name="camera_server_died">Media server died, closing camera.</string> + <string name="camera_unknown_error">Unknown error, closing camera.</string> </resources> |