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

2 files changed, 5 insertions, 5 deletions

diff --git a/services/core/java/com/android/server/media/MediaSessionConfig.java b/services/core/java/com/android/server/media/MediaSessionDeviceConfig.java
index a866b0d4a38b..9bb8e2e93746 100644
--- a/services/core/java/com/android/server/media/MediaSessionConfig.java
+++ b/services/core/java/com/android/server/media/MediaSessionDeviceConfig.java
@@ -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
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index aefdbca779e6..50cfe1fbc333 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -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