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

Commit c45c009f authored by Song Chun Fan's avatar Song Chun Fan Committed by Songchun Fan
Browse files

Revert^2 "[SettingsProvider] minor refactor before lock changes" 

This reverts commit 03021feb.

Reason for revert: reland with test fix.

Test: atest SettingsProviderTest
BUG: 284452689

Change-Id: I2f302365fb1cecfbd9e2929f78be5426c5a4f9c3
parent 2a9682ce

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+246 −332

File changed.

Preview size limit exceeded, changes collapsed.

packages/SettingsProvider/test/src/com/android/providers/settings/InstallNonMarketAppsDeprecationTest.java

+28 −12
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ 
package com.android.providers.settings;



import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;



import static org.junit.Assert.assertNotEquals;

import static org.junit.Assume.assumeTrue;



import android.annotation.Nullable;

import android.content.Context;

import android.content.pm.UserInfo;

import android.os.Process;
@@ -42,6 +44,8 @@ import java.io.IOException; 
import java.io.InputStreamReader;

import java.util.ArrayList;

import java.util.List;

import java.util.Objects;

import java.util.function.Supplier;



@LargeTest

public class InstallNonMarketAppsDeprecationTest extends BaseSettingsProviderTest {
@@ -54,35 +58,42 @@ public class InstallNonMarketAppsDeprecationTest extends BaseSettingsProviderTes 
    private boolean mSystemSetUserRestriction;

    private List<Integer> mUsersAddedByTest;



    private String waitTillValueChanges(String errorMessage, String oldValue) {

    private static String waitTillValueChanges(String errorMessage, @Nullable String oldValue,

                                        Supplier<String> action) {

        boolean interrupted = false;

        final long startTime = SystemClock.uptimeMillis();

        String newValue = getSetting(SETTING_TYPE_SECURE, Settings.Secure.INSTALL_NON_MARKET_APPS);

        while (newValue.equals(oldValue) && SystemClock.uptimeMillis() <= (startTime

        String newValue = action.get();

        while (Objects.equals(newValue, oldValue) && SystemClock.uptimeMillis() <= (startTime

                + USER_RESTRICTION_CHANGE_TIMEOUT)) {

            try {

                Thread.sleep(1000);

            } catch (InterruptedException exc) {

                interrupted = true;

            }

            newValue = getSetting(SETTING_TYPE_SECURE, Settings.Secure.INSTALL_NON_MARKET_APPS);

            newValue = action.get();

        }

        if (interrupted) {

            Thread.currentThread().interrupt();

        }

        assertFalse(errorMessage, oldValue.equals(newValue));

        assertNotEquals(errorMessage, newValue, oldValue);

        return newValue;

    }



    private String getSecureSettingForUserViaShell(int userId) throws IOException {

    private String getSecureSettingForUserViaShell(int userId) {

        StringBuilder sb = new StringBuilder("settings get --user ");

        sb.append(userId + " secure ");

        sb.append(Settings.Secure.INSTALL_NON_MARKET_APPS);

        BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(

                InstrumentationRegistry.getInstrumentation().getUiAutomation().executeShellCommand(

                        sb.toString()).getFileDescriptor())));

        String line = reader.readLine();

        return line.trim();

        String line;

        try {

            line = reader.readLine();

        } catch (IOException e) {

            return null;

        }

        final String result = line.trim();

        return (result.isEmpty() || result.equals("null")) ? null : result;

    }



    @Override
@@ -121,7 +132,10 @@ public class InstallNonMarketAppsDeprecationTest extends BaseSettingsProviderTes 


        UserInfo newUser = mUm.createUser("TEST_USER", 0);

        mUsersAddedByTest.add(newUser.id);

        String value = getSecureSettingForUserViaShell(newUser.id);

        // wait till SettingsProvider reacts to the USER_ADDED event

        String value = waitTillValueChanges(

                "install_non_market_apps should be set for the new user", null,

                () -> getSecureSettingForUserViaShell(newUser.id));

        assertEquals("install_non_market_apps should be 1 for a new user", value, "1");

    }
@@ -140,13 +154,15 @@ public class InstallNonMarketAppsDeprecationTest extends BaseSettingsProviderTes 
        mUm.setUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, !mHasUserRestriction);

        value = waitTillValueChanges(

                "Changing user restriction did not change the value of install_non_market_apps",

                value);

                value,

                () -> getSetting(SETTING_TYPE_SECURE, Settings.Secure.INSTALL_NON_MARKET_APPS));

        assertTrue("Invalid value", value.equals("1") || value.equals("0"));



        mUm.setUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, mHasUserRestriction);

        value = waitTillValueChanges(

                "Changing user restriction did not change the value of install_non_market_apps",

                value);

                value,

                () -> getSetting(SETTING_TYPE_SECURE, Settings.Secure.INSTALL_NON_MARKET_APPS));

        assertTrue("Invalid value", value.equals("1") || value.equals("0"));

    }