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

Commit 8c348c41 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: I64e7be8bd815a3f3bf84277ffb9ea801a5dceb24
Change-Id: Ib2ecaa196b974cec584f6ae5c1e8b4092818d73a
parents 4bc18937 84af7ecf

Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ java_defaults { 
    },



    sdk_version: "system_current",

    target_sdk_version: "30",

    min_sdk_version: "29",



    plugins: [
@@ -110,6 +111,7 @@ android_library { 
    ],



    sdk_version: "system_current",

    target_sdk_version: "30",

    min_sdk_version: "29",

}
@@ -137,6 +139,7 @@ android_library { 
    ],



    sdk_version: "system_current",

    target_sdk_version: "30",

    min_sdk_version: "29",

}
@@ -162,5 +165,6 @@ android_app { 


    required: ["privapp_whitelist_com.android.documentsui"],



    target_sdk_version: "30",

    min_sdk_version: "29",

}

AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.documentsui">



    <uses-sdk android:minSdkVersion="29" />

    <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="30"/>



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

    <uses-permission android:name="android.permission.REMOVE_TASKS" />
@@ -36,6 +36,8 @@ 
    <uses-permission android:name="android.permission.LOG_COMPAT_CHANGE"/>

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



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



    <application

        android:name=".DocumentsApplication"

        android:label="@string/app_label"

app-perf-tests/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -18,12 +18,15 @@ android_test { 


    static_libs: [

        "androidx.legacy_legacy-support-v4",

        "collector-device-lib",

        "mockito-target",

        "ub-uiautomator",

    ],



    platform_apis: true,



    data: [":perfetto_artifacts"],



    instrumentation_for: "DocumentsUI",



    certificate: "platform",

app-perf-tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


    <!-- This package instrumentates itself, so the DocumentsUI process can be killed without

         killing the testing package. -->

    <instrumentation android:name="android.test.InstrumentationTestRunner"

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.documentsui.appperftests"

        android:label="App performance tests for DocumentsUI" />

app-perf-tests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    </target_preparer>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="runner" value="android.test.InstrumentationTestRunner" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="package" value="com.android.documentsui.appperftests" />

    </test>

</configuration>