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

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

Merge "Revert "Hide APIs not intended to ship in DR.""

parents 57fef233 90396365

api/current.txt

+16 −1
Original line number Diff line number Diff line
@@ -10712,6 +10712,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";

    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION_NFCF = "android.hardware.nfc.hcef";

    field public static final java.lang.String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep";

    field public static final java.lang.String FEATURE_PC = "android.hardware.type.pc";

    field public static final java.lang.String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";

    field public static final java.lang.String FEATURE_PRINTING = "android.software.print";

    field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";
@@ -10753,6 +10754,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi";

    field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";

    field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";

    field public static final java.lang.String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";

    field public static final int GET_ACTIVITIES = 1; // 0x1

    field public static final int GET_CONFIGURATIONS = 16384; // 0x4000

    field public static final deprecated int GET_DISABLED_COMPONENTS = 512; // 0x200
@@ -38672,7 +38674,8 @@ package android.telecom { 














  public static final class Call.RttCall {















    method public int getRttAudioMode();













    method public java.lang.String read();













    method public java.lang.String read() throws java.io.IOException;













    method public java.lang.String readImmediately() throws java.io.IOException;















    method public void setRttMode(int);















    method public void write(java.lang.String) throws java.io.IOException;















    field public static final int RTT_MODE_FULL = 1; // 0x1










@@ -43964,6 +43967,7 @@ package android.view {













    method public android.os.Vibrator getVibrator();















    method public boolean[] hasKeys(int...);















    method public boolean hasMicrophone();













    method public boolean isEnabled();















    method public boolean isVirtual();















    method public boolean supportsSource(int);















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










@@ -46953,6 +46957,7 @@ package android.view.accessibility {













  }





























  public final class AccessibilityManager {













    method public void addAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);















    method public boolean addAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);















    method public void addAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener, android.os.Handler);















    method public boolean addTouchExplorationStateChangeListener(android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);









@@ -46963,6 +46968,7 @@ package android.view.accessibility {













    method public void interrupt();















    method public boolean isEnabled();















    method public boolean isTouchExplorationEnabled();













    method public void removeAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);















    method public boolean removeAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);















    method public boolean removeTouchExplorationStateChangeListener(android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);















    method public void sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent);










