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

Commit 3345eb1d 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

Change-Id: I9087a9175830c602e6190f2e1555136057e2a513
parents 3c9ceb82 fc617f0d

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;

    }