summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnkit Gupta <agupta@cyngn.com>2016-06-14 13:49:47 -0700
committerJoey Rizzoli <joey@lineageos.org>2017-11-14 20:28:49 +0100
commitc5ac84de549162a3e7fad9e201fa2df566c30a2b (patch)
tree9ff9e41ab034d10da40180caeea1df14ae95ab5b
parent086f0a54578d5471782c67f737d6b39220e4a514 (diff)
downloadpackages_apps_Messaging-c5ac84de549162a3e7fad9e201fa2df566c30a2b.tar.gz
packages_apps_Messaging-c5ac84de549162a3e7fad9e201fa2df566c30a2b.tar.bz2
packages_apps_Messaging-c5ac84de549162a3e7fad9e201fa2df566c30a2b.zip
MediaPicker: Check for NPE
make sure view has been created before asking for its visibility. Change-Id: I0f0c36f8edf83c518bf07ef05399eda5d6b0f78a Issue-id: FEIJ-1135
-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);
}