Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b29624e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Don't crash system_server if fixupAppDir() fails." into rvc-dev am: c8a208f5 

Change-Id: I028d16cc7cca62773ac2585ed30be4be12ba9a7d
parents 919a4ebd c8a208f5

services/core/java/com/android/server/StorageManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -4458,8 +4458,11 @@ class StorageManagerService extends IStorageManager.Stub 
                    mVold.fixupAppDir(packageObbDir.getCanonicalPath() + "/", uid);

                } catch (IOException e) {

                    Log.e(TAG, "Failed to get canonical path for " + packageName);

                } catch (RemoteException e) {

                    Log.e(TAG, "Failed to fixup app dir for " + packageName);

                } catch (RemoteException | ServiceSpecificException e) {

                    // TODO(b/149975102) there is a known case where this fails, when a new

                    // user is setup and we try to fixup app dirs for some existing apps.

                    // For now catch the exception and don't crash.

                    Log.e(TAG, "Failed to fixup app dir for " + packageName, e);

                }

            }

        }