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

Commit 4d935a7d authored by Xin Li's avatar Xin Li
Browse files

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future 

Bug: 337098550
Merged-In: I398f9f4d2ac0bd24f9f457fdff4b5a965cd6f67c
Change-Id: I2f9260c1cf1091ddb172d849cf22b9b18056feee
parents ddd659ae 863b66e9

Android.bp

+0 −14
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ java_defaults { 


    sdk_version: "system_current",

    min_sdk_version: "29",



    lint: {

        strict_updatability_linting: true,

    },

}



platform_compat_config {
@@ -80,7 +76,6 @@ java_library { 
    ],

    lint: {

        strict_updatability_linting: true,

        baseline_filename: "lint-baseline.xml",

    },

}
@@ -115,7 +110,6 @@ android_library { 
    target_sdk_version: "33",

    min_sdk_version: "29",

    lint: {

        strict_updatability_linting: true,

        baseline_filename: "lint-baseline.xml",

    },

}
@@ -132,10 +126,6 @@ android_library { 
    sdk_version: "system_current",

    target_sdk_version: "33",

    min_sdk_version: "29",

    lint: {

        strict_updatability_linting: true,

        baseline_filename: "lint-baseline.xml",

    },

}



android_app {
@@ -157,8 +147,4 @@ android_app { 


    min_sdk_version: "29",

    updatable: true,

    lint: {

        strict_updatability_linting: true,

        baseline_filename: "lint-baseline.xml",

    },

}

AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 


    <uses-permission android:name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>



    <!-- Permissions required for reading device configs -->

    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG"/>



    <application

        android:name=".DocumentsApplication"

        android:label="@string/app_label"

lint-baseline.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">

<issues format="6" by="lint 8.4.0-alpha01" type="baseline" client="" dependencies="true" name="" variant="all" version="8.4.0-alpha01">



    <issue

        id="NewApi"

perf-tests/src/com/android/documentsui/FilesActivityPerfTest.java

+2 −2
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ import android.app.Activity; 
import android.net.Uri;

import android.os.Bundle;

import android.os.RemoteException;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;



import com.android.documentsui.BaseActivity.EventListener;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.ActivityTest;



import java.util.ArrayList;

import java.util.Arrays;

perf-tests/src/com/android/documentsui/FilesJankPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import android.os.RemoteException; 
import android.support.test.jank.GfxMonitor;

import android.support.test.jank.JankTest;

import android.support.test.jank.JankTestBase;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.filters.LargeTest;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiScrollable;