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

Use userId 0 to bind the DisplayHashingService

Browse Source 
Clear calling identity and use system user id to bind the service. This
is because the DisplayHashingSevice doesn't need to be run per user and
can just be run as system.

Test: atest DisplayHashManagerTest
Bug: 184783122
Change-Id: Id15efeddefff632e339139899a17a550e517dd5b
This commit is contained in:
chaviw
2021-07-02 15:11:29 -05:00
parent d003be9369
commit 21905f7d2b
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/wm/DisplayHashController.java
View File

@@ -47,7 +47,6 @@ import android.os.Looper;
import android.os.Message;
import android.os.RemoteCallback;
import android.os.RemoteException;
import android.os.UserHandle;
import android.service.displayhash.DisplayHashParams;
import android.service.displayhash.DisplayHashingService;
import android.service.displayhash.IDisplayHashingService;
@@ -380,8 +379,7 @@ public class DisplayHashController {
intent.setComponent(component);
final long token = Binder.clearCallingIdentity();
try {
mContext.bindServiceAsUser(intent, mServiceConnection,
Context.BIND_AUTO_CREATE, UserHandle.CURRENT);
mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
if (DEBUG) Slog.v(TAG, "bound");
} finally {
Binder.restoreCallingIdentity(token);
@@ -404,8 +402,15 @@ public class DisplayHashController {
final Intent intent = new Intent(DisplayHashingService.SERVICE_INTERFACE);
intent.setPackage(packageName);
final ResolveInfo resolveInfo = mContext.getPackageManager().resolveService(intent,
PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
final ResolveInfo resolveInfo;
final long token = Binder.clearCallingIdentity();
try {
resolveInfo = mContext.getPackageManager().resolveService(intent,
PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
} finally {
Binder.restoreCallingIdentity(token);
}
if (resolveInfo == null || resolveInfo.serviceInfo == null) {
Slog.w(TAG, "No valid components found.");
return null;