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

Commit 061d7333 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11571437 from f62ec21a to 24Q3-release 

Change-Id: If0aeb54080cb48c82cdf991dd024d16e44b1c763
parents 2117dfff f62ec21a

core/api/current.txt

+25 −25
Original line number Diff line number Diff line
@@ -6849,7 +6849,7 @@ package android.app { 
  }















  public abstract static class Notification.Style {













    ctor public Notification.Style();













    ctor @Deprecated public Notification.Style();















    method public android.app.Notification build();















    method protected void checkBuilder();















    method protected android.widget.RemoteViews getStandardView(int);










@@ -19286,11 +19286,11 @@ package android.hardware.camera2 {













    method @NonNull public java.util.List<java.lang.Integer> getSupportedExtensions();















    method public boolean isCaptureProcessProgressAvailable(int);















    method public boolean isPostviewAvailable(int);













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Float>> EFV_PADDING_ZOOM_FACTOR_RANGE;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Float>> EFV_PADDING_ZOOM_FACTOR_RANGE;















    field public static final int EXTENSION_AUTOMATIC = 0; // 0x0















    field @Deprecated public static final int EXTENSION_BEAUTY = 1; // 0x1















    field public static final int EXTENSION_BOKEH = 2; // 0x2













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static final int EXTENSION_EYES_FREE_VIDEOGRAPHY = 5; // 0x5













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public static final int EXTENSION_EYES_FREE_VIDEOGRAPHY = 5; // 0x5















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















    field public static final int EXTENSION_HDR = 3; // 0x3















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










@@ -19890,30 +19890,30 @@ package android.hardware.camera2 {













    field public static final int MAX_THUMBNAIL_DIMENSION = 256; // 0x100















  }



























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class ExtensionCaptureRequest {













  @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public final class ExtensionCaptureRequest {















    ctor public ExtensionCaptureRequest();













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> EFV_AUTO_ZOOM;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_ROTATE_VIEWPORT;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> EFV_STABILIZATION_MODE;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static final int EFV_STABILIZATION_MODE_GIMBAL = 1; // 0x1













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static final int EFV_STABILIZATION_MODE_LOCKED = 2; // 0x2













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") public static final int EFV_STABILIZATION_MODE_OFF = 0; // 0x0













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<android.util.Pair<java.lang.Integer,java.lang.Integer>> EFV_TRANSLATE_VIEWPORT;













  }

























  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class ExtensionCaptureResult {













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> EFV_AUTO_ZOOM;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_ROTATE_VIEWPORT;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> EFV_STABILIZATION_MODE;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public static final int EFV_STABILIZATION_MODE_GIMBAL = 1; // 0x1













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public static final int EFV_STABILIZATION_MODE_LOCKED = 2; // 0x2













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public static final int EFV_STABILIZATION_MODE_OFF = 0; // 0x0













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<android.util.Pair<java.lang.Integer,java.lang.Integer>> EFV_TRANSLATE_VIEWPORT;













  }

























  @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public final class ExtensionCaptureResult {















    ctor public ExtensionCaptureResult();













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> EFV_AUTO_ZOOM;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_AUTO_ZOOM_PADDING_REGION;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_PADDING_REGION;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_ROTATE_VIEWPORT;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> EFV_STABILIZATION_MODE;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.PointF[]> EFV_TARGET_COORDINATES;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.util.Pair<java.lang.Integer,java.lang.Integer>> EFV_TRANSLATE_VIEWPORT;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> EFV_AUTO_ZOOM;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_AUTO_ZOOM_PADDING_REGION;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_PADDING_REGION;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_PADDING_ZOOM_FACTOR;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_ROTATE_VIEWPORT;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> EFV_STABILIZATION_MODE;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.PointF[]> EFV_TARGET_COORDINATES;













    field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.util.Pair<java.lang.Integer,java.lang.Integer>> EFV_TRANSLATE_VIEWPORT;















  }





























  public class MultiResolutionImageReader implements java.lang.AutoCloseable {

























core/api/system-current.txt



+40
−65




























File changed.
Preview size limit exceeded, changes collapsed.
























core/api/system-lint-baseline.txt



+0
−2






























Original line number
Diff line number
Diff line








@@ -1885,8 +1885,6 @@ Todo: android.Manifest.permission#READ_PEOPLE_DATA:













    Documentation mentions 'TODO'















Todo: android.app.NotificationManager#isNotificationAssistantAccessGranted(android.content.ComponentName):















    Documentation mentions 'TODO'













Todo: android.app.ondeviceintelligence.OnDeviceIntelligenceManager#requestFeatureDownload(android.app.ondeviceintelligence.Feature, android.app.ondeviceintelligence.CancellationSignal, java.util.concurrent.Executor, android.app.ondeviceintelligence.DownloadCallback):













    Documentation mentions 'TODO'















Todo: android.hardware.camera2.params.StreamConfigurationMap:















    Documentation mentions 'TODO'















Todo: android.hardware.location.ContextHubManager#getNanoAppInstanceInfo(int):

































core/java/android/app/ContextImpl.java



+75
−156






























Original line number
Diff line number
Diff line








@@ -272,17 +272,10 @@ class ContextImpl extends Context {





























    @UnsupportedAppUsage















    private Context mOuterContext;



























    private final Object mThemeLock = new Object();





























    @UnsupportedAppUsage













    @GuardedBy("mThemeLock")















    private int mThemeResource = 0;





























    @UnsupportedAppUsage













    @GuardedBy("mThemeLock")















    private Resources.Theme mTheme = null;





























    @UnsupportedAppUsage















    private PackageManager mPackageManager;















    private Context mReceiverRestrictedContext = null;









@@ -295,6 +288,7 @@ class ContextImpl extends Context {





























    private ContentCaptureOptions mContentCaptureOptions = null;





























    private final Object mSync = new Object();















    /**















     * Indicates this {@link Context} can not handle UI components properly and is not associated















     * with a {@link Display} instance.










@@ -346,18 +340,21 @@ class ContextImpl extends Context {













     */















    private boolean mOwnsToken = false;





























    private final Object mDirsLock = new Object();













    private volatile File mDatabasesDir;













    @UnsupportedAppUsage private volatile File mPreferencesDir;













    private volatile File mFilesDir;













    private volatile File mCratesDir;













    private volatile File mNoBackupFilesDir;













    private volatile File[] mExternalFilesDirs;













    private volatile File[] mObbDirs;













    private volatile File mCacheDir;













    private volatile File mCodeCacheDir;













    private volatile File[] mExternalCacheDirs;













    private volatile File[] mExternalMediaDirs;













    @GuardedBy("mSync")













    private File mDatabasesDir;













    @GuardedBy("mSync")













    @UnsupportedAppUsage













    private File mPreferencesDir;













    @GuardedBy("mSync")













    private File mFilesDir;













    @GuardedBy("mSync")













    private File mCratesDir;













    @GuardedBy("mSync")













    private File mNoBackupFilesDir;













    @GuardedBy("mSync")













    private File mCacheDir;













    @GuardedBy("mSync")













    private File mCodeCacheDir;































    // The system service cache for the system services that are cached per-ContextImpl.















    @UnsupportedAppUsage










@@ -461,7 +458,7 @@ class ContextImpl extends Context {





























    @Override















    public void setTheme(int resId) {













        synchronized (mThemeLock) {













        synchronized (mSync) {















            if (mThemeResource != resId) {















                mThemeResource = resId;















                initializeTheme();









@@ -471,14 +468,14 @@ class ContextImpl extends Context {





























    @Override















    public int getThemeResId() {













        synchronized (mThemeLock) {













        synchronized (mSync) {















            return mThemeResource;















        }















    }































    @Override















    public Resources.Theme getTheme() {













        synchronized (mThemeLock) {













        synchronized (mSync) {















            if (mTheme != null) {















                return mTheme;















            }









@@ -491,7 +488,6 @@ class ContextImpl extends Context {













        }















    }





























    @GuardedBy("mThemeLock")















    private void initializeTheme() {















        if (mTheme == null) {















            mTheme = mResources.newTheme();










@@ -741,18 +737,12 @@ class ContextImpl extends Context {





























    @UnsupportedAppUsage















    private File getPreferencesDir() {













        File localPreferencesDir = mPreferencesDir;













        if (localPreferencesDir == null) {













            synchronized (mDirsLock) {













                localPreferencesDir = mPreferencesDir;













                if (localPreferencesDir == null) {













                    localPreferencesDir = new File(getDataDir(), "shared_prefs");













                    ensurePrivateDirExists(localPreferencesDir);













                    mPreferencesDir = localPreferencesDir;













                }













        synchronized (mSync) {













            if (mPreferencesDir == null) {













                mPreferencesDir = new File(getDataDir(), "shared_prefs");















            }













            return ensurePrivateDirExists(mPreferencesDir);















        }













        return localPreferencesDir;















    }































    @Override










@@ -794,16 +784,16 @@ class ContextImpl extends Context {













    /**















     * Common-path handling of app data dir creation















     */













    private static void ensurePrivateDirExists(File file) {













        ensurePrivateDirExists(file, 0771, -1, null);













    private static File ensurePrivateDirExists(File file) {













        return ensurePrivateDirExists(file, 0771, -1, null);















    }





























    private static void ensurePrivateCacheDirExists(File file, String xattr) {













    private static File ensurePrivateCacheDirExists(File file, String xattr) {















        final int gid = UserHandle.getCacheAppGid(Process.myUid());













        ensurePrivateDirExists(file, 02771, gid, xattr);













        return ensurePrivateDirExists(file, 02771, gid, xattr);















    }





























    private static void ensurePrivateDirExists(File file, int mode, int gid, String xattr) {













    private static File ensurePrivateDirExists(File file, int mode, int gid, String xattr) {















        if (!file.exists()) {















            final String path = file.getAbsolutePath();















            try {










@@ -831,22 +821,17 @@ class ContextImpl extends Context {













                }















            }















        }













        return file;















    }































    @Override















    public File getFilesDir() {













        File localFilesDir = mFilesDir;













        if (localFilesDir == null) {













            localFilesDir = mFilesDir;













            synchronized (mDirsLock) {













                if (localFilesDir == null) {













                    localFilesDir = new File(getDataDir(), "files");













                    ensurePrivateDirExists(localFilesDir);













                    mFilesDir = localFilesDir;













                }













        synchronized (mSync) {













            if (mFilesDir == null) {













                mFilesDir = new File(getDataDir(), "files");















            }













            return ensurePrivateDirExists(mFilesDir);















        }













        return localFilesDir;















    }































    @Override









@@ -856,38 +841,26 @@ class ContextImpl extends Context {













        final Path absoluteNormalizedCratePath = cratesRootPath.resolve(crateId)















                .toAbsolutePath().normalize();





























        File localCratesDir = mCratesDir;













        if (localCratesDir == null) {













            synchronized (mDirsLock) {













                localCratesDir = mCratesDir;













                if (localCratesDir == null) {













                    localCratesDir = cratesRootPath.toFile();













                    ensurePrivateDirExists(localCratesDir);













                    mCratesDir = localCratesDir;













                }













        synchronized (mSync) {













            if (mCratesDir == null) {













                mCratesDir = cratesRootPath.toFile();















            }













            ensurePrivateDirExists(mCratesDir);















        }





























        File crateDir = absoluteNormalizedCratePath.toFile();













        ensurePrivateDirExists(crateDir);













        return crateDir;













        File cratedDir = absoluteNormalizedCratePath.toFile();













        return ensurePrivateDirExists(cratedDir);















    }































    @Override















    public File getNoBackupFilesDir() {













        File localNoBackupFilesDir = mNoBackupFilesDir;













        if (localNoBackupFilesDir == null) {













            synchronized (mDirsLock) {













                localNoBackupFilesDir = mNoBackupFilesDir;













                if (localNoBackupFilesDir == null) {













                    localNoBackupFilesDir = new File(getDataDir(), "no_backup");













                    ensurePrivateDirExists(localNoBackupFilesDir);













                    mNoBackupFilesDir = localNoBackupFilesDir;













        synchronized (mSync) {













            if (mNoBackupFilesDir == null) {













                mNoBackupFilesDir = new File(getDataDir(), "no_backup");















            }













            return ensurePrivateDirExists(mNoBackupFilesDir);















        }















    }













        return localNoBackupFilesDir;













    }































    @Override















    public File getExternalFilesDir(String type) {









@@ -898,25 +871,14 @@ class ContextImpl extends Context {





























    @Override















    public File[] getExternalFilesDirs(String type) {













        File[] localExternalFilesDirs = mExternalFilesDirs;













        if (localExternalFilesDirs == null) {













            synchronized (mDirsLock) {













                localExternalFilesDirs = mExternalFilesDirs;













                if (localExternalFilesDirs == null) {













                    localExternalFilesDirs =













                            Environment.buildExternalStorageAppFilesDirs(getPackageName());













        synchronized (mSync) {













            File[] dirs = Environment.buildExternalStorageAppFilesDirs(getPackageName());















            if (type != null) {













                        localExternalFilesDirs =













                                Environment.buildPaths(localExternalFilesDirs, type);













                    }













                    localExternalFilesDirs = ensureExternalDirsExistOrFilter(













                            localExternalFilesDirs, true /* tryCreateInProcess */);













                    mExternalFilesDirs = localExternalFilesDirs;













                dirs = Environment.buildPaths(dirs, type);















            }













            return ensureExternalDirsExistOrFilter(dirs, true /* tryCreateInProcess */);















        }















    }













        return localExternalFilesDirs;













    }































    @Override















    public File getObbDir() {









@@ -927,51 +889,30 @@ class ContextImpl extends Context {





























    @Override















    public File[] getObbDirs() {













        File[] localObbDirs = mObbDirs;













        if (mObbDirs == null) {













            synchronized (mDirsLock) {













                localObbDirs = mObbDirs;













                if (localObbDirs == null) {













                    localObbDirs = Environment.buildExternalStorageAppObbDirs(getPackageName());













                    localObbDirs = ensureExternalDirsExistOrFilter(













                            localObbDirs, true /* tryCreateInProcess */);













                    mObbDirs = localObbDirs;













                }













            }













        synchronized (mSync) {













            File[] dirs = Environment.buildExternalStorageAppObbDirs(getPackageName());













            return ensureExternalDirsExistOrFilter(dirs, true /* tryCreateInProcess */);















        }













        return localObbDirs;















    }































    @Override















    public File getCacheDir() {













        File localCacheDir = mCacheDir;













        if (localCacheDir == null) {













            synchronized (mDirsLock) {













                localCacheDir = mCacheDir;













                if (localCacheDir == null) {













                    localCacheDir = new File(getDataDir(), "cache");













                    ensurePrivateCacheDirExists(localCacheDir, XATTR_INODE_CACHE);













                    mCacheDir = localCacheDir;













        synchronized (mSync) {













            if (mCacheDir == null) {













                mCacheDir = new File(getDataDir(), "cache");















            }













            return ensurePrivateCacheDirExists(mCacheDir, XATTR_INODE_CACHE);















        }















    }













        return localCacheDir;













    }































    @Override















    public File getCodeCacheDir() {













        File localCodeCacheDir = mCodeCacheDir;













        if (localCodeCacheDir == null) {













            synchronized (mDirsLock) {













                localCodeCacheDir = mCodeCacheDir;













                if (localCodeCacheDir == null) {













                    localCodeCacheDir = getCodeCacheDirBeforeBind(getDataDir());













                    ensurePrivateCacheDirExists(localCodeCacheDir, XATTR_INODE_CODE_CACHE);













                    mCodeCacheDir = localCodeCacheDir;













                }













        synchronized (mSync) {













            if (mCodeCacheDir == null) {













                mCodeCacheDir = getCodeCacheDirBeforeBind(getDataDir());















            }













            return ensurePrivateCacheDirExists(mCodeCacheDir, XATTR_INODE_CODE_CACHE);















        }













        return localCodeCacheDir;















    }































    /**









@@ -992,38 +933,22 @@ class ContextImpl extends Context {





























    @Override















    public File[] getExternalCacheDirs() {













        File[] localExternalCacheDirs = mExternalCacheDirs;













        if (localExternalCacheDirs == null) {













            synchronized (mDirsLock) {













                localExternalCacheDirs = mExternalCacheDirs;













                if (localExternalCacheDirs == null) {













                    localExternalCacheDirs =













                            Environment.buildExternalStorageAppCacheDirs(getPackageName());













                    localExternalCacheDirs = ensureExternalDirsExistOrFilter(













                            localExternalCacheDirs, false /* tryCreateInProcess */);













                    mExternalCacheDirs = localExternalCacheDirs;













        synchronized (mSync) {













            File[] dirs = Environment.buildExternalStorageAppCacheDirs(getPackageName());













            // We don't try to create cache directories in-process, because they need special













            // setup for accurate quota tracking. This ensures the cache dirs are always













            // created through StorageManagerService.













            return ensureExternalDirsExistOrFilter(dirs, false /* tryCreateInProcess */);















        }















    }













        }













        return localExternalCacheDirs;













    }































    @Override















    public File[] getExternalMediaDirs() {













        File[] localExternalMediaDirs = mExternalMediaDirs;













        if (localExternalMediaDirs == null) {













            synchronized (mDirsLock) {













                localExternalMediaDirs = mExternalMediaDirs;













                if (localExternalMediaDirs == null) {













                    localExternalMediaDirs = Environment.buildExternalStorageAppMediaDirs(getPackageName());













                    localExternalMediaDirs = ensureExternalDirsExistOrFilter(













                            localExternalMediaDirs, true /* tryCreateInProcess */);













                    mExternalMediaDirs = localExternalMediaDirs;













                }













        synchronized (mSync) {













            File[] dirs = Environment.buildExternalStorageAppMediaDirs(getPackageName());













            return ensureExternalDirsExistOrFilter(dirs, true /* tryCreateInProcess */);















        }















    }













        return localExternalMediaDirs;













    }































    /**















     * @hide










@@ -1121,22 +1046,16 @@ class ContextImpl extends Context {













    }































    private File getDatabasesDir() {













        File localDatabasesDir = mDatabasesDir;













        if (localDatabasesDir == null) {













            synchronized (mDirsLock) {













                localDatabasesDir = mDatabasesDir;













                if (localDatabasesDir == null) {













        synchronized (mSync) {













            if (mDatabasesDir == null) {















                if ("android".equals(getPackageName())) {













                        localDatabasesDir = new File("/data/system");













                    mDatabasesDir = new File("/data/system");















                } else {













                        localDatabasesDir = new File(getDataDir(), "databases");













                    }













                    ensurePrivateDirExists(localDatabasesDir);













                    mDatabasesDir = localDatabasesDir;













                    mDatabasesDir = new File(getDataDir(), "databases");















                }















            }













            return ensurePrivateDirExists(mDatabasesDir);















        }













        return localDatabasesDir;















    }































    @Override

































core/java/android/app/Notification.java



+15
−3






























Original line number
Diff line number
Diff line








@@ -3586,12 +3586,15 @@ public class Notification implements Parcelable













     * Sets the token used for background operations for the pending intents associated with this















     * notification.















     *













     * This token is automatically set during deserialization for you, you usually won't need to













     * call this unless you want to change the existing token, if any.













     *















     * @hide















     */













    public void overrideAllowlistToken(IBinder token) {













        mAllowlistToken = token;













    public void clearAllowlistToken() {













        mAllowlistToken = null;















        if (publicVersion != null) {













            publicVersion.overrideAllowlistToken(token);













            publicVersion.clearAllowlistToken();















        }















    }
























@@ -7378,6 +7381,15 @@ public class Notification implements Parcelable













     */















    public static abstract class Style {



























        /**













         * @deprecated public access to the constructor of Style() is only useful for creating













         * custom subclasses, but that has actually been impossible due to hidden abstract













         * methods, so this constructor is now officially deprecated to clarify that this is













         * intended to be disallowed.













         */













        @Deprecated













        public Style() {}



























        /**















         * The number of items allowed simulatanously in the remote input history.















         * @hide