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

Use new naming for Widevine Developer option.

Browse Source 
Bug: 301669353
Change-Id: Idf9802fc6bbffdc81c9c0fa3527dc3eb7efbf2a1
This commit is contained in:
Kyle Zhang
2024-02-20 19:15:40 +00:00
parent 67a237efca
commit fc21e32cb3
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -13126,4 +13126,11 @@
<!--Text for Stylus Pointer Icon preference -->
<string name="show_stylus_pointer_icon">Show pointer while hovering</string>
<!-- Developer settings title: Media DRM settings screen. [CHAR LIMIT=50] -->
<string name="media_drm_settings_title">Media DRM settings</string>
<!-- Developer settings title: select whether to enable force Software Secure Crypto fallback. [CHAR LIMIT=50] -->
<string name="force_swcrypto_fallback_title">Force Software Secure Crypto</string>
<!-- Developer settings summary: select to force Software Secure Crypto.[CHAR LIMIT=NONE] -->
<string name="force_swcrypto_fallback_summary">Force DRM key management to use software-based whitebox crypto</string>
</resources>

6
res/xml/development_settings.xml
View File

@@ -645,9 +645,9 @@
android:fragment="com.android.settings.development.transcode.TranscodeSettingsFragment" />
<Preference
android:key="widevine_settings"
android:title="@string/widevine_settings_title"
android:fragment="com.android.settings.development.widevine.WidevineSettingsFragment" />
android:key="media_drm_settings"
android:title="@string/media_drm_settings_title"
android:fragment="com.android.settings.development.mediadrm.MediaDrmSettingsFragment" />
</PreferenceCategory>

10
res/xml/widevine_settings.xml → res/xml/media_drm_settings.xml
View File

@@ -18,12 +18,12 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/widevine_settings_title"
android:title="@string/media_drm_settings_title"
settings:searchable="false">
<SwitchPreferenceCompat
android:key="force_l3_fallback"
android:title="@string/force_l3_fallback_title"
android:summary="@string/force_l3_fallback_summary"
settings:controller="com.android.settings.development.widevine.ForceL3FallbackPreferenceController" />
android:key="force_swcrypto_fallback"
android:title="@string/force_swcrypto_fallback_title"
android:summary="@string/force_swcrypto_fallback_summary"
settings:controller="com.android.settings.development.mediadrm.ForceSwSecureCryptoFallbackPreferenceController" />
</PreferenceScreen>

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) {

12
tests/unit/src/com/android/settings/development/widevine/ForceL3FallbackPreferenceControllerTest.java → tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.development.widevine;
package com.android.settings.development.mediadrm;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assume.assumeTrue;
@@ -43,23 +43,23 @@ import org.junit.runner.RunWith;
import java.util.UUID;
@RunWith(AndroidJUnit4.class)
public class ForceL3FallbackPreferenceControllerTest {
public class ForceSwSecureCryptoFallbackPreferenceControllerTest {
private static final String PREF_KEY = "force_l3_fallback";
private static final String PREF_KEY = "force_swcrypto_fallback";
private static final UUID WIDEVINE_UUID =
new UUID(0xEDEF8BA979D64ACEL, 0xA3C827DCD51D21EDL);
private static final String TAG = "ForceL3FallbackPreferenceControllerTest";
private static final String TAG = "ForceSwSecureCryptoFallbackPreferenceControllerTest";
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private Context mContext;
private ForceL3FallbackPreferenceController mController;
private ForceSwSecureCryptoFallbackPreferenceController mController;
private SwitchPreference mPreference;
@Before
public void setUp() {
mContext = ApplicationProvider.getApplicationContext();
mController = new ForceL3FallbackPreferenceController(mContext, PREF_KEY);
mController = new ForceSwSecureCryptoFallbackPreferenceController(mContext, PREF_KEY);
mPreference = new SwitchPreference(mContext);
WidevineProperties.forcel3_enabled(false);
}