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

Commit 05026560 authored by Natasha Lee's avatar Natasha Lee Committed by Automerger Merge Worker
Browse files

Merge "Bump NetworkStack package version code" into rvc-d1-dev-plus-aosp am:... 

Merge "Bump NetworkStack package version code" into rvc-d1-dev-plus-aosp am: ec508cf5 am: 1da4d80e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12906295

Change-Id: I71558e4717fe4928c9ae4230e6263a18263d215f
parents 81008279 1da4d80e

AndroidManifest.xml

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

  package="com.android.networkstack"

  android:sharedUserId="android.uid.networkstack"

  android:versionCode="300000000"

  android:versionName="2019-09"

  android:versionCode="309999900"

  android:versionName="r_aml_309999900"

>

    <!-- Permissions must be defined here, and not in the base manifest, as the network stack

         running in the system server process does not need any permission, and having privileged

AndroidManifest_Next.xml

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

          package="com.android.networkstack"

          android:sharedUserId="android.uid.networkstack"

          android:versionCode="300000000"

          android:versionName="R-next">

          android:versionCode="310000000"

          android:versionName="S-next">

</manifest>