diff options
| author | Ankit Gupta <agupta@cyngn.com> | 2016-06-14 13:49:47 -0700 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-30 21:04:51 +0200 |
| commit | 2e9e30ac148c052dbb289faddf6f4137a86bb44e (patch) | |
| tree | b54ae42321452870e5e12674dca2eaa7bca3d3ac | |
| parent | 352a400370026a7052114483708b15869104bd5b (diff) | |
| download | android_packages_apps_Messaging-2e9e30ac148c052dbb289faddf6f4137a86bb44e.tar.gz android_packages_apps_Messaging-2e9e30ac148c052dbb289faddf6f4137a86bb44e.tar.bz2 android_packages_apps_Messaging-2e9e30ac148c052dbb289faddf6f4137a86bb44e.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.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); } |