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

Commit 63b007e6 authored by Stefan Kuhne's avatar Stefan Kuhne
Browse files

Fixing build breakage 

There was a merge conflict due to 2 overlapping CL's.

Bug: 20763296
Change-Id: Ib5e8476587dfd1354d288150501771df4b3b7ec8
parent a2968ad5

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -16199,9 +16199,6 @@ public final class ActivityManagerService extends ActivityManagerNative 
                                intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);

                                intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);

                        mCompatModePackages.handlePackageAddedLocked(ssp, replacing);

                        mCompatModePackages.handlePackageAddedLocked(ssp, replacing);

















                        if (replacing) {














                            removeTasksByRemovedPackageComponentsLocked(ssp, userId);














                        }














                        try {







                        try {











                            ApplicationInfo ai = AppGlobals.getPackageManager().







                            ApplicationInfo ai = AppGlobals.getPackageManager().











                                    getApplicationInfo(ssp, 0, 0);







                                    getApplicationInfo(ssp, 0, 0);