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

Commit ee11a9ce authored by Winson Chiu's avatar Winson Chiu
Browse files

Rename AndroidPackageApi to AndroidPackage 

Makes it so that the non-suffixed name is the to-be system API,
renaming the internal class with an _Internal suffix.

This will also happen to all other exposed internal package data
types in future changes.

Test: presubmit, just a naming change

Change-Id: I8695e7f1644ff5af9303bb32ddec3480bd155bf8
parent 1c22a72c

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -144,9 +144,9 @@ import com.android.server.JobSchedulerBackgroundThread; 
import com.android.server.LocalServices;

import com.android.server.SystemService;

import com.android.server.SystemServiceManager;

import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.pm.permission.PermissionManagerService;

import com.android.server.pm.permission.PermissionManagerServiceInternal;

import com.android.server.pm.pkg.AndroidPackage;

import com.android.server.tare.AlarmManagerEconomicPolicy;

import com.android.server.tare.EconomyManagerInternal;

import com.android.server.usage.AppStandbyInternal;

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ import com.android.internal.util.ConcurrentUtils; 
import com.android.server.AlarmManagerInternal;

import com.android.server.JobSchedulerBackgroundThread;

import com.android.server.LocalServices;

import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.pm.pkg.AndroidPackage;

import com.android.server.usage.AppIdleHistory.AppUsageHistory;



import libcore.util.EmptyArray;

services/core/java/android/content/pm/PackageManagerInternal.java

+2 −3
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ import com.android.server.pm.KnownPackages; 
import com.android.server.pm.PackageList;

import com.android.server.pm.PackageSetting;

import com.android.server.pm.dex.DynamicCodeLogger;

import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.pm.pkg.AndroidPackageApi;

import com.android.server.pm.pkg.AndroidPackage;

import com.android.server.pm.pkg.PackageStateInternal;

import com.android.server.pm.pkg.SharedUserApi;

import com.android.server.pm.pkg.component.ParsedMainComponent;
@@ -644,7 +643,7 @@ public abstract class PackageManagerInternal { 
     * Returns the {@link SystemApi} variant of a package for use with mainline.

     */

    @Nullable

    public abstract AndroidPackageApi getAndroidPackage(@NonNull String packageName);

    public abstract AndroidPackage getAndroidPackage(@NonNull String packageName);



    @Nullable

    public abstract PackageStateInternal getPackageStateInternal(@NonNull String packageName);

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -407,8 +407,8 @@ import com.android.server.os.NativeTombstoneManager; 
import com.android.server.pm.Computer;

import com.android.server.pm.Installer;

import com.android.server.pm.UserManagerInternal;

import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.pm.permission.PermissionManagerServiceInternal;

import com.android.server.pm.pkg.AndroidPackage;

import com.android.server.pm.pkg.SELinuxUtil;

import com.android.server.pm.pkg.parsing.ParsingPackageUtils;

import com.android.server.pm.snapshot.PackageDataSnapshot;

services/core/java/com/android/server/am/ContentProviderHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ import com.android.internal.util.FrameworkStatsLog; 
import com.android.server.LocalServices;

import com.android.server.RescueParty;

import com.android.server.pm.UserManagerInternal;

import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.pm.pkg.AndroidPackage;



import java.io.FileDescriptor;

import java.io.PrintWriter;