| commit | 170ca7bb2f660d1f8ea2cc39195946a8cbb5f0f7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Jul 19 19:55:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 19 19:55:12 2023 +0000 |
| tree | bbfbfc489d7f13461265f382bfb85bb1ffef1683 | |
| parent | 73d4d4c3d447bc3a5fe1c12d4d29b96934a0ff44 [diff] | |
| parent | ad3fec95456eb1ed528f2aca7ed7f41a7dba88a3 [diff] |
Merge changes I88ee8d2f,Id15ecc7f into main am: c081fa39df am: 58445c733c am: 14a734402a am: ad3fec9545 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2660420 Change-Id: I40475be7d85ee8bd34d590949af12a2736c49f47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cas/aidl/default/Android.bp b/cas/aidl/default/Android.bp old mode 100755 new mode 100644 index 3c16d57..6ce5681 --- a/cas/aidl/default/Android.bp +++ b/cas/aidl/default/Android.bp
@@ -68,6 +68,7 @@ defaults: ["cas_service_example_defaults"], init_rc: ["cas-default-lazy.rc"], cflags: ["-DLAZY_SERVICE"], + overrides: ["android.hardware.cas-service.example"], } cc_fuzz {
diff --git a/cas/aidl/default/CasImpl.cpp b/cas/aidl/default/CasImpl.cpp old mode 100755 new mode 100644
diff --git a/cas/aidl/default/CasImpl.h b/cas/aidl/default/CasImpl.h old mode 100755 new mode 100644
diff --git a/cas/aidl/default/DescramblerImpl.cpp b/cas/aidl/default/DescramblerImpl.cpp old mode 100755 new mode 100644
diff --git a/cas/aidl/default/DescramblerImpl.h b/cas/aidl/default/DescramblerImpl.h old mode 100755 new mode 100644
diff --git a/cas/aidl/default/FactoryLoader.h b/cas/aidl/default/FactoryLoader.h old mode 100755 new mode 100644
diff --git a/cas/aidl/default/MediaCasService.cpp b/cas/aidl/default/MediaCasService.cpp old mode 100755 new mode 100644
diff --git a/cas/aidl/default/MediaCasService.h b/cas/aidl/default/MediaCasService.h old mode 100755 new mode 100644
diff --git a/cas/aidl/default/SharedLibrary.cpp b/cas/aidl/default/SharedLibrary.cpp old mode 100755 new mode 100644
diff --git a/cas/aidl/default/SharedLibrary.h b/cas/aidl/default/SharedLibrary.h old mode 100755 new mode 100644
diff --git a/cas/aidl/default/TypeConvert.cpp b/cas/aidl/default/TypeConvert.cpp old mode 100755 new mode 100644
diff --git a/cas/aidl/default/TypeConvert.h b/cas/aidl/default/TypeConvert.h old mode 100755 new mode 100644
diff --git a/cas/aidl/default/android.hardware.cas-service.xml b/cas/aidl/default/android.hardware.cas-service.xml old mode 100755 new mode 100644
diff --git a/cas/aidl/default/cas-default-lazy.rc b/cas/aidl/default/cas-default-lazy.rc old mode 100755 new mode 100644
diff --git a/cas/aidl/default/cas-default.rc b/cas/aidl/default/cas-default.rc old mode 100755 new mode 100644
diff --git a/cas/aidl/default/fuzzer.cpp b/cas/aidl/default/fuzzer.cpp old mode 100755 new mode 100644
diff --git a/cas/aidl/default/service.cpp b/cas/aidl/default/service.cpp old mode 100755 new mode 100644