summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAnkit Gupta <agupta@cyngn.com>2016-06-14 13:49:47 -0700
committerMichael Bestas <mkbestas@lineageos.org>2019-10-29 20:23:47 +0200
commita791477eea2485f2384e22aa6a688b27222f8b0c (patch)
tree0b8892c3d9d2c7a865e94550cf3fc899db1dd5f6 /src
parent27c3a8ec28926800351fad36f7686db9807710de (diff)
downloadandroid_packages_apps_Messaging-a791477eea2485f2384e22aa6a688b27222f8b0c.tar.gz
android_packages_apps_Messaging-a791477eea2485f2384e22aa6a688b27222f8b0c.tar.bz2
android_packages_apps_Messaging-a791477eea2485f2384e22aa6a688b27222f8b0c.zip
MediaPicker: Check for NPE
make sure view has been created before asking for its visibility. Change-Id: I0f0c36f8edf83c518bf07ef05399eda5d6b0f78a Issue-id: FEIJ-1135
Diffstat (limited to 'src')
-rw-r--r--src/com/android/messaging/ui/mediapicker/AudioMediaChooser.java4
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);
}