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

Merge "Make the default value of flashlight availibility to true."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-21 05:23:30 +00:00
committed by Android (Google) Code Review
parent 9b32010876 8235ed14a4
commit e5584cd39c
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/flashlight/FlashlightSlice.java
View File

@@ -39,6 +39,7 @@ import androidx.slice.builders.ListBuilder;
import androidx.slice.builders.ListBuilder.RowBuilder;
import androidx.slice.builders.SliceAction;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.slices.CustomSliceRegistry;
@@ -131,10 +132,19 @@ public class FlashlightSlice implements CustomSliceable {
return null;
}
private static boolean isFlashlightAvailable(Context context) {
return Settings.Secure.getInt(
context.getContentResolver(), Secure.FLASHLIGHT_AVAILABLE, 0) == 1;
@VisibleForTesting
static boolean isFlashlightAvailable(Context context) {
int defaultAvailability = 0;
try {
// check if there is a flash unit
if (getCameraId(context) != null) {
defaultAvailability = 1;
}
} catch (CameraAccessException e) {
Log.e(TAG, "Error getting camera id.", e);
}
return Secure.getInt(context.getContentResolver(),
Secure.FLASHLIGHT_AVAILABLE, defaultAvailability) == 1;
}
private static boolean isFlashlightEnabled(Context context) {