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

Commit 82fd8f52 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents 5e9bf5de 0d563228

cmds/statsd/src/atoms.proto

+8 −8
Original line number Diff line number Diff line
@@ -3612,11 +3612,11 @@ message AppStartOccurred { 
    // Empty if not set.

    optional string launch_token = 13;



    // The compiler filter used when when the package was optimized.

    optional int32 package_optimization_compilation_filter = 14;



    // The reason why the package was optimized.

    optional int32 package_optimization_compilation_reason = 15;

    optional int32 package_optimization_compilation_reason = 14;



    // The compiler filter used when when the package was optimized.

    optional int32 package_optimization_compilation_filter = 15;

}



message AppStartCanceled {
@@ -3662,11 +3662,11 @@ message AppStartFullyDrawn { 
    // App startup time (until call to Activity#reportFullyDrawn()).

    optional int64 app_startup_time_millis = 6;



    // The compiler filter used when when the package was optimized.

    optional int32 package_optimization_compilation_filter = 7;



    // The reason why the package was optimized.

    optional int32 package_optimization_compilation_reason = 8;

    optional int32 package_optimization_compilation_reason = 7;



    // The compiler filter used when when the package was optimized.

    optional int32 package_optimization_compilation_filter = 8;

}



/**

core/java/android/app/Activity.java

+0 −6
Original line number Diff line number Diff line
@@ -5183,12 +5183,6 @@ public class Activity extends ContextThemeWrapper 
     * #checkSelfPermission(String)}.

     * </p>

     * <p>

     * Calling this API for permissions already granted to your app would show UI

     * to the user to decide whether the app can still hold these permissions. This

     * can be useful if the way your app uses data guarded by the permissions

     * changes significantly.

     * </p>

     * <p>

     * You cannot request a permission if your activity sets {@link

     * android.R.styleable#AndroidManifestActivity_noHistory noHistory} to

     * <code>true</code> because in this case the activity would not receive

core/java/android/app/ActivityManagerInternal.java

+22 −0
Original line number Diff line number Diff line
@@ -377,6 +377,21 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract boolean hasRunningForegroundService(int uid, int foregroundServiceType);



    /**

     * Returns {@code true} if the given notification channel currently has a

     * notification associated with a foreground service.  This is an AMS check

     * because that is the source of truth for the FGS state.

     */

    public abstract boolean hasForegroundServiceNotification(String pkg, @UserIdInt int userId,

            String channelId);



    /**

     * If the given app has any FGSs whose notifications are in the given channel,

     * stop them.

     */

    public abstract void stopForegroundServicesForChannel(String pkg, @UserIdInt int userId,

            String channelId);



    /**

     * Registers the specified {@code processObserver} to be notified of future changes to

     * process state.
@@ -440,4 +455,11 @@ public abstract class ActivityManagerInternal { 
     * @return true if exists, false otherwise.

     */

    public abstract boolean isPendingTopUid(int uid);



    public abstract void tempAllowWhileInUsePermissionInFgs(int uid, long duration);



    public abstract boolean isTempAllowlistedForFgsWhileInUse(int uid);



    public abstract boolean canAllowWhileInUsePermissionInFgs(int pid, int uid,

            @NonNull String packageName);

}

core/java/android/app/ActivityThread.java

+4 −0
Original line number Diff line number Diff line
@@ -4602,6 +4602,10 @@ public final class ActivityThread extends ClientTransactionHandler { 
        }



        if (r.isTopResumedActivity == onTop) {

            if (!Build.IS_DEBUGGABLE) {

                Slog.w(TAG, "Activity top position already set to onTop=" + onTop);

                return;

            }

            throw new IllegalStateException("Activity top position already set to onTop=" + onTop);

        }

core/java/android/app/AppOpsManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2436,9 +2436,9 @@ public class AppOpsManager { 
            false, // READ_MEDIA_AUDIO

            false, // WRITE_MEDIA_AUDIO

            false, // READ_MEDIA_VIDEO

            false, // WRITE_MEDIA_VIDEO

            true,  // WRITE_MEDIA_VIDEO

            false, // READ_MEDIA_IMAGES

            false, // WRITE_MEDIA_IMAGES

            true,  // WRITE_MEDIA_IMAGES

            true,  // LEGACY_STORAGE

            false, // ACCESS_ACCESSIBILITY

            false, // READ_DEVICE_IDENTIFIERS