Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d0b188f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5515452 from a9f9fbcc to qt-release 

Change-Id: I65cdd8a6d8f2c3744def76ee18c7489ad2ffefe9
parents 9b21d79a a9f9fbcc

api/current.txt

+5 −8
Original line number Diff line number Diff line
@@ -3763,7 +3763,7 @@ package android.app { 
    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 @@ package android.app { 
    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);
@@ -4680,7 +4680,7 @@ package android.app { 
  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);
@@ -4694,7 +4694,7 @@ package android.app { 
    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
@@ -5502,8 +5502,6 @@ package android.app { 
    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 @@ package android.app { 
    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);

  }










@@ -41836,7 +41833,7 @@ package android.service.voice {













    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);

























cmds/incident/main.cpp



+3
−0




























Original line number
Diff line number
Diff line








@@ -263,6 +263,9 @@ main(int argc, char** argv)













                return 1;















        }















    }













    if (destination == DEST_UNSET) {













        destination = DEST_STDOUT;













    }































    string pkg;















    string cls;

































cmds/incidentd/Android.bp



+2
−0




























Original line number
Diff line number
Diff line








@@ -31,6 +31,7 @@ cc_binary {













        "-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 @@ cc_test {













        "-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",

































cmds/incidentd/src/IncidentService.cpp



+26
−22




























Original line number
Diff line number
Diff line








@@ -174,12 +174,11 @@ void ReportHandler::schedule_send_broadcasts_locked() {













}































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 @@ void ReportHandler::take_report() {





























    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 @@ void ReportHandler::take_report() {













    size_t reportByteSize = 0;















    reporter->runReport(&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(const sp<Looper>& handlerLooper) {













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 @@ Status IncidentService::reportIncident(const IncidentReportArgs& args) {













        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::reportIncident(const IncidentReportArgs& args) {













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) {

































cmds/incidentd/src/Privacy.cpp



+23
−0




























Original line number
Diff line number
Diff line








@@ -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 @@ bool PrivacySpec::RequireAll() const {













    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