diff options
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 2 | ||||
| -rw-r--r-- | cmds/dumpstate/tests/dumpstate_test.cpp | 10 | ||||
| -rw-r--r-- | libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl | 6 | ||||
| -rw-r--r-- | libs/binder/aidl/android/content/pm/OWNERS | 4 | ||||
| -rw-r--r-- | libs/dumputils/dump_utils.cpp | 1 | ||||
| -rw-r--r-- | libs/nativewindow/libnativewindow.map.txt | 1 |
6 files changed, 16 insertions, 8 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index 31a1de03d9..4ac7b689cf 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -1263,7 +1263,7 @@ static void DumpHals() { } DurationReporter duration_reporter("DUMP HALS"); RunCommand("HARDWARE HALS", {"lshal", "-lVSietrpc", "--types=b,c,l,z"}, - CommandOptions::WithTimeout(2).AsRootIfAvailable().Build()); + CommandOptions::WithTimeout(10).AsRootIfAvailable().Build()); using android::hidl::manager::V1_0::IServiceManager; using android::hardware::defaultServiceManager; diff --git a/cmds/dumpstate/tests/dumpstate_test.cpp b/cmds/dumpstate/tests/dumpstate_test.cpp index e6a7735d60..71d15f4761 100644 --- a/cmds/dumpstate/tests/dumpstate_test.cpp +++ b/cmds/dumpstate/tests/dumpstate_test.cpp @@ -666,8 +666,7 @@ TEST_F(DumpstateTest, RunCommandWithTitle) { EXPECT_THAT(err, StrEq("stderr\n")); // We don't know the exact duration, so we check the prefix and suffix EXPECT_THAT(out, - StartsWith("------ I AM GROOT (" + kSimpleCommand + ") ------\nstdout\n------")); - EXPECT_THAT(out, EndsWith("s was the duration of 'I AM GROOT' ------\n")); + StartsWith("------ I AM GROOT (" + kSimpleCommand + ") ------\nstdout\n")); } TEST_F(DumpstateTest, RunCommandWithLoggingMessage) { @@ -702,8 +701,7 @@ TEST_F(DumpstateTest, RunCommandDryRun) { EXPECT_EQ(0, RunCommand("I AM GROOT", {kSimpleCommand})); // We don't know the exact duration, so we check the prefix and suffix EXPECT_THAT(out, StartsWith("------ I AM GROOT (" + kSimpleCommand + - ") ------\n\t(skipped on dry run)\n------")); - EXPECT_THAT(out, EndsWith("s was the duration of 'I AM GROOT' ------\n")); + ") ------\n\t(skipped on dry run)\n")); EXPECT_THAT(err, IsEmpty()); } @@ -1042,7 +1040,6 @@ TEST_F(DumpstateTest, DumpFileNotFoundWithTitle) { // We don't know the exact duration, so we check the prefix and suffix EXPECT_THAT(out, StartsWith("*** Error dumping /I/cant/believe/I/exist (Y U NO EXIST?): No " "such file or directory\n")); - EXPECT_THAT(out, EndsWith("s was the duration of 'Y U NO EXIST?' ------\n")); } TEST_F(DumpstateTest, DumpFileSingleLine) { @@ -1082,8 +1079,7 @@ TEST_F(DumpstateTest, DumpFileOnDryRun) { EXPECT_THAT(err, IsEmpty()); EXPECT_THAT( out, StartsWith("------ Might as well dump. Dump! (" + kTestDataPath + "single-line.txt:")); - EXPECT_THAT(out, HasSubstr("\n\t(skipped on dry run)\n------")); - EXPECT_THAT(out, EndsWith("s was the duration of 'Might as well dump. Dump!' ------\n")); + EXPECT_THAT(out, HasSubstr("\n\t(skipped on dry run)\n")); } TEST_F(DumpstateTest, DumpFileUpdateProgress) { diff --git a/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl b/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl index 90980b8e62..a7a7292125 100644 --- a/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl +++ b/libs/binder/aidl/android/content/pm/IPackageManagerNative.aidl @@ -81,4 +81,10 @@ interface IPackageManagerNative { * returned Status before using the result of this function. */ int getTargetSdkVersionForPackage(in String packageName); + + /** + * Returns the name of module metadata package, or empty string if device doesn't have such + * package. + */ + @utf8InCpp String getModuleMetadataPackageName(); } diff --git a/libs/binder/aidl/android/content/pm/OWNERS b/libs/binder/aidl/android/content/pm/OWNERS new file mode 100644 index 0000000000..b99ca09674 --- /dev/null +++ b/libs/binder/aidl/android/content/pm/OWNERS @@ -0,0 +1,4 @@ +narayan@google.com +patb@google.com +svetoslavganov@google.com +toddke@google.com
\ No newline at end of file diff --git a/libs/dumputils/dump_utils.cpp b/libs/dumputils/dump_utils.cpp index a00459d352..40f6b43802 100644 --- a/libs/dumputils/dump_utils.cpp +++ b/libs/dumputils/dump_utils.cpp @@ -32,6 +32,7 @@ static const char* native_processes_to_dump[] = { "/system/bin/mediametrics", // media.metrics "/system/bin/mediaserver", "/system/bin/netd", + "/system/bin/vold", "/system/bin/sdcard", "/system/bin/statsd", "/system/bin/surfaceflinger", diff --git a/libs/nativewindow/libnativewindow.map.txt b/libs/nativewindow/libnativewindow.map.txt index 23a05f3dca..bad8b11540 100644 --- a/libs/nativewindow/libnativewindow.map.txt +++ b/libs/nativewindow/libnativewindow.map.txt @@ -8,6 +8,7 @@ LIBNATIVEWINDOW { AHardwareBuffer_isSupported; # introduced=29 AHardwareBuffer_lock; AHardwareBuffer_lockAndGetInfo; # introduced=29 + AHardwareBuffer_lockPlanes; # introduced=29 AHardwareBuffer_recvHandleFromUnixSocket; AHardwareBuffer_release; AHardwareBuffer_sendHandleToUnixSocket; |