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

Make the default value of flashlight availibility to true.

Browse Source 
We read from SettingsProvider to decide whether flashlight slice is
available. However, when switching to the second user, FLASHLIGHT_AVAILABLE
will be null. The default was 0 which causes the slice returning null,
so we have to set it to 1 when there is a physical flash unit to be
consistent with system ui.

Fixes: 134734608
Test: robotest
Change-Id: I981461b1b66e6e273e13a9cbcba96e3ccf0aec68
This commit is contained in:
Yi-Ling Chuang
2019-06-17 11:00:47 +08:00
parent 2ee1249b01
commit 8235ed14a4
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/robotests/src/com/android/settings/flashlight/FlashlightSliceTest.java
View File

@@ -20,6 +20,8 @@ package com.android.settings.flashlight;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CameraManager;
import android.provider.Settings;
import androidx.slice.Slice;
@@ -35,6 +37,11 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowCameraCharacteristics;
import org.robolectric.shadows.ShadowCameraManager;
import java.util.List;
@@ -42,10 +49,12 @@ import java.util.List;
public class FlashlightSliceTest {
private Context mContext;
private ShadowCameraManager mShadowCameraManager;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mShadowCameraManager = Shadows.shadowOf(mContext.getSystemService(CameraManager.class));
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
@@ -64,4 +73,22 @@ public class FlashlightSliceTest {
final List<SliceAction> toggles = metadata.getToggles();
assertThat(toggles).hasSize(1);
}
@Test
public void isFlashlightAvailable_nullSecureAttr_noFlashUnit_returnFalse() {
assertThat(FlashlightSlice.isFlashlightAvailable(mContext)).isFalse();
}
@Test
public void isFlashlightAvailable_nullSecureAttr_hasFlashUnit_returnTrue() {
final CameraCharacteristics characteristics =
ShadowCameraCharacteristics.newCameraCharacteristics();
final ShadowCameraCharacteristics shadowCharacteristics = Shadow.extract(characteristics);
shadowCharacteristics.set(CameraCharacteristics.FLASH_INFO_AVAILABLE, true);
shadowCharacteristics
.set(CameraCharacteristics.LENS_FACING, CameraCharacteristics.LENS_FACING_BACK);
mShadowCameraManager.addCamera("camera_id", characteristics);
assertThat(FlashlightSlice.isFlashlightAvailable(mContext)).isTrue();
}
}