drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

Browse Source 
* commit '13249411b1c7dd4a476eec6905998217636a9344':
  Add NULL check in updateProxyConfig
This commit is contained in:
Marco Nelissen
2014-01-14 16:18:02 +00:00
committed by Android Git Automerger
parent d34950cfc6 13249411b1
commit e2c046fe7c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
media/jni/android_media_MediaPlayer.cpp
View File

@ -826,16 +826,19 @@ android_media_MediaPlayer_updateProxyConfig(
jstring exclusionListObj = (jstring)env->CallObjectMethod(
proxyProps, fields.proxyConfigGetExclusionList);
const char *exclusionList =
env->GetStringUTFChars(exclusionListObj, NULL);
if (host != NULL && exclusionListObj != NULL) {
thisplayer->updateProxyConfig(host, port, exclusionList);
}
const char *exclusionList = env->GetStringUTFChars(exclusionListObj, NULL);
if (exclusionList != NULL) {
env->ReleaseStringUTFChars(exclusionListObj, exclusionList);
exclusionList = NULL;
if (exclusionList != NULL) {
thisplayer->updateProxyConfig(host, port, exclusionList);
env->ReleaseStringUTFChars(exclusionListObj, exclusionList);
exclusionList = NULL;
} else {
thisplayer->updateProxyConfig(host, port, "");
}
} else if (host != NULL) {
thisplayer->updateProxyConfig(host, port, "");
}
if (host != NULL) {