Merge "Fix task movement if top running activity of focused stack is null" into qt-dev
diff --git a/Android.bp b/Android.bp
index 0fcc0d5..abf95a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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/api/current.txt b/api/current.txt
index b0452e3..8b24826 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -3763,7 +3763,7 @@
method public void onDetachedFromWindow();
method public void onEnterAnimationComplete();
method public boolean onGenericMotionEvent(android.view.MotionEvent);
- method @NonNull public java.util.List<android.app.DirectAction> onGetDirectActions();
+ 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);
@@ -3783,7 +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, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.os.Bundle>);
+ 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);
@@ -5502,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;
@@ -5518,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);
}
@@ -38823,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";
@@ -41836,7 +41832,7 @@
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, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.DirectAction>>);
+ 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);
diff --git a/api/system-current.txt b/api/system-current.txt
index 2ce1ee1..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);
@@ -6046,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";
diff --git a/api/test-current.txt b/api/test-current.txt
index 77c3a94..aacf2c1 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3205,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/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 9c9b6c7..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",
@@ -96,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",
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 b4021d1..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 4fe74c4..0cc358f 100644
--- a/cmds/incidentd/src/Privacy.cpp
+++ b/cmds/incidentd/src/Privacy.cpp
@@ -18,17 +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.
@@ -87,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 b599c1c4..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.
@@ -90,6 +93,11 @@
// 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 e8fa4f4..ca6fb37 100644
--- a/cmds/incidentd/src/PrivacyFilter.cpp
+++ b/cmds/incidentd/src/PrivacyFilter.cpp
@@ -18,6 +18,10 @@
#include "PrivacyFilter.h"
+#include "incidentd_util.h"
+#include "proto_util.h"
+#include "Section.h"
+
#include <android-base/file.h>
#include <android/util/ProtoFileReader.h>
#include <android/util/protobuf.h>
@@ -25,8 +29,6 @@
#include "cipher/IncidentKeyStore.h"
#include "cipher/ProtoEncryption.h"
-#include "incidentd_util.h"
-#include "proto_util.h"
namespace android {
namespace os {
@@ -190,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();
}
@@ -220,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());
@@ -316,7 +323,7 @@
if (err != NO_ERROR) {
// We can't successfully strip this data. We will skip
// the rest of this section.
- return err;
+ return NO_ERROR;
}
}
@@ -367,8 +374,8 @@
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)) {
- VLOG("Read section %d", 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));
diff --git a/cmds/incidentd/src/Reporter.cpp b/cmds/incidentd/src/Reporter.cpp
index 322b972..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,7 +457,9 @@
// 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));
}
@@ -619,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/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 @@