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

Commit 6ce8165b authored by Christopher Tate's avatar Christopher Tate
Browse files

Gracefully handle races with package uninstall

Bug 21417673

Change-Id: I46f9bf86454d356742f7bd5226a685257a40ced7
parent 31ed07d3
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -5501,8 +5501,10 @@ public final class ActivityManagerService extends ActivityManagerNative
                    // Entire package setting changed
                    enabled = pm.getApplicationEnabledSetting(packageName,
                            (userId != UserHandle.USER_ALL) ? userId : UserHandle.USER_OWNER);
                } catch (RemoteException e) {
                    // Can't happen...
                } catch (Exception e) {
                    // No such package/component; probably racing with uninstall.  In any
                    // event it means we have nothing further to do here.
                    return;
                }
                packageDisabled = enabled != PackageManager.COMPONENT_ENABLED_STATE_ENABLED
                        && enabled != PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
@@ -5517,8 +5519,9 @@ public final class ActivityManagerService extends ActivityManagerNative
                    enabled = pm.getComponentEnabledSetting(
                            new ComponentName(packageName, changedClass),
                            (userId != UserHandle.USER_ALL) ? userId : UserHandle.USER_OWNER);
                } catch (RemoteException e) {
                    // Can't happen...
                } catch (Exception e) {
                    // As above, probably racing with uninstall.
                    return;
                }
                if (enabled != PackageManager.COMPONENT_ENABLED_STATE_ENABLED
                        && enabled != PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {