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

Commit 224e962f authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Robin Lee
Browse files

Annotate appropriate AudioRecordingDisclosureBar's methods with @UiThread

Adding @UiThread annotation to the methods in
AudioRecordingDisclosureBar.javva that should only be called on the
UI thread.

Change-Id: If37149b315c2044adfa09e32cd84a4c6a8c3f142
Bug: 134942150
Test: make, flash, rub audio recording app
parent fa016dfc
Loading
Loading
Loading
Loading
+11 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
import android.animation.PropertyValuesHolder;
import android.annotation.IntDef;
import android.annotation.IntDef;
import android.annotation.UiThread;
import android.app.AppOpsManager;
import android.app.AppOpsManager;
import android.content.Context;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.ApplicationInfo;
@@ -133,6 +134,7 @@ class AudioRecordingDisclosureBar {
                new OnActiveRecordingListener());
                new OnActiveRecordingListener());
    }
    }


    @UiThread
    private void onStartedRecording(String packageName) {
    private void onStartedRecording(String packageName) {
        if (!mActiveAudioRecordingPackages.add(packageName)) {
        if (!mActiveAudioRecordingPackages.add(packageName)) {
            // This app is already known to perform recording
            // This app is already known to perform recording
@@ -164,6 +166,7 @@ class AudioRecordingDisclosureBar {
        }
        }
    }
    }


    @UiThread
    private void onDoneRecording(String packageName) {
    private void onDoneRecording(String packageName) {
        if (!mActiveAudioRecordingPackages.remove(packageName)) {
        if (!mActiveAudioRecordingPackages.remove(packageName)) {
            // Was not marked as an active recorder, do nothing
            // Was not marked as an active recorder, do nothing
@@ -179,6 +182,7 @@ class AudioRecordingDisclosureBar {
        }
        }
    }
    }


    @UiThread
    private void show(String packageName) {
    private void show(String packageName) {
        // Inflate the indicator view
        // Inflate the indicator view
        mIndicatorView = LayoutInflater.from(mContext).inflate(
        mIndicatorView = LayoutInflater.from(mContext).inflate(
@@ -253,6 +257,7 @@ class AudioRecordingDisclosureBar {
        mState = STATE_APPEARING;
        mState = STATE_APPEARING;
    }
    }


    @UiThread
    private void expand(String packageName) {
    private void expand(String packageName) {
        final String label = getApplicationLabel(packageName);
        final String label = getApplicationLabel(packageName);
        mTextView.setText(mContext.getString(R.string.app_accessed_mic, label));
        mTextView.setText(mContext.getString(R.string.app_accessed_mic, label));
@@ -276,6 +281,7 @@ class AudioRecordingDisclosureBar {
        mState = STATE_MAXIMIZING;
        mState = STATE_MAXIMIZING;
    }
    }


    @UiThread
    private void minimize() {
    private void minimize() {
        final int targetOffset = mTextsContainers.getWidth();
        final int targetOffset = mTextsContainers.getWidth();
        final AnimatorSet set = new AnimatorSet();
        final AnimatorSet set = new AnimatorSet();
@@ -297,6 +303,7 @@ class AudioRecordingDisclosureBar {
        mState = STATE_MINIMIZING;
        mState = STATE_MINIMIZING;
    }
    }


    @UiThread
    private void hide() {
    private void hide() {
        final int targetOffset =
        final int targetOffset =
                mIndicatorView.getWidth() - (int) mIconTextsContainer.getTranslationX();
                mIndicatorView.getWidth() - (int) mIconTextsContainer.getTranslationX();
@@ -317,12 +324,14 @@ class AudioRecordingDisclosureBar {
        mState = STATE_DISAPPEARING;
        mState = STATE_DISAPPEARING;
    }
    }


    @UiThread
    private void onExpanded() {
    private void onExpanded() {
        mState = STATE_SHOWN;
        mState = STATE_SHOWN;


        mIndicatorView.postDelayed(this::minimize, MAXIMIZED_DURATION);
        mIndicatorView.postDelayed(this::minimize, MAXIMIZED_DURATION);
    }
    }


    @UiThread
    private void onMinimized() {
    private void onMinimized() {
        mState = STATE_MINIMIZED;
        mState = STATE_MINIMIZED;


@@ -336,6 +345,7 @@ class AudioRecordingDisclosureBar {
        }
        }
    }
    }


    @UiThread
    private void onHidden() {
    private void onHidden() {
        final WindowManager windowManager = (WindowManager) mContext.getSystemService(
        final WindowManager windowManager = (WindowManager) mContext.getSystemService(
                Context.WINDOW_SERVICE);
                Context.WINDOW_SERVICE);
@@ -358,6 +368,7 @@ class AudioRecordingDisclosureBar {
        }
        }
    }
    }


    @UiThread
    private void startPulsatingAnimation() {
    private void startPulsatingAnimation() {
        final View pulsatingView = mIconTextsContainer.findViewById(R.id.pulsating_circle);
        final View pulsatingView = mIconTextsContainer.findViewById(R.id.pulsating_circle);
        final ObjectAnimator animator =
        final ObjectAnimator animator =