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

Commit c7fa63d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bump targetSdkVersion to "30"" am: c880212a 

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1737355

Change-Id: I63caa1f35eeda340064f05c0310d3a5eccbb1690
parents 16a01e7c c880212a

java/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ android_app { 
    // Include all the resources regardless of system supported locales

    aapt_include_all_resources: true,



    min_sdk_version: "14",

    target_sdk_version: "23",

    min_sdk_version: "21",

    target_sdk_version: "30",

    sdk_version: "current",



    product_specific: true,

java/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

     coreApp="true"

     package="com.android.inputmethod.latin"

     android:versionCode="28">

     android:versionCode="30">



    <uses-sdk android:minSdkVersion="21"

         android:targetSdkVersion="28"/>

         android:targetSdkVersion="30"/>



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

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

tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -50,6 +50,6 @@ android_test { 
    instrumentation_for: "LatinIME",



    min_sdk_version: "14",

    target_sdk_version: "21",

    target_sdk_version: "30",

    sdk_version: "current",

}

tests/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.inputmethod.latin.tests"

    android:versionCode="28">

    android:versionCode="30">



    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />

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



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