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

Commit d07131cb authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove throws RuntimeException from APIs" am: ad274e53 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669005

Change-Id: I9be404a01acf3714fab3164bd0698e9b10149d8b
parents cf855996 ad274e53

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6808,14 +6808,14 @@ package android.os { 
    method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.os.connectivity.WifiBatteryStats getWifiBatteryStats();

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportFullWifiLockAcquiredFromSource(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportFullWifiLockReleasedFromSource(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportMobileRadioPowerState(boolean, int) throws java.lang.RuntimeException;

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportMobileRadioPowerState(boolean, int);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiBatchedScanStartedFromSource(@NonNull android.os.WorkSource, @IntRange(from=0) int);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiBatchedScanStoppedFromSource(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiMulticastDisabled(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiMulticastEnabled(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiOff();

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiOn();

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiRadioPowerState(boolean, int) throws java.lang.RuntimeException;

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiRadioPowerState(boolean, int);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiRssiChanged(@IntRange(from=0xffffff81, to=0) int);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiScanStartedFromSource(@NonNull android.os.WorkSource);

    method @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public void reportWifiScanStoppedFromSource(@NonNull android.os.WorkSource);

core/java/android/os/BatteryStatsManager.java

+2 −4
Original line number Diff line number Diff line
@@ -386,10 +386,9 @@ public final class BatteryStatsManager { 
     * @param uid Uid of this event. For the active state it represents the uid that was responsible

     *            for waking the radio, or -1 if the system was responsible for waking the radio.

     *            For inactive state, the UID should always be -1.

     * @throws RuntimeException if there are binder remote-invocation errors.

     */

    @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)

    public void reportMobileRadioPowerState(boolean isActive, int uid) throws RuntimeException {

    public void reportMobileRadioPowerState(boolean isActive, int uid) {

        try {

            mBatteryStats.noteMobileRadioPowerState(getDataConnectionPowerState(isActive),

                    SystemClock.elapsedRealtimeNanos(), uid);
@@ -405,10 +404,9 @@ public final class BatteryStatsManager { 
     * @param uid Uid of this event. For the active state it represents the uid that was responsible

     *            for waking the radio, or -1 if the system was responsible for waking the radio.

     *            For inactive state, the UID should always be -1.

     * @throws RuntimeException if there are binder remote-invocation errors.

     */

    @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS)

    public void reportWifiRadioPowerState(boolean isActive, int uid) throws RuntimeException {

    public void reportWifiRadioPowerState(boolean isActive, int uid) {

        try {

            mBatteryStats.noteWifiRadioPowerState(getDataConnectionPowerState(isActive),

                    SystemClock.elapsedRealtimeNanos(), uid);