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

Commit 28028d1a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8529137 from b759da5e to tm-qpr1-release 

Change-Id: I0169a982cffb44504bde40342070a66b800af555
parents 4f15843c b759da5e

api/api.go

+0 −6
Original line number Diff line number Diff line
@@ -208,12 +208,6 @@ func createMergedFrameworkImpl(ctx android.LoadHookContext, modules []string) { 
	props := libraryProps{}

	props.Name = proptools.StringPtr("all-framework-module-impl")

	props.Static_libs = transformArray(modules, "", ".impl")

	// Media module's impl jar is called "updatable-media"

	for i, v := range props.Static_libs {

		if v == "framework-media.impl" {

			props.Static_libs[i] = "updatable-media"

		}

	}

	props.Sdk_version = proptools.StringPtr("module_current")

	props.Visibility = []string{"//frameworks/base"}

	ctx.CreateModule(java.LibraryFactory, &props)

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER) public void addHomeVisibilityListener(@NonNull java.util.concurrent.Executor, @NonNull android.app.HomeVisibilityListener);

    method public void alwaysShowUnsupportedCompileSdkWarning(android.content.ComponentName);

    method public long getTotalRam();

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidProcessCapabilities(int);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidProcessState(int);

    method @RequiresPermission(allOf={android.Manifest.permission.PACKAGE_USAGE_STATS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional=true) public int getUidProcessCapabilities(int);

    method @RequiresPermission(allOf={android.Manifest.permission.PACKAGE_USAGE_STATS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional=true) public int getUidProcessState(int);

    method public void holdLock(android.os.IBinder, int);

    method public static boolean isHighEndGfx();

    method @RequiresPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER) public void removeHomeVisibilityListener(@NonNull android.app.HomeVisibilityListener);

core/java/android/app/ActivityManager.java

+15 −2
Original line number Diff line number Diff line
@@ -3710,10 +3710,16 @@ public class ActivityManager { 
    /**

     * Returns the process state of this uid.

     *

     * If the caller does not hold {@link Manifest.permission#INTERACT_ACROSS_USERS_FULL}

     * permission, they can only query process state of UIDs running in the same user as the caller.

     *

     * @hide

     */

    @TestApi

    @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)

    @RequiresPermission(allOf = {

            Manifest.permission.PACKAGE_USAGE_STATS,

            Manifest.permission.INTERACT_ACROSS_USERS_FULL

    }, conditional = true)

    public int getUidProcessState(int uid) {

        try {

            return getService().getUidProcessState(uid, mContext.getOpPackageName());
@@ -3725,10 +3731,17 @@ public class ActivityManager { 
    /**

     * Returns the process capability of this uid.

     *

     * If the caller does not hold {@link Manifest.permission#INTERACT_ACROSS_USERS_FULL}

     * permission, they can only query process capabilities of UIDs running in the same user

     * as the caller.

     *

     * @hide

     */

    @TestApi

    @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)

    @RequiresPermission(allOf = {

            Manifest.permission.PACKAGE_USAGE_STATS,

            Manifest.permission.INTERACT_ACROSS_USERS_FULL

    }, conditional = true)

    public @ProcessCapability int getUidProcessCapabilities(int uid) {

        try {

            return getService().getUidProcessCapabilities(uid, mContext.getOpPackageName());

core/java/android/app/AppOpsManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2537,8 +2537,8 @@ public class AppOpsManager { 
     * restriction} for a certain app-op.

     */

    private static RestrictionBypass[] sOpAllowSystemRestrictionBypass = new RestrictionBypass[] {

            new RestrictionBypass(true, false), //COARSE_LOCATION

            new RestrictionBypass(true, false), //FINE_LOCATION

            null, //COARSE_LOCATION

            null, //FINE_LOCATION

            null, //GPS

            null, //VIBRATE

            null, //READ_CONTACTS

core/java/android/app/IActivityManager.aidl

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ interface IActivityManager { 
            String callingPackage);

    void unregisterUidObserver(in IUidObserver observer);

    boolean isUidActive(int uid, String callingPackage);

    @JavaPassthrough(annotation=

            "@android.annotation.RequiresPermission(allOf = {android.Manifest.permission.PACKAGE_USAGE_STATS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional = true)")

    int getUidProcessState(int uid, in String callingPackage);

    @UnsupportedAppUsage

    int checkPermission(in String permission, int pid, int uid);
@@ -742,6 +744,8 @@ interface IActivityManager { 
    /** Called by PendingIntent.queryIntentComponents() */

    ParceledListSlice queryIntentComponentsForIntentSender(in IIntentSender sender, int matchFlags);



    @JavaPassthrough(annotation=

            "@android.annotation.RequiresPermission(allOf = {android.Manifest.permission.PACKAGE_USAGE_STATS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional = true)")

    int getUidProcessCapabilities(int uid, in String callingPackage);



    /** Blocks until all broadcast queues become idle. */