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

Commit 99695eee authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7119974 from a73115b7 to sc-release 

Change-Id: Ie7bf5eb4038c5dae8ac670869c0b9780d3714323
parents fbef20af a73115b7

cmds/installd/dexopt.cpp

+0 −19
Original line number Diff line number Diff line
@@ -1130,23 +1130,6 @@ bool maybe_open_oat_and_vdex_file(const std::string& apk_path, 
    return true;

}



// Updates the access times of out_oat_path based on those from apk_path.

void update_out_oat_access_times(const char* apk_path, const char* out_oat_path) {

    struct stat input_stat;

    memset(&input_stat, 0, sizeof(input_stat));

    if (stat(apk_path, &input_stat) != 0) {

        PLOG(ERROR) << "Could not stat " << apk_path << " during dexopt";

        return;

    }



    struct utimbuf ut;

    ut.actime = input_stat.st_atime;

    ut.modtime = input_stat.st_mtime;

    if (utime(out_oat_path, &ut) != 0) {

        PLOG(WARNING) << "Could not update access times for " << apk_path << " during dexopt";

    }

}



// Runs (execv) dexoptanalyzer on the given arguments.

// The analyzer will check if the dex_file needs to be (re)compiled to match the compiler_filter.

// If this is for a profile guided compilation, profile_was_updated will tell whether or not
@@ -1843,8 +1826,6 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins 
        }

    }



    update_out_oat_access_times(dex_path, out_oat.path().c_str());



    // We've been successful, don't delete output.

    out_oat.DisableCleanup();

    out_vdex.DisableCleanup();

cmds/surfacereplayer/proto/src/trace.proto

+4 −9
Original line number Diff line number Diff line
@@ -50,11 +50,10 @@ message SurfaceChange { 
        CornerRadiusChange          corner_radius           = 16;

        ReparentChange              reparent                = 17;

        RelativeParentChange        relative_parent         = 18;

        DetachChildrenChange        detach_children         = 19;

        ReparentChildrenChange      reparent_children       = 20;

        BackgroundBlurRadiusChange  background_blur_radius  = 21;

        ShadowRadiusChange          shadow_radius           = 22;

        BlurRegionsChange           blur_regions            = 23;

        ReparentChildrenChange      reparent_children       = 19;

        BackgroundBlurRadiusChange  background_blur_radius  = 20;

        ShadowRadiusChange          shadow_radius           = 21;

        BlurRegionsChange           blur_regions            = 22;

    }

}
@@ -200,10 +199,6 @@ message RelativeParentChange { 
    required int32 z = 2;

}



message DetachChildrenChange {

    required bool detach_children = 1;

}



message ShadowRadiusChange {

    required float radius = 1;

}

cmds/surfacereplayer/replayer/Replayer.cpp

+0 −8
Original line number Diff line number Diff line
@@ -417,9 +417,6 @@ status_t Replayer::doSurfaceTransaction( 
            case SurfaceChange::SurfaceChangeCase::kRelativeParent:

                setRelativeParentChange(transaction, change.id(), change.relative_parent());

                break;

            case SurfaceChange::SurfaceChangeCase::kDetachChildren:

                setDetachChildrenChange(transaction, change.id(), change.detach_children());

                break;

            case SurfaceChange::SurfaceChangeCase::kShadowRadius:

                setShadowRadiusChange(transaction, change.id(), change.shadow_radius());

                break;
@@ -713,11 +710,6 @@ void Replayer::setRelativeParentChange(SurfaceComposerClient::Transaction& t, 
    t.setRelativeLayer(mLayers[id], mLayers[c.relative_parent_id()], c.z());

}



void Replayer::setDetachChildrenChange(SurfaceComposerClient::Transaction& t,

        layer_id id, const DetachChildrenChange& c) {

    t.detachChildren(mLayers[id]);

}



void Replayer::setReparentChildrenChange(SurfaceComposerClient::Transaction& t,

        layer_id id, const ReparentChildrenChange& c) {

    if (mLayers.count(c.parent_id()) == 0 || mLayers[c.parent_id()] == nullptr) {

cmds/surfacereplayer/replayer/Replayer.h

+0 −2
Original line number Diff line number Diff line
@@ -116,8 +116,6 @@ class Replayer { 
            layer_id id, const ReparentChange& c);

    void setRelativeParentChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const RelativeParentChange& c);

    void setDetachChildrenChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const DetachChildrenChange& c);

    void setReparentChildrenChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const ReparentChildrenChange& c);

    void setShadowRadiusChange(SurfaceComposerClient::Transaction& t,

data/etc/car_core_hardware.xml

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ 
    <feature name="android.software.secure_lock_screen" />

    <feature name="android.software.input_methods" />





    <!-- Feature to support device admins -->

    <!-- TODO(b/178412797): not fully supported yet, CTS tests are still

         failing. -->

    <feature name="android.software.device_admin" />



    <!-- devices with GPS must include android.hardware.location.gps.xml -->

    <!-- devices with an autofocus camera and/or flash must include either

         android.hardware.camera.autofocus.xml or