Cleanup after updating VHAL

This CL cleans up the mess created after we revised VHAL's type.hal.
I also removed CarRadio* since that is deprecated.

Bug: 77301298
Test: It compiles
Change-Id: Iad881373ab555da7e282349f5519f0882c5cd0cd

4 files changed, 12 insertions, 445 deletions

diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
index 853e8f45f4..e0e8d0d1a1 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -29,6 +29,10 @@ import android.support.car.hardware.CarSensorManager;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 
+import androidx.car.drawer.CarDrawerActivity;
+import androidx.car.drawer.CarDrawerAdapter;
+import androidx.car.drawer.DrawerItemViewHolder;
+
 import com.google.android.car.kitchensink.activityview.ActivityViewTestFragment;
 import com.google.android.car.kitchensink.alertdialog.AlertDialogTestFragment;
 import com.google.android.car.kitchensink.assistant.CarAssistantFragment;
@@ -45,7 +49,6 @@ import com.google.android.car.kitchensink.job.JobSchedulerFragment;
 import com.google.android.car.kitchensink.notification.NotificationFragment;
 import com.google.android.car.kitchensink.orientation.OrientationTestFragment;
 import com.google.android.car.kitchensink.power.PowerTestFragment;
-import com.google.android.car.kitchensink.radio.RadioTestFragment;
 import com.google.android.car.kitchensink.sensor.SensorsTestFragment;
 import com.google.android.car.kitchensink.setting.CarServiceSettingsActivity;
 import com.google.android.car.kitchensink.storagelifetime.StorageLifetimeFragment;
