diff options
| -rw-r--r-- | api/current.txt | 12 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/api/current.txt b/api/current.txt index 7e2b0ed..cb089b0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3455,7 +3455,7 @@ package android.app { method public boolean navigateUpToFromChild(android.app.Activity, android.content.Intent); method public void onActionModeFinished(android.view.ActionMode); method public void onActionModeStarted(android.view.ActionMode); - method protected void onActivityReenter(int, android.content.Intent); + method public void onActivityReenter(int, android.content.Intent); method protected void onActivityResult(int, int, android.content.Intent); method public void onAttachFragment(android.app.Fragment); method public void onAttachedToWindow(); @@ -3466,7 +3466,7 @@ package android.app { method public boolean onContextItemSelected(android.view.MenuItem); method public void onContextMenuClosed(android.view.Menu); method protected void onCreate(android.os.Bundle); - method protected void onCreate(android.os.Bundle, android.os.PersistableBundle); + method public void onCreate(android.os.Bundle, android.os.PersistableBundle); method public void onCreateContextMenu(android.view.ContextMenu, android.view.View, android.view.ContextMenu.ContextMenuInfo); method public java.lang.CharSequence onCreateDescription(); method protected deprecated android.app.Dialog onCreateDialog(int); @@ -3498,7 +3498,7 @@ package android.app { method public void onPanelClosed(int, android.view.Menu); method protected void onPause(); method protected void onPostCreate(android.os.Bundle); - method protected void onPostCreate(android.os.Bundle, android.os.PersistableBundle); + method public void onPostCreate(android.os.Bundle, android.os.PersistableBundle); method protected void onPostResume(); method protected deprecated void onPrepareDialog(int, android.app.Dialog); method protected deprecated void onPrepareDialog(int, android.app.Dialog, android.os.Bundle); @@ -3508,11 +3508,11 @@ package android.app { method public void onProvideAssistData(android.os.Bundle); method protected void onRestart(); method protected void onRestoreInstanceState(android.os.Bundle); - method protected void onRestoreInstanceState(android.os.Bundle, android.os.PersistableBundle); + method public void onRestoreInstanceState(android.os.Bundle, android.os.PersistableBundle); method protected void onResume(); method public deprecated java.lang.Object onRetainNonConfigurationInstance(); method protected void onSaveInstanceState(android.os.Bundle); - method protected void onSaveInstanceState(android.os.Bundle, android.os.PersistableBundle); + method public void onSaveInstanceState(android.os.Bundle, android.os.PersistableBundle); method public boolean onSearchRequested(); method protected void onStart(); method protected void onStop(); @@ -34350,7 +34350,7 @@ package android.view { } public final class ViewAnimationUtils { - method public static final android.animation.Animator createCircularReveal(android.view.View, int, int, float, float); + method public static android.animation.Animator createCircularReveal(android.view.View, int, int, float, float); } public class ViewConfiguration { 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) { } /** |