Commit ff8ead91 authored by Ted Choc's avatar Ted Choc Committed by Commit Bot

Hide camera icon if missing camera permission in file picker.

BUG=849294

Change-Id: I8bf82b86b517d3c269af2a8580df86aa546a88ed
Reviewed-on: https://chromium-review.googlesource.com/1089351Reviewed-by: default avatarYusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565024}
parent b419bb16
......@@ -4,9 +4,14 @@
package org.chromium.chrome.browser.photo_picker;
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Environment;
import android.os.Process;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.ContextUtils;
import org.chromium.base.ThreadUtils;
import java.io.File;
......@@ -107,7 +112,11 @@ class FileEnumWorkerTask extends AsyncTask<Void, Void, List<PickerBitmap>> {
Collections.sort(pickerBitmaps);
pickerBitmaps.add(0, new PickerBitmap("", 0, PickerBitmap.GALLERY));
pickerBitmaps.add(0, new PickerBitmap("", 0, PickerBitmap.CAMERA));
if (ApiCompatibilityUtils.checkPermission(ContextUtils.getApplicationContext(),
Manifest.permission.CAMERA, Process.myPid(), Process.myUid())
== PackageManager.PERMISSION_GRANTED) {
pickerBitmaps.add(0, new PickerBitmap("", 0, PickerBitmap.CAMERA));
}
return pickerBitmaps;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment