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

Commit 4bb5c0fb authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Merge "Show a toast when details cannot be added to zip file." into... 

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

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

Change-Id: I6c923972ac961567bffe38926ec8946802dce035
parents 7c92003c d7df808b

packages/Shell/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

packages/Shell/src/com/android/shell/BugreportProgressService.java

+2 −0
Original line number Diff line number Diff line
@@ -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.