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

Commit 645af0a6 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Revert "fix broken build on erorrprone" 

Revert submission 17730702-fixErrorProneBuild

Reason for revert: Breaks Launcher3 unbundled build by using hidden library in main Launcher code
Reverted Changes:
Id0ce4d308:Change version checks to use SdkLevel.isAtLeast*
I8fc801b00:fix broken build on erorrprone

Change-Id: Ib1cd50a746bad3b6fb9fbd455a7cdce30f341d8b
parent 998c47e5

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ android_library { 
        "androidx.cardview_cardview",

        "com.google.android.material_material",

        "iconloader_base",

        "modules-utils-build",

    ],

    manifest: "AndroidManifest-common.xml",

    sdk_version: "current",

src/com/android/launcher3/Utilities.java

+10 −4
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.graphics.drawable.ColorDrawable; 
import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Build;

import android.os.Build.VERSION_CODES;

import android.os.DeadObjectException;

import android.os.Handler;

import android.os.Message;
@@ -72,6 +73,7 @@ import android.view.ViewConfiguration; 
import android.view.animation.Interpolator;

import android.widget.LinearLayout;



import androidx.annotation.ChecksSdkIntAtLeast;

import androidx.annotation.NonNull;

import androidx.core.graphics.ColorUtils;
@@ -93,7 +95,6 @@ import com.android.launcher3.util.Themes; 
import com.android.launcher3.views.ActivityContext;

import com.android.launcher3.views.BaseDragLayer;

import com.android.launcher3.widget.PendingAddShortcutInfo;

import com.android.modules.utils.build.SdkLevel;



import java.lang.reflect.Method;

import java.util.ArrayList;
@@ -122,15 +123,20 @@ public final class Utilities { 
    public static final String[] EMPTY_STRING_ARRAY = new String[0];

    public static final Person[] EMPTY_PERSON_ARRAY = new Person[0];



    @ChecksSdkIntAtLeast(api = VERSION_CODES.P)

    public static final boolean ATLEAST_P = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P;



    @ChecksSdkIntAtLeast(api = VERSION_CODES.Q)

    public static final boolean ATLEAST_Q = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;



    public static final boolean ATLEAST_R = SdkLevel.isAtLeastR();

    @ChecksSdkIntAtLeast(api = VERSION_CODES.R)

    public static final boolean ATLEAST_R = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;



    public static final boolean ATLEAST_S = SdkLevel.isAtLeastS();

    @ChecksSdkIntAtLeast(api = VERSION_CODES.S)

    public static final boolean ATLEAST_S = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S;



    public static final boolean ATLEAST_T = SdkLevel.isAtLeastT();

    @ChecksSdkIntAtLeast(api = VERSION_CODES.TIRAMISU, codename = "T")

    public static final boolean ATLEAST_T = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU;



    /**

     * Set on a motion event dispatched from the nav bar. See {@link MotionEvent#setEdgeFlags(int)}.

src/com/android/launcher3/model/StringCache.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.launcher3.model;



import android.annotation.SuppressLint;

import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.os.Build;
@@ -215,6 +216,7 @@ public class StringCache { 
                context, DISABLED_BY_ADMIN_MESSAGE, R.string.msg_disabled_by_admin);

    }



    @SuppressLint("NewApi")

    private String getEnterpriseString(

            Context context, String updatableStringId, int defaultStringId) {

        return Utilities.ATLEAST_T