Merge "Adding lock function that obtains bytesPerPixel and bytesPerStride"
diff --git a/cmds/dumpstate/binder/android/os/IDumpstate.aidl b/cmds/dumpstate/binder/android/os/IDumpstate.aidl
index 37ff442..347856d 100644
--- a/cmds/dumpstate/binder/android/os/IDumpstate.aidl
+++ b/cmds/dumpstate/binder/android/os/IDumpstate.aidl
@@ -61,7 +61,6 @@
// Default mode.
const int BUGREPORT_MODE_DEFAULT = 6;
- // TODO(b/111441001): Should the args be for the consuming application rather than triggering?
/*
* Starts a bugreport in the background.
*
diff --git a/cmds/servicemanager/binder.h b/cmds/servicemanager/binder.h
index 70be3b4..a9ccc74 100644
--- a/cmds/servicemanager/binder.h
+++ b/cmds/servicemanager/binder.h
@@ -4,10 +4,9 @@
#ifndef _BINDER_H_
#define _BINDER_H_
+#include <linux/android/binder.h>
#include <sys/ioctl.h>
-#include "binder_kernel.h"
-
struct binder_state;
struct binder_io
diff --git a/cmds/servicemanager/binder_kernel.h b/cmds/servicemanager/binder_kernel.h
deleted file mode 100644
index 19fd773..0000000
--- a/cmds/servicemanager/binder_kernel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef ANDROID_BINDER_KERNEL_H
-#define ANDROID_BINDER_KERNEL_H
-
-#include <linux/android/binder.h>
-
-/**
- * This file exists because the uapi kernel headers in bionic are built
- * from upstream kernel headers only, and not all of the hwbinder kernel changes
- * have made it upstream yet. Therefore, the modifications to the
- * binder header are added locally in this file.
- */
-
-enum {
- FLAT_BINDER_FLAG_TXN_SECURITY_CTX = 0x1000,
-};
-
-#define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object)
-
-struct binder_transaction_data_secctx {
- struct binder_transaction_data transaction_data;
- binder_uintptr_t secctx;
-};
-
-enum {
- BR_TRANSACTION_SEC_CTX = _IOR('r', 2,
- struct binder_transaction_data_secctx),
-};
-
-
-#endif // ANDROID_BINDER_KERNEL_H
diff --git a/libs/binder/include/binder/Parcel.h b/libs/binder/include/binder/Parcel.h
index afdfe4f..e5219a5 100644
--- a/libs/binder/include/binder/Parcel.h
+++ b/libs/binder/include/binder/Parcel.h
@@ -20,6 +20,8 @@
#include <string>
#include <vector>
+#include <linux/android/binder.h>
+
#include <android-base/unique_fd.h>
#include <cutils/native_handle.h>
#include <utils/Errors.h>
@@ -28,7 +30,6 @@
#include <utils/Vector.h>
#include <utils/Flattenable.h>
-#include <binder/binder_kernel.h>
#include <binder/IInterface.h>
#include <binder/Parcelable.h>
#include <binder/Map.h>
diff --git a/libs/binder/include/binder/binder_kernel.h b/libs/binder/include/binder/binder_kernel.h
deleted file mode 100644
index c7f6b4b..0000000
--- a/libs/binder/include/binder/binder_kernel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#ifndef ANDROID_BINDER_KERNEL_H
-#define ANDROID_BINDER_KERNEL_H
-
-#include <linux/android/binder.h>
-
-/**
- * This file exists because the uapi kernel headers in bionic are built
- * from upstream kernel headers only, and not all of the hwbinder kernel changes
- * have made it upstream yet. Therefore, the modifications to the
- * binder header are added locally in this file.
- */
-
-enum {
- FLAT_BINDER_FLAG_TXN_SECURITY_CTX = 0x1000,
-};
-
-#define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object)
-
-struct binder_transaction_data_secctx {
- struct binder_transaction_data transaction_data;
- binder_uintptr_t secctx;
-};
-
-enum {
- BR_TRANSACTION_SEC_CTX = _IOR('r', 2,
- struct binder_transaction_data_secctx),
-};
-
-#endif // ANDROID_BINDER_KERNEL_H
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 512a0b4..07fe03e 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1788,9 +1788,13 @@
}
Layer::RoundedCornerState Layer::getRoundedCornerState() const {
+ return getRoundedCornerStateInternal(mSourceBounds);
+}
+
+Layer::RoundedCornerState Layer::getRoundedCornerStateInternal(const FloatRect bounds) const {
const auto& p = mDrawingParent.promote();
if (p != nullptr) {
- RoundedCornerState parentState = p->getRoundedCornerState();
+ RoundedCornerState parentState = p->getRoundedCornerStateInternal(bounds);
if (parentState.radius > 0) {
ui::Transform t = getActiveTransform(getDrawingState());
t = t.inverse();
@@ -1804,7 +1808,9 @@
}
}
const float radius = getDrawingState().cornerRadius;
- return radius > 0 ? RoundedCornerState(getBounds(), radius) : RoundedCornerState();
+ return radius > 0
+ ? RoundedCornerState(bounds.intersect(getCrop(getDrawingState()).toFloatRect()), radius)
+ : RoundedCornerState();
}
void Layer::commitChildList() {
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index 89063da..b7cfc16 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -907,6 +907,8 @@
*/
Rect getCroppedBufferSize(const Layer::State& s) const;
+ RoundedCornerState getRoundedCornerStateInternal(const FloatRect bounds) const;
+
// Cached properties computed from drawing state
// Effective transform taking into account parent transforms and any parent scaling.
ui::Transform mEffectiveTransform;
diff --git a/services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp b/services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp
index 4342dc9..b7e55f4 100644
--- a/services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp
+++ b/services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp
@@ -27,6 +27,7 @@
using namespace std::chrono_literals;
using testing::_;
+using testing::AtLeast;
namespace android {
namespace scheduler {
@@ -75,7 +76,7 @@
init(configs);
// There is one default config, so the refresh rates should have one item.
- ASSERT_EQ(1, mRefreshRateStats->getTotalTimes().size());
+ EXPECT_EQ(1, mRefreshRateStats->getTotalTimes().size());
}
TEST_F(RefreshRateStatsTest, oneConfigTest) {
@@ -88,13 +89,14 @@
init(configs);
- EXPECT_CALL(*mTimeStats, recordRefreshRate(0, _)).Times(4);
- EXPECT_CALL(*mTimeStats, recordRefreshRate(90, _)).Times(2);
+ EXPECT_CALL(*mTimeStats, recordRefreshRate(0, _)).Times(AtLeast(1));
+ EXPECT_CALL(*mTimeStats, recordRefreshRate(90, _)).Times(AtLeast(1));
std::unordered_map<std::string, int64_t> times = mRefreshRateStats->getTotalTimes();
- ASSERT_EQ(2, times.size());
- ASSERT_EQ(0, times["ScreenOff"]);
- ASSERT_EQ(0, times["90fps"]);
+ EXPECT_EQ(2, times.size());
+ EXPECT_NE(0u, times.count("ScreenOff"));
+ EXPECT_EQ(1u, times.count("90fps"));
+ EXPECT_EQ(0, times["90fps"]);
// Setting up tests on mobile harness can be flaky with time passing, so testing for
// exact time changes can result in flaxy numbers. To avoid that remember old
// numbers to make sure the correct values are increasing in the next test.
@@ -104,31 +106,31 @@
// Screen is off by default.
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_LT(screenOff, times["ScreenOff"]);
- ASSERT_EQ(0, times["90fps"]);
- screenOff = times["ScreenOff"];
+ EXPECT_LT(screenOff, times["ScreenOff"]);
+ EXPECT_EQ(0, times["90fps"]);
mRefreshRateStats->setPowerMode(HWC_POWER_MODE_NORMAL);
+ screenOff = mRefreshRateStats->getTotalTimes()["ScreenOff"];
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_EQ(screenOff, times["ScreenOff"]);
- ASSERT_LT(ninety, times["90fps"]);
- ninety = times["90fps"];
+ EXPECT_EQ(screenOff, times["ScreenOff"]);
+ EXPECT_LT(ninety, times["90fps"]);
mRefreshRateStats->setPowerMode(HWC_POWER_MODE_DOZE);
+ ninety = mRefreshRateStats->getTotalTimes()["90fps"];
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_LT(screenOff, times["ScreenOff"]);
- ASSERT_EQ(ninety, times["90fps"]);
- screenOff = times["ScreenOff"];
+ EXPECT_LT(screenOff, times["ScreenOff"]);
+ EXPECT_EQ(ninety, times["90fps"]);
mRefreshRateStats->setConfigMode(CONFIG_ID_90);
+ screenOff = mRefreshRateStats->getTotalTimes()["ScreenOff"];
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
// Because the power mode is not HWC_POWER_MODE_NORMAL, switching the config
// does not update refresh rates that come from the config.
- ASSERT_LT(screenOff, times["ScreenOff"]);
- ASSERT_EQ(ninety, times["90fps"]);
+ EXPECT_LT(screenOff, times["ScreenOff"]);
+ EXPECT_EQ(ninety, times["90fps"]);
}
TEST_F(RefreshRateStatsTest, twoConfigsTest) {
@@ -145,15 +147,17 @@
init(configs);
- EXPECT_CALL(*mTimeStats, recordRefreshRate(0, _)).Times(6);
- EXPECT_CALL(*mTimeStats, recordRefreshRate(60, _)).Times(4);
- EXPECT_CALL(*mTimeStats, recordRefreshRate(90, _)).Times(4);
+ EXPECT_CALL(*mTimeStats, recordRefreshRate(0, _)).Times(AtLeast(1));
+ EXPECT_CALL(*mTimeStats, recordRefreshRate(60, _)).Times(AtLeast(1));
+ EXPECT_CALL(*mTimeStats, recordRefreshRate(90, _)).Times(AtLeast(1));
std::unordered_map<std::string, int64_t> times = mRefreshRateStats->getTotalTimes();
- ASSERT_EQ(3, times.size());
- ASSERT_EQ(0, times["ScreenOff"]);
- ASSERT_EQ(0, times["60fps"]);
- ASSERT_EQ(0, times["90fps"]);
+ EXPECT_EQ(3, times.size());
+ EXPECT_NE(0u, times.count("ScreenOff"));
+ EXPECT_EQ(1u, times.count("60fps"));
+ EXPECT_EQ(0, times["60fps"]);
+ EXPECT_EQ(1u, times.count("90fps"));
+ EXPECT_EQ(0, times["90fps"]);
// Setting up tests on mobile harness can be flaky with time passing, so testing for
// exact time changes can result in flaxy numbers. To avoid that remember old
// numbers to make sure the correct values are increasing in the next test.
@@ -164,61 +168,61 @@
// Screen is off by default.
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_LT(screenOff, times["ScreenOff"]);
- ASSERT_EQ(sixty, times["60fps"]);
- ASSERT_EQ(ninety, times["90fps"]);
- screenOff = times["ScreenOff"];
+ EXPECT_LT(screenOff, times["ScreenOff"]);
+ EXPECT_EQ(sixty, times["60fps"]);
+ EXPECT_EQ(ninety, times["90fps"]);
mRefreshRateStats->setPowerMode(HWC_POWER_MODE_NORMAL);
+ screenOff = mRefreshRateStats->getTotalTimes()["ScreenOff"];
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_EQ(screenOff, times["ScreenOff"]);
- ASSERT_EQ(sixty, times["60fps"]);
- ASSERT_LT(ninety, times["90fps"]);
- ninety = times["90fps"];
+ EXPECT_EQ(screenOff, times["ScreenOff"]);
+ EXPECT_EQ(sixty, times["60fps"]);
+ EXPECT_LT(ninety, times["90fps"]);
// When power mode is normal, time for configs updates.
mRefreshRateStats->setConfigMode(CONFIG_ID_60);
+ ninety = mRefreshRateStats->getTotalTimes()["90fps"];
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_EQ(screenOff, times["ScreenOff"]);
- ASSERT_EQ(ninety, times["90fps"]);
- ASSERT_LT(sixty, times["60fps"]);
- sixty = times["60fps"];
+ EXPECT_EQ(screenOff, times["ScreenOff"]);
+ EXPECT_EQ(ninety, times["90fps"]);
+ EXPECT_LT(sixty, times["60fps"]);
mRefreshRateStats->setConfigMode(CONFIG_ID_90);
+ sixty = mRefreshRateStats->getTotalTimes()["60fps"];
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_EQ(screenOff, times["ScreenOff"]);
- ASSERT_LT(ninety, times["90fps"]);
- ASSERT_EQ(sixty, times["60fps"]);
- ninety = times["90fps"];
+ EXPECT_EQ(screenOff, times["ScreenOff"]);
+ EXPECT_LT(ninety, times["90fps"]);
+ EXPECT_EQ(sixty, times["60fps"]);
mRefreshRateStats->setConfigMode(CONFIG_ID_60);
+ ninety = mRefreshRateStats->getTotalTimes()["90fps"];
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_EQ(screenOff, times["ScreenOff"]);
- ASSERT_EQ(ninety, times["90fps"]);
- ASSERT_LT(sixty, times["60fps"]);
- sixty = times["60fps"];
+ EXPECT_EQ(screenOff, times["ScreenOff"]);
+ EXPECT_EQ(ninety, times["90fps"]);
+ EXPECT_LT(sixty, times["60fps"]);
// Because the power mode is not HWC_POWER_MODE_NORMAL, switching the config
// does not update refresh rates that come from the config.
mRefreshRateStats->setPowerMode(HWC_POWER_MODE_DOZE);
mRefreshRateStats->setConfigMode(CONFIG_ID_90);
+ sixty = mRefreshRateStats->getTotalTimes()["60fps"];
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_LT(screenOff, times["ScreenOff"]);
- ASSERT_EQ(ninety, times["90fps"]);
- ASSERT_EQ(sixty, times["60fps"]);
- screenOff = times["ScreenOff"];
+ EXPECT_LT(screenOff, times["ScreenOff"]);
+ EXPECT_EQ(ninety, times["90fps"]);
+ EXPECT_EQ(sixty, times["60fps"]);
mRefreshRateStats->setConfigMode(CONFIG_ID_60);
+ screenOff = mRefreshRateStats->getTotalTimes()["ScreenOff"];
std::this_thread::sleep_for(std::chrono::milliseconds(2));
times = mRefreshRateStats->getTotalTimes();
- ASSERT_LT(screenOff, times["ScreenOff"]);
- ASSERT_EQ(ninety, times["90fps"]);
- ASSERT_EQ(sixty, times["60fps"]);
+ EXPECT_LT(screenOff, times["ScreenOff"]);
+ EXPECT_EQ(ninety, times["90fps"]);
+ EXPECT_EQ(sixty, times["60fps"]);
}
} // namespace
} // namespace scheduler