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

Commit 3329e523 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents 0cc3b04a 7e89b012
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
        mMediaButtonIntentReceiver.setMediaHandleListener(listener);
        IntentFilter filter = new IntentFilter(Intent.ACTION_MEDIA_BUTTON);
        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
        registerReceiver(mMediaButtonIntentReceiver, filter);
        registerReceiver(mMediaButtonIntentReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
        mMediaSession = new MediaSession(mContext, TAG);
        Intent i = new Intent(this, FMMediaButtonIntentReceiver.class)
                .setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
@@ -1581,7 +1581,7 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
        filter.addAction(Intent.ACTION_SCREEN_OFF);
        filter.addAction(Intent.ACTION_HEADSET_PLUG);
        mBroadcastReceiver = new FmServiceBroadcastReceiver();
        registerReceiver(mBroadcastReceiver, filter);
        registerReceiver(mBroadcastReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
    }

    private void unregisterFmBroadcastReceiver() {
@@ -2042,7 +2042,7 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
        filter.addAction(Intent.ACTION_MEDIA_MOUNTED);
        filter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
        filter.addAction(Intent.ACTION_MEDIA_EJECT);
        registerReceiver(mSdcardListener, filter);
        registerReceiver(mSdcardListener, filter, Context.RECEIVER_NOT_EXPORTED);
    }

    private void unregisterSdcardListener() {