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

Commit 70d57188 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch 'epic211-a16-qpr0' into 'a16' 

Port changes from android 15

See merge request e/os/android_frameworks_base!306
parents 4790f994 8288683f

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ package android { 
    field public static final String READ_CONTACTS = "android.permission.READ_CONTACTS";

    field @FlaggedApi("com.android.server.feature.flags.enable_read_dropbox_permission") public static final String READ_DROPBOX_DATA = "android.permission.READ_DROPBOX_DATA";

    field public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE";

    field public static final String READ_FAKE_LOCATION_SETTINGS = "foundation.e.permission.READ_FAKE_LOCATION_SETTINGS";

    field public static final String READ_HOME_APP_SEARCH_DATA = "android.permission.READ_HOME_APP_SEARCH_DATA";

    field @Deprecated public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";

    field public static final String READ_LOGS = "android.permission.READ_LOGS";

core/api/lint-baseline.txt

+2 −0
Original line number Diff line number Diff line
@@ -1627,3 +1627,5 @@ UnflaggedApi: android.view.inputmethod.InlineSuggestionsRequest.Builder#setClien 
    New API must be flagged with @FlaggedApi: method android.view.inputmethod.InlineSuggestionsRequest.Builder.setClientSupported(boolean)

UnflaggedApi: android.view.inputmethod.InlineSuggestionsRequest.Builder#setServiceSupported(boolean):

    New API must be flagged with @FlaggedApi: method android.view.inputmethod.InlineSuggestionsRequest.Builder.setServiceSupported(boolean)

UnflaggedApi: android.Manifest.permission#READ_FAKE_LOCATION_SETTINGS:

    New API must be flagged with @FlaggedApi: field android.Manifest.permission.READ_FAKE_LOCATION_SETTINGS

core/java/android/app/Instrumentation.java

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ import java.util.Objects; 
import java.util.StringJoiner;

import java.util.concurrent.TimeoutException;



import com.android.internal.safetynet.SafetyNetHooks;



/**

 * Base class for implementing application instrumentation code.  When running

 * with instrumentation turned on, this class will be instantiated for you
@@ -1346,6 +1348,7 @@ public class Instrumentation { 
        Application app = getFactory(context.getPackageName())

                .instantiateApplication(cl, className);

        app.attach(context);

        SafetyNetHooks.init(app);

        return app;

    }
@@ -1363,6 +1366,7 @@ public class Instrumentation { 
            ClassNotFoundException {

        Application app = (Application)clazz.newInstance();

        app.attach(context);

        SafetyNetHooks.init(app);

        return app;

    }

core/java/android/content/pm/InstallSourceInfo.java

+6 −1
Original line number Diff line number Diff line
@@ -100,7 +100,12 @@ public final class InstallSourceInfo implements Parcelable { 
     */

    @Nullable

    public String getInitiatingPackageName() {

        return mInitiatingPackageName;

        /* Always return initiating package as the installer package.

           Some 3rd party apps are checking which package has initiated the installation

           of the app.

           From now on, we just consider that the initiating package returned

           to the user is always the installer package. */

        return mInstallingPackageName;

    }



    /**

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

+1 −5
Original line number Diff line number Diff line
@@ -3599,11 +3599,7 @@ public class PackageParser { 
            ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_ALLOW_CLEAR_USER_DATA_ON_FAILED_RESTORE;

        }



        if (sa.getBoolean(

                R.styleable.AndroidManifestApplication_allowAudioPlaybackCapture,

                owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.Q)) {

        ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_ALLOW_AUDIO_PLAYBACK_CAPTURE;

        }



        if (sa.getBoolean(

                R.styleable.AndroidManifestApplication_requestLegacyExternalStorage,