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

Commit cb27fa5a authored by Jakob Schneider's avatar Jakob Schneider Committed by Android (Google) Code Review
Browse files

Merge "Add more logs to help with debugging." into main

parents 243637f9 1c06da30

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

+5 −2
Original line number Diff line number Diff line
@@ -203,6 +203,9 @@ public class PackageArchiver { 
        Objects.requireNonNull(intentSender);

        Objects.requireNonNull(userHandle);



        Slog.i(TAG,

                TextUtils.formatSimple("Requested archival of package %s for user %s.", packageName,

                        userHandle.getIdentifier()));

        Computer snapshot = mPm.snapshotComputer();

        int binderUserId = userHandle.getIdentifier();

        int binderUid = Binder.getCallingUid();
@@ -227,7 +230,7 @@ public class PackageArchiver { 
                archiveStateStored[i] = createAndStoreArchiveState(packageName, users[i]);

            }

        } catch (PackageManager.NameNotFoundException e) {

            Slog.d(TAG, TextUtils.formatSimple("Failed to archive %s with message %s",

            Slog.e(TAG, TextUtils.formatSimple("Failed to archive %s with message %s",

                    packageName, e.getMessage()));

            throw new ParcelableException(e);

        }
@@ -247,7 +250,7 @@ public class PackageArchiver { 
                        binderPid)

        ).exceptionally(

                e -> {

                    Slog.d(TAG, TextUtils.formatSimple("Failed to archive %s with message %s",

                    Slog.e(TAG, TextUtils.formatSimple("Failed to archive %s with message %s",

                            packageName, e.getMessage()));

                    sendFailureStatus(intentSender, packageName, e.getMessage());

                    return null;

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

+6 −0
Original line number Diff line number Diff line
@@ -1702,6 +1702,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        Objects.requireNonNull(installerPackageName);

        Objects.requireNonNull(userHandle);



        Slog.i(TAG,

                TextUtils.formatSimple("Requested archived install of package %s for user %s.",

                        archivedPackageParcel.packageName,

                        userHandle.getIdentifier()));

        final int callingUid = Binder.getCallingUid();

        final int userId = userHandle.getIdentifier();

        final Computer snapshot = mPm.snapshotComputer();
@@ -1737,6 +1741,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
                session.addFile(LOCATION_DATA_APP, "base", 0 /*lengthBytes*/,

                        metadata.toByteArray(), null /*signature*/);

                session.commit(statusReceiver, false /*forTransfer*/);

                Slog.i(TAG, TextUtils.formatSimple("Installed archived app %s.",

                        archivedPackageParcel.packageName));

            } catch (IOException e) {

                throw ExceptionUtils.wrap(e);

            } finally {