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

Commit 28cdba46 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [12364563, 12364330, 12364331, 12364332, 12363743,... 

Merge cherrypicks of [12364563, 12364330, 12364331, 12364332, 12363743, 12364605, 12363956, 12363957, 12363958, 12364309, 12364483, 12364484, 12364564, 12364333, 12364334, 12364335, 12364336, 12364337, 12364607] into rvc-release

Change-Id: Ida8066f2651eb78529f4de6b18a82f3cf672975c
parents 34a1b9c9 a95061ca

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotNotificationsController.java

+4 −2
Original line number Diff line number Diff line
@@ -205,7 +205,8 @@ public class ScreenshotNotificationsController { 
        mPublicNotificationBuilder

                .setContentTitle(mResources.getString(R.string.screenshot_saved_title))

                .setContentText(mResources.getString(R.string.screenshot_saved_text))

                .setContentIntent(PendingIntent.getActivity(mContext, 0, launchIntent, 0))

                .setContentIntent(PendingIntent

                        .getActivity(mContext, 0, launchIntent, PendingIntent.FLAG_IMMUTABLE))

                .setWhen(now)

                .setAutoCancel(true)

                .setColor(mContext.getColor(
@@ -213,7 +214,8 @@ public class ScreenshotNotificationsController { 
        mNotificationBuilder

                .setContentTitle(mResources.getString(R.string.screenshot_saved_title))

                .setContentText(mResources.getString(R.string.screenshot_saved_text))

                .setContentIntent(PendingIntent.getActivity(mContext, 0, launchIntent, 0))

                .setContentIntent(PendingIntent

                        .getActivity(mContext, 0, launchIntent, PendingIntent.FLAG_IMMUTABLE))

                .setWhen(now)

                .setAutoCancel(true)

                .setColor(mContext.getColor(

packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java

+6 −2
Original line number Diff line number Diff line
@@ -104,9 +104,13 @@ public class LeakReporter { 
                    .setContentText(String.format(

                            "SystemUI has detected %d leaked objects. Tap to send", garbageCount))

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

                    .setContentIntent(PendingIntent.getActivityAsUser(mContext, 0,

                    .setContentIntent(PendingIntent.getActivityAsUser(

                            mContext,

                            0,

                            getIntent(hprofFile, dumpFile),

                            PendingIntent.FLAG_UPDATE_CURRENT, null, UserHandle.CURRENT));

                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                            null,

                            UserHandle.CURRENT));

            notiMan.notify(TAG, 0, builder.build());

        } catch (IOException e) {

            Log.e(TAG, "Couldn't dump heap for leak", e);

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -3318,6 +3318,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
    @Override

    public boolean setProcessMemoryTrimLevel(String process, int userId, int level)

            throws RemoteException {

        if (!isCallerShell()) {

            EventLog.writeEvent(0x534e4554, 160390416, Binder.getCallingUid(), "");

            throw new SecurityException("Only shell can call it");

        }

        synchronized (this) {

            final ProcessRecord app = findProcessLocked(process, userId, "setProcessMemoryTrimLevel");

            if (app == null) {