diff options
| author | Craig Mautner <cmautner@google.com> | 2014-09-04 14:57:04 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-09-04 14:57:04 -0700 |
| commit | 7a629c2d04bb3c8fbdca6fdf3e0911f451d1880e (patch) | |
| tree | 649703c3d9d571a48cac3648b3b2f4432068f25e /core/java/android/app/Activity.java | |
| parent | d35d826fb50f71cf592a72d2dffd5dea75390da3 (diff) | |
| download | frameworks_base-7a629c2d04bb3c8fbdca6fdf3e0911f451d1880e.zip frameworks_base-7a629c2d04bb3c8fbdca6fdf3e0911f451d1880e.tar.gz frameworks_base-7a629c2d04bb3c8fbdca6fdf3e0911f451d1880e.tar.bz2 | |
Update API per council request
A few protected => public changes and picking up another change
in ViewAnimationUtils that got missed.
Fixes bug 17389511.
Change-Id: I75027535eade6427c2d9067369426297c168e77e
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 29ef484..8f0266c 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -955,7 +955,7 @@ public class Activity extends ContextThemeWrapper * @see #onRestoreInstanceState * @see #onPostCreate */ - protected void onCreate(@Nullable Bundle savedInstanceState, + public void onCreate(@Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState) { onCreate(savedInstanceState); } @@ -1040,7 +1040,7 @@ public class Activity extends ContextThemeWrapper * @see #onResume * @see #onSaveInstanceState */ - protected void onRestoreInstanceState(Bundle savedInstanceState, + public void onRestoreInstanceState(Bundle savedInstanceState, PersistableBundle persistentState) { if (savedInstanceState != null) { onRestoreInstanceState(savedInstanceState); @@ -1130,7 +1130,7 @@ public class Activity extends ContextThemeWrapper * * @see #onCreate */ - protected void onPostCreate(@Nullable Bundle savedInstanceState, + public void onPostCreate(@Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState) { onPostCreate(savedInstanceState); } @@ -1380,7 +1380,7 @@ public class Activity extends ContextThemeWrapper * @see #onRestoreInstanceState(Bundle, PersistableBundle) * @see #onPause */ - protected void onSaveInstanceState(Bundle outState, PersistableBundle outPersistentState) { + public void onSaveInstanceState(Bundle outState, PersistableBundle outPersistentState) { onSaveInstanceState(outState); } @@ -4769,7 +4769,7 @@ public class Activity extends ContextThemeWrapper * @param data An Intent, which can return result data to the caller * (various data can be attached to Intent "extras"). */ - protected void onActivityReenter(int resultCode, Intent data) { + public void onActivityReenter(int resultCode, Intent data) { } /** |