Merge "Fix the burst callback issue on the repository" into main
diff --git a/Android.bp b/Android.bp
index 4d07913..9680b8b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,6 +61,7 @@
"res-product",
],
static_libs: [
+ "android.nfc.flags-aconfig-java",
"androidx-constraintlayout_constraintlayout",
"androidx.slice_slice-builders",
"androidx.slice_slice-core",
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6689645..f82f970 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3017,23 +3017,6 @@
</intent-filter>
</activity>
- <!-- NFC settings -->
- <activity
- android:name="Settings$AndroidBeamSettingsActivity"
- android:exported="true"
- android:label="@string/android_beam_settings_title">
- <intent-filter android:priority="1">
- <action android:name="android.settings.NFCSHARING_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.nfc.AndroidBeam" />
- <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
- android:value="@string/menu_key_connected_devices"/>
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
- </activity>
-
<activity
android:name="Settings$WifiDisplaySettingsActivity"
android:label="@string/wifi_display_settings_title"
diff --git a/res/values/config.xml b/res/values/config.xml
index 334d4e5..2c683ea 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -661,6 +661,9 @@
<!-- Whether to enable the advanced vpn feature. The default is not to. -->
<bool name="config_advanced_vpn_enabled">false</bool>
+ <!-- Whether to show the VPN options menu. The default is to show it. -->
+ <bool name="config_show_vpn_options">true</bool>
+
<!-- An array of uid name for which packages exempt from Wi-Fi permission check. -->
<string-array name="config_exempt_wifi_permission_uid_name" translatable="false">
<item>@string/config_settingsintelligence_package_name</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fa79cbb..d625122 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10505,9 +10505,9 @@
</string-array>
<!-- Debugging developer settings: enable angle as system driver? [CHAR LIMIT=50] -->
- <string name="enable_angle_as_system_driver">Enable ANGLE</string>
+ <string name="enable_angle_as_system_driver">Experimental: Enable ANGLE</string>
<!-- Debugging developer settings: enable angle as system driver summary [CHAR LIMIT=NONE] -->
- <string name="enable_angle_as_system_driver_summary">Enable ANGLE as system OpenGL ES driver</string>
+ <string name="enable_angle_as_system_driver_summary">Warning: Enable ANGLE as default OpenGL ES driver. This feature is in experiment and may not be compatible with some camera and video apps.</string>
<!--Dialog body text used to explain a reboot is required after changing ANGLE as system GLES driver setting-->
<string name="reboot_dialog_enable_angle_as_system_driver">A reboot is required to change the system OpenGL ES driver</string>
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index 11e3288..df97043 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -47,14 +47,6 @@
settings:keywords="@string/keywords_wifi_display_settings"/>
<com.android.settingslib.RestrictedPreference
- android:fragment="com.android.settings.nfc.AndroidBeam"
- android:key="android_beam_settings"
- android:title="@string/android_beam_settings_title"
- settings:controller="com.android.settings.nfc.AndroidBeamPreferenceController"
- android:icon="@drawable/ic_android"
- android:order="-5"/>
-
- <com.android.settingslib.RestrictedPreference
android:key="connected_device_printing"
android:title="@string/print_settings"
android:summary="@string/summary_placeholder"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index a8fa527..14d978b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -331,7 +331,6 @@
public static class ConfigureWifiSettingsActivity extends SettingsActivity { /* empty */ }
public static class SavedAccessPointsSettingsActivity extends SettingsActivity { /* empty */ }
public static class TextToSpeechSettingsActivity extends SettingsActivity { /* empty */ }
- public static class AndroidBeamSettingsActivity extends SettingsActivity { /* empty */ }
public static class WifiDisplaySettingsActivity extends SettingsActivity { /* empty */ }
public static class DreamSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity to manage communal settings */
diff --git a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
index 597705c..e378eb3 100644
--- a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
+++ b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
@@ -17,8 +17,10 @@
package com.android.settings.applications.specialaccess;
import android.content.Context;
+import android.nfc.Flags;
import android.nfc.NfcAdapter;
import android.nfc.cardemulation.CardEmulation;
+import android.os.UserHandle;
import androidx.preference.Preference;
@@ -64,12 +66,21 @@
}
}
+ private boolean hasAnyServices() {
+ if (Flags.enableNfcMainline()) {
+ return mCardEmuManager.getServices(
+ CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();
+ } else {
+ return mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT).isEmpty();
+ }
+ }
+
@Override
public void resume() {
if (!isNfcAvailable()) {
return;
}
- if (mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT).isEmpty()) {
+ if (hasAnyServices()) {
mIsPaymentAvailable = false;
} else {
mIsPaymentAvailable = true;
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
index e2d92c7..8e230cb 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -17,12 +17,10 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.content.pm.PackageManager;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.nfc.AndroidBeamPreferenceController;
import com.android.settings.print.PrintSettingPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.uwb.UwbPreferenceController;
@@ -112,17 +110,6 @@
}
@Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = super.getNonIndexableKeys(context);
- PackageManager pm = context.getPackageManager();
- if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
- keys.add(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
- }
-
- return keys;
- }
-
- @Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildControllers(context, null /* lifecycle */);
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 149d1f4..ff4b47f 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -141,7 +141,6 @@
import com.android.settings.network.telephony.MobileNetworkSettings;
import com.android.settings.network.telephony.NetworkSelectSettings;
import com.android.settings.network.tether.TetherSettings;
-import com.android.settings.nfc.AndroidBeam;
import com.android.settings.nfc.PaymentSettings;
import com.android.settings.notification.ConfigureNotificationSettings;
import com.android.settings.notification.NotificationAccessSettings;
@@ -258,7 +257,6 @@
PrivateVolumeForget.class.getName(),
PublicVolumeSettings.class.getName(),
DevelopmentSettingsDashboardFragment.class.getName(),
- AndroidBeam.class.getName(),
WifiDisplaySettings.class.getName(),
PowerUsageSummary.class.getName(),
AccountSyncSettings.class.getName(),
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
index b3af95e..992136c 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java
@@ -57,6 +57,10 @@
@VisibleForTesting
static final String PROPERTY_PERSISTENT_GRAPHICS_EGL = "persist.graphics.egl";
+ @VisibleForTesting
+ static final String PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION =
+ "debug.graphics.angle.developeroption.enable";
+
@VisibleForTesting static final String ANGLE_DRIVER_SUFFIX = "angle";
@VisibleForTesting
@@ -72,6 +76,11 @@
public void set(String key, String val) {
SystemProperties.set(key, val);
}
+
+ @Override
+ public boolean getBoolean(String key, boolean def) {
+ return SystemProperties.getBoolean(key, def);
+ }
};
}
}
@@ -81,6 +90,13 @@
this(context, fragment, new Injector());
}
+ // Return true if the ANGLE developer option entry point is enabled.
+ // This can be enabled by calling:
+ // `adb shell setprop debug.graphics.angle.developeroption.enable true`
+ private boolean isAngleDeveloperOptionEnabled() {
+ return mSystemProperties.getBoolean(PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION, false);
+ }
+
private boolean isAngleSupported() {
return TextUtils.equals(
mSystemProperties.get(PROPERTY_RO_GFX_ANGLE_SUPPORTED, ""), "true");
@@ -96,6 +112,10 @@
// Exception is when user chooses to reboot now, the switch should keep its current value
// and persist its' state over reboot.
mShouldToggleSwitchBackOnRebootDialogDismiss = true;
+ final String persistGraphicsEglValue =
+ mSystemProperties.get(PROPERTY_PERSISTENT_GRAPHICS_EGL, "");
+ Log.v(TAG, "Value of " + PROPERTY_PERSISTENT_GRAPHICS_EGL + " is: "
+ + persistGraphicsEglValue);
}
@Override
@@ -149,6 +169,13 @@
mPreference.setEnabled(false);
((SwitchPreference) mPreference).setChecked(false);
}
+
+ // Disable the developer option toggle UI if ANGLE is disabled, this means next time the
+ // debug property needs to be set to true again to enable ANGLE. If ANGLE is enabled, don't
+ // disable the developer option toggle UI so that it can be turned off easily.
+ if (!isAngleDeveloperOptionEnabled() && !((SwitchPreference) mPreference).isChecked()) {
+ mPreference.setEnabled(false);
+ }
}
@Override
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java
index 549cd81..9684282 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java
@@ -41,4 +41,13 @@
* SELinux. libc will log the underlying reason.
*/
void set(@NonNull String key, @Nullable String val);
+
+ /**
+ * Get the boolean value for the given {@code key}.
+ *
+ * @param key the key to lookup
+ * @param def the default value in case the property is not set or empty
+ * @return if the {@code key} isn't found, return {@code def}.
+ */
+ boolean getBoolean(@NonNull String key, @NonNull boolean def);
}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index f65dd24..1e0c184 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -30,6 +30,7 @@
import android.view.View;
import android.widget.Toast;
+import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -97,10 +98,19 @@
@Override
public void onNavigateNext(View view) {
// Ensure that all users are unlocked so that we can move their data
+ final LockPatternUtils lpu = new LockPatternUtils(this);
if (StorageManager.isFileEncrypted()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
- if (!StorageManager.isUserKeyUnlocked(user.id)) {
- Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
+ if (StorageManager.isUserKeyUnlocked(user.id)) {
+ continue;
+ }
+ if (!lpu.isSecure(user.id)) {
+ Log.d(TAG, "Unsecured user " + user.id + " is currently locked; attempting "
+ + "automatic unlock");
+ lpu.unlockUserKeyIfUnsecured(user.id);
+ } else {
+ Log.d(TAG, "Secured user " + user.id + " is currently locked; requesting "
+ + "manual unlock");
final CharSequence description = TextUtils.expandTemplate(
getText(R.string.storage_wizard_move_unlock), user.name);
final ChooseLockSettingsHelper.Builder builder =
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
index da96104..bf16ab0 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -33,6 +33,7 @@
import android.view.View;
import com.android.internal.util.Preconditions;
+import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -79,10 +80,19 @@
@Override
public void onNavigateNext(View view) {
// Ensure that all users are unlocked so that we can move their data
+ final LockPatternUtils lpu = new LockPatternUtils(this);
if (StorageManager.isFileEncrypted()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
- if (!StorageManager.isUserKeyUnlocked(user.id)) {
- Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
+ if (StorageManager.isUserKeyUnlocked(user.id)) {
+ continue;
+ }
+ if (!lpu.isSecure(user.id)) {
+ Log.d(TAG, "Unsecured user " + user.id + " is currently locked; attempting "
+ + "automatic unlock");
+ lpu.unlockUserKeyIfUnsecured(user.id);
+ } else {
+ Log.d(TAG, "Secured user " + user.id + " is currently locked; requesting "
+ + "manual unlock");
final CharSequence description = TextUtils.expandTemplate(
getText(R.string.storage_wizard_move_unlock), user.name);
final ChooseLockSettingsHelper.Builder builder =
diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
index 3dc3ab5..9892f0d 100644
--- a/src/com/android/settings/network/EraseEuiccDataController.java
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -18,10 +18,12 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import android.os.UserManager;
import android.text.TextUtils;
import androidx.preference.Preference;
+import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.telephony.MobileNetworkUtils;
@@ -33,8 +35,11 @@
public class EraseEuiccDataController extends BasePreferenceController {
private ResetDashboardFragment mHostFragment;
+ private final UserManager mUm;
+
public EraseEuiccDataController(Context context, String preferenceKey) {
super(context, preferenceKey);
+ mUm = context.getSystemService(UserManager.class);
}
public void setFragment(ResetDashboardFragment hostFragment) {
@@ -52,10 +57,12 @@
@Override
public int getAvailabilityStatus() {
- return SubscriptionUtil.isSimHardwareVisible(mContext) &&
- (!MobileNetworkUtils.isMobileNetworkUserRestricted(mContext)) &&
- mContext.getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE
- : UNSUPPORTED_ON_DEVICE;
+ boolean isAllowedUser = (mUm.isAdminUser() || Utils.isDemoUser(mContext))
+ && !MobileNetworkUtils.isMobileNetworkUserRestricted(mContext);
+ boolean hasEuiccFeature = mContext.getPackageManager().hasSystemFeature(
+ PackageManager.FEATURE_TELEPHONY_EUICC);
+ return SubscriptionUtil.isSimHardwareVisible(mContext)
+ && isAllowedUser
+ && hasEuiccFeature ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
}
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
deleted file mode 100644
index b1fcd57..0000000
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.nfc;
-
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.nfc.NfcAdapter;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
-import com.android.settings.widget.SettingsMainSwitchBar;
-import com.android.settingslib.HelpUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.widget.OnMainSwitchChangeListener;
-
-public class AndroidBeam extends InstrumentedFragment
- implements OnMainSwitchChangeListener {
- private View mView;
- private NfcAdapter mNfcAdapter;
- private SettingsMainSwitchBar mSwitchBar;
- private CharSequence mOldActivityTitle;
- private boolean mBeamDisallowedByBase;
- private boolean mBeamDisallowedByOnlyAdmin;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- final Context context = getActivity();
- mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
- final PackageManager pm = context.getPackageManager();
- if (mNfcAdapter == null || !pm.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM))
- getActivity().finish();
- setHasOptionsMenu(true);
- }
-
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- super.onCreateOptionsMenu(menu, inflater);
- HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_beam,
- getClass().getName());
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
- getActivity(), UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
- final UserManager um = UserManager.get(getActivity());
- mBeamDisallowedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
- UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
- if (!mBeamDisallowedByBase && admin != null) {
- new ActionDisabledByAdminDialogHelper(getActivity())
- .prepareDialogBuilder(UserManager.DISALLOW_OUTGOING_BEAM, admin).show();
- mBeamDisallowedByOnlyAdmin = true;
- return new View(getContext());
- }
- mView = inflater.inflate(R.layout.preference_footer, container, false);
-
- ImageView iconInfo = mView.findViewById(android.R.id.icon);
- iconInfo.setImageResource(R.drawable.ic_info_outline_24dp);
- TextView textInfo = mView.findViewById(android.R.id.title);
- textInfo.setText(R.string.android_beam_explained);
-
- return mView;
- }
-
- @Override
- public void onActivityCreated(Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
- SettingsActivity activity = (SettingsActivity) getActivity();
-
- mOldActivityTitle = activity.getActionBar().getTitle();
-
- mSwitchBar = activity.getSwitchBar();
- if (mBeamDisallowedByOnlyAdmin) {
- mSwitchBar.hide();
- } else {
- mSwitchBar.setChecked(!mBeamDisallowedByBase && mNfcAdapter.isNdefPushEnabled());
- mSwitchBar.addOnSwitchChangeListener(this);
- mSwitchBar.setEnabled(!mBeamDisallowedByBase);
- mSwitchBar.show();
- }
-
- activity.setTitle(R.string.android_beam_settings_title);
- }
-
- @Override
- public void onDestroyView() {
- super.onDestroyView();
- if (mOldActivityTitle != null) {
- getActivity().getActionBar().setTitle(mOldActivityTitle);
- }
- if (!mBeamDisallowedByOnlyAdmin) {
- mSwitchBar.removeOnSwitchChangeListener(this);
- mSwitchBar.hide();
- }
- }
-
- @Override
- public void onSwitchChanged(Switch switchView, boolean desiredState) {
- boolean success = false;
- mSwitchBar.setEnabled(false);
- if (desiredState) {
- success = mNfcAdapter.enableNdefPush();
- } else {
- success = mNfcAdapter.disableNdefPush();
- }
- if (success) {
- mSwitchBar.setChecked(desiredState);
- }
- mSwitchBar.setEnabled(true);
- }
-
- @Override
- public int getMetricsCategory() {
- return SettingsEnums.NFC_BEAM;
- }
-}
diff --git a/src/com/android/settings/nfc/AndroidBeamEnabler.java b/src/com/android/settings/nfc/AndroidBeamEnabler.java
deleted file mode 100644
index 31ef702..0000000
--- a/src/com/android/settings/nfc/AndroidBeamEnabler.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.nfc;
-
-import android.content.Context;
-import android.nfc.NfcAdapter;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.settings.R;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.RestrictedPreference;
-
-/**
- * AndroidBeanEnabler is a helper to manage the Android Beam preference. It turns on/off
- * Android Beam and ensures the summary of the preference reflects the current state.
- */
-public class AndroidBeamEnabler extends BaseNfcEnabler {
- private final boolean mBeamDisallowedBySystem;
- private final RestrictedPreference mPreference;
-
- public AndroidBeamEnabler(Context context, RestrictedPreference preference) {
- super(context);
- mPreference = preference;
- mBeamDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(context,
- UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
- if (!isNfcAvailable()) {
- // NFC is not supported
- mPreference.setEnabled(false);
- return;
- }
- if (mBeamDisallowedBySystem) {
- mPreference.setEnabled(false);
- }
- }
-
- @Override
- protected void handleNfcStateChanged(int newState) {
- switch (newState) {
- case NfcAdapter.STATE_OFF:
- mPreference.setEnabled(false);
- mPreference.setSummary(R.string.nfc_disabled_summary);
- break;
- case NfcAdapter.STATE_ON:
- if (mBeamDisallowedBySystem) {
- mPreference.setDisabledByAdmin(null);
- mPreference.setEnabled(false);
- } else {
- mPreference.checkRestrictionAndSetDisabled(UserManager.DISALLOW_OUTGOING_BEAM);
- }
- if (mNfcAdapter.isNdefPushEnabled() && mPreference.isEnabled()) {
- mPreference.setSummary(R.string.android_beam_on_summary);
- } else {
- mPreference.setSummary(R.string.android_beam_off_summary);
- }
- break;
- case NfcAdapter.STATE_TURNING_ON:
- mPreference.setEnabled(false);
- break;
- case NfcAdapter.STATE_TURNING_OFF:
- mPreference.setEnabled(false);
- break;
- }
- }
-}
diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
deleted file mode 100644
index 15c15aa..0000000
--- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.nfc;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.nfc.NfcAdapter;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-
-public class AndroidBeamPreferenceController extends BasePreferenceController
- implements LifecycleObserver, OnResume, OnPause {
-
- public static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
- private final NfcAdapter mNfcAdapter;
- private AndroidBeamEnabler mAndroidBeamEnabler;
-
- public AndroidBeamPreferenceController(Context context, String key) {
- super(context, key);
- mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- if (!isAvailable()) {
- mAndroidBeamEnabler = null;
- return;
- }
-
- final RestrictedPreference restrictedPreference = screen.findPreference(getPreferenceKey());
- mAndroidBeamEnabler = new AndroidBeamEnabler(mContext, restrictedPreference);
- }
-
- @Override
- @AvailabilityStatus
- public int getAvailabilityStatus() {
- PackageManager pm = mContext.getPackageManager();
- if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)) {
- return UNSUPPORTED_ON_DEVICE;
- }
- return mNfcAdapter != null
- ? AVAILABLE
- : UNSUPPORTED_ON_DEVICE;
- }
-
- @Override
- public void onResume() {
- if (mAndroidBeamEnabler != null) {
- mAndroidBeamEnabler.resume();
- }
- }
-
- @Override
- public void onPause() {
- if (mAndroidBeamEnabler != null) {
- mAndroidBeamEnabler.pause();
- }
- }
-}
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index a91bb6c..e9b6a4e 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -142,6 +142,11 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
+
+ if (!getContext().getResources().getBoolean(R.bool.config_show_vpn_options)) {
+ return;
+ }
+
// Although FEATURE_IPSEC_TUNNELS should always be present in android S and beyond,
// keep this check here just to be safe.
if (!getContext().getPackageManager().hasSystemFeature(
diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp
index f17f4b2..0b05e04 100644
--- a/tests/anomaly-tester/Android.bp
+++ b/tests/anomaly-tester/Android.bp
@@ -18,7 +18,7 @@
"androidx.test.rules",
"mockito-target",
"androidx.test.uiautomator_uiautomator",
- "truth-prebuilt",
+ "truth",
],
srcs: ["**/*.java"],
diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp
index 5c03aa9..300a338 100644
--- a/tests/componenttests/Android.bp
+++ b/tests/componenttests/Android.bp
@@ -19,7 +19,7 @@
],
static_libs: [
- "truth-prebuilt",
+ "truth",
"androidx.test.core",
"androidx.test.espresso.core",
"androidx.test.espresso.intents-nodeps",
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 94febff..ad8361e 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -1,4 +1,4 @@
- //############################################################
+//############################################################
// Build SettingsRoboTestStub.apk which includes test-only resources.#
//############################################################
@@ -47,7 +47,7 @@
"jsr305",
"settings-contextual-card-protos-lite",
"settings-log-bridge-protos-lite",
- "settings-telephony-protos-lite",
+ "settings-telephony-protos-lite",
"contextualcards",
"settings-logtags",
"zxing-core-1.7",
@@ -90,7 +90,10 @@
"ims-common",
],
- java_resource_dirs: ["config", "resources"],
+ java_resource_dirs: [
+ "config",
+ "resources",
+ ],
instrumentation_for: "SettingsRoboTestStub",
@@ -114,6 +117,6 @@
"Settings-core",
"Robolectric_all-target",
"mockito-robolectric-prebuilt",
- "truth-prebuilt",
+ "truth",
],
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
index aed3787..107d77c 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
@@ -23,7 +23,6 @@
import android.nfc.NfcAdapter;
import android.provider.SearchIndexableResource;
-import com.android.settings.nfc.AndroidBeamPreferenceController;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -78,14 +77,4 @@
public void testGetCategoryKey_returnCategoryDevice() {
assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE);
}
-
- @Test
- public void testSearchIndexProvider_correctNonIndexables() {
- mShadowNfcAdapter.setSecureNfcSupported(true);
- final List<String> niks =
- AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(mContext);
-
- assertThat(niks).contains(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
- }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerTest.java
index 9210b87..249acf5 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development.graphicsdriver;
import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.ANGLE_DRIVER_SUFFIX;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION;
import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_PERSISTENT_GRAPHICS_EGL;
import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_RO_GFX_ANGLE_SUPPORTED;
@@ -67,6 +68,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
+ ShadowSystemProperties.override(PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION, "true");
doReturn(mTransaction).when(mFragmentManager).beginTransaction();
doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager();
doReturn(mActivity).when(mFragment).getActivity();
diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
deleted file mode 100644
index 7e15618..0000000
--- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.nfc;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcManager;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.shadow.ShadowNfcAdapter;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadow.api.Shadow;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowNfcAdapter.class)
-public class AndroidBeamPreferenceControllerTest {
-
- Context mContext;
- @Mock
- NfcManager mNfcManager;
- @Mock
- private UserManager mUserManager;
- @Mock
- private PreferenceScreen mScreen;
- @Mock
- private PackageManager mPackageManager;
-
- private RestrictedPreference mAndroidBeamPreference;
- private AndroidBeamPreferenceController mAndroidBeamController;
- private ShadowNfcAdapter mShadowNfcAdapter;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- mShadowNfcAdapter = Shadow.extract(NfcAdapter.getDefaultAdapter(mContext));
-
- when(mContext.getApplicationContext()).thenReturn(mContext);
- when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- when(mContext.getSystemService(Context.NFC_SERVICE)).thenReturn(mNfcManager);
- when(RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
- UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId())).thenReturn(false);
-
- mAndroidBeamController = new AndroidBeamPreferenceController(mContext,
- AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
- mAndroidBeamPreference = new RestrictedPreference(RuntimeEnvironment.application);
- when(mScreen.findPreference(mAndroidBeamController.getPreferenceKey())).thenReturn(
- mAndroidBeamPreference);
- when(mContext.getPackageManager()).thenReturn(mPackageManager);
- when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)).thenReturn(true);
-
- Settings.Global.putString(mContext.getContentResolver(),
- Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS,
- Settings.Global.RADIO_NFC);
- Settings.Global.putInt(mContext.getContentResolver(),
- Settings.Global.AIRPLANE_MODE_ON,
- 0);
- mAndroidBeamController.displayPreference(mScreen);
- }
-
- @Test
- public void isAvailable_hasNfc_shouldReturnTrue() {
- mShadowNfcAdapter.setEnabled(true);
- assertThat(mAndroidBeamController.isAvailable()).isTrue();
- }
-
- @Test
- public void isAvailable_noNfcFeature_shouldReturnFalse() {
- mShadowNfcAdapter.setEnabled(true);
- when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)).thenReturn(false);
- assertThat(mAndroidBeamController.isAvailable()).isFalse();
- }
-
- @Test
- public void isAvailable_noNfcAdapter_shouldReturnFalse() {
- ReflectionHelpers.setField(mAndroidBeamController, "mNfcAdapter", null);
- assertThat(mAndroidBeamController.isAvailable()).isFalse();
- }
-
- @Test
- public void isBeamEnable_disAllowBeam_shouldReturnFalse() {
- mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_OFF);
-
- when(RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
- UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId())).thenReturn(true);
- mAndroidBeamController.displayPreference(mScreen);
-
- assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
- }
-
- @Test
- public void isBeamEnable_nfcStateOn_shouldReturnTrue() {
- mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_ON);
- try {
- mAndroidBeamController.onResume();
- } catch (NullPointerException e) {
- // skip because it's just test
- // it will meet NullPointerException in checkRestrictionAndSetDisabled
- }
- assertThat(mAndroidBeamPreference.isEnabled()).isTrue();
- }
-
- @Test
- public void isBeamEnable_nfcStateNotOn_shouldReturnFalse() {
- mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_OFF);
- mAndroidBeamController.onResume();
- assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
-
- mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_TURNING_ON);
- mAndroidBeamController.onResume();
- assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
-
- mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_TURNING_OFF);
- mAndroidBeamController.onResume();
- assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
- }
-
- @Test
- public void updateNonIndexableKeys_available_shouldNotUpdate() {
- mShadowNfcAdapter.setEnabled(true);
- final List<String> keys = new ArrayList<>();
-
- mAndroidBeamController.updateNonIndexableKeys(keys);
-
- assertThat(keys).isEmpty();
- }
-
- @Test
- public void updateNonIndexableKeys_notAvailable_shouldUpdate() {
- ReflectionHelpers.setField(mAndroidBeamController, "mNfcAdapter", null);
- final List<String> keys = new ArrayList<>();
-
- mAndroidBeamController.updateNonIndexableKeys(keys);
-
- assertThat(keys).hasSize(1);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
index f24b295..9afcd37 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
@@ -46,7 +46,6 @@
private static Map<Integer, PasswordMetrics> sUserToMetricsMap = new HashMap<>();
private static Map<Integer, PasswordMetrics> sUserToProfileMetricsMap = new HashMap<>();
private static Map<Integer, Boolean> sUserToIsSecureMap = new HashMap<>();
- private static Map<Integer, Boolean> sUserToPatternEverChosenMap = new HashMap<>();
private static Map<Integer, Boolean> sUserToVisiblePatternEnabledMap = new HashMap<>();
private static Map<Integer, Boolean> sUserToBiometricAllowedMap = new HashMap<>();
private static Map<Integer, Boolean> sUserToLockPatternEnabledMap = new HashMap<>();
@@ -61,7 +60,6 @@
sUserToMetricsMap.clear();
sUserToProfileMetricsMap.clear();
sUserToIsSecureMap.clear();
- sUserToPatternEverChosenMap.clear();
sUserToVisiblePatternEnabledMap.clear();
sUserToBiometricAllowedMap.clear();
sUserToLockPatternEnabledMap.clear();
@@ -162,15 +160,6 @@
}
@Implementation
- public boolean isPatternEverChosen(int userId) {
- return sUserToPatternEverChosenMap.getOrDefault(userId, true);
- }
-
- public static void setIsPatternEverChosen(int userId, boolean isPatternEverChosen) {
- sUserToPatternEverChosenMap.put(userId, isPatternEverChosen);
- }
-
- @Implementation
public boolean isBiometricAllowedForUser(int userId) {
return sUserToBiometricAllowedMap.getOrDefault(userId, false);
}
diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp
index d4f09a3..5e83dbc 100644
--- a/tests/uitests/Android.bp
+++ b/tests/uitests/Android.bp
@@ -43,7 +43,7 @@
"settings-helper",
"sysui-helper",
"timeresult-helper-lib",
- "truth-prebuilt",
+ "truth",
],
//sdk_version: "current",
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 8e81218..e0dd078 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -30,14 +30,14 @@
"androidx.preference_preference",
"mockito-target-minus-junit4",
"platform-test-annotations",
- "truth-prebuilt",
+ "truth",
"androidx.test.uiautomator_uiautomator",
// Don't add SettingsLib libraries here - you can use them directly as they are in the
// instrumented Settings app.
],
errorprone: {
- javacflags: ["-Xep:CheckReturnValue:WARN"]
+ javacflags: ["-Xep:CheckReturnValue:WARN"],
},
// Include all test java files.
diff --git a/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java b/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java
index ae35431..a402d91 100644
--- a/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java
+++ b/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java
@@ -18,12 +18,16 @@
import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.ANGLE_DRIVER_SUFFIX;
import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.Injector;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION;
import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_PERSISTENT_GRAPHICS_EGL;
import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_RO_GFX_ANGLE_SUPPORTED;
import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;
@@ -98,6 +102,8 @@
}
mContext = ApplicationProvider.getApplicationContext();
+ when(mSystemPropertiesMock.getBoolean(eq(PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION),
+ anyBoolean())).thenReturn(true);
// Construct a GraphicsDriverEnableAngleAsSystemDriverController with two Overrides:
// 1) Override the mSystemProperties with mSystemPropertiesMock,
@@ -468,4 +474,27 @@
SystemProperties.removeChangeCallback(propertyChangeSignal1.getCountDownJob());
SystemProperties.removeChangeCallback(propertyChangeSignal2.getCountDownJob());
}
+
+ @Test
+ public void updateState_DeveloperOptionPropertyIsFalse() {
+ // Test that when debug.graphics.angle.developeroption.enable is false:
+ when(mSystemPropertiesMock.getBoolean(eq(PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION),
+ anyBoolean())).thenReturn(false);
+ when(mSystemPropertiesMock.get(eq(PROPERTY_RO_GFX_ANGLE_SUPPORTED), any()))
+ .thenReturn("true");
+
+ // 1. "Enable ANGLE" switch is on, the switch should be enabled.
+ when(mSystemPropertiesMock.get(eq(PROPERTY_PERSISTENT_GRAPHICS_EGL), any()))
+ .thenReturn(ANGLE_DRIVER_SUFFIX);
+ mController.updateState(mPreference);
+ assertTrue(mPreference.isChecked());
+ assertTrue(mPreference.isEnabled());
+
+ // 2. "Enable ANGLE" switch is off, the switch should be disabled.
+ when(mSystemPropertiesMock.get(eq(PROPERTY_PERSISTENT_GRAPHICS_EGL), any()))
+ .thenReturn("");
+ mController.updateState(mPreference);
+ assertFalse(mPreference.isChecked());
+ assertFalse(mPreference.isEnabled());
+ }
}