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

Delay instantiation of PacProcessor until unlocked

Browse Source 
Webkit PAC processor cannot be created before the user is unlocked,
this is currently causing crashes during boot.
With this CL PacProcessor instantiation is delayed and will happen
only when the user is unlocked either when handling a request or
when PAC script is set.

Instantiation of PacProcessor can take substantial time, on order
of a second.

Bug: 200241231
Test: manual, set PAC proxy and reboot
Change-Id: Id42d857289a0b0f7df5b1c48f94d1b363d94235e
This commit is contained in:
Pavel Grafov
2021-10-11 16:09:34 +01:00
parent ae99d9ba9c
commit 3f0400e221
1 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
packages/services/PacProcessor/src/com/android/pacprocessor/PacService.java
View File

@@ -21,6 +21,7 @@ import android.os.Binder;
import android.os.IBinder;
import android.os.Process;
import android.os.RemoteException;
import android.os.UserManager;
import android.util.Log;
import android.webkit.PacProcessor;
@@ -33,16 +34,44 @@ import java.net.URL;
public class PacService extends Service {
private static final String TAG = "PacService";
private Object mLock = new Object();
private final Object mLock = new Object();
// Webkit PacProcessor cannot be instantiated before the user is unlocked, so this field is
// initialized lazily.
@GuardedBy("mLock")
private final PacProcessor mPacProcessor = PacProcessor.getInstance();
private PacProcessor mPacProcessor;
// Stores PAC script when setPacFile is called before mPacProcessor is available. In case the
// script was already fed to the PacProcessor, it should be null.
@GuardedBy("mLock")
private String mPendingScript;
private ProxyServiceStub mStub = new ProxyServiceStub();
@Override
public void onCreate() {
super.onCreate();
synchronized (mLock) {
checkPacProcessorLocked();
}
}
/**
* Initializes PacProcessor if it hasn't been initialized yet and if the system user is
* unlocked, e.g. after the user has entered their PIN after a reboot.
* Returns whether PacProcessor is available.
*/
private boolean checkPacProcessorLocked() {
if (mPacProcessor != null) {
return true;
}
UserManager um = getSystemService(UserManager.class);
if (um.isUserUnlocked()) {
mPacProcessor = PacProcessor.getInstance();
return true;
}
return false;
}
@Override
@@ -74,7 +103,20 @@ public class PacService extends Service {
}
synchronized (mLock) {
return mPacProcessor.findProxyForUrl(url);
if (checkPacProcessorLocked()) {
// Apply pending script in case it was set before processor was ready.
if (mPendingScript != null) {
if (!mPacProcessor.setProxyScript(mPendingScript)) {
Log.e(TAG, "Unable to parse proxy script.");
}
mPendingScript = null;
}
return mPacProcessor.findProxyForUrl(url);
} else {
Log.e(TAG, "PacProcessor isn't ready during early boot,"
+ " request will be direct");
return null;
}
}
} catch (MalformedURLException e) {
throw new IllegalArgumentException("Invalid URL was passed");
@@ -88,8 +130,13 @@ public class PacService extends Service {
throw new SecurityException();
}
synchronized (mLock) {
if (!mPacProcessor.setProxyScript(script)) {
Log.e(TAG, "Unable to parse proxy script.");
if (checkPacProcessorLocked()) {
if (!mPacProcessor.setProxyScript(script)) {
Log.e(TAG, "Unable to parse proxy script.");
}
} else {
Log.d(TAG, "PAC processor isn't ready, saving script for later.");
mPendingScript = script;
}
}
}