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

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

Snap for 6493843 from 38b4ec91 to mainline-release 

Change-Id: I5f1314d39a5a842efaf45f7b554128d1da8d9303
parents 14207832 38b4ec91

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12097,6 +12097,7 @@ package android.content.pm { 
    field public static final String FEATURE_COMPANION_DEVICE_SETUP = "android.software.companion_device_setup";

    field public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";

    field public static final String FEATURE_CONSUMER_IR = "android.hardware.consumerir";

    field public static final String FEATURE_CONTROLS = "android.software.controls";

    field public static final String FEATURE_DEVICE_ADMIN = "android.software.device_admin";

    field public static final String FEATURE_EMBEDDED = "android.hardware.type.embedded";

    field public static final String FEATURE_ETHERNET = "android.hardware.ethernet";

cmds/statsd/src/atoms.proto

+2 −1
Original line number Diff line number Diff line
@@ -1256,7 +1256,8 @@ message BatteryLevelChanged { 
 */

message ChargingStateChanged {

    // State of the battery, from frameworks/base/core/proto/android/os/enums.proto.

    optional android.os.BatteryStatusEnum state = 1;

    optional android.os.BatteryStatusEnum state = 1

            [(state_field_option).exclusive_state = true, (state_field_option).nested = false];

}



/**

core/java/android/content/pm/PackageManager.java

+10 −0
Original line number Diff line number Diff line
@@ -3048,6 +3048,16 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports a system interface for the user to select

     * and bind device control services provided by applications.

     *

     * @see android.service.controls.ControlsProviderService

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_CONTROLS = "android.software.controls";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device has

     * the requisite hardware support to support reboot escrow of synthetic password for updates.

core/java/android/provider/Settings.java

+5 −0
Original line number Diff line number Diff line
@@ -9936,6 +9936,11 @@ public final class Settings { 
        * @hide */

       public static final String PACKAGE_VERIFIER_TIMEOUT = "verifier_timeout";













        /** Timeout for app integrity verification.













         * @hide */













        public static final String APP_INTEGRITY_VERIFICATION_TIMEOUT =













                "app_integrity_verification_timeout";



























       /** Default response code for package verification.















        * @hide */















       public static final String PACKAGE_VERIFIER_DEFAULT_RESPONSE = "verifier_default_response";

































core/java/android/view/SurfaceControlViewHost.java



+0
−8




























Original line number
Diff line number
Diff line








@@ -275,12 +275,4 @@ public class SurfaceControlViewHost {













        // ViewRoot will release mSurfaceControl for us.















        mViewRoot.die(false /* immediate */);















    }



























    /**













     * Tell this viewroot to clean itself up.













     * @hide













     */













    public void die() {













        mViewRoot.die(false /* immediate */);













    }















}