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

Commit c6a7a961 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Show predefined title and description in finished notification" into... 

Merge "Show predefined title and description in finished notification" into rvc-dev am: a090dbd9 am: 6c07b888 am: 24578e50

Change-Id: I34cb85f19f43ce7adb3d9ba7d6feda2b004f04f1
parents 3c5480bf 24578e50

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

+7 −3
Original line number Diff line number Diff line
@@ -1019,6 +1019,9 @@ public class BugreportProgressService extends Service { 
     * Wraps up bugreport generation and triggers a notification to share the bugreport.

     */

    private void onBugreportFinished(BugreportInfo info) {

        if (!TextUtils.isEmpty(info.shareTitle)) {

            info.setTitle(info.shareTitle);

        }

        Log.d(TAG, "Bugreport finished with title: " + info.getTitle()

                + " and shareDescription: " + info.shareDescription);

        info.finished = new AtomicBoolean(true);
@@ -1795,7 +1798,9 @@ public class BugreportProgressService extends Service { 


        /**

         * User-provided, detailed description of the bugreport; when set, will be added to the body

         * of the {@link Intent#ACTION_SEND_MULTIPLE} intent.

         * of the {@link Intent#ACTION_SEND_MULTIPLE} intent. This is shown in the app where the

         * bugreport is being shared as an attachment. This is not related/dependant on

         * {@code shareDescription}.

         */

        private String description;
@@ -2130,7 +2135,6 @@ public class BugreportProgressService extends Service { 
                return new BugreportInfo[size];

            }

        };



    }



    @GuardedBy("mLock")