Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Show a toast when details cannot be added to zip file." into nyc-dev am: f39f044 am: 7c7af7b" into nyc-mr1-dev-plus-aosp

Browse Source 
am: d7df808

* commit 'd7df808bf7c39261c1aae1faefba5ec36deced02':
  Show a toast when details cannot be added to zip file.

Change-Id: I6c923972ac961567bffe38926ec8946802dce035
This commit is contained in:
Felipe Leme
2016-04-22 23:51:02 +00:00
committed by android-build-merger
parent 7c92003cd1 d7df808bf7
commit 4bb5c0fbb6
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Shell/res/values/strings.xml
View File

@@ -44,6 +44,8 @@
<!-- Toast message sent when the bugreport file could be read. -->
<string name="bugreport_unreadable_text">Bug report file could not be read</string>
<!-- Toast message sent when the bugreport details could not be added to the zip file. -->
<string name="bugreport_add_details_to_zip_failed">Couldn\'t add bug report details to zip file</string>
<!-- Title for bug reports received from dumpstate without a name. [CHAR LIMIT=30]-->
<string name="bugreport_unnamed">unnamed</string>

2
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -1134,6 +1134,8 @@ public class BugreportProgressService extends Service {
addEntry(zos, "description.txt", info.description);
} catch (IOException e) {
Log.e(TAG, "exception zipping file " + tmpZip, e);
Toast.makeText(mContext, R.string.bugreport_add_details_to_zip_failed,
Toast.LENGTH_LONG).show();
return;
} finally {
// Make sure it only tries to add details once, even it fails the first time.