Merge "Update car api usage for package manager queries" into rvc-dev am: 2254da33ec

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Dialer/+/11900903

Change-Id: I68e2ab495e7c4444bde2511d8089f4aa5108cbee

1 files changed, 15 insertions, 2 deletions

diff --git a/src/com/android/car/dialer/ui/warning/NoHfpFragment.java b/src/com/android/car/dialer/ui/warning/NoHfpFragment.java
index e471c823..2e4ef093 100644
--- a/src/com/android/car/dialer/ui/warning/NoHfpFragment.java
+++ b/src/com/android/car/dialer/ui/warning/NoHfpFragment.java
@@ -16,6 +16,8 @@
 
 package com.android.car.dialer.ui.warning;
 
+import android.car.Car;
+import android.car.content.pm.CarPackageManager;
 import android.car.drivingstate.CarUxRestrictions;
 import android.content.Intent;
 import android.os.Bundle;
@@ -46,6 +48,9 @@ public class NoHfpFragment extends Fragment {
     private TextView mErrorMessageView;
     private String mErrorMessage;
 
+    private Car mCar;
+    private CarPackageManager mCarPackageManager;
+
     /**
      * Returns an instance of the {@link NoHfpFragment} with the given error message as the one to
      * display.
@@ -67,6 +72,14 @@ public class NoHfpFragment extends Fragment {
         if (args != null) {
             mErrorMessage = args.getString(ERROR_MESSAGE_KEY);
         }
+        mCar = Car.createCar(getActivity());
+        mCarPackageManager = (CarPackageManager) mCar.getCarManager(Car.PACKAGE_SERVICE);
+    }
+
+    @Override
+    public void onDestroy() {
+        mCar.disconnect();
+        super.onDestroy();
     }
 
     /**
@@ -106,8 +119,8 @@ public class NoHfpFragment extends Fragment {
         launchIntent.addCategory(Bluetooth_Setting_CATEGORY);
 
         UxrButton bluetoothButton = view.findViewById(R.id.connect_bluetooth_button);
-        boolean isDistractionOptimized = CarPackageManagerUtils.getInstance(getActivity())
-                .isDistractionOptimized(getActivity().getPackageManager(), launchIntent);
+        boolean isDistractionOptimized = CarPackageManagerUtils.isDistractionOptimized(
+                mCarPackageManager, getActivity().getPackageManager(), launchIntent);
         bluetoothButton.setUxRestrictions(isDistractionOptimized
                 ? CarUxRestrictions.UX_RESTRICTIONS_BASELINE
                 : CarUxRestrictions.UX_RESTRICTIONS_NO_SETUP);