Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add getter for useTargetActivityForQuickAccess."

Browse Source
This commit is contained in:
Scottie Biddle
2022-03-16 17:59:17 +00:00
committed by Android (Google) Code Review
parent 548b6146e7 71bd41ce92
commit bc52a90ee5
3 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -39179,6 +39179,7 @@ package android.service.quickaccesswallet {
public abstract class QuickAccessWalletService extends android.app.Service {
ctor public QuickAccessWalletService();
method @Nullable public android.app.PendingIntent getTargetActivityPendingIntent();
method public final boolean getUseTargetActivityForQuickAccess();
method @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent);
method public abstract void onWalletCardSelected(@NonNull android.service.quickaccesswallet.SelectWalletCardRequest);
method public abstract void onWalletCardsRequested(@NonNull android.service.quickaccesswallet.GetWalletCardsRequest, @NonNull android.service.quickaccesswallet.GetWalletCardsCallback);

49
core/java/android/service/quickaccesswallet/QuickAccessWalletService.java
View File

@@ -16,12 +16,20 @@
package android.service.quickaccesswallet;
import static android.content.pm.PackageManager.GET_META_DATA;
import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.app.PendingIntent;
import android.app.Service;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
@@ -30,6 +38,8 @@ import android.os.RemoteException;
import android.provider.Settings;
import android.util.Log;
import java.util.List;
/**
* A {@code QuickAccessWalletService} provides a list of {@code WalletCard}s shown in the Quick
* Access Wallet. The Quick Access Wallet allows the user to change their selected payment method
@@ -341,6 +351,45 @@ public abstract class QuickAccessWalletService extends Service {
return null;
}
/**
* Returns the value specified by the attribute
* {@link android.R.styleable#QuickAccessWalletService_useTargetActivityForQuickAccess}
* in the QuickAccessWalletService's metadata configuration. If the attribute or metadata is
* not supplied, returns false.
*/
public final boolean getUseTargetActivityForQuickAccess() {
Intent intent = new Intent(SERVICE_INTERFACE).setPackage(getPackageName());
List<ResolveInfo> matchedServices = getPackageManager()
.queryIntentServices(intent,
PackageManager.ResolveInfoFlags.of(
GET_META_DATA | MATCH_DIRECT_BOOT_UNAWARE | MATCH_DIRECT_BOOT_AWARE
| MATCH_DEFAULT_ONLY));
ResolveInfo resolveInfo = null;
for (ResolveInfo info : matchedServices) {
ServiceInfo serviceInfo = info.serviceInfo;
if (serviceInfo == null) {
continue;
}
String serviceName = serviceInfo.name;
if (serviceName == null) {
continue;
}
if (serviceName.equals(getClass().getCanonicalName())) {
resolveInfo = info;
}
}
if (resolveInfo == null || resolveInfo.serviceInfo == null) {
Log.i(TAG, "Matching QuickAccessWalletService not found.");
return false;
}
QuickAccessWalletServiceInfo.ServiceMetadata serviceMetadata =
QuickAccessWalletServiceInfo.parseServiceMetadata(this, resolveInfo.serviceInfo);
return serviceMetadata != null && serviceMetadata.mUseTargetActivityForQuickAccess;
}
private void sendWalletServiceEventInternal(WalletServiceEvent serviceEvent) {
if (mEventListener == null) {
Log.i(TAG, "No dismiss listener registered");

6
core/java/android/service/quickaccesswallet/QuickAccessWalletServiceInfo.java
View File

@@ -135,7 +135,7 @@ class QuickAccessWalletServiceInfo {
return null;
}
private static class ServiceMetadata {
static class ServiceMetadata {
@Nullable
private final String mSettingsActivity;
@Nullable
@@ -144,7 +144,7 @@ class QuickAccessWalletServiceInfo {
private final CharSequence mShortcutShortLabel;
@Nullable
private final CharSequence mShortcutLongLabel;
private final boolean mUseTargetActivityForQuickAccess;
final boolean mUseTargetActivityForQuickAccess;
private static ServiceMetadata empty() {
return new ServiceMetadata(null, null, null, null, false);
@@ -164,7 +164,7 @@ class QuickAccessWalletServiceInfo {
}
}
private static ServiceMetadata parseServiceMetadata(Context context, ServiceInfo serviceInfo) {
static ServiceMetadata parseServiceMetadata(Context context, ServiceInfo serviceInfo) {
PackageManager pm = context.getPackageManager();
final XmlResourceParser parser =
serviceInfo.loadXmlMetaData(pm, QuickAccessWalletService.SERVICE_META_DATA);