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

Commit 6192217a authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Rename MediaSessionConfig to MediaSessionDeviceConfig." into sc-dev

parents 9fc14a22 6237247d

services/core/java/com/android/server/media/MediaSessionConfig.java→services/core/java/com/android/server/media/MediaSessionDeviceConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.text.TextUtils; 
import java.io.PrintWriter;

import java.util.Set;



class MediaSessionConfig {

class MediaSessionDeviceConfig {

    /**

     * Denotes the duration for which a media button receiver will be exempted from

     * FGS-from-BG restriction and so will be allowed to start an FGS even if it is in the

services/core/java/com/android/server/media/MediaSessionService.java

+4 −4
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
                        mSession2TokenCallback);

                break;

            case PHASE_ACTIVITY_MANAGER_READY:

                MediaSessionConfig.initialize(mContext);

                MediaSessionDeviceConfig.initialize(mContext);

                break;

        }

    }
@@ -560,7 +560,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
                        PowerExemptionManager.class);

                powerExemptionManager.addToTemporaryAllowList(targetPackage,

                        PowerExemptionManager.REASON_MEDIA_SESSION_CALLBACK, reason,

                        MediaSessionConfig.getMediaSessionCallbackFgsAllowlistDurationMs());

                        MediaSessionDeviceConfig.getMediaSessionCallbackFgsAllowlistDurationMs());

            }

        } finally {

            Binder.restoreCallingIdentity(token);
@@ -1975,7 +1975,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
                }

                mAudioPlayerStateMonitor.dump(mContext, pw, "");

            }

            MediaSessionConfig.dump(pw, "");

            MediaSessionDeviceConfig.dump(pw, "");

        }



        /**
@@ -2260,7 +2260,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
                        mContext, keyEvent, callingPackageName,

                        needWakeLock ? mKeyEventReceiver.mLastTimeoutId : -1, mKeyEventReceiver,

                        mHandler,

                        MediaSessionConfig.getMediaButtonReceiverFgsAllowlistDurationMs());

                        MediaSessionDeviceConfig.getMediaButtonReceiverFgsAllowlistDurationMs());

                if (sent) {

                    String pkgName = mediaButtonReceiverHolder.getPackageName();

                    for (FullUserRecord.OnMediaKeyEventDispatchedListenerRecord cr