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

Commit a0ce7fc7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5319441 from 1cdbfae1 to qt-release 

Change-Id: I15c7f7bef4277988034e922761e9cc24a9b41d01
parents 40f76ebe 1cdbfae1

api/current.txt

+19 −46
Original line number Diff line number Diff line
@@ -9348,25 +9348,7 @@ package android.content { 
    field public static final android.os.Parcelable.Creator<android.content.ComponentName> CREATOR;

  }













  public interface ContentInterface {













    method @NonNull public android.content.ContentProviderResult[] applyBatch(@NonNull String, @NonNull java.util.ArrayList<android.content.ContentProviderOperation>) throws android.content.OperationApplicationException, android.os.RemoteException;













    method public int bulkInsert(@NonNull android.net.Uri, @NonNull android.content.ContentValues[]) throws android.os.RemoteException;













    method @Nullable public android.os.Bundle call(@NonNull String, @NonNull String, @Nullable String, @Nullable android.os.Bundle) throws android.os.RemoteException;













    method @Nullable public android.net.Uri canonicalize(@NonNull android.net.Uri) throws android.os.RemoteException;













    method public int delete(@NonNull android.net.Uri, @Nullable String, @Nullable String[]) throws android.os.RemoteException;













    method @Nullable public String[] getStreamTypes(@NonNull android.net.Uri, @NonNull String) throws android.os.RemoteException;













    method @Nullable public String getType(@NonNull android.net.Uri) throws android.os.RemoteException;













    method @Nullable public android.net.Uri insert(@NonNull android.net.Uri, @Nullable android.content.ContentValues) throws android.os.RemoteException;













    method @Nullable public android.content.res.AssetFileDescriptor openAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;













    method @Nullable public android.os.ParcelFileDescriptor openFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;













    method @Nullable public android.content.res.AssetFileDescriptor openTypedAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException, android.os.RemoteException;













    method @Nullable public android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws android.os.RemoteException;













    method public boolean refresh(@NonNull android.net.Uri, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws android.os.RemoteException;













    method @Nullable public android.net.Uri uncanonicalize(@NonNull android.net.Uri) throws android.os.RemoteException;













    method public int update(@NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[]) throws android.os.RemoteException;













  }

























  public abstract class ContentProvider implements android.content.ComponentCallbacks2 android.content.ContentInterface {













  public abstract class ContentProvider implements android.content.ComponentCallbacks2 {















    ctor public ContentProvider();















    method @NonNull public android.content.ContentProviderResult[] applyBatch(@NonNull String, @NonNull java.util.ArrayList<android.content.ContentProviderOperation>) throws android.content.OperationApplicationException;















    method @NonNull public android.content.ContentProviderResult[] applyBatch(@NonNull java.util.ArrayList<android.content.ContentProviderOperation>) throws android.content.OperationApplicationException;










@@ -9419,7 +9401,7 @@ package android.content {













    method public void writeDataToPipe(@NonNull android.os.ParcelFileDescriptor, @NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle, @Nullable T);















  }



























  public class ContentProviderClient implements java.lang.AutoCloseable android.content.ContentInterface {













  public class ContentProviderClient implements java.lang.AutoCloseable {















    method @NonNull public android.content.ContentProviderResult[] applyBatch(@NonNull java.util.ArrayList<android.content.ContentProviderOperation>) throws android.content.OperationApplicationException, android.os.RemoteException;















    method @NonNull public android.content.ContentProviderResult[] applyBatch(@NonNull String, @NonNull java.util.ArrayList<android.content.ContentProviderOperation>) throws android.content.OperationApplicationException, android.os.RemoteException;















    method public int bulkInsert(@NonNull android.net.Uri, @NonNull android.content.ContentValues[]) throws android.os.RemoteException;










@@ -9502,8 +9484,8 @@ package android.content {













    method public void setKeepUpdated(boolean);















  }



























  public abstract class ContentResolver implements android.content.ContentInterface {













    ctor public ContentResolver(android.content.Context);













  public abstract class ContentResolver {













    ctor public ContentResolver(@Nullable android.content.Context);















    method @Nullable public final android.content.ContentProviderClient acquireContentProviderClient(@NonNull android.net.Uri);















    method @Nullable public final android.content.ContentProviderClient acquireContentProviderClient(@NonNull String);















    method @Nullable public final android.content.ContentProviderClient acquireUnstableContentProviderClient(@NonNull android.net.Uri);










@@ -9568,6 +9550,8 @@ package android.content {













    method public final void unregisterContentObserver(@NonNull android.database.ContentObserver);















    method public final int update(@RequiresPermission.Write @NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[]);















    method public static void validateSyncExtrasBundle(android.os.Bundle);













    method public static android.content.ContentResolver wrap(@NonNull android.content.ContentProvider);













    method public static android.content.ContentResolver wrap(@NonNull android.content.ContentProviderClient);















    field public static final String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";















    field public static final String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";















    field public static final String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";










@@ -26008,6 +25992,7 @@ package android.media {













    method public void broadcastSessionCommand(@NonNull android.media.Session2Command, @Nullable android.os.Bundle);















    method public void cancelSessionCommand(@NonNull android.media.MediaSession2.ControllerInfo, @NonNull Object);















    method public void close();













    method @NonNull public java.util.List<android.media.MediaSession2.ControllerInfo> getConnectedControllers();















    method @NonNull public String getSessionId();















    method @NonNull public android.media.Session2Token getSessionToken();















    method public boolean isPlaybackActive();










@@ -38170,38 +38155,26 @@ package android.provider {













    method public static android.net.Uri buildRootsUri(String);















    method public static android.net.Uri buildSearchDocumentsUri(String, String, String);















    method public static android.net.Uri buildTreeDocumentUri(String, String);













    method public static android.net.Uri copyDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;













    method @Deprecated public static android.net.Uri copyDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;













    method public static android.net.Uri createDocument(android.content.ContentInterface, android.net.Uri, String, String) throws java.io.FileNotFoundException;













    method @Deprecated public static android.net.Uri createDocument(android.content.ContentResolver, android.net.Uri, String, String) throws java.io.FileNotFoundException;













    method public static android.content.IntentSender createWebLinkIntent(android.content.ContentInterface, android.net.Uri, android.os.Bundle) throws java.io.FileNotFoundException;













    method @Deprecated public static android.content.IntentSender createWebLinkIntent(android.content.ContentResolver, android.net.Uri, android.os.Bundle) throws java.io.FileNotFoundException;













    method public static boolean deleteDocument(android.content.ContentInterface, android.net.Uri) throws java.io.FileNotFoundException;













    method @Deprecated public static boolean deleteDocument(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;













    method public static void ejectRoot(android.content.ContentInterface, android.net.Uri);













    method @Deprecated public static void ejectRoot(android.content.ContentResolver, android.net.Uri);













    method public static android.provider.DocumentsContract.Path findDocumentPath(android.content.ContentInterface, android.net.Uri) throws java.io.FileNotFoundException;













    method @Deprecated public static android.provider.DocumentsContract.Path findDocumentPath(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;













    method @Nullable public static android.net.Uri copyDocument(@NonNull android.content.ContentResolver, @NonNull android.net.Uri, @NonNull android.net.Uri) throws java.io.FileNotFoundException;













    method @Nullable public static android.net.Uri createDocument(@NonNull android.content.ContentResolver, @NonNull android.net.Uri, @NonNull String, @NonNull String) throws java.io.FileNotFoundException;













    method @Nullable public static android.content.IntentSender createWebLinkIntent(@NonNull android.content.ContentResolver, @NonNull android.net.Uri, @Nullable android.os.Bundle) throws java.io.FileNotFoundException;













    method public static boolean deleteDocument(@NonNull android.content.ContentResolver, @NonNull android.net.Uri) throws java.io.FileNotFoundException;













    method public static void ejectRoot(@NonNull android.content.ContentResolver, @NonNull android.net.Uri);













    method @Nullable public static android.provider.DocumentsContract.Path findDocumentPath(@NonNull android.content.ContentResolver, @NonNull android.net.Uri) throws java.io.FileNotFoundException;















    method public static String getDocumentId(android.net.Uri);













    method @Nullable public static android.os.Bundle getDocumentMetadata(@NonNull android.content.ContentInterface, @NonNull android.net.Uri) throws java.io.FileNotFoundException;













    method @Deprecated public static android.os.Bundle getDocumentMetadata(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException;













    method public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentInterface, android.net.Uri, android.graphics.Point, android.os.CancellationSignal) throws java.io.FileNotFoundException;













    method @Deprecated public static android.graphics.Bitmap getDocumentThumbnail(android.content.ContentResolver, android.net.Uri, android.graphics.Point, android.os.CancellationSignal) throws java.io.FileNotFoundException;













    method @Nullable public static android.os.Bundle getDocumentMetadata(@NonNull android.content.ContentResolver, @NonNull android.net.Uri) throws java.io.FileNotFoundException;













    method @Nullable public static android.graphics.Bitmap getDocumentThumbnail(@NonNull android.content.ContentResolver, @NonNull android.net.Uri, @NonNull android.graphics.Point, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;















    method public static String getRootId(android.net.Uri);















    method public static String getSearchDocumentsQuery(android.net.Uri);















    method public static String getTreeDocumentId(android.net.Uri);













    method public static boolean isChildDocument(@NonNull android.content.ContentInterface, @NonNull android.net.Uri, @NonNull android.net.Uri) throws java.io.FileNotFoundException;













    method @Deprecated public static boolean isChildDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;













    method public static boolean isChildDocument(@NonNull android.content.ContentResolver, @NonNull android.net.Uri, @NonNull android.net.Uri) throws java.io.FileNotFoundException;















    method public static boolean isDocumentUri(android.content.Context, @Nullable android.net.Uri);















    method public static boolean isRootUri(@NonNull android.content.Context, @Nullable android.net.Uri);















    method public static boolean isRootsUri(@NonNull android.content.Context, @Nullable android.net.Uri);















    method public static boolean isTreeUri(android.net.Uri);













    method public static android.net.Uri moveDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;













    method @Deprecated public static android.net.Uri moveDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;













    method public static boolean removeDocument(android.content.ContentInterface, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;













    method @Deprecated public static boolean removeDocument(android.content.ContentResolver, android.net.Uri, android.net.Uri) throws java.io.FileNotFoundException;













    method public static android.net.Uri renameDocument(android.content.ContentInterface, android.net.Uri, String) throws java.io.FileNotFoundException;













    method @Deprecated public static android.net.Uri renameDocument(android.content.ContentResolver, android.net.Uri, String) throws java.io.FileNotFoundException;













    method @Nullable public static android.net.Uri moveDocument(@NonNull android.content.ContentResolver, @NonNull android.net.Uri, @NonNull android.net.Uri, @NonNull android.net.Uri) throws java.io.FileNotFoundException;













    method public static boolean removeDocument(@NonNull android.content.ContentResolver, @NonNull android.net.Uri, @NonNull android.net.Uri) throws java.io.FileNotFoundException;













    method @Nullable public static android.net.Uri renameDocument(@NonNull android.content.ContentResolver, @NonNull android.net.Uri, @NonNull String) throws java.io.FileNotFoundException;















    field public static final String ACTION_DOCUMENT_SETTINGS = "android.provider.action.DOCUMENT_SETTINGS";















    field public static final String EXTRA_ERROR = "error";















    field public static final String EXTRA_EXCLUDE_SELF = "android.provider.extra.EXCLUDE_SELF";

























api/system-current.txt



+15
−3






























Original line number
Diff line number
Diff line








@@ -304,7 +304,7 @@ package android.app {













  }





























  public class AppOpsManager {













    method @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public void getHistoricalOps(int, @Nullable String, @Nullable String[], long, long, @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 @Deprecated @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.app.AppOpsManager.PackageOps> getOpsForPackage(int, String, 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...);










@@ -394,6 +394,17 @@ package android.app {













    field public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalOps> CREATOR;















  }



























  public static final class AppOpsManager.HistoricalOpsRequest {













  }

























  public static final class AppOpsManager.HistoricalOpsRequest.Builder {













    ctor public AppOpsManager.HistoricalOpsRequest.Builder(long, long);













    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest build();













    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setOpNames(@Nullable java.util.List<java.lang.String>);













    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setPackageName(@Nullable String);













    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setUid(int);













  }



























  public static final class AppOpsManager.HistoricalPackageOps implements android.os.Parcelable {















    method public int describeContents();















    method @Nullable public android.app.AppOpsManager.HistoricalOp getOp(@NonNull String);










@@ -1284,11 +1295,11 @@ package android.bluetooth.le {



























package android.content {



























  public class ContentProviderClient implements java.lang.AutoCloseable android.content.ContentInterface {













  public class ContentProviderClient implements java.lang.AutoCloseable {















    method @RequiresPermission(android.Manifest.permission.REMOVE_TASKS) public void setDetectNotResponding(long);















  }



























  public abstract class ContentResolver implements android.content.ContentInterface {













  public abstract class ContentResolver {















    method public android.os.Bundle getCache(android.net.Uri);















    method public android.graphics.drawable.Drawable getTypeDrawable(String);















    method public void putCache(android.net.Uri, android.os.Bundle);










@@ -5328,6 +5339,7 @@ package android.os {



























  public final class PowerManager {















    method @RequiresPermission(allOf={android.Manifest.permission.READ_DREAM_STATE, android.Manifest.permission.WRITE_DREAM_STATE}) public void dream(long);













    method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public boolean forceSuspend();















    method @RequiresPermission(android.Manifest.permission.POWER_SAVER) public int getPowerSaveMode();















    method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setAdaptivePowerSaveEnabled(boolean);















    method @RequiresPermission(anyOf={android.Manifest.permission.DEVICE_POWER, android.Manifest.permission.POWER_SAVER}) public boolean setAdaptivePowerSavePolicy(@NonNull android.os.BatterySaverPolicyConfig);

































api/test-current.txt



+15
−4






























Original line number
Diff line number
Diff line








@@ -101,8 +101,8 @@ package android.app {













  public class AppOpsManager {















    method @RequiresPermission("android.permission.MANAGE_APPOPS") public void addHistoricalOps(@NonNull android.app.AppOpsManager.HistoricalOps);















    method @RequiresPermission("android.permission.MANAGE_APPOPS") public void clearHistory();













    method @RequiresPermission("android.permission.GET_APP_OPS_STATS") public void getHistoricalOps(int, @Nullable String, @Nullable String[], long, long, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.AppOpsManager.HistoricalOps>);













    method @RequiresPermission("android.permission.GET_APP_OPS_STATS") public void getHistoricalOpsFromDiskRaw(int, @Nullable String, @Nullable String[], long, long, @Nullable java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.AppOpsManager.HistoricalOps>);













    method @RequiresPermission("android.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.permission.GET_APP_OPS_STATS") public void getHistoricalOpsFromDiskRaw(@NonNull android.app.AppOpsManager.HistoricalOpsRequest, @Nullable java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.AppOpsManager.HistoricalOps>);















    method public static int getNumOps();















    method public static String[] getOpStrs();















    method public boolean isOperationActive(int, int, String);










@@ -206,6 +206,17 @@ package android.app {













    field public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalOps> CREATOR;















  }





























  public static final class AppOpsManager.HistoricalOpsRequest {













  }



























  public static final class AppOpsManager.HistoricalOpsRequest.Builder {













    ctor public AppOpsManager.HistoricalOpsRequest.Builder(long, long);













    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest build();













    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setOpNames(@Nullable java.util.List<java.lang.String>);













    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setPackageName(@Nullable String);













    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setUid(int);













  }





























  public static final class AppOpsManager.HistoricalPackageOps implements android.os.Parcelable {















    method public int describeContents();















    method @Nullable public android.app.AppOpsManager.HistoricalOp getOp(@NonNull String);










@@ -472,11 +483,11 @@ package android.bluetooth {





























package android.content {





























  public class ContentProviderClient implements java.lang.AutoCloseable android.content.ContentInterface {













  public class ContentProviderClient implements java.lang.AutoCloseable {















    method @RequiresPermission(android.Manifest.permission.REMOVE_TASKS) public void setDetectNotResponding(long);















  }





























  public abstract class ContentResolver implements android.content.ContentInterface {













  public abstract class ContentResolver {















    method public static String[] getSyncAdapterPackagesForAuthorityAsUser(String, int);















  }

















































cmds/statsd/src/atoms.proto



+6
−0






























Original line number
Diff line number
Diff line








@@ -4821,6 +4821,12 @@ message AppCompacted {





























  // The process state at the time of compaction.















  optional android.app.ProcessStateEnum process_state = 16 [default = PROCESS_STATE_UNKNOWN];



























  // Free ZRAM in kilobytes before compaction.













  optional int64 before_zram_free_kilobytes = 17;



























  // Free ZRAM in kilobytes after compaction.













  optional int64 after_zram_free_kilobytes = 18;















}































/**

































cmds/svc/src/com/android/commands/svc/PowerCommand.java



+27
−1






























Original line number
Diff line number
Diff line








@@ -26,6 +26,8 @@ import android.os.SystemClock;













import android.os.SystemProperties;































public class PowerCommand extends Svc.Command {













    private static final int FORCE_SUSPEND_DELAY_DEFAULT_MILLIS = 0;





























    public PowerCommand() {















        super("power");















    }









@@ -42,7 +44,17 @@ public class PowerCommand extends Svc.Command {













                + "       svc power reboot [reason]\n"















                + "         Perform a runtime shutdown and reboot device with specified reason.\n"















                + "       svc power shutdown\n"













                + "         Perform a runtime shutdown and power off the device.\n";













                + "         Perform a runtime shutdown and power off the device.\n"













                + "       svc power forcesuspend [t]\n"













                + "         Force the system into suspend, ignoring all wakelocks.\n"













                + "         t - Number of milliseconds to wait before issuing force-suspend.\n"













                + "             Helps with devices that can't suspend while plugged in.\n"













                + "             Defaults to " + FORCE_SUSPEND_DELAY_DEFAULT_MILLIS + ".\n"













                + "             When using a delay, you must use the nohup shell modifier:\n"













                + "             'adb shell nohup svc power forcesuspend [time]'\n"













                + "         Use caution; this is dangerous. It puts the device to sleep\n"













                + "         immediately without giving apps or the system an opportunity to\n"













                + "         save their state.\n";















    }































    public void run(String[] args) {










@@ -101,6 +113,20 @@ public class PowerCommand extends Svc.Command {













                        maybeLogRemoteException("Failed to shutdown.");















                    }















                    return;













                } else if ("forcesuspend".equals(args[1])) {













                    int delayMillis = args.length > 2













                            ? Integer.parseInt(args[2]) : FORCE_SUSPEND_DELAY_DEFAULT_MILLIS;













                    try {













                        Thread.sleep(delayMillis);













                        if (!pm.forceSuspend()) {













                            System.err.println("Failed to force suspend.");













                        }













                    } catch (InterruptedException e) {













                        System.err.println("Failed to force suspend: " + e);













                    } catch (RemoteException e) {













                        maybeLogRemoteException("Failed to force-suspend with exception: " + e);













                    }













                    return;















                }















            }















        }