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

Commit cba2b002 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Deeper sanity checking of emitted types."

parents 352be20d c204c223

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since $(SRC_API_DIR)/25.txt 25 \

    -since $(SRC_API_DIR)/26.txt 26 \

    -since $(SRC_API_DIR)/27.txt 27 \

    -werror -lerror -hide 111 -hide 113 -hide 121 -hide 125 -hide 126 -hide 127 -hide 128 \

    -werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 \

    -overview $(LOCAL_PATH)/core/java/overview.html \



framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -41769,8 +41769,6 @@ package android.test.suitebuilder { 
  public deprecated class TestSuiteBuilder {

    ctor public TestSuiteBuilder(java.lang.Class);

    ctor public TestSuiteBuilder(java.lang.String, java.lang.ClassLoader);

    method public android.test.suitebuilder.TestSuiteBuilder addRequirements(java.util.List<com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>>);

    method public final android.test.suitebuilder.TestSuiteBuilder addRequirements(com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...);

    method public final junit.framework.TestSuite build();

    method public android.test.suitebuilder.TestSuiteBuilder excludePackages(java.lang.String...);

    method protected java.lang.String getSuiteName();

api/removed.txt

+0 −4
Original line number Diff line number Diff line
@@ -210,10 +210,6 @@ package android.media { 


package android.media.tv {



  public final class TvInputManager {

    method public android.media.tv.TvInputManager.Hardware acquireTvInputHardware(int, android.media.tv.TvInputManager.HardwareCallback, android.media.tv.TvInputInfo);

  }



  public class TvView extends android.view.ViewGroup {

    method public void requestUnblockContent(android.media.tv.TvContentRating);

  }

api/system-current.txt

+14 −0
Original line number Diff line number Diff line
@@ -751,6 +751,20 @@ package android.content.pm { 
    field public java.lang.String credentialProtectedDataDir;

  }



  public final class InstantAppInfo implements android.os.Parcelable {

    ctor public InstantAppInfo(android.content.pm.ApplicationInfo, java.lang.String[], java.lang.String[]);

    ctor public InstantAppInfo(java.lang.String, java.lang.CharSequence, java.lang.String[], java.lang.String[]);

    method public int describeContents();

    method public android.content.pm.ApplicationInfo getApplicationInfo();

    method public java.lang.String[] getGrantedPermissions();

    method public java.lang.String getPackageName();

    method public java.lang.String[] getRequestedPermissions();

    method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);

    method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.content.pm.InstantAppInfo> CREATOR;

  }



  public final class InstantAppIntentFilter implements android.os.Parcelable {

    ctor public InstantAppIntentFilter(java.lang.String, java.util.List<android.content.IntentFilter>);

    method public int describeContents();

api/system-removed.txt

+11 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ package android.content.pm { 


package android.media.tv {



  public final class TvInputManager {

    method public android.media.tv.TvInputManager.Hardware acquireTvInputHardware(int, android.media.tv.TvInputManager.HardwareCallback, android.media.tv.TvInputInfo);

  }



  public static final class TvInputManager.Hardware {

    method public boolean dispatchKeyEventToHdmi(android.view.KeyEvent);

  }
@@ -111,6 +115,13 @@ package android.media.tv { 


package android.net.wifi {



  public deprecated class BatchedScanResult implements android.os.Parcelable {

    ctor public BatchedScanResult();

    ctor public BatchedScanResult(android.net.wifi.BatchedScanResult);

    field public final java.util.List<android.net.wifi.ScanResult> scanResults;

    field public boolean truncated;

  }



  public class ScanResult implements android.os.Parcelable {

    field public boolean untrusted;

  }