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

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

Remove ParsingPackageImpl 

Pushes all of the members down into PackageImpl to simplify the class
structure. Manually combines the Booleans classes and creates a new
Booleans2 for the overflow above 64 values.

Also manually merges the Parcelable implementations.

Formatting is a mess, but that can be addressed in a future change that
migrates to Codegen and reorganizes the members.

Test: atest com.android.server.pm.test.parsing.parcelling

Change-Id: I2e82f0ba51e4e94ffc24ac98d967d600370efff5
parent 88e165c8

services/core/java/com/android/server/pm/parsing/pkg/PackageImpl.java

+2964 −140

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/pm/pkg/component/ParsedActivityImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE_VIA_SDK_VER 
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_UNSPECIFIED;



import static com.android.server.pm.pkg.parsing.ParsingPackageImpl.sForInternedString;

import static com.android.server.pm.pkg.parsing.ParsingPackageImpl.sForStringSet;

import static com.android.server.pm.parsing.pkg.PackageImpl.sForInternedString;

import static com.android.server.pm.parsing.pkg.PackageImpl.sForStringSet;



import android.annotation.NonNull;

import android.annotation.Nullable;

services/core/java/com/android/server/pm/pkg/component/ParsedComponentImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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



import static com.android.server.pm.pkg.parsing.ParsingPackageImpl.sForInternedString;

import static com.android.server.pm.parsing.pkg.PackageImpl.sForInternedString;



import static java.util.Collections.emptyMap;

services/core/java/com/android/server/pm/pkg/component/ParsedInstrumentationImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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



import static com.android.server.pm.pkg.parsing.ParsingPackageImpl.sForInternedString;

import static com.android.server.pm.parsing.pkg.PackageImpl.sForInternedString;



import android.annotation.NonNull;

import android.annotation.Nullable;

services/core/java/com/android/server/pm/pkg/component/ParsedMainComponentImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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



import static com.android.server.pm.pkg.parsing.ParsingPackageImpl.sForInternedString;

import static com.android.server.pm.parsing.pkg.PackageImpl.sForInternedString;



import android.annotation.NonNull;

import android.annotation.Nullable;