Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Remove deprecated System APIs added in Q.""" into qt-dev

Browse Source
This commit is contained in:
Ian Pedowitz
2019-05-15 16:28:54 +00:00
committed by Android (Google) Code Review
parent d7219205a0 169bed7b7a
commit 3bd719b534
9 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/system-current.txt
View File

@@ -317,7 +317,6 @@ package android.app {
public class AppOpsManager { public class AppOpsManager {
method @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public void getHistoricalOps(@NonNull android.app.AppOpsManager.HistoricalOpsRequest, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.AppOpsManager.HistoricalOps>); method @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public void getHistoricalOps(@NonNull android.app.AppOpsManager.HistoricalOpsRequest, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.AppOpsManager.HistoricalOps>);
method public static String[] getOpStrs(); method public static String[] getOpStrs();
method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, @NonNull String, @Nullable int[]);
method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, @NonNull String, @Nullable java.lang.String...); method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, @NonNull String, @Nullable java.lang.String...);
method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getPackagesForOps(@Nullable String[]); method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getPackagesForOps(@Nullable String[]);
method public static int opToDefaultMode(@NonNull String); method public static int opToDefaultMode(@NonNull String);
@@ -936,8 +935,6 @@ package android.app.backup {
method public int restorePackage(String, android.app.backup.RestoreObserver); method public int restorePackage(String, android.app.backup.RestoreObserver);
method public int restorePackages(long, @Nullable android.app.backup.RestoreObserver, @NonNull java.util.Set<java.lang.String>, @Nullable android.app.backup.BackupManagerMonitor); method public int restorePackages(long, @Nullable android.app.backup.RestoreObserver, @NonNull java.util.Set<java.lang.String>, @Nullable android.app.backup.BackupManagerMonitor);
method public int restorePackages(long, @Nullable android.app.backup.RestoreObserver, @NonNull java.util.Set<java.lang.String>); method public int restorePackages(long, @Nullable android.app.backup.RestoreObserver, @NonNull java.util.Set<java.lang.String>);
method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor, String[]);
method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, String[]);
} }
public class RestoreSet implements android.os.Parcelable { public class RestoreSet implements android.os.Parcelable {
@@ -1092,14 +1089,11 @@ package android.app.prediction {
} }
public static final class AppTarget.Builder { public static final class AppTarget.Builder {
ctor @Deprecated public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId);
ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull String, @NonNull android.os.UserHandle); ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull String, @NonNull android.os.UserHandle);
ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull android.content.pm.ShortcutInfo); ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull android.content.pm.ShortcutInfo);
method @NonNull public android.app.prediction.AppTarget build(); method @NonNull public android.app.prediction.AppTarget build();
method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String); method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);
method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int); method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);
method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
} }
public final class AppTargetEvent implements android.os.Parcelable { public final class AppTargetEvent implements android.os.Parcelable {
@@ -1602,9 +1596,6 @@ package android.content.pm {
method public static void forceSafeLabels(); method public static void forceSafeLabels();
method @Deprecated @NonNull public CharSequence loadSafeLabel(@NonNull android.content.pm.PackageManager); method @Deprecated @NonNull public CharSequence loadSafeLabel(@NonNull android.content.pm.PackageManager);
method @NonNull public CharSequence loadSafeLabel(@NonNull android.content.pm.PackageManager, @FloatRange(from=0) float, int); method @NonNull public CharSequence loadSafeLabel(@NonNull android.content.pm.PackageManager, @FloatRange(from=0) float, int);
field @Deprecated public static final int SAFE_LABEL_FLAG_FIRST_LINE = 4; // 0x4
field @Deprecated public static final int SAFE_LABEL_FLAG_SINGLE_LINE = 2; // 0x2
field @Deprecated public static final int SAFE_LABEL_FLAG_TRIM = 1; // 0x1
} }
public abstract class PackageManager { public abstract class PackageManager {
@@ -7102,7 +7093,6 @@ package android.telecom {
method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(String); method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(String);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();
method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging(); method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();
method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.WRITE_SECURE_SETTINGS}) public boolean setDefaultDialer(@Nullable String);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle);
field public static final String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT"; field public static final String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT";
field public static final String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT"; field public static final String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT";

41
api/system-removed.txt
View File

@@ -9,6 +9,10 @@ package android {
package android.app { package android.app {
public class AppOpsManager {
method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, @NonNull String, @Nullable int[]);
}
public class Notification implements android.os.Parcelable { public class Notification implements android.os.Parcelable {
method public static Class<? extends android.app.Notification.Style> getNotificationStyleClass(String); method public static Class<? extends android.app.Notification.Style> getNotificationStyleClass(String);
} }
@@ -28,6 +32,25 @@ package android.app.admin {
} }
package android.app.backup {
public class RestoreSession {
method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, android.app.backup.BackupManagerMonitor, String[]);
method @Deprecated public int restoreSome(long, android.app.backup.RestoreObserver, String[]);
}
}
package android.app.prediction {
public static final class AppTarget.Builder {
ctor @Deprecated public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId);
method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
}
}
package android.content { package android.content {
public class Intent implements java.lang.Cloneable android.os.Parcelable { public class Intent implements java.lang.Cloneable android.os.Parcelable {
@@ -60,6 +83,16 @@ package android.content {
} }
package android.content.pm {
public class PackageItemInfo {
field @Deprecated public static final int SAFE_LABEL_FLAG_FIRST_LINE = 4; // 0x4
field @Deprecated public static final int SAFE_LABEL_FLAG_SINGLE_LINE = 2; // 0x2
field @Deprecated public static final int SAFE_LABEL_FLAG_TRIM = 1; // 0x1
}
}
package android.hardware.hdmi { package android.hardware.hdmi {
public final class HdmiControlManager { public final class HdmiControlManager {
@@ -158,6 +191,14 @@ package android.service.notification {
} }
package android.telecom {
public class TelecomManager {
method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.WRITE_SECURE_SETTINGS}) public boolean setDefaultDialer(@Nullable String);
}
}
package android.telephony { package android.telephony {
public class TelephonyManager { public class TelephonyManager {

2
api/test-current.txt
View File

@@ -520,8 +520,6 @@ package android.app.prediction {
method @NonNull public android.app.prediction.AppTarget build(); method @NonNull public android.app.prediction.AppTarget build();
method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String); method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);
method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int); method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);
method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
} }
public final class AppTargetEvent implements android.os.Parcelable { public final class AppTargetEvent implements android.os.Parcelable {

9
api/test-removed.txt
View File

@@ -1,4 +1,13 @@
// Signature format: 2.0 // Signature format: 2.0
package android.app.prediction {
public static final class AppTarget.Builder {
method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
}
}
package android.provider { package android.provider {
public final class DeviceConfig { public final class DeviceConfig {

1
core/java/android/app/AppOpsManager.java
View File

@@ -4370,6 +4370,7 @@ public class AppOpsManager {
* {@link #getOpsForPackage(int, String, String...)})}. * {@link #getOpsForPackage(int, String, String...)})}.
* *
* @hide * @hide
* @removed
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi

2
core/java/android/app/backup/RestoreSession.java
View File

@@ -214,6 +214,7 @@ public class RestoreSession {
* *
* @deprecated use {@link RestoreSession#restorePackages(long, RestoreObserver, * @deprecated use {@link RestoreSession#restorePackages(long, RestoreObserver,
* BackupManagerMonitor, Set)} instead. * BackupManagerMonitor, Set)} instead.
* @removed
*/ */
@Deprecated @Deprecated
public int restoreSome(long token, RestoreObserver observer, BackupManagerMonitor monitor, public int restoreSome(long token, RestoreObserver observer, BackupManagerMonitor monitor,
@@ -240,6 +241,7 @@ public class RestoreSession {
* *
* @deprecated use {@link RestoreSession#restorePackages(long, RestoreObserver, Set)} * @deprecated use {@link RestoreSession#restorePackages(long, RestoreObserver, Set)}
* instead. * instead.
* @removed
*/ */
@Deprecated @Deprecated
public int restoreSome(long token, RestoreObserver observer, String[] packages) { public int restoreSome(long token, RestoreObserver observer, String[] packages) {

3
core/java/android/app/prediction/AppTarget.java
View File

@@ -206,6 +206,7 @@ public final class AppTarget implements Parcelable {
/** /**
* @deprecated Use the other Builder constructors. * @deprecated Use the other Builder constructors.
* @hide * @hide
* @removed
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi
@@ -244,6 +245,7 @@ public final class AppTarget implements Parcelable {
/** /**
* @deprecated Use the appropriate constructor. * @deprecated Use the appropriate constructor.
* @removed
*/ */
@NonNull @NonNull
@Deprecated @Deprecated
@@ -258,6 +260,7 @@ public final class AppTarget implements Parcelable {
/** /**
* @deprecated Use the appropriate constructor. * @deprecated Use the appropriate constructor.
* @removed
*/ */
@NonNull @NonNull
@Deprecated @Deprecated

3
core/java/android/content/pm/PackageItemInfo.java
View File

@@ -62,6 +62,7 @@ public class PackageItemInfo {
* *
* @deprecated Use {@link TextUtils#SAFE_STRING_FLAG_TRIM} instead * @deprecated Use {@link TextUtils#SAFE_STRING_FLAG_TRIM} instead
* @hide * @hide
* @removed
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi
@@ -75,6 +76,7 @@ public class PackageItemInfo {
* *
* @deprecated Use {@link TextUtils#SAFE_STRING_FLAG_SINGLE_LINE} instead * @deprecated Use {@link TextUtils#SAFE_STRING_FLAG_SINGLE_LINE} instead
* @hide * @hide
* @removed
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi
@@ -88,6 +90,7 @@ public class PackageItemInfo {
* *
* @deprecated Use {@link TextUtils#SAFE_STRING_FLAG_FIRST_LINE} instead * @deprecated Use {@link TextUtils#SAFE_STRING_FLAG_FIRST_LINE} instead
* @hide * @hide
* @removed
*/ */
@Deprecated @Deprecated
@SystemApi @SystemApi

1
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -1249,6 +1249,7 @@ public class TelecomManager {
* @deprecated Use * @deprecated Use
* {@link android.app.role.RoleManager#addRoleHolderAsUser(String, String, int, UserHandle, * {@link android.app.role.RoleManager#addRoleHolderAsUser(String, String, int, UserHandle,
* Executor, java.util.function.Consumer)} instead. * Executor, java.util.function.Consumer)} instead.
* @removed
*/ */
@SystemApi @SystemApi
@Deprecated @Deprecated