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

Commit 091fa307 authored by Kweku Adams's avatar Kweku Adams
Browse files

Remove @Deprecated && @removed package fields. 

They were tagged as @removed in Nougat and Oreo.

Bug: 135214188
Test: Android builds
Change-Id: Id52c23d02e2c4b7781c9b138ac2cf29cbf70c09c
parent a94ba372

api/removed.txt

+0 −8
Original line number Diff line number Diff line
@@ -149,10 +149,6 @@ package android.content.pm { 
    field @Deprecated public String volumeUuid;

  }



  public class ComponentInfo extends android.content.pm.PackageItemInfo {

    field @Deprecated public boolean encryptionAware;

  }



  public class PackageInfo implements android.os.Parcelable {

    field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1

  }
@@ -161,10 +157,6 @@ package android.content.pm { 
    method public abstract boolean setInstantAppCookie(@Nullable byte[]);

  }



  public class ResolveInfo implements android.os.Parcelable {

    field @Deprecated public boolean instantAppAvailable;

  }



  public final class SharedLibraryInfo implements android.os.Parcelable {

    method public boolean isBuiltin();

    method public boolean isDynamic();

core/java/android/content/pm/ComponentInfo.java

+2 −6
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ public class ComponentInfo extends PackageItemInfo { 
     */

    public boolean directBootAware = false;



    /** @removed */

    @Deprecated

    public boolean encryptionAware = false;



    public ComponentInfo() {

    }
@@ -94,7 +90,7 @@ public class ComponentInfo extends PackageItemInfo { 
        descriptionRes = orig.descriptionRes;

        enabled = orig.enabled;

        exported = orig.exported;

        encryptionAware = directBootAware = orig.directBootAware;

        directBootAware = orig.directBootAware;

    }



    /** @hide */
@@ -226,7 +222,7 @@ public class ComponentInfo extends PackageItemInfo { 
        descriptionRes = source.readInt();

        enabled = (source.readInt() != 0);

        exported = (source.readInt() != 0);

        encryptionAware = directBootAware = (source.readInt() != 0);

        directBootAware = (source.readInt() != 0);

    }



    /**

core/java/android/content/pm/PackageParser.java

+6 −6
Original line number Diff line number Diff line
@@ -4288,7 +4288,7 @@ public class PackageParser { 
        a.info.screenOrientation = SCREEN_ORIENTATION_UNSPECIFIED;

        a.info.resizeMode = RESIZE_MODE_FORCE_RESIZEABLE;

        a.info.lockTaskLaunchMode = 0;

        a.info.encryptionAware = a.info.directBootAware = false;

        a.info.directBootAware = false;

        a.info.rotationAnimation = ROTATION_ANIMATION_UNSPECIFIED;

        a.info.colorMode = ActivityInfo.COLOR_MODE_DEFAULT;

        if (hardwareAccelerated) {
@@ -4492,7 +4492,7 @@ public class PackageParser { 
            a.info.lockTaskLaunchMode =

                    sa.getInt(R.styleable.AndroidManifestActivity_lockTaskMode, 0);



            a.info.encryptionAware = a.info.directBootAware = sa.getBoolean(

            a.info.directBootAware = sa.getBoolean(

                    R.styleable.AndroidManifestActivity_directBootAware,

                    false);
@@ -4524,7 +4524,7 @@ public class PackageParser { 
                a.info.flags |= ActivityInfo.FLAG_SINGLE_USER;

            }



            a.info.encryptionAware = a.info.directBootAware = sa.getBoolean(

            a.info.directBootAware = sa.getBoolean(

                    R.styleable.AndroidManifestActivity_directBootAware,

                    false);

        }
@@ -4920,7 +4920,7 @@ public class PackageParser { 
        info.minAspectRatio = target.info.minAspectRatio;

        info.requestedVrComponent = target.info.requestedVrComponent;



        info.encryptionAware = info.directBootAware = target.info.directBootAware;

        info.directBootAware = target.info.directBootAware;



        Activity a = new Activity(cachedArgs.mActivityAliasArgs, info);

        if (outError[0] != null) {
@@ -5131,7 +5131,7 @@ public class PackageParser { 
            p.info.flags |= ProviderInfo.FLAG_SINGLE_USER;

        }



        p.info.encryptionAware = p.info.directBootAware = sa.getBoolean(

        p.info.directBootAware = sa.getBoolean(

                R.styleable.AndroidManifestProvider_directBootAware,

                false);

        if (p.info.directBootAware) {
@@ -5451,7 +5451,7 @@ public class PackageParser { 
            s.info.flags |= ServiceInfo.FLAG_SINGLE_USER;

        }



        s.info.encryptionAware = s.info.directBootAware = sa.getBoolean(

        s.info.directBootAware = sa.getBoolean(

                R.styleable.AndroidManifestService_directBootAware,

                false);

        if (s.info.directBootAware) {

core/java/android/content/pm/ResolveInfo.java

+1 −6
Original line number Diff line number Diff line
@@ -75,10 +75,6 @@ public class ResolveInfo implements Parcelable { 
     */

    public boolean isInstantAppAvailable;



    /** @removed */

    @Deprecated

    public boolean instantAppAvailable;



    /**

     * The IntentFilter that was matched for this ResolveInfo.

     */
@@ -378,7 +374,6 @@ public class ResolveInfo implements Parcelable { 
        targetUserId = orig.targetUserId;

        handleAllWebDataURI = orig.handleAllWebDataURI;

        isInstantAppAvailable = orig.isInstantAppAvailable;

        instantAppAvailable = isInstantAppAvailable;

    }



    public String toString() {
@@ -490,7 +485,7 @@ public class ResolveInfo implements Parcelable { 
        noResourceId = source.readInt() != 0;

        iconResourceId = source.readInt();

        handleAllWebDataURI = source.readInt() != 0;

        instantAppAvailable = isInstantAppAvailable = source.readInt() != 0;

        isInstantAppAvailable = source.readInt() != 0;

    }



    public static class DisplayNameComparator

services/core/java/com/android/server/pm/PackageManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -11590,16 +11590,16 @@ public class PackageManagerService extends IPackageManager.Stub 
            if (pkg.applicationInfo.isDirectBootAware()) {

                // we're direct boot aware; set for all components

                for (PackageParser.Service s : pkg.services) {

                    s.info.encryptionAware = s.info.directBootAware = true;

                    s.info.directBootAware = true;

                }

                for (PackageParser.Provider p : pkg.providers) {

                    p.info.encryptionAware = p.info.directBootAware = true;

                    p.info.directBootAware = true;

                }

                for (PackageParser.Activity a : pkg.activities) {

                    a.info.encryptionAware = a.info.directBootAware = true;

                    a.info.directBootAware = true;

                }

                for (PackageParser.Activity r : pkg.receivers) {

                    r.info.encryptionAware = r.info.directBootAware = true;

                    r.info.directBootAware = true;

                }

            }

            if (compressedFileExists(pkg.codePath)) {