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

Commit 932d5dea authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix issue where SmartAutoRotateController tries to unregister an... 

Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev
parents 2e2a484a 8814d968

src/com/android/settings/display/SmartAutoRotateController.java

+0 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.provider.Settings; 
import android.service.rotationresolver.RotationResolverService;

import android.text.TextUtils;



import androidx.lifecycle.Lifecycle;

import androidx.lifecycle.LifecycleObserver;

import androidx.lifecycle.OnLifecycleEvent;

import androidx.preference.Preference;
@@ -82,10 +81,6 @@ public class SmartAutoRotateController extends TogglePreferenceController implem 
                context);

    }



    public void init(Lifecycle lifecycle) {

        lifecycle.addObserver(this);

    }



    @Override

    public int getAvailabilityStatus() {

        if (!isRotationResolverServiceAvailable(mContext)) {

src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ public class SmartAutoRotatePreferenceFragment extends DashboardFragment { 
    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

        use(SmartAutoRotateController.class).init(getLifecycle());

        DeviceStateAutoRotationHelper.initControllers(

                getLifecycle(),

                useAll(DeviceStateAutoRotateSettingController.class)