Merge "dumpstate hal: use vendor toybox" into oc-dev
diff --git a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
index 14e4914..ec73a7d 100644
--- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
+++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
@@ -625,14 +625,17 @@
TEST_P(DrmHalVendorPluginTest, RestoreKeysClosedSession) {
RETURN_IF_SKIPPED;
for (auto config : contentConfigurations) {
- auto sessionId = openSession();
- hidl_vec<uint8_t> keySetId = loadKeys(sessionId, config);
- EXPECT_NE(0u, keySetId.size());
- closeSession(sessionId);
- sessionId = openSession();
- closeSession(sessionId);
- Status status = drmPlugin->restoreKeys(sessionId, keySetId);
- EXPECT_EQ(Status::ERROR_DRM_SESSION_NOT_OPENED, status);
+ if (config.policy.allowOffline) {
+ auto sessionId = openSession();
+ hidl_vec<uint8_t> keySetId =
+ loadKeys(sessionId, config, KeyType::OFFLINE);
+ EXPECT_NE(0u, keySetId.size());
+ closeSession(sessionId);
+ sessionId = openSession();
+ closeSession(sessionId);
+ Status status = drmPlugin->restoreKeys(sessionId, keySetId);
+ EXPECT_EQ(Status::ERROR_DRM_SESSION_NOT_OPENED, status);
+ }
}
}
diff --git a/gnss/1.0/default/android.hardware.gnss@1.0-service.rc b/gnss/1.0/default/android.hardware.gnss@1.0-service.rc
index f1116f4..96638a3 100644
--- a/gnss/1.0/default/android.hardware.gnss@1.0-service.rc
+++ b/gnss/1.0/default/android.hardware.gnss@1.0-service.rc
@@ -1,7 +1,4 @@
service gnss_service /vendor/bin/hw/android.hardware.gnss@1.0-service
class main
user system
-#
-# TODO:(b/35757613) - STOPSHIP - HAL cannot have direct inet access
-#
- group system inet
+ group system gps