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

Commit 77c54b3a authored by Charles Munger's avatar Charles Munger Committed by android-build-merger
Browse files

Merge "Deprecate AliasActivity" am: 95b815e2 am: 66f56ac1 

am: 23220f27

Change-Id: I5f47c62422441997eacc57856ffa1bc43a778660
parents 5fc195c5 23220f27

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -4271,8 +4271,8 @@ package android.app { 
    method public android.app.AlertDialog show();

  }













  public class AliasActivity extends android.app.Activity {













    ctor public AliasActivity();













  @Deprecated public class AliasActivity extends android.app.Activity {













    ctor @Deprecated public AliasActivity();















  }





























  public class AppComponentFactory {

























core/java/android/app/AliasActivity.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -39,7 +39,10 @@ import java.io.IOException;













 * To use this activity, you should include in the manifest for the associated















 * component an entry named "android.app.alias".  It is a reference to an XML















 * resource describing an intent that launches the real application.













 *













 * @deprecated Use {@code <activity-alias>} or subclass Activity directly.















 */













@Deprecated















public class AliasActivity extends Activity {















    /**















     * This is the name under which you should store in your component the