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

Commit 7cfd0cb4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4417144 from 4745025d to oc-m2-release 

Change-Id: I3e3c4343b9aae5ddbc205a1f28470a5fe9e1247c
parents 174b188d 4745025d

core/java/android/app/ActivityManagerInternal.java

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public abstract class ActivityManagerInternal { 
    /**

     * Allow DeviceIdleController to tell us about what apps are whitelisted.

     */

    public abstract void setDeviceIdleWhitelist(int[] userAppids, int[] allAppids);

    public abstract void setDeviceIdleWhitelist(int[] appids);



    /**

     * Update information about which app IDs are on the temp whitelist.

core/java/android/app/AppOpsManager.java

+2 −12
Original line number Diff line number Diff line
@@ -252,10 +252,8 @@ public class AppOpsManager { 
    public static final int OP_INSTANT_APP_START_FOREGROUND = 68;

    /** @hide Answer incoming phone calls */

    public static final int OP_ANSWER_PHONE_CALLS = 69;

    /** @hide Run jobs when in background */

    public static final int OP_RUN_ANY_IN_BACKGROUND = 70;

    /** @hide */

    public static final int _NUM_OP = 71;

    public static final int _NUM_OP = 70;



    /** Access to coarse location information. */

    public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
@@ -494,8 +492,7 @@ public class AppOpsManager { 
            OP_REQUEST_INSTALL_PACKAGES,

            OP_PICTURE_IN_PICTURE,

            OP_INSTANT_APP_START_FOREGROUND,

            OP_ANSWER_PHONE_CALLS,

            OP_RUN_ANY_IN_BACKGROUND,

            OP_ANSWER_PHONE_CALLS

    };



    /**
@@ -573,7 +570,6 @@ public class AppOpsManager { 
            OPSTR_PICTURE_IN_PICTURE,

            OPSTR_INSTANT_APP_START_FOREGROUND,

            OPSTR_ANSWER_PHONE_CALLS,

            null, // OP_RUN_ANY_IN_BACKGROUND

    };



    /**
@@ -651,7 +647,6 @@ public class AppOpsManager { 
            "PICTURE_IN_PICTURE",

            "INSTANT_APP_START_FOREGROUND",

            "ANSWER_PHONE_CALLS",

            "RUN_ANY_IN_BACKGROUND",

    };



    /**
@@ -729,7 +724,6 @@ public class AppOpsManager { 
            null, // no permission for entering picture-in-picture on hide

            Manifest.permission.INSTANT_APP_FOREGROUND_SERVICE,

            Manifest.permission.ANSWER_PHONE_CALLS,

            null, // no permission for OP_RUN_ANY_IN_BACKGROUND

    };



    /**
@@ -808,7 +802,6 @@ public class AppOpsManager { 
            null, // ENTER_PICTURE_IN_PICTURE_ON_HIDE

            null, // INSTANT_APP_START_FOREGROUND

            null, // ANSWER_PHONE_CALLS

            null, // OP_RUN_ANY_IN_BACKGROUND

    };



    /**
@@ -886,7 +879,6 @@ public class AppOpsManager { 
            false, // ENTER_PICTURE_IN_PICTURE_ON_HIDE

            false, // INSTANT_APP_START_FOREGROUND

            false, // ANSWER_PHONE_CALLS

            false, // OP_RUN_ANY_IN_BACKGROUND

    };



    /**
@@ -963,7 +955,6 @@ public class AppOpsManager { 
            AppOpsManager.MODE_ALLOWED,  // OP_PICTURE_IN_PICTURE

            AppOpsManager.MODE_DEFAULT,  // OP_INSTANT_APP_START_FOREGROUND

            AppOpsManager.MODE_ALLOWED, // ANSWER_PHONE_CALLS

            AppOpsManager.MODE_ALLOWED,  // OP_RUN_ANY_IN_BACKGROUND

    };



    /**
@@ -1044,7 +1035,6 @@ public class AppOpsManager { 
            false, // OP_PICTURE_IN_PICTURE

            false,

            false, // ANSWER_PHONE_CALLS

            false, // OP_RUN_ANY_IN_BACKGROUND

    };



    /**

core/java/android/app/IActivityManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ interface IActivityManager { 
    int getLaunchedFromUid(in IBinder activityToken);

    void unstableProviderDied(in IBinder connection);

    boolean isIntentSenderAnActivity(in IIntentSender sender);

    boolean isIntentSenderAForegroundService(in IIntentSender sender);

    int startActivityAsUser(in IApplicationThread caller, in String callingPackage,

            in Intent intent, in String resolvedType, in IBinder resultTo, in String resultWho,

            int requestCode, int flags, in ProfilerInfo profilerInfo,

core/java/android/app/PendingIntent.java

+4 −16
Original line number Diff line number Diff line
@@ -20,17 +20,18 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;

import android.content.Intent;

import android.content.IIntentReceiver;

import android.content.IIntentSender;

import android.content.Intent;

import android.content.IntentSender;

import android.os.Bundle;

import android.os.Looper;

import android.os.RemoteException;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.RemoteException;

import android.os.Process;

import android.os.UserHandle;

import android.util.AndroidException;
@@ -1009,19 +1010,6 @@ public final class PendingIntent implements Parcelable { 
        }

    }



    /**

     * @hide

     * Check whether this PendingIntent will launch a foreground service

     */

    public boolean isForegroundService() {

        try {

            return ActivityManager.getService()

                    .isIntentSenderAForegroundService(mTarget);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @hide

     * Return the Intent of this PendingIntent.

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

+34 −0
Original line number Diff line number Diff line
@@ -221,6 +221,40 @@ public class ResolveInfo implements Parcelable { 
        return data;

    }



    /**

     * @return The resource that would be used when loading

     * the label for this resolve info.

     *

     * @hide

     */

    public int resolveLabelResId() {

        if (labelRes != 0) {

            return labelRes;

        }

        final ComponentInfo componentInfo = getComponentInfo();

        if (componentInfo.labelRes != 0) {

            return componentInfo.labelRes;

        }

        return componentInfo.applicationInfo.labelRes;

    }



    /**

     * @return The resource that would be used when loading

     * the icon for this resolve info.

     *

     * @hide

     */

    public int resolveIconResId() {

        if (icon != 0) {

            return icon;

        }

        final ComponentInfo componentInfo = getComponentInfo();

        if (componentInfo.icon != 0) {

            return componentInfo.icon;

        }

        return componentInfo.applicationInfo.icon;

    }



    /**

     * Retrieve the current graphical icon associated with this resolution.  This

     * will call back on the given PackageManager to load the icon from