@@ -56,10 +59,6 @@ import com.google.android.car.kitchensink.volume.VolumeTestFragment;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.car.drawer.CarDrawerActivity;
-import androidx.car.drawer.CarDrawerAdapter;
-import androidx.car.drawer.DrawerItemViewHolder;
-
 public class KitchenSinkActivity extends CarDrawerActivity {
     private static final String TAG = "KitchenSinkActivity";
 
@@ -153,7 +152,6 @@ public class KitchenSinkActivity extends CarDrawerActivity {
             add("notification", NotificationFragment.class);
             add("orientation test", OrientationTestFragment.class);
             add("power test", PowerTestFragment.class);
-            add("radio", RadioTestFragment.class);
             add("sensors", SensorsTestFragment.class);
             add("storage lifetime", StorageLifetimeFragment.class);
             add("touch test", TouchTestFragment.class);
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java
index 0181d84c2d..b7d06e232c 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java
@@ -18,15 +18,12 @@ package com.google.android.car.kitchensink.hvac;
 
 import static java.lang.Integer.toHexString;
 
-import com.google.android.car.kitchensink.KitchenSinkActivity;
-import com.google.android.car.kitchensink.R;
-
 import android.car.CarNotConnectedException;
 import android.car.hardware.CarPropertyConfig;
 import android.car.hardware.CarPropertyValue;
 import android.car.hardware.hvac.CarHvacManager;
+import android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat;
 import android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow;
-import android.hardware.automotive.vehicle.V2_0.VehicleAreaZone;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.util.Log;
@@ -39,6 +36,9 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
+import com.google.android.car.kitchensink.KitchenSinkActivity;
+import com.google.android.car.kitchensink.R;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -415,12 +415,12 @@ public class HvacTestFragment extends Fragment {
             mTempStep = 0.5f;
         }
         mZoneForSetTempD = 0;
-        if (prop.hasArea(VehicleAreaZone.ROW_1_LEFT)) {
-            mZoneForSetTempD = VehicleAreaZone.ROW_1_LEFT;
+        if (prop.hasArea(VehicleAreaSeat.ROW_1_LEFT)) {
+            mZoneForSetTempD = VehicleAreaSeat.ROW_1_LEFT;
         }
         mZoneForSetTempP = 0;
-        if (prop.hasArea(VehicleAreaZone.ROW_1_RIGHT)) {
-            mZoneForSetTempP = VehicleAreaZone.ROW_1_RIGHT;
+        if (prop.hasArea(VehicleAreaSeat.ROW_1_RIGHT)) {
+            mZoneForSetTempP = VehicleAreaSeat.ROW_1_RIGHT;
         }
         int[] areas = prop.getAreaIds();
         if (mZoneForSetTempD == 0 && areas.length > 1) {
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/radio/RadioTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/radio/RadioTestFragment.java
deleted file mode 100644
index 1b0f0294f4..0000000000
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/radio/RadioTestFragment.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.android.car.kitchensink.radio;
-
-import android.annotation.Nullable;
-import android.car.Car;
-import android.car.CarNotConnectedException;
-import android.car.media.CarAudioManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.ServiceConnection;
-import android.hardware.radio.RadioManager;
-import android.hardware.radio.RadioMetadata;
-import android.hardware.radio.RadioTuner;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.support.v4.app.Fragment;
-import android.text.TextUtils;
-import android.text.method.ScrollingMovementMethod;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.ToggleButton;
-
-import com.google.android.car.kitchensink.R;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-public class RadioTestFragment extends Fragment {
-    private static final String TAG = "CAR.RADIO.KS";
-    private static final boolean DBG = true;
-    private static final int MAX_LOG_MESSAGES = 100;
-
-    private final RadioTuner.Callback mRadioCallback = new RadioTuner.Callback() {
-        @Override
-        public void onError(int status) {
-            addLog(Log.WARN, "Radio tuner error " + status);
-        }
-
-        @Override
-        public void onConfigurationChanged(RadioManager.BandConfig config) {
-            addLog(Log.INFO, "Radio tuner configuration changed. config:" + config);
-        }
-
-        @Override
-        public void onMetadataChanged(RadioMetadata metadata) {
-            addLog(Log.INFO, "Radio tuner metadata changed. metadata:" + metadata);
-            if (metadata == null) {
-                resetMessages();
-                updateMessages();
-                return;
-            }
-            mArtist = metadata.getString(RadioMetadata.METADATA_KEY_ARTIST);
-            mSong = metadata.getString(RadioMetadata.METADATA_KEY_TITLE);
-            mStation = metadata.getString(RadioMetadata.METADATA_KEY_RDS_PS);
-            updateMessages();
-        }
-
-        @Override
-        public void onProgramInfoChanged(RadioManager.ProgramInfo info) {
-            addLog(Log.INFO, "Radio tuner program info. info:" + info);
-            mChannel = String.valueOf(info.getChannel());
-            onMetadataChanged(info.getMetadata());
-            updateMessages();
-        }
-
-    };
-    private final LinkedList<String> mLogMessages = new LinkedList<>();
-
-    private Button mOpenRadio;
-    private Button mCloseRadio;
-    private Button mRadioNext;
-    private Button mRadioPrev;
-    private Button mRadioScanCancel;
-    private Button mRadioGetProgramInfo;
-    private Button mRadioTuneToStation;
-    private Button mRadioStepUp;
-    private Button mRadioStepDown;
-    private EditText mStationFrequency;
-    private ToggleButton mToggleMuteRadio;
-    private ToggleButton mRadioBand;
-    private TextView mStationInfo;
-    private TextView mChannelInfo;
-    private TextView mSongInfo;
-    private TextView mArtistInfo;
-    private TextView mLog;
-
-    private Car mCar;
-    private CarAudioManager mCarAudioManager;
-    private RadioTuner mRadioTuner;
-    private RadioManager mRadioManager;
-    private RadioManager.FmBandDescriptor mFmDescriptor;
-    private RadioManager.AmBandDescriptor mAmDescriptor;
-    private String mStation;
-    private String mChannel;
-    private String mSong;
-    private String mArtist;
-    private String mNaString;
-
-    private RadioManager.BandConfig mFmConfig;
-    private RadioManager.BandConfig mAmConfig;
-
-    private final List<RadioManager.ModuleProperties> mModules = new ArrayList<>();
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        if (DBG) {
-            Log.i(TAG, "onCreateView");
-        }
-
-        init();
-        View view = inflater.inflate(R.layout.radio, container, false);
-
-        mOpenRadio = view.findViewById(R.id.button_open_radio);
-        mCloseRadio = view.findViewById(R.id.button_close_radio);
-        mRadioNext = view.findViewById(R.id.button_radio_next);
-        mRadioPrev = view.findViewById(R.id.button_radio_prev);
-        mRadioScanCancel = view.findViewById(R.id.button_radio_scan_cancel);
-        mRadioGetProgramInfo = view.findViewById(R.id.button_radio_get_program_info);
-        mRadioTuneToStation = view.findViewById(R.id.button_radio_tune_to_station);
-        mRadioStepUp = view.findViewById(R.id.button_radio_step_up);
-        mRadioStepDown = view.findViewById(R.id.button_radio_step_down);
-
-        mStationFrequency = view.findViewById(R.id.edittext_station_frequency);
-
-        mToggleMuteRadio = view.findViewById(R.id.togglebutton_mute_radio);
-        mToggleMuteRadio.setChecked(true);
-        mRadioBand = view.findViewById(R.id.button_band_selection);
-
-        mStationInfo = view.findViewById(R.id.radio_station_info);
-        mChannelInfo = view.findViewById(R.id.radio_channel_info);
-        mSongInfo = view.findViewById(R.id.radio_song_info);
-        mArtistInfo = view.findViewById(R.id.radio_artist_info);
-
-        mLog = view.findViewById(R.id.radio_log);
-        mLog.setMovementMethod(new ScrollingMovementMethod());
-
-        mNaString = getContext().getString(R.string.radio_na);
-
-        addHandlers();
-        updateStates();
-
-        return view;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        resetMessages();
-        updateStates();
-        updateMessages();
-        resetLog();
-    }
-
-    private void init() {
-        mCar = Car.createCar(getContext(), new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName name, IBinder service) {
-                try {
-                    mCarAudioManager = (CarAudioManager) mCar.getCarManager(Car.AUDIO_SERVICE);
-                } catch (CarNotConnectedException e) {
-                    Log.e(TAG, "Car not connected", e);
-                }
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-            }
-        });
-        mCar.connect();
-        initializeRadio();
-    }
-
-    private void initializeRadio() {
-        mRadioManager = (RadioManager) getContext().getSystemService(Context.RADIO_SERVICE);
-
-        if (mRadioManager == null) {
-            throw new IllegalStateException("RadioManager could not be loaded.");
-        }
-
-        int status = mRadioManager.listModules(mModules);
-        if (status != RadioManager.STATUS_OK) {
-            throw new IllegalStateException("Load modules failed with status: " + status);
-        }
-
-        if (mModules.size() == 0) {
-            throw new IllegalStateException("No radio modules on device.");
-        }
-
-        boolean isDebugLoggable = Log.isLoggable(TAG, Log.DEBUG);
-
-        // Load the possible radio bands. For now, just accept FM and AM bands.
-        for (RadioManager.BandDescriptor band : mModules.get(0).getBands()) {
-            if (isDebugLoggable) {
-                Log.d(TAG, "loading band: " + band.toString());
-            }
-
-            if (mFmDescriptor == null && band.isFmBand()) {
-                mFmDescriptor = (RadioManager.FmBandDescriptor) band;
-            }
-
-            if (mAmDescriptor == null && band.isAmBand()) {
-                mAmDescriptor = (RadioManager.AmBandDescriptor) band;
-            }
-        }
-
-        if (mFmDescriptor == null && mAmDescriptor == null) {
-            throw new IllegalStateException("No AM and FM radio bands could be loaded.");
-        }
-
-        mFmConfig = new RadioManager.FmBandConfig.Builder(mFmDescriptor)
-                .setStereo(true)
-                .build();
-        mAmConfig = new RadioManager.AmBandConfig.Builder(mAmDescriptor)
-                .setStereo(true)
-                .build();
-    }
-
-    private void addHandlers() {
-        mOpenRadio.setOnClickListener(v -> {
-            handleRadioStart();
-            updateStates();
-        });
-        mCloseRadio.setOnClickListener(v -> {
-            handleRadioEnd();
-            mToggleMuteRadio.setChecked(true);
-            updateStates();
-        });
-        mToggleMuteRadio.setOnClickListener(v -> {
-            if (DBG) {
-                Log.i(TAG, "Toggle mute radio");
-            }
-            mRadioTuner.setMute(!mRadioTuner.getMute());
-            updateStates();
-        });
-        mRadioNext.setOnClickListener(v -> {
-            if (DBG) {
-                Log.i(TAG, "Next radio station");
-            }
-            if (mRadioTuner != null) {
-                mRadioTuner.scan(RadioTuner.DIRECTION_UP, true);
-            }
-            updateStates();
-        });
-        mRadioPrev.setOnClickListener(v -> {
-            if (DBG) {
-                Log.i(TAG, "Previous radio station");
-            }
-            if (mRadioTuner != null) {
-                mRadioTuner.scan(RadioTuner.DIRECTION_DOWN, true);
-            }
-            updateStates();
-        });
-        mRadioScanCancel.setOnClickListener(v -> {
-            if (DBG) {
-                Log.i(TAG, "Cancel radio scan");
-            }
-            if (mRadioTuner != null) {
-                mRadioTuner.cancel();
-            }
-            updateStates();
-        });
-        mRadioTuneToStation.setOnClickListener(v -> {
-            if (DBG) {
-                Log.i(TAG, "Tuning to station");
-            }
-            String station = mStationFrequency.getText().toString().trim();
-            if (mRadioTuner != null && !(station.equals(""))) {
-                mRadioTuner.tune(Integer.parseInt(station), 0);
-            }
-            resetMessages();
-            updateMessages();
-            updateStates();
-        });
-        mRadioStepUp.setOnClickListener(v -> {
-            if (DBG) {
-                Log.i(TAG, "Step up");
-            }
-            if (mRadioTuner != null) {
-                mRadioTuner.step(RadioTuner.DIRECTION_UP, false);
-            }
-            resetMessages();
-            updateMessages();
-            updateStates();
-        });
-        mRadioStepDown.setOnClickListener(v -> {
-            if (DBG) {
-                Log.i(TAG, "Step down");
-            }
-            if (mRadioTuner != null) {
-                mRadioTuner.step(RadioTuner.DIRECTION_DOWN, false);
-            }
-            resetMessages();
-            updateMessages();
-            updateStates();
-        });
-        mRadioGetProgramInfo.setOnClickListener(v -> {
-            if (DBG) {
-                Log.i(TAG, "getProgramInformation");
-            }
-            if (mRadioTuner != null) {
-                RadioManager.ProgramInfo[] programInfos = new RadioManager.ProgramInfo[1];
-                mRadioTuner.getProgramInformation(programInfos);
-                addLog(Log.INFO, "mRadioTuner.getProgramInformation() =>" + programInfos[0]);
-            }
-        });
-        mRadioBand.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            if (DBG) {
-                Log.i(TAG, "Changing radio band");
-            }
-            if (mRadioTuner != null) {
-                mRadioTuner.setConfiguration(mRadioBand.isChecked() ? mFmConfig : mAmConfig);
-            }
-            resetMessages();
-            updateMessages();
-            updateStates();
-        });
-    }
-
-    private void updateStates() {
-        mOpenRadio.setEnabled(mRadioTuner == null);
-        mCloseRadio.setEnabled(mRadioTuner != null);
-        mToggleMuteRadio.setEnabled(mRadioTuner != null);
-        mRadioNext.setEnabled(mRadioTuner != null);
-        mRadioPrev.setEnabled(mRadioTuner != null);
-        mRadioBand.setEnabled(mRadioTuner != null);
-        mRadioScanCancel.setEnabled(mRadioTuner != null);
-        mRadioTuneToStation.setEnabled(mRadioTuner != null);
-        mRadioStepUp.setEnabled(mRadioTuner != null);
-        mRadioStepDown.setEnabled(mRadioTuner != null);
-        mStationFrequency.setEnabled(mRadioTuner != null);
-        mRadioGetProgramInfo.setEnabled(mRadioTuner != null);
-    }
-
-    private void updateMessages() {
-        mStationInfo.setText(getContext().getString
-                (R.string.radio_station_info, mStation == null ? mNaString : mStation));
-        mChannelInfo.setText(getContext().getString
-                (R.string.radio_channel_info, mChannel == null ? mNaString : mChannel));
-        mArtistInfo.setText(getContext().getString
-                (R.string.radio_artist_info, mArtist == null ? mNaString : mArtist));
-        mSongInfo.setText(getContext().getString
-                (R.string.radio_song_info, mSong == null ? mNaString : mSong));
-    }
-
-    private void resetMessages() {
-        mStation = null;
-        mChannel = null;
-        mSong = null;
-        mArtist = null;
-    }
-
-    private void handleRadioStart() {
-        if (mCarAudioManager == null) {
-            return;
-        }
-        if (DBG) {
-            Log.i(TAG, "Radio start");
-        }
-        if (mRadioTuner != null) {
-            Log.w(TAG, "Radio tuner already open");
-            mRadioTuner.close();
-            mRadioTuner = null;
-        }
-        mRadioTuner = mRadioManager.openTuner(mModules.get(0).getId(),
-                mRadioBand.isChecked() ? mFmConfig : mAmConfig,
-                true, mRadioCallback /* callback */, null /* handler */);
-    }
-
-    private void handleRadioEnd() {
-        if (mCarAudioManager == null) {
-            return;
-        }
-        if (DBG) {
-            Log.i(TAG, "Radio end");
-        }
-        mRadioTuner.close();
-        mRadioTuner = null;
-    }
-
-    private void resetLog() {
-        synchronized (this) {
-            mLogMessages.clear();
-        }
-    }
-
-    private void addLog(int priority, String message) {
-        Log.println(priority, TAG, message);
-        synchronized (this) {
-            mLogMessages.add(message);
-            if (mLogMessages.size() > MAX_LOG_MESSAGES) {
-                mLogMessages.poll();
-            }
-            mLog.setText(TextUtils.join("\n", mLogMessages));
-        }
-    }
-}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java
index 2b9ee5427b..b022820c2c 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java
@@ -304,9 +304,6 @@ public class SensorsTestFragment extends Fragment {
                             getTimestamp(event), event == null ? mNaString :
                             event.getCarTractionControlActiveData().tractionControlIsActive));
                         break;
-                    case CarSensorManager.SENSOR_TYPE_ENGINE_ON:
-                        summary.add(getEngineOn(event));
-                        break;
                     case CarSensorManager.SENSOR_TYPE_EV_BATTERY_LEVEL:
                         summary.add(getEvBatteryLevel(event));
                         break;
@@ -441,14 +438,6 @@ public class SensorsTestFragment extends Fragment {
             fuelDoorOpen);
     }
 
-    private String getEngineOn(CarSensorEvent event) {
-        String engineOn = mNaString;
-        if (event != null) {
-            engineOn = String.valueOf(event.getCarEngineOnData().engineIsOn);
-        }
-        return getContext().getString(R.string.sensor_engine_is_on, getTimestamp(event), engineOn);
-    }
-
     private String getEvBatteryLevel(CarSensorEvent event) {
         String evBatteryLevel = mNaString;
         if(event != null) {