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

Commit fd1957f4 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: 761dd59a

Change-Id: I9c2a952c5ae1a7b03b4bd0ab9accd265e9ccee93
parents e7cf20cd 761dd59a

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;

    }