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

Commit 6fdea11f authored by Liana Kazanova's avatar Liana Kazanova Committed by Android (Google) Code Review
Browse files

Revert "Add sdk version check before skipping VcnManager initialization" 

This reverts commit 9977f84a.

Reason for revert: DroidMonitor: Potential culprit for b/330896603 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I56cd22694b77b84e6230b829c9711c41d49cd46e
parent 9977f84a

core/java/android/app/SystemServiceRegistry.java

+2 −32
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ import android.companion.ICompanionDeviceManager; 
import android.companion.virtual.IVirtualDeviceManager;

import android.companion.virtual.VirtualDeviceManager;

import android.compat.Compatibility;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledSince;

import android.content.ClipboardManager;

import android.content.ContentCaptureOptions;

import android.content.Context;
@@ -198,7 +196,6 @@ import android.os.ServiceManager; 
import android.os.ServiceManager.ServiceNotFoundException;

import android.os.StatsFrameworkInitializer;

import android.os.SystemConfigManager;

import android.os.SystemProperties;

import android.os.SystemUpdateManager;

import android.os.SystemVibrator;

import android.os.SystemVibratorManager;
@@ -288,16 +285,6 @@ public final class SystemServiceRegistry { 
    /** @hide */

    public static boolean sEnableServiceNotFoundWtf = false;



    /**

     * Starting with {@link VANILLA_ICE_CREAM}, Telephony feature flags

     * (e.g. {@link PackageManager#FEATURE_TELEPHONY_SUBSCRIPTION}) are being checked before

     * returning managers that depend on them. If the feature is missing,

     * {@link Context#getSystemService} will return null.

     */

    @ChangeId

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM)

    static final long ENABLE_CHECKING_TELEPHONY_FEATURES = 330583731;



    // Service registry information.

    // This information is never changed once static initialization has completed.

    private static final Map<Class<?>, String> SYSTEM_SERVICE_NAMES =
@@ -463,8 +450,7 @@ public final class SystemServiceRegistry { 
                new CachedServiceFetcher<VcnManager>() {

            @Override

            public VcnManager createService(ContextImpl ctx) throws ServiceNotFoundException {

                if (shouldCheckTelephonyFeatures()

                    && !ctx.getPackageManager().hasSystemFeature(

                if (!ctx.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {

                    return null;

                }
@@ -1762,22 +1748,6 @@ public final class SystemServiceRegistry { 
        return manager.hasSystemFeature(featureName);

    }



    // Suppressing AndroidFrameworkCompatChange because we're querying vendor

    // partition SDK level, not application's target SDK version (which BTW we

    // also check through Compatibility framework a few lines below).

    @SuppressWarnings("AndroidFrameworkCompatChange")

    private static boolean shouldCheckTelephonyFeatures() {

        // Check SDK version of the vendor partition. Pre-V devices might have

        // incorrectly under-declared telephony features.

        final int vendorApiLevel = SystemProperties.getInt(

                "ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);

        if (vendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) return false;



        // Check SDK version of the client app. Apps targeting pre-V SDK might

        // have not checked for existence of these features.

        return Compatibility.isChangeEnabled(ENABLE_CHECKING_TELEPHONY_FEATURES);

    }



    /**

     * Gets a system service from a given context.

     * @hide