diff options
4 files changed, 23 insertions, 3 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 3ac71b2cff1d..928fb62e07f0 100755 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -3801,7 +3801,7 @@ public class AudioManager { final IAudioService service = getService(); try { service.unregisterAudioPolicyAsync(policy.cb()); - policy.setRegistration(null); + policy.reset(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3823,7 +3823,7 @@ public class AudioManager { try { policy.invalidateCaptorsAndInjectors(); service.unregisterAudioPolicy(policy.cb()); - policy.setRegistration(null); + policy.reset(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index 4d26b8d3f7af..c9cdbb0ed277 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -487,6 +487,11 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, } } + /** @hide */ + public AudioAttributes getAudioAttributes() { + return mAudioAttributes; + } + /** * Builder class for {@link AudioRecord} objects. * Use this class to configure and create an <code>AudioRecord</code> instance. By setting the diff --git a/media/java/android/media/audiopolicy/AudioPolicy.java b/media/java/android/media/audiopolicy/AudioPolicy.java index d3e9c7e91056..8a17465c53b3 100644 --- a/media/java/android/media/audiopolicy/AudioPolicy.java +++ b/media/java/android/media/audiopolicy/AudioPolicy.java @@ -553,6 +553,12 @@ public class AudioPolicy { } } + /** @hide */ + public void reset() { + setRegistration(null); + mConfig.reset(); + } + public void setRegistration(String regId) { synchronized (mLock) { mRegistrationId = regId; @@ -566,6 +572,11 @@ public class AudioPolicy { sendMsg(MSG_POLICY_STATUS_CHANGE); } + /**@hide*/ + public String getRegistration() { + return mRegistrationId; + } + private boolean policyReadyToUse() { synchronized (mLock) { if (mStatus != POLICY_STATUS_REGISTERED) { diff --git a/media/java/android/media/audiopolicy/AudioPolicyConfig.java b/media/java/android/media/audiopolicy/AudioPolicyConfig.java index 91b9bb3f64c0..561a8847feed 100644 --- a/media/java/android/media/audiopolicy/AudioPolicyConfig.java +++ b/media/java/android/media/audiopolicy/AudioPolicyConfig.java @@ -162,7 +162,7 @@ public class AudioPolicyConfig implements Parcelable { public String toLogFriendlyString () { String textDump = new String("android.media.audiopolicy.AudioPolicyConfig:\n"); - textDump += mMixes.size() + " AudioMix: "+ mRegistrationId + "\n"; + textDump += mMixes.size() + " AudioMix, reg:" + mRegistrationId + "\n"; for(AudioMix mix : mMixes) { // write mix route flags textDump += "* route flags=0x" + Integer.toHexString(mix.getRouteFlags()) + "\n"; @@ -220,6 +220,10 @@ public class AudioPolicyConfig implements Parcelable { return textDump; } + protected void reset() { + mMixCounter = 0; + } + protected void setRegistration(String regId) { final boolean currentRegNull = (mRegistrationId == null) || mRegistrationId.isEmpty(); final boolean newRegNull = (regId == null) || regId.isEmpty(); |