Fix initialization/termination of AudioDeviceTemplate

webrtc/modules/audio_device/android/audio_device_template.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 42 matching lines @@
 
   int32_t ActiveAudioLayer(
       AudioDeviceModule::AudioLayer& audioLayer) const override {
     audioLayer = audio_layer_;
     return 0;
   }
 
   int32_t Init() override {
     DCHECK(thread_checker_.CalledOnValidThread());
     DCHECK(!initialized_);
-    initialized_ = audio_manager_->Init() || output_.Init() || input_.Init();
-    return initialized_ ? 0 : -1;
+    if (!audio_manager_->Init())
+      return -1;
+    if (output_.Init() != 0) {
+      audio_manager_->Close();
+      return -1;
+    }
+    if (input_.Init() != 0) {
+      output_.Terminate();
+      audio_manager_->Close();
+      return -1;
+    }
+    initialized_ = true;
+    return 0;
   }
 
   int32_t Terminate() override {
     DCHECK(thread_checker_.CalledOnValidThread());
-    initialized_ =
-        !(output_.Terminate() || input_.Terminate() || audio_manager_->Close());
-    return !initialized_ ? 0 : -1;
+    int32_t err = input_.Terminate();
+    err |= output_.Terminate();
+    err |= !audio_manager_->Close();
+    initialized_ = false;
+    DCHECK_EQ(err, 0);
+    return err;
   }
 
   bool Initialized() const override {
     DCHECK(thread_checker_.CalledOnValidThread());
     return initialized_;
   }
 
   int16_t PlayoutDevices() override {
     return 1;
   }
@@ skipping 380 matching lines @@
   OutputType output_;
 
   InputType input_;
 
   bool initialized_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_DEVICE_TEMPLATE_H_