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

Commit 792a7910 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5663715 from 4898d827 to qt-c2f2-release 

Change-Id: I88e300cabddb402b9cd6c8e3ab60727ecbedb70f
parents d8446b96 4898d827

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -47843,6 +47843,7 @@ package android.util { 
    field public static final int DENSITY_400 = 400; // 0x190

    field public static final int DENSITY_420 = 420; // 0x1a4

    field public static final int DENSITY_440 = 440; // 0x1b8

    field public static final int DENSITY_450 = 450; // 0x1c2

    field public static final int DENSITY_560 = 560; // 0x230

    field public static final int DENSITY_600 = 600; // 0x258

    field public static final int DENSITY_DEFAULT = 160; // 0xa0

cmds/incident_helper/src/main.cpp

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ static TextParserBase* selectParser(int section) { 
            return new PsParser();

        case 2006:

            return new BatteryTypeParser();

        case 3026: // system_trace is already a serialized protobuf

            return new NoopParser();

        default:

            // Return no op parser when no specific ones are implemented.

            return new NoopParser();

cmds/incidentd/src/Section.cpp

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ bool section_requires_specific_mention(int sectionId) { 
    switch (sectionId) {

        case 3025: // restricted_images

            return true;

        case 3026: // system_trace

            return true;

        default:

            return false;

    }

cmds/statsd/src/atoms.proto

+23 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ message Atom { 
        ContentCaptureSessionEvents content_capture_session_events = 208;

        ContentCaptureFlushed content_capture_flushed = 209;

        LocationManagerApiUsageReported location_manager_api_usage_reported = 210;

        ReviewPermissionsFragmentResultReported review_permissions_fragment_result_reported

            = 211 [(log_from_module) = "permissioncontroller"];

    }



    // Pulled events will start at field 10000.
@@ -6544,3 +6546,24 @@ message LocationManagerApiUsageReported { 
    // Categorized to 3 types that are interesting from location's perspective.

    optional android.stats.location.ActivityImportance activiy_importance = 12;

}



/**

 * Information about a permission grant or denial made by user inside ReviewPermissionsFragment

 */

message ReviewPermissionsFragmentResultReported {

    // unique value identifying a permission group change. A permission group change might result

    // in multiple of these atoms

    optional int64 change_id = 1;



    // UID of package the permission belongs to

    optional int32 uid = 2 [(is_uid) = true];



    // Name of package the permission belongs to

    optional string package_name = 3;



    // The permission to be granted

    optional string permission_name = 4;



    // The result of the permission grant

    optional bool permission_granted = 5;

}

core/java/android/app/admin/DevicePolicyManager.java

+1 −0
Original line number Diff line number Diff line
@@ -6396,6 +6396,7 @@ public class DevicePolicyManager { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public @Nullable ComponentName getProfileOwnerAsUser(final int userId) {

        if (mService != null) {

            try {