Merge "Change dialog text styles"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e71f4a..29f69b8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -932,8 +932,7 @@
<activity
android:name="Settings$ManageApplicationsActivity"
- android:label="@string/applications_settings"
- android:parentActivityName="Settings">
+ android:label="@string/applications_settings">
<intent-filter android:priority="1">
<action android:name="android.settings.APPLICATION_SETTINGS" />
<action android:name="android.settings.MANAGE_APPLICATIONS_SETTINGS" />
@@ -1306,8 +1305,7 @@
<activity
android:name="Settings$UsageAccessSettingsActivity"
- android:label="@string/usage_access_title"
- android:parentActivityName="Settings">
+ android:label="@string/usage_access_title">
<intent-filter android:priority="1">
<action android:name="android.settings.USAGE_ACCESS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1362,6 +1360,20 @@
android:value="true" />
</activity>
+ <activity
+ android:name="Settings$AccessibilityDetailsSettingsActivity"
+ android:label="@string/accessibility_settings"
+ android:permission="android.permission.OPEN_ACCESSIBILITY_DETAILS_SETTINGS">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.ACCESSIBILITY_DETAILS_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.accessibility.AccessibilityDetailsSettingsFragment" />
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
+
<activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
android:icon="@drawable/ic_accessibility_suggestion"
android:label="@string/vision_settings_title"
diff --git a/res/drawable/ic_account_circle_24dp.xml b/res/drawable/ic_account_circle_24dp.xml
index 8445adc..f41f579 100644
--- a/res/drawable/ic_account_circle_24dp.xml
+++ b/res/drawable/ic_account_circle_24dp.xml
@@ -17,11 +17,12 @@
android:width="32dp"
android:height="32dp"
android:viewportWidth="24"
- android:viewportHeight="24">
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorAccent">
<path
- android:fillColor="#ff4285f4"
+ android:fillColor="#FF000000"
android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20S8.43,19.36 7.07,18.28zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,13.82 19.38,15.49 18.36,16.83z"/>
<path
- android:fillColor="#ff4285f4"
+ android:fillColor="#FF000000"
android:pathData="M12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13c1.94,0 3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5C10.5,8.67 11.17,8 12,8c0.83,0 1.5,0.67 1.5,1.5C13.5,10.33 12.83,11 12,11z"/>
</vector>
diff --git a/res/layout/homepage_dismissal_view.xml b/res/layout/homepage_dismissal_view.xml
index 4295ff6..20c657e 100644
--- a/res/layout/homepage_dismissal_view.xml
+++ b/res/layout/homepage_dismissal_view.xml
@@ -37,20 +37,20 @@
android:gravity="bottom|end">
<Button
- android:id="@+id/remove"
+ android:id="@+id/keep"
style="@style/ContextualCardDismissalButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/contextual_card_dismiss_remove"/>
+ android:text="@string/contextual_card_dismiss_keep"/>
<Button
- android:id="@+id/keep"
+ android:id="@+id/remove"
style="@style/ContextualCardDismissalButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/homepage_card_dismissal_button_margin_start"
android:layout_marginEnd="@dimen/homepage_card_dismissal_button_margin_end"
- android:text="@string/contextual_card_dismiss_keep"/>
+ android:text="@string/contextual_card_dismiss_remove"/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index beeac0c..e6ada66 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -330,6 +330,9 @@
<!-- Whether device_model should be shown or not. -->
<bool name="config_show_device_model">true</bool>
+ <!-- Whether top_level_accessibility should be shown or not. -->
+ <bool name="config_show_top_level_accessibility">true</bool>
+
<!-- Whether top_level_battery should be shown or not. -->
<bool name="config_show_top_level_battery">true</bool>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0789a95..0d6eaeb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1859,7 +1859,7 @@
<!-- This string asks the user whether or not to allow an app to disable WiFi. [CHAR LIMIT=NONE] -->
<string name="wifi_ask_disable"><xliff:g id="requester" example="FancyApp">%s</xliff:g> wants to turn off Wi-Fi</string>
- <!-- Debugging developer settings: Enable ART verifier for Debuggable Apps [CHAR LIMIT=40] -->
+ <!-- Debugging developer settings: Enable ART verifier for Debuggable Apps [CHAR LIMIT=67] -->
<string name="art_verifier_for_debuggable_title">Verify bytecode of debuggable apps</string>
<!-- Debugging developer settings: Enable ART verifier for Debuggable Apps [CHAR LIMIT=NONE] -->
<string name="art_verifier_for_debuggable_summary">Allow ART to verify bytecode for debuggable apps</string>
@@ -2107,7 +2107,7 @@
<string name="wifi_ip_settings">IP settings</string>
<!-- Label for the spinner to show Wifi MAC randomization [CHAR LIMIT=25] -->
<string name="wifi_privacy_settings">Privacy</string>
- <!-- Summary for Wifi MAC randomization option when it is ephemeral network [CHAR LIMIT=25] -->
+ <!-- Summary for Wifi MAC randomization option when it is ephemeral network [CHAR LIMIT=40] -->
<string name="wifi_privacy_settings_ephemeral_summary">Randomized MAC</string>
<!-- Title for the fragment to add a device into the wifi network [CHAR LIMIT=50] -->
<string name="wifi_dpp_add_device_to_network">Add a device</string>
@@ -7092,8 +7092,8 @@
<!-- Search keyword for face settings. -->
<string name="keywords_face_settings">face</string>
- <!-- Search keyword for fingerprint settings. -->
- <string name="keywords_fingerprint_settings">fingerprint</string>
+ <!-- Search keyword for fingerprint settings. [CHAR_LIMIT=NONE]-->
+ <string name="keywords_fingerprint_settings">fingerprint, add fingerprint</string>
<!-- Search keywords for adaptive brightness setting [CHAR LIMIT=NONE]-->
<string name="keywords_display_auto_brightness">dim screen, touchscreen, battery, smart brightness, dynamic brightness</string>
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 9f4f902..64b620a 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -123,7 +123,8 @@
android:summary="@string/accessibility_settings_summary"
android:icon="@drawable/ic_homepage_accessibility"
android:order="-20"
- android:fragment="com.android.settings.accessibility.AccessibilitySettings"/>
+ android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+ settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
<Preference
android:key="top_level_system"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 7565dd8..fac4253 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -62,6 +62,7 @@
public static class StorageUseActivity extends SettingsActivity { /* empty */ }
public static class DevelopmentSettingsDashboardActivity extends SettingsActivity { /* empty */ }
public static class AccessibilitySettingsActivity extends SettingsActivity { /* empty */ }
+ public static class AccessibilityDetailsSettingsActivity extends SettingsActivity { /* empty */ }
public static class CaptioningSettingsActivity extends SettingsActivity { /* empty */ }
public static class AccessibilityInversionSettingsActivity extends SettingsActivity { /* empty */ }
public static class AccessibilityContrastSettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 69b8c56..a93fb76 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -98,6 +98,8 @@
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.util.ArrayUtils;
import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.development.featureflags.FeatureFlagPersistent;
import com.android.settings.password.ChooseLockSettingsHelper;
import java.net.InetAddress;
@@ -513,6 +515,9 @@
* TODO: See bug 16533525.
*/
public static boolean showSimCardTile(Context context) {
+ if (FeatureFlagPersistent.isEnabled(context, FeatureFlags.NETWORK_INTERNET_V2)) {
+ return false;
+ }
final TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
diff --git a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
new file mode 100644
index 0000000..dc07ef0
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2019 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.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+import android.app.settings.SettingsEnums;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.accessibility.AccessibilityUtils;
+
+import java.util.List;
+import java.util.Set;
+
+public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
+
+ private final static String TAG = "A11yDetailsSettings";
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.ACCESSIBILITY_DETAILS_SETTINGS;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ // In case the Intent doesn't have component name, go to a11y services list.
+ final String extraComponentName = getActivity().getIntent().getStringExtra(
+ Intent.EXTRA_COMPONENT_NAME);
+ if (extraComponentName == null) {
+ Log.w(TAG, "Open accessibility services list due to no component name.");
+ openAccessibilitySettingsAndFinish();
+ return;
+ }
+
+ // In case the A11yServiceInfo doesn't exist, go to ally services list.
+ final ComponentName componentName = ComponentName.unflattenFromString(extraComponentName);
+ final AccessibilityServiceInfo info = getAccessibilityServiceInfo(componentName);
+ if (info == null) {
+ Log.w(TAG, "Open accessibility services list due to invalid component name.");
+ openAccessibilitySettingsAndFinish();
+ return;
+ }
+
+ // In case this accessibility service isn't permitted, go to a11y services list.
+ if (!isServiceAllowed(componentName.getPackageName())) {
+ Log.w(TAG,
+ "Open accessibility services list due to target accessibility service is "
+ + "prohibited by Device Admin.");
+ openAccessibilitySettingsAndFinish();
+ return;
+ }
+
+ openAccessibilityDetailsSettingsAndFinish(buildArguments(info));
+ }
+
+ @VisibleForTesting
+ void openAccessibilitySettingsAndFinish() {
+ new SubSettingLauncher(getActivity())
+ .setDestination(AccessibilitySettings.class.getName())
+ .setSourceMetricsCategory(getMetricsCategory())
+ .launch();
+ finish();
+ }
+
+ @VisibleForTesting
+ void openAccessibilityDetailsSettingsAndFinish(Bundle arguments) {
+ new SubSettingLauncher(getActivity())
+ .setDestination(ToggleAccessibilityServicePreferenceFragment.class.getName())
+ .setSourceMetricsCategory(getMetricsCategory())
+ .setArguments(arguments)
+ .launch();
+ finish();
+ }
+
+ @VisibleForTesting
+ boolean isServiceAllowed(String packageName) {
+ final DevicePolicyManager dpm = getContext().getSystemService(DevicePolicyManager.class);
+ final List<String> permittedServices = dpm.getPermittedAccessibilityServices(
+ UserHandle.myUserId());
+ return (permittedServices == null || permittedServices.contains(packageName));
+ }
+
+ private AccessibilityServiceInfo getAccessibilityServiceInfo(ComponentName componentName) {
+ if (componentName == null) {
+ return null;
+ }
+
+ final List<AccessibilityServiceInfo> serviceInfos = AccessibilityManager.getInstance(
+ getActivity()).getInstalledAccessibilityServiceList();
+ final int serviceInfoCount = serviceInfos.size();
+ for (int i = 0; i < serviceInfoCount; i++) {
+ AccessibilityServiceInfo serviceInfo = serviceInfos.get(i);
+ ResolveInfo resolveInfo = serviceInfo.getResolveInfo();
+ if (componentName.getPackageName().equals(resolveInfo.serviceInfo.packageName)
+ && componentName.getClassName().equals(resolveInfo.serviceInfo.name)) {
+ return serviceInfo;
+ }
+ }
+ return null;
+ }
+
+ private Bundle buildArguments(AccessibilityServiceInfo info) {
+ final ResolveInfo resolveInfo = info.getResolveInfo();
+ final String title = resolveInfo.loadLabel(getActivity().getPackageManager()).toString();
+ final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
+ final String packageName = serviceInfo.packageName;
+ final ComponentName componentName = new ComponentName(packageName, serviceInfo.name);
+
+ final List<AccessibilityServiceInfo> enabledServiceInfos = AccessibilityManager.getInstance(
+ getActivity()).getEnabledAccessibilityServiceList(
+ AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
+ final Set<ComponentName> enabledServices =
+ AccessibilityUtils.getEnabledServicesFromSettings(getActivity());
+ final boolean serviceEnabled = enabledServices.contains(componentName);
+ String description = info.loadDescription(getActivity().getPackageManager());
+ if (TextUtils.isEmpty(description)) {
+ description = getString(R.string.accessibility_service_default_description);
+ }
+
+ if (serviceEnabled && AccessibilityUtils.hasServiceCrashed(
+ packageName, serviceInfo.name, enabledServiceInfos)) {
+ // Update the summaries for services that have crashed.
+ description = getString(R.string.accessibility_description_state_stopped);
+ }
+
+ final Bundle extras = new Bundle();
+ extras.putString(AccessibilitySettings.EXTRA_PREFERENCE_KEY,
+ componentName.flattenToString());
+ extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED, serviceEnabled);
+ extras.putString(AccessibilitySettings.EXTRA_TITLE, title);
+ extras.putParcelable(AccessibilitySettings.EXTRA_RESOLVE_INFO, resolveInfo);
+ extras.putString(AccessibilitySettings.EXTRA_SUMMARY, description);
+
+ final String settingsClassName = info.getSettingsActivityName();
+ if (!TextUtils.isEmpty(settingsClassName)) {
+ extras.putString(AccessibilitySettings.EXTRA_SETTINGS_TITLE,
+ getString(R.string.accessibility_menu_item_settings));
+ extras.putString(AccessibilitySettings.EXTRA_SETTINGS_COMPONENT_NAME,
+ new ComponentName(packageName, settingsClassName).flattenToString());
+ }
+ extras.putParcelable(AccessibilitySettings.EXTRA_COMPONENT_NAME, componentName);
+
+ return extras;
+ }
+
+ private void finish() {
+ Activity activity = getActivity();
+ if (activity == null) {
+ return;
+ }
+ activity.finish();
+ }
+}
diff --git a/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java b/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java
new file mode 100644
index 0000000..41040a0
--- /dev/null
+++ b/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceController.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2019 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.accessibility;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class TopLevelAccessibilityPreferenceController extends BasePreferenceController {
+
+ public TopLevelAccessibilityPreferenceController(Context context,
+ String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mContext.getResources().getBoolean(R.bool.config_show_top_level_accessibility)
+ ? AVAILABLE_UNSEARCHABLE
+ : UNSUPPORTED_ON_DEVICE;
+ }
+}
+
diff --git a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java
index 648acad..5261daa 100644
--- a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java
@@ -106,6 +106,31 @@
}
}
+ private boolean hasVibrationEnabledSetting() {
+ return !TextUtils.isEmpty(getVibrationEnabledSetting());
+ }
+
+ private void updateSettings(VibrationIntensityCandidateInfo candidate) {
+ boolean vibrationEnabled = candidate.getIntensity() != Vibrator.VIBRATION_INTENSITY_OFF;
+ if (hasVibrationEnabledSetting()) {
+ // Update vibration enabled setting
+ boolean wasEnabled = Settings.System.getInt(getContext().getContentResolver(),
+ getVibrationEnabledSetting(), 1) == 1;
+ if (vibrationEnabled != wasEnabled) {
+ Settings.System.putInt(getContext().getContentResolver(),
+ getVibrationEnabledSetting(), vibrationEnabled ? 1 : 0);
+ }
+ }
+ // There are two conditions that need to change the intensity.
+ // First: Vibration is enabled and we are changing its strength.
+ // Second: There is no setting to enable this vibration, change the intensity directly.
+ if (vibrationEnabled || !hasVibrationEnabledSetting()) {
+ // Update vibration intensity setting
+ Settings.System.putInt(getContext().getContentResolver(),
+ getVibrationIntensitySetting(), candidate.getIntensity());
+ }
+ }
+
@Override
public void onDetach() {
super.onDetach();
@@ -185,11 +210,7 @@
Log.e(TAG, "Tried to set unknown intensity (key=" + key + ")!");
return false;
}
- if (candidate.getIntensity() != Vibrator.VIBRATION_INTENSITY_OFF ||
- TextUtils.isEmpty(getVibrationEnabledSetting())) {
- Settings.System.putInt(getContext().getContentResolver(),
- getVibrationIntensitySetting(), candidate.getIntensity());
- }
+ updateSettings(candidate);
onVibrationIntensitySelected(candidate.getIntensity());
return true;
}
diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
index b056b20..ca8dda3 100644
--- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
+++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
@@ -29,6 +29,8 @@
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import java.util.concurrent.Executor;
+
/*
* Abstract base controller for the default app shortcut preferences that launches the default app
* settings with the corresponding default app highlighted.
@@ -41,6 +43,8 @@
private final RoleManager mRoleManager;
+ private boolean mRoleVisible;
+
private boolean mAppQualified;
private PreferenceScreen mPreferenceScreen;
@@ -56,8 +60,13 @@
final PermissionControllerManager permissionControllerManager =
mContext.getSystemService(PermissionControllerManager.class);
- permissionControllerManager.isApplicationQualifiedForRole(mRoleName, mPackageName,
- mContext.getMainExecutor(), qualified -> {
+ final Executor executor = mContext.getMainExecutor();
+ permissionControllerManager.isRoleVisible(mRoleName, executor, visible -> {
+ mRoleVisible = visible;
+ refreshAvailability();
+ });
+ permissionControllerManager.isApplicationQualifiedForRole(mRoleName, mPackageName, executor,
+ qualified -> {
mAppQualified = qualified;
refreshAvailability();
});
@@ -85,7 +94,7 @@
if (mContext.getSystemService(UserManager.class).isManagedProfile()) {
return DISABLED_FOR_USER;
}
- return mAppQualified ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ return mRoleVisible && mAppQualified ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
diff --git a/src/com/android/settings/applications/appops/AppOpsState.java b/src/com/android/settings/applications/appops/AppOpsState.java
index 2686b8c..3c8d647 100644
--- a/src/com/android/settings/applications/appops/AppOpsState.java
+++ b/src/com/android/settings/applications/appops/AppOpsState.java
@@ -618,7 +618,7 @@
}
AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
- permOps.get(k), AppOpsManager.MODE_ALLOWED, 0, 0, 0, -1, null);
+ permOps.get(k), AppOpsManager.MODE_ALLOWED);
dummyOps.add(opEntry);
addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
packageName == null ? 0 : opToOrder[opEntry.getOp()]);
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 5e32e71..7abd98d 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -24,6 +24,7 @@
import com.android.settings.TestingSettings;
import com.android.settings.TetherSettings;
import com.android.settings.TrustedCredentialsSettings;
+import com.android.settings.accessibility.AccessibilityDetailsSettingsFragment;
import com.android.settings.accessibility.AccessibilitySettings;
import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
import com.android.settings.accessibility.CaptionPropertiesFragment;
@@ -178,6 +179,7 @@
UsageAccessDetails.class.getName(),
PrivacySettings.class.getName(),
DeviceAdminSettings.class.getName(),
+ AccessibilityDetailsSettingsFragment.class.getName(),
AccessibilitySettings.class.getName(),
AccessibilitySettingsForSetupWizard.class.getName(),
CaptionPropertiesFragment.class.getName(),
diff --git a/src/com/android/settings/network/SubscriptionsChangeListener.java b/src/com/android/settings/network/SubscriptionsChangeListener.java
index c3bb22b..1ecd770 100644
--- a/src/com/android/settings/network/SubscriptionsChangeListener.java
+++ b/src/com/android/settings/network/SubscriptionsChangeListener.java
@@ -59,7 +59,9 @@
mBroadcastReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
- subscriptionsChangedCallback();
+ if (!isInitialStickyBroadcast()) {
+ subscriptionsChangedCallback();
+ }
}
};
}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 3c0940d..47eb66b 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -85,7 +85,14 @@
setContentView(R.layout.mobile_network_settings_container);
}
setActionBar(findViewById(R.id.mobile_action_bar));
- mPhoneChangeReceiver = new PhoneChangeReceiver();
+ mPhoneChangeReceiver = new PhoneChangeReceiver(this, () -> {
+ if (mCurSubscriptionId != SUB_ID_NULL) {
+ // When the radio changes (ex: CDMA->GSM), refresh the fragment.
+ // This is very rare.
+ switchFragment(new MobileNetworkSettings(), mCurSubscriptionId,
+ true /* forceUpdate */);
+ }
+ });
mSubscriptionManager = getSystemService(SubscriptionManager.class);
mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList(true);
mCurSubscriptionId = savedInstanceState != null
@@ -103,16 +110,14 @@
@Override
protected void onStart() {
super.onStart();
- final IntentFilter intentFilter = new IntentFilter(
- TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
- registerReceiver(mPhoneChangeReceiver, intentFilter);
+ mPhoneChangeReceiver.register();
mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
}
@Override
protected void onStop() {
super.onStop();
- unregisterReceiver(mPhoneChangeReceiver);
+ mPhoneChangeReceiver.unregister();
mSubscriptionManager.removeOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
}
@@ -235,14 +240,35 @@
return MOBILE_SETTINGS_TAG + subscriptionId;
}
- private class PhoneChangeReceiver extends BroadcastReceiver {
+ @VisibleForTesting
+ static class PhoneChangeReceiver extends BroadcastReceiver {
+ private static final IntentFilter RADIO_TECHNOLOGY_CHANGED_FILTER = new IntentFilter(
+ TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
+
+ private Context mContext;
+ private Client mClient;
+
+ interface Client {
+ void onPhoneChange();
+ }
+
+ public PhoneChangeReceiver(Context context, Client client) {
+ mContext = context;
+ mClient = client;
+ }
+
+ public void register() {
+ mContext.registerReceiver(this, RADIO_TECHNOLOGY_CHANGED_FILTER);
+ }
+
+ public void unregister() {
+ mContext.unregisterReceiver(this);
+ }
+
@Override
public void onReceive(Context context, Intent intent) {
- // When the radio changes (ex: CDMA->GSM), refresh the fragment.
- // This is very rare to happen.
- if (mCurSubscriptionId != SUB_ID_NULL) {
- switchFragment(new MobileNetworkSettings(), mCurSubscriptionId,
- true /* forceUpdate */);
+ if (!isInitialStickyBroadcast()) {
+ mClient.onPhoneChange();
}
}
}
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 2495ca5..088bfbf 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -132,7 +132,8 @@
@Override
public void onStart() {
super.onStart();
- mForbiddenPlmns = Arrays.asList(mTelephonyManager.getForbiddenPlmns());
+
+ updateForbiddenPlmns();
setProgressBarVisible(true);
mNetworkScanHelper.startNetworkScan(
@@ -141,6 +142,17 @@
: NetworkScanHelper.NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS);
}
+ /**
+ * Update forbidden PLMNs from the USIM App
+ */
+ @VisibleForTesting
+ void updateForbiddenPlmns() {
+ final String[] forbiddenPlmns = mTelephonyManager.getForbiddenPlmns();
+ mForbiddenPlmns = forbiddenPlmns != null
+ ? Arrays.asList(forbiddenPlmns)
+ : new ArrayList<>();
+ }
+
@Override
public void onStop() {
super.onStop();
diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index 7a685ab..baefa09 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -125,7 +125,7 @@
.setUseDefaultTitle() // use default title if title is null/empty
.setSubtitle(mBundle.getString(BiometricPrompt.KEY_SUBTITLE))
.setDescription(mBundle.getString(BiometricPrompt.KEY_DESCRIPTION))
- .setRequireConfirmation(
+ .setConfirmationRequired(
mBundle.getBoolean(BiometricPrompt.KEY_REQUIRE_CONFIRMATION, true))
.setNegativeButton(getResources().getString(
R.string.confirm_device_credential_use_alternate_method),
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index bc33f4f..01673e3 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -635,7 +635,7 @@
.setDescription(description);
if (keyguardManager.isDeviceSecure()) {
- builder.setAllowDeviceCredential(true);
+ builder.setDeviceCredentialAllowed(true);
}
final BiometricPrompt bp = builder.build();
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index b54781d..776a4d0 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -57,6 +57,7 @@
<bool name="config_show_reset_dashboard">false</bool>
<bool name="config_show_system_update_settings">false</bool>
<bool name="config_show_device_model">false</bool>
+ <bool name="config_show_top_level_accessibility">false</bool>
<bool name="config_show_top_level_battery">false</bool>
<bool name="config_show_top_level_connected_devices">false</bool>
<bool name="config_show_top_level_display">false</bool>
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
new file mode 100644
index 0000000..9d5a5b8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2019 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.accessibility;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.os.Bundle;
+import android.view.accessibility.AccessibilityManager;
+
+import androidx.fragment.app.FragmentActivity;
+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.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowAccessibilityManager;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class AccessibilityDetailsSettingsFragmentTest {
+ private final static String PACKAGE_NAME = "com.foo.bar";
+ private final static String CLASS_NAME = PACKAGE_NAME + ".fake_a11y_service";
+ private final static String COMPONENT_NAME = PACKAGE_NAME + "/" + CLASS_NAME;
+
+ private Context mContext;
+ private AccessibilityDetailsSettingsFragment mFragment;
+ private ShadowAccessibilityManager mShadowAccessibilityManager;
+ @Mock private FragmentActivity mActivity;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ mFragment = spy(new AccessibilityDetailsSettingsFragment());
+ mShadowAccessibilityManager = Shadow.extract(AccessibilityManager.getInstance(mContext));
+ mShadowAccessibilityManager.setInstalledAccessibilityServiceList(getMockServiceList());
+
+ doReturn(mActivity).when(mFragment).getActivity();
+ doReturn(mContext).when(mFragment).getContext();
+ }
+
+ @Test
+ public void onCreate_hasValidExtraComponentName_shouldOpenAccessibilityDetailsSettings() {
+ final Intent intent = new Intent();
+ intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
+ doReturn(intent).when(mActivity).getIntent();
+
+ mFragment.onCreate(Bundle.EMPTY);
+
+ verify(mFragment).openAccessibilityDetailsSettingsAndFinish(any());
+ }
+
+ @Test
+ public void onCreate_hasInvalidExtraComponentName_shouldOpenAccessibilityServicesList() {
+ final Intent intent = new Intent();
+ intent.putExtra(Intent.EXTRA_COMPONENT_NAME, PACKAGE_NAME + "/.service");
+ doReturn(intent).when(mActivity).getIntent();
+
+ mFragment.onCreate(Bundle.EMPTY);
+
+ verify(mFragment).openAccessibilitySettingsAndFinish();
+ }
+
+ @Test
+ public void onCreate_hasNoExtraComponentName_shouldOpenAccessibilityServicesList() {
+ final Intent intent = new Intent();
+ doReturn(intent).when(mActivity).getIntent();
+
+ mFragment.onCreate(Bundle.EMPTY);
+
+ verify(mFragment).openAccessibilitySettingsAndFinish();
+ }
+
+ @Test
+ public void onCreate_extraComponentNameIsDisallowed_shouldOpenAccessibilityServicesList() {
+ final Intent intent = new Intent();
+ intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
+ doReturn(intent).when(mActivity).getIntent();
+ doReturn(false).when(mFragment).isServiceAllowed(any());
+
+ mFragment.onCreate(Bundle.EMPTY);
+
+ verify(mFragment).openAccessibilitySettingsAndFinish();
+ }
+
+ private AccessibilityServiceInfo getMockAccessibilityServiceInfo() {
+ final ApplicationInfo applicationInfo = new ApplicationInfo();
+ final ServiceInfo serviceInfo = new ServiceInfo();
+ applicationInfo.packageName = PACKAGE_NAME;
+ serviceInfo.packageName = PACKAGE_NAME;
+ serviceInfo.name = CLASS_NAME;
+ serviceInfo.applicationInfo = applicationInfo;
+
+ final ResolveInfo resolveInfo = new ResolveInfo();
+ resolveInfo.serviceInfo = serviceInfo;
+
+ try {
+ final AccessibilityServiceInfo info = new AccessibilityServiceInfo(resolveInfo,
+ mContext);
+ ComponentName componentName = ComponentName.unflattenFromString(COMPONENT_NAME);
+ info.setComponentName(componentName);
+ return info;
+ } catch (XmlPullParserException | IOException e) {
+ // Do nothing
+ }
+
+ return null;
+ }
+
+ private List<AccessibilityServiceInfo> getMockServiceList() {
+ final List<AccessibilityServiceInfo> infoList = new ArrayList<>();
+ infoList.add(getMockAccessibilityServiceInfo());
+ return infoList;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java
new file mode 100644
index 0000000..809d8b4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/TopLevelAccessibilityPreferenceControllerTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2019 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.accessibility;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@RunWith(RobolectricTestRunner.class)
+public class TopLevelAccessibilityPreferenceControllerTest {
+
+ private Context mContext;
+ private TopLevelAccessibilityPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new TopLevelAccessibilityPreferenceController(mContext, "test_key");
+ }
+
+ @Test
+ public void getAvailibilityStatus_availableByDefault() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void getAvailabilityStatus_unsupportedWhenSet() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
index f3f4ca6..7b9bc25 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -101,35 +101,72 @@
@Test
public void
- getAvailabilityStatus_noCallbackForIsApplicationNotQualifiedForRole_shouldReturnUnsupported() {
+ getAvailabilityStatus_noCallback_shouldReturnUnsupported() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void
+ getAvailabilityStatus_noCallbackForIsRoleNotVisible_shouldReturnUnsupported() {
+ setApplicationIsQualifiedForRole(true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_RoleIsNotVisible_shouldReturnUnsupported() {
+ setRoleIsVisible(false);
+ setApplicationIsQualifiedForRole(true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void
+ getAvailabilityStatus_noCallbackForIsApplicationQualifiedForRole_shouldReturnUnsupported() {
+ setRoleIsVisible(true);
+
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
}
@Test
public void getAvailabilityStatus_applicationIsNotQualifiedForRole_shouldReturnUnsupported() {
- final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
- Consumer.class);
- verify(mPermissionControllerManager).isApplicationQualifiedForRole(eq(TEST_ROLE_NAME), eq(
- TEST_PACKAGE_NAME), any(Executor.class), callbackCaptor.capture());
- final Consumer<Boolean> callback = callbackCaptor.getValue();
- callback.accept(false);
+ setRoleIsVisible(true);
+ setApplicationIsQualifiedForRole(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
DefaultAppShortcutPreferenceControllerBase.UNSUPPORTED_ON_DEVICE);
}
@Test
- public void getAvailabilityStatus_applicationIsQualifiedForRole_shouldReturnAvailable() {
+ public void getAvailabilityStatus_RoleVisibleAndApplicationQualified_shouldReturnAvailable() {
+ setRoleIsVisible(true);
+ setApplicationIsQualifiedForRole(true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ DefaultAppShortcutPreferenceControllerBase.AVAILABLE);
+ }
+
+ private void setRoleIsVisible(boolean visible) {
+ final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
+ Consumer.class);
+ verify(mPermissionControllerManager).isRoleVisible(eq(TEST_ROLE_NAME), any(Executor.class),
+ callbackCaptor.capture());
+ final Consumer<Boolean> callback = callbackCaptor.getValue();
+ callback.accept(visible);
+ }
+
+ private void setApplicationIsQualifiedForRole(boolean qualified) {
final ArgumentCaptor<Consumer<Boolean>> callbackCaptor = ArgumentCaptor.forClass(
Consumer.class);
verify(mPermissionControllerManager).isApplicationQualifiedForRole(eq(TEST_ROLE_NAME), eq(
TEST_PACKAGE_NAME), any(Executor.class), callbackCaptor.capture());
final Consumer<Boolean> callback = callbackCaptor.getValue();
- callback.accept(true);
-
- assertThat(mController.getAvailabilityStatus()).isEqualTo(
- DefaultAppShortcutPreferenceControllerBase.AVAILABLE);
+ callback.accept(qualified);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
index 73c0d8e..993ba72 100644
--- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
@@ -15,6 +15,7 @@
import android.app.Activity;
import android.app.AppOpsManager;
+import android.app.AppOpsManager.OpEntry;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -144,7 +145,7 @@
}
private AppOpsManager.OpEntry createOpEntry(int opMode) {
- return new AppOpsManager.OpEntry(0, opMode, 0l /* time */, 0 /* rejectTime */,
- 0 /* duration */, 0 /* proxyUid */, null /* proxyPackage */);
+ return new OpEntry(0, false, opMode, null /*accessTimes*/, null /*rejectTimes*/,
+ null /*durations*/, null /* proxyUids */, null /* proxyPackages */);
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
index 368a93a..7868768 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -77,13 +77,16 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
-
final AppOpsManager.OpEntry allowOpEntry = new AppOpsManager.OpEntry(
- AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_ALLOWED, 0, 0, 0, 0, "");
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, false, AppOpsManager.MODE_ALLOWED,
+ null /*accessTimes*/, null /*rejectTimes*/, null /*durations*/,
+ null /* proxyUids */, null /* proxyPackages */);
final List<AppOpsManager.OpEntry> allowOps = new ArrayList<>();
allowOps.add(allowOpEntry);
final AppOpsManager.OpEntry restrictedOpEntry = new AppOpsManager.OpEntry(
- AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, AppOpsManager.MODE_IGNORED, 0, 0, 0, 0, "");
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, false, AppOpsManager.MODE_IGNORED,
+ null /*accessTimes*/, null /*rejectTimes*/, null /*durations*/,
+ null /* proxyUids */, null /* proxyPackages */);
final List<AppOpsManager.OpEntry> restrictedOps = new ArrayList<>();
restrictedOps.add(restrictedOpEntry);
mAllowedPackageOps = new AppOpsManager.PackageOps(
diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java
index 79d3fdc..9f302df 100644
--- a/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java
+++ b/tests/robotests/src/com/android/settings/network/SubscriptionsChangeListenerTest.java
@@ -23,17 +23,20 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
+import android.content.Intent;
import android.database.ContentObserver;
import android.net.Uri;
import android.provider.Settings;
import android.telephony.SubscriptionManager;
+import com.android.internal.telephony.TelephonyIntents;
import com.android.settings.network.SubscriptionsChangeListener.SubscriptionsChangeListenerClient;
import org.junit.Before;
@@ -95,6 +98,19 @@
}
@Test
+ public void
+ onSubscriptionsChangedEvent_ignoresStickyBroadcastFromBeforeRegistering() {
+ final Intent intent = new Intent(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
+ mContext.sendStickyBroadcast(intent);
+
+ initListener(true);
+ verify(mClient, never()).onSubscriptionsChanged();
+
+ mContext.sendStickyBroadcast(intent);
+ verify(mClient, times(1)).onSubscriptionsChanged();
+ }
+
+ @Test
public void onSubscriptionsChangedEvent_radioTechnologyChangedBroadcast_eventDeliveredToUs() {
initListener(true);
final ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor =
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
index 3b5cdf9..68f8c91 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
@@ -26,6 +26,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -35,10 +36,7 @@
import android.view.Menu;
import android.view.View;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
+import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.view.menu.ContextMenuBuilder;
import com.android.settings.R;
@@ -56,6 +54,10 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
@RunWith(RobolectricTestRunner.class)
public class MobileNetworkActivityTest {
@@ -142,6 +144,25 @@
}
@Test
+ public void phoneChangeReceiver_ignoresStickyBroadcastFromBeforeRegistering() {
+ Activity activity = Robolectric.setupActivity(Activity.class);
+ final int[] onChangeCallbackCount = {0};
+ MobileNetworkActivity.PhoneChangeReceiver receiver =
+ new MobileNetworkActivity.PhoneChangeReceiver(activity, () -> {
+ onChangeCallbackCount[0]++;
+ });
+ Intent intent = new Intent(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
+ activity.sendStickyBroadcast(intent);
+
+ receiver.register();
+ assertThat(onChangeCallbackCount[0]).isEqualTo(0);
+
+ activity.sendStickyBroadcast(intent);
+ assertThat(onChangeCallbackCount[0]).isEqualTo(1);
+ }
+
+
+ @Test
public void getSubscriptionId_hasIntent_getIdFromIntent() {
final Intent intent = new Intent();
intent.putExtra(Settings.EXTRA_SUB_ID, CURRENT_SUB_ID);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
index 2aa68f7..7dfc8a3 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
@@ -102,4 +102,12 @@
(NetworkOperatorPreference) mPreferenceCategory.getPreference(0);
assertThat(preference.getCellInfo()).isEqualTo(mCellInfo2);
}
+
+ @Test
+ public void updateForbiddenPlmns_forbiddenPlmnsNull_shouldNotCrash() {
+ when(mTelephonyManager.getForbiddenPlmns()).thenReturn(null);
+
+ // Should not Crash
+ mNetworkSelectSettings.updateForbiddenPlmns();
+ }
}
diff --git a/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java b/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java
index e601171..57d5662 100644
--- a/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java
+++ b/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java
@@ -50,8 +50,10 @@
private UiDevice mDevice;
@Before
- public void setUp() {
+ public void setUp() throws Exception {
mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+ mDevice.wakeUp();
+ mDevice.executeShellCommand("wm dismiss-keyguard");
mContext = InstrumentationRegistry.getTargetContext();
mTargetPackage = mContext.getPackageName();
}