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

Commit 45727d2b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7040187 from 0b44441e to rvc-qpr2-release

Change-Id: If5063432c51a47f1760f2482a34fb3a176f80d8b
parents 631dacc1 0b44441e
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -222,4 +222,16 @@ public abstract class DevicePolicyManagerInternal {
     * Returns the profile owner component for the given user, or {@code null} if there is not one.
     */
    public abstract ComponentName getProfileOwnerAsUser(int userHandle);

    /**
     * Returns whether this class supports being deferred the responsibility for resetting the given
     * op.
     */
    public abstract boolean supportsResetOp(int op);

    /**
     * Resets the given op across the profile group of the given user for the given package. Assumes
     * {@link #supportsResetOp(int)} is true.
     */
    public abstract void resetOp(int op, String packageName, @UserIdInt int userId);
}
+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package android.content.pm;

import android.annotation.UserIdInt;
import android.app.AppOpsManager.Mode;
import android.os.UserHandle;

import java.util.List;
@@ -62,4 +63,14 @@ public abstract class CrossProfileAppsInternal {
     */
    public abstract List<UserHandle> getTargetUserProfiles(
            String packageName, @UserIdInt int userId);

    /**
     * Sets the app-op for {@link android.Manifest.permission#INTERACT_ACROSS_PROFILES} that is
     * configurable by users in Settings. This configures it for the profile group of the given
     * user.
     *
     * @see CrossProfileApps#setInteractAcrossProfilesAppOp(String, int)
     */
    public abstract void setInteractAcrossProfilesAppOp(
            String packageName, @Mode int newMode, @UserIdInt int userId);
}
+2 −2
Original line number Diff line number Diff line
@@ -3117,7 +3117,7 @@ public class ConnectivityManager {
    /**
     * Set sign in error notification to visible or invisible
     *
     * {@hide}
     * @hide
     * @deprecated Doesn't properly deal with multiple connected networks of the same type.
     */
    @Deprecated
+12 −1
Original line number Diff line number Diff line
@@ -166,12 +166,23 @@ message CodecData {
 * Logged from:
 *   frameworks/av/media/libstagefright/RemoteMediaExtractor.cpp
 *   frameworks/av/services/mediaanalytics/statsd_extractor.cpp
 * Next Tag: 4
 * Next Tag: 5
 */
message ExtractorData {
    optional string format = 1;
    optional string mime = 2;
    optional int32 tracks = 3;

    enum EntryPoint {
        UNSET = 0; // For backwards compatibility with clients that don't
                   // collect the entry point.
        SDK = 1;
        NDK_WITH_JVM = 2;
        NDK_NO_JVM = 3;
        OTHER = 4; // For extractor users that don't make use of the APIs.
    }

    optional EntryPoint entry_point = 4 [default = UNSET];
}

/**
+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ JMediaExtractor::JMediaExtractor(JNIEnv *env, jobject thiz)
    mClass = (jclass)env->NewGlobalRef(clazz);
    mObject = env->NewWeakGlobalRef(thiz);

    mImpl = new NuMediaExtractor;
    mImpl = new NuMediaExtractor(NuMediaExtractor::EntryPoint::SDK);
}

JMediaExtractor::~JMediaExtractor() {
Loading