@@ -47279,6 +47285,13 @@ package android.view.accessibility {













    method public void setToIndex(int);















  }



























  public abstract class AccessibilityRequestPreparer {













    ctor public AccessibilityRequestPreparer(android.view.View, int);













    method public android.view.View getView();













    method public abstract void onPrepareExtraData(int, java.lang.String, android.os.Bundle, android.os.Message);













    field public static final int REQUEST_TYPE_EXTRA_DATA = 1; // 0x1













  }



























  public final class AccessibilityWindowInfo implements android.os.Parcelable {















    method public int describeContents();















    method public android.view.accessibility.AccessibilityNodeInfo getAnchor();










@@ -48800,6 +48813,7 @@ package android.webkit {













    method public void goBack();















    method public void goBackOrForward(int);















    method public void goForward();













    method public static void initSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);















    method public void invokeZoomPicker();















    method public boolean isPrivateBrowsingEnabled();















    method public void loadData(java.lang.String, java.lang.String, java.lang.String);










@@ -48844,6 +48858,7 @@ package android.webkit {













    method public static void setWebContentsDebuggingEnabled(boolean);















    method public void setWebViewClient(android.webkit.WebViewClient);















    method public deprecated boolean showFindDialog(java.lang.String, boolean);













    method public static void shutdownSafeBrowsing();















    method public void stopLoading();















    method public void zoomBy(float);















    method public boolean zoomIn();

























api/system-current.txt



+26
−1




























Original line number
Diff line number
Diff line








@@ -6679,6 +6679,7 @@ package android.app.admin {













    field public static final java.lang.String ACTION_SET_NEW_PASSWORD = "android.app.action.SET_NEW_PASSWORD";















    field public static final java.lang.String ACTION_SET_PROFILE_OWNER = "android.app.action.SET_PROFILE_OWNER";















    field public static final java.lang.String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION";













    field public static final java.lang.String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE";















    field public static final java.lang.String ACTION_SYSTEM_UPDATE_POLICY_CHANGED = "android.app.action.SYSTEM_UPDATE_POLICY_CHANGED";















    field public static final java.lang.String DELEGATION_APP_RESTRICTIONS = "delegation-app-restrictions";















    field public static final java.lang.String DELEGATION_BLOCK_UNINSTALL = "delegation-block-uninstall";










@@ -11335,6 +11336,7 @@ package android.content.pm {













    method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(android.content.Intent, int);















    method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(android.content.Intent, int);















    method public abstract java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;













    method public abstract void registerDexModule(java.lang.String, android.content.pm.PackageManager.DexModuleRegisterCallback);















    method public abstract void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);















    method public abstract deprecated void removePackageFromPreferred(java.lang.String);















    method public abstract void removePermission(java.lang.String);










@@ -11413,6 +11415,7 @@ package android.content.pm {













    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";















    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION_NFCF = "android.hardware.nfc.hcef";















    field public static final java.lang.String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep";













    field public static final java.lang.String FEATURE_PC = "android.hardware.type.pc";















    field public static final java.lang.String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";















    field public static final java.lang.String FEATURE_PRINTING = "android.software.print";















    field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";










@@ -11455,6 +11458,7 @@ package android.content.pm {













    field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi";















    field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";















    field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";













    field public static final java.lang.String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";















    field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20















    field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4















    field public static final int FLAG_PERMISSION_REVIEW_REQUIRED = 64; // 0x40










@@ -11554,6 +11558,11 @@ package android.content.pm {













    field public static final int VERSION_CODE_HIGHEST = -1; // 0xffffffff















  }



























  public static abstract class PackageManager.DexModuleRegisterCallback {













    ctor public PackageManager.DexModuleRegisterCallback();













    method public abstract void onDexModuleRegistered(java.lang.String, boolean, java.lang.String);













  }



























  public static class PackageManager.NameNotFoundException extends android.util.AndroidException {















    ctor public PackageManager.NameNotFoundException();















    ctor public PackageManager.NameNotFoundException(java.lang.String);










@@ -41909,7 +41918,8 @@ package android.telecom {



























  public static final class Call.RttCall {















    method public int getRttAudioMode();













    method public java.lang.String read();













    method public java.lang.String read() throws java.io.IOException;













    method public java.lang.String readImmediately() throws java.io.IOException;















    method public void setRttMode(int);















    method public void write(java.lang.String) throws java.io.IOException;















    field public static final int RTT_MODE_FULL = 1; // 0x1










@@ -44380,6 +44390,7 @@ package android.test.mock {













    method public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(android.content.Intent, int);















    method public java.util.List<android.content.pm.ResolveInfo> queryIntentServices(android.content.Intent, int);















    method public java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;













    method public void registerDexModule(java.lang.String, android.content.pm.PackageManager.DexModuleRegisterCallback);















    method public void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);















    method public void removePackageFromPreferred(java.lang.String);















    method public void removePermission(java.lang.String);










@@ -47503,6 +47514,7 @@ package android.view {













    method public android.os.Vibrator getVibrator();















    method public boolean[] hasKeys(int...);















    method public boolean hasMicrophone();













    method public boolean isEnabled();















    method public boolean isVirtual();















    method public boolean supportsSource(int);















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










@@ -50495,6 +50507,7 @@ package android.view.accessibility {













  }





























  public final class AccessibilityManager {













    method public void addAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);















    method public boolean addAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);















    method public void addAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener, android.os.Handler);















    method public boolean addTouchExplorationStateChangeListener(android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);









@@ -50506,6 +50519,7 @@ package android.view.accessibility {













    method public static boolean isAccessibilityButtonSupported();















    method public boolean isEnabled();















    method public boolean isTouchExplorationEnabled();













    method public void removeAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);















    method public boolean removeAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);















    method public boolean removeTouchExplorationStateChangeListener(android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);















    method public void sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent);










@@ -50822,6 +50836,13 @@ package android.view.accessibility {













    method public void setToIndex(int);















  }



























  public abstract class AccessibilityRequestPreparer {













    ctor public AccessibilityRequestPreparer(android.view.View, int);













    method public android.view.View getView();













    method public abstract void onPrepareExtraData(int, java.lang.String, android.os.Bundle, android.os.Message);













    field public static final int REQUEST_TYPE_EXTRA_DATA = 1; // 0x1













  }



























  public final class AccessibilityWindowInfo implements android.os.Parcelable {















    method public int describeContents();















    method public android.view.accessibility.AccessibilityNodeInfo getAnchor();










@@ -52437,6 +52458,7 @@ package android.webkit {













    method public void goBack();















    method public void goBackOrForward(int);















    method public void goForward();













    method public static void initSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);















    method public void invokeZoomPicker();















    method public boolean isPrivateBrowsingEnabled();















    method public void loadData(java.lang.String, java.lang.String, java.lang.String);










@@ -52481,6 +52503,7 @@ package android.webkit {













    method public static void setWebContentsDebuggingEnabled(boolean);















    method public void setWebViewClient(android.webkit.WebViewClient);















    method public deprecated boolean showFindDialog(java.lang.String, boolean);













    method public static void shutdownSafeBrowsing();















    method public void stopLoading();















    method public void zoomBy(float);















    method public boolean zoomIn();










@@ -52668,8 +52691,10 @@ package android.webkit {













    method public abstract java.lang.String findAddress(java.lang.String);















    method public abstract void freeMemoryForTests();















    method public abstract java.lang.String getDefaultUserAgent(android.content.Context);













    method public abstract void initSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);















    method public abstract android.net.Uri[] parseFileChooserResult(int, android.content.Intent);















    method public abstract void setWebContentsDebuggingEnabled(boolean);













    method public abstract void shutdownSafeBrowsing();















  }





























  public class WebViewFragment extends android.app.Fragment {

























api/test-current.txt



+6
−1




























Original line number
Diff line number
Diff line








@@ -10753,6 +10753,7 @@ package android.content.pm {













    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";















    field public static final java.lang.String FEATURE_NFC_HOST_CARD_EMULATION_NFCF = "android.hardware.nfc.hcef";















    field public static final java.lang.String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep";













    field public static final java.lang.String FEATURE_PC = "android.hardware.type.pc";















    field public static final java.lang.String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";















    field public static final java.lang.String FEATURE_PRINTING = "android.software.print";















    field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";










@@ -10794,6 +10795,7 @@ package android.content.pm {













    field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi";















    field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";















    field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";













    field public static final java.lang.String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";















    field public static final int GET_ACTIVITIES = 1; // 0x1















    field public static final int GET_CONFIGURATIONS = 16384; // 0x4000















    field public static final deprecated int GET_DISABLED_COMPONENTS = 512; // 0x200










@@ -38879,7 +38881,7 @@ package android.telecom {



























  public static final class Call.RttCall {















    method public int getRttAudioMode();













    method public java.lang.String read();













    method public java.lang.String read() throws java.io.IOException;















    method public java.lang.String readImmediately() throws java.io.IOException;















    method public void setRttMode(int);















    method public void write(java.lang.String) throws java.io.IOException;










@@ -44360,6 +44362,7 @@ package android.view {













    method public android.os.Vibrator getVibrator();















    method public boolean[] hasKeys(int...);















    method public boolean hasMicrophone();













    method public boolean isEnabled();















    method public boolean isVirtual();















    method public boolean supportsSource(int);















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










@@ -49225,6 +49228,7 @@ package android.webkit {













    method public void goBack();















    method public void goBackOrForward(int);















    method public void goForward();













    method public static void initSafeBrowsing(android.content.Context, android.webkit.ValueCallback<java.lang.Boolean>);















    method public void invokeZoomPicker();















    method public boolean isPrivateBrowsingEnabled();















    method public void loadData(java.lang.String, java.lang.String, java.lang.String);










@@ -49269,6 +49273,7 @@ package android.webkit {













    method public static void setWebContentsDebuggingEnabled(boolean);















    method public void setWebViewClient(android.webkit.WebViewClient);















    method public deprecated boolean showFindDialog(java.lang.String, boolean);













    method public static void shutdownSafeBrowsing();















    method public void stopLoading();















    method public void zoomBy(float);















    method public boolean zoomIn();

























core/java/android/app/admin/DevicePolicyManager.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -279,6 +279,7 @@ public class DevicePolicyManager {













     * @hide















     */















    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)













    @SystemApi















    public static final String ACTION_STATE_USER_SETUP_COMPLETE =















            "android.app.action.STATE_USER_SETUP_COMPLETE";

















































core/java/android/content/pm/PackageManager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -2285,7 +2285,6 @@ public abstract class PackageManager {













    /**















     * Feature for {@link #getSystemAvailableFeatures} and















     * {@link #hasSystemFeature}: The device supports Wi-Fi Passpoint.













     * @hide















     */















    @SdkConstant(SdkConstantType.FEATURE)















    public static final String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";










@@ -2343,7 +2342,6 @@ public abstract class PackageManager {













     * computers, laptops and variants such as convertibles or detachables.















     * Due to the larger screen, the device will most likely use the















     * {@link #FEATURE_FREEFORM_WINDOW_MANAGEMENT} feature as well.













     * @hide















     */















    @SdkConstant(SdkConstantType.FEATURE)















    public static final String FEATURE_PC = "android.hardware.type.pc";










@@ -5775,6 +5773,7 @@ public abstract class PackageManager {













     *















     * @hide















     */













    @SystemApi















    public static abstract class DexModuleRegisterCallback {















        public abstract void onDexModuleRegistered(String dexModulePath, boolean success,















                String message);










@@ -5808,6 +5807,7 @@ public abstract class PackageManager {













     *















     * @hide















     */













    @SystemApi















    public abstract void registerDexModule(String dexModulePath,















            @Nullable DexModuleRegisterCallback callback);















}