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

Commit 21492f3d authored by Anubha Kushwaha's avatar Anubha Kushwaha Committed by Android (Google) Code Review
Browse files

Merge "Add array resource for watchface permission list" into main

parents a099a95c 01c8740c

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -477,6 +477,7 @@ package android { 
  public static final class R.array {

    field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005

    field public static final int config_optionalIpSecAlgorithms = 17235974; // 0x1070006

    field @FlaggedApi("android.permission.flags.watch_face_role_enabled") public static final int config_watchFacePermissions;

  }















  public static final class R.attr {

























core/java/android/permission/flags.aconfig



+9
−0




























Original line number
Diff line number
Diff line








@@ -613,3 +613,12 @@ flag {













    description: "Enable checkPackage caching in AppOpsManager"















    bug: "423030916"















}



























flag {













    name: "watch_face_role_enabled"













    is_exported: true













    namespace: "wear_services"













    description: "This flag enables watchface roles support and API"













    bug: "399850691"













    is_fixed_read_only: true













}
























core/res/res/values/config.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -7699,4 +7699,8 @@













    <!-- The delay in milliseconds to show the toast after the user presses the power button. -->















    <integer name="config_turnOffTvToastPostDelayMs">0</integer>





























    <!-- A list of permissions to be granted under WatchFaceBehavior role













        It can only contain non-AOSP permissions outside of the android.*













        and com.android.* namespace. -->













    <string-array name="config_watchFacePermissions" translatable="false"/>















</resources>
























core/res/res/values/public-staging.xml



+3
−0




























Original line number
Diff line number
Diff line








@@ -187,6 +187,9 @@













  </staging-public-group>































  <staging-public-group type="array" first-id="0x019c0000">













    <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_WATCH_FACE_ROLE_ENABLED)













    @hide @SystemApi -->













    <public name="config_watchFacePermissions" />















  </staging-public-group>































  <staging-public-group type="drawable" first-id="0x019b0000">