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

Merge "Use bindServiceAsUser to bind PacService and ProxyService" am: f1edc162c4 am: 019af98809

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

Change-Id: I6ba578c705438c306eb86ab32976fcc5c15802bf
This commit is contained in:
Aaron Huang
2021-09-06 10:04:30 +00:00
committed by Automerger Merge Worker
parent 59a0d185e5 019af98809
commit 26c0c5c1b6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/connectivity/PacProxyService.java
View File

@@ -34,7 +34,6 @@ import android.net.ProxyInfo;
import android.net.TrafficStats; import android.net.TrafficStats;
import android.net.Uri; import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteCallbackList; import android.os.RemoteCallbackList;
@@ -42,6 +41,7 @@ import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log; import android.util.Log;
@@ -357,8 +357,9 @@ public class PacProxyService extends IPacProxyManager.Stub {
} }
} }
}; };
mContext.bindService(intent, mConnection, mContext.bindServiceAsUser(intent, mConnection,
Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND | Context.BIND_NOT_VISIBLE); Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND | Context.BIND_NOT_VISIBLE,
UserHandle.SYSTEM);
intent = new Intent(); intent = new Intent();
intent.setClassName(PROXY_PACKAGE, PROXY_SERVICE); intent.setClassName(PROXY_PACKAGE, PROXY_SERVICE);
@@ -398,9 +399,9 @@ public class PacProxyService extends IPacProxyManager.Stub {
} }
} }
}; };
mContext.bindService(intent, mContext.bindServiceAsUser(intent, mProxyConnection,
Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND | Context.BIND_NOT_VISIBLE, Context.BIND_AUTO_CREATE | Context.BIND_NOT_FOREGROUND | Context.BIND_NOT_VISIBLE,
new HandlerExecutor(mNetThreadHandler), mProxyConnection); mNetThreadHandler, UserHandle.SYSTEM);
} }
private void unbind() { private void unbind() {