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

Commit 51f1321b authored by Manish Singh's avatar Manish Singh
Browse files

Put stricter flag checks 

Also removed a log which gives away flag.

Bug: 312976400
Test: manual
Change-Id: I4a989de8b6b920666aabf0cc9311e28becc4d862
parent f403dc9c

src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java

+7 −0
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ public class AutoAdvanceSetupFragment extends Fragment { 
                }

            };



    @Override

    public void onCreate(@Nullable Bundle savedInstanceState) {

        if (android.os.Flags.allowPrivateProfile()) {

            super.onCreate(savedInstanceState);

        }

    }



    @Override

    public View onCreateView(

            LayoutInflater inflater,

src/com/android/settings/privatespace/DeletePrivateSpaceController.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public class DeletePrivateSpaceController extends BasePreferenceController { 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }



    @Override

src/com/android/settings/privatespace/HidePrivateSpaceController.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public class HidePrivateSpaceController extends TogglePreferenceController { 
    @Override

    @AvailabilityStatus

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }



    @Override

src/com/android/settings/privatespace/HidePrivateSpaceSettings.java

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.privatespace;



import android.app.settings.SettingsEnums;

import android.os.Bundle;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;
@@ -24,6 +25,13 @@ import com.android.settings.dashboard.DashboardFragment; 
public class HidePrivateSpaceSettings extends DashboardFragment{

    private static final String TAG = "HidePrivateSpaceSettings";



    @Override

    public void onCreate(Bundle icicle) {

        if (android.os.Flags.allowPrivateProfile()) {

            super.onCreate(icicle);

        }

    }



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.PRIVATE_SPACE_SETTINGS;

src/com/android/settings/privatespace/HidePrivateSpaceSummaryController.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public final class HidePrivateSpaceSummaryController extends BasePreferenceContr 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return android.os.Flags.allowPrivateProfile() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;

    }



    @Override