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

Commit 49cd8d88 authored by Edgar Wang's avatar Edgar Wang
Browse files

Avoid media transcode can be bypass guard of developer options 

When developer options switch is off, a user including guest user
can still configure media transcoding settings via slices.

Bug: 244569778
Test: manual
Change-Id: I3d70045c2498e683bf615cbe521e2f98d50b7eec
(cherry picked from commit a94e8d0b)
parent 1f139628

src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.SystemProperties; 


import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller (on the transcode settings screen) indicating that by default we assume that apps
@@ -47,7 +48,11 @@ public class TranscodeDefaultOptionPreferenceController extends TogglePreference 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override

src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.SystemProperties; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller (in the Media transcoding settings) indicating the user's preference to disable
@@ -49,7 +50,11 @@ public class TranscodeDisableCachePreferenceController extends TogglePreferenceC 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override

src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.SystemProperties; 


import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller for the "Enabling transcoding for all apps" switch on the transcode settings
@@ -37,7 +38,11 @@ public class TranscodeGlobalTogglePreferenceController extends TogglePreferenceC 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override

src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.SystemProperties; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller (in the Media transcoding settings) indicating the user's preference to show
@@ -49,7 +50,11 @@ public class TranscodeNotificationPreferenceController extends TogglePreferenceC 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override

src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java

+6 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.SystemProperties; 


import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;

import com.android.settingslib.development.DevelopmentSettingsEnabler;



/**

 * The controller for the User's control (over other transcoding preferences) preference switch on
@@ -47,7 +48,11 @@ public class TranscodeUserControlPreferenceController extends TogglePreferenceCo 


    @Override

    public int getAvailabilityStatus() {

        if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)) {

            return AVAILABLE;

        } else {

            return CONDITIONALLY_UNAVAILABLE;

        }

    }



    @Override