From ebf962f74b4cebe36c641542bb92410d8d204400 Mon Sep 17 00:00:00 2001 From: Bookatz Date: Wed, 28 Mar 2018 13:59:41 -0700 Subject: [PATCH] Dummy WorkChain class To avoid future merge conflicts, a dummy WorkChain class must be added temporarily. It goes along with the dummy StatsLog.java class. Bug: 71607284 Test: none Merged-In: Iff361eb98e079c7b2146c092dc27a3618a813c94 Change-Id: I66cf0c36c1842b99a5a4dd104fc5c06c0cfbe2b5 --- core/java/android/os/WorkSource.java | 58 ++++++++++++++++++++++++++++ core/java/android/util/StatsLog.java | 13 +++++++ 2 files changed, 71 insertions(+) diff --git a/core/java/android/os/WorkSource.java b/core/java/android/os/WorkSource.java index ecec448aba4c4..5bf051d53015f 100644 --- a/core/java/android/os/WorkSource.java +++ b/core/java/android/os/WorkSource.java @@ -4,6 +4,9 @@ import android.os.WorkSourceProto; import android.util.Log; import android.util.proto.ProtoOutputStream; +import com.android.internal.annotations.VisibleForTesting; + +import java.util.ArrayList; import java.util.Arrays; /** @@ -356,6 +359,15 @@ public class WorkSource implements Parcelable { return result; } + /** + * Temporary dummy function. + * @hide + */ + public ArrayList getWorkChains() { + return null; + } + + private boolean removeUids(WorkSource other) { int N1 = mNum; final int[] uids1 = mUids; @@ -664,6 +676,52 @@ public class WorkSource implements Parcelable { } } + /** + * Temporary dummy class for WorkChain. Will be removed. + * @hide + */ + public static final class WorkChain implements Parcelable { + // @VisibleForTesting + public WorkChain() { + } + + private WorkChain(Parcel in) { + in.readInt(); + } + + /** @hide */ + @VisibleForTesting + public int[] getUids() { + return null; + } + + /** @hide */ + @VisibleForTesting + public String[] getTags() { + return null; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(0); + } + + public static final Parcelable.Creator CREATOR = + new Parcelable.Creator() { + public WorkChain createFromParcel(Parcel in) { + return new WorkChain(in); + } + public WorkChain[] newArray(int size) { + return new WorkChain[size]; + } + }; + } + @Override public int describeContents() { return 0; diff --git a/core/java/android/util/StatsLog.java b/core/java/android/util/StatsLog.java index a4ffbe47bd880..433dd3a6adcc8 100644 --- a/core/java/android/util/StatsLog.java +++ b/core/java/android/util/StatsLog.java @@ -35,6 +35,11 @@ public final class StatsLog { public static final int BLUETOOTH_A2DP_AUDIO_STATE_CHANGED__STATE__PLAY = 1; public static final int BLUETOOTH_A2DP_AUDIO_STATE_CHANGED__STATE__STOP = 2; + public static final int BLE_SCAN_STATE_CHANGED = 2; + public static final int BLE_SCAN_STATE_CHANGED__STATE__OFF = 0; + public static final int BLE_SCAN_STATE_CHANGED__STATE__ON = 1; + public static final int BLE_SCAN_STATE_CHANGED__STATE__RESET = 2; + private StatsLog() {} public static void write(int id, int field1) {} @@ -43,4 +48,12 @@ public final class StatsLog { public static void write_non_chained(int id, int uid, String tag, int field1, int field2, String field3) {} + + /** I am a dummy javadoc comment. */ + public static void write(int code, int[] uid, String[] tag, int arg2, + boolean arg3, boolean arg4, boolean arg5) {}; + + /** I am a dummy javadoc comment. */ + public static void write_non_chained(int code, int arg1, String arg2, int arg3, + boolean arg4, boolean arg5, boolean arg6) {}; }