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

Commit 9ef6b603 authored by TYM Tsai's avatar TYM Tsai Committed by Android (Google) Code Review
Browse files

Merge "Move interfaces to framework internal" into main

parents 88cdcf14 c178d2ea

services/core/java/com/android/server/pm/parsing/pkg/AndroidPackageHidden.java→core/java/com/android/internal/pm/parsing/pkg/AndroidPackageHidden.java

+6 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.pm.parsing.pkg;

package com.android.internal.pm.parsing.pkg;



import android.annotation.Nullable;

import android.content.pm.ApplicationInfo;
@@ -22,16 +22,18 @@ import android.content.pm.PackageInfo; 


/**

 * Methods that normal consumers should not have access to. This usually means the field is stateful

 * or deprecated and should be access through {@link AndroidPackageUtils} or a system manager

 * class.

 * or deprecated and should be access through

 * {@link com.android.server.pm.parsing.pkg.AndroidPackageUtils} or a system manager class.

 * <p>

 * This is a separate interface, not implemented by the base {@link AndroidPackage} because Java

 * doesn't support non-public interface methods. The class must be cast to this interface.

 * <p>

 * Because they exist in different packages, some methods are duplicated from

 * android.content.pm.parsing.ParsingPackageHidden.

 * @hide

 */

interface AndroidPackageHidden {

// TODO: remove public after moved PackageImpl and AndroidPackageUtils

public interface AndroidPackageHidden {



    /**

     * @see ApplicationInfo#primaryCpuAbi

services/core/java/com/android/server/pm/parsing/pkg/AndroidPackageInternal.java→core/java/com/android/internal/pm/parsing/pkg/AndroidPackageInternal.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.pm.parsing.pkg;

package com.android.internal.pm.parsing.pkg;



import android.annotation.NonNull;

services/core/java/com/android/server/pm/parsing/pkg/ParsedPackage.java→core/java/com/android/internal/pm/parsing/pkg/ParsedPackage.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.pm.parsing.pkg;

package com.android.internal.pm.parsing.pkg;



import android.content.pm.SigningDetails;

services/core/java/com/android/server/pm/pkg/parsing/ParsingPackage.java→core/java/com/android/internal/pm/pkg/parsing/ParsingPackage.java

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.pm.pkg.parsing;

package com.android.internal.pm.pkg.parsing;



import android.annotation.CallSuper;

import android.annotation.NonNull;
@@ -32,6 +32,7 @@ import android.util.SparseArray; 
import android.util.SparseIntArray;



import com.android.internal.R;

import com.android.internal.pm.parsing.pkg.ParsedPackage;

import com.android.internal.pm.pkg.component.ParsedActivity;

import com.android.internal.pm.pkg.component.ParsedApexSystemService;

import com.android.internal.pm.pkg.component.ParsedAttribution;
@@ -43,7 +44,6 @@ import com.android.internal.pm.pkg.component.ParsedProcess; 
import com.android.internal.pm.pkg.component.ParsedProvider;

import com.android.internal.pm.pkg.component.ParsedService;

import com.android.internal.pm.pkg.component.ParsedUsesPermission;

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



import java.security.PublicKey;

import java.util.List;

services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageHidden.java→core/java/com/android/internal/pm/pkg/parsing/ParsingPackageHidden.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.pm.pkg.parsing;

package com.android.internal.pm.pkg.parsing;



import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;