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

PROXY_SERVICE may be missing and its reference null.

Browse Source 
Protect ourselves from when PROXY_SERVICE is missing
and mProxyService is null.

Bug: 10267814
Change-Id: Ia329376218e246cdde3d70b578c18466d48a6383
This commit is contained in:
Wink Saville
2013-08-10 11:22:31 -07:00
parent 7a7c35e2ab
commit a48ad8bd85
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/PacProxySelector.java
View File

@@ -3,6 +3,7 @@ package android.net;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.util.Log;
import com.android.net.IProxyService; import com.android.net.IProxyService;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
@@ -21,16 +22,25 @@ import java.util.List;
* @hide * @hide
*/ */
public class PacProxySelector extends ProxySelector { public class PacProxySelector extends ProxySelector {
private static final String TAG = "PacProxySelector";
public static final String PROXY_SERVICE = "com.android.net.IProxyService"; public static final String PROXY_SERVICE = "com.android.net.IProxyService";
private IProxyService mProxyService; private IProxyService mProxyService;
public PacProxySelector() { public PacProxySelector() {
mProxyService = IProxyService.Stub.asInterface( mProxyService = IProxyService.Stub.asInterface(
ServiceManager.getService(PROXY_SERVICE)); ServiceManager.getService(PROXY_SERVICE));
if (mProxyService == null) {
// Added because of b10267814 where mako is restarting.
Log.e(TAG, "PackManager: no proxy service");
}
} }
@Override @Override
public List<Proxy> select(URI uri) { public List<Proxy> select(URI uri) {
if (mProxyService == null) {
Log.e(TAG, "select: no proxy service return NO_PROXY");
return Lists.newArrayList(java.net.Proxy.NO_PROXY);
}
String response = null; String response = null;
String urlString; String urlString;
try { try {

14
services/java/com/android/server/connectivity/PacManager.java
View File

@@ -83,6 +83,12 @@ public class PacManager implements Runnable {
mContext = context; mContext = context;
mProxyService = IProxyService.Stub.asInterface( mProxyService = IProxyService.Stub.asInterface(
ServiceManager.getService(PROXY_SERVICE)); ServiceManager.getService(PROXY_SERVICE));
if (mProxyService == null) {
// Added because of b10267814 where mako is restarting.
Log.e(TAG, "PacManager: no proxy service");
} else {
Log.d(TAG, "PacManager: mProxyService available");
}
mPacRefreshIntent = PendingIntent.getBroadcast( mPacRefreshIntent = PendingIntent.getBroadcast(
context, 0, new Intent(ACTION_PAC_REFRESH), 0); context, 0, new Intent(ACTION_PAC_REFRESH), 0);
@@ -98,6 +104,10 @@ public class PacManager implements Runnable {
} }
public void setCurrentProxyScriptUrl(ProxyProperties proxy) { public void setCurrentProxyScriptUrl(ProxyProperties proxy) {
if (mProxyService == null) {
Log.e(TAG, "setCurrentProxyScriptUrl: no proxy service");
return;
}
if (!TextUtils.isEmpty(proxy.getPacFileUrl())) { if (!TextUtils.isEmpty(proxy.getPacFileUrl())) {
try { try {
mProxyService.startPacSystem(); mProxyService.startPacSystem();
@@ -212,6 +222,10 @@ public class PacManager implements Runnable {
} }
private boolean setCurrentProxyScript(String script) { private boolean setCurrentProxyScript(String script) {
if (mProxyService == null) {
Log.e(TAG, "setCurrentProxyScript: no proxy service");
return false;
}
try { try {
if (mProxyService.setPacFile(script) != NO_ERROR) { if (mProxyService.setPacFile(script) != NO_ERROR) {
Log.e(TAG, "Unable to parse proxy script."); Log.e(TAG, "Unable to parse proxy script.");