diff options
author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-16 16:27:01 +0100 |
---|---|---|
committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2020-03-16 16:29:10 +0100 |
commit | 606029be695cae07ce4b05a689acbe33bb8052b0 (patch) | |
tree | dac3390441256687fdef7515b1ea4355ad21a198 | |
parent | e3df05279a6bff00bdd5ecd9645e114dda9e51d3 (diff) | |
download | android_packages_apps_Messaging-606029be695cae07ce4b05a689acbe33bb8052b0.tar.gz android_packages_apps_Messaging-606029be695cae07ce4b05a689acbe33bb8052b0.tar.bz2 android_packages_apps_Messaging-606029be695cae07ce4b05a689acbe33bb8052b0.zip |
Revert "Fixed storage permission issue for attachments"
This reverts commit 2f0f7aee6432f475e84bb4873e7777542757645e.
Change-Id: I4f697eae9d525f7c284dcfabb30ff0def07fb375
3 files changed, 3 insertions, 9 deletions
diff --git a/src/com/android/messaging/ui/mediapicker/AudioListChooser.java b/src/com/android/messaging/ui/mediapicker/AudioListChooser.java index 6fb349a..767e725 100644 --- a/src/com/android/messaging/ui/mediapicker/AudioListChooser.java +++ b/src/com/android/messaging/ui/mediapicker/AudioListChooser.java @@ -174,9 +174,6 @@ class AudioListChooser extends MediaChooser implements // Work around a bug in MediaStore where cursors querying the Files provider don't get // updated for changes to Images.Media or Video.Media. startMediaPickerDataLoader(); - updateForPermissionState(true); - } else { - updateForPermissionState(false); } } @@ -186,7 +183,7 @@ class AudioListChooser extends MediaChooser implements if (selected && !OsUtil.hasStoragePermission()) { mMediaPicker.requestPermissions( new String[] { Manifest.permission.READ_EXTERNAL_STORAGE }, - MediaPicker.AUDIO_LIBRARY_PERMISSION_REQUEST_CODE); + MediaPicker.GALLERY_PERMISSION_REQUEST_CODE); } } @@ -198,7 +195,7 @@ class AudioListChooser extends MediaChooser implements @Override protected void onRequestPermissionsResult( final int requestCode, final String permissions[], final int[] grantResults) { - if (requestCode == MediaPicker.AUDIO_LIBRARY_PERMISSION_REQUEST_CODE) { + if (requestCode == MediaPicker.GALLERY_PERMISSION_REQUEST_CODE) { final boolean permissionGranted = grantResults[0] == PackageManager.PERMISSION_GRANTED; if (permissionGranted) { startMediaPickerDataLoader(); diff --git a/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java b/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java index f111f22..728de4c 100644 --- a/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java +++ b/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java @@ -24,6 +24,7 @@ import android.database.MergeCursor; import android.provider.Telephony; import androidx.appcompat.app.ActionBar; import androidx.appcompat.mms.CarrierConfigValuesLoader; +import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -195,9 +196,6 @@ class GalleryMediaChooser extends MediaChooser implements // Work around a bug in MediaStore where cursors querying the Files provider don't get // updated for changes to Images.Media or Video.Media. startMediaPickerDataLoader(); - updateForPermissionState(true); - } else { - updateForPermissionState(false); } } diff --git a/src/com/android/messaging/ui/mediapicker/MediaPicker.java b/src/com/android/messaging/ui/mediapicker/MediaPicker.java index e31c5c0..5920e63 100644 --- a/src/com/android/messaging/ui/mediapicker/MediaPicker.java +++ b/src/com/android/messaging/ui/mediapicker/MediaPicker.java @@ -726,7 +726,6 @@ public class MediaPicker extends Fragment implements DraftMessageSubscriptionDat protected static final int LOCATION_PERMISSION_REQUEST_CODE = 2; protected static final int RECORD_AUDIO_PERMISSION_REQUEST_CODE = 3; protected static final int GALLERY_PERMISSION_REQUEST_CODE = 4; - protected static final int AUDIO_LIBRARY_PERMISSION_REQUEST_CODE = 5; @Override public void onRequestPermissionsResult( |