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

Commit b54929b5 authored by Mathew Inwood's avatar Mathew Inwood Committed by Automerger Merge Worker
Browse files

Merge "Set updateable:false explicitly in apex rules." am: a3ab19e8 am: 6a103de8 am: a7286837 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590172

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5650736c60819b36b4dff3419208ed309bbeb3b8
parents b21761e7 a7286837

core/tests/overlaytests/remount/test-apps/overlaid_apex/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -50,4 +50,5 @@ apex { 
    key: "com.android.overlaytest.overlaid.key",

    apps: ["OverlayRemountedTest_Target"],

    installable: false,

    updatable: false,

}

core/tests/overlaytests/remount/test-apps/overlay_apex/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -50,4 +50,5 @@ apex { 
    key: "com.android.overlaytest.overlay.key",

    apps: ["OverlayRemountedTest_Overlay"],

    installable: false,

    updatable: false,

}

tests/RollbackTest/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ apex { 
  key: "com.android.apex.apkrollback.test.key",

  apps: ["TestAppAv1"],

  installable: false,

  updatable: false,

}



apex {
@@ -115,6 +116,7 @@ apex { 
  key: "com.android.apex.apkrollback.test.key",

  apps: ["TestAppAv2"],

  installable: false,

  updatable: false,

}



apex {
@@ -125,4 +127,5 @@ apex { 
  key: "com.android.apex.apkrollback.test.key",

  apps: ["TestAppACrashingV2"],

  installable: false,

  updatable: false,

}