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

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

Merge "Moved HsumBootUserInitializer to com.android.server.pm package." into main

parents 6088066f e4805031

services/Android.bp

+0 −13
Original line number Diff line number Diff line
@@ -167,19 +167,6 @@ java_library { 
    ],

}



// TODO(b/411222385): used only by FrameworksMockingServicesTests,

// should be refactored into services.user or something like that

// instead

java_library {

    name: "HsumBootUserInitializer",

    srcs: ["java/com/android/server/HsumBootUserInitializer.java"],

    static_libs: [

        "Slogf",

        "services.core.unboosted",

    ],

    visibility: ["//frameworks/base/services/tests/mockingservicestests"],

}



soong_config_module_type {

    name: "art_profile_java_defaults",

    module_type: "java_defaults",

services/java/com/android/server/HsumBootUserInitializer.java→services/core/java/com/android/server/pm/HsumBootUserInitializer.java

+3 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.server;

package com.android.server.pm;



import android.annotation.Nullable;

import android.annotation.UserIdInt;
@@ -28,9 +28,8 @@ import android.os.UserManager; 
import android.provider.Settings;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.LocalServices;

import com.android.server.am.ActivityManagerService;

import com.android.server.pm.PackageManagerService;

import com.android.server.pm.UserManagerInternal;

import com.android.server.utils.Slogf;

import com.android.server.utils.TimingsTraceAndSlog;
@@ -40,7 +39,7 @@ import java.util.Arrays; 
 * Class responsible for booting the device in the proper user on headless system user mode.

 *

 */

final class HsumBootUserInitializer {

public final class HsumBootUserInitializer {



    private static final String TAG = HsumBootUserInitializer.class.getSimpleName();

services/core/java/com/android/server/pm/OWNERS

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ per-file PackageUsage.java = file:dex/OWNERS 
per-file CrossProfile* = file:MULTIUSER_AND_ENTERPRISE_OWNERS

per-file RestrictionsSet.java = file:MULTIUSER_AND_ENTERPRISE_OWNERS

per-file UserRestriction* = file:MULTIUSER_AND_ENTERPRISE_OWNERS

per-file User* = file:/MULTIUSER_OWNERS

per-file BackgroundUser* = file:/MULTIUSER_OWNERS

per-file *User* = file:/MULTIUSER_OWNERS



# security

per-file KeySetHandle.java = cbrubaker@google.com, nnk@google.com

services/java/com/android/server/SystemServer.java

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ import com.android.server.pm.CrossProfileAppsService; 
import com.android.server.pm.DataLoaderManagerService;

import com.android.server.pm.DexOptHelper;

import com.android.server.pm.DynamicCodeLoggingService;

import com.android.server.pm.HsumBootUserInitializer;

import com.android.server.pm.Installer;

import com.android.server.pm.LauncherAppsService;

import com.android.server.pm.OtaDexoptService;

services/tests/mockingservicestests/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ android_test { 
        "services.companion",

        "services.core",

        "services.devicepolicy",

        // TODO(b/411222385): only needed by HsumBootUserInitializerTest, should be moved to 

        // its own test target

        "HsumBootUserInitializer",

        "services.net",

        "services.usage",

        "services.wallpapereffectsgeneration",