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

Commit 727dcc7e authored by Alan Viverette's avatar Alan Viverette
Browse files

Obtain handler from context in CaptioningManager 

Rather than the current thread, which prevented us from loading the
CaptionManager in a CTS test.

Bug: 15389946
Change-Id: Ic0037cc2ecfcab57545088ab63ed5cb9742206a7
parent 8fa24e91

core/java/android/view/accessibility/CaptioningManager.java

+14 −5
Original line number Diff line number Diff line
@@ -52,11 +52,9 @@ public class CaptioningManager { 
    /** Default scaling value for caption fonts. */

    private static final float DEFAULT_FONT_SCALE = 1;



    private final ArrayList<CaptioningChangeListener>

            mListeners = new ArrayList<CaptioningChangeListener>();

    private final Handler mHandler = new Handler();



    private final ArrayList<CaptioningChangeListener> mListeners = new ArrayList<>();

    private final ContentResolver mContentResolver;

    private final ContentObserver mContentObserver;



    /**

     * Creates a new captioning manager for the specified context.
@@ -65,6 +63,9 @@ public class CaptioningManager { 
     */

    public CaptioningManager(Context context) {

        mContentResolver = context.getContentResolver();



        final Handler handler = new Handler(context.getMainLooper());

        mContentObserver = new MyContentObserver(handler);

    }



    /**
@@ -220,7 +221,15 @@ public class CaptioningManager { 
        }

    }



    private final ContentObserver mContentObserver = new ContentObserver(mHandler) {

    private class MyContentObserver extends ContentObserver {

        private final Handler mHandler;



        public MyContentObserver(Handler handler) {

            super(handler);



            mHandler = handler;

        }



        @Override

        public void onChange(boolean selfChange, Uri uri) {

            final String uriPath = uri.getPath();