Fix wrong notify/wait from cherry-pick
- As this was replaced into mLock, all wait() / notify*() call should
be replaced into mLock.*.
Bug: 140732933
Test: Build, run tests
Change-Id: I92d57fae11935389bc6313368a076b2bd8189637
diff --git a/service/src/com/android/car/pm/CarPackageManagerService.java b/service/src/com/android/car/pm/CarPackageManagerService.java
index 0c4a1fd..085576b 100644
--- a/service/src/com/android/car/pm/CarPackageManagerService.java
+++ b/service/src/com/android/car/pm/CarPackageManagerService.java
@@ -249,7 +249,7 @@
synchronized (mLock) {
try {
while (mWaitingPolicies.contains(policy)) {
- wait();
+ mLock.wait();
}
} catch (InterruptedException e) {
// Pass it over binder call
@@ -404,7 +404,7 @@
mProxies.clear();
}
mWaitingPolicies.clear();
- notifyAll();
+ mLock.notifyAll();
}
mContext.unregisterReceiver(mPackageParsingEventReceiver);
mContext.unregisterReceiver(mUserSwitchedEventReceiver);
@@ -493,7 +493,7 @@
}
if ((flags & CarPackageManager.FLAG_SET_POLICY_WAIT_FOR_CHANGE) != 0) {
mWaitingPolicies.remove(policy);
- notifyAll();
+ mLock.notifyAll();
}
if (DBG_POLICY_SET) {
Log.i(CarLog.TAG_PACKAGE, "policy set:" + dumpPoliciesLocked(false));