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

Commit 2b3412e0 authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-7980d7077a9e4af78b30d173fc489b08" 

* changes:
  [automerge] Specify target_sdk_version to be 30. 2p: 6f99d9d0
  Specify target_sdk_version to be 30.
parents 438d96ec 704f0209

Android.bp

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



    sdk_version: "system_current",

    target_sdk_version: "30",

    min_sdk_version: "29",



    plugins: [
@@ -95,6 +96,7 @@ android_library { 
    ],



    sdk_version: "system_current",

    target_sdk_version: "30",

    min_sdk_version: "29",

}
@@ -117,6 +119,7 @@ android_library { 
    ],



    sdk_version: "system_current",

    target_sdk_version: "30",

    min_sdk_version: "29",

}
@@ -137,5 +140,6 @@ android_app { 


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



    target_sdk_version: "30",

    min_sdk_version: "29",

}

AndroidManifest.xml

+1 −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" />