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

Commit 0f94fc6f authored by Andreas Gampe's avatar Andreas Gampe Committed by Android (Google) Code Review
Browse files

Merge "Frameworks/base: Fix a constructor"

parents 4b57e74b 70e21e61

api/current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -23631,7 +23631,6 @@ package android.os { 
  }

  }

















  public class RecoverySystem {







  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 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 rebootWipeCache(android.content.Context) throws java.io.IOException;











    method public static void rebootWipeUserData(android.content.Context) throws java.io.IOException;







    method public static void rebootWipeUserData(android.content.Context) throws java.io.IOException;

























api/removed.txt



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -60,6 +60,10 @@ package android.os {









    method public void wakeUp(long);







    method public void wakeUp(long);











  }







  }


































  public class RecoverySystem {














    ctor public RecoverySystem();














  }


























  public class UserManager {







  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 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);







    method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);

































api/system-current.txt



+0
−1




























Original line number
Original line
Diff line number
Diff line








@@ -25531,7 +25531,6 @@ package android.os {









  }







  }



























  public class RecoverySystem {







  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 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 rebootWipeCache(android.content.Context) throws java.io.IOException;











    method public static void rebootWipeUserData(android.content.Context) throws java.io.IOException;







    method public static void rebootWipeUserData(android.content.Context) throws java.io.IOException;

























api/system-removed.txt



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -60,6 +60,10 @@ package android.os {









    method public void wakeUp(long);







    method public void wakeUp(long);











  }







  }


































  public class RecoverySystem {














    ctor public RecoverySystem();














  }


























  public class UserManager {







  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 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);







    method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);

































core/java/android/os/RecoverySystem.java



+5
−1




























Original line number
Original line
Diff line number
Diff line








@@ -513,5 +513,9 @@ public class RecoverySystem {









        return arg;







        return arg;











    }







    }































    private void RecoverySystem() { }  // Do not instantiate






















    /**














     * @removed Was previously made visible by accident.














     */














    public RecoverySystem() { }











}






}