PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev

Browse Source
This commit is contained in:
Chaohui Wang
2022-04-22 02:15:23 +00:00
committed by Android (Google) Code Review
parent 2e2a484a88 8814d96884
commit 932d5deaff
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/display/SmartAutoRotateController.java
View File

@@ -35,7 +35,6 @@ import android.provider.Settings;
import android.service.rotationresolver.RotationResolverService; import android.service.rotationresolver.RotationResolverService;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -82,10 +81,6 @@ public class SmartAutoRotateController extends TogglePreferenceController implem
context); context);
} }
public void init(Lifecycle lifecycle) {
lifecycle.addObserver(this);
}
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!isRotationResolverServiceAvailable(mContext)) { if (!isRotationResolverServiceAvailable(mContext)) {

1
src/com/android/settings/display/SmartAutoRotatePreferenceFragment.java
View File

@@ -64,7 +64,6 @@ public class SmartAutoRotatePreferenceFragment extends DashboardFragment {
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
super.onAttach(context); super.onAttach(context);
use(SmartAutoRotateController.class).init(getLifecycle());
DeviceStateAutoRotationHelper.initControllers( DeviceStateAutoRotationHelper.initControllers(
getLifecycle(), getLifecycle(),
useAll(DeviceStateAutoRotateSettingController.class) useAll(DeviceStateAutoRotateSettingController.class)