Fix initialization/termination of AudioDeviceTemplate

webrtc/modules/audio_device/android/audio_device_template.h

Index: webrtc/modules/audio_device/android/audio_device_template.h
diff --git a/webrtc/modules/audio_device/android/audio_device_template.h b/webrtc/modules/audio_device/android/audio_device_template.h
index adc66fa6d44d4caaa3d4ce907d26ca183f49e17d..9416c25c43f03705d1f329430c8311d1885f92df 100644
--- a/webrtc/modules/audio_device/android/audio_device_template.h
+++ b/webrtc/modules/audio_device/android/audio_device_template.h
@@ -60,14 +60,15 @@ class AudioDeviceTemplate : public AudioDeviceGeneric {
   int32_t Init() override {
     DCHECK(thread_checker_.CalledOnValidThread());
     DCHECK(!initialized_);
-    initialized_ = audio_manager_->Init() || output_.Init() || input_.Init();
+    initialized_ =
+        audio_manager_->Init() & ((output_.Init() | input_.Init()) == 0);

[tommi (sloooow) - chröme, 2015/08/17 08:23:19]

Great that you noticed this.  Why bitwise operators though?

Shouldn't this just be:

initialized_ = audio_manager_->Init() && output_.Init() && input_.Init();

Hmm... if we really intend to handle the case if things go bad, we need to undo
what was previously done.
E.g.

if (!audio_manager_->Init())
  return -1;
if (!output_.Init()) {
  audio_manager_->Close();
  return -1;
}
if (!input_.Init()) {
  output_.Terminate();
  audio_manager_->Close();
  return -1;
}
initialized_ = true;
return 0;

[Satoshi Matsumoto, 2015/08/17 16:40:23]

Done.

     return initialized_ ? 0 : -1;
   }
 
   int32_t Terminate() override {
     DCHECK(thread_checker_.CalledOnValidThread());
-    initialized_ =
-        !(output_.Terminate() || input_.Terminate() || audio_manager_->Close());
+    initialized_ = ((output_.Terminate() | input_.Terminate()) != 0) |
+                   !audio_manager_->Close();

[tommi (sloooow) - chröme, 2015/08/17 08:23:19]

There's not really much we can do here if things go wrong. I think this needs to
be a best effort kind of thing:

int32_t err = input_.Terminate();
err |= output_.Terminate();
err |= !audio_manager_->Close();
initialized_ = false;
DCHECK_EQ(err, 0);
return err;

[Satoshi Matsumoto, 2015/08/17 16:40:23]

Done.

     return !initialized_ ? 0 : -1;
   }