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

Commit 4162759b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add SafetyNet logging." into tm-dev am: 17ec4252 

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

Change-Id: I0c94128946dc6a5b74a69fe42ea77f2be6df9d9e
parents 46a75a74 17ec4252

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -126,6 +126,7 @@ import android.system.StructStat; 
import android.text.TextUtils;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.EventLog;

import android.util.ExceptionUtils;

import android.util.ExceptionUtils;

import android.util.IntArray;

import android.util.IntArray;

import android.util.MathUtils;

import android.util.MathUtils;
@@ -2861,7 +2862,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
                inheritFileLocked(mResolvedBaseFile);

                inheritFileLocked(mResolvedBaseFile);

                // Collect the requiredSplitTypes from base

                // Collect the requiredSplitTypes from base

                CollectionUtils.addAll(requiredSplitTypes, existing.getBaseRequiredSplitTypes());

                CollectionUtils.addAll(requiredSplitTypes, existing.getBaseRequiredSplitTypes());

            } else {

            } else if ((params.installFlags & PackageManager.INSTALL_DONT_KILL_APP) != 0) {

                EventLog.writeEvent(0x534e4554, "219044664");



                // Installing base.apk. Make sure the app is restarted.

                // Installing base.apk. Make sure the app is restarted.

                params.setDontKillApp(false);

                params.setDontKillApp(false);

            }

            }