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

Commit 9bfcbe30 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2476230, 2476289, 2476272, 2476118, 2475997, 2476251,... 

Merge cherrypicks of [2476230, 2476289, 2476272, 2476118, 2475997, 2476251, 2476119, 2476341, 2476252, 2476290, 2476232, 2476274, 2475999, 2476343, 2476275, 2476216, 2476381, 2476256, 2476000, 2476362, 2476345, 2476364, 2476234, 2476346, 2476347, 2476365, 2476276, 2476219, 2476277, 2476402, 2476348, 2476235, 2476383, 2476257, 2476278, 2476236, 2476350, 2476351, 2476307, 2476403, 2476308, 2476258] into oc-release

Change-Id: I3e45afab5b6c2e2a29e60638c33d090b368c4424
parents af0fec4b b2ad6b20

core/java/android/app/Activity.java

+1 −11
Original line number Diff line number Diff line
@@ -6416,17 +6416,7 @@ public class Activity extends ContextThemeWrapper 
     */

    @Deprecated

    public boolean requestVisibleBehind(boolean visible) {

        if (!mResumed) {

            // Do not permit paused or stopped activities to do this.

            visible = false;

        }

        try {

            mVisibleBehind = ActivityManager.getService()

                    .requestVisibleBehind(mToken, visible) && visible;

        } catch (RemoteException e) {

            mVisibleBehind = false;

        }

        return mVisibleBehind;

        return false;

    }



    /**

libs/hwui/GlopBuilder.cpp

+4 −2
Original line number Diff line number Diff line
@@ -456,11 +456,13 @@ GlopBuilder& GlopBuilder::setFillTextureLayer(GlLayer& layer, float alpha) { 
    return *this;

}



GlopBuilder& GlopBuilder::setFillExternalTexture(Texture& texture, Matrix4& textureTransform) {

GlopBuilder& GlopBuilder::setFillExternalTexture(Texture& texture, Matrix4& textureTransform,

        bool requiresFilter) {

    TRIGGER_STAGE(kFillStage);

    REQUIRE_STAGES(kMeshStage | kRoundRectClipStage);



    mOutGlop->fill.texture = { &texture, GL_LINEAR, GL_CLAMP_TO_EDGE, &textureTransform };

    GLenum filter = requiresFilter ? GL_LINEAR : GL_NEAREST;

    mOutGlop->fill.texture = { &texture, filter, GL_CLAMP_TO_EDGE, &textureTransform };



    setFill(SK_ColorWHITE, 1.0f, SkBlendMode::kSrc, Blend::ModeOrderSwap::NoSwap,

            nullptr, nullptr);

libs/hwui/GlopBuilder.h

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ public: 
    GlopBuilder& setFillTextureLayer(GlLayer& layer, float alpha);

    // TODO: setFillLayer normally forces its own wrap & filter mode,

    // which isn't always correct.

    GlopBuilder& setFillExternalTexture(Texture& texture, Matrix4& textureTransform);

    GlopBuilder& setFillExternalTexture(Texture& texture, Matrix4& textureTransform,

            bool requiresFilter);



    GlopBuilder& setTransform(const Matrix4& canvas, const int transformFlags);

libs/hwui/OpenGLReadback.cpp

+7 −1
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ inline CopyResult copyTextureInto(Caches& caches, RenderState& renderState, 
            GL_TEXTURE_2D, texture, 0);



    {

        bool requiresFilter;

        // Draw & readback

        renderState.setViewport(destWidth, destHeight);

        renderState.scissor().setEnabled(false);
@@ -208,12 +209,17 @@ inline CopyResult copyTextureInto(Caches& caches, RenderState& renderState, 
            croppedTexTransform.scale(srcRect.getWidth() / sourceTexture.width(),

                    srcRect.getHeight() / sourceTexture.height(), 1);

            croppedTexTransform.multiply(sFlipV);

            requiresFilter = srcRect.getWidth() != (float) destWidth

                    || srcRect.getHeight() != (float) destHeight;

        } else {

            requiresFilter = sourceTexture.width() != (uint32_t) destWidth

                    || sourceTexture.height() != (uint32_t) destHeight;

        }

        Glop glop;

        GlopBuilder(renderState, caches, &glop)

                .setRoundRectClipState(nullptr)

                .setMeshTexturedUnitQuad(nullptr)

                .setFillExternalTexture(sourceTexture, croppedTexTransform)

                .setFillExternalTexture(sourceTexture, croppedTexTransform, requiresFilter)

                .setTransform(Matrix4::identity(), TransformFlags::None)

                .setModelViewMapUnitToRect(Rect(destWidth, destHeight))

                .build();

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceDiscoveryService.java

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class DeviceDiscoveryService extends Service { 


    private BluetoothAdapter mBluetoothAdapter;

    private WifiManager mWifiManager;

    private BluetoothLeScanner mBLEScanner;

    @Nullable private BluetoothLeScanner mBLEScanner;

    private ScanSettings mDefaultScanSettings = new ScanSettings.Builder().build();



    private List<DeviceFilter<?>> mFilters;
@@ -185,7 +185,7 @@ public class DeviceDiscoveryService extends Service { 
            mBluetoothAdapter.startDiscovery();

        }



        if (shouldScan(mBLEFilters)) {

        if (shouldScan(mBLEFilters) && mBLEScanner != null) {

            mBLEScanCallback = new BLEScanCallback();

            mBLEScanner.startScan(mBLEScanFilters, mDefaultScanSettings, mBLEScanCallback);

        }
@@ -224,7 +224,7 @@ public class DeviceDiscoveryService extends Service { 
            unregisterReceiver(mBluetoothBroadcastReceiver);

            mBluetoothBroadcastReceiver = null;

        }

        mBLEScanner.stopScan(mBLEScanCallback);

        if (mBLEScanner != null) mBLEScanner.stopScan(mBLEScanCallback);

        if (mWifiBroadcastReceiver != null) {

            unregisterReceiver(mWifiBroadcastReceiver);

            mWifiBroadcastReceiver = null;