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

Commit afb1ef35 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "resolve merge conflicts of 20283435 to...

Merge "resolve merge conflicts of 20283435 to sc-dev" into sc-dev am: 8e8ff048

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

Change-Id: I885d040e4925ca89672c1800bd8efc3398e81f83
parents 05f143b2 8e8ff048
Loading
Loading
Loading
Loading
+12 −10
Original line number Diff line number Diff line
@@ -20,14 +20,16 @@ package android.os;
 * @see ResourcesTypes.h ResTable_overlayable_policy_header::PolicyFlags
 * @hide
 */
interface OverlayablePolicy {
  const int PUBLIC = 0x00000001;
  const int SYSTEM_PARTITION = 0x00000002;
  const int VENDOR_PARTITION = 0x00000004;
  const int PRODUCT_PARTITION = 0x00000008;
  const int SIGNATURE = 0x00000010;
  const int ODM_PARTITION = 0x00000020;
  const int OEM_PARTITION = 0x00000040;
  const int ACTOR_SIGNATURE = 0x00000080;
  const int CONFIG_SIGNATURE = 0x0000100;
@Backing(type="int")
enum OverlayablePolicy {
  NONE = 0x00000000,
  PUBLIC = 0x00000001,
  SYSTEM_PARTITION = 0x00000002,
  VENDOR_PARTITION = 0x00000004,
  PRODUCT_PARTITION = 0x00000008,
  SIGNATURE = 0x00000010,
  ODM_PARTITION = 0x00000020,
  OEM_PARTITION = 0x00000040,
  ACTOR_SIGNATURE = 0x00000080,
  CONFIG_SIGNATURE = 0x0000100,
}