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

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

Merge "Do not hard code USER_SYSTEM when reading adb allowlist" into main

parents f5a04944 371a62d2
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.appfunctions;
import static android.app.appfunctions.AppFunctionManager.ACCESS_REQUEST_STATE_UNREQUESTABLE;
import static android.app.appfunctions.AppFunctionRuntimeMetadata.APP_FUNCTION_RUNTIME_METADATA_DB;
import static android.app.appfunctions.AppFunctionRuntimeMetadata.APP_FUNCTION_RUNTIME_NAMESPACE;
import static android.os.UserHandle.USER_SYSTEM;

import static com.android.server.appfunctions.AppFunctionExecutors.THREAD_POOL_EXECUTOR;
import static com.android.server.appfunctions.CallerValidator.CAN_EXECUTE_APP_FUNCTIONS_ALLOWED_HAS_PERMISSION;
@@ -746,7 +745,8 @@ public class AppFunctionManagerServiceImpl extends IAppFunctionManager.Stub {
    @NonNull
    private List<SignedPackage> readAdbAgentAllowlist() {
        String agents = Settings.Secure.getStringForUser(mContext.getContentResolver(),
                Settings.Secure.APP_FUNCTION_ADDITIONAL_AGENT_ALLOWLIST, USER_SYSTEM);
                Settings.Secure.APP_FUNCTION_ADDITIONAL_AGENT_ALLOWLIST,
                Process.myUserHandle().getIdentifier());
        if (agents == null) {
            return Collections.emptyList();
        }