Merge "Merge "Add DumpstateOptions java implementation" am: 52502ef1a1 am:... (562d37d1) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -614,6 +614,7 @@ java_defaults {
		":netd_aidl",
		":vold_aidl",
		":installd_aidl",
		":dumpstate_aidl",

		"lowpan/java/android/net/lowpan/ILowpanEnergyScanCallback.aidl",
		"lowpan/java/android/net/lowpan/ILowpanNetScanCallback.aidl",
		@@ -660,6 +661,7 @@ java_defaults {
		include_dirs: [
		"system/update_engine/binder_bindings",
		"frameworks/native/aidl/binder",
		"frameworks/native/cmds/dumpstate/binder",
		"frameworks/av/camera/aidl",
		"frameworks/av/media/libaudioclient/aidl",
		"frameworks/native/aidl/gui",

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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 android.os;

		/**
		* Options passed to dumpstate service.
		*
		* @hide
		*/
		public final class DumpstateOptions implements Parcelable {
		// If true the caller can get callbacks with per-section
		// progress details.
		private final boolean mGetSectionDetails;
		// Name of the caller.
		private final String mName;

		public DumpstateOptions(Parcel in) {
		mGetSectionDetails = in.readBoolean();
		mName = in.readString();
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		out.writeBoolean(mGetSectionDetails);
		out.writeString(mName);
		}

		public static final Parcelable.Creator<DumpstateOptions> CREATOR =
		new Parcelable.Creator<DumpstateOptions>() {
		public DumpstateOptions createFromParcel(Parcel in) {
		return new DumpstateOptions(in);
		}

		public DumpstateOptions[] newArray(int size) {
		return new DumpstateOptions[size];
		}
		};
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ java_library_static {
		aidl: {
		include_dirs: [
		"frameworks/native/aidl/binder",
		"frameworks/native/cmds/dumpstate/binder",
		"system/core/storaged/binder",
		"system/netd/server/binder",
		"system/vold/binder",
		@@ -11,6 +12,7 @@ java_library_static {
		},
		srcs: [
		"java/*/.java",
		":dumpstate_aidl",
		":netd_aidl",
		":netd_metrics_aidl",
		":installd_aidl",