Merge Android RHEADmaster

Bug: 168057903
Merged-In: I3c77335b908d1ae9b675ef482589858ed27a9b97
Change-Id: I36f1c71de91f477257efed4c541bea519457b918

3 files changed, 47 insertions, 3 deletions

diff --git a/binder/com/google/android/startop/iorap/DexOptEvent.aidl b/binder/com/google/android/startop/iorap/DexOptEvent.aidl
new file mode 100644
index 0000000..a4e175b
--- /dev/null
+++ b/binder/com/google/android/startop/iorap/DexOptEvent.aidl
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2020 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.
+ */
+
+package com.google.android.startop.iorap;
+
+/** @hide */
+parcelable DexOptEvent cpp_header "binder/dexopt_event.h";
diff --git a/binder/com/google/android/startop/iorap/IIorap.aidl b/binder/com/google/android/startop/iorap/IIorap.aidl
index fe91d15..05faefe 100644
--- a/binder/com/google/android/startop/iorap/IIorap.aidl
+++ b/binder/com/google/android/startop/iorap/IIorap.aidl
@@ -18,12 +18,14 @@ package com.google.android.startop.iorap;
 
 import com.google.android.startop.iorap.ITaskListener;
 
-import com.google.android.startop.iorap.PackageEvent;
-import com.google.android.startop.iorap.AppLaunchEvent;
 import com.google.android.startop.iorap.AppIntentEvent;
+import com.google.android.startop.iorap.AppLaunchEvent;
+import com.google.android.startop.iorap.DexOptEvent;
+import com.google.android.startop.iorap.JobScheduledEvent;
+import com.google.android.startop.iorap.PackageEvent;
+import com.google.android.startop.iorap.RequestId;
 import com.google.android.startop.iorap.SystemServiceEvent;
 import com.google.android.startop.iorap.SystemServiceUserEvent;
-import com.google.android.startop.iorap.RequestId;
 
 /**
 * IIOrap is a client interface to the input/output readahead and pin daemon (iorapd).
@@ -109,6 +111,8 @@ oneway interface IIorap {
 
     // void onActivityHintEvent(in RequestId request, in ActivityHintEvent event);
     void onAppLaunchEvent(in RequestId request, in AppLaunchEvent event);
+    void onDexOptEvent(in RequestId request, in DexOptEvent event);
+    void onJobScheduledEvent(in RequestId request, in JobScheduledEvent event);
     void onPackageEvent(in RequestId request, in PackageEvent event);
     void onAppIntentEvent(in RequestId request, in AppIntentEvent event);
     void onSystemServiceEvent(in RequestId request, in SystemServiceEvent event);
diff --git a/binder/com/google/android/startop/iorap/JobScheduledEvent.aidl b/binder/com/google/android/startop/iorap/JobScheduledEvent.aidl
new file mode 100644
index 0000000..d4b5454
--- /dev/null
+++ b/binder/com/google/android/startop/iorap/JobScheduledEvent.aidl
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+package com.google.android.startop.iorap;
+
+/** @hide */
+parcelable JobScheduledEvent cpp_header "binder/job_scheduled_event.h";