Merge changes Ifecff4f1,Ia302de46 into nyc-dev (4d5806d0) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −6

Original line number	Diff line number	Diff line
		@@ -8225,8 +8225,6 @@ package android.content {
		method public java.lang.String getPackageResourcePath();
		method public android.content.res.Resources getResources();
		method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
		method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
		method public java.io.File getSharedPreferencesPath(java.lang.String);
		method public java.lang.Object getSystemService(java.lang.String);
		method public java.lang.String getSystemServiceName(java.lang.Class<?>);
		method public android.content.res.Resources.Theme getTheme();
		@@ -9994,7 +9992,7 @@ package android.content.pm {
		field public java.lang.String permission;
		}

		public class ShortcutInfo implements android.os.Parcelable {
		public final class ShortcutInfo implements android.os.Parcelable {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public android.os.PersistableBundle getExtras();
		@@ -29488,7 +29486,7 @@ package android.os.health {
		method public android.os.health.HealthStats[] takeUidSnapshots(int[]);
		}

		public class TimerStat implements android.os.Parcelable {
		public final class TimerStat implements android.os.Parcelable {
		ctor public TimerStat();
		ctor public TimerStat(int, long);
		ctor public TimerStat(android.os.Parcel);
		@@ -37962,8 +37960,6 @@ package android.test.mock {
		method public java.lang.String getPackageResourcePath();
		method public android.content.res.Resources getResources();
		method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
		method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
		method public java.io.File getSharedPreferencesPath(java.lang.String);
		method public java.lang.Object getSystemService(java.lang.String);
		method public java.lang.String getSystemServiceName(java.lang.Class<?>);
		method public android.content.res.Resources.Theme getTheme();

api/system-current.txt

+2 −6

Original line number	Diff line number	Diff line
		@@ -8536,8 +8536,6 @@ package android.content {
		method public java.lang.String getPackageResourcePath();
		method public android.content.res.Resources getResources();
		method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
		method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
		method public java.io.File getSharedPreferencesPath(java.lang.String);
		method public java.lang.Object getSystemService(java.lang.String);
		method public java.lang.String getSystemServiceName(java.lang.Class<?>);
		method public android.content.res.Resources.Theme getTheme();
		@@ -10393,7 +10391,7 @@ package android.content.pm {
		field public java.lang.String permission;
		}

		public class ShortcutInfo implements android.os.Parcelable {
		public final class ShortcutInfo implements android.os.Parcelable {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public android.os.PersistableBundle getExtras();
		@@ -31804,7 +31802,7 @@ package android.os.health {
		method public android.os.health.HealthStats[] takeUidSnapshots(int[]);
		}

		public class TimerStat implements android.os.Parcelable {
		public final class TimerStat implements android.os.Parcelable {
		ctor public TimerStat();
		ctor public TimerStat(int, long);
		ctor public TimerStat(android.os.Parcel);
		@@ -40705,8 +40703,6 @@ package android.test.mock {
		method public java.lang.String getPackageResourcePath();
		method public android.content.res.Resources getResources();
		method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
		method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
		method public java.io.File getSharedPreferencesPath(java.lang.String);
		method public java.lang.Object getSystemService(java.lang.String);
		method public java.lang.String getSystemServiceName(java.lang.Class<?>);
		method public android.content.res.Resources.Theme getTheme();

api/test-current.txt

+2 −6

Original line number	Diff line number	Diff line
		@@ -8231,8 +8231,6 @@ package android.content {
		method public java.lang.String getPackageResourcePath();
		method public android.content.res.Resources getResources();
		method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
		method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
		method public java.io.File getSharedPreferencesPath(java.lang.String);
		method public java.lang.Object getSystemService(java.lang.String);
		method public java.lang.String getSystemServiceName(java.lang.Class<?>);
		method public android.content.res.Resources.Theme getTheme();
		@@ -10004,7 +10002,7 @@ package android.content.pm {
		field public java.lang.String permission;
		}

		public class ShortcutInfo implements android.os.Parcelable {
		public final class ShortcutInfo implements android.os.Parcelable {
		method public int describeContents();
		method public android.content.ComponentName getActivityComponent();
		method public android.os.PersistableBundle getExtras();
		@@ -29554,7 +29552,7 @@ package android.os.health {
		method public android.os.health.HealthStats[] takeUidSnapshots(int[]);
		}

		public class TimerStat implements android.os.Parcelable {
		public final class TimerStat implements android.os.Parcelable {
		ctor public TimerStat();
		ctor public TimerStat(int, long);
		ctor public TimerStat(android.os.Parcel);
		@@ -38034,8 +38032,6 @@ package android.test.mock {
		method public java.lang.String getPackageResourcePath();
		method public android.content.res.Resources getResources();
		method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
		method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
		method public java.io.File getSharedPreferencesPath(java.lang.String);
		method public java.lang.Object getSystemService(java.lang.String);
		method public java.lang.String getSystemServiceName(java.lang.Class<?>);
		method public android.content.res.Resources.Theme getTheme();

core/java/android/content/ContextWrapper.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,7 @@ public class ContextWrapper extends Context {
		return mBase.getSharedPreferences(name, mode);
		}

		/** @removed */
		@Override
		public SharedPreferences getSharedPreferences(File file, int mode) {
		return mBase.getSharedPreferences(file, mode);
		@@ -201,6 +202,7 @@ public class ContextWrapper extends Context {
		return mBase.getFileStreamPath(name);
		}

		/** @removed */
		@Override
		public File getSharedPreferencesPath(String name) {
		return mBase.getSharedPreferencesPath(name);

core/java/android/content/pm/ShortcutInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ import java.lang.annotation.RetentionPolicy;
		*
		* @see {@link ShortcutManager}.
		*/
		public class ShortcutInfo implements Parcelable {
		public final class ShortcutInfo implements Parcelable {
		/* @hide */
		public static final int FLAG_DYNAMIC = 1 << 0;