diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-06 16:48:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-06 16:48:34 +0000 |
| commit | 6b0f1e78b841a32b45f513d283202e3af90c6a73 (patch) | |
| tree | 72c888833619923f7b80ebac2a61abd2faa3179f /api | |
| parent | da493aa6eab24de98b63cc63c457f5b899da3ad2 (diff) | |
| parent | 6bdd3a155fe380735d4108ddcc50b156c62406d0 (diff) | |
| download | frameworks_base-6b0f1e78b841a32b45f513d283202e3af90c6a73.zip frameworks_base-6b0f1e78b841a32b45f513d283202e3af90c6a73.tar.gz frameworks_base-6b0f1e78b841a32b45f513d283202e3af90c6a73.tar.bz2 | |
Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 05e494b..ac34c59 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3412,6 +3412,7 @@ package android.app { method public boolean onSearchRequested(android.view.SearchEvent); method public boolean onSearchRequested(); method protected void onStart(); + method public void onStateNotSaved(); method protected void onStop(); method protected void onTitleChanged(java.lang.CharSequence, int); method public boolean onTouchEvent(android.view.MotionEvent); diff --git a/api/system-current.txt b/api/system-current.txt index d9702ac..7987803 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3516,6 +3516,7 @@ package android.app { method public boolean onSearchRequested(android.view.SearchEvent); method public boolean onSearchRequested(); method protected void onStart(); + method public void onStateNotSaved(); method protected void onStop(); method protected void onTitleChanged(java.lang.CharSequence, int); method public boolean onTouchEvent(android.view.MotionEvent); |