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

Commit 21905f7d authored by chaviw's avatar chaviw
Browse files

Use userId 0 to bind the DisplayHashingService 

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
parent d003be93

services/core/java/com/android/server/wm/DisplayHashController.java

+10 −5
Original line number Diff line number Diff line
@@ -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,

        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;