Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 562ac8b9 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge changes Ifecff4f1,Ia302de46 into nyc-dev am: 2c0ae91f 

am: 4d5806d0

* commit '4d5806d0':
  Make preferred activities direct-boot aware.
  Make Parcelable classes final, API cleanup.

Change-Id: I7aa9858905cc241343da5a1fb3479bf3f74b8ba8
parents a5144e20 4d5806d0

api/current.txt

+2 −6
Original line number Diff line number Diff line
@@ -8228,8 +8228,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();
@@ -9997,7 +9995,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();










@@ -29493,7 +29491,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);










@@ -37967,8 +37965,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








@@ -8539,8 +8539,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();










@@ -10396,7 +10394,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();










@@ -31809,7 +31807,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);










@@ -40710,8 +40708,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








@@ -8234,8 +8234,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();










@@ -10007,7 +10005,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();










@@ -29559,7 +29557,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);










@@ -38039,8 +38037,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;