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

Commit 9e1196ee authored by Todd Kennedy's avatar Todd Kennedy Committed by Automerger Merge Worker
Browse files

Merge "Add debugging to diagnose failure" into sc-dev am: d8fe801f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14414237

Change-Id: I481683ebbf7f2c0721e7d30d32fdcef0ddc8c836
parents 3e655a7d d8fe801f

services/core/java/com/android/server/pm/PackageManagerService.java

+21 −10
Original line number Diff line number Diff line
@@ -26052,11 +26052,14 @@ public class PackageManagerService extends IPackageManager.Stub 














        @Override















        public String[] getNamesForUids(int[] uids) throws RemoteException {













            String[] names = null;













            String[] results = null;













            try {















                if (uids == null || uids.length == 0) {















                    return null;















                }













            final String[] names = PackageManagerService.this.getNamesForUids(uids);













            final String[] results = (names != null) ? names : new String[uids.length];













                names = PackageManagerService.this.getNamesForUids(uids);













                results = (names != null) ? names : new String[uids.length];















                // massage results so they can be parsed by the native binder















                for (int i = results.length - 1; i >= 0; --i) {















                    if (results[i] == null) {









@@ -26064,6 +26067,14 @@ public class PackageManagerService extends IPackageManager.Stub













                    }















                }















                return results;













            } catch (Throwable t) {













                // STOPSHIP(186558987): revert addition of try/catch/log













                Slog.e(TAG, "uids: " + Arrays.toString(uids));













                Slog.e(TAG, "names: " + Arrays.toString(names));













                Slog.e(TAG, "results: " + Arrays.toString(results));













                Slog.e(TAG, "throwing exception", t);













                throw t;













            }















        }





























        // NB: this differentiates between preloads and sideloads