Merge change 4696 into donut (63e7155c) · Commits · e / os / android_frameworks_base

api/current.xml

+44 −21

Original line number	Diff line number	Diff line
		@@ -27473,6 +27473,17 @@
		visibility="public"
		>
		</method>
		<method name="getApplicationInfo"
		return="android.content.pm.ApplicationInfo"
		abstract="true"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getAssets"
		return="android.content.res.AssetManager"
		abstract="true"
		@@ -28825,6 +28836,17 @@
		visibility="public"
		>
		</method>
		<method name="getApplicationInfo"
		return="android.content.pm.ApplicationInfo"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getAssets"
		return="android.content.res.AssetManager"
		abstract="false"
		@@ -35185,6 +35207,17 @@
		visibility="public"
		>
		</field>
		<field name="FLAG_SUPPORTS_LARGE_SCREENS"
		type="int"
		transient="false"
		volatile="false"
		value="512"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="FLAG_SYSTEM"
		type="int"
		transient="false"
		@@ -35258,16 +35291,6 @@
		visibility="public"
		>
		</field>
		<field name="expandable"
		type="boolean"
		transient="false"
		volatile="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="flags"
		type="int"
		transient="false"
		@@ -37127,17 +37150,6 @@
		visibility="public"
		>
		</field>
		<field name="GET_EXPANDABLE"
		type="int"
		transient="false"
		volatile="false"
		value="131072"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="GET_GIDS"
		type="int"
		transient="false"
		@@ -114387,6 +114399,17 @@
		visibility="public"
		>
		</method>
		<method name="getApplicationInfo"
		return="android.content.pm.ApplicationInfo"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getAssets"
		return="android.content.res.AssetManager"
		abstract="false"

core/java/android/app/ActivityThread.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public final class ActivityThread {
		try {
		appInfo = getPackageManager().getApplicationInfo(
		pkgInfo.getPackageName(),
		PackageManager.GET_SUPPORTS_DENSITIES \| PackageManager.GET_EXPANDABLE);
		PackageManager.GET_SUPPORTS_DENSITIES);
		} catch (RemoteException e) {
		throw new AssertionError(e);
		}
		@@ -287,6 +287,10 @@ public final class ActivityThread {
		return mPackageName;
		}

		public ApplicationInfo getApplicationInfo() {
		return mApplicationInfo;
		}

		public boolean isSecurityViolation() {
		return mSecurityViolation;
		}

core/java/android/app/ApplicationContext.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -282,6 +282,14 @@ class ApplicationContext extends Context {
		throw new RuntimeException("Not supported in system context");
		}

		@Override
		public ApplicationInfo getApplicationInfo() {
		if (mPackageInfo != null) {
		return mPackageInfo.getApplicationInfo();
		}
		throw new RuntimeException("Not supported in system context");
		}

		@Override
		public String getPackageResourcePath() {
		if (mPackageInfo != null) {

core/java/android/content/Context.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.content;

		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.res.AssetManager;
		import android.content.res.Resources;
		@@ -233,6 +234,9 @@ public abstract class Context {
		/** Return the name of this application's package. */
		public abstract String getPackageName();

		/** Return the full application info for this context's package. */
		public abstract ApplicationInfo getApplicationInfo();

		/**
		* {@hide}
		* Return the full path to this context's resource files. This is the ZIP files

core/java/android/content/ContextWrapper.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.content;

		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.res.AssetManager;
		import android.content.res.Resources;
		@@ -119,6 +120,11 @@ public class ContextWrapper extends Context {
		return mBase.getPackageName();
		}

		@Override
		public ApplicationInfo getApplicationInfo() {
		return mBase.getApplicationInfo();
		}

		@Override
		public String getPackageResourcePath() {
		return mBase.getPackageResourcePath();