diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-25 20:16:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-25 20:16:12 +0000 |
| commit | 0f94fc6f1df4ef03e639190a138d650bc6cf8adf (patch) | |
| tree | 8580002985f4232511a64e1ac4b133725ae38251 | |
| parent | 4b57e74bb3bea794f804655435e881d0ce756f57 (diff) | |
| parent | 70e21e61ac728c3e02d6d54a52b53199b4ebf9df (diff) | |
| download | frameworks_base-0f94fc6f1df4ef03e639190a138d650bc6cf8adf.zip frameworks_base-0f94fc6f1df4ef03e639190a138d650bc6cf8adf.tar.gz frameworks_base-0f94fc6f1df4ef03e639190a138d650bc6cf8adf.tar.bz2 | |
Merge "Frameworks/base: Fix a constructor"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/removed.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/system-removed.txt | 4 | ||||
| -rw-r--r-- | core/java/android/os/RecoverySystem.java | 6 |
5 files changed, 13 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 4ff18d7..eb69ed6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23631,7 +23631,6 @@ package android.os { } public class RecoverySystem { - ctor public RecoverySystem(); method public static void installPackage(android.content.Context, java.io.File) throws java.io.IOException; method public static void rebootWipeCache(android.content.Context) throws java.io.IOException; method public static void rebootWipeUserData(android.content.Context) throws java.io.IOException; diff --git a/api/removed.txt b/api/removed.txt index a722e17..5e77e15 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -60,6 +60,10 @@ package android.os { method public void wakeUp(long); } + public class RecoverySystem { + ctor public RecoverySystem(); + } + public class UserManager { method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int); method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle); diff --git a/api/system-current.txt b/api/system-current.txt index 87e130c..b8c7fa2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -25531,7 +25531,6 @@ package android.os { } public class RecoverySystem { - ctor public RecoverySystem(); method public static void installPackage(android.content.Context, java.io.File) throws java.io.IOException; method public static void rebootWipeCache(android.content.Context) throws java.io.IOException; method public static void rebootWipeUserData(android.content.Context) throws java.io.IOException; diff --git a/api/system-removed.txt b/api/system-removed.txt index a722e17..5e77e15 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -60,6 +60,10 @@ package android.os { method public void wakeUp(long); } + public class RecoverySystem { + ctor public RecoverySystem(); + } + public class UserManager { method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int); method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle); diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index b879c83..4aeab49 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -513,5 +513,9 @@ public class RecoverySystem { return arg; } - private void RecoverySystem() { } // Do not instantiate + + /** + * @removed Was previously made visible by accident. + */ + public RecoverySystem() { } } |