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

Commit 5a3850a9 authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future 

Bug: 347831320
Merged-In: I6687bee4aef1f73d21a08cfd433c636082148621
Change-Id: I55d9d891f8adfb4b29b1db1ab3388224d505c6ff
parents eab9cc31 e033e345

src/com/android/documentsui/BaseActivity.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -456,7 +456,6 @@ public abstract class BaseActivity 
        mPreferencesMonitor.stop();

        mPreferencesMonitor.stop();

        mSortController.destroy();

        mSortController.destroy();

        DocumentsApplication.invalidateUserManagerState(this);

        DocumentsApplication.invalidateUserManagerState(this);

        DocumentsApplication.invalidateConfigStore();

        super.onDestroy();

        super.onDestroy();

    }

    }

src/com/android/documentsui/DocumentsApplication.java

+0 −10
Original line number Original line Diff line number Diff line
@@ -162,16 +162,6 @@ public class DocumentsApplication extends Application { 
        ((DocumentsApplication) context.getApplicationContext()).mUserManagerState = null;

        ((DocumentsApplication) context.getApplicationContext()).mUserManagerState = null;

    }

    }





    /**

     * Set {@link #sConfigStore} as null onDestroy of BaseActivity so that new session uses new

     * instance of {@link #sConfigStore}

     */

    public static void invalidateConfigStore() {

        synchronized (DocumentsApplication.class) {

            sConfigStore = null;

        }

    }



    private void onApplyOverlayFinish(boolean result) {

    private void onApplyOverlayFinish(boolean result) {

        Log.d(TAG, "OverlayManager.setEnabled() result: " + result);

        Log.d(TAG, "OverlayManager.setEnabled() result: " + result);

    }

    }