Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f7308ba authored by Bartosz Fabianowski's avatar Bartosz Fabianowski Committed by android-build-merger
Browse files

Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev 

am: 55698160

Change-Id: I5b8286dce56e89ae924166d142785d52af4eb6bd
parents 1e67d890 55698160

src/com/android/settings/Settings.java

+12 −1
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


package com.android.settings;



import android.os.Bundle;



import com.android.settings.applications.AppOpsSummary;

import com.android.settings.enterprise.EnterprisePrivacySettings;

import com.android.settings.fingerprint.FingerprintEnrollIntroduction;

import com.android.settings.fingerprint.FingerprintSettings;
@@ -154,7 +157,15 @@ public class Settings extends SettingsActivity { 
    public static class TestingSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiAPITestActivity extends SettingsActivity { /* empty */ }

    public static class WifiInfoActivity extends SettingsActivity { /* empty */ }

    public static class EnterprisePrivacySettingsActivity extends SettingsActivity { /* empty */ }

    public static class EnterprisePrivacySettingsActivity extends SettingsActivity {

        @Override

        public void onCreate(Bundle savedInstanceState) {

            super.onCreate(savedInstanceState);

            if (!EnterprisePrivacySettings.isPageEnabled(this)) {

                finish();

            }

        }

    }

    public static class WebViewAppPickerActivity extends SettingsActivity { /* empty */ }



    // Top level categories for new IA

src/com/android/settings/SettingsActivity.java

+0 −5
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ import com.android.settings.core.instrumentation.SharedPreferencesLogger; 
import com.android.settings.dashboard.DashboardFeatureProvider;

import com.android.settings.dashboard.DashboardSummary;

import com.android.settings.development.DevelopmentSettings;

import com.android.settings.enterprise.EnterprisePrivacySettings;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.DynamicIndexableContentMonitor;

import com.android.settings.search2.SearchFeatureProvider;
@@ -826,10 +825,6 @@ public class SettingsActivity extends SettingsDrawerActivity 
                        BackupSettingsActivity.class.getName()), true,

                isAdmin || Utils.isCarrierDemoUser(this));



        setTileEnabled(new ComponentName(packageName,

                        Settings.EnterprisePrivacySettingsActivity.class.getName()),

                EnterprisePrivacySettings.isPageEnabled(this), isAdmin);



        setTileEnabled(new ComponentName(packageName,

                        Settings.WifiDisplaySettingsActivity.class.getName()),

                WifiDisplaySettings.isAvailable(this), isAdmin);