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

Commit 76fca54d authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Show "Android System" instead of "Shell" on notifications." into... 

Merge "Show "Android System" instead of "Shell" on notifications." into nyc-dev am: 28baa37a am: b31b8eac
am: bb66c494

* commit 'bb66c494':
  Show "Android System" instead of "Shell" on notifications.

Change-Id: I1f1283a80fe30a7700b0dd6b481258872007b4b2
parents d387b746 bb66c494

packages/Shell/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ 
    <uses-permission android:name="android.permission.VIBRATE" />

    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_STACKS" />

    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />

    <!-- Permission needed to rename bugreport notifications (so they're not shown as Shell) -->

    <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />



    <application android:label="@string/app_label"

                 android:defaultToDeviceProtectedStorage="true"

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

+9 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import android.content.Intent; 
import android.content.res.Configuration;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.IBinder;
@@ -204,6 +205,8 @@ public class BugreportProgressService extends Service { 
     */

    private boolean mTakingScreenshot;



    private static final Bundle sNotificationBundle = new Bundle();



    @Override

    public void onCreate() {

        mContext = getApplicationContext();
@@ -979,7 +982,13 @@ public class BugreportProgressService extends Service { 
    }



    private static Notification.Builder newBaseNotification(Context context) {

        if (sNotificationBundle.isEmpty()) {

            // Rename notifcations from "Shell" to "Android System"

            sNotificationBundle.putString(Notification.EXTRA_SUBSTITUTE_APP_NAME,

                    context.getString(com.android.internal.R.string.android_system_label));

        }

        return new Notification.Builder(context)

                .addExtras(sNotificationBundle)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setSmallIcon(com.android.internal.R.drawable.stat_sys_adb)

                .setLocalOnly(true)