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

Merge "Use new naming for Widevine Developer option." into main

Browse Source
This commit is contained in:
Kyle Zhang
2024-03-27 18:54:40 +00:00
committed by Android (Google) Code Review
parent 0c85e4bca9 fc21e32cb3
commit be7215cc51
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/development/widevine/ForceL3FallbackPreferenceController.java → src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceController.java
View File

@@ -14,9 +14,10 @@
* limitations under the License.
*/
package com.android.settings.development.widevine;
package com.android.settings.development.mediadrm;
import android.content.Context;
import android.media.MediaDrm;
import android.sysprop.WidevineProperties;
import android.util.Log;
@@ -29,13 +30,12 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settings.media_drm.Flags;
/**
* The controller (in the Media Widevine settings) enforces L3 security level
* of Widevine CDM.
* The controller (in the Media Drm settings) enforces software secure crypto.
*/
public class ForceL3FallbackPreferenceController extends TogglePreferenceController {
private static final String TAG = "ForceL3FallbackPreferenceController";
public class ForceSwSecureCryptoFallbackPreferenceController extends TogglePreferenceController {
private static final String TAG = "ForceSwSecureCryptoFallbackPreferenceController";
public ForceL3FallbackPreferenceController(Context context, String preferenceKey) {
public ForceSwSecureCryptoFallbackPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}

14
src/com/android/settings/development/widevine/WidevineSettingsFragment.java → src/com/android/settings/development/mediadrm/MediaDrmSettingsFragment.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.development.widevine;
package com.android.settings.development.mediadrm;
import android.app.settings.SettingsEnums;
import android.content.Context;
@@ -27,12 +27,12 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.search.SearchIndexable;
/**
* Fragment for native widevine settings in Developer options.
* Fragment for native mediadrm settings in Developer options.
*/
@SearchIndexable
public class WidevineSettingsFragment extends DashboardFragment implements
public class MediaDrmSettingsFragment extends DashboardFragment implements
DeveloperOptionAwareMixin {
private static final String TAG = "WidevineSettings";
private static final String TAG = "MediaDrmSettings";
@Override
protected String getLogTag() {
@@ -41,16 +41,16 @@ public class WidevineSettingsFragment extends DashboardFragment implements
@Override
protected int getPreferenceScreenResId() {
return R.xml.widevine_settings;
return R.xml.media_drm_settings;
}
@Override
public int getMetricsCategory() {
return SettingsEnums.WIDEVINE_SETTINGS;
return SettingsEnums.MEDIA_DRM_SETTINGS;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.widevine_settings) {
new BaseSearchIndexProvider(R.xml.media_drm_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {