Merge "Fix WifiTracker keeps sacnning even if onStop() is called." into qt-dev
diff --git a/Android.bp b/Android.bp
index b4110fa..abf95a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -320,7 +320,7 @@
"core/java/android/service/vr/IVrManager.aidl",
"core/java/android/service/vr/IVrStateCallbacks.aidl",
"core/java/android/service/watchdog/IExplicitHealthCheckService.aidl",
- "core/java/android/service/watchdog/PackageInfo.aidl",
+ "core/java/android/service/watchdog/PackageConfig.aidl",
"core/java/android/print/ILayoutResultCallback.aidl",
"core/java/android/print/IPrinterDiscoveryObserver.aidl",
"core/java/android/print/IPrintDocumentAdapter.aidl",
@@ -687,6 +687,7 @@
"core/java/com/android/server/DropboxLogTags.logtags",
"core/java/org/chromium/arc/EventLogTags.logtags",
+ ":apex-properties",
":platform-properties",
":framework-statslog-gen",
@@ -1834,4 +1835,4 @@
name: "framework-aidl-mappings",
srcs: [":framework-defaults"],
output: "framework-aidl-mappings.txt"
-}
\ No newline at end of file
+}
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6160acb..0015c85 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -248,9 +248,6 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.location.provider.jar)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.future.usb.accessory.jar)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/com.android.media.remotedisplay.jar)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/overlay/ExperimentNavigationBarSlim)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/overlay/ExperimentNavigationBarSlim)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/ExperimentNavigationBarSlim)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUI)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DynamicAndroidInstallationService)
diff --git a/apct-tests/perftests/core/src/android/graphics/perftests/TypefaceCreatePerfTest.java b/apct-tests/perftests/core/src/android/graphics/perftests/TypefaceCreatePerfTest.java
index d6e8ab2..8847456 100644
--- a/apct-tests/perftests/core/src/android/graphics/perftests/TypefaceCreatePerfTest.java
+++ b/apct-tests/perftests/core/src/android/graphics/perftests/TypefaceCreatePerfTest.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.content.res.AssetManager;
+import android.content.res.Resources;
import android.graphics.Typeface;
import android.perftests.utils.BenchmarkState;
import android.perftests.utils.PerfStatusReporter;
@@ -26,6 +27,8 @@
import androidx.test.filters.LargeTest;
import androidx.test.runner.AndroidJUnit4;
+import com.android.perftests.core.R;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -104,4 +107,15 @@
outFile.delete();
}
+
+ @Test
+ public void testCreate_fromResources() {
+ BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
+ final Resources r = InstrumentationRegistry.getContext().getResources();
+
+ while (state.keepRunning()) {
+ Typeface face = r.getFont(R.font.samplefont);
+ }
+ }
+
}
diff --git a/api/TEST_MAPPING b/api/TEST_MAPPING
index 4d22d0b..3a2e528 100644
--- a/api/TEST_MAPPING
+++ b/api/TEST_MAPPING
@@ -5,9 +5,11 @@
},
{
"name": "CtsSystemApiSignatureTestCases"
- },
+ }
+ ],
+ "imports": [
{
- "name": "GtsUnofficialApisUsageTestCases"
+ "path": "vendor/xts/gts-tests/hostsidetests/api"
}
]
}
diff --git a/api/current.txt b/api/current.txt
index d2f63fa..8b24826 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3763,6 +3763,7 @@
method public void onDetachedFromWindow();
method public void onEnterAnimationComplete();
method public boolean onGenericMotionEvent(android.view.MotionEvent);
+ method public void onGetDirectActions(@NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<java.util.List<android.app.DirectAction>>);
method public boolean onKeyDown(int, android.view.KeyEvent);
method public boolean onKeyLongPress(int, android.view.KeyEvent);
method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
@@ -3782,6 +3783,7 @@
method public void onOptionsMenuClosed(android.view.Menu);
method public void onPanelClosed(int, @NonNull android.view.Menu);
method @CallSuper protected void onPause();
+ method public void onPerformDirectAction(@NonNull String, @NonNull android.os.Bundle, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.os.Bundle>);
method public void onPictureInPictureModeChanged(boolean, android.content.res.Configuration);
method @Deprecated public void onPictureInPictureModeChanged(boolean);
method @CallSuper protected void onPostCreate(@Nullable android.os.Bundle);
@@ -4603,9 +4605,25 @@
field @Deprecated public static final int STYLE_NO_TITLE = 1; // 0x1
}
+ public final class DirectAction implements android.os.Parcelable {
+ method public int describeContents();
+ method @Nullable public android.os.Bundle getExtras();
+ method @NonNull public String getId();
+ method @Nullable public android.content.LocusId getLocusId();
+ method public void writeToParcel(android.os.Parcel, int);
+ field @NonNull public static final android.os.Parcelable.Creator<android.app.DirectAction> CREATOR;
+ }
+
+ public static final class DirectAction.Builder {
+ ctor public DirectAction.Builder(@NonNull String);
+ method @NonNull public android.app.DirectAction build();
+ method @NonNull public android.app.DirectAction.Builder setExtras(@Nullable android.os.Bundle);
+ method @NonNull public android.app.DirectAction.Builder setLocusId(@Nullable android.content.LocusId);
+ }
+
public class DownloadManager {
- method public long addCompletedDownload(String, String, boolean, String, String, long, boolean);
- method public long addCompletedDownload(String, String, boolean, String, String, long, boolean, android.net.Uri, android.net.Uri);
+ method @Deprecated public long addCompletedDownload(String, String, boolean, String, String, long, boolean);
+ method @Deprecated public long addCompletedDownload(String, String, boolean, String, String, long, boolean, android.net.Uri, android.net.Uri);
method public long enqueue(android.app.DownloadManager.Request);
method public static Long getMaxBytesOverMobile(android.content.Context);
method public String getMimeTypeForDownloadedFile(long);
@@ -4662,7 +4680,7 @@
public static class DownloadManager.Request {
ctor public DownloadManager.Request(android.net.Uri);
method public android.app.DownloadManager.Request addRequestHeader(String, String);
- method public void allowScanningByMediaScanner();
+ method @Deprecated public void allowScanningByMediaScanner();
method public android.app.DownloadManager.Request setAllowedNetworkTypes(int);
method public android.app.DownloadManager.Request setAllowedOverMetered(boolean);
method public android.app.DownloadManager.Request setAllowedOverRoaming(boolean);
@@ -4676,7 +4694,7 @@
method public android.app.DownloadManager.Request setRequiresDeviceIdle(boolean);
method @Deprecated public android.app.DownloadManager.Request setShowRunningNotification(boolean);
method public android.app.DownloadManager.Request setTitle(CharSequence);
- method public android.app.DownloadManager.Request setVisibleInDownloadsUi(boolean);
+ method @Deprecated public android.app.DownloadManager.Request setVisibleInDownloadsUi(boolean);
field public static final int NETWORK_MOBILE = 1; // 0x1
field public static final int NETWORK_WIFI = 2; // 0x2
field public static final int VISIBILITY_HIDDEN = 2; // 0x2
@@ -5484,8 +5502,6 @@
method @DimenRes public int getDesiredHeightResId();
method @NonNull public android.graphics.drawable.Icon getIcon();
method @NonNull public android.app.PendingIntent getIntent();
- method @Deprecated public boolean getSuppressInitialNotification();
- method @Deprecated public boolean getSuppressNotification();
method public boolean isNotificationSuppressed();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.app.Notification.BubbleMetadata> CREATOR;
@@ -5500,7 +5516,6 @@
method @NonNull public android.app.Notification.BubbleMetadata.Builder setDesiredHeightResId(@DimenRes int);
method @NonNull public android.app.Notification.BubbleMetadata.Builder setIcon(@NonNull android.graphics.drawable.Icon);
method @NonNull public android.app.Notification.BubbleMetadata.Builder setIntent(@NonNull android.app.PendingIntent);
- method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder setSuppressInitialNotification(boolean);
method @NonNull public android.app.Notification.BubbleMetadata.Builder setSuppressNotification(boolean);
}
@@ -6338,9 +6353,13 @@
public final class VoiceInteractor {
method public android.app.VoiceInteractor.Request getActiveRequest(String);
method public android.app.VoiceInteractor.Request[] getActiveRequests();
+ method public boolean isDestroyed();
+ method public void notifyDirectActionsChanged();
+ method public boolean registerOnDestroyedCallback(@NonNull java.util.concurrent.Executor, @NonNull Runnable);
method public boolean submitRequest(android.app.VoiceInteractor.Request);
method public boolean submitRequest(android.app.VoiceInteractor.Request, String);
method public boolean[] supportsCommands(String[]);
+ method public boolean unregisterOnDestroyedCallback(@NonNull Runnable);
}
public static class VoiceInteractor.AbortVoiceRequest extends android.app.VoiceInteractor.Request {
@@ -27245,7 +27264,7 @@
method @Nullable public CharSequence getQueueTitle();
method public int getRatingType();
method @Nullable public android.app.PendingIntent getSessionActivity();
- method @Nullable public android.os.Bundle getSessionInfo();
+ method @NonNull public android.os.Bundle getSessionInfo();
method @NonNull public android.media.session.MediaSession.Token getSessionToken();
method @NonNull public android.media.session.MediaController.TransportControls getTransportControls();
method public void registerCallback(@NonNull android.media.session.MediaController.Callback);
@@ -34407,18 +34426,18 @@
ctor public Environment();
method public static java.io.File getDataDirectory();
method public static java.io.File getDownloadCacheDirectory();
- method public static java.io.File getExternalStorageDirectory();
- method public static java.io.File getExternalStoragePublicDirectory(String);
+ method @Deprecated public static java.io.File getExternalStorageDirectory();
+ method @Deprecated public static java.io.File getExternalStoragePublicDirectory(String);
method public static String getExternalStorageState();
method public static String getExternalStorageState(java.io.File);
method @NonNull public static java.io.File getRootDirectory();
method @Deprecated public static String getStorageState(java.io.File);
method public static boolean isExternalStorageEmulated();
method public static boolean isExternalStorageEmulated(@NonNull java.io.File);
+ method public static boolean isExternalStorageLegacy();
+ method public static boolean isExternalStorageLegacy(@NonNull java.io.File);
method public static boolean isExternalStorageRemovable();
method public static boolean isExternalStorageRemovable(@NonNull java.io.File);
- method public static boolean isExternalStorageSandboxed();
- method public static boolean isExternalStorageSandboxed(@NonNull java.io.File);
field public static String DIRECTORY_ALARMS;
field public static String DIRECTORY_AUDIOBOOKS;
field public static String DIRECTORY_DCIM;
@@ -38801,8 +38820,7 @@
field @Deprecated public static final String LOCATION_MODE = "location_mode";
field @Deprecated public static final int LOCATION_MODE_BATTERY_SAVING = 2; // 0x2
field @Deprecated public static final int LOCATION_MODE_HIGH_ACCURACY = 3; // 0x3
- field @Deprecated public static final int LOCATION_MODE_OFF = 0; // 0x0
- field @Deprecated public static final int LOCATION_MODE_ON = 3; // 0x3
+ field public static final int LOCATION_MODE_OFF = 0; // 0x0
field @Deprecated public static final int LOCATION_MODE_SENSORS_ONLY = 1; // 0x1
field @Deprecated public static final String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
field @Deprecated public static final String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
@@ -41790,9 +41808,11 @@
method public void onCreate();
method public android.view.View onCreateContentView();
method public void onDestroy();
+ method public void onDirectActionsInvalidated(@NonNull android.service.voice.VoiceInteractionSession.ActivityId);
method public boolean[] onGetSupportedCommands(String[]);
- method public void onHandleAssist(@Nullable android.os.Bundle, @Nullable android.app.assist.AssistStructure, @Nullable android.app.assist.AssistContent);
- method public void onHandleAssistSecondary(@Nullable android.os.Bundle, @Nullable android.app.assist.AssistStructure, @Nullable android.app.assist.AssistContent, int, int);
+ method @Deprecated public void onHandleAssist(@Nullable android.os.Bundle, @Nullable android.app.assist.AssistStructure, @Nullable android.app.assist.AssistContent);
+ method public void onHandleAssist(@NonNull android.service.voice.VoiceInteractionSession.AssistState);
+ method @Deprecated public void onHandleAssistSecondary(@Nullable android.os.Bundle, @Nullable android.app.assist.AssistStructure, @Nullable android.app.assist.AssistContent, int, int);
method public void onHandleScreenshot(@Nullable android.graphics.Bitmap);
method public void onHide();
method public boolean onKeyDown(int, android.view.KeyEvent);
@@ -41811,6 +41831,8 @@
method public void onTaskFinished(android.content.Intent, int);
method public void onTaskStarted(android.content.Intent, int);
method public void onTrimMemory(int);
+ method public final void performDirectAction(@NonNull android.app.DirectAction, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.os.Bundle>);
+ method public final void requestDirectActions(@NonNull android.service.voice.VoiceInteractionSession.ActivityId, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.DirectAction>>);
method public void setContentView(android.view.View);
method public void setDisabledShowContext(int);
method public void setKeepAwake(boolean);
@@ -41835,6 +41857,19 @@
method public void sendAbortResult(android.os.Bundle);
}
+ public static class VoiceInteractionSession.ActivityId {
+ }
+
+ public static final class VoiceInteractionSession.AssistState {
+ method @NonNull public android.service.voice.VoiceInteractionSession.ActivityId getActivityId();
+ method @Nullable public android.app.assist.AssistContent getAssistContent();
+ method @Nullable public android.os.Bundle getAssistData();
+ method @Nullable public android.app.assist.AssistStructure getAssistStructure();
+ method @IntRange(from=0) public int getCount();
+ method @IntRange(from=0xffffffff) public int getIndex();
+ method public boolean isFocused();
+ }
+
public static final class VoiceInteractionSession.CommandRequest extends android.service.voice.VoiceInteractionSession.Request {
method public String getCommand();
method public void sendIntermediateResult(android.os.Bundle);
diff --git a/api/system-current.txt b/api/system-current.txt
index 99779de..36680a1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1635,7 +1635,7 @@
method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public java.util.List<android.content.pm.ResolveInfo> queryIntentServicesAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle);
method public abstract void registerDexModule(@NonNull String, @Nullable android.content.pm.PackageManager.DexModuleRegisterCallback);
method @RequiresPermission("android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS") public abstract void removeOnPermissionsChangeListener(@NonNull android.content.pm.PackageManager.OnPermissionsChangedListener);
- method @Deprecated public void replacePreferredActivity(@NonNull android.content.IntentFilter, int, @NonNull java.util.List<android.content.ComponentName>, @NonNull android.content.ComponentName);
+ method public void replacePreferredActivity(@NonNull android.content.IntentFilter, int, @NonNull java.util.List<android.content.ComponentName>, @NonNull android.content.ComponentName);
method @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public abstract void revokeRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);
method public void sendDeviceCustomizationReadyBroadcast();
method @RequiresPermission(allOf={android.Manifest.permission.SET_PREFERRED_APPLICATIONS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public abstract boolean setDefaultBrowserPackageNameAsUser(@Nullable String, int);
@@ -1655,6 +1655,7 @@
field public static final String FEATURE_TELEPHONY_CARRIERLOCK = "android.hardware.telephony.carrierlock";
field public static final int FLAG_PERMISSION_APPLY_RESTRICTION = 16384; // 0x4000
field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20
+ field public static final int FLAG_PERMISSION_GRANTED_BY_ROLE = 32768; // 0x8000
field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4
field public static final int FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT = 2048; // 0x800
field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000
@@ -1714,7 +1715,6 @@
field public static final int MATCH_ANY_USER = 4194304; // 0x400000
field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000
field public static final int MATCH_INSTANT = 8388608; // 0x800000
- field public static boolean RESTRICTED_PERMISSIONS_ENABLED;
field public static final int RESTRICTION_HIDE_FROM_SUGGESTIONS = 1; // 0x1
field public static final int RESTRICTION_HIDE_NOTIFICATIONS = 2; // 0x2
field public static final int RESTRICTION_NONE = 0; // 0x0
@@ -1729,7 +1729,7 @@
method public void onPermissionsChanged(int);
}
- @IntDef(prefix={"FLAG_PERMISSION_"}, value={android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET, android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE, android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface PackageManager.PermissionFlags {
+ @IntDef(prefix={"FLAG_PERMISSION_"}, value={android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET, android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE, android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_ROLE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface PackageManager.PermissionFlags {
}
public class PermissionGroupInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
@@ -3079,16 +3079,15 @@
}
public final class GnssCapabilities {
- method public boolean hasCapability(int);
- field public static final int GEOFENCING = 2; // 0x2
- field public static final int LOW_POWER_MODE = 0; // 0x0
- field public static final int MEASUREMENTS = 3; // 0x3
- field public static final int MEASUREMENT_CORRECTIONS = 5; // 0x5
- field public static final int MEASUREMENT_CORRECTIONS_EXCESS_PATH_LENGTH = 7; // 0x7
- field public static final int MEASUREMENT_CORRECTIONS_LOS_SATS = 6; // 0x6
- field public static final int MEASUREMENT_CORRECTIONS_REFLECTING_PLANE = 8; // 0x8
- field public static final int NAV_MESSAGES = 4; // 0x4
- field public static final int SATELLITE_BLACKLIST = 1; // 0x1
+ method public boolean hasGeofencing();
+ method public boolean hasLowPowerMode();
+ method public boolean hasMeasurementCorrections();
+ method public boolean hasMeasurementCorrectionsExcessPathLength();
+ method public boolean hasMeasurementCorrectionsLosSats();
+ method public boolean hasMeasurementCorrectionsReflectingPane();
+ method public boolean hasMeasurements();
+ method public boolean hasNavMessages();
+ method public boolean hasSatelliteBlacklist();
}
public final class GnssMeasurementCorrections implements android.os.Parcelable {
@@ -3399,7 +3398,7 @@
method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void flushGnssBatch();
method @Nullable public String getExtraLocationControllerPackage();
method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public int getGnssBatchSize();
- method @Nullable public android.location.GnssCapabilities getGnssCapabilities();
+ method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public android.location.GnssCapabilities getGnssCapabilities();
method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void injectGnssMeasurementCorrections(@NonNull android.location.GnssMeasurementCorrections);
method public boolean isExtraLocationControllerPackageEnabled();
method public boolean isLocationEnabledForUser(@NonNull android.os.UserHandle);
@@ -5661,18 +5660,17 @@
public abstract class PermissionControllerService extends android.app.Service {
ctor public PermissionControllerService();
- method public final void attachBaseContext(android.content.Context);
method @NonNull public final android.os.IBinder onBind(android.content.Intent);
- method public abstract int onCountPermissionApps(@NonNull java.util.List<java.lang.String>, int);
- method @NonNull public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(@NonNull String);
- method @NonNull public abstract java.util.List<android.permission.RuntimePermissionUsageInfo> onGetPermissionUsages(boolean, long);
- method public abstract void onGetRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.OutputStream);
- method public abstract void onGrantOrUpgradeDefaultRuntimePermissions();
- method @BinderThread public abstract boolean onRestoreDelayedRuntimePermissionsBackup(@NonNull String, @NonNull android.os.UserHandle);
- method @BinderThread public abstract void onRestoreRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream);
- method public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String);
- method @NonNull public abstract java.util.Map<java.lang.String,java.util.List<java.lang.String>> onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String);
- method public abstract boolean onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int);
+ method @BinderThread public abstract void onCountPermissionApps(@NonNull java.util.List<java.lang.String>, int, @NonNull java.util.function.IntConsumer);
+ method @BinderThread public abstract void onGetAppPermissions(@NonNull String, @NonNull java.util.function.Consumer<java.util.List<android.permission.RuntimePermissionPresentationInfo>>);
+ method @BinderThread public abstract void onGetPermissionUsages(boolean, long, @NonNull java.util.function.Consumer<java.util.List<android.permission.RuntimePermissionUsageInfo>>);
+ method @BinderThread public abstract void onGetRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.OutputStream, @NonNull Runnable);
+ method @BinderThread public abstract void onGrantOrUpgradeDefaultRuntimePermissions(@NonNull Runnable);
+ method @BinderThread public abstract void onRestoreDelayedRuntimePermissionsBackup(@NonNull String, @NonNull android.os.UserHandle, @NonNull java.util.function.Consumer<java.lang.Boolean>);
+ method @BinderThread public abstract void onRestoreRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream, @NonNull Runnable);
+ method @BinderThread public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String, @NonNull Runnable);
+ method @BinderThread public abstract void onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String, @NonNull java.util.function.Consumer<java.util.Map<java.lang.String,java.util.List<java.lang.String>>>);
+ method @BinderThread public abstract void onSetRuntimePermissionGrantStateByDeviceAdmin(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Consumer<java.lang.Boolean>);
field public static final String SERVICE_INTERFACE = "android.permission.PermissionControllerService";
}
@@ -6014,17 +6012,6 @@
method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);
field public static final String APP_STANDBY_ENABLED = "app_standby_enabled";
field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";
- field public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS = "captive_portal_fallback_probe_specs";
- field public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";
- field public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";
- field public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";
- field public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";
- field public static final int CAPTIVE_PORTAL_MODE_AVOID = 2; // 0x2
- field public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0; // 0x0
- field public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1; // 0x1
- field public static final String CAPTIVE_PORTAL_OTHER_FALLBACK_URLS = "captive_portal_other_fallback_urls";
- field public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent";
- field public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";
field public static final String CARRIER_APP_NAMES = "carrier_app_names";
field public static final String CARRIER_APP_WHITELIST = "carrier_app_whitelist";
field public static final String DEFAULT_SM_DP_PLUS = "default_sm_dp_plus";
@@ -6059,6 +6046,7 @@
field public static final String LAST_SETUP_SHOWN = "last_setup_shown";
field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis";
field public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis";
+ field public static final int LOCATION_MODE_ON = 3; // 0x3
field public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE = "location_permissions_upgrade_to_q_mode";
field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications";
field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";
@@ -6852,19 +6840,19 @@
method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent);
method public abstract void onCancelHealthCheck(@NonNull String);
method @NonNull public abstract java.util.List<java.lang.String> onGetRequestedPackages();
- method @NonNull public abstract java.util.List<android.service.watchdog.PackageInfo> onGetSupportedPackages();
+ method @NonNull public abstract java.util.List<android.service.watchdog.ExplicitHealthCheckService.PackageConfig> onGetSupportedPackages();
method public abstract void onRequestHealthCheck(@NonNull String);
field public static final String BIND_PERMISSION = "android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE";
field public static final String SERVICE_INTERFACE = "android.service.watchdog.ExplicitHealthCheckService";
}
- public final class PackageInfo implements android.os.Parcelable {
- ctor public PackageInfo(@NonNull String, long);
+ public static final class ExplicitHealthCheckService.PackageConfig implements android.os.Parcelable {
+ ctor public ExplicitHealthCheckService.PackageConfig(@NonNull String, long);
method public int describeContents();
method public long getHealthCheckTimeoutMillis();
method @NonNull public String getPackageName();
method public void writeToParcel(android.os.Parcel, int);
- field @NonNull public static final android.os.Parcelable.Creator<android.service.watchdog.PackageInfo> CREATOR;
+ field @NonNull public static final android.os.Parcelable.Creator<android.service.watchdog.ExplicitHealthCheckService.PackageConfig> CREATOR;
}
}
diff --git a/api/test-current.txt b/api/test-current.txt
index 63c8df0..aacf2c1 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -117,6 +117,7 @@
method public void startActivity(@NonNull android.content.Intent);
method public void startActivity(@NonNull android.content.Intent, android.os.UserHandle);
method public void startActivity(@NonNull android.app.PendingIntent);
+ method public void startActivity(@NonNull android.app.PendingIntent, @NonNull android.app.ActivityOptions);
}
public abstract static class ActivityView.StateCallback {
@@ -369,6 +370,7 @@
method public android.os.ParcelFileDescriptor[] executeShellCommandRw(String);
method @Deprecated public boolean grantRuntimePermission(String, String, android.os.UserHandle);
method @Deprecated public boolean revokeRuntimePermission(String, String, android.os.UserHandle);
+ method public void syncInputTransactions();
}
public class UiModeManager {
@@ -710,6 +712,7 @@
field public static final String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage";
field public static final String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption";
field public static final int FLAG_PERMISSION_APPLY_RESTRICTION = 16384; // 0x4000
+ field public static final int FLAG_PERMISSION_GRANTED_BY_ROLE = 32768; // 0x8000
field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4
field public static final int FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT = 2048; // 0x800
field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000
@@ -2265,17 +2268,6 @@
field public static final String AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "autofill_compat_mode_allowed_packages";
field public static final String AUTOMATIC_POWER_SAVE_MODE = "automatic_power_save_mode";
field public static final String BATTERY_SAVER_CONSTANTS = "battery_saver_constants";
- field public static final String CAPTIVE_PORTAL_FALLBACK_PROBE_SPECS = "captive_portal_fallback_probe_specs";
- field public static final String CAPTIVE_PORTAL_FALLBACK_URL = "captive_portal_fallback_url";
- field public static final String CAPTIVE_PORTAL_HTTPS_URL = "captive_portal_https_url";
- field public static final String CAPTIVE_PORTAL_HTTP_URL = "captive_portal_http_url";
- field public static final String CAPTIVE_PORTAL_MODE = "captive_portal_mode";
- field public static final int CAPTIVE_PORTAL_MODE_AVOID = 2; // 0x2
- field public static final int CAPTIVE_PORTAL_MODE_IGNORE = 0; // 0x0
- field public static final int CAPTIVE_PORTAL_MODE_PROMPT = 1; // 0x1
- field public static final String CAPTIVE_PORTAL_OTHER_FALLBACK_URLS = "captive_portal_other_fallback_urls";
- field public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent";
- field public static final String CAPTIVE_PORTAL_USE_HTTPS = "captive_portal_use_https";
field public static final String DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD = "dynamic_power_savings_disable_threshold";
field public static final String DYNAMIC_POWER_SAVINGS_ENABLED = "dynamic_power_savings_enabled";
field public static final String HIDDEN_API_BLACKLIST_EXEMPTIONS = "hidden_api_blacklist_exemptions";
@@ -3213,6 +3205,7 @@
method public default void setShouldShowIme(int, boolean);
method public default void setShouldShowSystemDecors(int, boolean);
method public default void setShouldShowWithInsecureKeyguard(int, boolean);
+ method public default boolean shouldShowIme(int);
method public default boolean shouldShowSystemDecors(int);
}
diff --git a/cmds/am/proto/instrumentation_data.proto b/cmds/am/proto/instrumentation_data.proto
index 8e29f96..23e9519 100644
--- a/cmds/am/proto/instrumentation_data.proto
+++ b/cmds/am/proto/instrumentation_data.proto
@@ -38,6 +38,7 @@
message TestStatus {
optional sint32 result_code = 3;
optional ResultsBundle results = 4;
+ optional string logcat = 5;
}
enum SessionStatusCode {
diff --git a/cmds/am/src/com/android/commands/am/Instrument.java b/cmds/am/src/com/android/commands/am/Instrument.java
index 70baa87..4d7b5a7 100644
--- a/cmds/am/src/com/android/commands/am/Instrument.java
+++ b/cmds/am/src/com/android/commands/am/Instrument.java
@@ -38,6 +38,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -62,8 +63,15 @@
* other: Failure
*/
public class Instrument {
+ private static final String TAG = "am";
+
public static final String DEFAULT_LOG_DIR = "instrument-logs";
+ private static final int STATUS_TEST_PASSED = 0;
+ private static final int STATUS_TEST_STARTED = 1;
+ private static final int STATUS_TEST_FAILED_ASSERTION = -1;
+ private static final int STATUS_TEST_FAILED_OTHER = -2;
+
private final IActivityManager mAm;
private final IPackageManager mPm;
private final IWindowManager mWm;
@@ -207,6 +215,8 @@
private File mLog;
+ private long mTestStartMs;
+
ProtoStatusReporter() {
if (protoFile) {
if (logPath == null) {
@@ -241,10 +251,22 @@
Bundle results) {
final ProtoOutputStream proto = new ProtoOutputStream();
- final long token = proto.start(InstrumentationData.Session.TEST_STATUS);
+ final long testStatusToken = proto.start(InstrumentationData.Session.TEST_STATUS);
+
proto.write(InstrumentationData.TestStatus.RESULT_CODE, resultCode);
writeBundle(proto, InstrumentationData.TestStatus.RESULTS, results);
- proto.end(token);
+
+ if (resultCode == STATUS_TEST_STARTED) {
+ // Logcat -T takes wall clock time (!?)
+ mTestStartMs = System.currentTimeMillis();
+ } else {
+ if (mTestStartMs > 0) {
+ proto.write(InstrumentationData.TestStatus.LOGCAT, readLogcat(mTestStartMs));
+ }
+ mTestStartMs = 0;
+ }
+
+ proto.end(testStatusToken);
outputProto(proto);
}
@@ -254,12 +276,12 @@
Bundle results) {
final ProtoOutputStream proto = new ProtoOutputStream();
- final long token = proto.start(InstrumentationData.Session.SESSION_STATUS);
+ final long sessionStatusToken = proto.start(InstrumentationData.Session.SESSION_STATUS);
proto.write(InstrumentationData.SessionStatus.STATUS_CODE,
InstrumentationData.SESSION_FINISHED);
proto.write(InstrumentationData.SessionStatus.RESULT_CODE, resultCode);
writeBundle(proto, InstrumentationData.SessionStatus.RESULTS, results);
- proto.end(token);
+ proto.end(sessionStatusToken);
outputProto(proto);
}
@@ -268,11 +290,11 @@
public void onError(String errorText, boolean commandError) {
final ProtoOutputStream proto = new ProtoOutputStream();
- final long token = proto.start(InstrumentationData.Session.SESSION_STATUS);
+ final long sessionStatusToken = proto.start(InstrumentationData.Session.SESSION_STATUS);
proto.write(InstrumentationData.SessionStatus.STATUS_CODE,
InstrumentationData.SESSION_ABORTED);
proto.write(InstrumentationData.SessionStatus.ERROR_TEXT, errorText);
- proto.end(token);
+ proto.end(sessionStatusToken);
outputProto(proto);
}
@@ -514,5 +536,43 @@
}
}
}
+
+ private static String readLogcat(long startTimeMs) {
+ try {
+ // Figure out the timestamp arg for logcat.
+ final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+ final String timestamp = format.format(new Date(startTimeMs));
+
+ // Start the process
+ final Process process = new ProcessBuilder()
+ .command("logcat", "-d", "-v threadtime,uid", "-T", timestamp)
+ .start();
+
+ // Nothing to write. Don't let the command accidentally block.
+ process.getOutputStream().close();
+
+ // Read the output
+ final StringBuilder str = new StringBuilder();
+ final InputStreamReader reader = new InputStreamReader(process.getInputStream());
+ char[] buffer = new char[4096];
+ int amt;
+ while ((amt = reader.read(buffer, 0, buffer.length)) >= 0) {
+ if (amt > 0) {
+ str.append(buffer, 0, amt);
+ }
+ }
+
+ try {
+ process.waitFor();
+ } catch (InterruptedException ex) {
+ // We already have the text, drop the exception.
+ }
+
+ return str.toString();
+
+ } catch (IOException ex) {
+ return "Error reading logcat command:\n" + ex.toString();
+ }
+ }
}
diff --git a/cmds/idmap2/idmap2/Scan.cpp b/cmds/idmap2/idmap2/Scan.cpp
index fa9a77a..83c034b 100644
--- a/cmds/idmap2/idmap2/Scan.cpp
+++ b/cmds/idmap2/idmap2/Scan.cpp
@@ -39,6 +39,8 @@
using android::idmap2::CommandLineOptions;
using android::idmap2::Error;
using android::idmap2::Idmap;
+using android::idmap2::kPolicyOdm;
+using android::idmap2::kPolicyOem;
using android::idmap2::kPolicyProduct;
using android::idmap2::kPolicyPublic;
using android::idmap2::kPolicySystem;
@@ -93,6 +95,8 @@
std::vector<std::string> PoliciesForPath(const std::string& apk_path) {
static const std::vector<std::pair<std::string, std::string>> values = {
+ {"/odm/", kPolicyOdm},
+ {"/oem/", kPolicyOem},
{"/product/", kPolicyProduct},
{"/system/", kPolicySystem},
{"/vendor/", kPolicyVendor},
diff --git a/cmds/incident/main.cpp b/cmds/incident/main.cpp
index 93e592c..eca781f 100644
--- a/cmds/incident/main.cpp
+++ b/cmds/incident/main.cpp
@@ -263,6 +263,9 @@
return 1;
}
}
+ if (destination == DEST_UNSET) {
+ destination = DEST_STDOUT;
+ }
string pkg;
string cls;
diff --git a/cmds/incidentd/Android.bp b/cmds/incidentd/Android.bp
index 8f9a5f8..534a38f 100644
--- a/cmds/incidentd/Android.bp
+++ b/cmds/incidentd/Android.bp
@@ -31,6 +31,7 @@
"-Wno-missing-field-initializers",
"-Wno-unused-variable",
"-Wunused-parameter",
+ "-Wno-tautological-undefined-compare",
// Allow implicit fallthrough in IncidentService.cpp:85 until it is fixed.
"-Wno-error=implicit-fallthrough",
@@ -59,6 +60,12 @@
"libservices",
"libutils",
"libprotobuf-cpp-lite",
+ "libcrypto",
+ "libkeystore_aidl",
+ "libkeystore_binder",
+ "libkeystore_parcelables",
+ "android.hardware.keymaster@4.0",
+ "libkeymaster4support",
],
static_libs: [
@@ -90,6 +97,7 @@
"-Wno-unused-variable",
"-Wunused-parameter",
"-g",
+ "-Wno-tautological-undefined-compare",
// Allow implicit fallthrough in IncidentService.cpp:85 until it is fixed.
"-Wno-error=implicit-fallthrough",
@@ -111,6 +119,8 @@
"src/incidentd_util.cpp",
"src/proto_util.cpp",
"src/report_directory.cpp",
+ "src/cipher/IncidentKeyStore.cpp",
+ "src/cipher/ProtoEncryption.cpp",
"src/**/*.proto",
],
@@ -132,6 +142,12 @@
"libprotoutil",
"libservices",
"libutils",
+ "libcrypto",
+ "libkeystore_aidl",
+ "libkeystore_binder",
+ "libkeystore_parcelables",
+ "android.hardware.keymaster@4.0",
+ "libkeymaster4support",
],
target: {
diff --git a/cmds/incidentd/OWNERS b/cmds/incidentd/OWNERS
index cede4ea..bcdcfc3 100644
--- a/cmds/incidentd/OWNERS
+++ b/cmds/incidentd/OWNERS
@@ -1,3 +1,4 @@
joeo@google.com
-kwekua@google.com
+yaochen@google.com
yanmin@google.com
+zhouwenjie@google.com
diff --git a/cmds/incidentd/src/IncidentService.cpp b/cmds/incidentd/src/IncidentService.cpp
index b4021d1b..71b89a2 100644
--- a/cmds/incidentd/src/IncidentService.cpp
+++ b/cmds/incidentd/src/IncidentService.cpp
@@ -174,12 +174,11 @@
}
void ReportHandler::take_report() {
- // Cycle the batch
+ // Cycle the batch and throttle.
sp<ReportBatch> batch;
{
unique_lock<mutex> lock(mLock);
- batch = mBatch;
- mBatch = new ReportBatch();
+ batch = mThrottler->filterBatch(mBatch);
}
if (batch->empty()) {
@@ -189,13 +188,6 @@
sp<Reporter> reporter = new Reporter(mWorkDirectory, batch);
- // TODO: Do we really want to clear the reports if we throttle? Should we only throttle
- // requests going to dropbox? How do we reconcile throttling with testing?
- if (mThrottler->shouldThrottle()) {
- ALOGW("RunReport got throttled.");
- return;
- }
-
// Take the report, which might take a while. More requests might queue
// up while we're doing this, and we'll handle them in their next batch.
// TODO: We should further rate-limit the reports to no more than N per time-period.
@@ -203,7 +195,13 @@
size_t reportByteSize = 0;
reporter->runReport(&reportByteSize);
- mThrottler->addReportSize(reportByteSize);
+ // Tell the throttler how big it was, for the next throttling.
+ // TODO: This still isn't ideal. The throttler really should just track the
+ // persisted reqeusts, but changing Reporter::runReport() to track that individually
+ // will be a big change.
+ if (batch->hasPersistedReports()) {
+ mThrottler->addReportSize(reportByteSize);
+ }
// Kick off the next steps, one of which is to send any new or otherwise remaining
// approvals, and one of which is to send any new or remaining broadcasts.
@@ -247,11 +245,11 @@
IncidentService::~IncidentService() {}
Status IncidentService::reportIncident(const IncidentReportArgs& args) {
- // TODO: Validate that the privacy policy is one of the real ones.
- // If it isn't, clamp it to the next more restrictive real one.
+ IncidentReportArgs argsCopy(args);
- // TODO: This function should reject the LOCAL privacy policy.
- // Those have to stream.
+ // Validate that the privacy policy is one of the real ones.
+ // If it isn't, clamp it to the next more restrictive real one.
+ argsCopy.setPrivacyPolicy(cleanup_privacy_policy(args.getPrivacyPolicy()));
// TODO: Check that the broadcast recevier has the proper permissions
// TODO: Maybe we should consider relaxing the permissions if it's going to
@@ -261,8 +259,15 @@
return status;
}
+ // If they asked for the LOCAL privacy policy, give them EXPLICT. LOCAL has to
+ // be streamed. (This only applies to shell/root, because everyone else would have
+ // been rejected by checkIncidentPermissions()).
+ if (argsCopy.getPrivacyPolicy() < PRIVACY_POLICY_EXPLICIT) {
+ ALOGI("Demoting privacy policy to EXPLICT for persisted report.");
+ argsCopy.setPrivacyPolicy(PRIVACY_POLICY_EXPLICIT);
+ }
+
// If they didn't specify a component, use dropbox.
- IncidentReportArgs argsCopy(args);
if (argsCopy.receiverPkg().length() == 0 && argsCopy.receiverCls().length() == 0) {
argsCopy.setReceiverPkg(DROPBOX_SENTINEL.getPackageName());
argsCopy.setReceiverCls(DROPBOX_SENTINEL.getClassName());
@@ -276,22 +281,21 @@
Status IncidentService::reportIncidentToStream(const IncidentReportArgs& args,
const sp<IIncidentReportStatusListener>& listener,
const unique_fd& stream) {
- // TODO: Validate that the privacy policy is one of the real ones.
- // If it isn't, clamp it to the next more restrictive real one.
-
- // TODO: Only shell should be able to do a LOCAL privacy policy report.
+ IncidentReportArgs argsCopy(args);
// Streaming reports can not also be broadcast.
- IncidentReportArgs argsCopy(args);
argsCopy.setReceiverPkg("");
argsCopy.setReceiverCls("");
+ // Validate that the privacy policy is one of the real ones.
+ // If it isn't, clamp it to the next more restrictive real one.
+ argsCopy.setPrivacyPolicy(cleanup_privacy_policy(args.getPrivacyPolicy()));
+
Status status = checkIncidentPermissions(argsCopy);
if (!status.isOk()) {
return status;
}
-
// The ReportRequest takes ownership of the fd, so we need to dup it.
int fd = dup(stream.get());
if (fd < 0) {
diff --git a/cmds/incidentd/src/Privacy.cpp b/cmds/incidentd/src/Privacy.cpp
index 386303b..0cc358f 100644
--- a/cmds/incidentd/src/Privacy.cpp
+++ b/cmds/incidentd/src/Privacy.cpp
@@ -18,15 +18,30 @@
#include <android/os/IncidentReportArgs.h>
#include <stdlib.h>
+#include <strstream>
+
namespace android {
namespace os {
namespace incidentd {
using namespace android::os;
+using std::strstream;
+
+static const bool kEncryptionEnabled = false;
uint64_t encode_field_id(const Privacy* p) { return (uint64_t)p->type << 32 | p->field_id; }
+string Privacy::toString() const {
+ if (this == NULL) {
+ return "Privacy{null}";
+ }
+ strstream os;
+ os << "Privacy{field_id=" << field_id << " type=" << ((int)type)
+ << " children=" << ((void*)children) << " policy=" << ((int)policy) << "}";
+ return os.str();
+}
+
const Privacy* lookup(const Privacy* p, uint32_t fieldId) {
if (p->children == NULL) return NULL;
for (int i = 0; p->children[i] != NULL; i++) { // NULL-terminated.
@@ -37,6 +52,10 @@
return NULL;
}
+bool sectionEncryption(int section_id) {
+ return kEncryptionEnabled ? (section_id == 3025) /*restricted image section*/ : false;
+}
+
static bool isAllowed(const uint8_t policy, const uint8_t check) {
switch (check) {
case PRIVACY_POLICY_LOCAL:
@@ -81,6 +100,16 @@
return mPolicy == android::os::PRIVACY_POLICY_LOCAL;
}
+uint8_t cleanup_privacy_policy(uint8_t policy) {
+ if (policy >= PRIVACY_POLICY_AUTOMATIC) {
+ return PRIVACY_POLICY_AUTOMATIC;
+ }
+ if (policy >= PRIVACY_POLICY_EXPLICIT) {
+ return PRIVACY_POLICY_EXPLICIT;
+ }
+ return PRIVACY_POLICY_LOCAL;
+}
+
} // namespace incidentd
} // namespace os
} // namespace android
diff --git a/cmds/incidentd/src/Privacy.h b/cmds/incidentd/src/Privacy.h
index fc8caae..9cde748 100644
--- a/cmds/incidentd/src/Privacy.h
+++ b/cmds/incidentd/src/Privacy.h
@@ -50,8 +50,11 @@
// DESTINATION Enum in frameworks/base/core/proto/android/privacy.proto.
uint8_t policy;
+
// A list of regexp rules for stripping string fields in proto.
const char** patterns;
+
+ string toString() const;
};
// Encode field id used by ProtoOutputStream.
@@ -87,6 +90,14 @@
uint8_t mPolicy;
};
+// TODO: Add privacy flag in incident.proto and auto generate it inside Privacy.
+bool sectionEncryption(int section_id);
+
+/**
+ * If a privacy policy is other than the defined values, update it to a real one.
+ */
+uint8_t cleanup_privacy_policy(uint8_t policy);
+
} // namespace incidentd
} // namespace os
} // namespace android
diff --git a/cmds/incidentd/src/PrivacyFilter.cpp b/cmds/incidentd/src/PrivacyFilter.cpp
index 7126322..ca6fb37 100644
--- a/cmds/incidentd/src/PrivacyFilter.cpp
+++ b/cmds/incidentd/src/PrivacyFilter.cpp
@@ -16,15 +16,20 @@
#define DEBUG false
#include "Log.h"
-#include "incidentd_util.h"
#include "PrivacyFilter.h"
+
+#include "incidentd_util.h"
#include "proto_util.h"
+#include "Section.h"
#include <android-base/file.h>
-#include <android/util/protobuf.h>
#include <android/util/ProtoFileReader.h>
+#include <android/util/protobuf.h>
#include <log/log.h>
+#include "cipher/IncidentKeyStore.h"
+#include "cipher/ProtoEncryption.h"
+
namespace android {
namespace os {
namespace incidentd {
@@ -141,6 +146,8 @@
*/
status_t writeData(int fd);
+ sp<ProtoReader> getData() { return mData; }
+
private:
/**
* The global set of field --> required privacy level mapping.
@@ -185,7 +192,7 @@
ProtoOutputStream proto;
// Optimization when no strip happens.
- if (mRestrictions == NULL || mRestrictions->children == NULL || spec.RequireAll()) {
+ if (mRestrictions == NULL || spec.RequireAll()) {
if (spec.CheckPremission(mRestrictions)) {
mSize = mData->size();
}
@@ -215,6 +222,11 @@
status_t FieldStripper::writeData(int fd) {
status_t err = NO_ERROR;
sp<ProtoReader> reader = mData;
+ if (mData == nullptr) {
+ // There had been an error processing the data. We won't write anything,
+ // but we also won't return an error, because errors are fatal.
+ return NO_ERROR;
+ }
while (reader->readBuffer() != NULL) {
err = WriteFully(fd, reader->readBuffer(), reader->currentToRead()) ? NO_ERROR : -errno;
reader->move(reader->currentToRead());
@@ -247,8 +259,47 @@
mOutputs.push_back(output);
}
-status_t PrivacyFilter::writeData(const FdBuffer& buffer, uint8_t bufferLevel,
- size_t* maxSize) {
+static void write_section_to_file(int sectionId, FieldStripper& fieldStripper, sp<FilterFd> output,
+ bool encryptIfNeeded) {
+ status_t err;
+
+ if (sectionEncryption(sectionId) && encryptIfNeeded) {
+ ProtoEncryptor encryptor(fieldStripper.getData());
+ size_t encryptedSize = encryptor.encrypt();
+
+ if (encryptedSize <= 0) {
+ output->onWriteError(BAD_VALUE);
+ return;
+ }
+ err = write_section_header(output->getFd(), sectionId, encryptedSize);
+ VLOG("Encrypted: write section header size %lu", (unsigned long)encryptedSize);
+
+ encryptor.flush(output->getFd());
+
+ if (err != NO_ERROR) {
+ output->onWriteError(err);
+ return;
+ }
+ } else {
+ err = write_section_header(output->getFd(), sectionId, fieldStripper.dataSize());
+ VLOG("No encryption: write section header size %lu",
+ (unsigned long)fieldStripper.dataSize());
+
+ if (err != NO_ERROR) {
+ output->onWriteError(err);
+ return;
+ }
+
+ err = fieldStripper.writeData(output->getFd());
+ if (err != NO_ERROR) {
+ output->onWriteError(err);
+ return;
+ }
+ }
+}
+
+status_t PrivacyFilter::writeData(const FdBuffer& buffer, uint8_t bufferLevel, size_t* maxSize,
+ bool encryptIfNeeded) {
status_t err;
if (maxSize != NULL) {
@@ -258,9 +309,9 @@
// Order the writes by privacy filter, with increasing levels of filtration,k
// so we can do the filter once, and then write many times.
sort(mOutputs.begin(), mOutputs.end(),
- [](const sp<FilterFd>& a, const sp<FilterFd>& b) -> bool {
- return a->getPrivacyPolicy() < b->getPrivacyPolicy();
- });
+ [](const sp<FilterFd>& a, const sp<FilterFd>& b) -> bool {
+ return a->getPrivacyPolicy() < b->getPrivacyPolicy();
+ });
uint8_t privacyPolicy = PRIVACY_POLICY_LOCAL; // a.k.a. no filtering
FieldStripper fieldStripper(mRestrictions, buffer.data()->read(), bufferLevel);
@@ -272,24 +323,14 @@
if (err != NO_ERROR) {
// We can't successfully strip this data. We will skip
// the rest of this section.
- return err;
+ return NO_ERROR;
}
}
// Write the resultant buffer to the fd, along with the header.
ssize_t dataSize = fieldStripper.dataSize();
if (dataSize > 0) {
- err = write_section_header(output->getFd(), mSectionId, dataSize);
- if (err != NO_ERROR) {
- output->onWriteError(err);
- continue;
- }
-
- err = fieldStripper.writeData(output->getFd());
- if (err != NO_ERROR) {
- output->onWriteError(err);
- continue;
- }
+ write_section_to_file(mSectionId, fieldStripper, output, encryptIfNeeded);
}
if (maxSize != NULL) {
@@ -333,15 +374,26 @@
uint64_t fieldTag = reader->readRawVarint();
uint32_t fieldId = read_field_id(fieldTag);
uint8_t wireType = read_wire_type(fieldTag);
- if (wireType == WIRE_TYPE_LENGTH_DELIMITED && args.containsSection(fieldId)) {
+ if (wireType == WIRE_TYPE_LENGTH_DELIMITED
+ && args.containsSection(fieldId, section_requires_specific_mention(fieldId))) {
// We need this field, but we need to strip it to the level provided in args.
PrivacyFilter filter(fieldId, get_privacy_of_section(fieldId));
filter.addFd(new ReadbackFilterFd(args.getPrivacyPolicy(), to));
// Read this section from the reader into an FdBuffer
size_t sectionSize = reader->readRawVarint();
+
FdBuffer sectionData;
- err = sectionData.write(reader, sectionSize);
+
+ // Write data to FdBuffer, if the section was encrypted, decrypt first.
+ if (sectionEncryption(fieldId)) {
+ VLOG("sectionSize %lu", (unsigned long)sectionSize);
+ ProtoDecryptor decryptor(reader, sectionSize);
+ err = decryptor.decryptAndFlush(§ionData);
+ } else {
+ err = sectionData.write(reader, sectionSize);
+ }
+
if (err != NO_ERROR) {
ALOGW("filter_and_write_report FdBuffer.write failed (this shouldn't happen): %s",
strerror(-err));
@@ -349,7 +401,8 @@
}
// Do the filter and write.
- err = filter.writeData(sectionData, bufferLevel, nullptr);
+ err = filter.writeData(sectionData, bufferLevel, nullptr,
+ false /* do not encrypt again*/);
if (err != NO_ERROR) {
ALOGW("filter_and_write_report filter.writeData had an error: %s", strerror(-err));
return err;
@@ -358,6 +411,7 @@
// We don't need this field. Incident does not have any direct children
// other than sections. So just skip them.
write_field_or_skip(NULL, reader, fieldTag, true);
+ VLOG("Skip this.... section %d", fieldId);
}
}
diff --git a/cmds/incidentd/src/PrivacyFilter.h b/cmds/incidentd/src/PrivacyFilter.h
index 76b2849..d426db9 100644
--- a/cmds/incidentd/src/PrivacyFilter.h
+++ b/cmds/incidentd/src/PrivacyFilter.h
@@ -82,8 +82,14 @@
* was written (i.e. after filtering).
*
* The buffer is assumed to have already been filtered to bufferLevel.
+ *
+ * This function can be called when persisting data to disk or when sending
+ * data to client. In the former case, we need to encrypt the data when that
+ * section requires encryption. In the latter case, we shouldn't send the
+ * unencrypted data to client.
*/
- status_t writeData(const FdBuffer& buffer, uint8_t bufferLevel, size_t* maxSize);
+ status_t writeData(const FdBuffer& buffer, uint8_t bufferLevel, size_t* maxSize,
+ bool encryptIfNeeded);
private:
int mSectionId;
diff --git a/cmds/incidentd/src/Reporter.cpp b/cmds/incidentd/src/Reporter.cpp
index 218c1b2..dc4065b 100644
--- a/cmds/incidentd/src/Reporter.cpp
+++ b/cmds/incidentd/src/Reporter.cpp
@@ -66,22 +66,18 @@
}
}
-void poo_make_metadata(IncidentMetadata* result, const IncidentMetadata& full,
- int64_t reportId, int32_t privacyPolicy, const IncidentReportArgs& args) {
- result->set_report_id(reportId);
- result->set_dest(privacy_policy_to_dest(privacyPolicy));
- size_t sectionCount = full.sections_size();
- for (int sectionIndex = 0; sectionIndex < sectionCount; sectionIndex++) {
- const IncidentMetadata::SectionStats& sectionStats = full.sections(sectionIndex);
- if (args.containsSection(sectionStats.id())) {
- *result->add_sections() = sectionStats;
- }
- }
+static bool contains_section(const IncidentReportArgs& args, int sectionId) {
+ return args.containsSection(sectionId, section_requires_specific_mention(sectionId));
+}
+
+static bool contains_section(const sp<ReportRequest>& args, int sectionId) {
+ return args->containsSection(sectionId);
}
// ARGS must have a containsSection(int) method
-template <typename ARGS> void make_metadata(IncidentMetadata* result, const IncidentMetadata& full,
+template <typename ARGS>
+void make_metadata(IncidentMetadata* result, const IncidentMetadata& full,
int64_t reportId, int32_t privacyPolicy, ARGS args) {
result->set_report_id(reportId);
result->set_dest(privacy_policy_to_dest(privacyPolicy));
@@ -89,7 +85,7 @@
size_t sectionCount = full.sections_size();
for (int sectionIndex = 0; sectionIndex < sectionCount; sectionIndex++) {
const IncidentMetadata::SectionStats& sectionStats = full.sections(sectionIndex);
- if (args->containsSection(sectionStats.id())) {
+ if (contains_section(args, sectionStats.id())) {
*result->add_sections() = sectionStats;
}
}
@@ -160,6 +156,10 @@
return mFd >= 0 && mStatus == NO_ERROR;
}
+bool ReportRequest::containsSection(int sectionId) const {
+ return args.containsSection(sectionId, section_requires_specific_mention(sectionId));
+}
+
void ReportRequest::closeFd() {
if (mIsStreaming && mFd >= 0) {
close(mFd);
@@ -286,6 +286,22 @@
mPersistedRequests.clear();
}
+void ReportBatch::transferStreamingRequests(const sp<ReportBatch>& that) {
+ for (vector<sp<ReportRequest>>::iterator request = mStreamingRequests.begin();
+ request != mStreamingRequests.end(); request++) {
+ that->mStreamingRequests.push_back(*request);
+ }
+ mStreamingRequests.clear();
+}
+
+void ReportBatch::transferPersistedRequests(const sp<ReportBatch>& that) {
+ for (map<ComponentName, sp<ReportRequest>>::iterator it = mPersistedRequests.begin();
+ it != mPersistedRequests.end(); it++) {
+ that->mPersistedRequests[it->first] = it->second;
+ }
+ mPersistedRequests.clear();
+}
+
void ReportBatch::getFailedRequests(vector<sp<ReportRequest>>* requests) {
for (map<ComponentName, sp<ReportRequest>>::iterator it = mPersistedRequests.begin();
it != mPersistedRequests.end(); it++) {
@@ -441,13 +457,16 @@
// Add the fds for the streamed requests
mBatch->forEachStreamingRequest([&filter, this](const sp<ReportRequest>& request) {
- if (request->ok() && request->args.containsSection(mCurrentSectionId)) {
+ if (request->ok()
+ && request->args.containsSection(mCurrentSectionId,
+ section_requires_specific_mention(mCurrentSectionId))) {
filter.addFd(new StreamingFilterFd(request->args.getPrivacyPolicy(),
request->getFd(), request));
}
});
- return filter.writeData(buffer, PRIVACY_POLICY_LOCAL, &mMaxSectionDataFilteredSize);
+ return filter.writeData(buffer, PRIVACY_POLICY_LOCAL, &mMaxSectionDataFilteredSize,
+ true /*encrypt if needed*/);
}
@@ -618,7 +637,7 @@
mBatch->getCombinedPersistedArgs(&combinedArgs);
IncidentMetadata persistedMetadata;
make_metadata(&persistedMetadata, metadata, mPersistedFile->getTimestampNs(),
- persistedPrivacyPolicy, &combinedArgs);
+ persistedPrivacyPolicy, combinedArgs);
mPersistedFile->setMetadata(persistedMetadata);
mPersistedFile->markCompleted();
diff --git a/cmds/incidentd/src/Reporter.h b/cmds/incidentd/src/Reporter.h
index e7a474f..fb3961a 100644
--- a/cmds/incidentd/src/Reporter.h
+++ b/cmds/incidentd/src/Reporter.h
@@ -16,7 +16,6 @@
#pragma once
#include "FdBuffer.h"
-#include "Throttler.h"
#include "WorkDirectory.h"
#include "frameworks/base/core/proto/android/os/metadata.pb.h"
@@ -58,7 +57,7 @@
bool ok(); // returns true if the request is ok for write.
- bool containsSection(int sectionId) const { return args.containsSection(sectionId); }
+ bool containsSection(int sectionId) const;
sp<IIncidentReportStatusListener> getListener() { return mListener; }
@@ -155,6 +154,18 @@
void clearPersistedRequests();
/**
+ * Move the streaming requests in this batch to that batch. After this call there
+ * will be no streaming requests in this batch.
+ */
+ void transferStreamingRequests(const sp<ReportBatch>& that);
+
+ /**
+ * Move the persisted requests in this batch to that batch. After this call there
+ * will be no streaming requests in this batch.
+ */
+ void transferPersistedRequests(const sp<ReportBatch>& that);
+
+ /**
* Get the requests that have encountered errors.
*/
void getFailedRequests(vector<sp<ReportRequest>>* requests);
diff --git a/cmds/incidentd/src/Section.cpp b/cmds/incidentd/src/Section.cpp
index 935a7c4..85c5a20 100644
--- a/cmds/incidentd/src/Section.cpp
+++ b/cmds/incidentd/src/Section.cpp
@@ -63,6 +63,15 @@
return fork_execute_cmd(const_cast<char**>(ihArgs), p2cPipe, c2pPipe);
}
+bool section_requires_specific_mention(int sectionId) {
+ switch (sectionId) {
+ case 3025: // restricted_images
+ return true;
+ default:
+ return false;
+ }
+}
+
// ================================================================================
Section::Section(int i, int64_t timeoutMs)
: id(i),
diff --git a/cmds/incidentd/src/Section.h b/cmds/incidentd/src/Section.h
index cfe7e16..c9b8056 100644
--- a/cmds/incidentd/src/Section.h
+++ b/cmds/incidentd/src/Section.h
@@ -171,6 +171,13 @@
std::string mType;
};
+
+/**
+ * These sections will not be generated when doing an 'all' report, either
+ * for size, speed of collection, or privacy.
+ */
+bool section_requires_specific_mention(int sectionId);
+
} // namespace incidentd
} // namespace os
} // namespace android
diff --git a/cmds/incidentd/src/Throttler.cpp b/cmds/incidentd/src/Throttler.cpp
index 11136ec..5f90ab3 100644
--- a/cmds/incidentd/src/Throttler.cpp
+++ b/cmds/incidentd/src/Throttler.cpp
@@ -33,6 +33,21 @@
Throttler::~Throttler() {}
+sp<ReportBatch> Throttler::filterBatch(const sp<ReportBatch>& queued) {
+ sp<ReportBatch> result = new ReportBatch();
+
+ // We will never throttle the streaming ones.
+ queued->transferStreamingRequests(result);
+
+ // If the persisted ones aren't to be throttled, then add them to the
+ // batch we're going to do.
+ if (!shouldThrottle()) {
+ queued->transferPersistedRequests(result);
+ }
+
+ return result;
+}
+
bool Throttler::shouldThrottle() {
int64_t now = android::elapsedRealtime();
if (now > mRefractoryPeriodMs + mLastRefractoryMs) {
@@ -56,4 +71,4 @@
} // namespace incidentd
} // namespace os
-} // namespace android
\ No newline at end of file
+} // namespace android
diff --git a/cmds/incidentd/src/Throttler.h b/cmds/incidentd/src/Throttler.h
index e8f317d7..46a1472 100644
--- a/cmds/incidentd/src/Throttler.h
+++ b/cmds/incidentd/src/Throttler.h
@@ -14,16 +14,19 @@
* limitations under the License.
*/
-#ifndef THROTTLER_H
-#define THROTTLER_H
+#pragma once
+
+#include "Reporter.h"
#include <utils/RefBase.h>
+#include <vector>
#include <unistd.h>
namespace android {
namespace os {
namespace incidentd {
+
/**
* This is a size-based throttler which prevents incidentd to take more data.
*/
@@ -33,8 +36,11 @@
~Throttler();
/**
- * Asserts this before starting taking report.
+ * Return a batch containing reports, if any that should be executed.
+ * Those will be removed from 'queued'.
*/
+ sp<ReportBatch> filterBatch(const sp<ReportBatch>& queued);
+
bool shouldThrottle();
void addReportSize(size_t reportByteSize);
@@ -52,5 +58,3 @@
} // namespace incidentd
} // namespace os
} // namespace android
-
-#endif // THROTTLER_H
diff --git a/cmds/incidentd/src/cipher/IncidentKeyStore.cpp b/cmds/incidentd/src/cipher/IncidentKeyStore.cpp
new file mode 100644
index 0000000..ae0a920
--- /dev/null
+++ b/cmds/incidentd/src/cipher/IncidentKeyStore.cpp
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+#include "Log.h"
+
+#include "IncidentKeyStore.h"
+
+#include <sys/stat.h>
+
+static constexpr size_t AES_KEY_BYTES = 32;
+static constexpr size_t GCM_MAC_BYTES = 16;
+constexpr char kKeyname[] = "IncidentKey";
+
+namespace android {
+namespace os {
+namespace incidentd {
+
+using namespace keystore;
+using std::string;
+
+IncidentKeyStore& IncidentKeyStore::getInstance() {
+ static IncidentKeyStore sInstance(new keystore::KeystoreClientImpl);
+ return sInstance;
+}
+
+bool IncidentKeyStore::encrypt(const string& data, int32_t flags, string* output) {
+ std::lock_guard<std::mutex> lock(mMutex);
+ if (data.empty()) {
+ ALOGW("IncidentKeyStore: Encrypt empty data?!");
+ return false;
+ }
+ if (!mClient->doesKeyExist(kKeyname)) {
+ auto gen_result = generateKeyLocked(kKeyname, 0);
+ if (!gen_result.isOk()) {
+ ALOGE("IncidentKeyStore: Key generate failed.");
+ return false;
+ }
+ }
+ if (!mClient->encryptWithAuthentication(kKeyname, data, flags, output)) {
+ ALOGE("IncidentKeyStore: Encryption failed.");
+ return false;
+ }
+ return true;
+}
+
+bool IncidentKeyStore::decrypt(const std::string& input, string* output) {
+ std::lock_guard<std::mutex> lock(mMutex);
+ if (input.empty()) {
+ ALOGE("IncidentKeyStore: Decrypt empty input?");
+ return false;
+ }
+ if (!mClient->decryptWithAuthentication(kKeyname, input, output)) {
+ ALOGE("IncidentKeyStore: Decryption failed.");
+ return false;
+ }
+ return true;
+}
+
+KeyStoreNativeReturnCode IncidentKeyStore::generateKeyLocked(const std::string& name,
+ int32_t flags) {
+ auto paramBuilder = AuthorizationSetBuilder()
+ .AesEncryptionKey(AES_KEY_BYTES * 8)
+ .GcmModeMinMacLen(GCM_MAC_BYTES * 8)
+ .Authorization(TAG_NO_AUTH_REQUIRED);
+
+ AuthorizationSet hardware_enforced_characteristics;
+ AuthorizationSet software_enforced_characteristics;
+ return mClient->generateKey(name, paramBuilder, flags, &hardware_enforced_characteristics,
+ &software_enforced_characteristics);
+}
+
+} // namespace incidentd
+} // namespace os
+} // namespace android
diff --git a/cmds/incidentd/src/cipher/IncidentKeyStore.h b/cmds/incidentd/src/cipher/IncidentKeyStore.h
new file mode 100644
index 0000000..27611cd
--- /dev/null
+++ b/cmds/incidentd/src/cipher/IncidentKeyStore.h
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+#pragma once
+
+#include <keystore/keystore_client_impl.h>
+
+namespace android {
+namespace os {
+namespace incidentd {
+
+class IncidentKeyStore {
+public:
+ static IncidentKeyStore& getInstance();
+
+ IncidentKeyStore(keystore::KeystoreClient* client) : mClient(client) {}
+
+ /**
+ * Encrypt the plainText and output the encrypted message.
+ *
+ * Returns true on success and false otherwise.
+ * If the key has not been created yet, it will generate the key in KeyMaster.
+ */
+ bool encrypt(const std::string& plainText, int32_t flags, std::string* output);
+
+ /**
+ * Decrypt and output the decrypted message.
+ *
+ * Returns true on success and false otherwise.
+ */
+ bool decrypt(const std::string& encryptedData, std::string* output);
+
+private:
+ std::unique_ptr<keystore::KeystoreClient> mClient;
+ std::mutex mMutex;
+ keystore::KeyStoreNativeReturnCode generateKeyLocked(const std::string& name, int32_t flags);
+};
+
+} // namespace incidentd
+} // namespace os
+} // namespace android
diff --git a/cmds/incidentd/src/cipher/ProtoEncryption.cpp b/cmds/incidentd/src/cipher/ProtoEncryption.cpp
new file mode 100644
index 0000000..493796d
--- /dev/null
+++ b/cmds/incidentd/src/cipher/ProtoEncryption.cpp
@@ -0,0 +1,139 @@
+/*
+ * 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.
+ */
+
+#define DEBUG true // STOPSHIP if true
+#include "Log.h"
+
+#include "ProtoEncryption.h"
+
+#include <android/util/protobuf.h>
+
+#include "IncidentKeyStore.h"
+
+namespace android {
+namespace os {
+namespace incidentd {
+
+using android::util::FIELD_COUNT_REPEATED;
+using android::util::FIELD_TYPE_STRING;
+using android::util::ProtoOutputStream;
+using android::util::ProtoReader;
+using std::string;
+
+static const int FIELD_ID_BLOCK = 1;
+
+size_t ProtoEncryptor::encrypt() {
+ string block;
+ int i = 0;
+ // Read at most sBlockSize at a time and encrypt.
+ while (mReader->readBuffer() != NULL) {
+ size_t readBytes =
+ mReader->currentToRead() > sBlockSize ? sBlockSize : mReader->currentToRead();
+ block.resize(readBytes);
+ std::memcpy(block.data(), mReader->readBuffer(), readBytes);
+
+ string encrypted;
+ if (IncidentKeyStore::getInstance().encrypt(block, 0, &encrypted)) {
+ mOutputStream.write(FIELD_TYPE_STRING | FIELD_ID_BLOCK | FIELD_COUNT_REPEATED,
+ encrypted);
+ VLOG("Block %d Encryption: original %lld now %lld", i++, (long long)readBytes,
+ (long long)encrypted.length());
+ mReader->move(readBytes);
+ } else {
+ return 0;
+ }
+ }
+ return mOutputStream.size();
+}
+
+status_t ProtoEncryptor::flush(int fd) {
+ if (!mOutputStream.flush(fd)) {
+ return BAD_VALUE;
+ }
+ return NO_ERROR;
+}
+
+status_t ProtoDecryptor::readOneBlock(string* output) {
+ if (!mReader->hasNext()) {
+ return NO_ERROR;
+ }
+ uint64_t fieldTag = mReader->readRawVarint();
+ uint32_t fieldId = read_field_id(fieldTag);
+ uint8_t wireType = read_wire_type(fieldTag);
+ if (wireType == WIRE_TYPE_LENGTH_DELIMITED) {
+ // Read this section from the reader into an FdBuffer
+ size_t sectionSize = mReader->readRawVarint();
+ output->resize(sectionSize);
+ size_t pos = 0;
+ while (pos < sectionSize && mReader->readBuffer() != NULL) {
+ size_t toRead = (sectionSize - pos) > mReader->currentToRead()
+ ? mReader->currentToRead()
+ : (sectionSize - pos);
+ std::memcpy(&((output->data())[pos]), mReader->readBuffer(), toRead);
+ pos += toRead;
+ mReader->move(toRead);
+ }
+ if (pos != sectionSize) {
+ return BAD_VALUE;
+ ALOGE("Failed to read one block");
+ }
+ } else {
+ return BAD_VALUE;
+ }
+ return NO_ERROR;
+}
+
+status_t ProtoDecryptor::decryptAndFlush(FdBuffer* out) {
+ size_t mStartBytes = mReader->bytesRead();
+ size_t bytesRead = 0;
+ int i = 0;
+ status_t err = NO_ERROR;
+ // Let's read until we read mTotalSize. If any error occurs before that, make sure to move the
+ // read pointer so the caller can continue to read the following sections.
+ while (bytesRead < mTotalSize) {
+ string block;
+ err = readOneBlock(&block);
+ bytesRead = mReader->bytesRead() - mStartBytes;
+
+ if (err != NO_ERROR) {
+ break;
+ }
+
+ if (block.length() == 0) {
+ VLOG("Done reading all blocks");
+ break;
+ }
+
+ string decryptedBlock;
+ if ((IncidentKeyStore::getInstance()).decrypt(block, &decryptedBlock)) {
+ VLOG("Block %d Original Size %lu Decrypted size %lu", i++,
+ (unsigned long)block.length(), (unsigned long)decryptedBlock.length());
+ out->write(reinterpret_cast<uint8_t*>(decryptedBlock.data()), decryptedBlock.length());
+ } else {
+ err = BAD_VALUE;
+ break;
+ }
+ }
+
+ if (bytesRead < mTotalSize) {
+ mReader->move(mTotalSize - bytesRead);
+ }
+ return err;
+}
+
+} // namespace incidentd
+} // namespace os
+} // namespace android
diff --git a/cmds/incidentd/src/cipher/ProtoEncryption.h b/cmds/incidentd/src/cipher/ProtoEncryption.h
new file mode 100644
index 0000000..5b72ca8
--- /dev/null
+++ b/cmds/incidentd/src/cipher/ProtoEncryption.h
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+#pragma once
+
+#include <android/util/ProtoOutputStream.h>
+#include <android/util/ProtoReader.h>
+#include <frameworks/base/cmds/incidentd/src/cipher/cipher_blocks.pb.h>
+
+#include "FdBuffer.h"
+
+namespace android {
+namespace os {
+namespace incidentd {
+
+// PlainText IncidentReport format
+// [section1_header(id, size, type)][section1_data] ...
+
+// Let's say section1 needs encryption
+// After encryption, it becomes
+// [section1_header(id, encrypted_size, type)][[cipher_block][cipher_block][cipher_block]..]
+
+// When clients read the report, it's decrypted, and written in its original format
+
+/**
+ * Takes a ProtoReader, encrypts its whole content -- which is one section, and flush to
+ * a file descriptor.
+ * The underlying encryption is done using Keystore binder APIs. We encrypt the data
+ * in blocks, and write to the file in android.os.incidentd.CipherBlocks format.
+ */
+class ProtoEncryptor {
+public:
+ ProtoEncryptor(const sp<android::util::ProtoReader>& reader) : mReader(reader){};
+
+ // Encrypt the data from ProtoReader, and store in CipherBlocks format.
+ // return the size of CipherBlocks.
+ size_t encrypt();
+
+ status_t flush(int fd);
+
+private:
+ static const size_t sBlockSize = 8 * 1024;
+ const sp<android::util::ProtoReader> mReader;
+ android::util::ProtoOutputStream mOutputStream;
+};
+
+// Read data from ProtoReader, which is in CipherBlocks proto format. Parse and decrypt
+// block by block.
+class ProtoDecryptor {
+public:
+ ProtoDecryptor(const sp<android::util::ProtoReader>& reader, size_t size)
+ : mReader(reader), mTotalSize(size){};
+ status_t decryptAndFlush(FdBuffer* out);
+
+private:
+ const sp<android::util::ProtoReader> mReader;
+
+ // Total size in bytes we should read from ProtoReader.
+ const size_t mTotalSize;
+
+ // Read one cipher block from ProtoReader, instead of reading the whole content
+ // and parse to CipherBlocks which could be huge.
+ status_t readOneBlock(std::string* output);
+};
+
+} // namespace incidentd
+} // namespace os
+} // namespace android
diff --git a/cmds/incidentd/src/cipher/cipher_blocks.proto b/cmds/incidentd/src/cipher/cipher_blocks.proto
new file mode 100644
index 0000000..5c7ed24
--- /dev/null
+++ b/cmds/incidentd/src/cipher/cipher_blocks.proto
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+syntax = "proto2";
+
+package android.os.incidentd;
+
+// This proto is never instantiated anywhere. It only exists to keep a record of the format of the
+// encrypted data on disk.
+message CipherBlocks {
+ repeated string blocks = 1;
+}
diff --git a/cmds/incidentd/testdata/morethan24MB.txt b/cmds/incidentd/testdata/morethan24MB.txt
new file mode 100644
index 0000000..88c29a2
--- /dev/null
+++ b/cmds/incidentd/testdata/morethan24MB.txt
@@ -0,0 +1 @@
