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

Commit 468c32be authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "from-pi-gsi" into pie-gsi 

* changes:
  Don't apply filter in readback, when there is no scaling
  Set AppStandbyController charging state on init
  Fix TextureView.getBitmap with scale layer transform
  Skip from copying preopted files if device is undecrypted
  Use Uppercase instead of Lowercase for PLMN Decode
  Check for null path in getInternalPathForUser
parents 6549309f 82000f7e

core/java/android/os/storage/VolumeInfo.java

+3 −1
Original line number Diff line number Diff line
@@ -312,7 +312,9 @@ public class VolumeInfo implements Parcelable { 
     * {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}.

     */

    public File getInternalPathForUser(int userId) {

        if (type == TYPE_PUBLIC) {

        if (path == null) {

            return null;

        } else if (type == TYPE_PUBLIC) {

            // TODO: plumb through cleaner path from vold

            return new File(path.replace("/storage/", "/mnt/media_rw/"));

        } else {

libs/hwui/pipeline/skia/LayerDrawable.cpp

+8 −1
Original line number Diff line number Diff line
@@ -82,7 +82,14 @@ bool LayerDrawable::DrawLayer(GrContext* context, SkCanvas* canvas, Layer* layer 
            textureMatrix = textureMatrixInv;

        }



        SkMatrix matrix = SkMatrix::Concat(layerTransform, textureMatrix);

        SkMatrix matrix;

        if (dstRect) {

            // Destination rectangle is set only when we are trying to read back the content

            // of the layer. In this case we don't want to apply layer transform.

            matrix = textureMatrix;

        } else {

            matrix = SkMatrix::Concat(layerTransform, textureMatrix);

        }



        SkPaint paint;

        paint.setAlpha(layer->getAlpha());

libs/hwui/pipeline/skia/SkiaOpenGLReadback.cpp

+4 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "DeviceInfo.h"

#include "Matrix.h"

#include "Properties.h"

#include "utils/MathUtils.h"



using namespace android::uirenderer::renderthread;
@@ -116,9 +117,9 @@ CopyResult SkiaOpenGLReadback::copyImageInto(EGLImageKHR eglImage, const Matrix4 
            paint.setBlendMode(SkBlendMode::kSrc);

            // Apply a filter, which is matching OpenGL pipeline readback behaviour. Filter usage

            // is codified by tests using golden images like DecodeAccuracyTest.

            if (skiaSrcRect.width() != bitmap->width() ||

                skiaSrcRect.height() != bitmap->height()) {

                // TODO: apply filter always, but check if tests will be fine

            bool disableFilter = MathUtils::areEqual(skiaSrcRect.width(), skiaDestRect.width())

                    && MathUtils::areEqual(skiaSrcRect.height(), skiaDestRect.height());

            if (!disableFilter) {

                paint.setFilterQuality(kLow_SkFilterQuality);

            }

            scaledSurface->getCanvas()->concat(textureMatrix);

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2533,7 +2533,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                }

            }













            if (mFirstBoot) {













            if (!mOnlyCore && mFirstBoot) {















                requestCopyPreoptedFiles();















            }







































services/usage/java/com/android/server/usage/UsageStatsService.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -207,8 +207,8 @@ public class UsageStatsService extends SystemService implements





























    @Override















    public void onBootPhase(int phase) {













        if (phase == PHASE_SYSTEM_SERVICES_READY) {















        mAppStandby.onBootPhase(phase);













        if (phase == PHASE_SYSTEM_SERVICES_READY) {















            // initialize mDpmInternal















            getDpmInternal();