commit 826c033668e5820aabdfb61d24710d61c01ec846
author James Wei <jameswei@google.com> Tue Mar 24 08:51:17 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 24 08:51:17 2020 +0000
tree b12d8a0630be7ca59d62538f7ce91a2abb9fe2dd
parent 048a8c1ed66a409b72174f98d3a1bb8eaabdc567
parent d54889408aa859a479b68c7ab03afc1475f6b305

MTP: Add MTP host exception handling am: 15486968c2 am: d54889408a

Change-Id: Ib9eb905c7dbf341659c50ce3181db6465936fcbf

src/com/android/mtp/MtpDatabase.java

diff --git a/src/com/android/mtp/MtpDatabase.java b/src/com/android/mtp/MtpDatabase.java
index 59c205a..bfb5cb8 100644
--- a/src/com/android/mtp/MtpDatabase.java
+++ b/src/com/android/mtp/MtpDatabase.java
@@ -27,6 +27,7 @@
 import android.database.MatrixCursor;
 import android.database.MatrixCursor.RowBuilder;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.media.MediaFile;
@@ -37,6 +38,7 @@
 import android.provider.MetadataReader;
 import android.provider.DocumentsContract.Document;
 import android.provider.DocumentsContract.Root;
+import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.Preconditions;
@@ -83,6 +85,8 @@
  * TODO: Improve performance by SQL optimization.
  */
 class MtpDatabase {
+    private static final String TAG = "MtpDatabaseHost";
+
     private final SQLiteDatabase mDatabase;
     private final Mapper mMapper;
 
@@ -530,6 +534,9 @@
             mDatabase.setTransactionSuccessful();
             // TODO Remove mappingState.
             return deleted != 0;
+        } catch (SQLiteException exSql) {
+            Log.w(TAG, "SQLiteException:" + selection, exSql);
+            return false;
         } finally {
             mDatabase.endTransaction();
         }

src/com/android/mtp/MtpDocumentsProvider.java

diff --git a/src/com/android/mtp/MtpDocumentsProvider.java b/src/com/android/mtp/MtpDocumentsProvider.java
index 8c8116b..490b831 100644
--- a/src/com/android/mtp/MtpDocumentsProvider.java
+++ b/src/com/android/mtp/MtpDocumentsProvider.java
@@ -136,6 +136,10 @@
             // It can happen due to disk shortage.
             Log.e(TAG, "Failed to clean database.", error);
             return false;
+        } catch (SecurityException exSec) {
+            // For UriPermission.
+            Log.w(TAG, "SecurityException:", exSec);
+            return false;
         }
 
         resume();