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

Commit 72200e80 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5503058 from 471ddb2b to qt-release 

Change-Id: I8a209ad2a587dfd86ba5277c6a6e7d69e564f94c
parents 65e8c859 471ddb2b

CleanSpec.mk

+0 −3
Original line number Diff line number Diff line
@@ -248,9 +248,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.mediad 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.location.provider.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.future.usb.accessory.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.media.remotedisplay.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/overlay/ExperimentNavigationBarSlim)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/overlay/ExperimentNavigationBarSlim)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/ExperimentNavigationBarSlim)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DynamicAndroidInstallationService)

apct-tests/perftests/core/src/android/graphics/perftests/TypefaceCreatePerfTest.java

+14 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.graphics.perftests; 


import android.content.Context;

import android.content.res.AssetManager;

import android.content.res.Resources;

import android.graphics.Typeface;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;
@@ -26,6 +27,8 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.perftests.core.R;



import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -104,4 +107,15 @@ public class TypefaceCreatePerfTest { 


        outFile.delete();

    }



    @Test

    public void testCreate_fromResources() {

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final Resources r = InstrumentationRegistry.getContext().getResources();



        while (state.keepRunning()) {

            Typeface face = r.getFont(R.font.samplefont);

        }

    }



}

api/TEST_MAPPING

+4 −2
Original line number Diff line number Diff line
@@ -5,9 +5,11 @@ 
    },

    {

      "name": "CtsSystemApiSignatureTestCases"

    },

    }

  ],

  "imports": [

    {

      "name": "GtsUnofficialApisUsageTestCases"

      "path": "vendor/xts/gts-tests/hostsidetests/api"

    }

  ]

}

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -27245,7 +27245,7 @@ package android.media.session { 
    method @Nullable public CharSequence getQueueTitle();

    method public int getRatingType();

    method @Nullable public android.app.PendingIntent getSessionActivity();

    method @Nullable public android.os.Bundle getSessionInfo();

    method @NonNull public android.os.Bundle getSessionInfo();

    method @NonNull public android.media.session.MediaSession.Token getSessionToken();

    method @NonNull public android.media.session.MediaController.TransportControls getTransportControls();

    method public void registerCallback(@NonNull android.media.session.MediaController.Callback);
@@ -34415,10 +34415,10 @@ package android.os { 
    method @Deprecated public static String getStorageState(java.io.File);

    method public static boolean isExternalStorageEmulated();

    method public static boolean isExternalStorageEmulated(@NonNull java.io.File);

    method public static boolean isExternalStorageLegacy();

    method public static boolean isExternalStorageLegacy(@NonNull java.io.File);

    method public static boolean isExternalStorageRemovable();

    method public static boolean isExternalStorageRemovable(@NonNull java.io.File);

    method public static boolean isExternalStorageSandboxed();

    method public static boolean isExternalStorageSandboxed(@NonNull java.io.File);

    field public static String DIRECTORY_ALARMS;

    field public static String DIRECTORY_AUDIOBOOKS;

    field public static String DIRECTORY_DCIM;

api/system-current.txt

+8 −20
Original line number Diff line number Diff line
@@ -1714,7 +1714,6 @@ package android.content.pm { 
    field public static final int MATCH_ANY_USER = 4194304; // 0x400000

    field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000

    field public static final int MATCH_INSTANT = 8388608; // 0x800000

    field public static boolean RESTRICTED_PERMISSIONS_ENABLED;

    field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1

    field public static final int RESTRICTION_HIDE_NOTIFICATIONS = 2; // 0x2

    field public static final int RESTRICTION_NONE = 0; // 0x0
@@ -5662,16 +5661,16 @@ package android.permission { 
    ctor public PermissionControllerService();

    method public final void attachBaseContext(android.content.Context);

    method @NonNull public final android.os.IBinder onBind(android.content.Intent);

    method public abstract int onCountPermissionApps(@NonNull java.util.List<java.lang.String>, int);

    method @NonNull public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(@NonNull String);

    method @NonNull public abstract java.util.List<android.permission.RuntimePermissionUsageInfo> onGetPermissionUsages(boolean, long);

    method public abstract void onGetRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.OutputStream);

    method public abstract void onGrantOrUpgradeDefaultRuntimePermissions();

    method @WorkerThread public abstract int onCountPermissionApps(@NonNull java.util.List<java.lang.String>, int);

    method @WorkerThread @NonNull public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(@NonNull String);

    method @WorkerThread @NonNull public abstract java.util.List<android.permission.RuntimePermissionUsageInfo> onGetPermissionUsages(boolean, long);

    method @WorkerThread public abstract void onGetRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.OutputStream);

    method @WorkerThread public abstract void onGrantOrUpgradeDefaultRuntimePermissions();

    method @BinderThread public abstract boolean onRestoreDelayedRuntimePermissionsBackup(@NonNull String, @NonNull android.os.UserHandle);

    method @BinderThread public abstract void onRestoreRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream);

    method public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String);

    method @NonNull public abstract java.util.Map<java.lang.String,java.util.List<java.lang.String>> onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String);

    method public abstract boolean onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int);

    method @WorkerThread public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String);

    method @WorkerThread @NonNull public abstract java.util.Map<java.lang.String,java.util.List<java.lang.String>> onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String);

    method @WorkerThread public abstract boolean onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int);

    field public static final String SERVICE_INTERFACE = "android.permission.PermissionControllerService";

  }










@@ -6013,17 +6012,6 @@ package android.provider {













    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);















    field public static final String APP_STANDBY_ENABLED = "app_standby_enabled";















    field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";













    field public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS = "captive_portal_fallback_probe_specs";













    field public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";













    field public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";













    field public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";













    field public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";













    field public static final int CAPTIVE_PORTAL_MODE_AVOID = 2; // 0x2













    field public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0; // 0x0













    field public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1; // 0x1













    field public static final String CAPTIVE_PORTAL_OTHER_FALLBACK_URLS = "captive_portal_other_fallback_urls";













    field public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent";













    field public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";















    field public static final String CARRIER_APP_NAMES = "carrier_app_names";















    field public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";















    field public static final String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";