Merge \"Avoid runtime restart when storage is missing.\" into nyc-dev

am: 18553f5f73 Change-Id: I0f8e9b715eb0ddddbf36dcbcdf78e75e692303dc
2016-06-22 20:14:54 +00:00
parent f6bfce5202 18553f5f73
commit c14abae170
1 changed files with 3 additions and 4 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -12526,13 +12526,12 @@ public class PackageManagerService extends IPackageManager.Stub {
            }

            if (mSuccess) {
-                final boolean mounted;
-                if (Environment.isExternalStorageEmulated()) {
-                    mounted = true;
-                } else {
+                boolean mounted = false;
+                try {
                    final String status = Environment.getExternalStorageState();
                    mounted = (Environment.MEDIA_MOUNTED.equals(status)
                            || Environment.MEDIA_MOUNTED_READ_ONLY.equals(status));
+                } catch (Exception e) {
                }

                if (mounted) {