Whitespace cleanup. (a92d3bf3) · Commits · e / os / android_frameworks_base

core/java/android/app/ContextImpl.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -168,7 +168,6 @@ class ContextImpl extends Context {

		private static final Object sSync = new Object();
		private static AlarmManager sAlarmManager;

		private static PowerManager sPowerManager;
		private static ConnectivityManager sConnectivityManager;
		private static ThrottleManager sThrottleManager;
		@@ -205,7 +204,6 @@ class ContextImpl extends Context {
		private DevicePolicyManager mDevicePolicyManager = null;
		private UiModeManager mUiModeManager = null;


		private final Object mSync = new Object();

		private File mDatabasesDir;
		@@ -345,8 +343,8 @@ class ContextImpl extends Context {

		@Override
		public ClassLoader getClassLoader() {
		return mPackageInfo != null ? mPackageInfo.getClassLoader()
		: ClassLoader.getSystemClassLoader();
		return mPackageInfo != null ?
		mPackageInfo.getClassLoader() : ClassLoader.getSystemClassLoader();
		}

		@Override
		@@ -2017,7 +2015,6 @@ class ContextImpl extends Context {
		}
		}


		@Override
		public List<ApplicationInfo> getInstalledApplications(int flags) {
		try {

+11 −10

Original line number	Diff line number	Diff line
		@@ -259,14 +259,10 @@ public class ActivityInfo extends ComponentInfo
		* {@link android.R.attr#configChanges} attribute.
		*/
		public static final int CONFIG_ORIENTATION = 0x0080;

		/**
		* @hide
		*/
		public static final int CONFIG_THEME_RESOURCE = 0x008000;



		/**
		* Bit in {@link #configChanges} that indicates that the activity
		* can itself handle changes to the screen layout. Set from the
		@@ -327,12 +323,15 @@ public class ActivityInfo extends ComponentInfo

		/**
		* Is given activity theme agnostic, i.e. behaves properly when default theme is changed.
		* {@hide}
		*
		* @deprecated Not fully supported; do not use.
		* @hide
		*/
		private int isThemeable = ISTHEMEABLE_INHERITED;

		/**
		* {@hide}
		* @deprecated Not fully supported; do not use.
		* @hide
		*/
		public boolean getIsThemeable() {
		if (isThemeable == ISTHEMEABLE_INHERITED) {
		@@ -342,7 +341,8 @@ public class ActivityInfo extends ComponentInfo
		}

		/**
		* {@hide}
		* @deprecated Not fully supported; do not use.
		* @hide
		*/
		public void setIsThemeable(boolean value) {
		isThemeable = value? ISTHEMEABLE_TRUE : ISTHEMEABLE_FALSE;
		@@ -377,6 +377,7 @@ public class ActivityInfo extends ComponentInfo
		}

		/**
		* @deprecated Not fully supported; do not use.
		* @hide
		*/
		public final boolean isThemeable() {

+0 −1

Original line number	Diff line number	Diff line
		@@ -1816,7 +1816,6 @@ public class PackageParser {
		mParseActivityArgs.flags = flags;

		Activity a = new Activity(mParseActivityArgs, new ActivityInfo());

		if (outError[0] != null) {
		sa.recycle();
		return null;

+1 −3

Original line number	Diff line number	Diff line
		@@ -664,9 +664,7 @@ public final class AssetManager {
		public native final int updateResourcesWithAssetPath(String path);

		/**
		* Delete a set of assets from the asset manager. This can be
		* either a directory or ZIP file. Not for use by applications. Returns
		* true if succeeded or false on failure.
		* Debug method to dump resource information.
		* {@hide}
		*/
		public native final void dumpResources();

+6 −6

File changed.

Contains only whitespace changes.