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

Commit 289ddad4 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Cleanup (remove ldap, reduce screenshot log level)" into rvc-dev am:... 

Merge "Cleanup (remove ldap, reduce screenshot log level)" into rvc-dev am: 59fcab20 am: fc617f0d am: 3345eb1d am: 4ba132ad

Change-Id: I0e033a0199f5c48eb244cd85846a891d4b631ed0
parents 7f1f6782 4ba132ad

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

+2 −2
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset 
     * Clears current screenshot

     */

    private void clearScreenshot(String reason) {

        Log.e(TAG, "clearing screenshot: " + reason);

        Log.v(TAG, "clearing screenshot: " + reason);

        if (mScreenshotLayout.isAttachedToWindow()) {

            mWindowManager.removeView(mScreenshotLayout);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class TakeScreenshotService extends Service { 
    @Override

    public boolean onUnbind(Intent intent) {

        if (mScreenshot != null) mScreenshot.stopScreenshot();

        // TODO (mkephart) remove once notifications flow is fully deprecated

        // TODO remove once notifications flow is fully deprecated

        if (mScreenshotLegacy != null) mScreenshotLegacy.stopScreenshot();

        return true;

    }