resolved conflicts for merge of 181bb0ab to master (fb4e1e24) · Commits · e / os / android_frameworks_base

api/current.xml

+58 −2

Original line number	Diff line number	Diff line
		@@ -82164,7 +82164,7 @@
		type="float"
		transient="false"
		volatile="false"
		value="0.0010f"
		value="0.001f"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -129541,6 +129541,32 @@
		visibility="public"
		>
		</method>
		<method name="getMountedObbPath"
		return="java.lang.String"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="filename" type="java.lang.String">
		</parameter>
		</method>
		<method name="isObbMounted"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="filename" type="java.lang.String">
		</parameter>
		</method>
		<method name="isUsbMassStorageConnected"
		return="boolean"
		abstract="false"
		@@ -129563,6 +129589,21 @@
		visibility="public"
		>
		</method>
		<method name="mountObb"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="filename" type="java.lang.String">
		</parameter>
		<parameter name="key" type="java.lang.String">
		</parameter>
		</method>
		<method name="registerListener"
		return="void"
		abstract="false"
		@@ -129576,6 +129617,21 @@
		<parameter name="listener" type="android.os.storage.StorageEventListener">
		</parameter>
		</method>
		<method name="unmountObb"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="filename" type="java.lang.String">
		</parameter>
		<parameter name="force" type="boolean">
		</parameter>
		</method>
		<method name="unregisterListener"
		return="void"
		abstract="false"
		@@ -225998,7 +226054,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="t" type="T">
		<parameter name="arg0" type="T">
		</parameter>
		</method>
		</interface>

core/java/android/content/Context.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1400,7 +1400,7 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService} to retrieve a {@link
		* android.os.storage.StorageManager} for accesssing system storage
		* android.os.storage.StorageManager} for accessing system storage
		* functions.
		*
		* @see #getSystemService

core/java/android/content/res/ObbInfo.aidl

0 → 100755

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.content.res;

		parcelable ObbInfo;

core/java/android/content/res/ObbInfo.java

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.content.res;

		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* Basic information about a Opaque Binary Blob (OBB) that reflects
		* the info from the footer on the OBB file.
		* @hide
		*/
		public class ObbInfo implements Parcelable {
		/**
		* The name of the package to which the OBB file belongs.
		*/
		public String packageName;

		/**
		* The version of the package to which the OBB file belongs.
		*/
		public int version;

		public ObbInfo() {
		}

		public String toString() {
		return "ObbInfo{"
		+ Integer.toHexString(System.identityHashCode(this))
		+ " packageName=" + packageName + ",version=" + version + "}";
		}

		public int describeContents() {
		return 0;
		}

		public void writeToParcel(Parcel dest, int parcelableFlags) {
		dest.writeString(packageName);
		dest.writeInt(version);
		}

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

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

		private ObbInfo(Parcel source) {
		packageName = source.readString();
		version = source.readInt();
		}
		}

core/java/android/content/res/ObbScanner.java

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.content.res;

		/**
		* Class to scan Opaque Binary Blob (OBB) files.
		* @hide
		*/
		public class ObbScanner {
		// Don't allow others to instantiate this class
		private ObbScanner() {}

		public static ObbInfo getObbInfo(String filePath) {
		if (filePath == null) {
		return null;
		}

		ObbInfo obbInfo = new ObbInfo();
		if (!getObbInfo_native(filePath, obbInfo)) {
		throw new IllegalArgumentException("Could not read OBB file: " + filePath);
		}
		return obbInfo;
		}

		private native static boolean getObbInfo_native(String filePath, ObbInfo obbInfo);
		}