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

Commit dad49bb3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable client side binder caching for Pac Service" into main

parents 61c370b5 55a25dbd

services/core/java/com/android/server/connectivity/PacProxyService.java

+4 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.net.Uri; 
import android.os.Handler;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.IServiceManager;

import android.os.RemoteCallbackList;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -355,7 +356,9 @@ public class PacProxyService extends IPacProxyManager.Stub { 
                    } catch (RemoteException e1) {

                        Log.e(TAG, "Remote Exception", e1);

                    }

                    ServiceManager.addService(PAC_SERVICE_NAME, binder);

                    // Do not cache the service, otherwise it will crash com.android.pacprocessor

                    ServiceManager.addService(PAC_SERVICE_NAME, binder, /* allowIsolated */ false,

                            IServiceManager.FLAG_IS_LAZY_SERVICE);

                    mProxyService = IProxyService.Stub.asInterface(binder);

                    if (mProxyService == null) {

                        Log.e(TAG, "No proxy service");