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

Revert "RESTRICT AUTOMERGE Remove deprecated System APIs added in Q."

Browse Source 
This reverts commit 02014297fd.

Reason for revert: QT SDK Finalization. Will be merged again on/after May 13th

Bug: 129975435
Change-Id: Ia054b193a982dee669630555974d2d7831fe2b50
This commit is contained in:
Ian Pedowitz
2019-05-02 00:54:39 +00:00
parent 02014297fd
commit 79a19effee
10 changed files with 16 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/system-current.txt
View File

@@ -317,6 +317,7 @@ package android.app {
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 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> getPackagesForOps(@Nullable String[]);
method public static int opToDefaultMode(@NonNull String);
@@ -935,6 +936,8 @@ package android.app.backup {
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>);
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 {
@@ -1089,11 +1092,14 @@ package android.app.prediction {
}
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 android.content.pm.ShortcutInfo);
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 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 {
@@ -1596,6 +1602,9 @@ package android.content.pm {
method public static void forceSafeLabels();
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);
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 {
@@ -6391,10 +6400,14 @@ package android.service.contentsuggestions {
public abstract class ContentSuggestionsService extends android.app.Service {
ctor public ContentSuggestionsService();
method @Deprecated public void classifyContentSelections(@NonNull android.app.contentsuggestions.ClassificationsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.ClassificationsCallback);
method @Deprecated public void notifyInteraction(@NonNull String, @NonNull android.os.Bundle);
method public void onClassifyContentSelections(@NonNull android.app.contentsuggestions.ClassificationsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.ClassificationsCallback);
method public void onNotifyInteraction(@NonNull String, @NonNull android.os.Bundle);
method public void onProcessContextImage(int, @Nullable android.graphics.Bitmap, @NonNull android.os.Bundle);
method public void onSuggestContentSelections(@NonNull android.app.contentsuggestions.SelectionsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.SelectionsCallback);
method @Deprecated public void processContextImage(int, @Nullable android.graphics.Bitmap, @NonNull android.os.Bundle);
method @Deprecated public void suggestContentSelections(@NonNull android.app.contentsuggestions.SelectionsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.SelectionsCallback);
field public static final String SERVICE_INTERFACE = "android.service.contentsuggestions.ContentSuggestionsService";
}
@@ -7092,6 +7105,7 @@ 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(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 @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);
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";

52
api/system-removed.txt
View File

@@ -9,10 +9,6 @@ package android {
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 {
method public static Class<? extends android.app.Notification.Style> getNotificationStyleClass(String);
}
@@ -32,25 +28,6 @@ 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 {
public class Intent implements java.lang.Cloneable android.os.Parcelable {
@@ -83,16 +60,6 @@ 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 {
public final class HdmiControlManager {
@@ -171,17 +138,6 @@ package android.provider {
}
package android.service.contentsuggestions {
public abstract class ContentSuggestionsService extends android.app.Service {
method @Deprecated public void classifyContentSelections(@NonNull android.app.contentsuggestions.ClassificationsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.ClassificationsCallback);
method @Deprecated public void notifyInteraction(@NonNull String, @NonNull android.os.Bundle);
method @Deprecated public void processContextImage(int, @Nullable android.graphics.Bitmap, @NonNull android.os.Bundle);
method @Deprecated public void suggestContentSelections(@NonNull android.app.contentsuggestions.SelectionsRequest, @NonNull android.app.contentsuggestions.ContentSuggestionsManager.SelectionsCallback);
}
}
package android.service.notification {
public abstract class NotificationListenerService extends android.app.Service {
@@ -202,14 +158,6 @@ 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 {
public class TelephonyManager {

2
api/test-current.txt
View File

@@ -520,6 +520,8 @@ package android.app.prediction {
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 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 {

9
api/test-removed.txt
View File

@@ -1,13 +1,4 @@
// 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 {
public final class DeviceConfig {

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

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

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

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

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

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

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

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

4
core/java/android/service/contentsuggestions/ContentSuggestionsService.java
View File

@@ -184,7 +184,6 @@ public abstract class ContentSuggestionsService extends Service {
/**
* For temporary compat reason, remove with b/127532182
* @deprecated use {@link #onProcessContextImage(int, Bitmap, Bundle)} instead.
* @removed
*/
@Deprecated
public void processContextImage(
@@ -195,7 +194,6 @@ public abstract class ContentSuggestionsService extends Service {
* For temporary compat reason, remove with b/127532182
* @deprecated use {@link #onSuggestContentSelections(SelectionsRequest,
* ContentSuggestionsManager.SelectionsCallback)} instead.
* @removed
*/
@Deprecated
public void suggestContentSelections(@NonNull SelectionsRequest request,
@@ -206,7 +204,6 @@ public abstract class ContentSuggestionsService extends Service {
* For temporary compat reason, remove with b/127532182
* @deprecated use {@link #onClassifyContentSelections(ClassificationsRequest,
* ContentSuggestionsManager.ClassificationsCallback)} instead.
* @removed
*/
@Deprecated
public void classifyContentSelections(@NonNull ClassificationsRequest request,
@@ -216,7 +213,6 @@ public abstract class ContentSuggestionsService extends Service {
/**
* For temporary compat reason, remove with b/127532182
* @deprecated use {@link #onNotifyInteraction(String, Bundle)} instead.
* @removed
*/
@Deprecated
public void notifyInteraction(@NonNull String requestId, @NonNull Bundle interaction) {

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

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