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

Commit d57e959e authored by Xin Li's avatar Xin Li
Browse files

Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master 

Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
parents 3ed452c5 2fc30b6e

api/test-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String);

    method public long getTotalRam();

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

    method public static boolean isHighEndGfx();

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);

    method public static void resumeAppSwitches() throws android.os.RemoteException;

    method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int);
@@ -3262,10 +3263,13 @@ package android.view { 
  }



  @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {

    method @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS, to="yesExcludeDescendants"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS, to="noExcludeDescendants")}) public int getImportantForContentCapture();

    method public android.view.View getTooltipView();

    method public boolean isAutofilled();

    method public static boolean isDefaultFocusHighlightEnabled();

    method public boolean isDefaultFocusHighlightNeeded(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);

    method public final boolean isImportantForContentCapture();

    method public void onProvideContentCaptureStructure(@NonNull android.view.ViewStructure, int);

    method protected void resetResolvedDrawables();

    method public void resetResolvedLayoutDirection();

    method public void resetResolvedPadding();
@@ -3276,7 +3280,13 @@ package android.view { 
    method public boolean restoreFocusNotInCluster();

    method public void setAutofilled(boolean);

    method public final void setFocusedInCluster();

    method public void setImportantForContentCapture(int);

    method public void setIsRootNamespace(boolean);

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_AUTO = 0; // 0x0

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO = 2; // 0x2

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS = 8; // 0x8

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES = 1; // 0x1

    field public static final int IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS = 4; // 0x4

  }



  public class ViewConfiguration {

cmds/bootanimation/bootanim.rc

+1 −0
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ service bootanim /system/bin/bootanimation 
    group graphics audio

    disabled

    oneshot

    ioprio rt 0

    writepid /dev/stune/top-app/tasks

cmds/statsd/src/atoms.proto

+39 −0
Original line number Diff line number Diff line
@@ -319,6 +319,8 @@ message Atom { 
            217 [(log_from_module) = "permissioncontroller"];

        PermissionAppsFragmentViewed permission_apps_fragment_viewed =

            218  [(log_from_module) = "permissioncontroller"];

        ExclusionRectStateChanged exclusion_rect_state_changed = 223;

        BackGesture back_gesture_reported_reported = 224;

    }



    // Pulled events will start at field 10000.
@@ -2500,6 +2502,41 @@ message PhoneStateChanged { 
    optional State state = 1;

}



message BackGesture {

    enum BackType {

          DEFAULT_BACK_TYPE = 0;

          COMPLETED = 1;

          COMPLETED_REJECTED = 2; // successful because coming from rejected area

          INCOMPLETE_EXCLUDED = 3; // would have been successful but in the exclusion area

          INCOMPLETE = 4;

    }

    optional BackType type = 1;



    optional int32 y_coordinate = 2; // y coordinate for ACTION_DOWN event

    enum WindowHorizontalLocation {

        DEFAULT_LOCATION = 0;

        LEFT = 1;

        RIGHT = 2;

    }

    optional WindowHorizontalLocation x_location = 3;

}



message ExclusionRectStateChanged {

    optional string component_name = 1;    // if not available, simply packageName

    optional int32 requested_height = 2;   // px

    optional int32 rejected_height = 3;    // px



    enum WindowHorizontalLocation {

        DEFAULT_LOCATION = 0;

        LEFT = 1;

        RIGHT = 2;

    }

    optional WindowHorizontalLocation x_location = 4;

    optional bool landscape = 5;

    optional bool splitscreen = 6;

    optional int32 duration_millis = 7;

}



message LauncherUIChanged {

    optional android.stats.launcher.LauncherAction action = 1;

    optional android.stats.launcher.LauncherState src_state = 2;
@@ -3291,6 +3328,8 @@ message BiometricErrorOccurred { 
    optional int32 error_info_vendor = 7;

    // Dictates if this message should trigger additional debugging.

    optional bool debug = 8;

    // Time spent during the authentication attempt.

    optional int64 latency_millis = 9;

}



/**

cmds/statsd/src/external/PowerStatsPuller.cpp

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ bool PowerStatsPuller::PullInternal(vector<shared_ptr<LogEvent>>* data) { 
    std::lock_guard<std::mutex> lock(gPowerStatsHalMutex);



    if (!getPowerStatsHalLocked()) {

        ALOGE("power.stats Hal not loaded");

        return false;

    }
@@ -116,6 +115,7 @@ bool PowerStatsPuller::PullInternal(vector<shared_ptr<LogEvent>>* data) { 
        if (gRailInfo.empty()) {

            ALOGE("power.stats has no rail information");

            gPowerStatsExist = false; // No rail info, so never try again.

            gPowerStatsHal = nullptr;

            return false;

        }

    }

core/java/android/accessibilityservice/AccessibilityService.java

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ public abstract class AccessibilityService extends Service { 
     * Name under which an AccessibilityService component publishes information

     * about itself. This meta-data must reference an XML resource containing an

     * <code>&lt;{@link android.R.styleable#AccessibilityService accessibility-service}&gt;</code>

     * tag. This is a a sample XML file configuring an accessibility service:

     * tag. This is a sample XML file configuring an accessibility service:

     * <pre> &lt;accessibility-service

     *     android:accessibilityEventTypes="typeViewClicked|typeViewFocused"

     *     android:packageNames="foo.bar, foo.baz"