summaryrefslogtreecommitdiff
authorTing Li <ting.li@amlogic.com>2016-01-29 06:38:30 (GMT)
committer Ting Li <ting.li@amlogic.com>2016-01-29 06:40:43 (GMT)
commit86daaa2a7dbb308e6e4235d1749e641f3bc8a725 (patch)
tree821823872733415f94797a055f2d686730053edb
parente3ab5016ae99a71da1d8365c4984b7547a6f2a35 (diff)
downloadOTAUpgrade2-86daaa2a7dbb308e6e4235d1749e641f3bc8a725.zip
OTAUpgrade2-86daaa2a7dbb308e6e4235d1749e641f3bc8a725.tar.gz
OTAUpgrade2-86daaa2a7dbb308e6e4235d1749e641f3bc8a725.tar.bz2
pd#118388 commit 'Idee80f9d' which include a null exception
Change-Id: Ic2091fb0b091ee81a7579eda0d28743704a8b820
Diffstat
-rw-r--r--src/com/droidlogic/otaupgrade/PrefUtils.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/droidlogic/otaupgrade/PrefUtils.java b/src/com/droidlogic/otaupgrade/PrefUtils.java
index f4bffa7..9d78a70 100644
--- a/src/com/droidlogic/otaupgrade/PrefUtils.java
+++ b/src/com/droidlogic/otaupgrade/PrefUtils.java
@@ -221,7 +221,7 @@ public class PrefUtils implements CheckUpdateTask.CheckPathCallBack{
}
private String getCanWritePath(){
ArrayList<File> externalDevs = getExternalStorageList();
- String filePath = null;
+ String filePath = "";
for ( int j = 0; (externalDevs != null) && j < externalDevs.size(); j++ ) {
File dir = externalDevs.get(j);
if ( dir.isDirectory() && dir.canWrite() ) {
@@ -290,7 +290,7 @@ public class PrefUtils implements CheckUpdateTask.CheckPathCallBack{
void write2File() {
String flagParentPath = getCanWritePath();
- if ( flagParentPath == null ) {
+ if ( flagParentPath.isEmpty() ) {
return;
}
File flagFile = new File ( flagParentPath, FlagFile );
@@ -334,7 +334,7 @@ public class PrefUtils implements CheckUpdateTask.CheckPathCallBack{
File dev = new File ( backupOutFile );
- if ( dev == null || !dev.canWrite() ) {
+ if ( backupOutFile.isEmpty() || dev == null || !dev.canWrite() ) {
return;
}
if ( dev.isDirectory() && dev.canWrite() && !dev.getName().startsWith(".") ) {