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

Commit 2b2b298d authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Correctly initialize runtime sensors" into main

parents fadd782b 42f73024

core/java/android/hardware/SystemSensorManager.java

+10 −5
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.hardware;



import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM;

import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;

import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_INVALID;

import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_SENSORS;
@@ -161,6 +162,9 @@ public class SystemSensorManager extends SensorManager { 
        mIsPackageDebuggable = (0 != (appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE));



        // initialize the sensor list

        if (getSensorPolicy(mContext.getDeviceId()) == DEVICE_POLICY_CUSTOM) {

            createRuntimeSensorListLocked(mContext.getDeviceId());

        } else {

            for (int index = 0; ; ++index) {

                Sensor sensor = new Sensor();

                if (!nativeGetDefaultDeviceSensorAtIndex(mNativeInstance, sensor, index)) break;
@@ -168,6 +172,7 @@ public class SystemSensorManager extends SensorManager { 
                mHandleToSensor.put(sensor.getHandle(), sensor);

            }

        }

    }



    /** @hide */

    @Override