Merge "frameworks/base: Fix AudioService JNI leaks" into pi-dev (f0ac5f99) · Commits · e / os / android_frameworks_base

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

+14 −1

Original line number	Diff line number	Diff line
		@@ -1915,7 +1915,16 @@ public class AudioService extends IAudioService.Stub
		}
		mUserSelectedVolumeControlStream = false;
		} else {
		if (null == mForceControlStreamClient) {
		mForceControlStreamClient = new ForceControlStreamClient(cb);
		} else {
		if (mForceControlStreamClient.getBinder() == cb) {
		Log.d(TAG, "forceVolumeControlStream cb:" + cb + " is already linked.");
		} else {
		mForceControlStreamClient.release();
		mForceControlStreamClient = new ForceControlStreamClient(cb);
		}
		}
		}
		}
		}
		@@ -1955,6 +1964,10 @@ public class AudioService extends IAudioService.Stub
		mCb = null;
		}
		}

		public IBinder getBinder() {
		return mCb;
		}
		}

		private void sendBroadcastToAll(Intent intent) {