From 6f980feeba69bb50fc4ababf27eff602e9f4d37b Mon Sep 17 00:00:00 2001
From: tmfang <tmfang@google.com>
Date: Tue, 31 Jul 2018 14:20:12 +0800
Subject: [PATCH] Unable to send files over Bluetooth OPP

DevicPickerActivity switches to an androidx fragment in layout of bluetooth_device_picker.
But android.app.Activity doesn't support androidx fragment.
So, let DevicePiackerActivity extend androidx FragmentActivity.

Change-Id: I5da98a5e2242b75d2205a786bf373b81dfe6f613
Fixes: 112010509
Test: manual test, robo test
---
 src/com/android/settings/bluetooth/DevicePickerActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/bluetooth/DevicePickerActivity.java b/src/com/android/settings/bluetooth/DevicePickerActivity.java
index 43ba05d8812..5228cd89ef2 100644
--- a/src/com/android/settings/bluetooth/DevicePickerActivity.java
+++ b/src/com/android/settings/bluetooth/DevicePickerActivity.java
@@ -16,16 +16,17 @@
 
 package com.android.settings.bluetooth;
 
-import android.app.Activity;
 import android.os.Bundle;
 
 import com.android.settings.R;
 
+import androidx.fragment.app.FragmentActivity;
+
 /**
  * Activity for Bluetooth device picker dialog. The device picker logic
  * is implemented in the {@link BluetoothPairingDetail} fragment.
  */
-public final class DevicePickerActivity extends Activity {
+public final class DevicePickerActivity extends FragmentActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {