summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PermissionController/role-controller/java/com/android/role/controller/behavior/WalletRoleBehavior.java20
-rw-r--r--framework-s/jarjar-rules.txt3
-rw-r--r--service/jarjar-rules.txt3
-rw-r--r--tests/cts/permissionpolicy/res/raw/android_manifest.xml17
4 files changed, 25 insertions, 18 deletions
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/WalletRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/WalletRoleBehavior.java
index 170c42c3d..3e209aaee 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/WalletRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/WalletRoleBehavior.java
@@ -16,12 +16,11 @@
package com.android.role.controller.behavior;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.nfc.NfcAdapter;
-import android.nfc.cardemulation.ApduServiceInfo;
import android.nfc.cardemulation.CardEmulation;
import android.nfc.cardemulation.HostApduService;
import android.nfc.cardemulation.OffHostApduService;
@@ -30,7 +29,6 @@ import android.os.UserHandle;
import android.permission.flags.Flags;
import android.service.quickaccesswallet.QuickAccessWalletService;
import android.util.ArraySet;
-import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -65,21 +63,13 @@ public class WalletRoleBehavior implements RoleBehavior {
@Override
public List<String> getDefaultHoldersAsUser(@NonNull Role role, @NonNull UserHandle user,
@NonNull Context context) {
- CardEmulation cardEmulation;
Context userContext = UserUtils.getUserContext(context, user);
- try {
- cardEmulation =
- CardEmulation.getInstance(NfcAdapter.getDefaultAdapter(userContext));
- } catch (UnsupportedOperationException e) {
- Log.e(LOG_TAG, "Unsupported Card Emulation Operation.", e);
- return null;
- }
- ApduServiceInfo preferredPaymentService = cardEmulation
- .getPreferredPaymentService();
+ ComponentName preferredPaymentService =
+ CardEmulation.getPreferredPaymentService(userContext);
if (preferredPaymentService != null) {
- return Collections.singletonList(preferredPaymentService.getComponent()
- .getPackageName());
+ return Collections.singletonList(preferredPaymentService.getPackageName());
}
+
return null;
}
diff --git a/framework-s/jarjar-rules.txt b/framework-s/jarjar-rules.txt
index 39f2ad3b7..22e1da3ac 100644
--- a/framework-s/jarjar-rules.txt
+++ b/framework-s/jarjar-rules.txt
@@ -1,5 +1,6 @@
rule android.os.HandlerExecutor android.permission.jarjar.@0
-rule android.permission.flags.** android.permission.jarjar.@0
+rule android.permission.flags.*Flags* android.permission.jarjar.@0
+rule android.permission.flags.Flags android.permission.jarjar.@0
rule android.util.IndentingPrintWriter android.permission.jarjar.@0
rule com.android.internal.** android.permission.jarjar.@0
rule com.android.modules.** android.permission.jarjar.@0
diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt
index a3fd75930..495388afe 100644
--- a/service/jarjar-rules.txt
+++ b/service/jarjar-rules.txt
@@ -1,5 +1,6 @@
rule android.os.HandlerExecutor com.android.permission.jarjar.@0
-rule android.permission.flags.** com.android.permission.jarjar.@0
+rule android.permission.flags.*Flags* com.android.permission.jarjar.@0
+rule android.permission.flags.Flags com.android.permission.jarjar.@0
rule android.util.IndentingPrintWriter com.android.permission.jarjar.@0
rule com.android.internal.** com.android.permission.jarjar.@0
rule com.android.modules.** com.android.permission.jarjar.@0
diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
index ab9518f6b..c5da824a8 100644
--- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml
+++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
@@ -2881,7 +2881,7 @@
<p>Protection level: signature
@SystemApi
@hide
- @FlaggedApi("com.android.internal.telephony.flags.ap_domain_selection_enabled")
+ @FlaggedApi("com.android.internal.telephony.flags.use_oem_domain_selection_service")
-->
<permission android:name="android.permission.BIND_DOMAIN_SELECTION_SERVICE"
android:protectionLevel="signature" />
@@ -3667,6 +3667,13 @@
<permission android:name="android.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL"
android:protectionLevel="internal|role" />
+ <!-- Allows an application to access EnhancedConfirmationManager.
+ @SystemApi
+ @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled")
+ @hide This is not a third-party API (intended for OEMs and system apps). -->
+ <permission android:name="android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES"
+ android:protectionLevel="signature|installer" />
+
<!-- @SystemApi @hide Allows an application to set a device owner on retail demo devices.-->
<permission android:name="android.permission.PROVISION_DEMO_DEVICE"
android:protectionLevel="signature|setup|knownSigner"
@@ -3889,6 +3896,14 @@
android:description="@string/permdesc_useDataInBackground"
android:protectionLevel="normal" />
+ <!-- Allows an application to subscribe to notifications about the nearby devices' presence
+ status change base on the UUIDs.
+ <p>Not for use by third-party applications.</p>
+ @FlaggedApi("android.companion.flags.device_uuid_presence")
+ -->
+ <permission android:name="android.permission.REQUEST_OBSERVE_DEVICE_UUID_PRESENCE"
+ android:protectionLevel="signature|privileged" />
+
<!-- Allows app to request to be associated with a device via
{@link android.companion.CompanionDeviceManager}
as a "watch"