diff options
| author | Ankit Gupta <agupta@cyngn.com> | 2016-06-14 13:49:47 -0700 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2016-09-30 03:45:13 -0700 |
| commit | 7be05f39f6cc1578449578ac3867e585b6727d06 (patch) | |
| tree | 32411b165d106b90ad8078ac7c2d336887011674 | |
| parent | 39dcaf95531fe783075b8b71bd21a97b6b444bf8 (diff) | |
| download | android_packages_apps_Messaging-7be05f39f6cc1578449578ac3867e585b6727d06.tar.gz android_packages_apps_Messaging-7be05f39f6cc1578449578ac3867e585b6727d06.tar.bz2 android_packages_apps_Messaging-7be05f39f6cc1578449578ac3867e585b6727d06.zip | |
MediaPicker: Check for NPE
make sure view has been created before asking for
its visibility.
Issue-id: FEIJ-1135
Change-Id: Id5c537b5446c4e8edb1a6748d931e245fa31fd64
(cherry picked from commit 57cadbe3de1b0e8faf1e8196b7d1df361f3960ca)
| -rw-r--r-- | src/com/android/messaging/ui/mediapicker/AudioMediaChooser.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/messaging/ui/mediapicker/AudioMediaChooser.java b/src/com/android/messaging/ui/mediapicker/AudioMediaChooser.java index 5d79293..3553f10 100644 --- a/src/com/android/messaging/ui/mediapicker/AudioMediaChooser.java +++ b/src/com/android/messaging/ui/mediapicker/AudioMediaChooser.java @@ -123,6 +123,10 @@ class AudioMediaChooser extends MediaChooser implements final int requestCode, final String permissions[], final int[] grantResults) { if (requestCode == MediaPicker.RECORD_AUDIO_PERMISSION_REQUEST_CODE) { final boolean permissionGranted = grantResults[0] == PackageManager.PERMISSION_GRANTED; + // onRequestPermissionsResult can sometimes get called before createView(). + if (mEnabledView == null) { + return; + } mEnabledView.setVisibility(permissionGranted ? View.VISIBLE : View.GONE); mMissingPermissionView.setVisibility(permissionGranted ? View.GONE : View.VISIBLE); } |