Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Addressing CL feedback." into tm-dev am: 4ced90c38a

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

Change-Id: I22e242c3f39f4b8087fb498e4372c55ca2b0d901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Buynytskyy
2022-05-12 23:05:20 +00:00
committed by Automerger Merge Worker
parent 79d42a23bc 4ced90c38a
commit 30375852fb
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/pm/Installer.java
View File

@@ -44,9 +44,8 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
public class Installer extends SystemService { public class Installer extends SystemService {
private static final String TAG = "Installer"; private static final String TAG = "Installer";
@@ -127,7 +126,7 @@ public class Installer extends SystemService {
private final boolean mIsolated; private final boolean mIsolated;
private volatile boolean mDeferSetFirstBoot; private volatile boolean mDeferSetFirstBoot;
private volatile IInstalld mInstalld = null; private volatile IInstalld mInstalld = null;
private volatile CompletableFuture<IInstalld> mInstalldFuture = new CompletableFuture<>(); private volatile CountDownLatch mInstalldLatch = new CountDownLatch(1);
private volatile Object mWarnIfHeld; private volatile Object mWarnIfHeld;
public Installer(Context context) { public Installer(Context context) {
@@ -156,7 +155,7 @@ public class Installer extends SystemService {
public void onStart() { public void onStart() {
if (mIsolated) { if (mIsolated) {
mInstalld = null; mInstalld = null;
mInstalldFuture = null; mInstalldLatch.countDown();
} else { } else {
connect(); connect();
} }
@@ -168,6 +167,7 @@ public class Installer extends SystemService {
try { try {
binder.linkToDeath(() -> { binder.linkToDeath(() -> {
Slog.w(TAG, "installd died; reconnecting"); Slog.w(TAG, "installd died; reconnecting");
mInstalldLatch = new CountDownLatch(1);
connect(); connect();
}, 0); }, 0);
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -178,7 +178,7 @@ public class Installer extends SystemService {
if (binder != null) { if (binder != null) {
IInstalld installd = IInstalld.Stub.asInterface(binder); IInstalld installd = IInstalld.Stub.asInterface(binder);
mInstalld = installd; mInstalld = installd;
mInstalldFuture.complete(installd); mInstalldLatch.countDown();
try { try {
invalidateMounts(); invalidateMounts();
executeDeferredActions(); executeDeferredActions();
@@ -186,7 +186,7 @@ public class Installer extends SystemService {
} }
} else { } else {
Slog.w(TAG, "installd not found; trying again"); Slog.w(TAG, "installd not found; trying again");
BackgroundThread.getHandler().postDelayed(this::connect, DateUtils.SECOND_IN_MILLIS); BackgroundThread.getHandler().postDelayed(this::connect, CONNECT_RETRY_DELAY_MS);
} }
} }
@@ -204,7 +204,7 @@ public class Installer extends SystemService {
* *
* @return if the remote call should continue. * @return if the remote call should continue.
*/ */
private boolean checkBeforeRemote() { private boolean checkBeforeRemote() throws InstallerException {
if (mWarnIfHeld != null && Thread.holdsLock(mWarnIfHeld)) { if (mWarnIfHeld != null && Thread.holdsLock(mWarnIfHeld)) {
Slog.wtf(TAG, "Calling thread " + Thread.currentThread().getName() + " is holding 0x" Slog.wtf(TAG, "Calling thread " + Thread.currentThread().getName() + " is holding 0x"
+ Integer.toHexString(System.identityHashCode(mWarnIfHeld)), new Throwable()); + Integer.toHexString(System.identityHashCode(mWarnIfHeld)), new Throwable());
@@ -214,16 +214,15 @@ public class Installer extends SystemService {
return false; return false;
} }
if (mInstalld == null && mInstalldFuture != null) {
try { try {
Slog.i(TAG, "installd not ready, waiting for: " + CONNECT_WAIT_MS + "ms"); if (!mInstalldLatch.await(CONNECT_WAIT_MS, TimeUnit.MILLISECONDS)) {
mInstalld = mInstalldFuture.get(CONNECT_WAIT_MS, TimeUnit.MILLISECONDS); throw new InstallerException("time out waiting for the installer to be ready");
} catch (InterruptedException | ExecutionException | TimeoutException e) {
Slog.e(TAG, "Ignoring request because this installer is not initialized", e);
} }
} catch (InterruptedException e) {
// Do nothing.
} }
return mInstalld != null; return true;
} }
// We explicitly do NOT set previousAppId because the default value should always be 0. // We explicitly do NOT set previousAppId because the default value should always be 0.