Merge "[audio] Add wtf if audioserver not up on start" into main (fac5dcbe) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioPolicyFacade.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,4 +27,5 @@ public interface AudioPolicyFacade {
		public INativePermissionController getPermissionController();
		public void registerOnStartTask(Runnable r);
		public void setEnableHardening(boolean shouldEnable);
		public boolean isServiceAvailable();
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -1354,10 +1354,14 @@ public class AudioService extends IAudioService.Stub
		mSystemServer = systemServer;
		mAudioVolumeGroupHelper = audioVolumeGroupHelper;
		mSettings = settings;

		mAudioPolicy = audioPolicy;
		mAudioPolicy.registerOnStartTask(() -> {
		mAudioPolicy.setEnableHardening(mShouldEnableAllHardening.get());
		});
		if (!mAudioPolicy.isServiceAvailable()) {
		Log.wtf(TAG, "AudioPolicy not available on AudioService start!");
		}

		mPlatformType = AudioSystem.getPlatformType(context);

+10 −5

Original line number	Diff line number	Diff line
		@@ -76,11 +76,6 @@ public class DefaultAudioPolicyFacade implements AudioPolicyFacade {
		}
		}

		@Override
		public void registerOnStartTask(Runnable task) {
		mServiceHolder.registerOnStartTask(unused -> task.run());
		}

		@Override
		public void setEnableHardening(boolean shouldEnable) {
		IAudioPolicyService ap = mServiceHolder.waitForService();
		@@ -90,4 +85,14 @@ public class DefaultAudioPolicyFacade implements AudioPolicyFacade {
		mServiceHolder.attemptClear(ap.asBinder());
		}
		}

		@Override
		public void registerOnStartTask(Runnable task) {
		mServiceHolder.registerOnStartTask(unused -> task.run());
		}

		@Override
		public boolean isServiceAvailable() {
		return mServiceHolder.checkService() != null;
		}
		}