From e2eab4e258c1fa267ff41f4b3bbd13f3070f66cd Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Mon, 11 May 2020 22:55:05 +0800
Subject: [PATCH 1/2] Allows to launch only authenticator owned activities

- 3rd party developers can define himself-authenticator
  and use the accountPreferences attribute to load the
  predefined preference UI.
- If a developer defines an action intent to launch the
  other activity in xml and it would return true due
  to the true exported attribute and no permission.
- To avoid launching arbitrary activity. Here allows
  to launch only authenticator owned activities.

Bug: 150946634
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accounts
Test: PoC app
Change-Id: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
Merged-In: I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb
(cherry picked from commit d6d8f988449617d757a5d7439314198d10d6ee78)
---
 .../settings/accounts/AccountTypePreferenceLoader.java   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
index a90a3d3ddef..3914fac39b4 100644
--- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
+++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
@@ -196,14 +196,7 @@ public class AccountTypePreferenceLoader {
         ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo;
         ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;
         try {
-            if (resolvedActivityInfo.exported) {
-                if (resolvedActivityInfo.permission == null) {
-                    return true; // exported activity without permission.
-                } else if (pm.checkPermission(resolvedActivityInfo.permission,
-                    authDesc.packageName) == PackageManager.PERMISSION_GRANTED) {
-                    return true;
-                }
-            }
+            // Allows to launch only authenticator owned activities.
             ApplicationInfo authenticatorAppInf = pm.getApplicationInfo(authDesc.packageName, 0);
             return resolvedAppInfo.uid == authenticatorAppInf.uid;
         } catch (NameNotFoundException e) {

From eda0a421185ad5986102595046de8d164d20f252 Mon Sep 17 00:00:00 2001
From: Blake Kragten <kragtenb@google.com>
Date: Thu, 16 Jul 2020 16:45:21 -0700
Subject: [PATCH 2/2] Remove Enhanced Connectivity Dev Option

Applying to d1-dev as this change will be propagated to qpr branch.

Remove Developer Option Enhanced Connectivity. Remove controller and
layout variables/tests.

Bug: 162231796
Test: On Device Custom Build. Testing BSM trigger. Developer Option does
not appear anymore.

Change-Id: I8a385eb444e84975a3bbd7c063c5ce94e507c25f
---
 res/values/config.xml                         |   3 -
 res/xml/development_settings.xml              |   5 -
 .../DevelopmentSettingsDashboardFragment.java |   1 -
 ...ancedConnectivityPreferenceController.java |  87 ------------
 ...dConnectivityPreferenceControllerTest.java | 133 ------------------
 5 files changed, 229 deletions(-)
 delete mode 100644 src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
 delete mode 100644 tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java

diff --git a/res/values/config.xml b/res/values/config.xml
index 746d3e7d85e..fa4bc93d456 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -457,9 +457,6 @@
     <!-- Whether nfc detection point preview image is available or not. -->
     <bool name="config_nfc_detection_point">false</bool>
 
-    <!-- Whether to show Enhanced Connectivity switch in Developer Options -->
-    <bool name="config_show_enhanced_connectivity">false</bool>
-
     <!-- Whether to show Smooth Display feature in Settings Options -->
     <bool name="config_show_smooth_display">false</bool>
 </resources>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 746a51c4b9d..6f9405e7e12 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -297,11 +297,6 @@
             android:title="@string/mobile_data_always_on"
             android:summary="@string/mobile_data_always_on_summary" />
 
-        <SwitchPreference
-            android:key="enhanced_connectivity"
-            android:title="@string/enhanced_connectivity"
-            android:summary="@string/enhanced_connectivity_summary" />
-
         <SwitchPreference
             android:key="tethering_hardware_offload"
             android:title="@string/tethering_hardware_offload"
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 945970eafbd..f2d60f19814 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -479,7 +479,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new BluetoothMapVersionPreferenceController(context));
         controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
         controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
-        controllers.add(new EnhancedConnectivityPreferenceController(context));
         controllers.add(new ShowTapsPreferenceController(context));
         controllers.add(new PointerLocationPreferenceController(context));
         controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
diff --git a/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java b/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
deleted file mode 100644
index 54cfdc630bc..00000000000
--- a/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2020 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.development;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-/**
- * Preference controller for Enhanced Connectivity feature
- */
-public class EnhancedConnectivityPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
-
-    private static final String ENHANCED_CONNECTIVITY_KEY = "enhanced_connectivity";
-
-    @VisibleForTesting
-    static final int ENHANCED_CONNECTIVITY_ON = 1;
-    // default is enhanced connectivity enabled.
-    @VisibleForTesting
-    static final int ENHANCED_CONNECTIVITY_OFF = 0;
-
-    public EnhancedConnectivityPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object o) {
-        final boolean isEnabled = (Boolean) o;
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                isEnabled
-                        ? ENHANCED_CONNECTIVITY_ON
-                        : ENHANCED_CONNECTIVITY_OFF);
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return ENHANCED_CONNECTIVITY_KEY;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final int enhancedConnectivityEnabled = Settings.Global.getInt(
-                mContext.getContentResolver(), Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                ENHANCED_CONNECTIVITY_ON);
-        ((SwitchPreference) mPreference).setChecked(
-                enhancedConnectivityEnabled == ENHANCED_CONNECTIVITY_ON);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                ENHANCED_CONNECTIVITY_ON);
-        ((SwitchPreference) mPreference).setChecked(true);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java
deleted file mode 100644
index db0b0db2dcc..00000000000
--- a/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2020 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.development;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class EnhancedConnectivityPreferenceControllerTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    @Mock
-    private SwitchPreference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-
-    private EnhancedConnectivityPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new EnhancedConnectivityPreferenceController(mContext);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreference);
-        mController.displayPreference(mPreferenceScreen);
-    }
-
-    @Test
-    public void onPreferenceChanged_enhanceConnectivity_shouldBeOn() {
-        mController.onPreferenceChange(mPreference, true /* new value */);
-
-        assertThat(isSettingEnabled()).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChanged_enhanceConnectivity_shouldBeOff() {
-        mController.onPreferenceChange(mPreference, false /* new value */);
-
-        assertThat(isSettingEnabled()).isFalse();
-    }
-
-    @Test
-    public void updateState_preferenceShouldBeChecked() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 1 /* enabled */);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceShouldNotBeChecked() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 0 /* disabled */);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsDisabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-        verify(mPreference).setChecked(true);
-
-        assertThat(isSettingEnabled()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_enhancedConnectivityShown_shouldReturnTrue() {
-        enableEnhancedConnectivityPreference(true);
-
-        boolean availability = mController.isAvailable();
-
-        assertThat(availability).isTrue();
-    }
-
-    @Test
-    public void isAvailable_enhancedConnectivityNotShown_shouldReturnFalse() {
-        enableEnhancedConnectivityPreference(false);
-
-        boolean availability = mController.isAvailable();
-
-        assertThat(availability).isFalse();
-    }
-
-    private void enableEnhancedConnectivityPreference(boolean enable) {
-        when(mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity))
-                .thenReturn(enable);
-    }
-
-    private boolean isSettingEnabled() {
-        return Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON
-                /* default on */)
-                == EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON;
-    }
-}