summaryrefslogtreecommitdiffstats
path: root/src/com/android/packageinstaller/PackageInstallerActivity.java
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2016-07-19 10:45:09 -0700
committerSvet Ganov <svetoslavganov@google.com>2016-07-19 10:49:25 -0700
commit8511fffaa14d847da14cd5c27a5ed8acde888e25 (patch)
tree4ef7ec4d5675e8be227229c79f2c53e2f1cde9a6 /src/com/android/packageinstaller/PackageInstallerActivity.java
parent9e6c523115e08ec8449b56dfe17630d1f7ab7feb (diff)
downloadandroid_packages_apps_PackageInstaller-8511fffaa14d847da14cd5c27a5ed8acde888e25.tar.gz
android_packages_apps_PackageInstaller-8511fffaa14d847da14cd5c27a5ed8acde888e25.tar.bz2
android_packages_apps_PackageInstaller-8511fffaa14d847da14cd5c27a5ed8acde888e25.zip
Handle protected URI gracefully
It is possible that the content URI passed to the PackageInstaller requires a permission the former doesn't have while also the caller didn't perform a URI grant. In this case the PackageInstaller should not crash but instead fail gracefully. bug:30210094 Change-Id: I75cb17f5cb447f91101a7edcc2d42ebe23a92d3d
Diffstat (limited to 'src/com/android/packageinstaller/PackageInstallerActivity.java')
-rw-r--r--src/com/android/packageinstaller/PackageInstallerActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java
index 1903f917..c675911e 100644
--- a/src/com/android/packageinstaller/PackageInstallerActivity.java
+++ b/src/com/android/packageinstaller/PackageInstallerActivity.java
@@ -748,8 +748,8 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen
out.write(buffer, 0, bytesRead);
}
}
- } catch (IOException ioe) {
- Log.w(TAG, "Error staging apk from content URI", ioe);
+ } catch (IOException | SecurityException e) {
+ Log.w(TAG, "Error staging apk from content URI", e);
if (sourceFile != null) {
sourceFile.delete();
}