PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove context from BluetoothFeatureProviderImpl" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-07-19 09:17:08 +00:00
committed by Android (Google) Code Review
parent 7755a29e25 80744abb37
commit 2281a64085
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/bluetooth/BluetoothFeatureProviderImpl.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.bluetooth;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context;
import android.net.Uri; import android.net.Uri;
import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.bluetooth.BluetoothUtils;
@@ -30,8 +29,6 @@ import java.util.List;
*/ */
public class BluetoothFeatureProviderImpl implements BluetoothFeatureProvider { public class BluetoothFeatureProviderImpl implements BluetoothFeatureProvider {
public BluetoothFeatureProviderImpl(Context context) {}
@Override @Override
public Uri getBluetoothDeviceSettingsUri(BluetoothDevice bluetoothDevice) { public Uri getBluetoothDeviceSettingsUri(BluetoothDevice bluetoothDevice) {
final byte[] uriByte = bluetoothDevice.getMetadata( final byte[] uriByte = bluetoothDevice.getMetadata(

2
src/com/android/settings/overlay/FeatureFactoryImpl.kt
View File

@@ -145,7 +145,7 @@ open class FeatureFactoryImpl : FeatureFactory() {
override fun getContextualCardFeatureProvider(context: Context) = contextualCardFeatureProvider override fun getContextualCardFeatureProvider(context: Context) = contextualCardFeatureProvider
override val bluetoothFeatureProvider: BluetoothFeatureProvider by lazy { override val bluetoothFeatureProvider: BluetoothFeatureProvider by lazy {
BluetoothFeatureProviderImpl(appContext) BluetoothFeatureProviderImpl()
} }
override val faceFeatureProvider: FaceFeatureProvider by lazy { FaceFeatureProviderImpl() } override val faceFeatureProvider: FaceFeatureProvider by lazy { FaceFeatureProviderImpl() }

4
tests/robotests/src/com/android/settings/bluetooth/BluetoothFeatureProviderImplTest.java
View File

@@ -28,7 +28,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class BluetoothFeatureProviderImplTest { public class BluetoothFeatureProviderImplTest {
@@ -47,8 +46,7 @@ public class BluetoothFeatureProviderImplTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mBluetoothFeatureProvider = new BluetoothFeatureProviderImpl( mBluetoothFeatureProvider = new BluetoothFeatureProviderImpl();
RuntimeEnvironment.application);
} }
@Test @Test