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

Commit 7379cfee authored by Mathew Inwood's avatar Mathew Inwood Committed by Automerger Merge Worker
Browse files

Merge "Remove duplicate compat logging." into sc-dev am: 4058f591 

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

Change-Id: I405708d2e76f88af5e5a5ebcd2789162d6ad01bc
parents c85b1a77 4058f591

core/java/android/hardware/SystemSensorManager.java

+0 −2
Original line number Diff line number Diff line
@@ -575,7 +575,6 @@ public class SystemSensorManager extends SensorManager { 
                && rate > CAPPED_SAMPLING_RATE_LEVEL

                && mIsPackageDebuggable

                && !mHasHighSamplingRateSensorsPermission) {

            Compatibility.reportChange(CHANGE_ID_SAMPLING_RATE_SENSORS_PERMISSION);

            throw new SecurityException("To use the sampling rate level " + rate

                    + ", app needs to declare the normal permission"

                    + " HIGH_SAMPLING_RATE_SENSORS.");
@@ -787,7 +786,6 @@ public class SystemSensorManager extends SensorManager { 
                    && rateUs < CAPPED_SAMPLING_PERIOD_US

                    && mManager.mIsPackageDebuggable

                    && !mManager.mHasHighSamplingRateSensorsPermission) {

                Compatibility.reportChange(CHANGE_ID_SAMPLING_RATE_SENSORS_PERMISSION);

                throw new SecurityException("To use the sampling rate of " + rateUs

                        + " microseconds, app needs to declare the normal permission"

                        + " HIGH_SAMPLING_RATE_SENSORS.");