Merge "Mark @Nullable annotation to String parameter"
diff --git a/Android.bp b/Android.bp
index 4b22f9e..c97ee3d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1788,3 +1788,10 @@
],
}
+// Creates an index of AIDL methods; used for adding UnsupportedAppUsage
+// annotations to private apis
+aidl_mapping {
+ name: "framework-aidl-mappings",
+ srcs: [":framework-defaults"],
+ output: "framework-aidl-mappings.txt"
+}
\ No newline at end of file
diff --git a/api/current.txt b/api/current.txt
index 3671ba6..2156867 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4277,7 +4277,8 @@
method public void stopWatchingMode(android.app.AppOpsManager.OnOpChangedListener);
method public int unsafeCheckOp(String, int, String);
method public int unsafeCheckOpNoThrow(String, int, String);
- method public int unsafeCheckOpRaw(String, int, String);
+ method public int unsafeCheckOpRaw(@NonNull String, int, String);
+ method public int unsafeCheckOpRawNoThrow(@NonNull String, int, @NonNull String);
field public static final int MODE_ALLOWED = 0; // 0x0
field public static final int MODE_DEFAULT = 3; // 0x3
field public static final int MODE_ERRORED = 2; // 0x2
@@ -23689,7 +23690,7 @@
public abstract static class AudioTrack.StreamEventCallback {
ctor public AudioTrack.StreamEventCallback();
- method public void onDataRequest(@NonNull android.media.AudioTrack, int);
+ method public void onDataRequest(@NonNull android.media.AudioTrack, @IntRange(from=0) int);
method public void onPresentationEnded(@NonNull android.media.AudioTrack);
method public void onTearDown(@NonNull android.media.AudioTrack);
}
@@ -29402,7 +29403,7 @@
method public java.util.Date getValidNotAfterDate();
method @Deprecated public String getValidNotBefore();
method public java.util.Date getValidNotBeforeDate();
- method public java.security.cert.X509Certificate getX509Certificate();
+ method @Nullable public java.security.cert.X509Certificate getX509Certificate();
method public static android.net.http.SslCertificate restoreState(android.os.Bundle);
method public static android.os.Bundle saveState(android.net.http.SslCertificate);
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 258f272..e8eca21 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -121,6 +121,7 @@
field public static final String NOTIFY_TV_INPUTS = "android.permission.NOTIFY_TV_INPUTS";
field public static final String OBSERVE_APP_USAGE = "android.permission.OBSERVE_APP_USAGE";
field public static final String OBSERVE_ROLE_HOLDERS = "android.permission.OBSERVE_ROLE_HOLDERS";
+ field public static final String OPEN_ACCESSIBILITY_DETAILS_SETTINGS = "android.permission.OPEN_ACCESSIBILITY_DETAILS_SETTINGS";
field public static final String OVERRIDE_WIFI_CONFIG = "android.permission.OVERRIDE_WIFI_CONFIG";
field public static final String PACKAGE_VERIFICATION_AGENT = "android.permission.PACKAGE_VERIFICATION_AGENT";
field public static final String PACKET_KEEPALIVE_OFFLOAD = "android.permission.PACKET_KEEPALIVE_OFFLOAD";
@@ -361,27 +362,34 @@
field public static final String OPSTR_WRITE_ICC_SMS = "android:write_icc_sms";
field public static final String OPSTR_WRITE_SMS = "android:write_sms";
field public static final String OPSTR_WRITE_WALLPAPER = "android:write_wallpaper";
- field public static final int UID_STATE_BACKGROUND = 5; // 0x5
- field public static final int UID_STATE_CACHED = 6; // 0x6
- field public static final int UID_STATE_FOREGROUND = 4; // 0x4
- field public static final int UID_STATE_FOREGROUND_SERVICE = 3; // 0x3
- field public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 2; // 0x2
- field public static final int UID_STATE_PERSISTENT = 0; // 0x0
- field public static final int UID_STATE_TOP = 1; // 0x1
+ field public static final int OP_FLAGS_ALL = 31; // 0x1f
+ field public static final int OP_FLAGS_ALL_TRUSTED = 13; // 0xd
+ field public static final int OP_FLAG_SELF = 1; // 0x1
+ field public static final int OP_FLAG_TRUSTED_PROXIED = 8; // 0x8
+ field public static final int OP_FLAG_TRUSTED_PROXY = 2; // 0x2
+ field public static final int OP_FLAG_UNTRUSTED_PROXIED = 16; // 0x10
+ field public static final int OP_FLAG_UNTRUSTED_PROXY = 4; // 0x4
+ field public static final int UID_STATE_BACKGROUND = 600; // 0x258
+ field public static final int UID_STATE_CACHED = 700; // 0x2bc
+ field public static final int UID_STATE_FOREGROUND = 500; // 0x1f4
+ field public static final int UID_STATE_FOREGROUND_SERVICE = 400; // 0x190
+ field public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300; // 0x12c
+ field public static final int UID_STATE_PERSISTENT = 100; // 0x64
+ field public static final int UID_STATE_TOP = 200; // 0xc8
}
public static final class AppOpsManager.HistoricalOp implements android.os.Parcelable {
method public int describeContents();
- method public long getAccessCount(int);
- method public long getAccessDuration(int);
- method public long getBackgroundAccessCount();
- method public long getBackgroundAccessDuration();
- method public long getBackgroundRejectCount();
- method public long getForegroundAccessCount();
- method public long getForegroundAccessDuration();
- method public long getForegroundRejectCount();
+ method public long getAccessCount(int, int, int);
+ method public long getAccessDuration(int, int, int);
+ method public long getBackgroundAccessCount(int);
+ method public long getBackgroundAccessDuration(int);
+ method public long getBackgroundRejectCount(int);
+ method public long getForegroundAccessCount(int);
+ method public long getForegroundAccessDuration(int);
+ method public long getForegroundRejectCount(int);
method @NonNull public String getOpName();
- method public long getRejectCount(int);
+ method public long getRejectCount(int, int, int);
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalOp> CREATOR;
}
@@ -403,6 +411,7 @@
public static final class AppOpsManager.HistoricalOpsRequest.Builder {
ctor public AppOpsManager.HistoricalOpsRequest.Builder(long, long);
method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest build();
+ method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setFlags(int);
method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setOpNames(@Nullable java.util.List<java.lang.String>);
method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setPackageName(@Nullable String);
method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setUid(int);
@@ -430,17 +439,24 @@
public static final class AppOpsManager.OpEntry implements android.os.Parcelable {
method public int describeContents();
- method public int getDuration();
- method public long getLastAccessBackgroundTime();
- method public long getLastAccessForegroundTime();
- method public long getLastAccessTime();
- method public long getLastRejectBackgroundTime();
- method public long getLastRejectForegroundTime();
- method public long getLastRejectTime();
+ method public long getDuration();
+ method public long getLastAccessBackgroundTime(int);
+ method public long getLastAccessForegroundTime(int);
+ method public long getLastAccessTime(int);
+ method public long getLastAccessTime(int, int, int);
+ method public long getLastBackgroundDuration(int);
+ method public long getLastDuration(int, int, int);
+ method public long getLastForegroundDuration(int);
+ method public long getLastRejectBackgroundTime(int);
+ method public long getLastRejectForegroundTime(int);
+ method public long getLastRejectTime(int);
+ method public long getLastRejectTime(int, int, int);
method public int getMode();
- method public String getOpStr();
- method public String getProxyPackageName();
+ method @NonNull public String getOpStr();
+ method @Nullable public String getProxyPackageName();
+ method @Nullable public String getProxyPackageName(int, int);
method public int getProxyUid();
+ method public int getProxyUid(int, int);
method public boolean isRunning();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.OpEntry> CREATOR;
@@ -449,7 +465,7 @@
public static final class AppOpsManager.PackageOps implements android.os.Parcelable {
method public int describeContents();
method public java.util.List<android.app.AppOpsManager.OpEntry> getOps();
- method public String getPackageName();
+ method @NonNull public String getPackageName();
method public int getUid();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.PackageOps> CREATOR;
@@ -6044,6 +6060,7 @@
}
public final class Settings {
+ field public static final String ACTION_ACCESSIBILITY_DETAILS_SETTINGS = "android.settings.ACCESSIBILITY_DETAILS_SETTINGS";
field public static final String ACTION_ENTERPRISE_PRIVACY_SETTINGS = "android.settings.ENTERPRISE_PRIVACY_SETTINGS";
field public static final String ACTION_LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS = "android.settings.LOCATION_CONTROLLER_EXTRA_PACKAGE_SETTINGS";
field public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE = "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE";
diff --git a/api/test-current.txt b/api/test-current.txt
index d016c11..a3b6155 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -193,29 +193,36 @@
field public static final String OPSTR_WRITE_SMS = "android:write_sms";
field public static final String OPSTR_WRITE_WALLPAPER = "android:write_wallpaper";
field public static final int OP_COARSE_LOCATION = 0; // 0x0
+ field public static final int OP_FLAGS_ALL = 31; // 0x1f
+ field public static final int OP_FLAG_SELF = 1; // 0x1
+ field public static final int OP_FLAG_TRUSTED_PROXIED = 8; // 0x8
+ field public static final int OP_FLAG_TRUSTED_PROXY = 2; // 0x2
+ field public static final int OP_FLAG_UNTRUSTED_PROXIED = 16; // 0x10
+ field public static final int OP_FLAG_UNTRUSTED_PROXY = 4; // 0x4
field public static final int OP_RECORD_AUDIO = 27; // 0x1b
+ field public static final int OP_START_FOREGROUND = 76; // 0x4c
field public static final int OP_SYSTEM_ALERT_WINDOW = 24; // 0x18
- field public static final int UID_STATE_BACKGROUND = 5; // 0x5
- field public static final int UID_STATE_CACHED = 6; // 0x6
- field public static final int UID_STATE_FOREGROUND = 4; // 0x4
- field public static final int UID_STATE_FOREGROUND_SERVICE = 3; // 0x3
- field public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 2; // 0x2
- field public static final int UID_STATE_PERSISTENT = 0; // 0x0
- field public static final int UID_STATE_TOP = 1; // 0x1
+ field public static final int UID_STATE_BACKGROUND = 600; // 0x258
+ field public static final int UID_STATE_CACHED = 700; // 0x2bc
+ field public static final int UID_STATE_FOREGROUND = 500; // 0x1f4
+ field public static final int UID_STATE_FOREGROUND_SERVICE = 400; // 0x190
+ field public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300; // 0x12c
+ field public static final int UID_STATE_PERSISTENT = 100; // 0x64
+ field public static final int UID_STATE_TOP = 200; // 0xc8
}
public static final class AppOpsManager.HistoricalOp implements android.os.Parcelable {
method public int describeContents();
- method public long getAccessCount(int);
- method public long getAccessDuration(int);
- method public long getBackgroundAccessCount();
- method public long getBackgroundAccessDuration();
- method public long getBackgroundRejectCount();
- method public long getForegroundAccessCount();
- method public long getForegroundAccessDuration();
- method public long getForegroundRejectCount();
+ method public long getAccessCount(int, int, int);
+ method public long getAccessDuration(int, int, int);
+ method public long getBackgroundAccessCount(int);
+ method public long getBackgroundAccessDuration(int);
+ method public long getBackgroundRejectCount(int);
+ method public long getForegroundAccessCount(int);
+ method public long getForegroundAccessDuration(int);
+ method public long getForegroundRejectCount(int);
method @NonNull public String getOpName();
- method public long getRejectCount(int);
+ method public long getRejectCount(int, int, int);
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalOp> CREATOR;
}
@@ -228,9 +235,9 @@
method public int getUidCount();
method @Nullable public android.app.AppOpsManager.HistoricalUidOps getUidOps(int);
method @NonNull public android.app.AppOpsManager.HistoricalUidOps getUidOpsAt(int);
- method public void increaseAccessCount(int, int, @NonNull String, int, long);
- method public void increaseAccessDuration(int, int, @NonNull String, int, long);
- method public void increaseRejectCount(int, int, @NonNull String, int, long);
+ method public void increaseAccessCount(int, int, @NonNull String, int, int, long);
+ method public void increaseAccessDuration(int, int, @NonNull String, int, int, long);
+ method public void increaseRejectCount(int, int, @NonNull String, int, int, long);
method public void offsetBeginAndEndTime(long);
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalOps> CREATOR;
@@ -242,6 +249,7 @@
public static final class AppOpsManager.HistoricalOpsRequest.Builder {
ctor public AppOpsManager.HistoricalOpsRequest.Builder(long, long);
method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest build();
+ method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setFlags(int);
method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setOpNames(@Nullable java.util.List<java.lang.String>);
method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setPackageName(@Nullable String);
method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setUid(int);
@@ -271,6 +279,31 @@
method public void onOpActiveChanged(int, int, String, boolean);
}
+ public static final class AppOpsManager.OpEntry implements android.os.Parcelable {
+ method public int describeContents();
+ method public long getDuration();
+ method public long getLastAccessBackgroundTime(int);
+ method public long getLastAccessForegroundTime(int);
+ method public long getLastAccessTime(int);
+ method public long getLastAccessTime(int, int, int);
+ method public long getLastBackgroundDuration(int);
+ method public long getLastDuration(int, int, int);
+ method public long getLastForegroundDuration(int);
+ method public long getLastRejectBackgroundTime(int);
+ method public long getLastRejectForegroundTime(int);
+ method public long getLastRejectTime(int);
+ method public long getLastRejectTime(int, int, int);
+ method public int getMode();
+ method @NonNull public String getOpStr();
+ method @Nullable public String getProxyPackageName();
+ method @Nullable public String getProxyPackageName(int, int);
+ method public int getProxyUid();
+ method public int getProxyUid(int, int);
+ method public boolean isRunning();
+ method public void writeToParcel(android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.OpEntry> CREATOR;
+ }
+
public class DownloadManager {
field public static final String COLUMN_MEDIASTORE_URI = "mediastore_uri";
}
@@ -2732,6 +2765,10 @@
field public static final int CALLBACK_ANIMATION = 1; // 0x1
}
+ public final class Display {
+ method public boolean hasAccess(int);
+ }
+
public class FocusFinder {
method public static void sort(android.view.View[], int, int, android.view.ViewGroup, boolean);
}
diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt
index e6ba40d..46a956c 100644
--- a/config/hiddenapi-greylist.txt
+++ b/config/hiddenapi-greylist.txt
@@ -36,18 +36,7 @@
Landroid/app/admin/IDevicePolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/admin/IDevicePolicyManager;
Landroid/app/admin/IDevicePolicyManager$Stub;->TRANSACTION_packageHasActiveAdmins:I
Landroid/app/admin/IDevicePolicyManager$Stub;->TRANSACTION_removeActiveAdmin:I
-Landroid/app/admin/IDevicePolicyManager;->packageHasActiveAdmins(Ljava/lang/String;I)Z
Landroid/app/backup/IBackupManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/backup/IBackupManager;
-Landroid/app/backup/IBackupManager;->acknowledgeFullBackupOrRestore(IZLjava/lang/String;Ljava/lang/String;Landroid/app/backup/IFullBackupRestoreObserver;)V
-Landroid/app/backup/IBackupManager;->clearBackupData(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/app/backup/IBackupManager;->dataChanged(Ljava/lang/String;)V
-Landroid/app/backup/IBackupManager;->getCurrentTransport()Ljava/lang/String;
-Landroid/app/backup/IBackupManager;->isBackupEnabled()Z
-Landroid/app/backup/IBackupManager;->isBackupServiceActive(I)Z
-Landroid/app/backup/IBackupManager;->listAllTransports()[Ljava/lang/String;
-Landroid/app/backup/IBackupManager;->selectBackupTransport(Ljava/lang/String;)Ljava/lang/String;
-Landroid/app/backup/IBackupManager;->setAutoRestore(Z)V
-Landroid/app/backup/IBackupManager;->setBackupEnabled(Z)V
Landroid/app/backup/IFullBackupRestoreObserver$Stub;-><init>()V
Landroid/app/backup/IRestoreObserver$Stub;-><init>()V
Landroid/app/DownloadManager;->restartDownload([J)V
@@ -215,19 +204,12 @@
Landroid/app/job/IJobCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/app/job/IJobCallback$Stub;-><init>()V
Landroid/app/job/IJobCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobCallback;
-Landroid/app/job/IJobCallback;->acknowledgeStartMessage(IZ)V
-Landroid/app/job/IJobCallback;->acknowledgeStopMessage(IZ)V
-Landroid/app/job/IJobCallback;->completeWork(II)Z
-Landroid/app/job/IJobCallback;->dequeueWork(I)Landroid/app/job/JobWorkItem;
-Landroid/app/job/IJobCallback;->jobFinished(IZ)V
Landroid/app/job/IJobScheduler$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/app/job/IJobScheduler$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobScheduler;
Landroid/app/job/IJobService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/app/job/IJobService$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/app/job/IJobService$Stub;-><init>()V
Landroid/app/job/IJobService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobService;
-Landroid/app/job/IJobService;->startJob(Landroid/app/job/JobParameters;)V
-Landroid/app/job/IJobService;->stopJob(Landroid/app/job/JobParameters;)V
Landroid/app/PackageDeleteObserver;-><init>()V
Landroid/app/PackageInstallObserver;-><init>()V
Landroid/app/ReceiverRestrictedContext;-><init>(Landroid/content/Context;)V
@@ -237,10 +219,6 @@
Landroid/app/trust/ITrustManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/app/UiAutomationConnection;-><init>()V
Landroid/app/usage/IUsageStatsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/usage/IUsageStatsManager;
-Landroid/app/usage/IUsageStatsManager;->isAppInactive(Ljava/lang/String;I)Z
-Landroid/app/usage/IUsageStatsManager;->queryConfigurationStats(IJJLjava/lang/String;)Landroid/content/pm/ParceledListSlice;
-Landroid/app/usage/IUsageStatsManager;->queryUsageStats(IJJLjava/lang/String;)Landroid/content/pm/ParceledListSlice;
-Landroid/app/usage/IUsageStatsManager;->setAppInactive(Ljava/lang/String;ZI)V
Landroid/app/UserSwitchObserver;-><init>()V
Landroid/bluetooth/IBluetooth$Stub$Proxy;->getAddress()Ljava/lang/String;
Landroid/bluetooth/IBluetooth$Stub$Proxy;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I
@@ -284,22 +262,14 @@
Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelected(Ljava/lang/String;ILjava/lang/String;)V
Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelectionCancel()V
Landroid/companion/IFindDeviceCallback;->onSuccess(Landroid/app/PendingIntent;)V
-Landroid/content/ContentProviderProxy;->mRemote:Landroid/os/IBinder;
Landroid/content/IClipboard$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/IClipboard$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IClipboard;
Landroid/content/IContentService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/IContentService$Stub;-><init>()V
Landroid/content/IContentService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IContentService;
-Landroid/content/IContentService;->cancelSync(Landroid/accounts/Account;Ljava/lang/String;Landroid/content/ComponentName;)V
-Landroid/content/IContentService;->getIsSyncable(Landroid/accounts/Account;Ljava/lang/String;)I
-Landroid/content/IContentService;->getMasterSyncAutomatically()Z
-Landroid/content/IContentService;->getSyncAdapterTypes()[Landroid/content/SyncAdapterType;
-Landroid/content/IContentService;->isSyncActive(Landroid/accounts/Account;Ljava/lang/String;Landroid/content/ComponentName;)Z
-Landroid/content/IContentService;->setMasterSyncAutomatically(Z)V
Landroid/content/IIntentReceiver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/IIntentReceiver$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/IIntentReceiver$Stub;-><init>()V
-Landroid/content/IIntentReceiver;->performReceive(Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;ZZI)V
Landroid/content/IOnPrimaryClipChangedListener$Stub;-><init>()V
Landroid/content/IOnPrimaryClipChangedListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IOnPrimaryClipChangedListener;
Landroid/content/IRestrictionsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IRestrictionsManager;
@@ -307,29 +277,20 @@
Landroid/content/ISyncAdapter$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/ISyncAdapter$Stub;-><init>()V
Landroid/content/ISyncAdapter$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/ISyncAdapter;
-Landroid/content/ISyncAdapter;->cancelSync(Landroid/content/ISyncContext;)V
-Landroid/content/ISyncAdapter;->onUnsyncableAccount(Landroid/content/ISyncAdapterUnsyncableAccountCallback;)V
-Landroid/content/ISyncAdapter;->startSync(Landroid/content/ISyncContext;Ljava/lang/String;Landroid/accounts/Account;Landroid/os/Bundle;)V
Landroid/content/ISyncContext$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/ISyncContext$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/ISyncContext$Stub;-><init>()V
Landroid/content/ISyncContext$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/ISyncContext;
Landroid/content/ISyncServiceAdapter$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/ISyncServiceAdapter;
-Landroid/content/ISyncServiceAdapter;->cancelSync(Landroid/content/ISyncContext;)V
-Landroid/content/ISyncServiceAdapter;->startSync(Landroid/content/ISyncContext;Landroid/os/Bundle;)V
Landroid/content/ISyncStatusObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/ISyncStatusObserver$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/ISyncStatusObserver$Stub;-><init>()V
Landroid/content/ISyncStatusObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/ISyncStatusObserver;
-Landroid/content/ISyncStatusObserver;->onStatusChanged(I)V
Landroid/content/om/IOverlayManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/om/IOverlayManager;
-Landroid/content/om/IOverlayManager;->getAllOverlays(I)Ljava/util/Map;
-Landroid/content/om/IOverlayManager;->getOverlayInfo(Ljava/lang/String;I)Landroid/content/om/OverlayInfo;
Landroid/content/pm/IPackageDataObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/pm/IPackageDataObserver$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/pm/IPackageDataObserver$Stub;-><init>()V
Landroid/content/pm/IPackageDataObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageDataObserver;
-Landroid/content/pm/IPackageDataObserver;->onRemoveCompleted(Ljava/lang/String;Z)V
Landroid/content/pm/IPackageDeleteObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/pm/IPackageDeleteObserver$Stub;-><init>()V
Landroid/content/pm/IPackageDeleteObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageDeleteObserver;
@@ -337,17 +298,9 @@
Landroid/content/pm/IPackageDeleteObserver2$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/pm/IPackageDeleteObserver2$Stub;-><init>()V
Landroid/content/pm/IPackageDeleteObserver2$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageDeleteObserver2;
-Landroid/content/pm/IPackageDeleteObserver2;->onPackageDeleted(Ljava/lang/String;ILjava/lang/String;)V
-Landroid/content/pm/IPackageDeleteObserver;->packageDeleted(Ljava/lang/String;I)V
-Landroid/content/pm/IPackageInstaller;->uninstall(Landroid/content/pm/VersionedPackage;Ljava/lang/String;ILandroid/content/IntentSender;I)V
Landroid/content/pm/IPackageInstallerCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/pm/IPackageInstallerCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/pm/IPackageInstallerCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageInstallerCallback;
-Landroid/content/pm/IPackageInstallerCallback;->onSessionActiveChanged(IZ)V
-Landroid/content/pm/IPackageInstallerCallback;->onSessionBadgingChanged(I)V
-Landroid/content/pm/IPackageInstallerCallback;->onSessionCreated(I)V
-Landroid/content/pm/IPackageInstallerCallback;->onSessionFinished(IZ)V
-Landroid/content/pm/IPackageInstallerCallback;->onSessionProgressChanged(IF)V
Landroid/content/pm/IPackageInstallerSession$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/pm/IPackageInstallerSession$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/pm/IPackageInstallerSession$Stub;-><init>()V
@@ -356,8 +309,6 @@
Landroid/content/pm/IPackageInstallObserver2$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/pm/IPackageInstallObserver2$Stub;-><init>()V
Landroid/content/pm/IPackageInstallObserver2$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageInstallObserver2;
-Landroid/content/pm/IPackageInstallObserver2;->onPackageInstalled(Ljava/lang/String;ILjava/lang/String;Landroid/os/Bundle;)V
-Landroid/content/pm/IPackageInstallObserver2;->onUserActionRequired(Landroid/content/Intent;)V
Landroid/content/pm/IPackageManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/pm/IPackageManager$Stub$Proxy;->checkUidPermission(Ljava/lang/String;I)I
Landroid/content/pm/IPackageManager$Stub$Proxy;->getAppOpPermissionPackages(Ljava/lang/String;)[Ljava/lang/String;
@@ -369,69 +320,12 @@
Landroid/content/pm/IPackageManager$Stub$Proxy;->getSystemSharedLibraryNames()[Ljava/lang/String;
Landroid/content/pm/IPackageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageManager;
Landroid/content/pm/IPackageManager$Stub;->TRANSACTION_getApplicationInfo:I
-Landroid/content/pm/IPackageManager;->addPermission(Landroid/content/pm/PermissionInfo;)Z
-Landroid/content/pm/IPackageManager;->addPermissionAsync(Landroid/content/pm/PermissionInfo;)Z
-Landroid/content/pm/IPackageManager;->canonicalToCurrentPackageNames([Ljava/lang/String;)[Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;I)I
-Landroid/content/pm/IPackageManager;->checkSignatures(Ljava/lang/String;Ljava/lang/String;)I
-Landroid/content/pm/IPackageManager;->checkUidSignatures(II)I
-Landroid/content/pm/IPackageManager;->clearPackagePreferredActivities(Ljava/lang/String;)V
-Landroid/content/pm/IPackageManager;->currentToCanonicalPackageNames([Ljava/lang/String;)[Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->deleteApplicationCacheFiles(Ljava/lang/String;Landroid/content/pm/IPackageDataObserver;)V
-Landroid/content/pm/IPackageManager;->getActivityInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ActivityInfo;
-Landroid/content/pm/IPackageManager;->getApplicationEnabledSetting(Ljava/lang/String;I)I
-Landroid/content/pm/IPackageManager;->getApplicationInfo(Ljava/lang/String;II)Landroid/content/pm/ApplicationInfo;
-Landroid/content/pm/IPackageManager;->getAppOpPermissionPackages(Ljava/lang/String;)[Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->getBlockUninstallForUser(Ljava/lang/String;I)Z
-Landroid/content/pm/IPackageManager;->getComponentEnabledSetting(Landroid/content/ComponentName;I)I
-Landroid/content/pm/IPackageManager;->getFlagsForUid(I)I
-Landroid/content/pm/IPackageManager;->getHomeActivities(Ljava/util/List;)Landroid/content/ComponentName;
-Landroid/content/pm/IPackageManager;->getInstalledApplications(II)Landroid/content/pm/ParceledListSlice;
-Landroid/content/pm/IPackageManager;->getInstalledPackages(II)Landroid/content/pm/ParceledListSlice;
-Landroid/content/pm/IPackageManager;->getInstallerPackageName(Ljava/lang/String;)Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->getInstallLocation()I
-Landroid/content/pm/IPackageManager;->getInstrumentationInfo(Landroid/content/ComponentName;I)Landroid/content/pm/InstrumentationInfo;
-Landroid/content/pm/IPackageManager;->getLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;I)Landroid/content/pm/ResolveInfo;
-Landroid/content/pm/IPackageManager;->getNameForUid(I)Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo;
-Landroid/content/pm/IPackageManager;->getPackageInstaller()Landroid/content/pm/IPackageInstaller;
-Landroid/content/pm/IPackageManager;->getPackagesForUid(I)[Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->getPackageUid(Ljava/lang/String;II)I
-Landroid/content/pm/IPackageManager;->getPermissionControllerPackageName()Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->getPermissionGroupInfo(Ljava/lang/String;I)Landroid/content/pm/PermissionGroupInfo;
-Landroid/content/pm/IPackageManager;->getPreferredActivities(Ljava/util/List;Ljava/util/List;Ljava/lang/String;)I
-Landroid/content/pm/IPackageManager;->getProviderInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ProviderInfo;
-Landroid/content/pm/IPackageManager;->getReceiverInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ActivityInfo;
-Landroid/content/pm/IPackageManager;->getServiceInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ServiceInfo;
-Landroid/content/pm/IPackageManager;->getServicesSystemSharedLibraryPackageName()Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->getSharedSystemSharedLibraryPackageName()Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->getSystemSharedLibraryNames()[Ljava/lang/String;
-Landroid/content/pm/IPackageManager;->getUidForSharedUser(Ljava/lang/String;)I
-Landroid/content/pm/IPackageManager;->grantRuntimePermission(Ljava/lang/String;Ljava/lang/String;I)V
-Landroid/content/pm/IPackageManager;->hasSystemUidErrors()Z
-Landroid/content/pm/IPackageManager;->isPackageAvailable(Ljava/lang/String;I)Z
-Landroid/content/pm/IPackageManager;->isSafeMode()Z
-Landroid/content/pm/IPackageManager;->isStorageLow()Z
-Landroid/content/pm/IPackageManager;->isUidPrivileged(I)Z
-Landroid/content/pm/IPackageManager;->queryInstrumentation(Ljava/lang/String;I)Landroid/content/pm/ParceledListSlice;
-Landroid/content/pm/IPackageManager;->queryIntentActivities(Landroid/content/Intent;Ljava/lang/String;II)Landroid/content/pm/ParceledListSlice;
-Landroid/content/pm/IPackageManager;->querySyncProviders(Ljava/util/List;Ljava/util/List;)V
-Landroid/content/pm/IPackageManager;->removePermission(Ljava/lang/String;)V
-Landroid/content/pm/IPackageManager;->replacePreferredActivity(Landroid/content/IntentFilter;I[Landroid/content/ComponentName;Landroid/content/ComponentName;I)V
-Landroid/content/pm/IPackageManager;->resolveIntent(Landroid/content/Intent;Ljava/lang/String;II)Landroid/content/pm/ResolveInfo;
-Landroid/content/pm/IPackageManager;->setApplicationEnabledSetting(Ljava/lang/String;IIILjava/lang/String;)V
-Landroid/content/pm/IPackageManager;->setApplicationHiddenSettingAsUser(Ljava/lang/String;ZI)Z
-Landroid/content/pm/IPackageManager;->setComponentEnabledSetting(Landroid/content/ComponentName;III)V
-Landroid/content/pm/IPackageManager;->setInstallerPackageName(Ljava/lang/String;Ljava/lang/String;)V
-Landroid/content/pm/IPackageManager;->setLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;ILandroid/content/IntentFilter;ILandroid/content/ComponentName;)V
-Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;ZI)V
Landroid/content/pm/IPackageMoveObserver$Stub;-><init>()V
Landroid/content/pm/IPackageMoveObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageMoveObserver;
Landroid/content/pm/IPackageStatsObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/pm/IPackageStatsObserver$Stub$Proxy;->mRemote:Landroid/os/IBinder;
Landroid/content/pm/IPackageStatsObserver$Stub;-><init>()V
Landroid/content/pm/IPackageStatsObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageStatsObserver;
-Landroid/content/pm/IPackageStatsObserver;->onGetStatsCompleted(Landroid/content/pm/PackageStats;Z)V
Landroid/content/pm/IShortcutService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/content/pm/IShortcutService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IShortcutService;
Landroid/content/res/ConfigurationBoundResourceCache;-><init>()V
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index 5bf7ef5..91df05f 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -43,6 +43,8 @@
import android.os.UserManager;
import android.provider.Settings;
import android.util.ArrayMap;
+import android.util.LongSparseArray;
+import android.util.LongSparseLongArray;
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
@@ -55,8 +57,10 @@
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.Preconditions;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
@@ -64,9 +68,11 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
+import java.util.function.Supplier;
/**
* API for interacting with "application operation" tracking.
@@ -227,7 +233,7 @@
/** @hide */
@Retention(RetentionPolicy.SOURCE)
- @IntDef(flag = true, prefix = { "UID_STATE_" }, value = {
+ @IntDef(prefix = { "UID_STATE_" }, value = {
UID_STATE_PERSISTENT,
UID_STATE_TOP,
UID_STATE_FOREGROUND_SERVICE_LOCATION,
@@ -239,78 +245,322 @@
public @interface UidState {}
/**
- * Invalid UID state.
- * @hide
- */
- public static final int UID_STATE_INVALID = -1;
-
- /**
- * Metrics about an op when its uid is persistent.
+ * Uid state: The UID is a foreground persistent app.
* @hide
*/
@TestApi
@SystemApi
- public static final int UID_STATE_PERSISTENT = 0;
+ public static final int UID_STATE_PERSISTENT = 100;
/**
- * Metrics about an op when its uid is at the top.
+ * Uid state: The UID is top foreground app.
* @hide
*/
@TestApi
@SystemApi
- public static final int UID_STATE_TOP = 1;
+ public static final int UID_STATE_TOP = 200;
/**
- * Metrics about an op when its uid is running a foreground service with location type.
+ * Uid state: The UID is running a foreground service of location type.
* @hide
*/
@TestApi
@SystemApi
- public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 2;
+ public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300;
/**
- * Metrics about an op when its uid is running a foreground service.
+ * Uid state: The UID is running a foreground service.
* @hide
*/
@TestApi
@SystemApi
- public static final int UID_STATE_FOREGROUND_SERVICE = 3;
+ public static final int UID_STATE_FOREGROUND_SERVICE = 400;
/**
- * Last UID state in which we don't restrict what an op can do.
+ * The max, which is min priority, UID state for which any app op
+ * would be considered as performed in the foreground.
* @hide
*/
- public static final int UID_STATE_LAST_NON_RESTRICTED = UID_STATE_FOREGROUND_SERVICE_LOCATION;
+ public static final int UID_STATE_MAX_LAST_NON_RESTRICTED = UID_STATE_FOREGROUND_SERVICE;
/**
- * Metrics about an op when its uid is in the foreground for any other reasons.
+ * Uid state: The UID is a foreground app.
* @hide
*/
@TestApi
@SystemApi
- public static final int UID_STATE_FOREGROUND = 4;
+ public static final int UID_STATE_FOREGROUND = 500;
/**
- * Metrics about an op when its uid is in the background for any reason.
+ * Uid state: The UID is a background app.
* @hide
*/
@TestApi
@SystemApi
- public static final int UID_STATE_BACKGROUND = 5;
+ public static final int UID_STATE_BACKGROUND = 600;
/**
- * Metrics about an op when its uid is cached.
+ * Uid state: The UID is a cached app.
* @hide
*/
@TestApi
@SystemApi
- public static final int UID_STATE_CACHED = 6;
+ public static final int UID_STATE_CACHED = 700;
/**
- * Number of uid states we track.
+ * Uid state: The UID state with the highest priority.
* @hide
*/
- public static final int _NUM_UID_STATE = 7;
+ public static final int MAX_PRIORITY_UID_STATE = UID_STATE_PERSISTENT;
+
+ /**
+ * Uid state: The UID state with the lowest priority.
+ * @hide
+ */
+ public static final int MIN_PRIORITY_UID_STATE = UID_STATE_CACHED;
+
+ /**
+ * Resolves the first unrestricted state given an app op. Location is
+ * special as we want to allow its access only if a dedicated location
+ * foreground service is running. For other ops we consider any foreground
+ * service as a foreground state.
+ *
+ * @param op The op to resolve.
+ * @return The last restricted UID state.
+ *
+ * @hide
+ */
+ public static int resolveFirstUnrestrictedUidState(int op) {
+ switch (op) {
+ case OP_FINE_LOCATION:
+ case OP_COARSE_LOCATION: {
+ return UID_STATE_FOREGROUND_SERVICE_LOCATION;
+ }
+ }
+ return UID_STATE_FOREGROUND_SERVICE;
+ }
+
+ /**
+ * Resolves the last restricted state given an app op. Location is
+ * special as we want to allow its access only if a dedicated location
+ * foreground service is running. For other ops we consider any foreground
+ * service as a foreground state.
+ *
+ * @param op The op to resolve.
+ * @return The last restricted UID state.
+ *
+ * @hide
+ */
+ public static int resolveLastRestrictedUidState(int op) {
+ switch (op) {
+ case OP_FINE_LOCATION:
+ case OP_COARSE_LOCATION: {
+ return UID_STATE_FOREGROUND_SERVICE;
+ }
+ }
+ return UID_STATE_FOREGROUND;
+ }
+
+ /** @hide Note: Keep these sorted */
+ public static final int[] UID_STATES = {
+ UID_STATE_PERSISTENT,
+ UID_STATE_TOP,
+ UID_STATE_FOREGROUND_SERVICE_LOCATION,
+ UID_STATE_FOREGROUND_SERVICE,
+ UID_STATE_FOREGROUND,
+ UID_STATE_BACKGROUND,
+ UID_STATE_CACHED
+ };
+
+ /** @hide */
+ public static String getUidStateName(@UidState int uidState) {
+ switch (uidState) {
+ case UID_STATE_PERSISTENT:
+ return "pers";
+ case UID_STATE_TOP:
+ return "top";
+ case UID_STATE_FOREGROUND_SERVICE_LOCATION:
+ return "fgsvcl";
+ case UID_STATE_FOREGROUND_SERVICE:
+ return "fgsvc";
+ case UID_STATE_FOREGROUND:
+ return "fg";
+ case UID_STATE_BACKGROUND:
+ return "bg";
+ case UID_STATE_CACHED:
+ return "cch";
+ default:
+ return "unknown";
+ }
+ }
+
+ /**
+ * Flag: non proxy operations. These are operations
+ * performed on behalf of the app itself and not on behalf of
+ * another one.
+ *
+ * @hide
+ */
+ @TestApi
+ @SystemApi
+ public static final int OP_FLAG_SELF = 0x1;
+
+ /**
+ * Flag: trusted proxy operations. These are operations
+ * performed on behalf of another app by a trusted app.
+ * Which is work a trusted app blames on another app.
+ *
+ * @hide
+ */
+ @TestApi
+ @SystemApi
+ public static final int OP_FLAG_TRUSTED_PROXY = 0x2;
+
+ /**
+ * Flag: untrusted proxy operations. These are operations
+ * performed on behalf of another app by an untrusted app.
+ * Which is work an untrusted app blames on another app.
+ *
+ * @hide
+ */
+ @TestApi
+ @SystemApi
+ public static final int OP_FLAG_UNTRUSTED_PROXY = 0x4;
+
+ /**
+ * Flag: trusted proxied operations. These are operations
+ * performed by a trusted other app on behalf of an app.
+ * Which is work an app was blamed for by a trusted app.
+ *
+ * @hide
+ */
+ @TestApi
+ @SystemApi
+ public static final int OP_FLAG_TRUSTED_PROXIED = 0x8;
+
+ /**
+ * Flag: untrusted proxied operations. These are operations
+ * performed by an untrusted other app on behalf of an app.
+ * Which is work an app was blamed for by an untrusted app.
+ *
+ * @hide
+ */
+ @TestApi
+ @SystemApi
+ public static final int OP_FLAG_UNTRUSTED_PROXIED = 0x10;
+
+ /**
+ * Flags: all operations. These include operations matched
+ * by {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}.
+ *
+ * @hide
+ */
+ @TestApi
+ @SystemApi
+ public static final int OP_FLAGS_ALL =
+ OP_FLAG_SELF
+ | OP_FLAG_TRUSTED_PROXY
+ | OP_FLAG_UNTRUSTED_PROXY
+ | OP_FLAG_TRUSTED_PROXIED
+ | OP_FLAG_UNTRUSTED_PROXIED;
+
+ /**
+ * Flags: all trusted operations which is ones either the app did {@link #OP_FLAG_SELF},
+ * or it was blamed for by a trusted app {@link #OP_FLAG_TRUSTED_PROXIED}, or ones the
+ * app if untrusted blamed on other apps {@link #OP_FLAG_UNTRUSTED_PROXY}.
+ *
+ * @hide
+ */
+ @SystemApi
+ public static final int OP_FLAGS_ALL_TRUSTED = AppOpsManager.OP_FLAG_SELF
+ | AppOpsManager.OP_FLAG_UNTRUSTED_PROXY
+ | AppOpsManager.OP_FLAG_TRUSTED_PROXIED;
+
+ /** @hide */
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef(flag = true, prefix = { "FLAG_" }, value = {
+ OP_FLAG_SELF,
+ OP_FLAG_TRUSTED_PROXY,
+ OP_FLAG_UNTRUSTED_PROXY,
+ OP_FLAG_TRUSTED_PROXIED,
+ OP_FLAG_UNTRUSTED_PROXIED
+ })
+ public @interface OpFlags {}
+
+
+ /** @hide */
+ public static final String getFlagName(@OpFlags int flag) {
+ switch (flag) {
+ case OP_FLAG_SELF:
+ return "s";
+ case OP_FLAG_TRUSTED_PROXY:
+ return "tp";
+ case OP_FLAG_UNTRUSTED_PROXY:
+ return "up";
+ case OP_FLAG_TRUSTED_PROXIED:
+ return "tpd";
+ case OP_FLAG_UNTRUSTED_PROXIED:
+ return "upd";
+ default:
+ return "unknown";
+ }
+ }
+
+ private static final int UID_STATE_OFFSET = 31;
+ private static final int FLAGS_MASK = 0xFFFFFFFF;
+
+ /**
+ * Key for a data bucket storing app op state. The bucket
+ * is composed of the uid state and state flags. This way
+ * we can query data for given uid state and a set of flags where
+ * the flags control which type of data to get. For example,
+ * one can get the ops an app did on behalf of other apps
+ * while in the background.
+ *
+ * @hide
+ */
+ @Retention(RetentionPolicy.SOURCE)
+ @Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
+ public @interface DataBucketKey {
+ }
+
+ /** @hide */
+ public static String keyToString(@DataBucketKey long key) {
+ final int uidState = extractUidStateFromKey(key);
+ final int flags = extractFlagsFromKey(key);
+ return "[" + getUidStateName(uidState) + "-" + flagsToString(flags) + "]";
+ }
+
+ /** @hide */
+ public static @DataBucketKey long makeKey(@UidState int uidState, @OpFlags int flags) {
+ return ((long) uidState << UID_STATE_OFFSET) | flags;
+ }
+
+ /** @hide */
+ public static int extractUidStateFromKey(@DataBucketKey long key) {
+ return (int) (key >> UID_STATE_OFFSET);
+ }
+
+ /** @hide */
+ public static int extractFlagsFromKey(@DataBucketKey long key) {
+ return (int) (key & FLAGS_MASK);
+ }
+
+ /** @hide */
+ public static String flagsToString(@OpFlags int flags) {
+ final StringBuilder flagsBuilder = new StringBuilder();
+ while (flags != 0) {
+ final int flag = 1 << Integer.numberOfTrailingZeros(flags);
+ flags &= ~flag;
+ if (flagsBuilder.length() > 0) {
+ flagsBuilder.append('|');
+ }
+ flagsBuilder.append(getFlagName(flag));
+ }
+ return flagsBuilder.toString();
+ }
// when adding one of these:
// - increment _NUM_OP
@@ -551,7 +801,7 @@
@UnsupportedAppUsage
public static final int OP_MANAGE_IPSEC_TUNNELS = 75;
/** @hide Any app start foreground service. */
- @UnsupportedAppUsage
+ @TestApi
public static final int OP_START_FOREGROUND = 76;
/** @hide */
@UnsupportedAppUsage
@@ -1947,14 +2197,23 @@
mEntries = entries;
}
- public String getPackageName() {
+ /**
+ * @return The name of the package.
+ */
+ public @NonNull String getPackageName() {
return mPackageName;
}
+ /**
+ * @return The uid of the package.
+ */
public int getUid() {
return mUid;
}
+ /**
+ * @return The ops of the package.
+ */
public List<OpEntry> getOps() {
return mEntries;
}
@@ -1999,57 +2258,59 @@
* Class holding the information about one unique operation of an application.
* @hide
*/
+ @TestApi
+ @Immutable
@SystemApi
public static final class OpEntry implements Parcelable {
private final int mOp;
- private final @Mode int mMode;
- private final long[] mTimes;
- private final long[] mRejectTimes;
- private final int mDuration;
- private final int mProxyUid;
private final boolean mRunning;
- private final String mProxyPackageName;
+ private final @Mode int mMode;
+ private final @Nullable LongSparseLongArray mAccessTimes;
+ private final @Nullable LongSparseLongArray mRejectTimes;
+ private final @Nullable LongSparseLongArray mDurations;
+ private final @Nullable LongSparseLongArray mProxyUids;
+ private final @Nullable LongSparseArray<String> mProxyPackageNames;
/**
* @hide
*/
- public OpEntry(int op, @Mode int mode, long time, long rejectTime, int duration,
- int proxyUid, String proxyPackage) {
+ public OpEntry(int op, boolean running, @Mode int mode,
+ @Nullable LongSparseLongArray accessTimes, @Nullable LongSparseLongArray rejectTimes,
+ @Nullable LongSparseLongArray durations, @Nullable LongSparseLongArray proxyUids,
+ @Nullable LongSparseArray<String> proxyPackageNames) {
mOp = op;
- mMode = mode;
- mTimes = new long[_NUM_UID_STATE];
- mRejectTimes = new long[_NUM_UID_STATE];
- mTimes[0] = time;
- mRejectTimes[0] = rejectTime;
- mDuration = duration;
- mRunning = duration == -1;
- mProxyUid = proxyUid;
- mProxyPackageName = proxyPackage;
- }
-
- /**
- * @hide
- */
- public OpEntry(int op, @Mode int mode, long[] times, long[] rejectTimes, int duration,
- boolean running, int proxyUid, String proxyPackage) {
- mOp = op;
- mMode = mode;
- mTimes = new long[_NUM_UID_STATE];
- mRejectTimes = new long[_NUM_UID_STATE];
- System.arraycopy(times, 0, mTimes, 0, _NUM_UID_STATE);
- System.arraycopy(rejectTimes, 0, mRejectTimes, 0, _NUM_UID_STATE);
- mDuration = duration;
mRunning = running;
- mProxyUid = proxyUid;
- mProxyPackageName = proxyPackage;
+ mMode = mode;
+ mAccessTimes = accessTimes;
+ mRejectTimes = rejectTimes;
+ mDurations = durations;
+ mProxyUids = proxyUids;
+ mProxyPackageNames = proxyPackageNames;
}
/**
* @hide
*/
- public OpEntry(int op, @Mode int mode, long[] times, long[] rejectTimes, int duration,
- int proxyUid, String proxyPackage) {
- this(op, mode, times, rejectTimes, duration, duration == -1, proxyUid, proxyPackage);
+ public OpEntry(int op, @Mode int mode) {
+ mOp = op;
+ mMode = mode;
+ mRunning = false;
+ mAccessTimes = null;
+ mRejectTimes = null;
+ mDurations = null;
+ mProxyUids = null;
+ mProxyPackageNames = null;
+ }
+
+ /**
+ * Returns all keys for which we have mapped state in any of the data buckets -
+ * access time, reject time, duration.
+ * @hide */
+ public @Nullable LongSparseArray<Object> collectKeys() {
+ LongSparseArray<Object> result = AppOpsManager.collectKeys(mAccessTimes, null);
+ result = AppOpsManager.collectKeys(mRejectTimes, result);
+ result = AppOpsManager.collectKeys(mDurations, result);
+ return result;
}
/**
@@ -2061,14 +2322,14 @@
}
/**
- * Return this entry's op string name, such as {@link #OPSTR_COARSE_LOCATION}.
+ * @return This entry's op string name, such as {@link #OPSTR_COARSE_LOCATION}.
*/
- public String getOpStr() {
+ public @NonNull String getOpStr() {
return sOpToString[mOp];
}
/**
- * Return this entry's current mode, such as {@link #MODE_ALLOWED}.
+ * @return this entry's current mode, such as {@link #MODE_ALLOWED}.
*/
public @Mode int getMode() {
return mMode;
@@ -2079,89 +2340,331 @@
*/
@UnsupportedAppUsage
public long getTime() {
- return maxTime(mTimes, 0, _NUM_UID_STATE);
+ return getLastAccessTime(OP_FLAGS_ALL);
}
/**
- * Return the last wall clock time this op was accessed by the app.
+ * Return the last wall clock time in milliseconds this op was accessed.
+ *
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the last access time in milliseconds since
+ * epoch start (January 1, 1970 00:00:00.000 GMT - Gregorian).
+ *
+ * @see #getLastAccessForegroundTime(int)
+ * @see #getLastAccessBackgroundTime(int)
+ * @see #getLastAccessTime(int, int, int)
*/
- public long getLastAccessTime() {
- return maxTime(mTimes, 0, _NUM_UID_STATE);
+ public long getLastAccessTime(@OpFlags int flags) {
+ return maxForFlagsInStates(mAccessTimes, MAX_PRIORITY_UID_STATE,
+ MIN_PRIORITY_UID_STATE, flags);
}
/**
- * Return the last wall clock time this op was accessed by the app while in the foreground.
+ * Return the last wall clock time in milliseconds this op was accessed
+ * by the app while in the foreground.
+ *
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the last foreground access time in milliseconds since
+ * epoch start (January 1, 1970 00:00:00.000 GMT - Gregorian).
+ *
+ * @see #getLastAccessBackgroundTime(int)
+ * @see #getLastAccessTime(int)
+ * @see #getLastAccessTime(int, int, int)
*/
- public long getLastAccessForegroundTime() {
- return maxTime(mTimes, UID_STATE_PERSISTENT, UID_STATE_LAST_NON_RESTRICTED + 1);
+ public long getLastAccessForegroundTime(@OpFlags int flags) {
+ return maxForFlagsInStates(mAccessTimes, MAX_PRIORITY_UID_STATE,
+ resolveFirstUnrestrictedUidState(mOp), flags);
}
/**
- * Return the last wall clock time this op was accessed by the app while in the background.
+ * Return the last wall clock time in milliseconds this op was accessed
+ * by the app while in the background.
+ *
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the last foreground access time in milliseconds since
+ * epoch start (January 1, 1970 00:00:00.000 GMT - Gregorian).
+ *
+ * @see #getLastAccessForegroundTime(int)
+ * @see #getLastAccessTime(int)
+ * @see #getLastAccessTime(int, int, int)
*/
- public long getLastAccessBackgroundTime() {
- return maxTime(mTimes, UID_STATE_LAST_NON_RESTRICTED + 1, _NUM_UID_STATE);
+ public long getLastAccessBackgroundTime(@OpFlags int flags) {
+ return maxForFlagsInStates(mAccessTimes, resolveLastRestrictedUidState(mOp),
+ MIN_PRIORITY_UID_STATE, flags);
}
/**
- * @hide
+ * Return the last wall clock time in milliseconds this op was accessed
+ * by the app for a given range of UID states.
+ *
+ * @param fromUidState The UID state for which to query. Could be one of
+ * {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
+ * {@link #UID_STATE_FOREGROUND_SERVICE}, {@link #UID_STATE_FOREGROUND},
+ * {@link #UID_STATE_BACKGROUND}, {@link #UID_STATE_CACHED}.
+ * @param toUidState The UID state for which to query.
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ *
+ * @return the last foreground access time in milliseconds since
+ * epoch start (January 1, 1970 00:00:00.000 GMT - Gregorian).
+ *
+ * @see #getLastAccessForegroundTime(int)
+ * @see #getLastAccessBackgroundTime(int)
+ * @see #getLastAccessTime(int)
*/
- public long getLastTimeFor(int uidState) {
- return mTimes[uidState];
+ public long getLastAccessTime(@UidState int fromUidState, @UidState int toUidState,
+ @OpFlags int flags) {
+ return maxForFlagsInStates(mAccessTimes, fromUidState, toUidState, flags);
}
/**
* @hide
*/
public long getRejectTime() {
- return maxTime(mRejectTimes, 0, _NUM_UID_STATE);
+ return getLastRejectTime(OP_FLAGS_ALL);
}
/**
- * Return the last wall clock time the app made an attempt to access this op but
- * was rejected.
+ * Return the last wall clock time in milliseconds the app made an attempt
+ * to access this op but was rejected.
+ *
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the last reject time in milliseconds since
+ * epoch start (January 1, 1970 00:00:00.000 GMT - Gregorian).
+ *
+ * @see #getLastRejectBackgroundTime(int)
+ * @see #getLastRejectForegroundTime(int)
+ * @see #getLastRejectTime(int, int, int)
*/
- public long getLastRejectTime() {
- return maxTime(mRejectTimes, 0, _NUM_UID_STATE);
+ public long getLastRejectTime(@OpFlags int flags) {
+ return maxForFlagsInStates(mRejectTimes, MAX_PRIORITY_UID_STATE,
+ MIN_PRIORITY_UID_STATE, flags);
}
/**
- * Return the last wall clock time the app made an attempt to access this op while in
- * the foreground but was rejected.
+ * Return the last wall clock time in milliseconds the app made an attempt
+ * to access this op while in the foreground but was rejected.
+ *
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the last foreground reject time in milliseconds since
+ * epoch start (January 1, 1970 00:00:00.000 GMT - Gregorian).
+ *
+ * @see #getLastRejectBackgroundTime(int)
+ * @see #getLastRejectTime(int, int, int)
+ * @see #getLastRejectTime(int)
*/
- public long getLastRejectForegroundTime() {
- return maxTime(mRejectTimes, UID_STATE_PERSISTENT, UID_STATE_LAST_NON_RESTRICTED + 1);
+ public long getLastRejectForegroundTime(@OpFlags int flags) {
+ return maxForFlagsInStates(mRejectTimes, MAX_PRIORITY_UID_STATE,
+ resolveFirstUnrestrictedUidState(mOp), flags);
}
/**
- * Return the last wall clock time the app made an attempt to access this op while in
- * the background but was rejected.
+ * Return the last wall clock time in milliseconds the app made an attempt
+ * to access this op while in the background but was rejected.
+ *
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the last background reject time in milliseconds since
+ * epoch start (January 1, 1970 00:00:00.000 GMT - Gregorian).
+ *
+ * @see #getLastRejectForegroundTime(int)
+ * @see #getLastRejectTime(int, int, int)
+ * @see #getLastRejectTime(int)
*/
- public long getLastRejectBackgroundTime() {
- return maxTime(mRejectTimes, UID_STATE_LAST_NON_RESTRICTED + 1, _NUM_UID_STATE);
+ public long getLastRejectBackgroundTime(@OpFlags int flags) {
+ return maxForFlagsInStates(mRejectTimes, resolveLastRestrictedUidState(mOp),
+ MIN_PRIORITY_UID_STATE, flags);
}
/**
- * @hide
+ * Return the last wall clock time state in milliseconds the app made an
+ * attempt to access this op for a given range of UID states.
+ *
+ * @param fromUidState The UID state from which to query. Could be one of
+ * {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
+ * {@link #UID_STATE_FOREGROUND_SERVICE}, {@link #UID_STATE_FOREGROUND},
+ * {@link #UID_STATE_BACKGROUND}, {@link #UID_STATE_CACHED}.
+ * @param toUidState The UID state to which to query.
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the last foreground access time in milliseconds since
+ * epoch start (January 1, 1970 00:00:00.000 GMT - Gregorian).
+ *
+ * @see #getLastRejectForegroundTime(int)
+ * @see #getLastRejectBackgroundTime(int)
+ * @see #getLastRejectTime(int)
*/
- public long getLastRejectTimeFor(int uidState) {
- return mRejectTimes[uidState];
+ public long getLastRejectTime(@UidState int fromUidState, @UidState int toUidState,
+ @OpFlags int flags) {
+ return maxForFlagsInStates(mRejectTimes, fromUidState, toUidState, flags);
}
+ /**
+ * @return Whether the operation is running.
+ */
public boolean isRunning() {
return mRunning;
}
- public int getDuration() {
- return mDuration;
+ /**
+ * @return The duration of the operation in milliseconds.
+ */
+ public long getDuration() {
+ return getLastDuration(MAX_PRIORITY_UID_STATE, MIN_PRIORITY_UID_STATE, OP_FLAGS_ALL);
}
+ /**
+ * Return the duration in milliseconds the app accessed this op while
+ * in the foreground.
+ *
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the foreground access duration in milliseconds.
+ *
+ * @see #getLastBackgroundDuration(int)
+ * @see #getLastDuration(int, int, int)
+ */
+ public long getLastForegroundDuration(@OpFlags int flags) {
+ return sumForFlagsInStates(mDurations, MAX_PRIORITY_UID_STATE,
+ resolveFirstUnrestrictedUidState(mOp), flags);
+ }
+
+ /**
+ * Return the duration in milliseconds the app accessed this op while
+ * in the background.
+ *
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the background access duration in milliseconds.
+ *
+ * @see #getLastForegroundDuration(int)
+ * @see #getLastDuration(int, int, int)
+ */
+ public long getLastBackgroundDuration(@OpFlags int flags) {
+ return sumForFlagsInStates(mDurations, resolveLastRestrictedUidState(mOp),
+ MIN_PRIORITY_UID_STATE, flags);
+ }
+
+ /**
+ * Return the duration in milliseconds the app accessed this op for
+ * a given range of UID states.
+ *
+ * @param fromUidState The UID state for which to query. Could be one of
+ * {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
+ * {@link #UID_STATE_FOREGROUND_SERVICE}, {@link #UID_STATE_FOREGROUND},
+ * {@link #UID_STATE_BACKGROUND}, {@link #UID_STATE_CACHED}.
+ * @param toUidState The UID state for which to query.
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return the access duration in milliseconds.
+ */
+ public long getLastDuration(@UidState int fromUidState, @UidState int toUidState,
+ @OpFlags int flags) {
+ return sumForFlagsInStates(mDurations, fromUidState, toUidState, flags);
+ }
+
+ /**
+ * Gets the UID of the app that performed the op on behalf of this app and
+ * as a result blamed the op on this app or {@link Process#INVALID_UID} if
+ * there is no proxy.
+ *
+ * @return The proxy UID.
+ */
public int getProxyUid() {
- return mProxyUid;
+ return (int) findFirstNonNegativeForFlagsInStates(mDurations,
+ MAX_PRIORITY_UID_STATE, MIN_PRIORITY_UID_STATE, OP_FLAGS_ALL);
}
- public String getProxyPackageName() {
- return mProxyPackageName;
+ /**
+ * Gets the UID of the app that performed the op on behalf of this app and
+ * as a result blamed the op on this app or {@link Process#INVALID_UID} if
+ * there is no proxy.
+ *
+ * @param uidState The UID state for which to query. Could be one of
+ * {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
+ * {@link #UID_STATE_FOREGROUND_SERVICE}, {@link #UID_STATE_FOREGROUND},
+ * {@link #UID_STATE_BACKGROUND}, {@link #UID_STATE_CACHED}.
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ *
+ * @return The proxy UID.
+ */
+ public int getProxyUid(@UidState int uidState, @OpFlags int flags) {
+ return (int) findFirstNonNegativeForFlagsInStates(mDurations,
+ uidState, uidState, flags);
+ }
+
+ /**
+ * Gets the package name of the app that performed the op on behalf of this
+ * app and as a result blamed the op on this app or {@code null}
+ * if there is no proxy.
+ *
+ * @return The proxy package name.
+ */
+ public @Nullable String getProxyPackageName() {
+ return findFirstNonNullForFlagsInStates(mProxyPackageNames, MAX_PRIORITY_UID_STATE,
+ MIN_PRIORITY_UID_STATE, OP_FLAGS_ALL);
+ }
+
+ /**
+ * Gets the package name of the app that performed the op on behalf of this
+ * app and as a result blamed the op on this app for a UID state or
+ * {@code null} if there is no proxy.
+ *
+ * @param uidState The UID state for which to query. Could be one of
+ * {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
+ * {@link #UID_STATE_FOREGROUND_SERVICE}, {@link #UID_STATE_FOREGROUND},
+ * {@link #UID_STATE_BACKGROUND}, {@link #UID_STATE_CACHED}.
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return The proxy package name.
+ */
+ public @Nullable String getProxyPackageName(@UidState int uidState, @OpFlags int flags) {
+ return findFirstNonNullForFlagsInStates(mProxyPackageNames, uidState, uidState, flags);
}
@Override
@@ -2173,23 +2676,23 @@
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(mOp);
dest.writeInt(mMode);
- dest.writeLongArray(mTimes);
- dest.writeLongArray(mRejectTimes);
- dest.writeInt(mDuration);
dest.writeBoolean(mRunning);
- dest.writeInt(mProxyUid);
- dest.writeString(mProxyPackageName);
+ writeLongSparseLongArrayToParcel(mAccessTimes, dest);
+ writeLongSparseLongArrayToParcel(mRejectTimes, dest);
+ writeLongSparseLongArrayToParcel(mDurations, dest);
+ writeLongSparseLongArrayToParcel(mProxyUids, dest);
+ writeLongSparseStringArrayToParcel(mProxyPackageNames, dest);
}
OpEntry(Parcel source) {
mOp = source.readInt();
mMode = source.readInt();
- mTimes = source.createLongArray();
- mRejectTimes = source.createLongArray();
- mDuration = source.readInt();
mRunning = source.readBoolean();
- mProxyUid = source.readInt();
- mProxyPackageName = source.readString();
+ mAccessTimes = readLongSparseLongArrayFromParcel(source);
+ mRejectTimes = readLongSparseLongArrayFromParcel(source);
+ mDurations = readLongSparseLongArrayFromParcel(source);
+ mProxyUids = readLongSparseLongArrayFromParcel(source);
+ mProxyPackageNames = readLongSparseStringArrayFromParcel(source);
}
public static final @android.annotation.NonNull Creator<OpEntry> CREATOR = new Creator<OpEntry>() {
@@ -2226,14 +2729,17 @@
private final @Nullable List<String> mOpNames;
private final long mBeginTimeMillis;
private final long mEndTimeMillis;
+ private final @OpFlags int mFlags;
private HistoricalOpsRequest(int uid, @Nullable String packageName,
- @Nullable List<String> opNames, long beginTimeMillis, long endTimeMillis) {
+ @Nullable List<String> opNames, long beginTimeMillis, long endTimeMillis,
+ @OpFlags int flags) {
mUid = uid;
mPackageName = packageName;
mOpNames = opNames;
mBeginTimeMillis = beginTimeMillis;
mEndTimeMillis = endTimeMillis;
+ mFlags = flags;
}
/**
@@ -2249,6 +2755,7 @@
private @Nullable List<String> mOpNames;
private final long mBeginTimeMillis;
private final long mEndTimeMillis;
+ private @OpFlags int mFlags = OP_FLAGS_ALL;
/**
* Creates a new builder.
@@ -2311,11 +2818,28 @@
}
/**
+ * Sets the op flags to query for. The flags specify the type of
+ * op data being queried.
+ *
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
+ * @return This builder.
+ */
+ public @NonNull Builder setFlags(@OpFlags int flags) {
+ Preconditions.checkFlagsArgument(flags, OP_FLAGS_ALL);
+ mFlags = flags;
+ return this;
+ }
+
+ /**
* @return a new {@link HistoricalOpsRequest}.
*/
public @NonNull HistoricalOpsRequest build() {
return new HistoricalOpsRequest(mUid, mPackageName, mOpNames,
- mBeginTimeMillis, mEndTimeMillis);
+ mBeginTimeMillis, mEndTimeMillis, mFlags);
}
}
}
@@ -2521,25 +3045,25 @@
/** @hide */
@TestApi
public void increaseAccessCount(int opCode, int uid, @NonNull String packageName,
- @UidState int uidState, long increment) {
+ @UidState int uidState, @OpFlags int flags, long increment) {
getOrCreateHistoricalUidOps(uid).increaseAccessCount(opCode,
- packageName, uidState, increment);
+ packageName, uidState, flags, increment);
}
/** @hide */
@TestApi
public void increaseRejectCount(int opCode, int uid, @NonNull String packageName,
- @UidState int uidState, long increment) {
+ @UidState int uidState, @OpFlags int flags, long increment) {
getOrCreateHistoricalUidOps(uid).increaseRejectCount(opCode,
- packageName, uidState, increment);
+ packageName, uidState, flags, increment);
}
/** @hide */
@TestApi
public void increaseAccessDuration(int opCode, int uid, @NonNull String packageName,
- @UidState int uidState, long increment) {
+ @UidState int uidState, @OpFlags int flags, long increment) {
getOrCreateHistoricalUidOps(uid).increaseAccessDuration(opCode,
- packageName, uidState, increment);
+ packageName, uidState, flags, increment);
}
/** @hide */
@@ -2834,21 +3358,21 @@
}
private void increaseAccessCount(int opCode, @NonNull String packageName,
- @UidState int uidState, long increment) {
+ @UidState int uidState, @OpFlags int flags, long increment) {
getOrCreateHistoricalPackageOps(packageName).increaseAccessCount(
- opCode, uidState, increment);
+ opCode, uidState, flags, increment);
}
private void increaseRejectCount(int opCode, @NonNull String packageName,
- @UidState int uidState, long increment) {
+ @UidState int uidState, @OpFlags int flags, long increment) {
getOrCreateHistoricalPackageOps(packageName).increaseRejectCount(
- opCode, uidState, increment);
+ opCode, uidState, flags, increment);
}
private void increaseAccessDuration(int opCode, @NonNull String packageName,
- @UidState int uidState, long increment) {
+ @UidState int uidState, @OpFlags int flags, long increment) {
getOrCreateHistoricalPackageOps(packageName).increaseAccessDuration(
- opCode, uidState, increment);
+ opCode, uidState, flags, increment);
}
/**
@@ -3070,16 +3594,19 @@
return true;
}
- private void increaseAccessCount(int opCode, @UidState int uidState, long increment) {
- getOrCreateHistoricalOp(opCode).increaseAccessCount(uidState, increment);
+ private void increaseAccessCount(int opCode, @UidState int uidState,
+ @OpFlags int flags, long increment) {
+ getOrCreateHistoricalOp(opCode).increaseAccessCount(uidState, flags, increment);
}
- private void increaseRejectCount(int opCode, @UidState int uidState, long increment) {
- getOrCreateHistoricalOp(opCode).increaseRejectCount(uidState, increment);
+ private void increaseRejectCount(int opCode, @UidState int uidState,
+ @OpFlags int flags, long increment) {
+ getOrCreateHistoricalOp(opCode).increaseRejectCount(uidState, flags, increment);
}
- private void increaseAccessDuration(int opCode, @UidState int uidState, long increment) {
- getOrCreateHistoricalOp(opCode).increaseAccessDuration(uidState, increment);
+ private void increaseAccessDuration(int opCode, @UidState int uidState,
+ @OpFlags int flags, long increment) {
+ getOrCreateHistoricalOp(opCode).increaseAccessDuration(uidState, flags, increment);
}
/**
@@ -3095,7 +3622,6 @@
* Gets number historical app ops.
*
* @return The number historical app ops.
- *
* @see #getOpAt(int)
*/
public int getOpCount() {
@@ -3109,9 +3635,7 @@
* Gets the historical op at a given index.
*
* @param index The index to lookup.
- *
* @return The op at the given index.
- *
* @see #getOpCount()
*/
public @NonNull HistoricalOp getOpAt(int index) {
@@ -3125,7 +3649,6 @@
* Gets the historical entry for a given op name.
*
* @param opName The op name.
- *
* @return The historical entry for that op name.
*/
public @Nullable HistoricalOp getOp(@NonNull String opName) {
@@ -3219,39 +3742,33 @@
@SystemApi
public static final class HistoricalOp implements Parcelable {
private final int mOp;
- private @Nullable long[] mAccessCount;
- private @Nullable long[] mRejectCount;
- private @Nullable long[] mAccessDuration;
+ private @Nullable LongSparseLongArray mAccessCount;
+ private @Nullable LongSparseLongArray mRejectCount;
+ private @Nullable LongSparseLongArray mAccessDuration;
/** @hide */
public HistoricalOp(int op) {
mOp = op;
- mAccessCount = new long[_NUM_UID_STATE];
- mRejectCount = new long[_NUM_UID_STATE];
- mAccessDuration = new long[_NUM_UID_STATE];
}
private HistoricalOp(@NonNull HistoricalOp other) {
mOp = other.mOp;
if (other.mAccessCount != null) {
- System.arraycopy(other.mAccessCount, 0, getOrCreateAccessCount(),
- 0, other.mAccessCount.length);
+ mAccessCount = other.mAccessCount.clone();
}
if (other.mRejectCount != null) {
- System.arraycopy(other.mRejectCount, 0, getOrCreateRejectCount(),
- 0, other.mRejectCount.length);
+ mRejectCount = other.mRejectCount.clone();
}
if (other.mAccessDuration != null) {
- System.arraycopy(other.mAccessDuration, 0, getOrCreateAccessDuration(),
- 0, other.mAccessDuration.length);
+ mAccessDuration = other.mAccessDuration.clone();
}
}
private HistoricalOp(@NonNull Parcel parcel) {
mOp = parcel.readInt();
- mAccessCount = parcel.createLongArray();
- mRejectCount = parcel.createLongArray();
- mAccessDuration = parcel.createLongArray();
+ mAccessCount = readLongSparseLongArrayFromParcel(parcel);
+ mRejectCount = readLongSparseLongArrayFromParcel(parcel);
+ mAccessDuration = readLongSparseLongArrayFromParcel(parcel);
}
private void filter(double scaleFactor) {
@@ -3266,90 +3783,64 @@
&& !hasData(mAccessDuration);
}
- private boolean hasData(@NonNull long[] array) {
- for (long value : array) {
- if (value != 0) {
- return true;
- }
- }
- return false;
+ private boolean hasData(@NonNull LongSparseLongArray array) {
+ return (array != null && array.size() > 0);
}
private @Nullable HistoricalOp splice(double fractionToRemove) {
- HistoricalOp splice = null;
- if (mAccessCount != null) {
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- final long spliceAccessCount = Math.round(
- mAccessCount[i] * fractionToRemove);
- if (spliceAccessCount > 0) {
- if (splice == null) {
- splice = new HistoricalOp(mOp);
- }
- splice.getOrCreateAccessCount()[i] = spliceAccessCount;
- mAccessCount[i] -= spliceAccessCount;
- }
- }
- }
-
- if (mRejectCount != null) {
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- final long spliceRejectCount = Math.round(
- mRejectCount[i] * fractionToRemove);
-
- if (spliceRejectCount > 0) {
- if (splice == null) {
- splice = new HistoricalOp(mOp);
- }
- splice.getOrCreateRejectCount()[i] = spliceRejectCount;
- mRejectCount[i] -= spliceRejectCount;
- }
- }
- }
-
- if (mAccessDuration != null) {
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- final long spliceAccessDuration = Math.round(
- mAccessDuration[i] * fractionToRemove);
- if (spliceAccessDuration > 0) {
- if (splice == null) {
- splice = new HistoricalOp(mOp);
- }
- splice.getOrCreateAccessDuration()[i] = spliceAccessDuration;
- mAccessDuration[i] -= spliceAccessDuration;
- }
- }
- }
+ final HistoricalOp splice = new HistoricalOp(mOp);
+ splice(mAccessCount, splice::getOrCreateAccessCount, fractionToRemove);
+ splice(mRejectCount, splice::getOrCreateRejectCount, fractionToRemove);
+ splice(mAccessDuration, splice::getOrCreateAccessDuration, fractionToRemove);
return splice;
}
+ private static void splice(@Nullable LongSparseLongArray sourceContainer,
+ @NonNull Supplier<LongSparseLongArray> destContainerProvider,
+ double fractionToRemove) {
+ if (sourceContainer != null) {
+ final int size = sourceContainer.size();
+ for (int i = 0; i < size; i++) {
+ final long key = sourceContainer.keyAt(i);
+ final long value = sourceContainer.valueAt(i);
+ final long removedFraction = Math.round(value * fractionToRemove);
+ if (removedFraction > 0) {
+ destContainerProvider.get().put(key, removedFraction);
+ sourceContainer.put(key, value - removedFraction);
+ }
+ }
+ }
+ }
+
private void merge(@NonNull HistoricalOp other) {
- if (other.mAccessCount != null) {
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- getOrCreateAccessCount()[i] += other.mAccessCount[i];
- }
- }
- if (other.mRejectCount != null) {
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- getOrCreateRejectCount()[i] += other.mRejectCount[i];
- }
- }
- if (other.mAccessDuration != null) {
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- getOrCreateAccessDuration()[i] += other.mAccessDuration[i];
- }
- }
+ merge(this::getOrCreateAccessCount, other.mAccessCount);
+ merge(this::getOrCreateRejectCount, other.mRejectCount);
+ merge(this::getOrCreateAccessDuration, other.mAccessDuration);
}
- private void increaseAccessCount(@UidState int uidState, long increment) {
- getOrCreateAccessCount()[uidState] += increment;
+ private void increaseAccessCount(@UidState int uidState, @OpFlags int flags,
+ long increment) {
+ increaseCount(getOrCreateAccessCount(), uidState, flags, increment);
}
- private void increaseRejectCount(@UidState int uidState, long increment) {
- getOrCreateRejectCount()[uidState] += increment;
+ private void increaseRejectCount(@UidState int uidState, @OpFlags int flags,
+ long increment) {
+ increaseCount(getOrCreateRejectCount(), uidState, flags, increment);
}
- private void increaseAccessDuration(@UidState int uidState, long increment) {
- getOrCreateAccessDuration()[uidState] += increment;
+ private void increaseAccessDuration(@UidState int uidState, @OpFlags int flags,
+ long increment) {
+ increaseCount(getOrCreateAccessDuration(), uidState, flags, increment);
+ }
+
+ private void increaseCount(@NonNull LongSparseLongArray counts,
+ @UidState int uidState, @OpFlags int flags, long increment) {
+ while (flags != 0) {
+ final int flag = 1 << Integer.numberOfTrailingZeros(flags);
+ flags &= ~flag;
+ final long key = makeKey(uidState, flag);
+ counts.put(key, counts.get(key) + increment);
+ }
}
/**
@@ -3369,154 +3860,186 @@
/**
* Gets the number times the op was accessed (performed) in the foreground.
*
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
* @return The times the op was accessed in the foreground.
*
- * @see #getBackgroundAccessCount()
- * @see #getAccessCount(int)
+ * @see #getBackgroundAccessCount(int)
+ * @see #getAccessCount(int, int, int)
*/
- public long getForegroundAccessCount() {
- if (mAccessCount == null) {
- return 0;
- }
- return sum(mAccessCount, UID_STATE_PERSISTENT, UID_STATE_LAST_NON_RESTRICTED + 1);
+ public long getForegroundAccessCount(@OpFlags int flags) {
+ return sumForFlagsInStates(mAccessCount, MAX_PRIORITY_UID_STATE,
+ resolveFirstUnrestrictedUidState(mOp), flags);
}
/**
* Gets the number times the op was accessed (performed) in the background.
*
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
* @return The times the op was accessed in the background.
*
- * @see #getForegroundAccessCount()
- * @see #getAccessCount(int)
+ * @see #getForegroundAccessCount(int)
+ * @see #getAccessCount(int, int, int)
*/
- public long getBackgroundAccessCount() {
- if (mAccessCount == null) {
- return 0;
- }
- return sum(mAccessCount, UID_STATE_LAST_NON_RESTRICTED + 1, _NUM_UID_STATE);
+ public long getBackgroundAccessCount(@OpFlags int flags) {
+ return sumForFlagsInStates(mAccessCount, resolveLastRestrictedUidState(mOp),
+ MIN_PRIORITY_UID_STATE, flags);
}
/**
- * Gets the number times the op was accessed (performed) for a given uid state.
+ * Gets the number times the op was accessed (performed) for a
+ * range of uid states.
*
- * @param uidState The UID state for which to query. Could be one of
+ * @param fromUidState The UID state from which to query. Could be one of
* {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
* {@link #UID_STATE_FOREGROUND_SERVICE_LOCATION},
* {@link #UID_STATE_FOREGROUND_SERVICE}, {@link #UID_STATE_FOREGROUND},
* {@link #UID_STATE_BACKGROUND}, {@link #UID_STATE_CACHED}.
+ * @param toUidState The UID state to which to query.
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
*
* @return The times the op was accessed for the given UID state.
*
- * @see #getForegroundAccessCount()
- * @see #getBackgroundAccessCount()
+ * @see #getForegroundAccessCount(int)
+ * @see #getBackgroundAccessCount(int)
*/
- public long getAccessCount(@UidState int uidState) {
- if (mAccessCount == null) {
- return 0;
- }
- return mAccessCount[uidState];
+ public long getAccessCount(@UidState int fromUidState, @UidState int toUidState,
+ @OpFlags int flags) {
+ return sumForFlagsInStates(mAccessCount, fromUidState, toUidState, flags);
}
/**
* Gets the number times the op was rejected in the foreground.
*
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
* @return The times the op was rejected in the foreground.
*
- * @see #getBackgroundRejectCount()
- * @see #getRejectCount(int)
+ * @see #getBackgroundRejectCount(int)
+ * @see #getRejectCount(int, int, int)
*/
- public long getForegroundRejectCount() {
- if (mRejectCount == null) {
- return 0;
- }
- return sum(mRejectCount, UID_STATE_PERSISTENT, UID_STATE_LAST_NON_RESTRICTED + 1);
+ public long getForegroundRejectCount(@OpFlags int flags) {
+ return sumForFlagsInStates(mRejectCount, MAX_PRIORITY_UID_STATE,
+ resolveFirstUnrestrictedUidState(mOp), flags);
}
/**
* Gets the number times the op was rejected in the background.
*
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
* @return The times the op was rejected in the background.
*
- * @see #getForegroundRejectCount()
- * @see #getRejectCount(int)
+ * @see #getForegroundRejectCount(int)
+ * @see #getRejectCount(int, int, int)
*/
- public long getBackgroundRejectCount() {
- if (mRejectCount == null) {
- return 0;
- }
- return sum(mRejectCount, UID_STATE_LAST_NON_RESTRICTED + 1, _NUM_UID_STATE);
+ public long getBackgroundRejectCount(@OpFlags int flags) {
+ return sumForFlagsInStates(mRejectCount, resolveLastRestrictedUidState(mOp),
+ MIN_PRIORITY_UID_STATE, flags);
}
/**
- * Gets the number times the op was rejected for a given uid state.
+ * Gets the number times the op was rejected for a given range of UID states.
*
- * @param uidState The UID state for which to query. Could be one of
+ * @param fromUidState The UID state from which to query. Could be one of
* {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
* {@link #UID_STATE_FOREGROUND_SERVICE_LOCATION},
* {@link #UID_STATE_FOREGROUND_SERVICE}, {@link #UID_STATE_FOREGROUND},
* {@link #UID_STATE_BACKGROUND}, {@link #UID_STATE_CACHED}.
+ * @param toUidState The UID state to which to query.
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
*
* @return The times the op was rejected for the given UID state.
*
- * @see #getForegroundRejectCount()
- * @see #getBackgroundRejectCount()
+ * @see #getForegroundRejectCount(int)
+ * @see #getBackgroundRejectCount(int)
*/
- public long getRejectCount(@UidState int uidState) {
- if (mRejectCount == null) {
- return 0;
- }
- return mRejectCount[uidState];
+ public long getRejectCount(@UidState int fromUidState, @UidState int toUidState,
+ @OpFlags int flags) {
+ return sumForFlagsInStates(mRejectCount, fromUidState, toUidState, flags);
}
/**
* Gets the total duration the app op was accessed (performed) in the foreground.
*
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
* @return The total duration the app op was accessed in the foreground.
*
- * @see #getBackgroundAccessDuration()
- * @see #getAccessDuration(int)
+ * @see #getBackgroundAccessDuration(int)
+ * @see #getAccessDuration(int, int, int)
*/
- public long getForegroundAccessDuration() {
- if (mAccessDuration == null) {
- return 0;
- }
- return sum(mAccessDuration, UID_STATE_PERSISTENT, UID_STATE_LAST_NON_RESTRICTED + 1);
+ public long getForegroundAccessDuration(@OpFlags int flags) {
+ return sumForFlagsInStates(mAccessDuration, MAX_PRIORITY_UID_STATE,
+ resolveFirstUnrestrictedUidState(mOp), flags);
}
/**
* Gets the total duration the app op was accessed (performed) in the background.
*
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
* @return The total duration the app op was accessed in the background.
*
- * @see #getForegroundAccessDuration()
- * @see #getAccessDuration(int)
+ * @see #getForegroundAccessDuration(int)
+ * @see #getAccessDuration(int, int, int)
*/
- public long getBackgroundAccessDuration() {
- if (mAccessDuration == null) {
- return 0;
- }
- return sum(mAccessDuration, UID_STATE_LAST_NON_RESTRICTED + 1, _NUM_UID_STATE);
+ public long getBackgroundAccessDuration(@OpFlags int flags) {
+ return sumForFlagsInStates(mAccessDuration, resolveLastRestrictedUidState(mOp),
+ MIN_PRIORITY_UID_STATE, flags);
}
/**
- * Gets the total duration the app op was accessed (performed) for a given UID state.
+ * Gets the total duration the app op was accessed (performed) for a given
+ * range of UID states.
*
- * @param uidState The UID state for which to query. Could be one of
+ * @param fromUidState The UID state from which to query. Could be one of
* {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
* {@link #UID_STATE_FOREGROUND_SERVICE_LOCATION},
* {@link #UID_STATE_FOREGROUND_SERVICE}, {@link #UID_STATE_FOREGROUND},
* {@link #UID_STATE_BACKGROUND}, {@link #UID_STATE_CACHED}.
+ * @param toUidState The UID state from which to query.
+ * @param flags The flags which are any combination of
+ * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
+ * {@link #OP_FLAG_UNTRUSTED_PROXY}, {@link #OP_FLAG_TRUSTED_PROXIED},
+ * {@link #OP_FLAG_UNTRUSTED_PROXIED}. You can use {@link #OP_FLAGS_ALL}
+ * for any flag.
*
* @return The total duration the app op was accessed for the given UID state.
*
- * @see #getForegroundAccessDuration()
- * @see #getBackgroundAccessDuration()
+ * @see #getForegroundAccessDuration(int)
+ * @see #getBackgroundAccessDuration(int)
*/
- public long getAccessDuration(@UidState int uidState) {
- if (mAccessDuration == null) {
- return 0;
- }
- return mAccessDuration[uidState];
+ public long getAccessDuration(@UidState int fromUidState, @UidState int toUidState,
+ @OpFlags int flags) {
+ return sumForFlagsInStates(mAccessDuration, fromUidState, toUidState, flags);
}
@Override
@@ -3527,80 +4050,11 @@
@Override
public void writeToParcel(Parcel parcel, int flags) {
parcel.writeInt(mOp);
- parcel.writeLongArray(mAccessCount);
- parcel.writeLongArray(mRejectCount);
- parcel.writeLongArray(mAccessDuration);
+ writeLongSparseLongArrayToParcel(mAccessCount, parcel);
+ writeLongSparseLongArrayToParcel(mRejectCount, parcel);
+ writeLongSparseLongArrayToParcel(mAccessDuration, parcel);
}
- private void accept(@NonNull HistoricalOpsVisitor visitor) {
- visitor.visitHistoricalOp(this);
- }
-
- private @NonNull long[] getOrCreateAccessCount() {
- if (mAccessCount == null) {
- mAccessCount = new long[_NUM_UID_STATE];
- }
- return mAccessCount;
- }
-
- private @NonNull long[] getOrCreateRejectCount() {
- if (mRejectCount == null) {
- mRejectCount = new long[_NUM_UID_STATE];
- }
- return mRejectCount;
- }
-
- private @NonNull long[] getOrCreateAccessDuration() {
- if (mAccessDuration == null) {
- mAccessDuration = new long[_NUM_UID_STATE];
- }
- return mAccessDuration;
- }
-
- /**
- *
- * Computes the sum given the start and end index.
- *
- * @param counts The data array.
- * @param start The start index (inclusive)
- * @param end The end index (exclusive)
- * @return The sum.
- */
- private static long sum(@NonNull long[] counts, int start, int end) {
- long totalCount = 0;
- for (int i = start; i < end; i++) {
- totalCount += counts[i];
- }
- return totalCount;
- }
-
- /**
- * Multiplies the entries in the array with the passed in scale factor and
- * rounds the result at up 0.5 boundary.
- *
- * @param data The data to scale.
- * @param scaleFactor The scale factor.
- */
- private static void scale(@NonNull long[] data, double scaleFactor) {
- if (data != null) {
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- data[i] = (long) HistoricalOps.round((double) data[i] * scaleFactor);
- }
- }
- }
-
- public static final @android.annotation.NonNull Creator<HistoricalOp> CREATOR = new Creator<HistoricalOp>() {
- @Override
- public @NonNull HistoricalOp createFromParcel(@NonNull Parcel source) {
- return new HistoricalOp(source);
- }
-
- @Override
- public @NonNull HistoricalOp[] newArray(int size) {
- return new HistoricalOp[size];
- }
- };
-
@Override
public boolean equals(Object obj) {
if (this == obj) {
@@ -3613,23 +4067,201 @@
if (mOp != other.mOp) {
return false;
}
- if (!Arrays.equals(mAccessCount, other.mAccessCount)) {
+ if (!Objects.equals(mAccessCount, other.mAccessCount)) {
return false;
}
- if (!Arrays.equals(mRejectCount, other.mRejectCount)) {
+ if (!Objects.equals(mRejectCount, other.mRejectCount)) {
return false;
}
- return Arrays.equals(mAccessDuration, other.mAccessDuration);
+ return Objects.equals(mAccessDuration, other.mAccessDuration);
}
@Override
public int hashCode() {
int result = mOp;
- result = 31 * result + Arrays.hashCode(mAccessCount);
- result = 31 * result + Arrays.hashCode(mRejectCount);
- result = 31 * result + Arrays.hashCode(mAccessDuration);
+ result = 31 * result + Objects.hashCode(mAccessCount);
+ result = 31 * result + Objects.hashCode(mRejectCount);
+ result = 31 * result + Objects.hashCode(mAccessDuration);
return result;
}
+
+ private void accept(@NonNull HistoricalOpsVisitor visitor) {
+ visitor.visitHistoricalOp(this);
+ }
+
+ private @NonNull LongSparseLongArray getOrCreateAccessCount() {
+ if (mAccessCount == null) {
+ mAccessCount = new LongSparseLongArray();
+ }
+ return mAccessCount;
+ }
+
+ private @NonNull LongSparseLongArray getOrCreateRejectCount() {
+ if (mRejectCount == null) {
+ mRejectCount = new LongSparseLongArray();
+ }
+ return mRejectCount;
+ }
+
+ private @NonNull LongSparseLongArray getOrCreateAccessDuration() {
+ if (mAccessDuration == null) {
+ mAccessDuration = new LongSparseLongArray();
+ }
+ return mAccessDuration;
+ }
+
+ /**
+ * Multiplies the entries in the array with the passed in scale factor and
+ * rounds the result at up 0.5 boundary.
+ *
+ * @param data The data to scale.
+ * @param scaleFactor The scale factor.
+ */
+ private static void scale(@NonNull LongSparseLongArray data, double scaleFactor) {
+ if (data != null) {
+ final int size = data.size();
+ for (int i = 0; i < size; i++) {
+ data.put(data.keyAt(i), (long) HistoricalOps.round(
+ (double) data.valueAt(i) * scaleFactor));
+ }
+ }
+ }
+
+ /**
+ * Merges two arrays while lazily acquiring the destination.
+ *
+ * @param thisSupplier The destination supplier.
+ * @param other The array to merge in.
+ */
+ private static void merge(@NonNull Supplier<LongSparseLongArray> thisSupplier,
+ @Nullable LongSparseLongArray other) {
+ if (other != null) {
+ final int otherSize = other.size();
+ for (int i = 0; i < otherSize; i++) {
+ final LongSparseLongArray that = thisSupplier.get();
+ final long otherKey = other.keyAt(i);
+ final long otherValue = other.valueAt(i);
+ that.put(otherKey, that.get(otherKey) + otherValue);
+ }
+ }
+ }
+
+ /** @hide */
+ public @Nullable LongSparseArray<Object> collectKeys() {
+ LongSparseArray<Object> result = AppOpsManager.collectKeys(mAccessCount,
+ null /*result*/);
+ result = AppOpsManager.collectKeys(mRejectCount, result);
+ result = AppOpsManager.collectKeys(mAccessDuration, result);
+ return result;
+ }
+
+ public static final @android.annotation.NonNull Creator<HistoricalOp> CREATOR =
+ new Creator<HistoricalOp>() {
+ @Override
+ public @NonNull HistoricalOp createFromParcel(@NonNull Parcel source) {
+ return new HistoricalOp(source);
+ }
+
+ @Override
+ public @NonNull HistoricalOp[] newArray(int size) {
+ return new HistoricalOp[size];
+ }
+ };
+ }
+
+ /**
+ * Computes the sum of the counts for the given flags in between the begin and
+ * end UID states.
+ *
+ * @param counts The data array.
+ * @param beginUidState The beginning UID state (exclusive).
+ * @param endUidState The end UID state.
+ * @param flags The UID flags.
+ * @return The sum.
+ */
+ private static long sumForFlagsInStates(@Nullable LongSparseLongArray counts,
+ @UidState int beginUidState, @UidState int endUidState, @OpFlags int flags) {
+ if (counts == null) {
+ return 0;
+ }
+ long sum = 0;
+ while (flags != 0) {
+ final int flag = 1 << Integer.numberOfTrailingZeros(flags);
+ flags &= ~flag;
+ for (int uidState : UID_STATES) {
+ if (uidState < beginUidState || uidState > endUidState) {
+ continue;
+ }
+ final long key = makeKey(uidState, flag);
+ sum += counts.get(key);
+ }
+ }
+ return sum;
+ }
+
+ /**
+ * Finds the first non-negative value for the given flags in between the begin and
+ * end UID states.
+ *
+ * @param counts The data array.
+ * @param flags The UID flags.
+ * @param beginUidState The beginning UID state (exclusive).
+ * @param endUidState The end UID state.
+ * @return The non-negative value or -1.
+ */
+ private static long findFirstNonNegativeForFlagsInStates(@Nullable LongSparseLongArray counts,
+ @OpFlags int flags, @UidState int beginUidState, @UidState int endUidState) {
+ if (counts == null) {
+ return -1;
+ }
+ while (flags != 0) {
+ final int flag = 1 << Integer.numberOfTrailingZeros(flags);
+ flags &= ~flag;
+ for (int uidState : UID_STATES) {
+ if (uidState < beginUidState || uidState > endUidState) {
+ continue;
+ }
+ final long key = makeKey(uidState, flag);
+ final long value = counts.get(key);
+ if (value >= 0) {
+ return value;
+ }
+ }
+ }
+ return -1;
+ }
+
+ /**
+ * Finds the first non-null value for the given flags in between the begin and
+ * end UID states.
+ *
+ * @param counts The data array.
+ * @param flags The UID flags.
+ * @param beginUidState The beginning UID state (exclusive).
+ * @param endUidState The end UID state.
+ * @return The non-negative value or -1.
+ */
+ private static @Nullable String findFirstNonNullForFlagsInStates(
+ @Nullable LongSparseArray<String> counts, @OpFlags int flags,
+ @UidState int beginUidState, @UidState int endUidState) {
+ if (counts == null) {
+ return null;
+ }
+ while (flags != 0) {
+ final int flag = 1 << Integer.numberOfTrailingZeros(flags);
+ flags &= ~flag;
+ for (int uidState : UID_STATES) {
+ if (uidState < beginUidState || uidState > endUidState) {
+ continue;
+ }
+ final long key = makeKey(uidState, flag);
+ final String value = counts.get(key);
+ if (value != null) {
+ return value;
+ }
+ }
+ }
+ return null;
}
/**
@@ -3800,7 +4432,7 @@
Preconditions.checkNotNull(callback, "callback cannot be null");
try {
mService.getHistoricalOps(request.mUid, request.mPackageName, request.mOpNames,
- request.mBeginTimeMillis, request.mEndTimeMillis,
+ request.mBeginTimeMillis, request.mEndTimeMillis, request.mFlags,
new RemoteCallback((result) -> {
final HistoricalOps ops = result.getParcelable(KEY_HISTORICAL_OPS);
final long identity = Binder.clearCallingIdentity();
@@ -3840,7 +4472,7 @@
try {
mService.getHistoricalOpsFromDiskRaw(request.mUid, request.mPackageName,
request.mOpNames, request.mBeginTimeMillis, request.mEndTimeMillis,
- new RemoteCallback((result) -> {
+ request.mFlags, new RemoteCallback((result) -> {
final HistoricalOps ops = result.getParcelable(KEY_HISTORICAL_OPS);
final long identity = Binder.clearCallingIdentity();
try {
@@ -4310,7 +4942,20 @@
* Like {@link #checkOp} but returns the <em>raw</em> mode associated with the op.
* Does not throw a security exception, does not translate {@link #MODE_FOREGROUND}.
*/
- public int unsafeCheckOpRaw(String op, int uid, String packageName) {
+ public int unsafeCheckOpRaw(@NonNull String op, int uid, String packageName) {
+ try {
+ return mService.checkOperationRaw(strOpToOp(op), uid, packageName);
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
+ * Like {@link #unsafeCheckOpNoThrow(String, int, String)} but returns the <em>raw</em>
+ * mode associated with the op. Does not throw a security exception, does not translate
+ * {@link #MODE_FOREGROUND}.
+ */
+ public int unsafeCheckOpRawNoThrow(@NonNull String op, int uid, @NonNull String packageName) {
try {
return mService.checkOperationRaw(strOpToOp(op), uid, packageName);
} catch (RemoteException e) {
@@ -4899,16 +5544,110 @@
}
/**
- * @hide
+ * Computes the max for the given flags in between the begin and
+ * end UID states.
+ *
+ * @param counts The data array.
+ * @param flags The UID flags.
+ * @param beginUidState The beginning UID state (exclusive).
+ * @param endUidState The end UID state.
+ * @return The sum.
*/
- public static long maxTime(long[] times, int start, int end) {
- long time = 0;
- for (int i = start; i < end; i++) {
- if (times[i] > time) {
- time = times[i];
+ private static long maxForFlagsInStates(@Nullable LongSparseLongArray counts,
+ @UidState int beginUidState, @UidState int endUidState,
+ @OpFlags int flags) {
+ if (counts == null) {
+ return 0;
+ }
+ long max = 0;
+ while (flags != 0) {
+ final int flag = 1 << Integer.numberOfTrailingZeros(flags);
+ flags &= ~flag;
+ for (int uidState : UID_STATES) {
+ if (uidState < beginUidState || uidState > endUidState) {
+ continue;
+ }
+ final long key = makeKey(uidState, flag);
+ max = Math.max(max, counts.get(key));
}
}
- return time;
+ return max;
+ }
+
+
+ private static void writeLongSparseLongArrayToParcel(
+ @Nullable LongSparseLongArray array, @NonNull Parcel parcel) {
+ if (array != null) {
+ final int size = array.size();
+ parcel.writeInt(size);
+ for (int i = 0; i < size; i++) {
+ parcel.writeLong(array.keyAt(i));
+ parcel.writeLong(array.valueAt(i));
+ }
+ } else {
+ parcel.writeInt(-1);
+ }
+ }
+
+ private static @Nullable LongSparseLongArray readLongSparseLongArrayFromParcel(
+ @NonNull Parcel parcel) {
+ final int size = parcel.readInt();
+ if (size < 0) {
+ return null;
+ }
+ final LongSparseLongArray array = new LongSparseLongArray(size);
+ for (int i = 0; i < size; i++) {
+ array.append(parcel.readLong(), parcel.readLong());
+ }
+ return array;
+ }
+
+ private static void writeLongSparseStringArrayToParcel(
+ @Nullable LongSparseArray<String> array, @NonNull Parcel parcel) {
+ if (array != null) {
+ final int size = array.size();
+ parcel.writeInt(size);
+ for (int i = 0; i < size; i++) {
+ parcel.writeLong(array.keyAt(i));
+ parcel.writeString(array.valueAt(i));
+ }
+ } else {
+ parcel.writeInt(-1);
+ }
+ }
+
+ private static @Nullable LongSparseArray<String> readLongSparseStringArrayFromParcel(
+ @NonNull Parcel parcel) {
+ final int size = parcel.readInt();
+ if (size < 0) {
+ return null;
+ }
+ final LongSparseArray<String> array = new LongSparseArray<>(size);
+ for (int i = 0; i < size; i++) {
+ array.append(parcel.readLong(), parcel.readString());
+ }
+ return array;
+ }
+
+ /**
+ * Collects the keys from an array to the result creating the result if needed.
+ *
+ * @param array The array whose keys to collect.
+ * @param result The optional result store collected keys.
+ * @return The result collected keys array.
+ */
+ private static LongSparseArray<Object> collectKeys(@Nullable LongSparseLongArray array,
+ @Nullable LongSparseArray<Object> result) {
+ if (array != null) {
+ if (result == null) {
+ result = new LongSparseArray<>();
+ }
+ final int accessSize = array.size();
+ for (int i = 0; i < accessSize; i++) {
+ result.put(array.keyAt(i), null);
+ }
+ }
+ return result;
}
/** @hide */
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 65859c7..ad614b1 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -1,18 +1,37 @@
{
- "imports": [
- {
- "path": "frameworks/base/services/core/java/com/android/server/am"
- },
- {
- "path": "frameworks/base/services/core/java/com/android/server/wm"
- }
- ],
- "presubmit": [
- {
- "name": "CtsFragmentTestCases"
- },
- {
- "name": "CtsFragmentTestCasesSdk26"
- }
- ]
+ "imports": [
+ {
+ "path": "frameworks/base/services/core/java/com/android/server/am"
+ },
+ {
+ "path": "frameworks/base/services/core/java/com/android/server/wm"
+ }
+ ],
+ "presubmit": [
+ {
+ "name": "CtsFragmentTestCases"
+ },
+ {
+ "name": "CtsFragmentTestCasesSdk26"
+ },
+ {
+ "file_patterns": ["(/|^)AppOpsManager.java"],
+ "name": "CtsAppOpsTestCases"
+ },
+ {
+ "file_patterns": ["(/|^)AppOpsManager.java"],
+ "name": "FrameworksServicesTests",
+ "options": [
+ {
+ "include-filter": "com.android.server.appop.AppOpsUpgradeTest"
+ },
+ {
+ "include-filter": "com.android.server.appop.AppOpsServiceTest"
+ },
+ {
+ "include-filter": "com.android.server.appop.AppOpsActiveWatcherTest"
+ }
+ ]
+ }
+ ]
}
diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl
index 9478a3c..3c389e4 100644
--- a/core/java/android/app/admin/IDevicePolicyManager.aidl
+++ b/core/java/android/app/admin/IDevicePolicyManager.aidl
@@ -124,6 +124,7 @@
void setActiveAdmin(in ComponentName policyReceiver, boolean refreshing, int userHandle);
boolean isAdminActive(in ComponentName policyReceiver, int userHandle);
List<ComponentName> getActiveAdmins(int userHandle);
+ @UnsupportedAppUsage
boolean packageHasActiveAdmins(String packageName, int userHandle);
void getRemoveWarning(in ComponentName policyReceiver, in RemoteCallback result, int userHandle);
void removeActiveAdmin(in ComponentName policyReceiver, int userHandle);
diff --git a/core/java/android/app/backup/IBackupManager.aidl b/core/java/android/app/backup/IBackupManager.aidl
index 8386c72..70ecdae 100644
--- a/core/java/android/app/backup/IBackupManager.aidl
+++ b/core/java/android/app/backup/IBackupManager.aidl
@@ -54,6 +54,7 @@
/**
* {@link android.app.backup.IBackupManager.dataChangedForUser} for the calling user id.
*/
+ @UnsupportedAppUsage
void dataChanged(String packageName);
/**
@@ -73,6 +74,7 @@
/**
* {@link android.app.backup.IBackupManager.clearBackupDataForUser} for the calling user id.
*/
+ @UnsupportedAppUsage
void clearBackupData(String transportName, String packageName);
/**
@@ -155,6 +157,7 @@
/**
* {@link android.app.backup.IBackupManager.setBackupEnabledForUser} for the calling user id.
*/
+ @UnsupportedAppUsage
void setBackupEnabled(boolean isEnabled);
/**
@@ -178,6 +181,7 @@
/**
* {@link android.app.backup.IBackupManager.setAutoRestoreForUser} for the calling user id.
*/
+ @UnsupportedAppUsage
void setAutoRestore(boolean doAutoRestore);
/**
@@ -194,6 +198,7 @@
/**
* {@link android.app.backup.IBackupManager.isBackupEnabledForUser} for the calling user id.
*/
+ @UnsupportedAppUsage
boolean isBackupEnabled();
/**
@@ -322,6 +327,7 @@
* {@link android.app.backup.IBackupManager.acknowledgeFullBackupOrRestoreForUser} for the
* calling user id.
*/
+ @UnsupportedAppUsage
void acknowledgeFullBackupOrRestore(int token, boolean allow,
in String curPassword, in String encryptionPassword,
IFullBackupRestoreObserver observer);
@@ -371,6 +377,7 @@
/**
* {@link android.app.backup.IBackupManager.getCurrentTransportForUser} for the calling user id.
*/
+ @UnsupportedAppUsage
String getCurrentTransport();
/**
@@ -397,6 +404,7 @@
/**
* {@link android.app.backup.IBackupManager.listAllTransportsForUser} for the calling user id.
*/
+ @UnsupportedAppUsage
String[] listAllTransports();
/**
@@ -434,6 +442,7 @@
* {@link android.app.backup.IBackupManager.selectBackupTransportForUser} for the calling user
* id.
*/
+ @UnsupportedAppUsage
String selectBackupTransport(String transport);
/**
@@ -590,6 +599,7 @@
* @param whichUser User handle of the defined user whose backup active state
* is being queried.
*/
+ @UnsupportedAppUsage
boolean isBackupServiceActive(int whichUser);
/**
diff --git a/core/java/android/app/job/IJobCallback.aidl b/core/java/android/app/job/IJobCallback.aidl
index e7695e2..d281da0 100644
--- a/core/java/android/app/job/IJobCallback.aidl
+++ b/core/java/android/app/job/IJobCallback.aidl
@@ -36,6 +36,7 @@
* @param ongoing True to indicate that the client is processing the job. False if the job is
* complete
*/
+ @UnsupportedAppUsage
void acknowledgeStartMessage(int jobId, boolean ongoing);
/**
* Immediate callback to the system after sending a stop signal, used to quickly detect ANR.
@@ -43,14 +44,17 @@
* @param jobId Unique integer used to identify this job.
* @param reschedule Whether or not to reschedule this job.
*/
+ @UnsupportedAppUsage
void acknowledgeStopMessage(int jobId, boolean reschedule);
/*
* Called to deqeue next work item for the job.
*/
+ @UnsupportedAppUsage
JobWorkItem dequeueWork(int jobId);
/*
* Called to report that job has completed processing a work item.
*/
+ @UnsupportedAppUsage
boolean completeWork(int jobId, int workId);
/*
* Tell the job manager that the client is done with its execution, so that it can go on to
@@ -59,5 +63,6 @@
* @param jobId Unique integer used to identify this job.
* @param reschedule Whether or not to reschedule this job.
*/
+ @UnsupportedAppUsage
void jobFinished(int jobId, boolean reschedule);
}
diff --git a/core/java/android/app/job/IJobService.aidl b/core/java/android/app/job/IJobService.aidl
index 7f55d29..22ad252 100644
--- a/core/java/android/app/job/IJobService.aidl
+++ b/core/java/android/app/job/IJobService.aidl
@@ -26,7 +26,9 @@
*/
oneway interface IJobService {
/** Begin execution of application's job. */
+ @UnsupportedAppUsage
void startJob(in JobParameters jobParams);
/** Stop execution of application's job. */
+ @UnsupportedAppUsage
void stopJob(in JobParameters jobParams);
}
diff --git a/core/java/android/app/usage/IUsageStatsManager.aidl b/core/java/android/app/usage/IUsageStatsManager.aidl
index b1500c1..b72ec39 100644
--- a/core/java/android/app/usage/IUsageStatsManager.aidl
+++ b/core/java/android/app/usage/IUsageStatsManager.aidl
@@ -28,8 +28,10 @@
* {@hide}
*/
interface IUsageStatsManager {
+ @UnsupportedAppUsage
ParceledListSlice queryUsageStats(int bucketType, long beginTime, long endTime,
String callingPackage);
+ @UnsupportedAppUsage
ParceledListSlice queryConfigurationStats(int bucketType, long beginTime, long endTime,
String callingPackage);
ParceledListSlice queryEventStats(int bucketType, long beginTime, long endTime,
@@ -38,7 +40,9 @@
UsageEvents queryEventsForPackage(long beginTime, long endTime, String callingPackage);
UsageEvents queryEventsForUser(long beginTime, long endTime, int userId, String callingPackage);
UsageEvents queryEventsForPackageForUser(long beginTime, long endTime, int userId, String pkg, String callingPackage);
+ @UnsupportedAppUsage
void setAppInactive(String packageName, boolean inactive, int userId);
+ @UnsupportedAppUsage
boolean isAppInactive(String packageName, int userId);
void whitelistAppTemporarily(String packageName, long duration, int userId);
void onCarrierPrivilegedAppsChanged();
diff --git a/core/java/android/content/ContentProviderNative.java b/core/java/android/content/ContentProviderNative.java
index ca657b1..9948338 100644
--- a/core/java/android/content/ContentProviderNative.java
+++ b/core/java/android/content/ContentProviderNative.java
@@ -800,5 +800,6 @@
}
}
+ @UnsupportedAppUsage
private IBinder mRemote;
}
diff --git a/core/java/android/content/IContentService.aidl b/core/java/android/content/IContentService.aidl
index 9f6e23630..a34a995 100644
--- a/core/java/android/content/IContentService.aidl
+++ b/core/java/android/content/IContentService.aidl
@@ -61,6 +61,7 @@
*/
void sync(in SyncRequest request, String callingPackage);
void syncAsUser(in SyncRequest request, int userId, String callingPackage);
+ @UnsupportedAppUsage
void cancelSync(in Account account, String authority, in ComponentName cname);
void cancelSyncAsUser(in Account account, String authority, in ComponentName cname, int userId);
@@ -118,6 +119,7 @@
* Check if this account/provider is syncable.
* @return >0 if it is syncable, 0 if not, and <0 if the state isn't known yet.
*/
+ @UnsupportedAppUsage
int getIsSyncable(in Account account, String providerName);
int getIsSyncableAsUser(in Account account, String providerName, int userId);
@@ -128,9 +130,11 @@
void setIsSyncable(in Account account, String providerName, int syncable);
void setIsSyncableAsUser(in Account account, String providerName, int syncable, int userId);
+ @UnsupportedAppUsage
void setMasterSyncAutomatically(boolean flag);
void setMasterSyncAutomaticallyAsUser(boolean flag, int userId);
+ @UnsupportedAppUsage
boolean getMasterSyncAutomatically();
boolean getMasterSyncAutomaticallyAsUser(int userId);
@@ -141,6 +145,7 @@
* Returns the types of the SyncAdapters that are registered with the system.
* @return Returns the types of the SyncAdapters that are registered with the system.
*/
+ @UnsupportedAppUsage
SyncAdapterType[] getSyncAdapterTypes();
SyncAdapterType[] getSyncAdapterTypesAsUser(int userId);
@@ -154,6 +159,7 @@
* @param cname component to identify sync service, must be null if account/providerName are
* non-null.
*/
+ @UnsupportedAppUsage
boolean isSyncActive(in Account account, String authority, in ComponentName cname);
/**
diff --git a/core/java/android/content/IIntentReceiver.aidl b/core/java/android/content/IIntentReceiver.aidl
index 3d92723..2b45021 100644
--- a/core/java/android/content/IIntentReceiver.aidl
+++ b/core/java/android/content/IIntentReceiver.aidl
@@ -27,6 +27,7 @@
* {@hide}
*/
oneway interface IIntentReceiver {
+ @UnsupportedAppUsage
void performReceive(in Intent intent, int resultCode, String data,
in Bundle extras, boolean ordered, boolean sticky, int sendingUser);
}
diff --git a/core/java/android/content/ISyncAdapter.aidl b/core/java/android/content/ISyncAdapter.aidl
index 0eb581e..9242d02 100644
--- a/core/java/android/content/ISyncAdapter.aidl
+++ b/core/java/android/content/ISyncAdapter.aidl
@@ -32,6 +32,7 @@
*
* @param cb If called back with {@code false} accounts are not synced.
*/
+ @UnsupportedAppUsage
void onUnsyncableAccount(ISyncAdapterUnsyncableAccountCallback cb);
/**
@@ -44,6 +45,7 @@
* @param account the account that should be synced
* @param extras SyncAdapter-specific parameters
*/
+ @UnsupportedAppUsage
void startSync(ISyncContext syncContext, String authority,
in Account account, in Bundle extras);
@@ -52,5 +54,6 @@
* after the ISyncContext.onFinished() for that sync was called.
* @param syncContext the ISyncContext that was passed to {@link #startSync}
*/
+ @UnsupportedAppUsage
void cancelSync(ISyncContext syncContext);
}
diff --git a/core/java/android/content/ISyncServiceAdapter.aidl b/core/java/android/content/ISyncServiceAdapter.aidl
index d419307..29f3a40 100644
--- a/core/java/android/content/ISyncServiceAdapter.aidl
+++ b/core/java/android/content/ISyncServiceAdapter.aidl
@@ -35,11 +35,13 @@
* @param extras SyncAdapter-specific parameters.
*
*/
+ @UnsupportedAppUsage
void startSync(ISyncContext syncContext, in Bundle extras);
/**
* Cancel the currently ongoing sync.
*/
+ @UnsupportedAppUsage
void cancelSync(ISyncContext syncContext);
}
diff --git a/core/java/android/content/ISyncStatusObserver.aidl b/core/java/android/content/ISyncStatusObserver.aidl
index eb26845..64bf3bd 100644
--- a/core/java/android/content/ISyncStatusObserver.aidl
+++ b/core/java/android/content/ISyncStatusObserver.aidl
@@ -20,5 +20,6 @@
* @hide
*/
oneway interface ISyncStatusObserver {
+ @UnsupportedAppUsage
void onStatusChanged(int which);
}
diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl
index 5b3c9dd..722c128 100644
--- a/core/java/android/content/om/IOverlayManager.aidl
+++ b/core/java/android/content/om/IOverlayManager.aidl
@@ -37,6 +37,7 @@
* mapped to lists of overlays; if no overlays exist for the
* requested user, an empty map is returned.
*/
+ @UnsupportedAppUsage
Map getAllOverlays(in int userId);
/**
@@ -60,6 +61,7 @@
* @return The OverlayInfo for the overlay package; or null if no such
* overlay package exists.
*/
+ @UnsupportedAppUsage
OverlayInfo getOverlayInfo(in String packageName, in int userId);
/**
diff --git a/core/java/android/content/pm/IPackageDataObserver.aidl b/core/java/android/content/pm/IPackageDataObserver.aidl
index d010ee4..926ecda 100644
--- a/core/java/android/content/pm/IPackageDataObserver.aidl
+++ b/core/java/android/content/pm/IPackageDataObserver.aidl
@@ -24,5 +24,6 @@
* {@hide}
*/
oneway interface IPackageDataObserver {
+ @UnsupportedAppUsage
void onRemoveCompleted(in String packageName, boolean succeeded);
}
diff --git a/core/java/android/content/pm/IPackageDeleteObserver.aidl b/core/java/android/content/pm/IPackageDeleteObserver.aidl
index 2e2d16e..faae81e 100644
--- a/core/java/android/content/pm/IPackageDeleteObserver.aidl
+++ b/core/java/android/content/pm/IPackageDeleteObserver.aidl
@@ -23,6 +23,7 @@
* {@hide}
*/
oneway interface IPackageDeleteObserver {
+ @UnsupportedAppUsage
void packageDeleted(in String packageName, in int returnCode);
}
diff --git a/core/java/android/content/pm/IPackageDeleteObserver2.aidl b/core/java/android/content/pm/IPackageDeleteObserver2.aidl
index bff3baa..ea80967 100644
--- a/core/java/android/content/pm/IPackageDeleteObserver2.aidl
+++ b/core/java/android/content/pm/IPackageDeleteObserver2.aidl
@@ -21,5 +21,6 @@
/** {@hide} */
oneway interface IPackageDeleteObserver2 {
void onUserActionRequired(in Intent intent);
+ @UnsupportedAppUsage
void onPackageDeleted(String packageName, int returnCode, String msg);
}
diff --git a/core/java/android/content/pm/IPackageInstallObserver2.aidl b/core/java/android/content/pm/IPackageInstallObserver2.aidl
index bb5f22a..ed2eb7d 100644
--- a/core/java/android/content/pm/IPackageInstallObserver2.aidl
+++ b/core/java/android/content/pm/IPackageInstallObserver2.aidl
@@ -25,6 +25,7 @@
* @hide
*/
oneway interface IPackageInstallObserver2 {
+ @UnsupportedAppUsage
void onUserActionRequired(in Intent intent);
/**
@@ -42,5 +43,6 @@
* </tr>
* </table>
*/
+ @UnsupportedAppUsage
void onPackageInstalled(String basePackageName, int returnCode, String msg, in Bundle extras);
}
diff --git a/core/java/android/content/pm/IPackageInstaller.aidl b/core/java/android/content/pm/IPackageInstaller.aidl
index 0cf83fd..8e84079 100644
--- a/core/java/android/content/pm/IPackageInstaller.aidl
+++ b/core/java/android/content/pm/IPackageInstaller.aidl
@@ -47,6 +47,7 @@
void registerCallback(IPackageInstallerCallback callback, int userId);
void unregisterCallback(IPackageInstallerCallback callback);
+ @UnsupportedAppUsage
void uninstall(in VersionedPackage versionedPackage, String callerPackageName, int flags,
in IntentSender statusReceiver, int userId);
diff --git a/core/java/android/content/pm/IPackageInstallerCallback.aidl b/core/java/android/content/pm/IPackageInstallerCallback.aidl
index 974eb1e..ee26500 100644
--- a/core/java/android/content/pm/IPackageInstallerCallback.aidl
+++ b/core/java/android/content/pm/IPackageInstallerCallback.aidl
@@ -18,9 +18,14 @@
/** {@hide} */
oneway interface IPackageInstallerCallback {
+ @UnsupportedAppUsage
void onSessionCreated(int sessionId);
+ @UnsupportedAppUsage
void onSessionBadgingChanged(int sessionId);
+ @UnsupportedAppUsage
void onSessionActiveChanged(int sessionId, boolean active);
+ @UnsupportedAppUsage
void onSessionProgressChanged(int sessionId, float progress);
+ @UnsupportedAppUsage
void onSessionFinished(int sessionId, boolean success);
}
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index dcbb4ac..fd3529b 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -63,45 +63,60 @@
*/
interface IPackageManager {
void checkPackageStartable(String packageName, int userId);
+ @UnsupportedAppUsage
boolean isPackageAvailable(String packageName, int userId);
+ @UnsupportedAppUsage
PackageInfo getPackageInfo(String packageName, int flags, int userId);
PackageInfo getPackageInfoVersioned(in VersionedPackage versionedPackage,
int flags, int userId);
+ @UnsupportedAppUsage
int getPackageUid(String packageName, int flags, int userId);
int[] getPackageGids(String packageName, int flags, int userId);
+ @UnsupportedAppUsage
String[] currentToCanonicalPackageNames(in String[] names);
+ @UnsupportedAppUsage
String[] canonicalToCurrentPackageNames(in String[] names);
PermissionInfo getPermissionInfo(String name, String packageName, int flags);
ParceledListSlice queryPermissionsByGroup(String group, int flags);
+ @UnsupportedAppUsage
PermissionGroupInfo getPermissionGroupInfo(String name, int flags);
ParceledListSlice getAllPermissionGroups(int flags);
+ @UnsupportedAppUsage
ApplicationInfo getApplicationInfo(String packageName, int flags ,int userId);
+ @UnsupportedAppUsage
ActivityInfo getActivityInfo(in ComponentName className, int flags, int userId);
boolean activitySupportsIntent(in ComponentName className, in Intent intent,
String resolvedType);
+ @UnsupportedAppUsage
ActivityInfo getReceiverInfo(in ComponentName className, int flags, int userId);
+ @UnsupportedAppUsage
ServiceInfo getServiceInfo(in ComponentName className, int flags, int userId);
+ @UnsupportedAppUsage
ProviderInfo getProviderInfo(in ComponentName className, int flags, int userId);
+ @UnsupportedAppUsage
int checkPermission(String permName, String pkgName, int userId);
int checkUidPermission(String permName, int uid);
+ @UnsupportedAppUsage
boolean addPermission(in PermissionInfo info);
+ @UnsupportedAppUsage
void removePermission(String name);
+ @UnsupportedAppUsage
void grantRuntimePermission(String packageName, String permissionName, int userId);
void revokeRuntimePermission(String packageName, String permissionName, int userId);
@@ -120,33 +135,43 @@
boolean isProtectedBroadcast(String actionName);
+ @UnsupportedAppUsage
int checkSignatures(String pkg1, String pkg2);
+ @UnsupportedAppUsage
int checkUidSignatures(int uid1, int uid2);
List<String> getAllPackages();
+ @UnsupportedAppUsage
String[] getPackagesForUid(int uid);
+ @UnsupportedAppUsage
String getNameForUid(int uid);
String[] getNamesForUids(in int[] uids);
+ @UnsupportedAppUsage
int getUidForSharedUser(String sharedUserName);
+ @UnsupportedAppUsage
int getFlagsForUid(int uid);
int getPrivateFlagsForUid(int uid);
+ @UnsupportedAppUsage
boolean isUidPrivileged(int uid);
+ @UnsupportedAppUsage
String[] getAppOpPermissionPackages(String permissionName);
+ @UnsupportedAppUsage
ResolveInfo resolveIntent(in Intent intent, String resolvedType, int flags, int userId);
ResolveInfo findPersistentPreferredActivity(in Intent intent, int userId);
boolean canForwardTo(in Intent intent, String resolvedType, int sourceUserId, int targetUserId);
+ @UnsupportedAppUsage
ParceledListSlice queryIntentActivities(in Intent intent,
String resolvedType, int flags, int userId);
@@ -173,6 +198,7 @@
* limit that kicks in when flags are included that bloat up the data
* returned.
*/
+ @UnsupportedAppUsage
ParceledListSlice getInstalledPackages(int flags, in int userId);
/**
@@ -190,6 +216,7 @@
* limit that kicks in when flags are included that bloat up the data
* returned.
*/
+ @UnsupportedAppUsage
ParceledListSlice getInstalledApplications(int flags, int userId);
/**
@@ -210,20 +237,24 @@
* @param outInfo Filled in with a list of the ProviderInfo for each
* name in 'outNames'.
*/
+ @UnsupportedAppUsage
void querySyncProviders(inout List<String> outNames,
inout List<ProviderInfo> outInfo);
ParceledListSlice queryContentProviders(
String processName, int uid, int flags, String metaDataKey);
+ @UnsupportedAppUsage
InstrumentationInfo getInstrumentationInfo(
in ComponentName className, int flags);
+ @UnsupportedAppUsage
ParceledListSlice queryInstrumentation(
String targetPackage, int flags);
void finishPackageInstall(int token, boolean didLaunch);
+ @UnsupportedAppUsage
void setInstallerPackageName(in String targetPackage, in String installerPackageName);
void setApplicationCategoryHint(String packageName, int categoryHint, String callerPackageName);
@@ -243,24 +274,30 @@
void deletePackageVersioned(in VersionedPackage versionedPackage,
IPackageDeleteObserver2 observer, int userId, int flags);
+ @UnsupportedAppUsage
String getInstallerPackageName(in String packageName);
void resetApplicationPreferences(int userId);
+ @UnsupportedAppUsage
ResolveInfo getLastChosenActivity(in Intent intent,
String resolvedType, int flags);
+ @UnsupportedAppUsage
void setLastChosenActivity(in Intent intent, String resolvedType, int flags,
in IntentFilter filter, int match, in ComponentName activity);
void addPreferredActivity(in IntentFilter filter, int match,
in ComponentName[] set, in ComponentName activity, int userId);
+ @UnsupportedAppUsage
void replacePreferredActivity(in IntentFilter filter, int match,
in ComponentName[] set, in ComponentName activity, int userId);
+ @UnsupportedAppUsage
void clearPackagePreferredActivities(String packageName);
+ @UnsupportedAppUsage
int getPreferredActivities(out List<IntentFilter> outFilters,
out List<ComponentName> outActivities, String packageName);
@@ -300,6 +337,7 @@
* Report the set of 'Home' activity candidates, plus (if any) which of them
* is the current "always use this one" setting.
*/
+ @UnsupportedAppUsage
ComponentName getHomeActivities(out List<ResolveInfo> outHomeCandidates);
void setHomeActivity(in ComponentName className, int userId);
@@ -307,23 +345,27 @@
/**
* As per {@link android.content.pm.PackageManager#setComponentEnabledSetting}.
*/
+ @UnsupportedAppUsage
void setComponentEnabledSetting(in ComponentName componentName,
in int newState, in int flags, int userId);
/**
* As per {@link android.content.pm.PackageManager#getComponentEnabledSetting}.
*/
+ @UnsupportedAppUsage
int getComponentEnabledSetting(in ComponentName componentName, int userId);
/**
* As per {@link android.content.pm.PackageManager#setApplicationEnabledSetting}.
*/
+ @UnsupportedAppUsage
void setApplicationEnabledSetting(in String packageName, in int newState, int flags,
int userId, String callingPackage);
/**
* As per {@link android.content.pm.PackageManager#getApplicationEnabledSetting}.
*/
+ @UnsupportedAppUsage
int getApplicationEnabledSetting(in String packageName, int userId);
/**
@@ -341,6 +383,7 @@
* Set whether the given package should be considered stopped, making
* it not visible to implicit intents that filter out stopped packages.
*/
+ @UnsupportedAppUsage
void setPackageStoppedState(String packageName, boolean stopped, int userId);
/**
@@ -396,6 +439,7 @@
* files need to be deleted
* @param observer a callback used to notify when the deletion is finished.
*/
+ @UnsupportedAppUsage
void deleteApplicationCacheFiles(in String packageName, IPackageDataObserver observer);
/**
@@ -436,6 +480,7 @@
* Get a list of shared libraries that are available on the
* system.
*/
+ @UnsupportedAppUsage
String[] getSystemSharedLibraryNames();
/**
@@ -447,8 +492,10 @@
boolean hasSystemFeature(String name, int version);
void enterSafeMode();
+ @UnsupportedAppUsage
boolean isSafeMode();
void systemReady();
+ @UnsupportedAppUsage
boolean hasSystemUidErrors();
/**
@@ -570,9 +617,11 @@
int movePackage(in String packageName, in String volumeUuid);
int movePrimaryStorage(in String volumeUuid);
+ @UnsupportedAppUsage
boolean addPermissionAsync(in PermissionInfo info);
boolean setInstallLocation(int loc);
+ @UnsupportedAppUsage
int getInstallLocation();
int installExistingPackageAsUser(String packageName, int userId, int installFlags,
@@ -600,17 +649,21 @@
boolean isPermissionEnforced(String permission);
/** Reflects current DeviceStorageMonitorService state */
+ @UnsupportedAppUsage
boolean isStorageLow();
+ @UnsupportedAppUsage
boolean setApplicationHiddenSettingAsUser(String packageName, boolean hidden, int userId);
boolean getApplicationHiddenSettingAsUser(String packageName, int userId);
void setSystemAppHiddenUntilInstalled(String packageName, boolean hidden);
boolean setSystemAppInstallState(String packageName, boolean installed, int userId);
+ @UnsupportedAppUsage
IPackageInstaller getPackageInstaller();
boolean setBlockUninstallForUser(String packageName, boolean blockUninstall, int userId);
+ @UnsupportedAppUsage
boolean getBlockUninstallForUser(String packageName, int userId);
KeySet getKeySetByAlias(String packageName, String alias);
@@ -631,6 +684,7 @@
boolean isPermissionRevokedByPolicy(String permission, String packageName, int userId);
+ @UnsupportedAppUsage
String getPermissionControllerPackageName();
ParceledListSlice getInstantApps(int userId);
@@ -647,7 +701,9 @@
*/
void setUpdateAvailable(String packageName, boolean updateAvaialble);
+ @UnsupportedAppUsage
String getServicesSystemSharedLibraryPackageName();
+ @UnsupportedAppUsage
String getSharedSystemSharedLibraryPackageName();
ChangedPackages getChangedPackages(int sequenceNumber, int userId);
diff --git a/core/java/android/content/pm/IPackageStatsObserver.aidl b/core/java/android/content/pm/IPackageStatsObserver.aidl
index ede4d1d..559a035 100644
--- a/core/java/android/content/pm/IPackageStatsObserver.aidl
+++ b/core/java/android/content/pm/IPackageStatsObserver.aidl
@@ -26,5 +26,6 @@
*/
oneway interface IPackageStatsObserver {
+ @UnsupportedAppUsage
void onGetStatsCompleted(in PackageStats pStats, boolean succeeded);
}
diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java
index ac44fe9..ea63776 100644
--- a/core/java/android/hardware/display/DisplayManagerGlobal.java
+++ b/core/java/android/hardware/display/DisplayManagerGlobal.java
@@ -185,6 +185,21 @@
}
/**
+ * Check if specified UID's content is present on display and should be granted access to it.
+ *
+ * @param uid UID to be checked.
+ * @param displayId id of the display where presence of the content is checked.
+ * @return {@code true} if UID is present on display, {@code false} otherwise.
+ */
+ public boolean isUidPresentOnDisplay(int uid, int displayId) {
+ try {
+ return mDm.isUidPresentOnDisplay(uid, displayId);
+ } catch (RemoteException ex) {
+ throw ex.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Gets information about a logical display.
*
* The display metrics may be adjusted to provide compatibility
diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java
index 43ea682..8231985 100644
--- a/core/java/android/hardware/display/DisplayManagerInternal.java
+++ b/core/java/android/hardware/display/DisplayManagerInternal.java
@@ -187,14 +187,6 @@
public abstract void setDisplayAccessUIDs(SparseArray<IntArray> displayAccessUIDs);
/**
- * Check if specified UID's content is present on display and should be granted access to it.
- *
- * @param uid UID to be checked.
- * @param displayId id of the display where presence of the content is checked.
- * */
- public abstract boolean isUidPresentOnDisplay(int uid, int displayId);
-
- /**
* Persist brightness slider events and ambient brightness stats.
*/
public abstract void persistBrightnessTrackerState();
diff --git a/core/java/android/hardware/display/IDisplayManager.aidl b/core/java/android/hardware/display/IDisplayManager.aidl
index edd2051..0143c91 100644
--- a/core/java/android/hardware/display/IDisplayManager.aidl
+++ b/core/java/android/hardware/display/IDisplayManager.aidl
@@ -34,6 +34,8 @@
DisplayInfo getDisplayInfo(int displayId);
int[] getDisplayIds();
+ boolean isUidPresentOnDisplay(int uid, int displayId);
+
void registerCallback(in IDisplayManagerCallback callback);
// Requires CONFIGURE_WIFI_DISPLAY permission.
diff --git a/core/java/android/net/http/SslCertificate.java b/core/java/android/net/http/SslCertificate.java
index 6fcd6eb..01dd08f 100644
--- a/core/java/android/net/http/SslCertificate.java
+++ b/core/java/android/net/http/SslCertificate.java
@@ -16,6 +16,7 @@
package android.net.http;
+import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.os.Bundle;
@@ -252,7 +253,7 @@
* @return The {@code X509Certificate} used to create this {@code SslCertificate} or
* {@code null} if no certificate was provided.
*/
- public X509Certificate getX509Certificate() {
+ public @Nullable X509Certificate getX509Certificate() {
return mX509Certificate;
}
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 5a4108a..368fc2a 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -308,6 +308,22 @@
"android.settings.ACCESSIBILITY_SETTINGS";
/**
+ * Activity Action: Show detail settings of a particular accessibility service.
+ * <p>
+ * In some cases, a matching Activity may not exist, so ensure you safeguard against this.
+ * <p>
+ * Input: {@link Intent#EXTRA_COMPONENT_NAME} must specify the accessibility service component
+ * name to be shown.
+ * <p>
+ * Output: Nothing.
+ * @hide
+ **/
+ @SystemApi
+ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
+ public static final String ACTION_ACCESSIBILITY_DETAILS_SETTINGS =
+ "android.settings.ACCESSIBILITY_DETAILS_SETTINGS";
+
+ /**
* Activity Action: Show settings to control access to usage information.
* <p>
* In some cases, a matching Activity may not exist, so ensure you
diff --git a/core/java/android/util/LocalLog.java b/core/java/android/util/LocalLog.java
index adfa4fc..8b5659b 100644
--- a/core/java/android/util/LocalLog.java
+++ b/core/java/android/util/LocalLog.java
@@ -17,6 +17,7 @@
package android.util;
import android.annotation.UnsupportedAppUsage;
+
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.time.LocalDateTime;
@@ -55,6 +56,10 @@
@UnsupportedAppUsage
public synchronized void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+ dump(pw);
+ }
+
+ public synchronized void dump(PrintWriter pw) {
Iterator<String> itr = mLog.iterator();
while (itr.hasNext()) {
pw.println(itr.next());
@@ -62,6 +67,10 @@
}
public synchronized void reverseDump(FileDescriptor fd, PrintWriter pw, String[] args) {
+ reverseDump(pw);
+ }
+
+ public synchronized void reverseDump(PrintWriter pw) {
Iterator<String> itr = mLog.descendingIterator();
while (itr.hasNext()) {
pw.println(itr.next());
@@ -75,10 +84,16 @@
}
@UnsupportedAppUsage
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
- mLog.dump(fd, pw, args);
+ mLog.dump(pw);
+ }
+ public void dump(PrintWriter pw) {
+ mLog.dump(pw);
}
public void reverseDump(FileDescriptor fd, PrintWriter pw, String[] args) {
- mLog.reverseDump(fd, pw, args);
+ mLog.reverseDump(pw);
+ }
+ public void reverseDump(PrintWriter pw) {
+ mLog.reverseDump(pw);
}
}
diff --git a/core/java/android/util/LongSparseArray.java b/core/java/android/util/LongSparseArray.java
index 9ba0f5d..cf49803 100644
--- a/core/java/android/util/LongSparseArray.java
+++ b/core/java/android/util/LongSparseArray.java
@@ -21,6 +21,9 @@
import libcore.util.EmptyArray;
+import java.util.Arrays;
+import java.util.Objects;
+
/**
* SparseArray mapping longs to Objects. Unlike a normal array of Objects,
* there can be gaps in the indices. It is intended to be more memory efficient
diff --git a/core/java/android/util/LongSparseLongArray.java b/core/java/android/util/LongSparseLongArray.java
index af163ac..8dcdb40 100644
--- a/core/java/android/util/LongSparseLongArray.java
+++ b/core/java/android/util/LongSparseLongArray.java
@@ -22,6 +22,8 @@
import android.annotation.UnsupportedAppUsage;
import libcore.util.EmptyArray;
+import java.util.Arrays;
+
/**
* Map of {@code long} to {@code long}. Unlike a normal array of longs, there
* can be gaps in the indices. It is intended to be more memory efficient than using a
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index dbb2071..b3d98b8 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -21,6 +21,7 @@
import android.annotation.IntDef;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
+import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.app.KeyguardManager;
import android.content.res.CompatibilityInfo;
@@ -1096,16 +1097,19 @@
* Returns true if the specified UID has access to this display.
* @hide
*/
+ @TestApi
public boolean hasAccess(int uid) {
- return Display.hasAccess(uid, mFlags, mOwnerUid);
+ return hasAccess(uid, mFlags, mOwnerUid, mDisplayId);
}
/** @hide */
- public static boolean hasAccess(int uid, int flags, int ownerUid) {
+ public static boolean hasAccess(int uid, int flags, int ownerUid, int displayId) {
return (flags & Display.FLAG_PRIVATE) == 0
|| uid == ownerUid
|| uid == Process.SYSTEM_UID
- || uid == 0;
+ || uid == 0
+ // Check if the UID is present on given display.
+ || DisplayManagerGlobal.getInstance().isUidPresentOnDisplay(uid, displayId);
}
/**
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index 11ed357..2efebf6 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -58,6 +58,11 @@
public int type;
/**
+ * Logical display identifier.
+ */
+ public int displayId;
+
+ /**
* Display address, or null if none.
* Interpretation varies by display type.
*/
@@ -305,6 +310,7 @@
&& layerStack == other.layerStack
&& flags == other.flags
&& type == other.type
+ && displayId == other.displayId
&& Objects.equals(address, other.address)
&& Objects.equals(uniqueId, other.uniqueId)
&& appWidth == other.appWidth
@@ -346,6 +352,7 @@
layerStack = other.layerStack;
flags = other.flags;
type = other.type;
+ displayId = other.displayId;
address = other.address;
name = other.name;
uniqueId = other.uniqueId;
@@ -385,6 +392,7 @@
layerStack = source.readInt();
flags = source.readInt();
type = source.readInt();
+ displayId = source.readInt();
address = source.readParcelable(null);
name = source.readString();
appWidth = source.readInt();
@@ -432,6 +440,7 @@
dest.writeInt(layerStack);
dest.writeInt(this.flags);
dest.writeInt(type);
+ dest.writeInt(displayId);
dest.writeParcelable(address, flags);
dest.writeString(name);
dest.writeInt(appWidth);
@@ -579,7 +588,7 @@
* Returns true if the specified UID has access to this display.
*/
public boolean hasAccess(int uid) {
- return Display.hasAccess(uid, flags, ownerUid);
+ return Display.hasAccess(uid, flags, ownerUid, displayId);
}
private void getMetricsWithSize(DisplayMetrics outMetrics, CompatibilityInfo compatInfo,
@@ -610,6 +619,8 @@
StringBuilder sb = new StringBuilder();
sb.append("DisplayInfo{\"");
sb.append(name);
+ sb.append(", displayId ");
+ sb.append(displayId);
sb.append("\", uniqueId \"");
sb.append(uniqueId);
sb.append("\", app ");
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index a5a1dd9..67e0446 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -1889,11 +1889,19 @@
* Set to true to reveal all service targets at once.
*/
public void setShowServiceTargets(boolean show) {
+ // mShowServiceTargets is only flipped once to show direct share targets. But after the
+ // initial display the list can be re-sorted and the user will see the target list
+ // change. This will log the initial show and the subsequent shuffle to help us get
+ // accurate timing of the UX.
+ if (show) {
+ getMetricsLogger().write(
+ new LogMaker(MetricsEvent.ACTION_ACTIVITY_CHOOSER_SHOWN_DIRECT_TARGET)
+ .setSubtype(mShowServiceTargets ? MetricsEvent.PREVIOUSLY_VISIBLE
+ : MetricsEvent.PREVIOUSLY_HIDDEN));
+ }
if (show != mShowServiceTargets) {
mShowServiceTargets = show;
notifyDataSetChanged();
- getMetricsLogger().write(
- new LogMaker(MetricsEvent.ACTION_ACTIVITY_CHOOSER_SHOWN_DIRECT_TARGET));
}
}
diff --git a/core/java/com/android/internal/app/IAppOpsService.aidl b/core/java/com/android/internal/app/IAppOpsService.aidl
index c096961..c4af4c7 100644
--- a/core/java/com/android/internal/app/IAppOpsService.aidl
+++ b/core/java/com/android/internal/app/IAppOpsService.aidl
@@ -48,9 +48,9 @@
@UnsupportedAppUsage
List<AppOpsManager.PackageOps> getOpsForPackage(int uid, String packageName, in int[] ops);
void getHistoricalOps(int uid, String packageName, in List<String> ops, long beginTimeMillis,
- long endTimeMillis, in RemoteCallback callback);
+ long endTimeMillis, int flags, in RemoteCallback callback);
void getHistoricalOpsFromDiskRaw(int uid, String packageName, in List<String> ops,
- long beginTimeMillis, long endTimeMillis, in RemoteCallback callback);
+ long beginTimeMillis, long endTimeMillis, int flags, in RemoteCallback callback);
void offsetHistory(long duration);
void setHistoryParameters(int mode, long baseSnapshotInterval, int compressionStep);
void addHistoricalOps(in AppOpsManager.HistoricalOps ops);
diff --git a/core/java/com/android/internal/os/BinderCallsStats.java b/core/java/com/android/internal/os/BinderCallsStats.java
index bab4787..aa1e0d4 100644
--- a/core/java/com/android/internal/os/BinderCallsStats.java
+++ b/core/java/com/android/internal/os/BinderCallsStats.java
@@ -54,7 +54,7 @@
public static final int PERIODIC_SAMPLING_INTERVAL_DEFAULT = 1000;
public static final boolean DEFAULT_TRACK_SCREEN_INTERACTIVE = false;
public static final boolean DEFAULT_TRACK_DIRECT_CALLING_UID = true;
- public static final int MAX_BINDER_CALL_STATS_COUNT_DEFAULT = 5000;
+ public static final int MAX_BINDER_CALL_STATS_COUNT_DEFAULT = 1500;
private static final String DEBUG_ENTRY_PREFIX = "__DEBUG_";
private static class OverflowBinder extends Binder {}
diff --git a/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java b/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java
index 718bcb4..b8dfe0d 100644
--- a/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java
+++ b/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java
@@ -57,14 +57,14 @@
* List of UIDs to report data for
*/
private static final String COLLECTED_UIDS_SETTINGS_KEY = "collected_uids";
- private static final String COLLECTED_UIDS_DEFAULT = "1000-1000";
+ private static final String COLLECTED_UIDS_DEFAULT = "0-0;1000-1000";
/**
* Minimum total CPU usage to report
*/
private static final String MINIMUM_TOTAL_CPU_USAGE_MILLIS_SETTINGS_KEY =
"minimum_total_cpu_usage_millis";
- private static final int MINIMUM_TOTAL_CPU_USAGE_MILLIS_DEFAULT = 0;
+ private static final int MINIMUM_TOTAL_CPU_USAGE_MILLIS_DEFAULT = 10000;
private final Context mContext;
diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto
index efbe8ba..f3bc2c7 100644
--- a/core/proto/android/app/settings_enums.proto
+++ b/core/proto/android/app/settings_enums.proto
@@ -2284,4 +2284,7 @@
PAGE_ATSCP = 1672;
PAGE_ATHNP = 1673;
+
+ // OPEN: Accessibility detail settings (android.settings.ACCESSIBILITY_DETAILS_SETTINGS intent)
+ ACCESSIBILITY_DETAILS_SETTINGS = 1682;
}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0149365..e87295a 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2935,6 +2935,13 @@
<permission android:name="android.permission.TEMPORARY_ENABLE_ACCESSIBILITY"
android:protectionLevel="signature" />
+ <!-- @SystemApi Allows an application to launch detail settings activity of a particular
+ accessibility service.
+ <p>Not for use by third-party applications.
+ @hide -->
+ <permission android:name="android.permission.OPEN_ACCESSIBILITY_DETAILS_SETTINGS"
+ android:protectionLevel="signature|installer" />
+
<!-- @SystemApi Allows an application to watch and control how activities are
started globally in the system. Only for is in debugging
(usually the monkey command).
diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java
index 5dddd1a..e6e7a85 100644
--- a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java
@@ -518,6 +518,17 @@
}
@Test
+ public void testUidPredicate_zero() {
+ KernelCpuThreadReaderSettingsObserver.UidPredicate uidPredicate =
+ KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString("0-0");
+ assertTrue(uidPredicate.test(0));
+ assertFalse(uidPredicate.test(1));
+ assertFalse(uidPredicate.test(2000));
+ assertFalse(uidPredicate.test(10000));
+ assertFalse(uidPredicate.test(-100));
+ }
+
+ @Test
public void testUidPredicate_emptyRangeString() {
assertThrows(
NumberFormatException.class,
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index 6ecb621..1894e32 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -581,9 +581,9 @@
* The default value for this property is {@code false}.
* <p>
* <strong>Note</strong>: This property corresponds to the
- * {@code android:useLevel} attribute on the inner {@code <gradient>}
+ * {@code android:useLevel} attribute on the inner {@code <gradient>}
* tag, NOT the {@code android:useLevel} attribute on the outer
- * {@code <shape>} tag. For example,
+ * {@code <shape>} tag. For example,
* <pre>{@code
* <shape ...>
* <gradient
diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
index 866634e..e5fd0d3 100644
--- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
+++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java
@@ -118,8 +118,8 @@
static private boolean mIsHexInput = true;
// End time of emergency call, and extension, if set
- private long mCallEndElapsedRealtimeMillis = 0;
- private long mEmergencyExtensionMillis = 0;
+ private volatile long mCallEndElapsedRealtimeMillis = 0;
+ private volatile long mEmergencyExtensionMillis = 0;
public static class GpsNiNotification
{
@@ -242,8 +242,9 @@
*/
public boolean getInEmergency() {
boolean isInEmergencyExtension =
- (SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis) <
- mEmergencyExtensionMillis;
+ (mCallEndElapsedRealtimeMillis > 0)
+ && ((SystemClock.elapsedRealtime() - mCallEndElapsedRealtimeMillis)
+ < mEmergencyExtensionMillis);
boolean isInEmergencyCallback = mTelephonyManager.getEmergencyCallbackMode();
return mIsInEmergencyCall || isInEmergencyCallback || isInEmergencyExtension;
}
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 3bb696b..7cfe0dd 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -3168,7 +3168,8 @@
* @param sizeInFrames the number of frames available to write without blocking.
* Note that the frame size of a compressed stream is 1 byte.
*/
- public void onDataRequest(@NonNull AudioTrack track, int sizeInFrames) { }
+ public void onDataRequest(@NonNull AudioTrack track, @IntRange(from = 0) int sizeInFrames) {
+ }
}
/**
diff --git a/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationAccesses.java b/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationAccesses.java
index 4ac3ce4..09107ce 100644
--- a/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationAccesses.java
+++ b/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationAccesses.java
@@ -48,6 +48,11 @@
// Keep last 24 hours of location app information.
private static final long RECENT_TIME_INTERVAL_MILLIS = DateUtils.DAY_IN_MILLIS;
+ /** The flags for querying ops that are trusted for showing in the UI. */
+ public static final int TRUSTED_STATE_FLAGS = AppOpsManager.OP_FLAG_SELF
+ | AppOpsManager.OP_FLAG_UNTRUSTED_PROXY
+ | AppOpsManager.OP_FLAG_TRUSTED_PROXIED;
+
@VisibleForTesting
static final int[] LOCATION_OPS = new int[]{
AppOpsManager.OP_FINE_LOCATION,
@@ -136,8 +141,7 @@
// Earliest time for a location access to end and still be shown in list.
long recentLocationCutoffTime = now - RECENT_TIME_INTERVAL_MILLIS;
for (AppOpsManager.OpEntry entry : entries) {
- locationAccessFinishTime = Math.max(entry.getLastAccessBackgroundTime(),
- entry.getLastAccessForegroundTime());
+ locationAccessFinishTime = entry.getLastAccessTime(TRUSTED_STATE_FLAGS);
}
// Bail out if the entry is out of date.
if (locationAccessFinishTime < recentLocationCutoffTime) {
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAccessesTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAccessesTest.java
index d5b89ca..c1c5fa9 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAccessesTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAccessesTest.java
@@ -17,6 +17,7 @@
import android.os.UserHandle;
import android.os.UserManager;
+import android.util.LongSparseLongArray;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -152,11 +153,12 @@
}
private OpEntry createOpEntryWithTime(int op, long time) {
- final long[] times = new long[AppOpsManager._NUM_UID_STATE];
// Slot for background access timestamp.
- times[AppOpsManager.UID_STATE_LAST_NON_RESTRICTED + 1] = time;
- final long[] rejectTimes = new long[AppOpsManager._NUM_UID_STATE];
- return new OpEntry(op, AppOpsManager.MODE_ALLOWED, times, rejectTimes, 0 /* duration */,
- 0 /* proxyUid */, "" /* proxyPackage */);
+ final LongSparseLongArray accessTimes = new LongSparseLongArray();
+ accessTimes.put(AppOpsManager.makeKey(AppOpsManager.UID_STATE_BACKGROUND,
+ AppOpsManager.OP_FLAG_SELF), time);
+
+ return new OpEntry(op, false, AppOpsManager.MODE_ALLOWED, accessTimes, null /*durations*/,
+ null /*rejectTimes*/, null /* proxyUids */, null /* proxyPackages */);
}
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java
index 08d5367..8bd5fd2 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java
@@ -17,6 +17,7 @@
import android.os.UserHandle;
import android.os.UserManager;
+import android.util.LongSparseLongArray;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -153,6 +154,13 @@
}
private OpEntry createOpEntryWithTime(int op, long time, int duration) {
- return new OpEntry(op, AppOpsManager.MODE_ALLOWED, time, 0L, duration, 0, "");
+ final LongSparseLongArray accessTimes = new LongSparseLongArray();
+ accessTimes.put(AppOpsManager.makeKey(AppOpsManager.UID_STATE_TOP,
+ AppOpsManager.OP_FLAG_SELF), time);
+ final LongSparseLongArray durations = new LongSparseLongArray();
+ durations.put(AppOpsManager.makeKey(AppOpsManager.UID_STATE_TOP,
+ AppOpsManager.OP_FLAG_SELF), duration);
+ return new OpEntry(op, false, AppOpsManager.MODE_ALLOWED, accessTimes,
+ null /*rejectTimes*/, durations, null /* proxyUids */, null /* proxyPackages */);
}
}
diff --git a/packages/SystemUI/res/layout/quick_settings_footer_dialog.xml b/packages/SystemUI/res/layout/quick_settings_footer_dialog.xml
index 5bcc1b3..b969a15 100644
--- a/packages/SystemUI/res/layout/quick_settings_footer_dialog.xml
+++ b/packages/SystemUI/res/layout/quick_settings_footer_dialog.xml
@@ -39,17 +39,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/monitoring_title_device_owned"
- style="@style/TextAppearance.DeviceManagementDialog.Title"
- android:textColor="?android:attr/textColorPrimary"
+ style="@style/DeviceManagementDialogTitle"
android:paddingBottom="@dimen/qs_footer_dialog_subtitle_padding"
/>
<TextView
android:id="@+id/device_management_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@null"
- style="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
+ android:textAppearance="@style/TextAppearance.DeviceManagementDialog.Content"
/>
</LinearLayout>
@@ -64,17 +61,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/monitoring_subtitle_ca_certificate"
- style="@style/TextAppearance.DeviceManagementDialog.Title"
- android:textColor="?android:attr/textColorPrimary"
+ style="@style/DeviceManagementDialogTitle"
android:paddingBottom="@dimen/qs_footer_dialog_subtitle_padding"
/>
<TextView
android:id="@+id/ca_certs_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@null"
- style="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
+ android:textAppearance="@style/TextAppearance.DeviceManagementDialog.Content"
/>
</LinearLayout>
@@ -89,17 +83,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/monitoring_subtitle_network_logging"
- style="@style/TextAppearance.DeviceManagementDialog.Title"
- android:textColor="?android:attr/textColorPrimary"
+ style="@style/DeviceManagementDialogTitle"
android:paddingBottom="@dimen/qs_footer_dialog_subtitle_padding"
/>
<TextView
android:id="@+id/network_logging_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@null"
- style="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
+ android:textAppearance="@style/TextAppearance.DeviceManagementDialog.Content"
/>
</LinearLayout>
@@ -114,17 +105,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/monitoring_subtitle_vpn"
- style="@style/TextAppearance.DeviceManagementDialog.Title"
- android:textColor="?android:attr/textColorPrimary"
+ style="@style/DeviceManagementDialogTitle"
android:paddingBottom="@dimen/qs_footer_dialog_subtitle_padding"
/>
<TextView
android:id="@+id/vpn_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@null"
- style="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
+ android:textAppearance="@style/TextAppearance.DeviceManagementDialog.Content"
/>
</LinearLayout>
</LinearLayout>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 30dbc8b..2cd2c43 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -239,10 +239,19 @@
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
- <style name="TextAppearance.DeviceManagementDialog.Title" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">
- <item name="android:gravity">center</item>
+ <style name="TextAppearance.DeviceManagementDialog">
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
+ <style name="TextAppearance.DeviceManagementDialog.Title" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"/>
+
+ <style name="DeviceManagementDialogTitle">
+ <item name="android:gravity">center</item>
+ <item name="android:textAppearance">@style/TextAppearance.DeviceManagementDialog.Title</item>
+ </style>
+
+ <style name="TextAppearance.DeviceManagementDialog.Content" parent="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
+
<style name="BaseBrightnessDialogContainer" parent="@style/Theme.SystemUI">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java
index 46ed715b..0f71ffb 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java
@@ -16,6 +16,7 @@
package com.android.systemui.shared.system;
+import static android.app.ActivityManager.LOCK_TASK_MODE_LOCKED;
import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED;
import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE;
@@ -464,6 +465,17 @@
}
/**
+ * @return whether lock task mode is active in kiosk-mode (not screen pinning).
+ */
+ public boolean isLockTaskKioskModeActive() {
+ try {
+ return ActivityTaskManager.getService().getLockTaskModeState() == LOCK_TASK_MODE_LOCKED;
+ } catch (RemoteException e) {
+ return false;
+ }
+ }
+
+ /**
* Shows a voice session identified by {@code token}
* @return true if the session was shown, false otherwise
*/
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/DevicePolicyManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/DevicePolicyManagerWrapper.java
new file mode 100644
index 0000000..c6722ae
--- /dev/null
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/DevicePolicyManagerWrapper.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.shared.system;
+
+import android.app.AppGlobals;
+import android.app.admin.DevicePolicyManager;
+
+/**
+ * Wrapper for {@link DevicePolicyManager}.
+ */
+public class DevicePolicyManagerWrapper {
+ private static final DevicePolicyManagerWrapper sInstance = new DevicePolicyManagerWrapper();
+
+ private static final DevicePolicyManager sDevicePolicyManager =
+ AppGlobals.getInitialApplication().getSystemService(DevicePolicyManager.class);
+
+ private DevicePolicyManagerWrapper() { }
+
+ public static DevicePolicyManagerWrapper getInstance() {
+ return sInstance;
+ }
+
+ /**
+ * Returns whether the given package is allowed to run in Lock Task mode.
+ */
+ public boolean isLockTaskPermitted(String pkg) {
+ return sDevicePolicyManager.isLockTaskPermitted(pkg);
+ }
+}
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/PackageManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/PackageManagerWrapper.java
index 32e4bbf..443c1e1 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/PackageManagerWrapper.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/PackageManagerWrapper.java
@@ -22,8 +22,10 @@
import android.content.pm.ActivityInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.ResolveInfoFlags;
import android.content.pm.ResolveInfo;
import android.os.RemoteException;
+import android.os.UserHandle;
import java.util.List;
@@ -40,6 +42,8 @@
return sInstance;
}
+ private PackageManagerWrapper() {}
+
/**
* @return the activity info for a given {@param componentName} and {@param userId}.
*/
@@ -65,4 +69,19 @@
return null;
}
}
+
+ /**
+ * Determine the best Activity to perform for a given Intent.
+ */
+ public ResolveInfo resolveActivity(Intent intent, @ResolveInfoFlags int flags) {
+ final String resolvedType =
+ intent.resolveTypeIfNeeded(AppGlobals.getInitialApplication().getContentResolver());
+ try {
+ return mIPackageManager.resolveIntent(
+ intent, resolvedType, flags, UserHandle.getCallingUserId());
+ } catch (RemoteException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index 87f004f..f946cc1 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -48,6 +48,9 @@
import com.android.systemui.privacy.PrivacyItemController;
import com.android.systemui.recents.OverviewProxyService;
import com.android.systemui.shared.plugins.PluginManager;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.DevicePolicyManagerWrapper;
+import com.android.systemui.shared.system.PackageManagerWrapper;
import com.android.systemui.statusbar.AmbientPulseManager;
import com.android.systemui.statusbar.NavigationBarController;
import com.android.systemui.statusbar.NotificationListener;
@@ -285,6 +288,9 @@
@Nullable
@Inject @Named(LEAK_REPORT_EMAIL_NAME) Lazy<String> mLeakReportEmail;
@Inject Lazy<ClockManager> mClockManager;
+ @Inject Lazy<ActivityManagerWrapper> mActivityManagerWrapper;
+ @Inject Lazy<DevicePolicyManagerWrapper> mDevicePolicyManagerWrapper;
+ @Inject Lazy<PackageManagerWrapper> mPackageManagerWrapper;
@Inject
public Dependency() {
@@ -452,6 +458,9 @@
mForegroundServiceNotificationListener::get);
mProviders.put(ClockManager.class, mClockManager::get);
mProviders.put(PrivacyItemController.class, mPrivacyItemController::get);
+ mProviders.put(ActivityManagerWrapper.class, mActivityManagerWrapper::get);
+ mProviders.put(DevicePolicyManagerWrapper.class, mDevicePolicyManagerWrapper::get);
+ mProviders.put(PackageManagerWrapper.class, mPackageManagerWrapper::get);
// TODO(b/118592525): to support multi-display , we start to add something which is
diff --git a/packages/SystemUI/src/com/android/systemui/DependencyProvider.java b/packages/SystemUI/src/com/android/systemui/DependencyProvider.java
index a517d7c..895f9b9 100644
--- a/packages/SystemUI/src/com/android/systemui/DependencyProvider.java
+++ b/packages/SystemUI/src/com/android/systemui/DependencyProvider.java
@@ -41,6 +41,9 @@
import com.android.systemui.plugins.PluginInitializerImpl;
import com.android.systemui.shared.plugins.PluginManager;
import com.android.systemui.shared.plugins.PluginManagerImpl;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.DevicePolicyManagerWrapper;
+import com.android.systemui.shared.system.PackageManagerWrapper;
import com.android.systemui.statusbar.NavigationBarController;
import com.android.systemui.statusbar.phone.AutoHideController;
import com.android.systemui.statusbar.phone.ConfigurationControllerImpl;
@@ -181,4 +184,22 @@
@Named(MAIN_HANDLER_NAME) Handler mainHandler) {
return new AutoHideController(context, mainHandler);
}
+
+ @Singleton
+ @Provides
+ public ActivityManagerWrapper provideActivityManagerWrapper() {
+ return ActivityManagerWrapper.getInstance();
+ }
+
+ @Singleton
+ @Provides
+ public DevicePolicyManagerWrapper provideDevicePolicyManagerWrapper() {
+ return DevicePolicyManagerWrapper.getInstance();
+ }
+
+ @Singleton
+ @Provides
+ public PackageManagerWrapper providePackageManagerWrapper() {
+ return PackageManagerWrapper.getInstance();
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
index 4dcacd4..7006249 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
@@ -27,6 +27,7 @@
import android.os.Build;
import android.os.Handler;
import android.provider.Settings;
+import android.service.quicksettings.Tile;
import android.service.quicksettings.TileService;
import android.text.TextUtils;
import android.util.ArraySet;
@@ -166,7 +167,8 @@
icon.mutate();
icon.setTint(mContext.getColor(android.R.color.white));
CharSequence label = info.serviceInfo.loadLabel(pm);
- addTile(spec, icon, label != null ? label.toString() : "null", appLabel);
+ createStateAndAddTile(spec, icon, label != null ? label.toString() : "null",
+ appLabel);
}
notifyTilesChanged(true);
@@ -207,9 +209,10 @@
mSpecs.add(spec);
}
- private void addTile(
+ private void createStateAndAddTile(
String spec, Drawable drawable, CharSequence label, CharSequence appLabel) {
QSTile.State state = new QSTile.State();
+ state.state = Tile.STATE_INACTIVE;
state.label = label;
state.contentDescription = label;
state.icon = new DrawableIcon(drawable);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/InflatedSmartReplies.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/InflatedSmartReplies.java
index d8ea1f6..5b2e398 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/InflatedSmartReplies.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/InflatedSmartReplies.java
@@ -21,12 +21,18 @@
import android.app.Notification;
import android.app.RemoteInput;
import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
import android.os.Build;
import android.util.Log;
import android.util.Pair;
import android.widget.Button;
import com.android.internal.util.ArrayUtils;
+import com.android.systemui.Dependency;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.DevicePolicyManagerWrapper;
+import com.android.systemui.shared.system.PackageManagerWrapper;
import com.android.systemui.statusbar.SmartReplyController;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
@@ -191,14 +197,47 @@
boolean useSmartActions = !ArrayUtils.isEmpty(entry.systemGeneratedSmartActions)
&& notification.getAllowSystemGeneratedContextualActions();
if (useSmartActions) {
+ List<Notification.Action> systemGeneratedActions =
+ entry.systemGeneratedSmartActions;
+ // Filter actions if we're in kiosk-mode - we don't care about screen pinning mode,
+ // since notifications aren't shown there anyway.
+ ActivityManagerWrapper activityManagerWrapper =
+ Dependency.get(ActivityManagerWrapper.class);
+ if (activityManagerWrapper.isLockTaskKioskModeActive()) {
+ systemGeneratedActions = filterWhiteListedLockTaskApps(systemGeneratedActions);
+ }
smartActions = new SmartReplyView.SmartActions(
- entry.systemGeneratedSmartActions, true /* fromAssistant */);
+ systemGeneratedActions, true /* fromAssistant */);
}
}
return new SmartRepliesAndActions(smartReplies, smartActions);
}
/**
+ * Filter actions so that only actions pointing to whitelisted apps are allowed.
+ * This filtering is only meaningful when in lock-task mode.
+ */
+ private static List<Notification.Action> filterWhiteListedLockTaskApps(
+ List<Notification.Action> actions) {
+ PackageManagerWrapper packageManagerWrapper = Dependency.get(PackageManagerWrapper.class);
+ DevicePolicyManagerWrapper devicePolicyManagerWrapper =
+ Dependency.get(DevicePolicyManagerWrapper.class);
+ List<Notification.Action> filteredActions = new ArrayList<>();
+ for (Notification.Action action : actions) {
+ if (action.actionIntent == null) continue;
+ Intent intent = action.actionIntent.getIntent();
+ // Only allow actions that are explicit (implicit intents are not handled in lock-task
+ // mode), and link to whitelisted apps.
+ ResolveInfo resolveInfo = packageManagerWrapper.resolveActivity(intent, 0 /* flags */);
+ if (resolveInfo != null && devicePolicyManagerWrapper.isLockTaskPermitted(
+ resolveInfo.activityInfo.packageName)) {
+ filteredActions.add(action);
+ }
+ }
+ return filteredActions;
+ }
+
+ /**
* Returns whether the {@link Notification} represented by entry has a free-form remote input.
* Such an input can be used e.g. to implement smart reply buttons - by passing the replies
* through the remote input.
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java
index 12eed78..9e226f6 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java
@@ -14,12 +14,14 @@
package com.android.systemui.qs.customize;
+import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.atLeastOnce;
@@ -29,8 +31,13 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.Manifest;
+import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
import android.provider.Settings;
+import android.service.quicksettings.Tile;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
import android.testing.TestableLooper.RunWithLooper;
@@ -48,7 +55,9 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Answers;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -68,6 +77,8 @@
private static final String STOCK_TILES = "wifi,dnd,cell,battery";
private static final String ALL_TILES = "wifi,dnd,nfc,cell,battery";
private static final Set<String> FACTORY_TILES = new ArraySet<>();
+ private static final String TEST_PKG = "test_pkg";
+ private static final String TEST_CLS = "test_cls";
static {
FACTORY_TILES.addAll(Arrays.asList(
@@ -82,6 +93,8 @@
private QSTileHost mQSTileHost;
@Mock
private PackageManager mPackageManager;
+ @Captor
+ private ArgumentCaptor<List<TileQueryHelper.TileInfo>> mCaptor;
private QSTile.State mState;
private TestableLooper mBGLooper;
@@ -154,8 +167,6 @@
@Test
public void testQueryTiles_correctTilesAndOrderOnlyStockTiles() {
- ArgumentCaptor<List<TileQueryHelper.TileInfo>> captor = ArgumentCaptor.forClass(List.class);
-
Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.QS_TILES,
ONLY_STOCK_TILES);
mContext.getOrCreateTestableResources().addOverride(R.string.quick_settings_tiles_stock,
@@ -166,9 +177,9 @@
mBGLooper.processAllMessages();
waitForIdleSync(Dependency.get(Dependency.MAIN_HANDLER));
- verify(mListener, atLeastOnce()).onTilesChanged(captor.capture());
+ verify(mListener, atLeastOnce()).onTilesChanged(mCaptor.capture());
List<String> specs = new ArrayList<>();
- for (TileQueryHelper.TileInfo t : captor.getValue()) {
+ for (TileQueryHelper.TileInfo t : mCaptor.getValue()) {
specs.add(t.spec);
}
String tiles = TextUtils.join(",", specs);
@@ -177,8 +188,6 @@
@Test
public void testQueryTiles_correctTilesAndOrderOtherFactoryTiles() {
- ArgumentCaptor<List<TileQueryHelper.TileInfo>> captor = ArgumentCaptor.forClass(List.class);
-
Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.QS_TILES,
CURRENT_TILES);
mContext.getOrCreateTestableResources().addOverride(R.string.quick_settings_tiles_stock,
@@ -189,9 +198,9 @@
mBGLooper.processAllMessages();
waitForIdleSync(Dependency.get(Dependency.MAIN_HANDLER));
- verify(mListener, atLeastOnce()).onTilesChanged(captor.capture());
+ verify(mListener, atLeastOnce()).onTilesChanged(mCaptor.capture());
List<String> specs = new ArrayList<>();
- for (TileQueryHelper.TileInfo t : captor.getValue()) {
+ for (TileQueryHelper.TileInfo t : mCaptor.getValue()) {
specs.add(t.spec);
}
String tiles = TextUtils.join(",", specs);
@@ -200,8 +209,6 @@
@Test
public void testQueryTiles_otherTileNotIncluded() {
- ArgumentCaptor<List<TileQueryHelper.TileInfo>> captor = ArgumentCaptor.forClass(List.class);
-
Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.QS_TILES,
WITH_OTHER_TILES);
mContext.getOrCreateTestableResources().addOverride(R.string.quick_settings_tiles_stock,
@@ -212,15 +219,44 @@
mBGLooper.processAllMessages();
waitForIdleSync(Dependency.get(Dependency.MAIN_HANDLER));
- verify(mListener, atLeastOnce()).onTilesChanged(captor.capture());
+ verify(mListener, atLeastOnce()).onTilesChanged(mCaptor.capture());
List<String> specs = new ArrayList<>();
- for (TileQueryHelper.TileInfo t : captor.getValue()) {
+ for (TileQueryHelper.TileInfo t : mCaptor.getValue()) {
specs.add(t.spec);
}
assertFalse(specs.contains("other"));
}
@Test
+ public void testThirdPartyTilesInactive() {
+ ResolveInfo resolveInfo = new ResolveInfo();
+ ServiceInfo serviceInfo = mock(ServiceInfo.class, Answers.RETURNS_MOCKS);
+ resolveInfo.serviceInfo = serviceInfo;
+ serviceInfo.packageName = TEST_PKG;
+ serviceInfo.name = TEST_CLS;
+ serviceInfo.icon = R.drawable.android;
+ serviceInfo.permission = Manifest.permission.BIND_QUICK_SETTINGS_TILE;
+ serviceInfo.applicationInfo = mock(ApplicationInfo.class, Answers.RETURNS_MOCKS);
+ serviceInfo.applicationInfo.icon = R.drawable.android;
+ List<ResolveInfo> list = new ArrayList<>();
+ list.add(resolveInfo);
+ when(mPackageManager.queryIntentServicesAsUser(any(), anyInt(), anyInt())).thenReturn(list);
+
+ Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.QS_TILES, "");
+ mContext.getOrCreateTestableResources().addOverride(R.string.quick_settings_tiles_stock,
+ "");
+
+ mTileQueryHelper.queryTiles(mQSTileHost);
+ mBGLooper.processAllMessages();
+ waitForIdleSync(Dependency.get(Dependency.MAIN_HANDLER));
+
+ verify(mListener, atLeastOnce()).onTilesChanged(mCaptor.capture());
+ List<TileQueryHelper.TileInfo> tileInfos = mCaptor.getValue();
+ assertEquals(1, tileInfos.size());
+ assertEquals(Tile.STATE_INACTIVE, tileInfos.get(0).state.state);
+ }
+
+ @Test
public void testQueryTiles_nullSetting() {
Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.QS_TILES, null);
mContext.getOrCreateTestableResources().addOverride(R.string.quick_settings_tiles_stock,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/InflatedSmartRepliesTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/InflatedSmartRepliesTest.java
index 13651a5..de1072d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/InflatedSmartRepliesTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/InflatedSmartRepliesTest.java
@@ -11,19 +11,23 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * limitations under the License. */
package com.android.systemui.statusbar.policy;
import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.when;
import android.app.Notification;
import android.app.PendingIntent;
import android.app.RemoteInput;
import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ResolveInfo;
import android.graphics.drawable.Icon;
import android.service.notification.StatusBarNotification;
import android.util.Pair;
@@ -34,6 +38,9 @@
import com.android.systemui.R;
import com.android.systemui.SysuiTestCase;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
+import com.android.systemui.shared.system.DevicePolicyManagerWrapper;
+import com.android.systemui.shared.system.PackageManagerWrapper;
import com.android.systemui.statusbar.notification.collection.NotificationEntry;
import com.android.systemui.statusbar.policy.InflatedSmartReplies.SmartRepliesAndActions;
@@ -50,19 +57,19 @@
@RunWith(AndroidJUnit4.class)
public class InflatedSmartRepliesTest extends SysuiTestCase {
- private static final String TEST_ACTION = "com.android.SMART_REPLY_VIEW_ACTION";
+ private static final Intent TEST_INTENT = new Intent("com.android.SMART_REPLY_VIEW_ACTION");
+ private static final Intent WHITELISTED_TEST_INTENT =
+ new Intent("com.android.WHITELISTED_TEST_ACTION");
- @Mock
- SmartReplyConstants mSmartReplyConstants;
- @Mock
- StatusBarNotification mStatusBarNotification;
- @Mock
- Notification mNotification;
+ @Mock SmartReplyConstants mSmartReplyConstants;
+ @Mock StatusBarNotification mStatusBarNotification;
+ @Mock Notification mNotification;
NotificationEntry mEntry;
- @Mock
- RemoteInput mRemoteInput;
- @Mock
- RemoteInput mFreeFormRemoteInput;
+ @Mock RemoteInput mRemoteInput;
+ @Mock RemoteInput mFreeFormRemoteInput;
+ @Mock ActivityManagerWrapper mActivityManagerWrapper;
+ @Mock PackageManagerWrapper mPackageManagerWrapper;
+ @Mock DevicePolicyManagerWrapper mDevicePolicyManagerWrapper;
private Icon mActionIcon;
@@ -71,11 +78,18 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mDependency.injectTestDependency(ActivityManagerWrapper.class, mActivityManagerWrapper);
+ mDependency.injectTestDependency(
+ DevicePolicyManagerWrapper.class, mDevicePolicyManagerWrapper);
+ mDependency.injectTestDependency(PackageManagerWrapper.class, mPackageManagerWrapper);
+
when(mNotification.getAllowSystemGeneratedContextualActions()).thenReturn(true);
when(mStatusBarNotification.getNotification()).thenReturn(mNotification);
mEntry = new NotificationEntry(mStatusBarNotification);
when(mSmartReplyConstants.isEnabled()).thenReturn(true);
mActionIcon = Icon.createWithResource(mContext, R.drawable.ic_person);
+
+ when(mActivityManagerWrapper.isLockTaskKioskModeActive()).thenReturn(false);
}
@Test
@@ -227,6 +241,87 @@
assertThat(repliesAndActions.smartReplies).isNull();
}
+ @Test
+ public void chooseSmartRepliesAndActions_lockTaskKioskModeEnabled_smartRepliesUnaffected() {
+ when(mActivityManagerWrapper.isLockTaskKioskModeActive()).thenReturn(true);
+ // No apps are white-listed
+ when(mDevicePolicyManagerWrapper.isLockTaskPermitted(anyString())).thenReturn(false);
+
+ // Pass a null-array as app-generated smart replies, so that we use NAS-generated smart
+ // suggestions.
+ setupAppGeneratedReplies(null /* smartReplies */);
+ mEntry.systemGeneratedSmartReplies =
+ new String[] {"Sys Smart Reply 1", "Sys Smart Reply 2"};
+ mEntry.systemGeneratedSmartActions =
+ createActions(new String[] {"Sys Smart Action 1", "Sys Smart Action 2"});
+
+ SmartRepliesAndActions repliesAndActions =
+ InflatedSmartReplies.chooseSmartRepliesAndActions(mSmartReplyConstants, mEntry);
+
+ assertThat(repliesAndActions.smartReplies.choices).isEqualTo(
+ mEntry.systemGeneratedSmartReplies);
+ // Since no apps are whitelisted no actions should be shown.
+ assertThat(repliesAndActions.smartActions.actions).isEmpty();
+ }
+
+ @Test
+ public void chooseSmartRepliesAndActions_lockTaskKioskModeEnabled_smartActionsAffected() {
+ when(mActivityManagerWrapper.isLockTaskKioskModeActive()).thenReturn(true);
+ String allowedPackage = "allowedPackage";
+ ResolveInfo allowedResolveInfo = new ResolveInfo();
+ allowedResolveInfo.activityInfo = new ActivityInfo();
+ allowedResolveInfo.activityInfo.packageName = allowedPackage;
+ when(mPackageManagerWrapper
+ .resolveActivity(
+ argThat(intent -> WHITELISTED_TEST_INTENT.getAction().equals(
+ intent.getAction())),
+ anyInt() /* flags */))
+ .thenReturn(allowedResolveInfo);
+ when(mDevicePolicyManagerWrapper.isLockTaskPermitted(allowedPackage)).thenReturn(true);
+
+ // Pass a null-array as app-generated smart replies, so that we use NAS-generated smart
+ // suggestions.
+ setupAppGeneratedReplies(null /* smartReplies */);
+ mEntry.systemGeneratedSmartReplies =
+ new String[] {"Sys Smart Reply 1", "Sys Smart Reply 2"};
+ List<Notification.Action> actions = new ArrayList<>();
+ actions.add(createAction("allowed action", WHITELISTED_TEST_INTENT));
+ actions.add(createAction("non-allowed action", TEST_INTENT));
+ mEntry.systemGeneratedSmartActions = actions;
+
+ SmartRepliesAndActions repliesAndActions =
+ InflatedSmartReplies.chooseSmartRepliesAndActions(mSmartReplyConstants, mEntry);
+
+ // Only the action for the whitelisted package should be allowed.
+ assertThat(repliesAndActions.smartActions.actions.size()).isEqualTo(1);
+ assertThat(repliesAndActions.smartActions.actions.get(0)).isEqualTo(
+ mEntry.systemGeneratedSmartActions.get(0));
+ }
+
+ @Test
+ public void chooseSmartRepliesAndActions_screenPinningModeEnabled_suggestionsUnaffected() {
+ when(mActivityManagerWrapper.isLockToAppActive()).thenReturn(true);
+ // No apps are white-listed
+ when(mDevicePolicyManagerWrapper.isLockTaskPermitted(anyString())).thenReturn(false);
+
+ // Pass a null-array as app-generated smart replies, so that we use NAS-generated smart
+ // suggestions.
+ setupAppGeneratedReplies(null /* smartReplies */);
+ mEntry.systemGeneratedSmartReplies =
+ new String[] {"Sys Smart Reply 1", "Sys Smart Reply 2"};
+ mEntry.systemGeneratedSmartActions =
+ createActions(new String[] {"Sys Smart Action 1", "Sys Smart Action 2"});
+
+ SmartRepliesAndActions repliesAndActions =
+ InflatedSmartReplies.chooseSmartRepliesAndActions(mSmartReplyConstants, mEntry);
+
+ // We don't restrict replies or actions in screen pinning mode.
+ assertThat(repliesAndActions.smartReplies.choices).isEqualTo(
+ mEntry.systemGeneratedSmartReplies);
+ assertThat(repliesAndActions.smartActions.actions).isEqualTo(
+ mEntry.systemGeneratedSmartActions);
+ }
+
private void setupAppGeneratedReplies(CharSequence[] smartReplies) {
setupAppGeneratedReplies(smartReplies, true /* allowSystemGeneratedReplies */);
}
@@ -234,7 +329,7 @@
private void setupAppGeneratedReplies(
CharSequence[] smartReplies, boolean allowSystemGeneratedReplies) {
PendingIntent pendingIntent =
- PendingIntent.getBroadcast(mContext, 0, new Intent(TEST_ACTION), 0);
+ PendingIntent.getBroadcast(mContext, 0, TEST_INTENT, 0);
Notification.Action action =
new Notification.Action.Builder(null, "Test Action", pendingIntent).build();
when(mRemoteInput.getChoices()).thenReturn(smartReplies);
@@ -261,8 +356,11 @@
}
private Notification.Action.Builder createActionBuilder(String actionTitle) {
- PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0,
- new Intent(TEST_ACTION), 0);
+ return createActionBuilder(actionTitle, TEST_INTENT);
+ }
+
+ private Notification.Action.Builder createActionBuilder(String actionTitle, Intent intent) {
+ PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);
return new Notification.Action.Builder(mActionIcon, actionTitle, pendingIntent);
}
@@ -270,6 +368,10 @@
return createActionBuilder(actionTitle).build();
}
+ private Notification.Action createAction(String actionTitle, Intent intent) {
+ return createActionBuilder(actionTitle, intent).build();
+ }
+
private List<Notification.Action> createActions(String[] actionTitles) {
List<Notification.Action> actions = new ArrayList<>();
for (String title : actionTitles) {
diff --git a/proto/src/metrics_constants/metrics_constants.proto b/proto/src/metrics_constants/metrics_constants.proto
index 365c6b4..ab8ad0f 100644
--- a/proto/src/metrics_constants/metrics_constants.proto
+++ b/proto/src/metrics_constants/metrics_constants.proto
@@ -253,6 +253,13 @@
MANAGED_PROFILE = 2;
}
+ // Subtypes for showing direct sharing targets
+ enum DirectShareTargetPreviousState {
+ PREVIOUSLY_UNKNOWN = 0;
+ PREVIOUSLY_HIDDEN = 1;
+ PREVIOUSLY_VISIBLE = 2;
+ }
+
// Known visual elements: views or controls.
enum View {
// Unknown view
@@ -7065,6 +7072,9 @@
ACTION_ATCHNUC = 1681;
+ // OPEN: Accessibility detail settings (android.settings.ACCESSIBILITY_DETAILS_SETTINGS intent)
+ ACCESSIBILITY_DETAILS_SETTINGS = 1682;
+
// ---- End Q Constants, all Q constants go above this line ----
// Add new aosp constants above this line.
// END OF AOSP CONSTANTS
diff --git a/services/core/java/com/android/server/LooperStatsService.java b/services/core/java/com/android/server/LooperStatsService.java
index b423f62..965b64b 100644
--- a/services/core/java/com/android/server/LooperStatsService.java
+++ b/services/core/java/com/android/server/LooperStatsService.java
@@ -55,7 +55,7 @@
private static final String DEBUG_SYS_LOOPER_STATS_ENABLED =
"debug.sys.looper_stats_enabled";
private static final int DEFAULT_SAMPLING_INTERVAL = 1000;
- private static final int DEFAULT_ENTRIES_SIZE_CAP = 2000;
+ private static final int DEFAULT_ENTRIES_SIZE_CAP = 1500;
private static final boolean DEFAULT_ENABLED = true;
private static final boolean DEFAULT_TRACK_SCREEN_INTERACTIVE = false;
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index c8e8ef8..e28d484 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -1727,7 +1727,8 @@
final List<AppOpsManager.PackageOps> pkgs = manager.getOpsForPackage(uid, packageName, ops);
for (AppOpsManager.PackageOps pkg : CollectionUtils.emptyIfNull(pkgs)) {
for (AppOpsManager.OpEntry op : CollectionUtils.emptyIfNull(pkg.getOps())) {
- maxTime = Math.max(maxTime, op.getLastAccessTime());
+ maxTime = Math.max(maxTime, op.getLastAccessTime(
+ AppOpsManager.OP_FLAGS_ALL_TRUSTED));
}
}
return maxTime;
diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java
index 545baa0..5cca159 100644
--- a/services/core/java/com/android/server/VibratorService.java
+++ b/services/core/java/com/android/server/VibratorService.java
@@ -594,8 +594,9 @@
if (mProcStatesCache.get(uid, ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND)
> ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND
&& !vib.isNotification() && !vib.isRingtone()) {
- Slog.e(TAG, "Ignoring incoming vibration as process with uid = "
- + uid + " is background");
+ Slog.e(TAG, "Ignoring incoming vibration as process with"
+ + " uid = " + uid + " is background,"
+ + " usage = " + AudioAttributes.usageToString(vib.usageHint));
return;
}
linkVibration(vib);
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index 70c28a8..ba7288e 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -16,6 +16,9 @@
package com.android.server.appop;
+import static android.app.AppOpsManager.MAX_PRIORITY_UID_STATE;
+import static android.app.AppOpsManager.MIN_PRIORITY_UID_STATE;
+import static android.app.AppOpsManager.OP_FLAGS_ALL;
import static android.app.AppOpsManager.OP_NONE;
import static android.app.AppOpsManager.OP_PLAY_AUDIO;
import static android.app.AppOpsManager.UID_STATE_BACKGROUND;
@@ -23,12 +26,12 @@
import static android.app.AppOpsManager.UID_STATE_FOREGROUND;
import static android.app.AppOpsManager.UID_STATE_FOREGROUND_SERVICE;
import static android.app.AppOpsManager.UID_STATE_FOREGROUND_SERVICE_LOCATION;
-import static android.app.AppOpsManager.UID_STATE_LAST_NON_RESTRICTED;
+import static android.app.AppOpsManager.UID_STATE_MAX_LAST_NON_RESTRICTED;
import static android.app.AppOpsManager.UID_STATE_PERSISTENT;
import static android.app.AppOpsManager.UID_STATE_TOP;
-import static android.app.AppOpsManager._NUM_UID_STATE;
import static android.app.AppOpsManager.modeToName;
import static android.app.AppOpsManager.opToName;
+import static android.app.AppOpsManager.resolveFirstUnrestrictedUidState;
import android.Manifest;
import android.annotation.NonNull;
@@ -39,6 +42,9 @@
import android.app.AppOpsManager;
import android.app.AppOpsManager.HistoricalOps;
import android.app.AppOpsManager.HistoricalOpsRequest;
+import android.app.AppOpsManager.Mode;
+import android.app.AppOpsManager.OpEntry;
+import android.app.AppOpsManager.OpFlags;
import android.app.AppOpsManagerInternal;
import android.app.AppOpsManagerInternal.CheckOpsDelegate;
import android.content.BroadcastReceiver;
@@ -76,6 +82,8 @@
import android.util.ArraySet;
import android.util.AtomicFile;
import android.util.KeyValueListParser;
+import android.util.LongSparseArray;
+import android.util.LongSparseLongArray;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
@@ -164,36 +172,6 @@
UID_STATE_CACHED, // ActivityManager.PROCESS_STATE_NONEXISTENT
};
- static final String[] UID_STATE_NAMES = new String[] {
- "pers ", // UID_STATE_PERSISTENT
- "top ", // UID_STATE_TOP
- "fgsvcl", // UID_STATE_FOREGROUND_SERVICE_LOCATION
- "fgsvc", // UID_STATE_FOREGROUND_SERVICE
- "fg ", // UID_STATE_FOREGROUND
- "bg ", // UID_STATE_BACKGROUND
- "cch ", // UID_STATE_CACHED
- };
-
- static final String[] UID_STATE_TIME_ATTRS = new String[] {
- "tp", // UID_STATE_PERSISTENT
- "tt", // UID_STATE_TOP
- "tfsl", // UID_STATE_FOREGROUND_SERVICE_LOCATION
- "tfs", // UID_STATE_FOREGROUND_SERVICE
- "tf", // UID_STATE_FOREGROUND
- "tb", // UID_STATE_BACKGROUND
- "tc", // UID_STATE_CACHED
- };
-
- static final String[] UID_STATE_REJECT_ATTRS = new String[] {
- "rp", // UID_STATE_PERSISTENT
- "rt", // UID_STATE_TOP
- "rfsl", // UID_STATE_FOREGROUND_SERVICE_LOCATION
- "rfs", // UID_STATE_FOREGROUND_SERVICE
- "rf", // UID_STATE_FOREGROUND
- "rb", // UID_STATE_BACKGROUND
- "rc", // UID_STATE_CACHED
- };
-
Context mContext;
final AtomicFile mFile;
final Handler mHandler;
@@ -355,12 +333,14 @@
public boolean isDefault() {
return (pkgOps == null || pkgOps.isEmpty())
- && (opModes == null || opModes.size() <= 0);
+ && (opModes == null || opModes.size() <= 0)
+ && (state == UID_STATE_CACHED
+ && (pendingState == UID_STATE_CACHED));
}
- int evalMode(int mode) {
+ int evalMode(int op, int mode) {
if (mode == AppOpsManager.MODE_FOREGROUND) {
- return state <= UID_STATE_LAST_NON_RESTRICTED
+ return state <= AppOpsManager.resolveLastRestrictedUidState(op)
? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED;
}
return mode;
@@ -425,41 +405,121 @@
}
final static class Op {
+ int op;
+ boolean running;
final UidState uidState;
- final int uid;
- final String packageName;
- final int op;
- int proxyUid = -1;
- String proxyPackageName;
- int mode;
- int duration;
- long time[] = new long[_NUM_UID_STATE];
- long rejectTime[] = new long[_NUM_UID_STATE];
+ final @NonNull String packageName;
+
+ private @Mode int mode;
+ private @Nullable LongSparseLongArray mAccessTimes;
+ private @Nullable LongSparseLongArray mRejectTimes;
+ private @Nullable LongSparseLongArray mDurations;
+ private @Nullable LongSparseLongArray mProxyUids;
+ private @Nullable LongSparseArray<String> mProxyPackageNames;
+
int startNesting;
long startRealtime;
- Op(UidState _uidState, String _packageName, int _op) {
- uidState = _uidState;
- uid = _uidState.uid;
- packageName = _packageName;
- op = _op;
- mode = AppOpsManager.opToDefaultMode(op);
- }
-
- boolean hasAnyTime() {
- for (int i = 0; i < AppOpsManager._NUM_UID_STATE; i++) {
- if (time[i] != 0) {
- return true;
- }
- if (rejectTime[i] != 0) {
- return true;
- }
- }
- return false;
+ Op(UidState uidState, String packageName, int op) {
+ this.op = op;
+ this.uidState = uidState;
+ this.packageName = packageName;
+ this.mode = AppOpsManager.opToDefaultMode(op);
}
int getMode() {
- return uidState.evalMode(mode);
+ return mode;
+ }
+
+ int evalMode() {
+ return uidState.evalMode(op, mode);
+ }
+
+ /** @hide */
+ public void accessed(long time, int proxyUid, @Nullable String proxyPackageName,
+ @AppOpsManager.UidState int uidState, @OpFlags int flags) {
+ final long key = AppOpsManager.makeKey(uidState, flags);
+ if (mAccessTimes == null) {
+ mAccessTimes = new LongSparseLongArray();
+ }
+ mAccessTimes.put(key, time);
+ updateProxyState(key, proxyUid, proxyPackageName);
+ if (mDurations != null) {
+ mDurations.delete(key);
+ }
+ }
+
+ /** @hide */
+ public void rejected(long time, int proxyUid, @Nullable String proxyPackageName,
+ @AppOpsManager.UidState int uidState, @OpFlags int flags) {
+ final long key = AppOpsManager.makeKey(uidState, flags);
+ if (mRejectTimes == null) {
+ mRejectTimes = new LongSparseLongArray();
+ }
+ mRejectTimes.put(key, time);
+ updateProxyState(key, proxyUid, proxyPackageName);
+ if (mDurations != null) {
+ mDurations.delete(key);
+ }
+ }
+
+ /** @hide */
+ public void started(long time, @AppOpsManager.UidState int uidState, @OpFlags int flags) {
+ updateAccessTimeAndDuration(time, -1 /*duration*/, uidState, flags);
+ running = true;
+ }
+
+ /** @hide */
+ public void finished(long time, long duration, @AppOpsManager.UidState int uidState,
+ @OpFlags int flags) {
+ updateAccessTimeAndDuration(time, duration, uidState, flags);
+ running = false;
+ }
+
+ /** @hide */
+ public void running(long time, long duration, @AppOpsManager.UidState int uidState,
+ @OpFlags int flags) {
+ updateAccessTimeAndDuration(time, duration, uidState, flags);
+ }
+
+ /** @hide */
+ public void continuing(long duration, @AppOpsManager.UidState int uidState,
+ @OpFlags int flags) {
+ final long key = AppOpsManager.makeKey(uidState, flags);
+ if (mDurations == null) {
+ mDurations = new LongSparseLongArray();
+ }
+ mDurations.put(key, duration);
+ }
+
+ private void updateAccessTimeAndDuration(long time, long duration,
+ @AppOpsManager.UidState int uidState, @OpFlags int flags) {
+ final long key = AppOpsManager.makeKey(uidState, flags);
+ if (mAccessTimes == null) {
+ mAccessTimes = new LongSparseLongArray();
+ }
+ mAccessTimes.put(key, time);
+ if (mDurations == null) {
+ mDurations = new LongSparseLongArray();
+ }
+ mDurations.put(key, duration);
+ }
+
+ private void updateProxyState(long key, int proxyUid,
+ @Nullable String proxyPackageName) {
+ if (mProxyUids == null) {
+ mProxyUids = new LongSparseLongArray();
+ }
+ mProxyUids.put(key, proxyUid);
+ if (mProxyPackageNames == null) {
+ mProxyPackageNames = new LongSparseArray<>();
+ }
+ mProxyPackageNames.put(key, proxyPackageName);
+ }
+
+ boolean hasAnyTime() {
+ return (mAccessTimes != null && mAccessTimes.size() > 0)
+ || (mRejectTimes != null && mRejectTimes.size() > 0);
}
}
@@ -812,7 +872,7 @@
final int opCount = client.mStartedOps.size();
for (int j = opCount - 1; j >= 0; j--) {
final Op op = client.mStartedOps.get(j);
- if (uid == op.uid && packageName.equals(op.packageName)) {
+ if (uid == op.uidState.uid && packageName.equals(op.packageName)) {
finishOperationLocked(op, /*finishNested*/ true);
client.mStartedOps.remove(j);
if (op.startNesting <= 0) {
@@ -829,9 +889,9 @@
final int opCount = ops.size();
for (int i = 0; i < opCount; i++) {
final Op op = ops.valueAt(i);
- if (op.duration == -1) {
+ if (op.running) {
scheduleOpActiveChangedIfNeededLocked(
- op.op, op.uid, op.packageName, false);
+ op.op, op.uidState.uid, op.packageName, false);
}
}
}
@@ -854,7 +914,7 @@
if (uidState != null && uidState.pendingState != newState) {
final int oldPendingState = uidState.pendingState;
uidState.pendingState = newState;
- if (newState < uidState.state || newState <= UID_STATE_LAST_NON_RESTRICTED) {
+ if (newState < uidState.state || newState <= UID_STATE_MAX_LAST_NON_RESTRICTED) {
// We are moving to a more important state, or the new state is in the
// foreground, then always do it immediately.
commitUidPendingStateLocked(uidState);
@@ -880,8 +940,18 @@
for (int j = ops.size() - 1; j >= 0; j--) {
final Op op = ops.valueAt(j);
if (op.startNesting > 0) {
- op.time[oldPendingState] = now;
- op.time[newState] = now;
+ final long duration = SystemClock.elapsedRealtime()
+ - op.startRealtime;
+ // We don't support proxy long running ops (start/stop)
+ mHistoricalRegistry.increaseOpAccessDuration(op.op,
+ op.uidState.uid, op.packageName, oldPendingState,
+ AppOpsManager.OP_FLAG_SELF, duration);
+ // Finish the op in the old state
+ op.finished(now, duration, oldPendingState,
+ AppOpsManager.OP_FLAG_SELF);
+ // Start the op in the new state
+ op.startRealtime = now;
+ op.started(now, newState, AppOpsManager.OP_FLAG_SELF);
}
}
}
@@ -911,13 +981,7 @@
resOps = new ArrayList<>();
for (int j=0; j<pkgOps.size(); j++) {
Op curOp = pkgOps.valueAt(j);
- final boolean running = curOp.duration == -1;
- long duration = running
- ? (elapsedNow - curOp.startRealtime)
- : curOp.duration;
- resOps.add(new AppOpsManager.OpEntry(curOp.op, curOp.mode, curOp.time,
- curOp.rejectTime, (int) duration, running, curOp.proxyUid,
- curOp.proxyPackageName));
+ resOps.add(getOpEntryForResult(curOp, elapsedNow));
}
} else {
for (int j=0; j<ops.length; j++) {
@@ -926,13 +990,7 @@
if (resOps == null) {
resOps = new ArrayList<>();
}
- final boolean running = curOp.duration == -1;
- final long duration = running
- ? (elapsedNow - curOp.startRealtime)
- : curOp.duration;
- resOps.add(new AppOpsManager.OpEntry(curOp.op, curOp.mode, curOp.time,
- curOp.rejectTime, (int) duration, running, curOp.proxyUid,
- curOp.proxyPackageName));
+ resOps.add(getOpEntryForResult(curOp, elapsedNow));
}
}
}
@@ -947,8 +1005,7 @@
if (ops == null) {
resOps = new ArrayList<>();
for (int j=0; j<uidOps.size(); j++) {
- resOps.add(new AppOpsManager.OpEntry(uidOps.keyAt(j), uidOps.valueAt(j),
- 0, 0, 0, -1, null));
+ resOps.add(new OpEntry(uidOps.keyAt(j), uidOps.valueAt(j)));
}
} else {
for (int j=0; j<ops.length; j++) {
@@ -957,14 +1014,27 @@
if (resOps == null) {
resOps = new ArrayList<>();
}
- resOps.add(new AppOpsManager.OpEntry(uidOps.keyAt(index), uidOps.valueAt(index),
- 0, 0, 0, -1, null));
+ resOps.add(new OpEntry(uidOps.keyAt(j), uidOps.valueAt(j)));
}
}
}
return resOps;
}
+ private static @NonNull OpEntry getOpEntryForResult(@NonNull Op op, long elapsedNow) {
+ if (op.running) {
+ op.continuing(elapsedNow - op.startRealtime,
+ op.uidState.state, AppOpsManager.OP_FLAG_SELF);
+ }
+ final OpEntry entry = new OpEntry(op.op, op.running, op.mode,
+ op.mAccessTimes != null ? op.mAccessTimes.clone() : null,
+ op.mRejectTimes != null ? op.mRejectTimes.clone() : null,
+ op.mDurations != null ? op.mDurations.clone() : null,
+ op.mProxyUids != null ? op.mProxyUids.clone() : null,
+ op.mProxyPackageNames != null ? op.mProxyPackageNames.clone() : null);
+ return entry;
+ }
+
@Override
public List<AppOpsManager.PackageOps> getPackagesForOps(int[] ops) {
mContext.enforcePermission(android.Manifest.permission.GET_APP_OPS_STATS,
@@ -1026,13 +1096,14 @@
@Override
public void getHistoricalOps(int uid, @NonNull String packageName,
@Nullable List<String> opNames, long beginTimeMillis, long endTimeMillis,
- @NonNull RemoteCallback callback) {
+ @OpFlags int flags, @NonNull RemoteCallback callback) {
// Use the builder to validate arguments.
- final HistoricalOpsRequest request = new HistoricalOpsRequest.Builder(
+ new HistoricalOpsRequest.Builder(
beginTimeMillis, endTimeMillis)
.setUid(uid)
.setPackageName(packageName)
.setOpNames(opNames)
+ .setFlags(flags)
.build();
Preconditions.checkNotNull(callback, "callback cannot be null");
@@ -1041,79 +1112,23 @@
final String[] opNamesArray = (opNames != null)
? opNames.toArray(new String[opNames.size()]) : null;
- if (mHistoricalRegistry.getMode() == AppOpsManager.HISTORICAL_MODE_DISABLED) {
- // TODO (bug:122218838): Remove once the feature fully enabled.
- getHistoricalPackagesOpsCompat(uid, packageName, opNamesArray, beginTimeMillis,
- endTimeMillis, callback);
- } else {
- // Must not hold the appops lock
- mHistoricalRegistry.getHistoricalOps(uid, packageName, opNamesArray,
- beginTimeMillis, endTimeMillis, callback);
- }
- }
- private void getHistoricalPackagesOpsCompat(int uid, @NonNull String packageName,
- @Nullable String[] opNames, long beginTimeMillis, long endTimeMillis,
- @NonNull RemoteCallback callback) {
- synchronized (AppOpsService.this) {
- final HistoricalOps ops = new HistoricalOps(beginTimeMillis, endTimeMillis);
- if (opNames == null) {
- opNames = AppOpsManager.getOpStrs();
- }
- final int uidStateCount = mUidStates.size();
- for (int uidIdx = 0; uidIdx < uidStateCount; uidIdx++) {
- final UidState uidState = mUidStates.valueAt(uidIdx);
- if (uidState.pkgOps == null || uidState.pkgOps.isEmpty()
- || (uid != Process.INVALID_UID && uid != uidState.uid)) {
- continue;
- }
- final ArrayMap<String, Ops> packages = uidState.pkgOps;
- final int packageCount = packages.size();
- for (int pkgIdx = 0; pkgIdx < packageCount; pkgIdx++) {
- final Ops pkgOps = packages.valueAt(pkgIdx);
- if (packageName != null && !packageName.equals(pkgOps.packageName)) {
- continue;
- }
- final int opCount = opNames.length;
- for (int opIdx = 0; opIdx < opCount; opIdx++) {
- final String opName = opNames[opIdx];
- if (!ArrayUtils.contains(opNames, opName)) {
- continue;
- }
- final int opCode = AppOpsManager.strOpToOp(opName);
- final Op op = pkgOps.get(opCode);
- if (op == null) {
- continue;
- }
- final int stateCount = AppOpsManager._NUM_UID_STATE;
- for (int stateIdx = 0; stateIdx < stateCount; stateIdx++) {
- if (op.rejectTime[stateIdx] != 0) {
- ops.increaseRejectCount(opCode, uidState.uid,
- pkgOps.packageName, stateIdx, 1);
- } else if (op.time[stateIdx] != 0) {
- ops.increaseAccessCount(opCode, uidState.uid,
- pkgOps.packageName, stateIdx, 1);
- }
- }
- }
- }
- }
- final Bundle payload = new Bundle();
- payload.putParcelable(AppOpsManager.KEY_HISTORICAL_OPS, ops);
- callback.sendResult(payload);
- }
+ // Must not hold the appops lock
+ mHistoricalRegistry.getHistoricalOps(uid, packageName, opNamesArray,
+ beginTimeMillis, endTimeMillis, flags, callback);
}
@Override
public void getHistoricalOpsFromDiskRaw(int uid, @NonNull String packageName,
@Nullable List<String> opNames, long beginTimeMillis, long endTimeMillis,
- @NonNull RemoteCallback callback) {
+ @OpFlags int flags, @NonNull RemoteCallback callback) {
// Use the builder to validate arguments.
- final HistoricalOpsRequest request = new HistoricalOpsRequest.Builder(
+ new HistoricalOpsRequest.Builder(
beginTimeMillis, endTimeMillis)
.setUid(uid)
.setPackageName(packageName)
.setOpNames(opNames)
+ .setFlags(flags)
.build();
Preconditions.checkNotNull(callback, "callback cannot be null");
@@ -1125,7 +1140,7 @@
// Must not hold the appops lock
mHistoricalRegistry.getHistoricalOpsFromDiskRaw(uid, packageName, opNamesArray,
- beginTimeMillis, endTimeMillis, callback);
+ beginTimeMillis, endTimeMillis, flags, callback);
}
@Override
@@ -1172,7 +1187,7 @@
}
}
- void enforceManageAppOpsModes(int callingPid, int callingUid, int targetUid) {
+ private void enforceManageAppOpsModes(int callingPid, int callingUid, int targetUid) {
if (callingPid == Process.myPid()) {
return;
}
@@ -1316,6 +1331,8 @@
return;
}
+ boolean scheduleWrite = false;
+
int numPkgs = pkgOps.size();
for (int pkgNum = 0; pkgNum < numPkgs; pkgNum++) {
Ops ops = pkgOps.valueAt(pkgNum);
@@ -1327,14 +1344,14 @@
int defaultMode = AppOpsManager.opToDefaultMode(code);
if (op.mode != defaultMode) {
- Slog.w(TAG, "resetting app-op mode for " + AppOpsManager.opToName(code) + " of "
- + pkgOps.keyAt(pkgNum));
-
op.mode = defaultMode;
-
- scheduleWriteLocked();
+ scheduleWrite = true;
}
}
+
+ if (scheduleWrite) {
+ scheduleWriteLocked();
+ }
}
}
@@ -1544,9 +1561,10 @@
curOp.mode = AppOpsManager.opToDefaultMode(curOp.op);
changed = true;
uidChanged = true;
- callbacks = addCallbacks(callbacks, curOp.op, curOp.uid, packageName,
+ final int uid = curOp.uidState.uid;
+ callbacks = addCallbacks(callbacks, curOp.op, uid, packageName,
mOpModeWatchers.get(curOp.op));
- callbacks = addCallbacks(callbacks, curOp.op, curOp.uid, packageName,
+ callbacks = addCallbacks(callbacks, curOp.op, uid, packageName,
mPackageModeWatchers.get(packageName));
if (!curOp.hasAnyTime()) {
pkgOps.removeAt(j);
@@ -1727,6 +1745,7 @@
private int checkOperationUnchecked(int code, int uid, String packageName,
boolean raw) {
synchronized (this) {
+ checkPackage(uid, packageName);
if (isOpRestrictedLocked(uid, code, packageName)) {
return AppOpsManager.MODE_IGNORED;
}
@@ -1735,13 +1754,13 @@
if (uidState != null && uidState.opModes != null
&& uidState.opModes.indexOfKey(code) >= 0) {
final int rawMode = uidState.opModes.get(code);
- return raw ? rawMode : uidState.evalMode(rawMode);
+ return raw ? rawMode : uidState.evalMode(code, rawMode);
}
Op op = getOpLocked(code, uid, packageName, false, true, false);
if (op == null) {
return AppOpsManager.opToDefaultMode(code);
}
- return op.mode;
+ return raw ? op.mode : op.evalMode();
}
}
@@ -1855,21 +1874,32 @@
String proxyPackageName, int proxiedUid, String proxiedPackageName) {
verifyIncomingUid(proxyUid);
verifyIncomingOp(code);
+
String resolveProxyPackageName = resolvePackageName(proxyUid, proxyPackageName);
if (resolveProxyPackageName == null) {
return AppOpsManager.MODE_IGNORED;
}
+
+ final boolean isProxyTrusted = mContext.checkPermission(
+ Manifest.permission.UPDATE_APP_OPS_STATS, -1, proxyUid)
+ == PackageManager.PERMISSION_GRANTED;
+
+ final int proxyFlags = isProxyTrusted ? AppOpsManager.OP_FLAG_TRUSTED_PROXY
+ : AppOpsManager.OP_FLAG_UNTRUSTED_PROXY;
final int proxyMode = noteOperationUnchecked(code, proxyUid,
- resolveProxyPackageName, -1, null);
+ resolveProxyPackageName, Process.INVALID_UID, null, proxyFlags);
if (proxyMode != AppOpsManager.MODE_ALLOWED || Binder.getCallingUid() == proxiedUid) {
return proxyMode;
}
+
String resolveProxiedPackageName = resolvePackageName(proxiedUid, proxiedPackageName);
if (resolveProxiedPackageName == null) {
return AppOpsManager.MODE_IGNORED;
}
+ final int proxiedFlags = isProxyTrusted ? AppOpsManager.OP_FLAG_TRUSTED_PROXIED
+ : AppOpsManager.OP_FLAG_UNTRUSTED_PROXIED;
return noteOperationUnchecked(code, proxiedUid, resolveProxiedPackageName,
- proxyMode, resolveProxyPackageName);
+ proxyUid, resolveProxyPackageName, proxiedFlags);
}
@Override
@@ -1892,11 +1922,12 @@
if (resolvedPackageName == null) {
return AppOpsManager.MODE_IGNORED;
}
- return noteOperationUnchecked(code, uid, resolvedPackageName, 0, null);
+ return noteOperationUnchecked(code, uid, resolvedPackageName, Process.INVALID_UID, null,
+ AppOpsManager.OP_FLAG_SELF);
}
private int noteOperationUnchecked(int code, int uid, String packageName,
- int proxyUid, String proxyPackageName) {
+ int proxyUid, String proxyPackageName, @OpFlags int flags) {
synchronized (this) {
final Ops ops = getOpsRawLocked(uid, packageName, true /* edit */,
false /* uidMismatchExpected */);
@@ -1914,49 +1945,52 @@
return AppOpsManager.MODE_IGNORED;
}
final UidState uidState = ops.uidState;
- if (op.duration == -1) {
+ if (op.running) {
+ final OpEntry entry = new OpEntry(op.op, op.running, op.mode, op.mAccessTimes,
+ op.mRejectTimes, op.mDurations, op.mProxyUids, op.mProxyPackageNames);
Slog.w(TAG, "Noting op not finished: uid " + uid + " pkg " + packageName
- + " code " + code + " time=" + op.time[uidState.state]
- + " duration=" + op.duration);
+ + " code " + code + " time=" + entry.getLastAccessTime(uidState.state,
+ uidState.state, flags) + " duration=" + entry.getLastDuration(
+ uidState.state, uidState.state, flags));
}
- op.duration = 0;
+
final int switchCode = AppOpsManager.opToSwitch(code);
// If there is a non-default per UID policy (we set UID op mode only if
// non-default) it takes over, otherwise use the per package policy.
if (uidState.opModes != null && uidState.opModes.indexOfKey(switchCode) >= 0) {
- final int uidMode = uidState.evalMode(uidState.opModes.get(switchCode));
+ final int uidMode = uidState.evalMode(code, uidState.opModes.get(switchCode));
if (uidMode != AppOpsManager.MODE_ALLOWED) {
if (DEBUG) Slog.d(TAG, "noteOperation: uid reject #" + uidMode + " for code "
+ switchCode + " (" + code + ") uid " + uid + " package "
+ packageName);
- op.rejectTime[uidState.state] = System.currentTimeMillis();
+ op.rejected(System.currentTimeMillis(), proxyUid, proxyPackageName,
+ uidState.state, flags);
+ mHistoricalRegistry.incrementOpRejected(code, uid, packageName,
+ uidState.state, flags);
scheduleOpNotedIfNeededLocked(code, uid, packageName, uidMode);
- mHistoricalRegistry.incrementOpRejected(op.op, uid, packageName,
- uidState.state);
return uidMode;
}
} else {
final Op switchOp = switchCode != code ? getOpLocked(ops, switchCode, true) : op;
- final int mode = switchOp.getMode();
- if (mode != AppOpsManager.MODE_ALLOWED) {
+ final int mode = switchOp.evalMode();
+ if (switchOp.mode != AppOpsManager.MODE_ALLOWED) {
if (DEBUG) Slog.d(TAG, "noteOperation: reject #" + mode + " for code "
+ switchCode + " (" + code + ") uid " + uid + " package "
+ packageName);
- op.rejectTime[uidState.state] = System.currentTimeMillis();
- scheduleOpNotedIfNeededLocked(op.op, uid, packageName, mode);
- mHistoricalRegistry.incrementOpRejected(op.op, uid, packageName,
- uidState.state);
+ op.rejected(System.currentTimeMillis(), proxyUid, proxyPackageName,
+ uidState.state, flags);
+ mHistoricalRegistry.incrementOpRejected(code, uid, packageName,
+ uidState.state, flags);
+ scheduleOpNotedIfNeededLocked(code, uid, packageName, mode);
return mode;
}
}
if (DEBUG) Slog.d(TAG, "noteOperation: allowing code " + code + " uid " + uid
+ " package " + packageName);
- op.time[uidState.state] = System.currentTimeMillis();
+ op.accessed(System.currentTimeMillis(), proxyUid, proxyPackageName,
+ uidState.state, flags);
mHistoricalRegistry.incrementOpAccessedCount(op.op, uid, packageName,
- uidState.state);
- op.rejectTime[uidState.state] = 0;
- op.proxyUid = proxyUid;
- op.proxyPackageName = proxyPackageName;
+ uidState.state, flags);
scheduleOpNotedIfNeededLocked(code, uid, packageName,
AppOpsManager.MODE_ALLOWED);
return AppOpsManager.MODE_ALLOWED;
@@ -2080,29 +2114,34 @@
final UidState uidState = ops.uidState;
// If there is a non-default per UID policy (we set UID op mode only if
// non-default) it takes over, otherwise use the per package policy.
+ final int opCode = op.op;
if (uidState.opModes != null && uidState.opModes.indexOfKey(switchCode) >= 0) {
- final int uidMode = uidState.evalMode(uidState.opModes.get(switchCode));
+ final int uidMode = uidState.evalMode(code, uidState.opModes.get(switchCode));
if (uidMode != AppOpsManager.MODE_ALLOWED
&& (!startIfModeDefault || uidMode != AppOpsManager.MODE_DEFAULT)) {
if (DEBUG) Slog.d(TAG, "noteOperation: uid reject #" + uidMode + " for code "
+ switchCode + " (" + code + ") uid " + uid + " package "
+ resolvedPackageName);
- op.rejectTime[uidState.state] = System.currentTimeMillis();
- mHistoricalRegistry.incrementOpRejected(op.op, uid, packageName,
- uidState.state);
+ // We don't support proxy long running ops (start/stop)
+ op.rejected(System.currentTimeMillis(), -1 /*proxyUid*/,
+ null /*proxyPackage*/, uidState.state, AppOpsManager.OP_FLAG_SELF);
+ mHistoricalRegistry.incrementOpRejected(opCode, uid, packageName,
+ uidState.state, AppOpsManager.OP_FLAG_SELF);
return uidMode;
}
} else {
final Op switchOp = switchCode != code ? getOpLocked(ops, switchCode, true) : op;
- final int mode = switchOp.getMode();
+ final int mode = switchOp.evalMode();
if (mode != AppOpsManager.MODE_ALLOWED
&& (!startIfModeDefault || mode != AppOpsManager.MODE_DEFAULT)) {
if (DEBUG) Slog.d(TAG, "startOperation: reject #" + mode + " for code "
+ switchCode + " (" + code + ") uid " + uid + " package "
+ resolvedPackageName);
- op.rejectTime[uidState.state] = System.currentTimeMillis();
- mHistoricalRegistry.incrementOpRejected(op.op, uid, packageName,
- uidState.state);
+ // We don't support proxy long running ops (start/stop)
+ op.rejected(System.currentTimeMillis(), -1 /*proxyUid*/,
+ null /*proxyPackage*/, uidState.state, AppOpsManager.OP_FLAG_SELF);
+ mHistoricalRegistry.incrementOpRejected(opCode, uid, packageName,
+ uidState.state, AppOpsManager.OP_FLAG_SELF);
return mode;
}
}
@@ -2110,11 +2149,12 @@
+ " package " + resolvedPackageName);
if (op.startNesting == 0) {
op.startRealtime = SystemClock.elapsedRealtime();
- op.time[uidState.state] = System.currentTimeMillis();
- mHistoricalRegistry.incrementOpAccessedCount(op.op, uid, packageName,
- uidState.state);
- op.rejectTime[uidState.state] = 0;
- op.duration = -1;
+ // We don't support proxy long running ops (start/stop)
+ op.started(System.currentTimeMillis(), uidState.state,
+ AppOpsManager.OP_FLAG_SELF);
+ mHistoricalRegistry.incrementOpAccessedCount(opCode, uid, packageName,
+ uidState.state, AppOpsManager.OP_FLAG_SELF);
+
scheduleOpActiveChangedIfNeededLocked(code, uid, packageName, true);
}
op.startNesting++;
@@ -2161,7 +2201,7 @@
} finally {
Binder.restoreCallingIdentity(identity);
}
- Slog.wtf(TAG, "Operation not started: uid=" + op.uid + " pkg="
+ Slog.wtf(TAG, "Operation not started: uid=" + op.uidState.uid + " pkg="
+ op.packageName + " op=" + AppOpsManager.opToName(op.op));
return;
}
@@ -2272,16 +2312,24 @@
}
void finishOperationLocked(Op op, boolean finishNested) {
+ final int opCode = op.op;
+ final int uid = op.uidState.uid;
if (op.startNesting <= 1 || finishNested) {
if (op.startNesting == 1 || finishNested) {
- op.duration = (int)(SystemClock.elapsedRealtime() - op.startRealtime);
- mHistoricalRegistry.increaseOpAccessDuration(op.op, op.uid, op.packageName,
- op.uidState.state, op.duration);
- op.time[op.uidState.state] = System.currentTimeMillis();
+ // We don't support proxy long running ops (start/stop)
+ final long duration = SystemClock.elapsedRealtime() - op.startRealtime;
+ op.finished(System.currentTimeMillis(), duration, op.uidState.state,
+ AppOpsManager.OP_FLAG_SELF);
+ mHistoricalRegistry.increaseOpAccessDuration(opCode, uid, op.packageName,
+ op.uidState.state, AppOpsManager.OP_FLAG_SELF, duration);
} else {
- Slog.w(TAG, "Finishing op nesting under-run: uid " + op.uid + " pkg "
- + op.packageName + " code " + op.op + " time=" + op.time
- + " duration=" + op.duration + " nesting=" + op.startNesting);
+ final OpEntry entry = new OpEntry(op.op, op.running, op.mode, op.mAccessTimes,
+ op.mRejectTimes, op.mDurations, op.mProxyUids, op.mProxyPackageNames);
+ Slog.w(TAG, "Finishing op nesting under-run: uid " + uid + " pkg "
+ + op.packageName + " code " + opCode + " time="
+ + entry.getLastAccessTime(OP_FLAGS_ALL)
+ + " duration=" + entry.getLastDuration(MAX_PRIORITY_UID_STATE,
+ MIN_PRIORITY_UID_STATE, OP_FLAGS_ALL) + " nesting=" + op.startNesting);
}
if (op.startNesting >= 1) {
op.uidState.startNesting -= op.startNesting;
@@ -2311,7 +2359,7 @@
throw new IllegalArgumentException("Bad operation #" + op);
}
- private UidState getUidStateLocked(int uid, boolean edit) {
+ private @NonNull UidState getUidStateLocked(int uid, boolean edit) {
UidState uidState = mUidStates.get(uid);
if (uidState == null) {
if (!edit) {
@@ -2335,8 +2383,8 @@
}
private void commitUidPendingStateLocked(UidState uidState) {
- final boolean lastForeground = uidState.state <= UID_STATE_LAST_NON_RESTRICTED;
- final boolean nowForeground = uidState.pendingState <= UID_STATE_LAST_NON_RESTRICTED;
+ final boolean lastForeground = uidState.state <= UID_STATE_MAX_LAST_NON_RESTRICTED;
+ final boolean nowForeground = uidState.pendingState <= UID_STATE_MAX_LAST_NON_RESTRICTED;
uidState.state = uidState.pendingState;
uidState.pendingStateCommitTime = 0;
if (uidState.hasForegroundWatchers && lastForeground != nowForeground) {
@@ -2345,7 +2393,15 @@
continue;
}
final int code = uidState.foregroundOps.keyAt(fgi);
-
+ // For location ops we consider fg state only if the fg service
+ // is of location type, for all other ops any fg service will do.
+ final long resolvedLastRestrictedUidState = resolveFirstUnrestrictedUidState(code);
+ final boolean resolvedLastFg = uidState.state <= resolvedLastRestrictedUidState;
+ final boolean resolvedNowBg = uidState.pendingState
+ <= resolvedLastRestrictedUidState;
+ if (resolvedLastFg == resolvedNowBg) {
+ continue;
+ }
final ArraySet<ModeCallback> callbacks = mOpModeWatchers.get(code);
if (callbacks != null) {
for (int cbi = callbacks.size() - 1; cbi >= 0; cbi--) {
@@ -2360,8 +2416,10 @@
if (uidState.pkgOps != null) {
for (int pkgi = uidState.pkgOps.size() - 1; pkgi >= 0; pkgi--) {
final Op op = uidState.pkgOps.valueAt(pkgi).get(code);
- if (doAllPackages || (op != null
- && op.mode == AppOpsManager.MODE_FOREGROUND)) {
+ if (op == null) {
+ continue;
+ }
+ if (doAllPackages || op.mode == AppOpsManager.MODE_FOREGROUND) {
mHandler.sendMessage(PooledLambda.obtainMessage(
AppOpsService::notifyOpChanged,
this, callback, code, uidState.uid,
@@ -2651,7 +2709,7 @@
final int idx = uidState.opModes.indexOfKey(AppOpsManager.OP_RUN_IN_BACKGROUND);
if (idx >= 0) {
uidState.opModes.put(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND,
- uidState.opModes.valueAt(idx));
+ uidState.opModes.valueAt(idx));
}
}
if (uidState.pkgOps == null) {
@@ -2664,7 +2722,7 @@
final Op op = ops.get(AppOpsManager.OP_RUN_IN_BACKGROUND);
if (op != null && op.mode != AppOpsManager.opToDefaultMode(op.op)) {
final Op copy = new Op(op.uidState, op.packageName,
- AppOpsManager.OP_RUN_ANY_IN_BACKGROUND);
+ AppOpsManager.OP_RUN_ANY_IN_BACKGROUND);
copy.mode = op.mode;
ops.put(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, copy);
changed = true;
@@ -2692,7 +2750,7 @@
scheduleFastWriteLocked();
}
- void readUidOps(XmlPullParser parser) throws NumberFormatException,
+ private void readUidOps(XmlPullParser parser) throws NumberFormatException,
XmlPullParserException, IOException {
final int uid = Integer.parseInt(parser.getAttributeValue(null, "n"));
int outerDepth = parser.getDepth();
@@ -2720,8 +2778,8 @@
}
}
- void readPackage(XmlPullParser parser) throws NumberFormatException,
- XmlPullParserException, IOException {
+ private void readPackage(XmlPullParser parser)
+ throws NumberFormatException, XmlPullParserException, IOException {
String pkgName = parser.getAttributeValue(null, "n");
int outerDepth = parser.getDepth();
int type;
@@ -2742,9 +2800,10 @@
}
}
- void readUid(XmlPullParser parser, String pkgName) throws NumberFormatException,
- XmlPullParserException, IOException {
+ private void readUid(XmlPullParser parser, String pkgName)
+ throws NumberFormatException, XmlPullParserException, IOException {
int uid = Integer.parseInt(parser.getAttributeValue(null, "n"));
+ final UidState uidState = getUidStateLocked(uid, true);
String isPrivilegedString = parser.getAttributeValue(null, "p");
boolean isPrivileged = false;
if (isPrivilegedString == null) {
@@ -2774,113 +2833,73 @@
if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
continue;
}
-
String tagName = parser.getName();
if (tagName.equals("op")) {
- UidState uidState = getUidStateLocked(uid, true);
- if (uidState.pkgOps == null) {
- uidState.pkgOps = new ArrayMap<>();
- }
-
- Op op = new Op(uidState, pkgName,
- Integer.parseInt(parser.getAttributeValue(null, "n")));
-
- for (int i = parser.getAttributeCount()-1; i >= 0; i--) {
- final String name = parser.getAttributeName(i);
- final String value = parser.getAttributeValue(i);
- switch (name) {
- case "m":
- op.mode = Integer.parseInt(value);
- break;
- case "d":
- op.duration = Integer.parseInt(value);
- break;
- case "pu":
- op.proxyUid = Integer.parseInt(value);
- break;
- case "pp":
- op.proxyPackageName = value;
- break;
- case "tp":
- op.time[AppOpsManager.UID_STATE_PERSISTENT] = Long.parseLong(value);
- break;
- case "tt":
- op.time[AppOpsManager.UID_STATE_TOP] = Long.parseLong(value);
- break;
- case "tfsl":
- op.time[AppOpsManager.UID_STATE_FOREGROUND_SERVICE_LOCATION] =
- Long.parseLong(value);
- break;
- case "tfs":
- op.time[AppOpsManager.UID_STATE_FOREGROUND_SERVICE] =
- Long.parseLong(value);
- break;
- case "tf":
- op.time[AppOpsManager.UID_STATE_FOREGROUND] = Long.parseLong(value);
- break;
- case "tb":
- op.time[AppOpsManager.UID_STATE_BACKGROUND] = Long.parseLong(value);
- break;
- case "tc":
- op.time[AppOpsManager.UID_STATE_CACHED] = Long.parseLong(value);
- break;
- case "rp":
- op.rejectTime[AppOpsManager.UID_STATE_PERSISTENT] =
- Long.parseLong(value);
- break;
- case "rt":
- op.rejectTime[AppOpsManager.UID_STATE_TOP] = Long.parseLong(value);
- break;
- case "rfsl":
- op.rejectTime[AppOpsManager.UID_STATE_FOREGROUND_SERVICE_LOCATION] =
- Long.parseLong(value);
- break;
- case "rfs":
- op.rejectTime[AppOpsManager.UID_STATE_FOREGROUND_SERVICE] =
- Long.parseLong(value);
- break;
- case "rf":
- op.rejectTime[AppOpsManager.UID_STATE_FOREGROUND] =
- Long.parseLong(value);
- break;
- case "rb":
- op.rejectTime[AppOpsManager.UID_STATE_BACKGROUND] =
- Long.parseLong(value);
- break;
- case "rc":
- op.rejectTime[AppOpsManager.UID_STATE_CACHED] =
- Long.parseLong(value);
- break;
- case "t":
- // Backwards compat.
- op.time[AppOpsManager.UID_STATE_TOP] = Long.parseLong(value);
- break;
- case "r":
- // Backwards compat.
- op.rejectTime[AppOpsManager.UID_STATE_TOP] = Long.parseLong(value);
- break;
- default:
- Slog.w(TAG, "Unknown attribute in 'op' tag: " + name);
- break;
- }
- }
-
- Ops ops = uidState.pkgOps.get(pkgName);
- if (ops == null) {
- ops = new Ops(pkgName, uidState, isPrivileged);
- uidState.pkgOps.put(pkgName, ops);
- }
- ops.put(op.op, op);
+ readOp(parser, uidState, pkgName, isPrivileged);
} else {
Slog.w(TAG, "Unknown element under <pkg>: "
+ parser.getName());
XmlUtils.skipCurrentTag(parser);
}
}
- UidState uidState = getUidStateLocked(uid, false);
- if (uidState != null) {
- uidState.evalForegroundOps(mOpModeWatchers);
+ uidState.evalForegroundOps(mOpModeWatchers);
+ }
+
+ private void readOp(XmlPullParser parser, @NonNull UidState uidState,
+ @NonNull String pkgName, boolean isPrivileged) throws NumberFormatException,
+ XmlPullParserException, IOException {
+ Op op = new Op(uidState, pkgName,
+ Integer.parseInt(parser.getAttributeValue(null, "n")));
+
+ final int mode = XmlUtils.readIntAttribute(parser, "m",
+ AppOpsManager.opToDefaultMode(op.op));
+ op.mode = mode;
+
+ int outerDepth = parser.getDepth();
+ int type;
+ while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+ && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) {
+ if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {
+ continue;
+ }
+ String tagName = parser.getName();
+ if (tagName.equals("st")) {
+ final long key = XmlUtils.readLongAttribute(parser, "n");
+
+ final int flags = AppOpsManager.extractFlagsFromKey(key);
+ final int state = AppOpsManager.extractUidStateFromKey(key);
+
+ final long accessTime = XmlUtils.readLongAttribute(parser, "t", 0);
+ final long rejectTime = XmlUtils.readLongAttribute(parser, "r", 0);
+ final long accessDuration = XmlUtils.readLongAttribute(parser, "d", 0);
+ final String proxyPkg = XmlUtils.readStringAttribute(parser, "pp");
+ final int proxyUid = XmlUtils.readIntAttribute(parser, "pu", 0);
+
+ if (accessTime > 0) {
+ op.accessed(accessTime, proxyUid, proxyPkg, state, flags);
+ }
+ if (rejectTime > 0) {
+ op.rejected(rejectTime, proxyUid, proxyPkg, state, flags);
+ }
+ if (accessDuration > 0) {
+ op.running(accessTime, accessDuration, state, flags);
+ }
+ } else {
+ Slog.w(TAG, "Unknown element under <op>: "
+ + parser.getName());
+ XmlUtils.skipCurrentTag(parser);
+ }
}
+
+ if (uidState.pkgOps == null) {
+ uidState.pkgOps = new ArrayMap<>();
+ }
+ Ops ops = uidState.pkgOps.get(pkgName);
+ if (ops == null) {
+ ops = new Ops(pkgName, uidState, isPrivileged);
+ uidState.pkgOps.put(pkgName, ops);
+ }
+ ops.put(op.op, op);
}
void writeState() {
@@ -2955,30 +2974,53 @@
if (op.getMode() != AppOpsManager.opToDefaultMode(op.getOp())) {
out.attribute(null, "m", Integer.toString(op.getMode()));
}
- for (int k = 0; k < _NUM_UID_STATE; k++) {
- final long time = op.getLastTimeFor(k);
- if (time != 0) {
- out.attribute(null, UID_STATE_TIME_ATTRS[k],
- Long.toString(time));
+
+ final LongSparseArray keys = op.collectKeys();
+ if (keys == null || keys.size() <= 0) {
+ continue;
+ }
+
+ final int keyCount = keys.size();
+ for (int k = 0; k < keyCount; k++) {
+ final long key = keys.keyAt(k);
+
+ final int uidState = AppOpsManager.extractUidStateFromKey(key);
+ final int flags = AppOpsManager.extractFlagsFromKey(key);
+
+ final long accessTime = op.getLastAccessTime(
+ uidState, uidState, flags);
+ final long rejectTime = op.getLastRejectTime(
+ uidState, uidState, flags);
+ final long accessDuration = op.getLastDuration(
+ uidState, uidState, flags);
+ final String proxyPkg = op.getProxyPackageName(uidState, flags);
+ final int proxyUid = op.getProxyUid(uidState, flags);
+
+ if (accessTime <= 0 && rejectTime <= 0 && accessDuration <= 0
+ && proxyPkg == null && proxyUid < 0) {
+ continue;
}
- final long rejectTime = op.getLastRejectTimeFor(k);
- if (rejectTime != 0) {
- out.attribute(null, UID_STATE_REJECT_ATTRS[k],
- Long.toString(rejectTime));
+
+ out.startTag(null, "st");
+ out.attribute(null, "n", Long.toString(key));
+ if (accessTime > 0) {
+ out.attribute(null, "t", Long.toString(accessTime));
}
+ if (rejectTime > 0) {
+ out.attribute(null, "r", Long.toString(rejectTime));
+ }
+ if (accessDuration > 0) {
+ out.attribute(null, "d", Long.toString(accessDuration));
+ }
+ if (proxyPkg != null) {
+ out.attribute(null, "pp", proxyPkg);
+ }
+ if (proxyUid >= 0) {
+ out.attribute(null, "pu", Integer.toString(proxyUid));
+ }
+ out.endTag(null, "st");
}
- int dur = op.getDuration();
- if (dur != 0) {
- out.attribute(null, "d", Integer.toString(dur));
- }
- int proxyUid = op.getProxyUid();
- if (proxyUid != -1) {
- out.attribute(null, "pu", Integer.toString(proxyUid));
- }
- String proxyPackageName = op.getProxyPackageName();
- if (proxyPackageName != null) {
- out.attribute(null, "pp", proxyPackageName);
- }
+
out.endTag(null, "op");
}
out.endTag(null, "uid");
@@ -3462,32 +3504,80 @@
pw.println(" Limit output to data associated with the given package name.");
pw.println(" --watchers");
pw.println(" Only output the watcher sections.");
+ pw.println(" --history");
+ pw.println(" Output the historical data.");
}
- private void dumpTimesLocked(PrintWriter pw, String firstPrefix, String prefix, long[] times,
- long now, SimpleDateFormat sdf, Date date) {
- boolean hasTime = false;
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- if (times[i] != 0) {
- hasTime = true;
- break;
- }
- }
- if (!hasTime) {
+ private void dumpStatesLocked(@NonNull PrintWriter pw, @NonNull Op op,
+ long now, @NonNull SimpleDateFormat sdf, @NonNull Date date, @NonNull String prefix) {
+
+ final OpEntry entry = new OpEntry(op.op, op.running, op.mode, op.mAccessTimes,
+ op.mRejectTimes, op.mDurations, op.mProxyUids, op.mProxyPackageNames);
+
+ final LongSparseArray keys = entry.collectKeys();
+ if (keys == null || keys.size() <= 0) {
return;
}
- boolean first = true;
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- if (times[i] != 0) {
- pw.print(first ? firstPrefix : prefix);
- first = false;
- pw.print(UID_STATE_NAMES[i]);
- pw.print(" = ");
- date.setTime(times[i]);
+
+ final int keyCount = keys.size();
+ for (int k = 0; k < keyCount; k++) {
+ final long key = keys.keyAt(k);
+
+ final int uidState = AppOpsManager.extractUidStateFromKey(key);
+ final int flags = AppOpsManager.extractFlagsFromKey(key);
+
+ final long accessTime = entry.getLastAccessTime(
+ uidState, uidState, flags);
+ final long rejectTime = entry.getLastRejectTime(
+ uidState, uidState, flags);
+ final long accessDuration = entry.getLastDuration(
+ uidState, uidState, flags);
+ final String proxyPkg = entry.getProxyPackageName(uidState, flags);
+ final int proxyUid = entry.getProxyUid(uidState, flags);
+
+ if (accessTime > 0) {
+ pw.print(prefix);
+ pw.print("Access: ");
+ pw.print(AppOpsManager.keyToString(key));
+ pw.print(" ");
+ date.setTime(accessTime);
pw.print(sdf.format(date));
pw.print(" (");
- TimeUtils.formatDuration(times[i]-now, pw);
- pw.println(")");
+ TimeUtils.formatDuration(accessTime - now, pw);
+ pw.print(")");
+ if (accessDuration > 0) {
+ pw.print(" duration=");
+ TimeUtils.formatDuration(accessDuration, pw);
+ }
+ if (proxyUid >= 0) {
+ pw.print(" proxy[");
+ pw.print("uid=");
+ pw.print(proxyUid);
+ pw.print(", pkg=");
+ pw.print(proxyPkg);
+ pw.print("]");
+ }
+ pw.println();
+ }
+
+ if (rejectTime > 0) {
+ pw.print(prefix);
+ pw.print("Reject: ");
+ pw.print(AppOpsManager.keyToString(key));
+ date.setTime(rejectTime);
+ pw.print(sdf.format(date));
+ pw.print(" (");
+ TimeUtils.formatDuration(rejectTime - now, pw);
+ pw.print(")");
+ if (proxyUid >= 0) {
+ pw.print(" proxy[");
+ pw.print("uid=");
+ pw.print(proxyUid);
+ pw.print(", pkg=");
+ pw.print(proxyPkg);
+ pw.print("]");
+ }
+ pw.println();
}
}
}
@@ -3501,6 +3591,7 @@
int dumpUid = Process.INVALID_UID;
int dumpMode = -1;
boolean dumpWatchers = false;
+ boolean dumpHistory = false;
if (args != null) {
for (int i=0; i<args.length; i++) {
@@ -3550,6 +3641,8 @@
}
} else if ("--watchers".equals(arg)) {
dumpWatchers = true;
+ } else if ("--history".equals(arg)) {
+ dumpHistory = true;
} else if (arg.length() > 0 && arg.charAt(0) == '-'){
pw.println("Unknown option: " + arg);
return;
@@ -3562,7 +3655,9 @@
synchronized (this) {
pw.println("Current AppOps Service state:");
- mConstants.dump(pw);
+ if (!dumpHistory && !dumpWatchers) {
+ mConstants.dump(pw);
+ }
pw.println();
final long now = System.currentTimeMillis();
final long nowElapsed = SystemClock.elapsedRealtime();
@@ -3571,7 +3666,7 @@
final Date date = new Date();
boolean needSep = false;
if (dumpOp < 0 && dumpMode < 0 && dumpPackage == null && mProfileOwners != null
- && !dumpWatchers) {
+ && !dumpWatchers && !dumpHistory) {
pw.println(" Profile owners:");
for (int poi = 0; poi < mProfileOwners.size(); poi++) {
pw.print(" User #");
@@ -3582,7 +3677,7 @@
}
pw.println();
}
- if (mOpModeWatchers.size() > 0) {
+ if (mOpModeWatchers.size() > 0 && !dumpHistory) {
boolean printedHeader = false;
for (int i=0; i<mOpModeWatchers.size(); i++) {
if (dumpOp >= 0 && dumpOp != mOpModeWatchers.keyAt(i)) {
@@ -3612,7 +3707,7 @@
}
}
}
- if (mPackageModeWatchers.size() > 0 && dumpOp < 0) {
+ if (mPackageModeWatchers.size() > 0 && dumpOp < 0 && !dumpHistory) {
boolean printedHeader = false;
for (int i=0; i<mPackageModeWatchers.size(); i++) {
if (dumpPackage != null && !dumpPackage.equals(mPackageModeWatchers.keyAt(i))) {
@@ -3632,7 +3727,7 @@
}
}
}
- if (mModeWatchers.size() > 0 && dumpOp < 0) {
+ if (mModeWatchers.size() > 0 && dumpOp < 0 && !dumpHistory) {
boolean printedHeader = false;
for (int i=0; i<mModeWatchers.size(); i++) {
final ModeCallback cb = mModeWatchers.valueAt(i);
@@ -3730,7 +3825,7 @@
pw.println(cb);
}
}
- if (mClients.size() > 0 && dumpMode < 0 && !dumpWatchers) {
+ if (mClients.size() > 0 && dumpMode < 0 && !dumpWatchers && !dumpHistory) {
needSep = true;
boolean printedHeader = false;
for (int i=0; i<mClients.size(); i++) {
@@ -3759,7 +3854,7 @@
pw.println(" Started ops:");
printedStarted = true;
}
- pw.print(" "); pw.print("uid="); pw.print(op.uid);
+ pw.print(" "); pw.print("uid="); pw.print(op.uidState.uid);
pw.print(" pkg="); pw.print(op.packageName);
pw.print(" op="); pw.println(AppOpsManager.opToName(op.op));
}
@@ -3767,7 +3862,7 @@
}
}
if (mAudioRestrictions.size() > 0 && dumpOp < 0 && dumpPackage != null
- && dumpMode < 0 && !dumpWatchers) {
+ && dumpMode < 0 && !dumpWatchers && !dumpWatchers) {
boolean printedHeader = false;
for (int o=0; o<mAudioRestrictions.size(); o++) {
final String op = AppOpsManager.opToName(mAudioRestrictions.keyAt(o));
@@ -3800,7 +3895,7 @@
final SparseIntArray opModes = uidState.opModes;
final ArrayMap<String, Ops> pkgOps = uidState.pkgOps;
- if (dumpWatchers) {
+ if (dumpWatchers || dumpHistory) {
continue;
}
if (dumpOp >= 0 || dumpPackage != null || dumpMode >= 0) {
@@ -3847,10 +3942,10 @@
pw.print(" Uid "); UserHandle.formatUid(pw, uidState.uid); pw.println(":");
pw.print(" state=");
- pw.println(UID_STATE_NAMES[uidState.state]);
+ pw.println(AppOpsManager.getUidStateName(uidState.state));
if (uidState.state != uidState.pendingState) {
pw.print(" pendingState=");
- pw.println(UID_STATE_NAMES[uidState.pendingState]);
+ pw.println(AppOpsManager.getUidStateName(uidState.pendingState));
}
if (uidState.pendingStateCommitTime != 0) {
pw.print(" pendingStateCommitTime=");
@@ -3906,7 +4001,8 @@
boolean printedPackage = false;
for (int j=0; j<ops.size(); j++) {
final Op op = ops.valueAt(j);
- if (dumpOp >= 0 && dumpOp != op.op) {
+ final int opCode = op.op;
+ if (dumpOp >= 0 && dumpOp != opCode) {
continue;
}
if (dumpMode >= 0 && dumpMode != op.mode) {
@@ -3916,32 +4012,23 @@
pw.print(" Package "); pw.print(ops.packageName); pw.println(":");
printedPackage = true;
}
- pw.print(" "); pw.print(AppOpsManager.opToName(op.op));
+ pw.print(" "); pw.print(AppOpsManager.opToName(opCode));
pw.print(" ("); pw.print(AppOpsManager.modeToName(op.mode));
- final int switchOp = AppOpsManager.opToSwitch(op.op);
- if (switchOp != op.op) {
+ final int switchOp = AppOpsManager.opToSwitch(opCode);
+ if (switchOp != opCode) {
pw.print(" / switch ");
pw.print(AppOpsManager.opToName(switchOp));
final Op switchObj = ops.get(switchOp);
- int mode = switchObj != null
- ? switchObj.mode : AppOpsManager.opToDefaultMode(switchOp);
+ int mode = switchObj != null ? switchObj.mode
+ : AppOpsManager.opToDefaultMode(switchOp);
pw.print("="); pw.print(AppOpsManager.modeToName(mode));
}
pw.println("): ");
- dumpTimesLocked(pw,
- " Access: ",
- " ", op.time, now, sdf, date);
- dumpTimesLocked(pw,
- " Reject: ",
- " ", op.rejectTime, now, sdf, date);
- if (op.duration == -1) {
+ dumpStatesLocked(pw, op, now, sdf, date, " ");
+ if (op.running) {
pw.print(" Running start at: ");
TimeUtils.formatDuration(nowElapsed-op.startRealtime, pw);
pw.println();
- } else if (op.duration != 0) {
- pw.print(" duration=");
- TimeUtils.formatDuration(op.duration, pw);
- pw.println();
}
if (op.startNesting != 0) {
pw.print(" startNesting=");
@@ -3960,7 +4047,7 @@
ClientRestrictionState restrictionState = mOpUserRestrictions.valueAt(i);
boolean printedTokenHeader = false;
- if (dumpMode >= 0 || dumpWatchers) {
+ if (dumpMode >= 0 || dumpWatchers || dumpHistory) {
continue;
}
@@ -4044,7 +4131,9 @@
}
// Must not hold the appops lock
- mHistoricalRegistry.dump(" ", pw, dumpUid, dumpPackage, dumpOp);
+ if (dumpHistory && !dumpWatchers) {
+ mHistoricalRegistry.dump(" ", pw, dumpUid, dumpPackage, dumpOp);
+ }
}
private static final class Restriction {
@@ -4158,7 +4247,7 @@
final ClientState client = mClients.valueAt(i);
for (int j = client.mStartedOps.size() - 1; j >= 0; j--) {
final Op op = client.mStartedOps.get(j);
- if (op.op == code && op.uid == uid) return true;
+ if (op.op == code && op.uidState.uid == uid) return true;
}
}
}
diff --git a/services/core/java/com/android/server/appop/HistoricalRegistry.java b/services/core/java/com/android/server/appop/HistoricalRegistry.java
index 4485a54..280bc02 100644
--- a/services/core/java/com/android/server/appop/HistoricalRegistry.java
+++ b/services/core/java/com/android/server/appop/HistoricalRegistry.java
@@ -23,6 +23,7 @@
import android.app.AppOpsManager.HistoricalOps;
import android.app.AppOpsManager.HistoricalPackageOps;
import android.app.AppOpsManager.HistoricalUidOps;
+import android.app.AppOpsManager.OpFlags;
import android.app.AppOpsManager.UidState;
import android.content.ContentResolver;
import android.database.ContentObserver;
@@ -37,6 +38,7 @@
import android.os.UserHandle;
import android.provider.Settings;
import android.util.ArraySet;
+import android.util.LongSparseArray;
import android.util.Slog;
import android.util.TimeUtils;
import android.util.Xml;
@@ -297,20 +299,20 @@
}
}
- @Nullable void getHistoricalOpsFromDiskRaw(int uid, @NonNull String packageName,
+ void getHistoricalOpsFromDiskRaw(int uid, @NonNull String packageName,
@Nullable String[] opNames, long beginTimeMillis, long endTimeMillis,
- @NonNull RemoteCallback callback) {
+ @OpFlags int flags, @NonNull RemoteCallback callback) {
final HistoricalOps result = new HistoricalOps(beginTimeMillis, endTimeMillis);
mPersistence.collectHistoricalOpsDLocked(result, uid, packageName, opNames,
- beginTimeMillis, endTimeMillis);
+ beginTimeMillis, endTimeMillis, flags);
final Bundle payload = new Bundle();
payload.putParcelable(AppOpsManager.KEY_HISTORICAL_OPS, result);
callback.sendResult(payload);
}
- @Nullable void getHistoricalOps(int uid, @NonNull String packageName,
+ void getHistoricalOps(int uid, @NonNull String packageName,
@Nullable String[] opNames, long beginTimeMillis, long endTimeMillis,
- @NonNull RemoteCallback callback) {
+ @OpFlags int flags, @NonNull RemoteCallback callback) {
final long currentTimeMillis = System.currentTimeMillis();
if (endTimeMillis == Long.MAX_VALUE) {
endTimeMillis = currentTimeMillis;
@@ -326,6 +328,8 @@
synchronized (mOnDiskLock) {
final List<HistoricalOps> pendingWrites;
final HistoricalOps currentOps;
+ boolean collectOpsFromDisk;
+
synchronized (mInMemoryLock) {
currentOps = getUpdatedPendingHistoricalOpsMLocked(currentTimeMillis);
if (!(inMemoryAdjBeginTimeMillis >= currentOps.getEndTimeMillis()
@@ -338,10 +342,11 @@
}
pendingWrites = new ArrayList<>(mPendingWrites);
mPendingWrites.clear();
+ collectOpsFromDisk = inMemoryAdjEndTimeMillis > currentOps.getEndTimeMillis();
}
// If the query was only for in-memory state - done.
- if (inMemoryAdjEndTimeMillis > currentOps.getEndTimeMillis()) {
+ if (collectOpsFromDisk) {
// If there is a write in flight we need to force it now
persistPendingHistory(pendingWrites);
// Collect persisted state.
@@ -352,7 +357,7 @@
final long onDiskAdjEndTimeMillis = Math.max(inMemoryAdjEndTimeMillis
- onDiskAndInMemoryOffsetMillis, 0);
mPersistence.collectHistoricalOpsDLocked(result, uid, packageName, opNames,
- onDiskAdjBeginTimeMillis, onDiskAdjEndTimeMillis);
+ onDiskAdjBeginTimeMillis, onDiskAdjEndTimeMillis, flags);
}
// Rebase the result time to be since epoch.
@@ -366,32 +371,31 @@
}
void incrementOpAccessedCount(int op, int uid, @NonNull String packageName,
- @UidState int uidState) {
+ @UidState int uidState, @OpFlags int flags) {
synchronized (mInMemoryLock) {
if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {
getUpdatedPendingHistoricalOpsMLocked(System.currentTimeMillis())
- .increaseAccessCount(op, uid, packageName, uidState, 1);
-
+ .increaseAccessCount(op, uid, packageName, uidState, flags, 1);
}
}
}
void incrementOpRejected(int op, int uid, @NonNull String packageName,
- @UidState int uidState) {
+ @UidState int uidState, @OpFlags int flags) {
synchronized (mInMemoryLock) {
if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {
getUpdatedPendingHistoricalOpsMLocked(System.currentTimeMillis())
- .increaseRejectCount(op, uid, packageName, uidState, 1);
+ .increaseRejectCount(op, uid, packageName, uidState, flags, 1);
}
}
}
void increaseOpAccessDuration(int op, int uid, @NonNull String packageName,
- @UidState int uidState, long increment) {
+ @UidState int uidState, @OpFlags int flags, long increment) {
synchronized (mInMemoryLock) {
if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) {
getUpdatedPendingHistoricalOpsMLocked(System.currentTimeMillis())
- .increaseAccessDuration(op, uid, packageName, uidState, increment);
+ .increaseAccessDuration(op, uid, packageName, uidState, flags, increment);
}
}
}
@@ -593,20 +597,20 @@
private static final String TAG_HISTORY = "history";
private static final String TAG_OPS = "ops";
private static final String TAG_UID = "uid";
- private static final String TAG_PACKAGE = "package";
+ private static final String TAG_PACKAGE = "pkg";
private static final String TAG_OP = "op";
- private static final String TAG_STATE = "state";
+ private static final String TAG_STATE = "st";
- private static final String ATTR_VERSION = "version";
- private static final String ATTR_NAME = "name";
- private static final String ATTR_ACCESS_COUNT = "accessCount";
- private static final String ATTR_REJECT_COUNT = "rejectCount";
- private static final String ATTR_ACCESS_DURATION = "accessDuration";
- private static final String ATTR_BEGIN_TIME = "beginTime";
- private static final String ATTR_END_TIME = "endTime";
- private static final String ATTR_OVERFLOW = "overflow";
+ private static final String ATTR_VERSION = "ver";
+ private static final String ATTR_NAME = "na";
+ private static final String ATTR_ACCESS_COUNT = "ac";
+ private static final String ATTR_REJECT_COUNT = "rc";
+ private static final String ATTR_ACCESS_DURATION = "du";
+ private static final String ATTR_BEGIN_TIME = "beg";
+ private static final String ATTR_END_TIME = "end";
+ private static final String ATTR_OVERFLOW = "ov";
- private static final int CURRENT_VERSION = 1;
+ private static final int CURRENT_VERSION = 2;
private final long mBaseSnapshotInterval;
private final long mIntervalCompressionMultiplier;
@@ -657,7 +661,8 @@
@Nullable List<HistoricalOps> readHistoryRawDLocked() {
return collectHistoricalOpsBaseDLocked(Process.INVALID_UID /*filterUid*/,
null /*filterPackageName*/, null /*filterOpNames*/,
- 0 /*filterBeginTimeMills*/, Long.MAX_VALUE /*filterEndTimeMills*/);
+ 0 /*filterBeginTimeMills*/, Long.MAX_VALUE /*filterEndTimeMills*/,
+ AppOpsManager.OP_FLAGS_ALL);
}
@Nullable List<HistoricalOps> readHistoryDLocked() {
@@ -697,9 +702,10 @@
private void collectHistoricalOpsDLocked(@NonNull HistoricalOps currentOps,
int filterUid, @NonNull String filterPackageName, @Nullable String[] filterOpNames,
- long filterBeingMillis, long filterEndMillis) {
+ long filterBeingMillis, long filterEndMillis, @OpFlags int filterFlags) {
final List<HistoricalOps> readOps = collectHistoricalOpsBaseDLocked(filterUid,
- filterPackageName, filterOpNames, filterBeingMillis, filterEndMillis);
+ filterPackageName, filterOpNames, filterBeingMillis, filterEndMillis,
+ filterFlags);
if (readOps != null) {
final int readCount = readOps.size();
for (int i = 0; i < readCount; i++) {
@@ -711,7 +717,7 @@
private @Nullable LinkedList<HistoricalOps> collectHistoricalOpsBaseDLocked(
int filterUid, @NonNull String filterPackageName, @Nullable String[] filterOpNames,
- long filterBeginTimeMillis, long filterEndTimeMillis) {
+ long filterBeginTimeMillis, long filterEndTimeMillis, @OpFlags int filterFlags) {
File baseDir = null;
try {
baseDir = mHistoricalAppOpsDir.startRead();
@@ -724,8 +730,8 @@
final long[] globalContentOffsetMillis = {0};
final LinkedList<HistoricalOps> ops = collectHistoricalOpsRecursiveDLocked(
baseDir, filterUid, filterPackageName, filterOpNames, filterBeginTimeMillis,
- filterEndTimeMillis, globalContentOffsetMillis, null /*outOps*/,
- 0 /*depth*/, historyFiles);
+ filterEndTimeMillis, filterFlags, globalContentOffsetMillis,
+ null /*outOps*/, 0 /*depth*/, historyFiles);
if (DEBUG) {
filesInvariant.stopTracking(baseDir);
}
@@ -741,7 +747,8 @@
private @Nullable LinkedList<HistoricalOps> collectHistoricalOpsRecursiveDLocked(
@NonNull File baseDir, int filterUid, @NonNull String filterPackageName,
@Nullable String[] filterOpNames, long filterBeginTimeMillis,
- long filterEndTimeMillis, @NonNull long[] globalContentOffsetMillis,
+ long filterEndTimeMillis, @OpFlags int filterFlags,
+ @NonNull long[] globalContentOffsetMillis,
@Nullable LinkedList<HistoricalOps> outOps, int depth,
@NonNull Set<String> historyFiles)
throws IOException, XmlPullParserException {
@@ -757,7 +764,7 @@
final List<HistoricalOps> readOps = readHistoricalOpsLocked(baseDir,
previousIntervalEndMillis, currentIntervalEndMillis, filterUid,
filterPackageName, filterOpNames, filterBeginTimeMillis, filterEndTimeMillis,
- globalContentOffsetMillis, depth, historyFiles);
+ filterFlags, globalContentOffsetMillis, depth, historyFiles);
// Empty is a special signal to stop diving
if (readOps != null && readOps.isEmpty()) {
@@ -767,7 +774,7 @@
// Collect older historical data from subsequent levels
outOps = collectHistoricalOpsRecursiveDLocked(
baseDir, filterUid, filterPackageName, filterOpNames, filterBeginTimeMillis,
- filterEndTimeMillis, globalContentOffsetMillis, outOps, depth + 1,
+ filterEndTimeMillis, filterFlags, globalContentOffsetMillis, outOps, depth + 1,
historyFiles);
// Make older historical data relative to the current historical level
@@ -836,22 +843,24 @@
previousIntervalEndMillis, currentIntervalEndMillis,
Process.INVALID_UID /*filterUid*/, null /*filterPackageName*/,
null /*filterOpNames*/, Long.MIN_VALUE /*filterBeginTimeMillis*/,
- Long.MAX_VALUE /*filterEndTimeMillis*/, null, depth,
- null /*historyFiles*/);
+ Long.MAX_VALUE /*filterEndTimeMillis*/, AppOpsManager.OP_FLAGS_ALL,
+ null, depth, null /*historyFiles*/);
if (DEBUG) {
enforceOpsWellFormed(existingOps);
}
// Offset existing ops to account for elapsed time
- final int existingOpCount = existingOps.size();
- if (existingOpCount > 0) {
- // Compute elapsed time
- final long elapsedTimeMillis = passedOps.get(passedOps.size() - 1)
+ if (existingOps != null) {
+ final int existingOpCount = existingOps.size();
+ if (existingOpCount > 0) {
+ // Compute elapsed time
+ final long elapsedTimeMillis = passedOps.get(passedOps.size() - 1)
.getEndTimeMillis();
- for (int i = 0; i < existingOpCount; i++) {
- final HistoricalOps existingOp = existingOps.get(i);
- existingOp.offsetBeginAndEndTime(elapsedTimeMillis);
+ for (int i = 0; i < existingOpCount; i++) {
+ final HistoricalOps existingOp = existingOps.get(i);
+ existingOp.offsetBeginAndEndTime(elapsedTimeMillis);
+ }
}
}
@@ -864,9 +873,10 @@
// Consolidate passed ops at the current slot duration ensuring each snapshot is
// full. To achieve this we put all passed and existing ops in a list and will
// merge them to ensure each represents a snapshot at the current granularity.
- final List<HistoricalOps> allOps = new LinkedList<>();
- allOps.addAll(passedOps);
- allOps.addAll(existingOps);
+ final List<HistoricalOps> allOps = new LinkedList<>(passedOps);
+ if (existingOps != null) {
+ allOps.addAll(existingOps);
+ }
if (DEBUG) {
enforceOpsWellFormed(allOps);
@@ -944,10 +954,10 @@
overflowedOps, oldFileNames, depth + 1);
}
- private @NonNull List<HistoricalOps> readHistoricalOpsLocked(File baseDir,
- long intervalBeginMillis, long intervalEndMillis, int filterUid,
- @Nullable String filterPackageName, @Nullable String[] filterOpNames,
- long filterBeginTimeMillis, long filterEndTimeMillis,
+ private @Nullable List<HistoricalOps> readHistoricalOpsLocked(File baseDir,
+ long intervalBeginMillis, long intervalEndMillis,
+ int filterUid, @Nullable String filterPackageName, @Nullable String[] filterOpNames,
+ long filterBeginTimeMillis, long filterEndTimeMillis, @OpFlags int filterFlags,
@Nullable long[] cumulativeOverflowMillis, int depth,
@NonNull Set<String> historyFiles)
throws IOException, XmlPullParserException {
@@ -973,12 +983,13 @@
}
}
return readHistoricalOpsLocked(file, filterUid, filterPackageName, filterOpNames,
- filterBeginTimeMillis, filterEndTimeMillis, cumulativeOverflowMillis);
+ filterBeginTimeMillis, filterEndTimeMillis, filterFlags,
+ cumulativeOverflowMillis);
}
private @Nullable List<HistoricalOps> readHistoricalOpsLocked(@NonNull File file,
int filterUid, @Nullable String filterPackageName, @Nullable String[] filterOpNames,
- long filterBeginTimeMillis, long filterEndTimeMillis,
+ long filterBeginTimeMillis, long filterEndTimeMillis, @OpFlags int filterFlags,
@Nullable long[] cumulativeOverflowMillis)
throws IOException, XmlPullParserException {
if (DEBUG) {
@@ -989,13 +1000,22 @@
final XmlPullParser parser = Xml.newPullParser();
parser.setInput(stream, StandardCharsets.UTF_8.name());
XmlUtils.beginDocument(parser, TAG_HISTORY);
+
+ // We haven't released version 1 and have more detailed
+ // accounting - just nuke the current state
+ final int version = XmlUtils.readIntAttribute(parser, ATTR_VERSION);
+ if (CURRENT_VERSION == 2 && version < CURRENT_VERSION) {
+ throw new IllegalStateException("Dropping unsupported history "
+ + "version 1 for file:" + file);
+ }
+
final long overflowMillis = XmlUtils.readLongAttribute(parser, ATTR_OVERFLOW, 0);
final int depth = parser.getDepth();
while (XmlUtils.nextElementWithin(parser, depth)) {
if (TAG_OPS.equals(parser.getName())) {
final HistoricalOps ops = readeHistoricalOpsDLocked(parser,
filterUid, filterPackageName, filterOpNames, filterBeginTimeMillis,
- filterEndTimeMillis, cumulativeOverflowMillis);
+ filterEndTimeMillis, filterFlags, cumulativeOverflowMillis);
if (ops == null) {
continue;
}
@@ -1029,7 +1049,8 @@
private @Nullable HistoricalOps readeHistoricalOpsDLocked(
@NonNull XmlPullParser parser, int filterUid, @Nullable String filterPackageName,
@Nullable String[] filterOpNames, long filterBeginTimeMillis,
- long filterEndTimeMillis, @Nullable long[] cumulativeOverflowMillis)
+ long filterEndTimeMillis, @OpFlags int filterFlags,
+ @Nullable long[] cumulativeOverflowMillis)
throws IOException, XmlPullParserException {
final long beginTimeMillis = XmlUtils.readLongAttribute(parser, ATTR_BEGIN_TIME, 0)
+ (cumulativeOverflowMillis != null ? cumulativeOverflowMillis[0] : 0);
@@ -1045,6 +1066,10 @@
}
final long filteredBeginTimeMillis = Math.max(beginTimeMillis, filterBeginTimeMillis);
final long filteredEndTimeMillis = Math.min(endTimeMillis, filterEndTimeMillis);
+ // // Keep reading as subsequent records may start matching
+ // if (filteredEndTimeMillis - filterBeginTimeMillis <= 0) {
+ // return null;
+ // }
final double filterScale = (double) (filteredEndTimeMillis - filteredBeginTimeMillis)
/ (double) (endTimeMillis - beginTimeMillis);
HistoricalOps ops = null;
@@ -1052,7 +1077,7 @@
while (XmlUtils.nextElementWithin(parser, depth)) {
if (TAG_UID.equals(parser.getName())) {
final HistoricalOps returnedOps = readHistoricalUidOpsDLocked(ops, parser,
- filterUid, filterPackageName, filterOpNames, filterScale);
+ filterUid, filterPackageName, filterOpNames, filterFlags, filterScale);
if (ops == null) {
ops = returnedOps;
}
@@ -1067,7 +1092,8 @@
private @Nullable HistoricalOps readHistoricalUidOpsDLocked(
@Nullable HistoricalOps ops, @NonNull XmlPullParser parser, int filterUid,
@Nullable String filterPackageName, @Nullable String[] filterOpNames,
- double filterScale) throws IOException, XmlPullParserException {
+ @OpFlags int filterFlags, double filterScale)
+ throws IOException, XmlPullParserException {
final int uid = XmlUtils.readIntAttribute(parser, ATTR_NAME);
if (filterUid != Process.INVALID_UID && filterUid != uid) {
XmlUtils.skipCurrentTag(parser);
@@ -1077,7 +1103,8 @@
while (XmlUtils.nextElementWithin(parser, depth)) {
if (TAG_PACKAGE.equals(parser.getName())) {
final HistoricalOps returnedOps = readHistoricalPackageOpsDLocked(ops,
- uid, parser, filterPackageName, filterOpNames, filterScale);
+ uid, parser, filterPackageName, filterOpNames, filterFlags,
+ filterScale);
if (ops == null) {
ops = returnedOps;
}
@@ -1089,7 +1116,8 @@
private @Nullable HistoricalOps readHistoricalPackageOpsDLocked(
@Nullable HistoricalOps ops, int uid, @NonNull XmlPullParser parser,
@Nullable String filterPackageName, @Nullable String[] filterOpNames,
- double filterScale) throws IOException, XmlPullParserException {
+ @OpFlags int filterFlags, double filterScale)
+ throws IOException, XmlPullParserException {
final String packageName = XmlUtils.readStringAttribute(parser, ATTR_NAME);
if (filterPackageName != null && !filterPackageName.equals(packageName)) {
XmlUtils.skipCurrentTag(parser);
@@ -1099,7 +1127,7 @@
while (XmlUtils.nextElementWithin(parser, depth)) {
if (TAG_OP.equals(parser.getName())) {
final HistoricalOps returnedOps = readHistoricalOpDLocked(ops, uid,
- packageName, parser, filterOpNames, filterScale);
+ packageName, parser, filterOpNames, filterFlags, filterScale);
if (ops == null) {
ops = returnedOps;
}
@@ -1110,7 +1138,7 @@
private @Nullable HistoricalOps readHistoricalOpDLocked(@Nullable HistoricalOps ops,
int uid, String packageName, @NonNull XmlPullParser parser,
- @Nullable String[] filterOpNames, double filterScale)
+ @Nullable String[] filterOpNames, @OpFlags int filterFlags, double filterScale)
throws IOException, XmlPullParserException {
final int op = XmlUtils.readIntAttribute(parser, ATTR_NAME);
if (filterOpNames != null && !ArrayUtils.contains(filterOpNames,
@@ -1121,8 +1149,8 @@
final int depth = parser.getDepth();
while (XmlUtils.nextElementWithin(parser, depth)) {
if (TAG_STATE.equals(parser.getName())) {
- final HistoricalOps returnedOps = readUidStateDLocked(ops, uid,
- packageName, op, parser, filterScale);
+ final HistoricalOps returnedOps = readStateDLocked(ops, uid,
+ packageName, op, parser, filterFlags, filterScale);
if (ops == null) {
ops = returnedOps;
}
@@ -1131,10 +1159,15 @@
return ops;
}
- private @Nullable HistoricalOps readUidStateDLocked(@Nullable HistoricalOps ops,
+ private @Nullable HistoricalOps readStateDLocked(@Nullable HistoricalOps ops,
int uid, String packageName, int op, @NonNull XmlPullParser parser,
- double filterScale) throws IOException {
- final int uidState = XmlUtils.readIntAttribute(parser, ATTR_NAME);
+ @OpFlags int filterFlags, double filterScale) throws IOException {
+ final long key = XmlUtils.readLongAttribute(parser, ATTR_NAME);
+ final int flags = AppOpsManager.extractFlagsFromKey(key) & filterFlags;
+ if (flags == 0) {
+ return null;
+ }
+ final int uidState = AppOpsManager.extractUidStateFromKey(key);
long accessCount = XmlUtils.readLongAttribute(parser, ATTR_ACCESS_COUNT, 0);
if (accessCount > 0) {
if (!Double.isNaN(filterScale)) {
@@ -1144,7 +1177,7 @@
if (ops == null) {
ops = new HistoricalOps(0, 0);
}
- ops.increaseAccessCount(op, uid, packageName, uidState, accessCount);
+ ops.increaseAccessCount(op, uid, packageName, uidState, flags, accessCount);
}
long rejectCount = XmlUtils.readLongAttribute(parser, ATTR_REJECT_COUNT, 0);
if (rejectCount > 0) {
@@ -1155,7 +1188,7 @@
if (ops == null) {
ops = new HistoricalOps(0, 0);
}
- ops.increaseRejectCount(op, uid, packageName, uidState, rejectCount);
+ ops.increaseRejectCount(op, uid, packageName, uidState, flags, rejectCount);
}
long accessDuration = XmlUtils.readLongAttribute(parser, ATTR_ACCESS_DURATION, 0);
if (accessDuration > 0) {
@@ -1166,7 +1199,7 @@
if (ops == null) {
ops = new HistoricalOps(0, 0);
}
- ops.increaseAccessDuration(op, uid, packageName, uidState, accessDuration);
+ ops.increaseAccessDuration(op, uid, packageName, uidState, flags, accessDuration);
}
return ops;
}
@@ -1241,24 +1274,34 @@
private void writeHistoricalOpDLocked(@NonNull HistoricalOp op,
@NonNull XmlSerializer serializer) throws IOException {
+ final LongSparseArray keys = op.collectKeys();
+ if (keys == null || keys.size() <= 0) {
+ return;
+ }
serializer.startTag(null, TAG_OP);
serializer.attribute(null, ATTR_NAME, Integer.toString(op.getOpCode()));
- for (int uidState = 0; uidState < AppOpsManager._NUM_UID_STATE; uidState++) {
- writeUidStateOnLocked(op, uidState, serializer);
+ final int keyCount = keys.size();
+ for (int i = 0; i < keyCount; i++) {
+ writeStateOnLocked(op, keys.keyAt(i), serializer);
}
serializer.endTag(null, TAG_OP);
}
- private void writeUidStateOnLocked(@NonNull HistoricalOp op, @UidState int uidState,
+ private void writeStateOnLocked(@NonNull HistoricalOp op, long key,
@NonNull XmlSerializer serializer) throws IOException {
- final long accessCount = op.getAccessCount(uidState);
- final long rejectCount = op.getRejectCount(uidState);
- final long accessDuration = op.getAccessDuration(uidState);
- if (accessCount == 0 && rejectCount == 0 && accessDuration == 0) {
+ final int uidState = AppOpsManager.extractUidStateFromKey(key);
+ final int flags = AppOpsManager.extractFlagsFromKey(key);
+
+ final long accessCount = op.getAccessCount(uidState, uidState, flags);
+ final long rejectCount = op.getRejectCount(uidState, uidState, flags);
+ final long accessDuration = op.getAccessDuration(uidState, uidState, flags);
+
+ if (accessCount <= 0 && rejectCount <= 0 && accessDuration <= 0) {
return;
}
+
serializer.startTag(null, TAG_STATE);
- serializer.attribute(null, ATTR_NAME, Integer.toString(uidState));
+ serializer.attribute(null, ATTR_NAME, Long.toString(key));
if (accessCount > 0) {
serializer.attribute(null, ATTR_ACCESS_COUNT, Long.toString(accessCount));
}
@@ -1532,24 +1575,29 @@
mWriter.print(mEntryPrefix);
mWriter.print(AppOpsManager.opToName(ops.getOpCode()));
mWriter.println(":");
- for (int uidState = 0; uidState < AppOpsManager._NUM_UID_STATE; uidState++) {
+ final LongSparseArray keys = ops.collectKeys();
+ final int keyCount = keys.size();
+ for (int i = 0; i < keyCount; i++) {
+ final long key = keys.keyAt(i);
+ final int uidState = AppOpsManager.extractUidStateFromKey(key);
+ final int flags = AppOpsManager.extractFlagsFromKey(key);
boolean printedUidState = false;
- final long accessCount = ops.getAccessCount(uidState);
+ final long accessCount = ops.getAccessCount(uidState, uidState, flags);
if (accessCount > 0) {
if (!printedUidState) {
mWriter.print(mUidStatePrefix);
- mWriter.print(AppOpsService.UID_STATE_NAMES[uidState]);
+ mWriter.print(AppOpsManager.keyToString(key));
mWriter.print(" = ");
printedUidState = true;
}
mWriter.print("access=");
mWriter.print(accessCount);
}
- final long rejectCount = ops.getRejectCount(uidState);
+ final long rejectCount = ops.getRejectCount(uidState, uidState, flags);
if (rejectCount > 0) {
if (!printedUidState) {
mWriter.print(mUidStatePrefix);
- mWriter.print(AppOpsService.UID_STATE_NAMES[uidState]);
+ mWriter.print(AppOpsManager.keyToString(key));
mWriter.print(" = ");
printedUidState = true;
} else {
@@ -1558,11 +1606,11 @@
mWriter.print("reject=");
mWriter.print(rejectCount);
}
- final long accessDuration = ops.getAccessDuration(uidState);
+ final long accessDuration = ops.getAccessDuration(uidState, uidState, flags);
if (accessDuration > 0) {
if (!printedUidState) {
mWriter.print(mUidStatePrefix);
- mWriter.print(AppOpsService.UID_STATE_NAMES[uidState]);
+ mWriter.print(AppOpsManager.keyToString(key));
mWriter.print(" = ");
printedUidState = true;
} else {
diff --git a/services/core/java/com/android/server/appop/TEST_MAPPING b/services/core/java/com/android/server/appop/TEST_MAPPING
new file mode 100644
index 0000000..f2e2782
--- /dev/null
+++ b/services/core/java/com/android/server/appop/TEST_MAPPING
@@ -0,0 +1,21 @@
+{
+ "presubmit": [
+ {
+ "name": "CtsAppOpsTestCases"
+ },
+ {
+ "name": "FrameworksServicesTests",
+ "options": [
+ {
+ "include-filter": "com.android.server.appop.AppOpsUpgradeTest"
+ },
+ {
+ "include-filter": "com.android.server.appop.AppOpsServiceTest"
+ },
+ {
+ "include-filter": "com.android.server.appop.AppOpsActiveWatcherTest"
+ }
+ ]
+ }
+ ]
+}
diff --git a/services/core/java/com/android/server/connectivity/TcpKeepaliveController.java b/services/core/java/com/android/server/connectivity/TcpKeepaliveController.java
index 8a9ac23..65de83b 100644
--- a/services/core/java/com/android/server/connectivity/TcpKeepaliveController.java
+++ b/services/core/java/com/android/server/connectivity/TcpKeepaliveController.java
@@ -16,10 +16,12 @@
package com.android.server.connectivity;
import static android.net.SocketKeepalive.DATA_RECEIVED;
+import static android.net.SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED;
import static android.net.SocketKeepalive.ERROR_INVALID_SOCKET;
import static android.net.SocketKeepalive.ERROR_SOCKET_NOT_IDLE;
import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_ERROR;
import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_INPUT;
+import static android.system.OsConstants.ENOPROTOOPT;
import static android.system.OsConstants.FIONREAD;
import static android.system.OsConstants.IPPROTO_TCP;
import static android.system.OsConstants.TIOCOUTQ;
@@ -179,12 +181,13 @@
trw = NetworkUtils.getTcpRepairWindow(fd);
} catch (ErrnoException e) {
Log.e(TAG, "Exception reading TCP state from socket", e);
- try {
- Os.setsockoptInt(fd, IPPROTO_TCP, TCP_REPAIR, TCP_REPAIR_OFF);
- } catch (ErrnoException ex) {
- Log.e(TAG, "Exception while turning off repair mode due to exception", ex);
+ if (e.errno == ENOPROTOOPT) {
+ // ENOPROTOOPT may happen in kernel version lower than 4.8.
+ // Treat it as ERROR_HARDWARE_UNSUPPORTED.
+ throw new InvalidSocketException(ERROR_HARDWARE_UNSUPPORTED, e);
+ } else {
+ throw new InvalidSocketException(ERROR_INVALID_SOCKET, e);
}
- throw new InvalidSocketException(ERROR_INVALID_SOCKET, e);
} finally {
dropAllIncomingPackets(fd, false);
}
diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index 1aaaf41..6c00da2 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -1689,8 +1689,9 @@
* Returns information about the specified logical display.
*
* @param displayId The logical display id.
- * @return The logical display info, or null if the display does not exist. The
- * returned object must be treated as immutable.
+ * @return The logical display info, return {@code null} if the display does not exist or
+ * the calling UID isn't present on the display. The returned object must be treated as
+ * immutable.
*/
@Override // Binder call
public DisplayInfo getDisplayInfo(int displayId) {
@@ -1717,6 +1718,16 @@
}
}
+ @Override // Binder call
+ public boolean isUidPresentOnDisplay(int uid, int displayId) {
+ final long token = Binder.clearCallingIdentity();
+ try {
+ return isUidPresentOnDisplayInternal(uid, displayId);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
/**
* Returns the stable device display size, in pixels.
*/
@@ -2385,11 +2396,6 @@
}
@Override
- public boolean isUidPresentOnDisplay(int uid, int displayId) {
- return isUidPresentOnDisplayInternal(uid, displayId);
- }
-
- @Override
public void persistBrightnessTrackerState() {
synchronized (mSyncRoot) {
mDisplayPowerController.persistBrightnessTrackerState();
diff --git a/services/core/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java
index 7ee8422..b21f0a7 100644
--- a/services/core/java/com/android/server/display/LogicalDisplay.java
+++ b/services/core/java/com/android/server/display/LogicalDisplay.java
@@ -301,6 +301,7 @@
boolean maskCutout =
(deviceInfo.flags & DisplayDeviceInfo.FLAG_MASK_DISPLAY_CUTOUT) != 0;
mBaseDisplayInfo.displayCutout = maskCutout ? null : deviceInfo.displayCutout;
+ mBaseDisplayInfo.displayId = mDisplayId;
mPrimaryDisplayDeviceInfo = deviceInfo;
mInfo = null;
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index 8e8477a..9ab9975 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -601,12 +601,11 @@
// while IO initialization and registration is delegated to our internal handler
// this approach is just fine because events are posted to our handler anyway
mGnssConfiguration = new GnssConfiguration(mContext);
- sendMessage(INITIALIZE_HANDLER, 0, null);
-
- // Create a GPS net-initiated handler.
+ // Create a GPS net-initiated handler (also needed by handleInitialize)
mNIHandler = new GpsNetInitiatedHandler(context,
mNetInitiatedListener,
mSuplEsEnabled);
+ sendMessage(INITIALIZE_HANDLER, 0, null);
mGnssStatusListenerHelper = new GnssStatusListenerHelper(mContext, mHandler) {
@Override
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index f70adef..1783591 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -564,11 +564,8 @@
pw.print("requestedVrComponent=");
pw.println(requestedVrComponent);
}
- final boolean waitingVisible =
- mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(this);
- if (lastVisibleTime != 0 || waitingVisible || nowVisible) {
- pw.print(prefix); pw.print("waitingVisible="); pw.print(waitingVisible);
- pw.print(" nowVisible="); pw.print(nowVisible);
+ if (lastVisibleTime != 0 || nowVisible) {
+ pw.print(prefix); pw.print(" nowVisible="); pw.print(nowVisible);
pw.print(" lastVisibleTime=");
if (lastVisibleTime == 0) pw.print("0");
else TimeUtils.formatDuration(lastVisibleTime, now, pw);
@@ -2358,27 +2355,6 @@
if (!nowVisible) {
nowVisible = true;
lastVisibleTime = SystemClock.uptimeMillis();
- if (idle || mStackSupervisor.isStoppingNoHistoryActivity()) {
- // If this activity was already idle or there is an activity that must be
- // stopped immediately after visible, then we now need to make sure we perform
- // the full stop of any activities that are waiting to do so. This is because
- // we won't do that while they are still waiting for this one to become visible.
- final int size = mStackSupervisor.mActivitiesWaitingForVisibleActivity.size();
- if (size > 0) {
- for (int i = 0; i < size; i++) {
- final ActivityRecord r =
- mStackSupervisor.mActivitiesWaitingForVisibleActivity.get(i);
- if (DEBUG_SWITCH) Log.v(TAG_SWITCH, "Was waiting for visible: " + r);
- }
- mStackSupervisor.mActivitiesWaitingForVisibleActivity.clear();
- mStackSupervisor.scheduleIdleLocked();
- }
- } else {
- // Instead of doing the full stop routine here, let's just hide any activities
- // we now can, and let them stop when the normal idle happens.
- mStackSupervisor.processStoppingActivitiesLocked(null /* idleActivity */,
- false /* remove */, true /* processPausingActivities */);
- }
mAtmService.scheduleAppGcsLocked();
}
}
@@ -2392,6 +2368,24 @@
}
}
+ void onAnimationFinished() {
+ if (mRootActivityContainer.allResumedActivitiesIdle()
+ || mStackSupervisor.isStoppingNoHistoryActivity()) {
+ // If all activities are already idle or there is an activity that must be
+ // stopped immediately after visible, then we now need to make sure we perform
+ // the full stop of this activity. This is because we won't do that while they are still
+ // waiting for the animation to finish.
+ if (mStackSupervisor.mStoppingActivities.contains(this)) {
+ mStackSupervisor.scheduleIdleLocked();
+ }
+ } else {
+ // Instead of doing the full stop routine here, let's just hide any activities
+ // we now can, and let them stop when the normal idle happens.
+ mStackSupervisor.processStoppingActivitiesLocked(null /* idleActivity */,
+ false /* remove */, true /* processPausingActivities */);
+ }
+ }
+
/**
* Called when the key dispatching to a window associated with the app window container
* timed-out.
@@ -2424,10 +2418,9 @@
}
private ActivityRecord getWaitingHistoryRecordLocked() {
- // First find the real culprit... if this activity is waiting for
- // another activity to start or has stopped, then the key dispatching
+ // First find the real culprit... if this activity has stopped, then the key dispatching
// timeout should not be caused by this.
- if (mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(this) || stopped) {
+ if (stopped) {
final ActivityStack stack = mRootActivityContainer.getTopDisplayFocusedStack();
// Try to use the one which is closest to top.
ActivityRecord r = stack.getResumedActivity();
diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index ea2aff2..82c0e21 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -701,6 +701,14 @@
*/
void setWindowingMode(int preferredWindowingMode, boolean animate, boolean showRecents,
boolean enteringSplitScreenMode, boolean deferEnsuringVisibility, boolean creating) {
+ mWindowManager.inSurfaceTransaction(() -> setWindowingModeInSurfaceTransaction(
+ preferredWindowingMode, animate, showRecents, enteringSplitScreenMode,
+ deferEnsuringVisibility, creating));
+ }
+
+ private void setWindowingModeInSurfaceTransaction(int preferredWindowingMode, boolean animate,
+ boolean showRecents, boolean enteringSplitScreenMode, boolean deferEnsuringVisibility,
+ boolean creating) {
final int currentMode = getWindowingMode();
final int currentOverrideMode = getRequestedOverrideWindowingMode();
final ActivityDisplay display = getDisplay();
@@ -744,7 +752,7 @@
// warning toast about it.
mService.getTaskChangeNotificationController().notifyActivityDismissingDockedStack();
final ActivityStack primarySplitStack = display.getSplitScreenPrimaryStack();
- primarySplitStack.setWindowingMode(WINDOWING_MODE_UNDEFINED,
+ primarySplitStack.setWindowingModeInSurfaceTransaction(WINDOWING_MODE_UNDEFINED,
false /* animate */, false /* showRecents */,
false /* enteringSplitScreenMode */, true /* deferEnsuringVisibility */,
primarySplitStack == this ? creating : false);
@@ -1799,10 +1807,6 @@
} else if (prev.hasProcess()) {
if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Enqueue pending stop if needed: " + prev
+ " wasStopping=" + wasStopping + " visible=" + prev.visible);
- if (mStackSupervisor.mActivitiesWaitingForVisibleActivity.remove(prev)) {
- if (DEBUG_SWITCH || DEBUG_PAUSE) Slog.v(TAG_PAUSE,
- "Complete pause, no longer waiting: " + prev);
- }
if (prev.deferRelaunchUntilPaused) {
// Complete the deferred relaunch that was waiting for pause to complete.
if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Re-launching after pause: " + prev);
@@ -1882,16 +1886,6 @@
private void addToStopping(ActivityRecord r, boolean scheduleIdle, boolean idleDelayed) {
if (!mStackSupervisor.mStoppingActivities.contains(r)) {
mStackSupervisor.mStoppingActivities.add(r);
-
- // Some activity is waiting for another activity to become visible before it's being
- // stopped, which means that we also want to wait with stopping this one to avoid
- // flickers.
- if (!mStackSupervisor.mActivitiesWaitingForVisibleActivity.isEmpty()
- && !mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(r)) {
- if (DEBUG_SWITCH) Slog.i(TAG_SWITCH, "adding to waiting visible activity=" + r
- + " existing=" + mStackSupervisor.mActivitiesWaitingForVisibleActivity);
- mStackSupervisor.mActivitiesWaitingForVisibleActivity.add(r);
- }
}
// If we already have a few activities waiting to stop, then give up
@@ -2707,7 +2701,6 @@
mStackSupervisor.mStoppingActivities.remove(next);
mStackSupervisor.mGoingToSleepActivities.remove(next);
next.sleeping = false;
- mStackSupervisor.mActivitiesWaitingForVisibleActivity.remove(next);
if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "Resuming " + next);
@@ -2716,11 +2709,6 @@
if (DEBUG_SWITCH || DEBUG_PAUSE || DEBUG_STATES) Slog.v(TAG_PAUSE,
"resumeTopActivityLocked: Skip resume: some activity pausing.");
- // Adding previous activity to the waiting visible list, or it would be stopped
- // before top activity being visible.
- if (prev != null && !next.nowVisible) {
- mStackSupervisor.mActivitiesWaitingForVisibleActivity.add(prev);
- }
return false;
}
@@ -2796,35 +2784,27 @@
mLastNoHistoryActivity = null;
}
- if (prev != null && prev != next) {
- if (!mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(prev)
- && !next.nowVisible) {
- mStackSupervisor.mActivitiesWaitingForVisibleActivity.add(prev);
+ if (prev != null && prev != next && next.nowVisible) {
+
+ // The next activity is already visible, so hide the previous
+ // activity's windows right now so we can show the new one ASAP.
+ // We only do this if the previous is finishing, which should mean
+ // it is on top of the one being resumed so hiding it quickly
+ // is good. Otherwise, we want to do the normal route of allowing
+ // the resumed activity to be shown so we can decide if the
+ // previous should actually be hidden depending on whether the
+ // new one is found to be full-screen or not.
+ if (prev.finishing) {
+ prev.setVisibility(false);
if (DEBUG_SWITCH) Slog.v(TAG_SWITCH,
- "Resuming top, waiting visible to hide: " + prev);
+ "Not waiting for visible to hide: " + prev
+ + ", nowVisible=" + next.nowVisible);
} else {
- // The next activity is already visible, so hide the previous
- // activity's windows right now so we can show the new one ASAP.
- // We only do this if the previous is finishing, which should mean
- // it is on top of the one being resumed so hiding it quickly
- // is good. Otherwise, we want to do the normal route of allowing
- // the resumed activity to be shown so we can decide if the
- // previous should actually be hidden depending on whether the
- // new one is found to be full-screen or not.
- if (prev.finishing) {
- prev.setVisibility(false);
- if (DEBUG_SWITCH) Slog.v(TAG_SWITCH,
- "Not waiting for visible to hide: " + prev + ", waitingVisible="
- + mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(prev)
- + ", nowVisible=" + next.nowVisible);
- } else {
- if (DEBUG_SWITCH) Slog.v(TAG_SWITCH,
- "Previous already visible but still waiting to hide: " + prev
- + ", waitingVisible="
- + mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(prev)
- + ", nowVisible=" + next.nowVisible);
- }
+ if (DEBUG_SWITCH) Slog.v(TAG_SWITCH,
+ "Previous already visible but still waiting to hide: " + prev
+ + ", nowVisible=" + next.nowVisible);
}
+
}
// Launching this app's activity, make sure the app is no longer
@@ -4081,9 +4061,6 @@
dc.prepareAppTransition(transit, false);
r.setVisibility(false);
dc.executeAppTransition();
- if (!mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(r)) {
- mStackSupervisor.mActivitiesWaitingForVisibleActivity.add(r);
- }
}
static final int FINISH_IMMEDIATELY = 0;
@@ -4119,7 +4096,6 @@
// make sure the record is cleaned out of other places.
mStackSupervisor.mStoppingActivities.remove(r);
mStackSupervisor.mGoingToSleepActivities.remove(r);
- mStackSupervisor.mActivitiesWaitingForVisibleActivity.remove(r);
final ActivityState prevState = r.getState();
if (DEBUG_STATES) Slog.v(TAG_STATES, "Moving to FINISHING: " + r);
@@ -4725,8 +4701,6 @@
"mStoppingActivities");
removeHistoryRecordsForAppLocked(mStackSupervisor.mGoingToSleepActivities, app,
"mGoingToSleepActivities");
- removeHistoryRecordsForAppLocked(mStackSupervisor.mActivitiesWaitingForVisibleActivity, app,
- "mActivitiesWaitingForVisibleActivity");
removeHistoryRecordsForAppLocked(mStackSupervisor.mFinishingActivities, app,
"mFinishingActivities");
diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
index 758a765..d1108cc 100644
--- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
@@ -267,12 +267,6 @@
*/
private final SparseIntArray mCurTaskIdForUser = new SparseIntArray(20);
- /** List of activities that are waiting for a new activity to become visible before completing
- * whatever operation they are supposed to do. */
- // TODO: Remove mActivitiesWaitingForVisibleActivity list and just remove activity from
- // mStoppingActivities when something else comes up.
- final ArrayList<ActivityRecord> mActivitiesWaitingForVisibleActivity = new ArrayList<>();
-
/** List of processes waiting to find out when a specific activity becomes visible. */
private final ArrayList<WaitInfo> mWaitingForActivityVisible = new ArrayList<>();
@@ -550,7 +544,6 @@
// This could happen, for example, if we are trimming activities
// down to the max limit while they are still waiting to finish.
mFinishingActivities.remove(r);
- mActivitiesWaitingForVisibleActivity.remove(r);
for (int i = mWaitingForActivityVisible.size() - 1; i >= 0; --i) {
if (mWaitingForActivityVisible.get(i).matches(r.mActivityComponent)) {
@@ -2142,28 +2135,27 @@
final boolean nowVisible = mRootActivityContainer.allResumedActivitiesVisible();
for (int activityNdx = mStoppingActivities.size() - 1; activityNdx >= 0; --activityNdx) {
ActivityRecord s = mStoppingActivities.get(activityNdx);
- boolean waitingVisible = mActivitiesWaitingForVisibleActivity.contains(s);
+
+ final boolean animating = s.mAppWindowToken.isSelfAnimating();
+
if (DEBUG_STATES) Slog.v(TAG, "Stopping " + s + ": nowVisible=" + nowVisible
- + " waitingVisible=" + waitingVisible + " finishing=" + s.finishing);
- if (waitingVisible && nowVisible) {
- mActivitiesWaitingForVisibleActivity.remove(s);
- waitingVisible = false;
- if (s.finishing) {
- // If this activity is finishing, it is sitting on top of
- // everyone else but we now know it is no longer needed...
- // so get rid of it. Otherwise, we need to go through the
- // normal flow and hide it once we determine that it is
- // hidden by the activities in front of it.
- if (DEBUG_STATES) Slog.v(TAG, "Before stopping, can hide: " + s);
- s.setVisibility(false);
- }
+ + " animating=" + animating + " finishing=" + s.finishing);
+ if (nowVisible && s.finishing) {
+
+ // If this activity is finishing, it is sitting on top of
+ // everyone else but we now know it is no longer needed...
+ // so get rid of it. Otherwise, we need to go through the
+ // normal flow and hide it once we determine that it is
+ // hidden by the activities in front of it.
+ if (DEBUG_STATES) Slog.v(TAG, "Before stopping, can hide: " + s);
+ s.setVisibility(false);
}
if (remove) {
final ActivityStack stack = s.getActivityStack();
final boolean shouldSleepOrShutDown = stack != null
? stack.shouldSleepOrShutDownActivities()
: mService.isSleepingOrShuttingDownLocked();
- if (!waitingVisible || shouldSleepOrShutDown) {
+ if (!animating || shouldSleepOrShutDown) {
if (!processPausingActivities && s.isState(PAUSING)) {
// Defer processing pausing activities in this iteration and reschedule
// a delayed idle to reprocess it again
@@ -2178,9 +2170,6 @@
}
stops.add(s);
- // Make sure to remove it in all cases in case we entered this block with
- // shouldSleepOrShutDown
- mActivitiesWaitingForVisibleActivity.remove(s);
mStoppingActivities.remove(activityNdx);
}
}
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 19ff438..bb5a221 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -86,6 +86,7 @@
import android.content.res.Configuration;
import android.content.res.ResourceId;
import android.content.res.Resources;
+import android.content.res.Resources.NotFoundException;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
@@ -123,6 +124,7 @@
import android.view.animation.TranslateAnimation;
import com.android.internal.R;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.DumpUtils.Dump;
import com.android.internal.util.function.pooled.PooledLambda;
import com.android.server.AttributeCache;
@@ -558,19 +560,19 @@
}
resId = updateToTranslucentAnimIfNeeded(resId, transit);
if (ResourceId.isValid(resId)) {
- return AnimationUtils.loadAnimation(context, resId);
+ return loadAnimationSafely(context, resId);
}
return null;
}
- Animation loadAnimationRes(LayoutParams lp, int resId) {
+ private Animation loadAnimationRes(LayoutParams lp, int resId) {
Context context = mContext;
if (ResourceId.isValid(resId)) {
AttributeCache.Entry ent = getCachedAnimations(lp);
if (ent != null) {
context = ent.context;
}
- return AnimationUtils.loadAnimation(context, resId);
+ return loadAnimationSafely(context, resId);
}
return null;
}
@@ -579,12 +581,22 @@
if (ResourceId.isValid(resId)) {
AttributeCache.Entry ent = getCachedAnimations(packageName, resId);
if (ent != null) {
- return AnimationUtils.loadAnimation(ent.context, resId);
+ return loadAnimationSafely(ent.context, resId);
}
}
return null;
}
+ @VisibleForTesting
+ Animation loadAnimationSafely(Context context, int resId) {
+ try {
+ return AnimationUtils.loadAnimation(context, resId);
+ } catch (NotFoundException e) {
+ Slog.w(TAG, "Unable to load animation resource", e);
+ return null;
+ }
+ }
+
private int updateToTranslucentAnimIfNeeded(int anim, int transit) {
if (transit == TRANSIT_TRANSLUCENT_ACTIVITY_OPEN && anim == R.anim.activity_open_enter) {
return R.anim.activity_translucent_open_enter;
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index 78199d44..220370c 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -2784,6 +2784,8 @@
getDisplayContent().mAppTransition.notifyAppTransitionFinishedLocked(token);
scheduleAnimation();
+
+ mActivityRecord.onAnimationFinished();
}
@Override
diff --git a/services/core/java/com/android/server/wm/RootActivityContainer.java b/services/core/java/com/android/server/wm/RootActivityContainer.java
index e3beb19..e59b6d7 100644
--- a/services/core/java/com/android/server/wm/RootActivityContainer.java
+++ b/services/core/java/com/android/server/wm/RootActivityContainer.java
@@ -2016,8 +2016,7 @@
final ActivityStack stack = display.getChildAt(stackNdx);
final ActivityRecord r = stack.getResumedActivity();
if (r != null) {
- if (!r.nowVisible
- || mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(r)) {
+ if (!r.nowVisible) {
return false;
}
foundResumed = true;
@@ -2345,10 +2344,6 @@
printed |= dumpHistoryList(fd, pw, mStackSupervisor.mStoppingActivities, " ",
"Stop", false, !dumpAll,
false, dumpPackage, true, " Activities waiting to stop:", null);
- printed |= dumpHistoryList(fd, pw,
- mStackSupervisor.mActivitiesWaitingForVisibleActivity, " ", "Wait",
- false, !dumpAll, false, dumpPackage, true,
- " Activities waiting for another to become visible:", null);
printed |= dumpHistoryList(fd, pw, mStackSupervisor.mGoingToSleepActivities,
" ", "Sleep", false, !dumpAll,
false, dumpPackage, true, " Activities waiting to sleep:", null);
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index d58e204..d3f387c 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -1179,8 +1179,7 @@
+ displayId + ". Aborting.");
return WindowManagerGlobal.ADD_INVALID_DISPLAY;
}
- if (!displayContent.hasAccess(session.mUid)
- && !mDisplayManagerInternal.isUidPresentOnDisplay(session.mUid, displayId)) {
+ if (!displayContent.hasAccess(session.mUid)) {
Slog.w(TAG_WM, "Attempted to add window to a display for which the application "
+ "does not have access: " + displayId + ". Aborting.");
return WindowManagerGlobal.ADD_INVALID_DISPLAY;
diff --git a/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java b/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java
index c8e6782..d0158e0 100644
--- a/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/AppStateTrackerTest.java
@@ -685,10 +685,10 @@
List<OpEntry> entries = new ArrayList<>();
entries.add(new OpEntry(
AppOpsManager.OP_ACCESS_NOTIFICATIONS,
- AppOpsManager.MODE_IGNORED, 0, 0, 0, 0, null));
+ AppOpsManager.MODE_IGNORED));
entries.add(new OpEntry(
AppStateTracker.TARGET_OP,
- AppOpsManager.MODE_IGNORED, 0, 0, 0, 0, null));
+ AppOpsManager.MODE_IGNORED));
ops.add(new PackageOps(PACKAGE_1, UID_1, entries));
@@ -696,7 +696,7 @@
entries = new ArrayList<>();
entries.add(new OpEntry(
AppStateTracker.TARGET_OP,
- AppOpsManager.MODE_IGNORED, 0, 0, 0, 0, null));
+ AppOpsManager.MODE_IGNORED));
ops.add(new PackageOps(PACKAGE_2, UID_2, entries));
@@ -704,7 +704,7 @@
entries = new ArrayList<>();
entries.add(new OpEntry(
AppStateTracker.TARGET_OP,
- AppOpsManager.MODE_ALLOWED, 0, 0, 0, 0, null));
+ AppOpsManager.MODE_ALLOWED));
ops.add(new PackageOps(PACKAGE_1, UID_10_1, entries));
@@ -712,10 +712,10 @@
entries = new ArrayList<>();
entries.add(new OpEntry(
AppStateTracker.TARGET_OP,
- AppOpsManager.MODE_IGNORED, 0, 0, 0, 0, null));
+ AppOpsManager.MODE_IGNORED));
entries.add(new OpEntry(
AppOpsManager.OP_ACCESS_NOTIFICATIONS,
- AppOpsManager.MODE_IGNORED, 0, 0, 0, 0, null));
+ AppOpsManager.MODE_IGNORED));
ops.add(new PackageOps(PACKAGE_3, UID_10_3, entries));
diff --git a/services/tests/servicestests/src/com/android/server/appop/AppOpsNotedWatcherTest.java b/services/tests/servicestests/src/com/android/server/appop/AppOpsNotedWatcherTest.java
index edd89f9..96f329b 100644
--- a/services/tests/servicestests/src/com/android/server/appop/AppOpsNotedWatcherTest.java
+++ b/services/tests/servicestests/src/com/android/server/appop/AppOpsNotedWatcherTest.java
@@ -45,21 +45,6 @@
private static final long NOTIFICATION_TIMEOUT_MILLIS = 5000;
- public void testWatchNotedOpsRequiresPermission() {
- // Create a mock listener
- final OnOpNotedListener listener = mock(OnOpNotedListener.class);
-
- // Try to start watching noted ops
- final AppOpsManager appOpsManager = getContext().getSystemService(AppOpsManager.class);
- try {
- appOpsManager.startWatchingNoted(new int[]{AppOpsManager.OP_FINE_LOCATION,
- AppOpsManager.OP_RECORD_AUDIO}, listener);
- fail("Watching noted ops shoudl require " + Manifest.permission.WATCH_APPOPS);
- } catch (SecurityException expected) {
- /*ignored*/
- }
- }
-
@Test
public void testWatchNotedOps() {
// Create a mock listener
diff --git a/services/tests/servicestests/src/com/android/server/appop/AppOpsUpgradeTest.java b/services/tests/servicestests/src/com/android/server/appop/AppOpsUpgradeTest.java
index eb0c627..66d2bab 100644
--- a/services/tests/servicestests/src/com/android/server/appop/AppOpsUpgradeTest.java
+++ b/services/tests/servicestests/src/com/android/server/appop/AppOpsUpgradeTest.java
@@ -107,8 +107,8 @@
}
final AppOpsService.Op _op1 = ops.get(op1);
final AppOpsService.Op _op2 = ops.get(op2);
- final int mode1 = (_op1 == null) ? defaultModeOp1 : _op1.mode;
- final int mode2 = (_op2 == null) ? defaultModeOp2 : _op2.mode;
+ final int mode1 = (_op1 == null) ? defaultModeOp1 : _op1.getMode();
+ final int mode2 = (_op2 == null) ? defaultModeOp2 : _op2.getMode();
assertEquals(mode1, mode2);
if (mode1 != defaultModeOp1) {
numberOfNonDefaultOps++;
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
index b91f3ec..6e09167 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java
@@ -23,29 +23,29 @@
import static android.view.WindowManager.TRANSIT_CRASHING_ACTIVITY_CLOSE;
import static android.view.WindowManager.TRANSIT_KEYGUARD_GOING_AWAY;
import static android.view.WindowManager.TRANSIT_KEYGUARD_UNOCCLUDE;
-
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.anyBoolean;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import android.graphics.Rect;
import android.platform.test.annotations.Presubmit;
import android.view.Display;
-import androidx.test.filters.SmallTest;
-
import org.junit.Before;
import org.junit.Test;
+import androidx.test.filters.SmallTest;
+
/**
* Test class for {@link AppTransition}.
*
* Build/Install/Run:
- * atest FrameworksServicesTests:AppTransitionTests
+ * atest WmTests:AppTransitionTests
*/
@SmallTest
@Presubmit
@@ -167,4 +167,11 @@
assertFalse(dc1.mOpeningApps.contains(token1));
}
+ @Test
+ public void testLoadAnimationSafely() {
+ DisplayContent dc = createNewDisplay(Display.STATE_ON);
+ assertNull(dc.mAppTransition.loadAnimationSafely(
+ getInstrumentation().getTargetContext(), -1));
+ }
+
}
diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java
index 79b7807..9d46300 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/telephony/java/android/provider/Telephony.java
@@ -1191,8 +1191,8 @@
* Broadcast Action: A debug code has been entered in the dialer. This intent is
* broadcast by the system and OEM telephony apps may need to receive these broadcasts.
* These "secret codes" are used to activate developer menus by dialing certain codes.
- * And they are of the form {@code *#*#<code>#*#*}. The intent will have the data
- * URI: {@code android_secret_code://<code>}. It is possible that a manifest
+ * And they are of the form {@code *#*#<code>#*#*}. The intent will have the data
+ * URI: {@code android_secret_code://<code>}. It is possible that a manifest
* receiver would be woken up even if it is not currently running.
*
* <p>Requires {@code android.Manifest.permission#CONTROL_INCALL_EXPERIENCE} to
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 79c7195..cf2b1ea 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2797,8 +2797,8 @@
* (see {@link #hasCarrierPrivileges}).
* <p>
* These "secret codes" are used to activate developer menus by dialing certain codes.
- * And they are of the form {@code *#*#<code>#*#*}. The intent will have the data
- * URI: {@code android_secret_code://<code>}. It is possible that a manifest
+ * And they are of the form {@code *#*#<code>#*#*}. The intent will have the data
+ * URI: {@code android_secret_code://<code>}. It is possible that a manifest
* receiver would be woken up even if it is not currently running.
* <p>
* It is supposed to replace {@link android.provider.Telephony.Sms.Intents#SECRET_CODE_ACTION}