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

Commit 0e73c922 authored by Will Burr's avatar Will Burr Committed by Automerger Merge Worker
Browse files

Merge "Store SDK sandbox exit reasons under real UID and package UID" into... 

Merge "Store SDK sandbox exit reasons under real UID and package UID" into udc-dev am: 163fedcd am: 55edae41 am: faa30393 am: e8f0e7a4

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



Change-Id: I588fa19a38383ae9e41586e9babe970b2f0ec15a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3030f027 e8f0e7a4

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

+10 −1
Original line number Diff line number Diff line
@@ -9504,11 +9504,20 @@ public class ActivityManagerService extends IActivityManager.Stub 
     * Check if the calling process has the permission to dump given package,

     * throw SecurityException if it doesn't have the permission.

     *

     * @return The UID of the given package, or {@link android.os.Process#INVALID_UID}

     * @return The real UID of process that can be dumped, or {@link android.os.Process#INVALID_UID}

     *         if the package is not found.

     */

    int enforceDumpPermissionForPackage(String packageName, int userId, int callingUid,

            String function) {

        // Allow SDK sandbox process to dump for its own process (under SDK sandbox package)

        try {

            if (Process.isSdkSandboxUid(callingUid)

                    && getPackageManager().getSdkSandboxPackageName().equals(packageName)) {

                return callingUid;

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Could not get SDK sandbox package name");

        }

        final long identity = Binder.clearCallingIdentity();

        int uid = INVALID_UID;

        try {

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

+24 −8
Original line number Diff line number Diff line
@@ -467,6 +467,13 @@ public final class AppExitInfoTracker { 
            addExitInfoInnerLocked(packages[i], uid, info, recoverable);

        }



        // SDK sandbox exits are stored under both real and package UID

        if (Process.isSdkSandboxUid(uid)) {

            for (int i = 0; i < packages.length; i++) {

                addExitInfoInnerLocked(packages[i], raw.getPackageUid(), info, recoverable);

            }

        }



        schedulePersistProcessExitInfo(false);



        return info;
@@ -1400,11 +1407,20 @@ public final class AppExitInfoTracker { 
                }

            }

            // Claim the state information if there is any

            final int uid = info.getPackageUid();

            int uid = info.getPackageUid();

            // SDK sandbox app states and app traces are stored under real UID

            if (Process.isSdkSandboxUid(info.getRealUid())) {

                uid = info.getRealUid();

            }

            final int pid = info.getPid();

            if (info.getProcessStateSummary() == null) {

                info.setProcessStateSummary(findAndRemoveFromSparse2dArray(

                        mActiveAppStateSummary, uid, pid));

            }

            if (info.getTraceFile() == null) {

                info.setTraceFile(findAndRemoveFromSparse2dArray(mActiveAppTraces, uid, pid));

            }



            info.setAppTraceRetriever(mAppTraceRetriever);

            map.append(pid, info);

        }
@@ -1905,15 +1921,15 @@ public final class AppExitInfoTracker { 
            }

            final int callingPid = Binder.getCallingPid();

            final int callingUid = Binder.getCallingUid();

            final int callingUserId = UserHandle.getCallingUserId();

            final int userId = UserHandle.getUserId(uid);



            mService.mUserController.handleIncomingUser(callingPid, callingUid, userId, true,

                    ALLOW_NON_FULL, "getTraceFileDescriptor", null);

            if (mService.enforceDumpPermissionForPackage(packageName, userId,

                    callingUid, "getTraceFileDescriptor") != Process.INVALID_UID) {

            final int filterUid = mService.enforceDumpPermissionForPackage(packageName, userId,

                    callingUid, "getTraceFileDescriptor");

            if (filterUid != Process.INVALID_UID) {

                synchronized (mLock) {

                    final ApplicationExitInfo info = getExitInfoLocked(packageName, uid, pid);

                    final ApplicationExitInfo info = getExitInfoLocked(packageName, filterUid, pid);

                    if (info == null) {

                        return null;

                    }