Merge "Remove WebView-package-being-replaced logic from WebViewUpdateService." into nyc-dev
diff --git a/api/current.txt b/api/current.txt
index 015c035..889ed59 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -443,6 +443,7 @@
field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495
field public static final int debuggable = 16842767; // 0x101000f
field public static final int defaultHeight = 16844021; // 0x10104f5
+ field public static final int defaultToDeviceProtectedStorage = 16844037; // 0x1010505
field public static final int defaultValue = 16843245; // 0x10101ed
field public static final int defaultWidth = 16844020; // 0x10104f4
field public static final int delay = 16843212; // 0x10101cc
@@ -462,6 +463,7 @@
field public static final int dialogTheme = 16843528; // 0x1010308
field public static final int dialogTitle = 16843250; // 0x10101f2
field public static final int digits = 16843110; // 0x1010166
+ field public static final int directBootAware = 16844038; // 0x1010506
field public static final int direction = 16843217; // 0x10101d1
field public static final deprecated int directionDescriptions = 16843681; // 0x10103a1
field public static final int directionPriority = 16843218; // 0x10101d2
@@ -510,7 +512,6 @@
field public static final int ellipsize = 16842923; // 0x10100ab
field public static final int ems = 16843096; // 0x1010158
field public static final int enabled = 16842766; // 0x101000e
- field public static final int encryptionAware = 16844038; // 0x1010506
field public static final int end = 16843996; // 0x10104dc
field public static final int endColor = 16843166; // 0x101019e
field public static final int endX = 16844051; // 0x1010513
@@ -575,7 +576,6 @@
field public static final int fontFamily = 16843692; // 0x10103ac
field public static final int fontFeatureSettings = 16843959; // 0x10104b7
field public static final int footerDividersEnabled = 16843311; // 0x101022f
- field public static final int forceDeviceEncrypted = 16844037; // 0x1010505
field public static final int foreground = 16843017; // 0x1010109
field public static final int foregroundGravity = 16843264; // 0x1010200
field public static final int foregroundTint = 16843885; // 0x101046d
@@ -7974,7 +7974,7 @@
method public abstract int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
method public abstract deprecated void clearWallpaper() throws java.io.IOException;
method public abstract android.content.Context createConfigurationContext(android.content.res.Configuration);
- method public abstract android.content.Context createDeviceEncryptedStorageContext();
+ method public abstract android.content.Context createDeviceProtectedStorageContext();
method public abstract android.content.Context createDisplayContext(android.view.Display);
method public abstract android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
method public abstract java.lang.String[] databaseList();
@@ -8032,10 +8032,10 @@
method public abstract deprecated int getWallpaperDesiredMinimumHeight();
method public abstract deprecated int getWallpaperDesiredMinimumWidth();
method public abstract void grantUriPermission(java.lang.String, android.net.Uri, int);
- method public abstract boolean isDeviceEncryptedStorage();
+ method public abstract boolean isDeviceProtectedStorage();
method public boolean isRestricted();
- method public abstract boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
- method public abstract boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ method public abstract boolean moveDatabaseFrom(android.content.Context, java.lang.String);
+ method public abstract boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
method public final android.content.res.TypedArray obtainStyledAttributes(int[]);
method public final android.content.res.TypedArray obtainStyledAttributes(int, int[]) throws android.content.res.Resources.NotFoundException;
method public final android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[]);
@@ -8170,7 +8170,7 @@
method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
method public deprecated void clearWallpaper() throws java.io.IOException;
method public android.content.Context createConfigurationContext(android.content.res.Configuration);
- method public android.content.Context createDeviceEncryptedStorageContext();
+ method public android.content.Context createDeviceProtectedStorageContext();
method public android.content.Context createDisplayContext(android.view.Display);
method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
method public java.lang.String[] databaseList();
@@ -8222,9 +8222,9 @@
method public deprecated int getWallpaperDesiredMinimumHeight();
method public deprecated int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
- method public boolean isDeviceEncryptedStorage();
- method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
- method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ method public boolean isDeviceProtectedStorage();
+ method public boolean moveDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -9315,10 +9315,9 @@
field public java.lang.String backupAgentName;
field public java.lang.String className;
field public int compatibleWidthLimitDp;
- field public java.lang.String credentialEncryptedDataDir;
field public java.lang.String dataDir;
field public int descriptionRes;
- field public java.lang.String deviceEncryptedDataDir;
+ field public java.lang.String deviceProtectedDataDir;
field public boolean enabled;
field public int flags;
field public int largestWidthLimitDp;
@@ -9355,8 +9354,8 @@
method public boolean isEnabled();
field public android.content.pm.ApplicationInfo applicationInfo;
field public int descriptionRes;
+ field public boolean directBootAware;
field public boolean enabled;
- field public boolean encryptionAware;
field public boolean exported;
field public java.lang.String processName;
}
@@ -9827,11 +9826,10 @@
field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
field public static final int MATCH_ALL = 131072; // 0x20000
field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
+ field public static final int MATCH_DIRECT_BOOT_AWARE = 524288; // 0x80000
+ field public static final int MATCH_DIRECT_BOOT_UNAWARE = 262144; // 0x40000
field public static final int MATCH_DISABLED_COMPONENTS = 512; // 0x200
field public static final int MATCH_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
- field public static final int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000
- field public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000
- field public static final int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000
field public static final int MATCH_SYSTEM_ONLY = 1048576; // 0x100000
field public static final int MATCH_UNINSTALLED_PACKAGES = 8192; // 0x2000
field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
@@ -29370,10 +29368,6 @@
method public boolean isSystemUser();
method public boolean isUserAGoat();
method public boolean isUserRunning(android.os.UserHandle);
- method public deprecated boolean isUserRunningAndLocked();
- method public deprecated boolean isUserRunningAndLocked(android.os.UserHandle);
- method public deprecated boolean isUserRunningAndUnlocked();
- method public deprecated boolean isUserRunningAndUnlocked(android.os.UserHandle);
method public boolean isUserRunningOrStopping(android.os.UserHandle);
method public boolean isUserUnlocked();
method public boolean isUserUnlocked(android.os.UserHandle);
@@ -29935,7 +29929,7 @@
method public void setSharedPreferencesMode(int);
method public void setSharedPreferencesName(java.lang.String);
method public void setStorageDefault();
- method public void setStorageDeviceEncrypted();
+ method public void setStorageDeviceProtected();
field public static final java.lang.String KEY_HAS_SET_DEFAULT_VALUES = "_has_set_default_values";
field public static final java.lang.String METADATA_KEY_PREFERENCES = "android.preference";
}
@@ -37912,7 +37906,7 @@
method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
method public void clearWallpaper();
method public android.content.Context createConfigurationContext(android.content.res.Configuration);
- method public android.content.Context createDeviceEncryptedStorageContext();
+ method public android.content.Context createDeviceProtectedStorageContext();
method public android.content.Context createDisplayContext(android.view.Display);
method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
method public java.lang.String[] databaseList();
@@ -37963,9 +37957,9 @@
method public int getWallpaperDesiredMinimumHeight();
method public int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
- method public boolean isDeviceEncryptedStorage();
- method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
- method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ method public boolean isDeviceProtectedStorage();
+ method public boolean moveDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
diff --git a/api/removed.txt b/api/removed.txt
index 8ac2d63..9b5d3ab 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -17,12 +17,40 @@
}
+package android.content {
+
+ public abstract class Context {
+ method public deprecated android.content.Context createCredentialEncryptedStorageContext();
+ method public deprecated android.content.Context createDeviceEncryptedStorageContext();
+ method public deprecated boolean isCredentialEncryptedStorage();
+ method public deprecated boolean isDeviceEncryptedStorage();
+ method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public deprecated boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ }
+
+}
+
package android.content.pm {
+ public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
+ field public deprecated java.lang.String credentialEncryptedDataDir;
+ field public deprecated java.lang.String deviceEncryptedDataDir;
+ }
+
+ public class ComponentInfo extends android.content.pm.PackageItemInfo {
+ field public deprecated boolean encryptionAware;
+ }
+
public class PackageInfo implements android.os.Parcelable {
field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1
}
+ public abstract class PackageManager {
+ field public static final deprecated int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000
+ field public static final deprecated int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000
+ field public static final deprecated int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000
+ }
+
}
package android.database {
@@ -98,6 +126,19 @@
method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);
+ method public deprecated boolean isUserRunningAndLocked();
+ method public deprecated boolean isUserRunningAndLocked(android.os.UserHandle);
+ method public deprecated boolean isUserRunningAndUnlocked();
+ method public deprecated boolean isUserRunningAndUnlocked(android.os.UserHandle);
+ }
+
+}
+
+package android.preference {
+
+ public class PreferenceManager {
+ method public deprecated void setStorageCredentialEncrypted();
+ method public deprecated void setStorageDeviceEncrypted();
}
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 2c164ff..4a9cd46 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -538,6 +538,7 @@
field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495
field public static final int debuggable = 16842767; // 0x101000f
field public static final int defaultHeight = 16844021; // 0x10104f5
+ field public static final int defaultToDeviceProtectedStorage = 16844037; // 0x1010505
field public static final int defaultValue = 16843245; // 0x10101ed
field public static final int defaultWidth = 16844020; // 0x10104f4
field public static final int delay = 16843212; // 0x10101cc
@@ -557,6 +558,7 @@
field public static final int dialogTheme = 16843528; // 0x1010308
field public static final int dialogTitle = 16843250; // 0x10101f2
field public static final int digits = 16843110; // 0x1010166
+ field public static final int directBootAware = 16844038; // 0x1010506
field public static final int direction = 16843217; // 0x10101d1
field public static final deprecated int directionDescriptions = 16843681; // 0x10103a1
field public static final int directionPriority = 16843218; // 0x10101d2
@@ -605,7 +607,6 @@
field public static final int ellipsize = 16842923; // 0x10100ab
field public static final int ems = 16843096; // 0x1010158
field public static final int enabled = 16842766; // 0x101000e
- field public static final int encryptionAware = 16844038; // 0x1010506
field public static final int end = 16843996; // 0x10104dc
field public static final int endColor = 16843166; // 0x101019e
field public static final int endX = 16844051; // 0x1010513
@@ -670,7 +671,6 @@
field public static final int fontFamily = 16843692; // 0x10103ac
field public static final int fontFeatureSettings = 16843959; // 0x10104b7
field public static final int footerDividersEnabled = 16843311; // 0x101022f
- field public static final int forceDeviceEncrypted = 16844037; // 0x1010505
field public static final int foreground = 16843017; // 0x1010109
field public static final int foregroundGravity = 16843264; // 0x1010200
field public static final int foregroundTint = 16843885; // 0x101046d
@@ -8272,8 +8272,8 @@
method public abstract int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
method public abstract deprecated void clearWallpaper() throws java.io.IOException;
method public abstract android.content.Context createConfigurationContext(android.content.res.Configuration);
- method public abstract android.content.Context createCredentialEncryptedStorageContext();
- method public abstract android.content.Context createDeviceEncryptedStorageContext();
+ method public abstract android.content.Context createCredentialProtectedStorageContext();
+ method public abstract android.content.Context createDeviceProtectedStorageContext();
method public abstract android.content.Context createDisplayContext(android.view.Display);
method public abstract android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
method public abstract java.lang.String[] databaseList();
@@ -8331,11 +8331,11 @@
method public abstract deprecated int getWallpaperDesiredMinimumHeight();
method public abstract deprecated int getWallpaperDesiredMinimumWidth();
method public abstract void grantUriPermission(java.lang.String, android.net.Uri, int);
- method public abstract boolean isCredentialEncryptedStorage();
- method public abstract boolean isDeviceEncryptedStorage();
+ method public abstract boolean isCredentialProtectedStorage();
+ method public abstract boolean isDeviceProtectedStorage();
method public boolean isRestricted();
- method public abstract boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
- method public abstract boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ method public abstract boolean moveDatabaseFrom(android.content.Context, java.lang.String);
+ method public abstract boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
method public final android.content.res.TypedArray obtainStyledAttributes(int[]);
method public final android.content.res.TypedArray obtainStyledAttributes(int, int[]) throws android.content.res.Resources.NotFoundException;
method public final android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[]);
@@ -8479,8 +8479,8 @@
method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
method public deprecated void clearWallpaper() throws java.io.IOException;
method public android.content.Context createConfigurationContext(android.content.res.Configuration);
- method public android.content.Context createCredentialEncryptedStorageContext();
- method public android.content.Context createDeviceEncryptedStorageContext();
+ method public android.content.Context createCredentialProtectedStorageContext();
+ method public android.content.Context createDeviceProtectedStorageContext();
method public android.content.Context createDisplayContext(android.view.Display);
method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
method public java.lang.String[] databaseList();
@@ -8532,10 +8532,10 @@
method public deprecated int getWallpaperDesiredMinimumHeight();
method public deprecated int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
- method public boolean isCredentialEncryptedStorage();
- method public boolean isDeviceEncryptedStorage();
- method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
- method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ method public boolean isCredentialProtectedStorage();
+ method public boolean isDeviceProtectedStorage();
+ method public boolean moveDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -9638,10 +9638,10 @@
field public java.lang.String backupAgentName;
field public java.lang.String className;
field public int compatibleWidthLimitDp;
- field public java.lang.String credentialEncryptedDataDir;
+ field public java.lang.String credentialProtectedDataDir;
field public java.lang.String dataDir;
field public int descriptionRes;
- field public java.lang.String deviceEncryptedDataDir;
+ field public java.lang.String deviceProtectedDataDir;
field public boolean enabled;
field public int flags;
field public int largestWidthLimitDp;
@@ -9678,8 +9678,8 @@
method public boolean isEnabled();
field public android.content.pm.ApplicationInfo applicationInfo;
field public int descriptionRes;
+ field public boolean directBootAware;
field public boolean enabled;
- field public boolean encryptionAware;
field public boolean exported;
field public java.lang.String processName;
}
@@ -10216,11 +10216,10 @@
field public static final int MASK_PERMISSION_FLAGS = 255; // 0xff
field public static final int MATCH_ALL = 131072; // 0x20000
field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
+ field public static final int MATCH_DIRECT_BOOT_AWARE = 524288; // 0x80000
+ field public static final int MATCH_DIRECT_BOOT_UNAWARE = 262144; // 0x40000
field public static final int MATCH_DISABLED_COMPONENTS = 512; // 0x200
field public static final int MATCH_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
- field public static final int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000
- field public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000
- field public static final int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000
field public static final int MATCH_SYSTEM_ONLY = 1048576; // 0x100000
field public static final int MATCH_UNINSTALLED_PACKAGES = 8192; // 0x2000
field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
@@ -24708,8 +24707,6 @@
method public android.media.tv.TvInputManager.Hardware acquireTvInputHardware(int, android.media.tv.TvInputManager.HardwareCallback, android.media.tv.TvInputInfo);
method public void addBlockedRating(android.media.tv.TvContentRating);
method public boolean captureFrame(java.lang.String, android.view.Surface, android.media.tv.TvStreamConfig);
- method public void createRecordingSession(java.lang.String, android.media.tv.TvInputManager.SessionCallback, android.os.Handler);
- method public void createSession(java.lang.String, android.media.tv.TvInputManager.SessionCallback, android.os.Handler);
method public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(java.lang.String);
method public java.util.List<android.media.tv.TvContentRating> getBlockedRatings();
method public java.util.List<android.media.tv.TvInputHardwareInfo> getHardwareList();
@@ -24761,39 +24758,6 @@
method public abstract void onStreamConfigChanged(android.media.tv.TvStreamConfig[]);
}
- public static final class TvInputManager.Session {
- method public void dispatchSurfaceChanged(int, int, int);
- method public java.lang.String getSelectedTrack(int);
- method public java.util.List<android.media.tv.TvTrackInfo> getTracks(int);
- method public void release();
- method public void selectTrack(int, java.lang.String);
- method public void sendAppPrivateCommand(java.lang.String, android.os.Bundle);
- method public void setCaptionEnabled(boolean);
- method public void setStreamVolume(float);
- method public void setSurface(android.view.Surface);
- method public void tune(android.net.Uri);
- method public void tune(android.net.Uri, android.os.Bundle);
- }
-
- public static abstract class TvInputManager.SessionCallback {
- ctor public TvInputManager.SessionCallback();
- method public void onChannelRetuned(android.media.tv.TvInputManager.Session, android.net.Uri);
- method public void onContentAllowed(android.media.tv.TvInputManager.Session);
- method public void onContentBlocked(android.media.tv.TvInputManager.Session, android.media.tv.TvContentRating);
- method public void onLayoutSurface(android.media.tv.TvInputManager.Session, int, int, int, int);
- method public void onSessionCreated(android.media.tv.TvInputManager.Session);
- method public void onSessionEvent(android.media.tv.TvInputManager.Session, java.lang.String, android.os.Bundle);
- method public void onSessionReleased(android.media.tv.TvInputManager.Session);
- method public void onTimeShiftCurrentPositionChanged(android.media.tv.TvInputManager.Session, long);
- method public void onTimeShiftStartPositionChanged(android.media.tv.TvInputManager.Session, long);
- method public void onTimeShiftStatusChanged(android.media.tv.TvInputManager.Session, int);
- method public void onTrackSelected(android.media.tv.TvInputManager.Session, int, java.lang.String);
- method public void onTracksChanged(android.media.tv.TvInputManager.Session, java.util.List<android.media.tv.TvTrackInfo>);
- method public void onVideoAvailable(android.media.tv.TvInputManager.Session);
- method public void onVideoSizeChanged(android.media.tv.TvInputManager.Session, int, int);
- method public void onVideoUnavailable(android.media.tv.TvInputManager.Session, int);
- }
-
public static abstract class TvInputManager.TvInputCallback {
ctor public TvInputManager.TvInputCallback();
method public void onInputAdded(java.lang.String);
@@ -31424,6 +31388,7 @@
field public static final int RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY = 1; // 0x1
field public static final deprecated int SCREEN_BRIGHT_WAKE_LOCK = 10; // 0xa
field public static final deprecated int SCREEN_DIM_WAKE_LOCK = 6; // 0x6
+ field public static final int USER_ACTIVITY_EVENT_ACCESSIBILITY = 3; // 0x3
field public static final int USER_ACTIVITY_EVENT_BUTTON = 1; // 0x1
field public static final int USER_ACTIVITY_EVENT_OTHER = 0; // 0x0
field public static final int USER_ACTIVITY_EVENT_TOUCH = 2; // 0x2
@@ -31716,10 +31681,6 @@
method public boolean isSystemUser();
method public boolean isUserAGoat();
method public boolean isUserRunning(android.os.UserHandle);
- method public deprecated boolean isUserRunningAndLocked();
- method public deprecated boolean isUserRunningAndLocked(android.os.UserHandle);
- method public deprecated boolean isUserRunningAndUnlocked();
- method public deprecated boolean isUserRunningAndUnlocked(android.os.UserHandle);
method public boolean isUserRunningOrStopping(android.os.UserHandle);
method public boolean isUserUnlocked();
method public boolean isUserUnlocked(android.os.UserHandle);
@@ -32280,9 +32241,9 @@
method public static void setDefaultValues(android.content.Context, java.lang.String, int, int, boolean);
method public void setSharedPreferencesMode(int);
method public void setSharedPreferencesName(java.lang.String);
- method public void setStorageCredentialEncrypted();
+ method public void setStorageCredentialProtected();
method public void setStorageDefault();
- method public void setStorageDeviceEncrypted();
+ method public void setStorageDeviceProtected();
field public static final java.lang.String KEY_HAS_SET_DEFAULT_VALUES = "_has_set_default_values";
field public static final java.lang.String METADATA_KEY_PREFERENCES = "android.preference";
}
@@ -40659,8 +40620,8 @@
method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
method public void clearWallpaper();
method public android.content.Context createConfigurationContext(android.content.res.Configuration);
- method public android.content.Context createCredentialEncryptedStorageContext();
- method public android.content.Context createDeviceEncryptedStorageContext();
+ method public android.content.Context createCredentialProtectedStorageContext();
+ method public android.content.Context createDeviceProtectedStorageContext();
method public android.content.Context createDisplayContext(android.view.Display);
method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
method public java.lang.String[] databaseList();
@@ -40711,10 +40672,10 @@
method public int getWallpaperDesiredMinimumHeight();
method public int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
- method public boolean isCredentialEncryptedStorage();
- method public boolean isDeviceEncryptedStorage();
- method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
- method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ method public boolean isCredentialProtectedStorage();
+ method public boolean isDeviceProtectedStorage();
+ method public boolean moveDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
diff --git a/api/system-removed.txt b/api/system-removed.txt
index caeecf5..8bf59df 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -15,12 +15,40 @@
}
+package android.content {
+
+ public abstract class Context {
+ method public deprecated android.content.Context createCredentialEncryptedStorageContext();
+ method public deprecated android.content.Context createDeviceEncryptedStorageContext();
+ method public deprecated boolean isCredentialEncryptedStorage();
+ method public deprecated boolean isDeviceEncryptedStorage();
+ method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public deprecated boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ }
+
+}
+
package android.content.pm {
+ public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
+ field public deprecated java.lang.String credentialEncryptedDataDir;
+ field public deprecated java.lang.String deviceEncryptedDataDir;
+ }
+
+ public class ComponentInfo extends android.content.pm.PackageItemInfo {
+ field public deprecated boolean encryptionAware;
+ }
+
public class PackageInfo implements android.os.Parcelable {
field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1
}
+ public abstract class PackageManager {
+ field public static final deprecated int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000
+ field public static final deprecated int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000
+ field public static final deprecated int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000
+ }
+
}
package android.database {
@@ -96,6 +124,19 @@
method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);
+ method public deprecated boolean isUserRunningAndLocked();
+ method public deprecated boolean isUserRunningAndLocked(android.os.UserHandle);
+ method public deprecated boolean isUserRunningAndUnlocked();
+ method public deprecated boolean isUserRunningAndUnlocked(android.os.UserHandle);
+ }
+
+}
+
+package android.preference {
+
+ public class PreferenceManager {
+ method public deprecated void setStorageCredentialEncrypted();
+ method public deprecated void setStorageDeviceEncrypted();
}
}
diff --git a/api/test-current.txt b/api/test-current.txt
index 34c14d4..908a50e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -443,6 +443,7 @@
field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495
field public static final int debuggable = 16842767; // 0x101000f
field public static final int defaultHeight = 16844021; // 0x10104f5
+ field public static final int defaultToDeviceProtectedStorage = 16844037; // 0x1010505
field public static final int defaultValue = 16843245; // 0x10101ed
field public static final int defaultWidth = 16844020; // 0x10104f4
field public static final int delay = 16843212; // 0x10101cc
@@ -462,6 +463,7 @@
field public static final int dialogTheme = 16843528; // 0x1010308
field public static final int dialogTitle = 16843250; // 0x10101f2
field public static final int digits = 16843110; // 0x1010166
+ field public static final int directBootAware = 16844038; // 0x1010506
field public static final int direction = 16843217; // 0x10101d1
field public static final deprecated int directionDescriptions = 16843681; // 0x10103a1
field public static final int directionPriority = 16843218; // 0x10101d2
@@ -510,7 +512,6 @@
field public static final int ellipsize = 16842923; // 0x10100ab
field public static final int ems = 16843096; // 0x1010158
field public static final int enabled = 16842766; // 0x101000e
- field public static final int encryptionAware = 16844038; // 0x1010506
field public static final int end = 16843996; // 0x10104dc
field public static final int endColor = 16843166; // 0x101019e
field public static final int endX = 16844051; // 0x1010513
@@ -575,7 +576,6 @@
field public static final int fontFamily = 16843692; // 0x10103ac
field public static final int fontFeatureSettings = 16843959; // 0x10104b7
field public static final int footerDividersEnabled = 16843311; // 0x101022f
- field public static final int forceDeviceEncrypted = 16844037; // 0x1010505
field public static final int foreground = 16843017; // 0x1010109
field public static final int foregroundGravity = 16843264; // 0x1010200
field public static final int foregroundTint = 16843885; // 0x101046d
@@ -7979,7 +7979,7 @@
method public abstract int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
method public abstract deprecated void clearWallpaper() throws java.io.IOException;
method public abstract android.content.Context createConfigurationContext(android.content.res.Configuration);
- method public abstract android.content.Context createDeviceEncryptedStorageContext();
+ method public abstract android.content.Context createDeviceProtectedStorageContext();
method public abstract android.content.Context createDisplayContext(android.view.Display);
method public abstract android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
method public abstract java.lang.String[] databaseList();
@@ -8038,10 +8038,10 @@
method public abstract deprecated int getWallpaperDesiredMinimumHeight();
method public abstract deprecated int getWallpaperDesiredMinimumWidth();
method public abstract void grantUriPermission(java.lang.String, android.net.Uri, int);
- method public abstract boolean isDeviceEncryptedStorage();
+ method public abstract boolean isDeviceProtectedStorage();
method public boolean isRestricted();
- method public abstract boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
- method public abstract boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ method public abstract boolean moveDatabaseFrom(android.content.Context, java.lang.String);
+ method public abstract boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
method public final android.content.res.TypedArray obtainStyledAttributes(int[]);
method public final android.content.res.TypedArray obtainStyledAttributes(int, int[]) throws android.content.res.Resources.NotFoundException;
method public final android.content.res.TypedArray obtainStyledAttributes(android.util.AttributeSet, int[]);
@@ -8176,7 +8176,7 @@
method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
method public deprecated void clearWallpaper() throws java.io.IOException;
method public android.content.Context createConfigurationContext(android.content.res.Configuration);
- method public android.content.Context createDeviceEncryptedStorageContext();
+ method public android.content.Context createDeviceProtectedStorageContext();
method public android.content.Context createDisplayContext(android.view.Display);
method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
method public java.lang.String[] databaseList();
@@ -8229,9 +8229,9 @@
method public deprecated int getWallpaperDesiredMinimumHeight();
method public deprecated int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
- method public boolean isDeviceEncryptedStorage();
- method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
- method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ method public boolean isDeviceProtectedStorage();
+ method public boolean moveDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
@@ -9324,10 +9324,9 @@
field public java.lang.String backupAgentName;
field public java.lang.String className;
field public int compatibleWidthLimitDp;
- field public java.lang.String credentialEncryptedDataDir;
field public java.lang.String dataDir;
field public int descriptionRes;
- field public java.lang.String deviceEncryptedDataDir;
+ field public java.lang.String deviceProtectedDataDir;
field public boolean enabled;
field public int flags;
field public int largestWidthLimitDp;
@@ -9364,8 +9363,8 @@
method public boolean isEnabled();
field public android.content.pm.ApplicationInfo applicationInfo;
field public int descriptionRes;
+ field public boolean directBootAware;
field public boolean enabled;
- field public boolean encryptionAware;
field public boolean exported;
field public java.lang.String processName;
}
@@ -9837,11 +9836,10 @@
field public static final int GET_URI_PERMISSION_PATTERNS = 2048; // 0x800
field public static final int MATCH_ALL = 131072; // 0x20000
field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000
+ field public static final int MATCH_DIRECT_BOOT_AWARE = 524288; // 0x80000
+ field public static final int MATCH_DIRECT_BOOT_UNAWARE = 262144; // 0x40000
field public static final int MATCH_DISABLED_COMPONENTS = 512; // 0x200
field public static final int MATCH_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
- field public static final int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000
- field public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000
- field public static final int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000
field public static final int MATCH_SYSTEM_ONLY = 1048576; // 0x100000
field public static final int MATCH_UNINSTALLED_PACKAGES = 8192; // 0x2000
field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
@@ -29436,10 +29434,6 @@
method public boolean isSystemUser();
method public boolean isUserAGoat();
method public boolean isUserRunning(android.os.UserHandle);
- method public deprecated boolean isUserRunningAndLocked();
- method public deprecated boolean isUserRunningAndLocked(android.os.UserHandle);
- method public deprecated boolean isUserRunningAndUnlocked();
- method public deprecated boolean isUserRunningAndUnlocked(android.os.UserHandle);
method public boolean isUserRunningOrStopping(android.os.UserHandle);
method public boolean isUserUnlocked();
method public boolean isUserUnlocked(android.os.UserHandle);
@@ -30001,7 +29995,7 @@
method public void setSharedPreferencesMode(int);
method public void setSharedPreferencesName(java.lang.String);
method public void setStorageDefault();
- method public void setStorageDeviceEncrypted();
+ method public void setStorageDeviceProtected();
field public static final java.lang.String KEY_HAS_SET_DEFAULT_VALUES = "_has_set_default_values";
field public static final java.lang.String METADATA_KEY_PREFERENCES = "android.preference";
}
@@ -37983,7 +37977,7 @@
method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
method public void clearWallpaper();
method public android.content.Context createConfigurationContext(android.content.res.Configuration);
- method public android.content.Context createDeviceEncryptedStorageContext();
+ method public android.content.Context createDeviceProtectedStorageContext();
method public android.content.Context createDisplayContext(android.view.Display);
method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
method public java.lang.String[] databaseList();
@@ -38035,9 +38029,9 @@
method public int getWallpaperDesiredMinimumHeight();
method public int getWallpaperDesiredMinimumWidth();
method public void grantUriPermission(java.lang.String, android.net.Uri, int);
- method public boolean isDeviceEncryptedStorage();
- method public boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
- method public boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ method public boolean isDeviceProtectedStorage();
+ method public boolean moveDatabaseFrom(android.content.Context, java.lang.String);
+ method public boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
diff --git a/api/test-removed.txt b/api/test-removed.txt
index 8ac2d63..9b5d3ab 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -17,12 +17,40 @@
}
+package android.content {
+
+ public abstract class Context {
+ method public deprecated android.content.Context createCredentialEncryptedStorageContext();
+ method public deprecated android.content.Context createDeviceEncryptedStorageContext();
+ method public deprecated boolean isCredentialEncryptedStorage();
+ method public deprecated boolean isDeviceEncryptedStorage();
+ method public deprecated boolean migrateDatabaseFrom(android.content.Context, java.lang.String);
+ method public deprecated boolean migrateSharedPreferencesFrom(android.content.Context, java.lang.String);
+ }
+
+}
+
package android.content.pm {
+ public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
+ field public deprecated java.lang.String credentialEncryptedDataDir;
+ field public deprecated java.lang.String deviceEncryptedDataDir;
+ }
+
+ public class ComponentInfo extends android.content.pm.PackageItemInfo {
+ field public deprecated boolean encryptionAware;
+ }
+
public class PackageInfo implements android.os.Parcelable {
field public static final int REQUESTED_PERMISSION_REQUIRED = 1; // 0x1
}
+ public abstract class PackageManager {
+ field public static final deprecated int MATCH_ENCRYPTION_AWARE = 524288; // 0x80000
+ field public static final deprecated int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = 786432; // 0xc0000
+ field public static final deprecated int MATCH_ENCRYPTION_UNAWARE = 262144; // 0x40000
+ }
+
}
package android.database {
@@ -98,6 +126,19 @@
method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);
+ method public deprecated boolean isUserRunningAndLocked();
+ method public deprecated boolean isUserRunningAndLocked(android.os.UserHandle);
+ method public deprecated boolean isUserRunningAndUnlocked();
+ method public deprecated boolean isUserRunningAndUnlocked(android.os.UserHandle);
+ }
+
+}
+
+package android.preference {
+
+ public class PreferenceManager {
+ method public deprecated void setStorageCredentialEncrypted();
+ method public deprecated void setStorageDeviceEncrypted();
}
}
diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
index 75680e6..4019a56 100644
--- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
+++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
@@ -688,7 +688,7 @@
/** {@hide} */
public boolean isEncryptionAware() {
- return mResolveInfo.serviceInfo.encryptionAware;
+ return mResolveInfo.serviceInfo.directBootAware;
}
/**
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 93c668d1..dbc6c84 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -5236,9 +5236,9 @@
// Setup a location to store generated/compiled graphics code and
// JIT profiling data. Note that this data is stored in a
- // device-encrypted storage area, so these caches must never contain
+ // device-protected storage area, so these caches must never contain
// user sensitive user data.
- final Context deviceContext = appContext.createDeviceEncryptedStorageContext();
+ final Context deviceContext = appContext.createDeviceProtectedStorageContext();
final File codeCacheDir = deviceContext.getCodeCacheDir();
if (codeCacheDir != null) {
setupGraphicsSupport(data.info, codeCacheDir);
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 4fccbc9..63a6829 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -400,7 +400,7 @@
*
* @return the number of files moved, or -1 if there was trouble.
*/
- private static int migrateFiles(File sourceDir, File targetDir, final String prefix) {
+ private static int moveFiles(File sourceDir, File targetDir, final String prefix) {
final File[] sourceFiles = FileUtils.listFilesOrEmpty(sourceDir, new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
@@ -430,12 +430,12 @@
}
@Override
- public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {
+ public boolean moveSharedPreferencesFrom(Context sourceContext, String name) {
synchronized (ContextImpl.class) {
final File source = sourceContext.getSharedPreferencesPath(name);
final File target = getSharedPreferencesPath(name);
- final int res = migrateFiles(source.getParentFile(), target.getParentFile(),
+ final int res = moveFiles(source.getParentFile(), target.getParentFile(),
source.getName());
if (res > 0) {
// We moved at least one file, so evict any in-memory caches for
@@ -681,11 +681,11 @@
}
@Override
- public boolean migrateDatabaseFrom(Context sourceContext, String name) {
+ public boolean moveDatabaseFrom(Context sourceContext, String name) {
synchronized (ContextImpl.class) {
final File source = sourceContext.getDatabasePath(name);
final File target = getDatabasePath(name);
- return migrateFiles(source.getParentFile(), target.getParentFile(),
+ return moveFiles(source.getParentFile(), target.getParentFile(),
source.getName()) != -1;
}
}
@@ -1905,17 +1905,17 @@
}
@Override
- public Context createDeviceEncryptedStorageContext() {
- final int flags = (mFlags & ~Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE)
- | Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE;
+ public Context createDeviceProtectedStorageContext() {
+ final int flags = (mFlags & ~Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE)
+ | Context.CONTEXT_DEVICE_PROTECTED_STORAGE;
return new ContextImpl(this, mMainThread, mPackageInfo, mActivityToken,
mUser, flags, mDisplay, null, Display.INVALID_DISPLAY);
}
@Override
- public Context createCredentialEncryptedStorageContext() {
- final int flags = (mFlags & ~Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE)
- | Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE;
+ public Context createCredentialProtectedStorageContext() {
+ final int flags = (mFlags & ~Context.CONTEXT_DEVICE_PROTECTED_STORAGE)
+ | Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE;
return new ContextImpl(this, mMainThread, mPackageInfo, mActivityToken,
mUser, flags, mDisplay, null, Display.INVALID_DISPLAY);
}
@@ -1926,13 +1926,13 @@
}
@Override
- public boolean isDeviceEncryptedStorage() {
- return (mFlags & Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE) != 0;
+ public boolean isDeviceProtectedStorage() {
+ return (mFlags & Context.CONTEXT_DEVICE_PROTECTED_STORAGE) != 0;
}
@Override
- public boolean isCredentialEncryptedStorage() {
- return (mFlags & Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE) != 0;
+ public boolean isCredentialProtectedStorage() {
+ return (mFlags & Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE) != 0;
}
@Override
@@ -1944,10 +1944,10 @@
public File getDataDir() {
if (mPackageInfo != null) {
File res = null;
- if (isCredentialEncryptedStorage()) {
- res = mPackageInfo.getCredentialEncryptedDataDirFile();
- } else if (isDeviceEncryptedStorage()) {
- res = mPackageInfo.getDeviceEncryptedDataDirFile();
+ if (isCredentialProtectedStorage()) {
+ res = mPackageInfo.getCredentialProtectedDataDirFile();
+ } else if (isDeviceProtectedStorage()) {
+ res = mPackageInfo.getDeviceProtectedDataDirFile();
} else {
res = mPackageInfo.getDataDirFile();
}
@@ -2013,13 +2013,13 @@
// If creator didn't specify which storage to use, use the default
// location for application.
- if ((flags & (Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE
- | Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE)) == 0) {
+ if ((flags & (Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE
+ | Context.CONTEXT_DEVICE_PROTECTED_STORAGE)) == 0) {
final File dataDir = packageInfo.getDataDirFile();
- if (Objects.equals(dataDir, packageInfo.getCredentialEncryptedDataDirFile())) {
- flags |= Context.CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE;
- } else if (Objects.equals(dataDir, packageInfo.getDeviceEncryptedDataDirFile())) {
- flags |= Context.CONTEXT_DEVICE_ENCRYPTED_STORAGE;
+ if (Objects.equals(dataDir, packageInfo.getCredentialProtectedDataDirFile())) {
+ flags |= Context.CONTEXT_CREDENTIAL_PROTECTED_STORAGE;
+ } else if (Objects.equals(dataDir, packageInfo.getDeviceProtectedDataDirFile())) {
+ flags |= Context.CONTEXT_DEVICE_PROTECTED_STORAGE;
}
}
diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java
index c68fd65..e090aa4 100644
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -16,8 +16,6 @@
package android.app;
-import android.text.TextUtils;
-import android.util.ArrayMap;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
@@ -37,15 +35,17 @@
import android.os.Process;
import android.os.RemoteException;
import android.os.StrictMode;
+import android.os.SystemProperties;
import android.os.Trace;
import android.os.UserHandle;
+import android.text.TextUtils;
import android.util.AndroidRuntimeException;
+import android.util.ArrayMap;
import android.util.Log;
import android.util.Slog;
import android.util.SparseArray;
-import android.view.DisplayAdjustments;
import android.view.Display;
-import android.os.SystemProperties;
+import android.view.DisplayAdjustments;
import dalvik.system.VMRuntime;
@@ -56,11 +56,10 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.List;
import java.util.Objects;
final class IntentReceiverLeaked extends AndroidRuntimeException {
@@ -95,8 +94,8 @@
private String mDataDir;
private String mLibDir;
private File mDataDirFile;
- private File mDeviceEncryptedDataDirFile;
- private File mCredentialEncryptedDataDirFile;
+ private File mDeviceProtectedDataDirFile;
+ private File mCredentialProtectedDataDirFile;
private final ClassLoader mBaseClassLoader;
private final boolean mSecurityViolation;
private final boolean mIncludeCode;
@@ -186,8 +185,8 @@
mSharedLibraries = null;
mDataDir = null;
mDataDirFile = null;
- mDeviceEncryptedDataDirFile = null;
- mCredentialEncryptedDataDirFile = null;
+ mDeviceProtectedDataDirFile = null;
+ mCredentialProtectedDataDirFile = null;
mLibDir = null;
mBaseClassLoader = null;
mSecurityViolation = false;
@@ -303,8 +302,8 @@
mDataDir = aInfo.dataDir;
mLibDir = aInfo.nativeLibraryDir;
mDataDirFile = FileUtils.newFileOrNull(aInfo.dataDir);
- mDeviceEncryptedDataDirFile = FileUtils.newFileOrNull(aInfo.deviceEncryptedDataDir);
- mCredentialEncryptedDataDirFile = FileUtils.newFileOrNull(aInfo.credentialEncryptedDataDir);
+ mDeviceProtectedDataDirFile = FileUtils.newFileOrNull(aInfo.deviceProtectedDataDir);
+ mCredentialProtectedDataDirFile = FileUtils.newFileOrNull(aInfo.credentialProtectedDataDir);
}
public static void makePaths(ActivityThread activityThread, ApplicationInfo aInfo,
@@ -651,12 +650,12 @@
return mDataDirFile;
}
- public File getDeviceEncryptedDataDirFile() {
- return mDeviceEncryptedDataDirFile;
+ public File getDeviceProtectedDataDirFile() {
+ return mDeviceProtectedDataDirFile;
}
- public File getCredentialEncryptedDataDirFile() {
- return mCredentialEncryptedDataDirFile;
+ public File getCredentialProtectedDataDirFile() {
+ return mCredentialProtectedDataDirFile;
}
public AssetManager getAssets(ActivityThread mainThread) {
diff --git a/core/java/android/app/backup/BackupAgent.java b/core/java/android/app/backup/BackupAgent.java
index aeb3156..801c951 100644
--- a/core/java/android/app/backup/BackupAgent.java
+++ b/core/java/android/app/backup/BackupAgent.java
@@ -18,7 +18,6 @@
import android.app.IBackupAgent;
import android.app.QueuedWork;
-import android.app.backup.IBackupManager;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.pm.ApplicationInfo;
@@ -36,18 +35,17 @@
import android.util.ArraySet;
import android.util.Log;
+import org.xmlpull.v1.XmlPullParserException;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Collection;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-import org.xmlpull.v1.XmlPullParserException;
-
/**
* Provides the central interface between an
* application and Android's data backup infrastructure. An application that wishes
@@ -310,7 +308,7 @@
// System apps have control over where their default storage context
// is pointed, so we're always explicit when building paths.
- final Context ceContext = createCredentialEncryptedStorageContext();
+ final Context ceContext = createCredentialProtectedStorageContext();
final String rootDir = ceContext.getDataDir().getCanonicalPath();
final String filesDir = ceContext.getFilesDir().getCanonicalPath();
final String noBackupDir = ceContext.getNoBackupFilesDir().getCanonicalPath();
@@ -321,7 +319,7 @@
final String cacheDir = ceContext.getCacheDir().getCanonicalPath();
final String codeCacheDir = ceContext.getCodeCacheDir().getCanonicalPath();
- final Context deContext = createDeviceEncryptedStorageContext();
+ final Context deContext = createDeviceProtectedStorageContext();
final String deviceRootDir = deContext.getDataDir().getCanonicalPath();
final String deviceFilesDir = deContext.getFilesDir().getCanonicalPath();
final String deviceNoBackupDir = deContext.getNoBackupFilesDir().getCanonicalPath();
@@ -516,7 +514,7 @@
try {
// System apps have control over where their default storage context
// is pointed, so we're always explicit when building paths.
- final Context ceContext = createCredentialEncryptedStorageContext();
+ final Context ceContext = createCredentialProtectedStorageContext();
rootDir = ceContext.getDataDir().getCanonicalPath();
filesDir = ceContext.getFilesDir().getCanonicalPath();
nbFilesDir = ceContext.getNoBackupFilesDir().getCanonicalPath();
@@ -525,7 +523,7 @@
cacheDir = ceContext.getCacheDir().getCanonicalPath();
codeCacheDir = ceContext.getCodeCacheDir().getCanonicalPath();
- final Context deContext = createDeviceEncryptedStorageContext();
+ final Context deContext = createDeviceProtectedStorageContext();
deviceRootDir = deContext.getDataDir().getCanonicalPath();
deviceFilesDir = deContext.getFilesDir().getCanonicalPath();
deviceNbFilesDir = deContext.getNoBackupFilesDir().getCanonicalPath();
diff --git a/core/java/android/app/backup/FullBackup.java b/core/java/android/app/backup/FullBackup.java
index cdc80e3..478024d 100644
--- a/core/java/android/app/backup/FullBackup.java
+++ b/core/java/android/app/backup/FullBackup.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.XmlResourceParser;
-import android.os.*;
+import android.os.ParcelFileDescriptor;
import android.os.Process;
import android.system.ErrnoException;
import android.system.Os;
@@ -31,16 +31,15 @@
import com.android.internal.annotations.VisibleForTesting;
import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.xmlpull.v1.XmlPullParserException;
/**
* Global constant definitions et cetera related to the full-backup-to-fd
* binary format. Nothing in this namespace is part of any API; it's all
@@ -289,7 +288,7 @@
// System apps have control over where their default storage context
// is pointed, so we're always explicit when building paths.
- final Context ceContext = context.createCredentialEncryptedStorageContext();
+ final Context ceContext = context.createCredentialProtectedStorageContext();
FILES_DIR = ceContext.getFilesDir();
DATABASE_DIR = ceContext.getDatabasePath("foo").getParentFile();
ROOT_DIR = ceContext.getDataDir();
@@ -297,7 +296,7 @@
CACHE_DIR = ceContext.getCacheDir();
NOBACKUP_DIR = ceContext.getNoBackupFilesDir();
- final Context deContext = context.createDeviceEncryptedStorageContext();
+ final Context deContext = context.createDeviceProtectedStorageContext();
DEVICE_FILES_DIR = deContext.getFilesDir();
DEVICE_DATABASE_DIR = deContext.getDatabasePath("foo").getParentFile();
DEVICE_ROOT_DIR = deContext.getDataDir();
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index c4dfdcf..ca19b9b 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -695,20 +695,26 @@
public abstract SharedPreferences getSharedPreferences(File file, int mode);
/**
- * Migrate an existing shared preferences file from the given source storage
+ * Move an existing shared preferences file from the given source storage
* context to this context. This is typically used to migrate data between
- * storage locations after an upgrade, such as migrating from credential
- * encrypted to device encrypted storage.
+ * storage locations after an upgrade, such as moving to device protected
+ * storage.
*
* @param sourceContext The source context which contains the existing
- * shared preferences to migrate.
+ * shared preferences to move.
* @param name The name of the shared preferences file.
- * @return {@code true} if the migration was successful or if the shared
+ * @return {@code true} if the move was successful or if the shared
* preferences didn't exist in the source context, otherwise
* {@code false}.
- * @see #createDeviceEncryptedStorageContext()
+ * @see #createDeviceProtectedStorageContext()
*/
- public abstract boolean migrateSharedPreferencesFrom(Context sourceContext, String name);
+ public abstract boolean moveSharedPreferencesFrom(Context sourceContext, String name);
+
+ /** @removed */
+ @Deprecated
+ public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {
+ return moveSharedPreferencesFrom(sourceContext, name);
+ }
/**
* Delete an existing shared preferences file.
@@ -1397,19 +1403,25 @@
@Nullable DatabaseErrorHandler errorHandler);
/**
- * Migrate an existing database file from the given source storage context
- * to this context. This is typically used to migrate data between storage
- * locations after an upgrade, such as migrating from credential encrypted
- * to device encrypted storage.
+ * Move an existing database file from the given source storage context to
+ * this context. This is typically used to migrate data between storage
+ * locations after an upgrade, such as migrating to device protected
+ * storage.
*
* @param sourceContext The source context which contains the existing
- * database to migrate.
+ * database to move.
* @param name The name of the database file.
- * @return {@code true} if the migration was successful or if the database
- * didn't exist in the source context, otherwise {@code false}.
- * @see #createDeviceEncryptedStorageContext()
+ * @return {@code true} if the move was successful or if the database didn't
+ * exist in the source context, otherwise {@code false}.
+ * @see #createDeviceProtectedStorageContext()
*/
- public abstract boolean migrateDatabaseFrom(Context sourceContext, String name);
+ public abstract boolean moveDatabaseFrom(Context sourceContext, String name);
+
+ /** @removed */
+ @Deprecated
+ public boolean migrateDatabaseFrom(Context sourceContext, String name) {
+ return moveDatabaseFrom(sourceContext, name);
+ }
/**
* Delete an existing private SQLiteDatabase associated with this Context's
@@ -4038,19 +4050,19 @@
/**
* Flag for use with {@link #createPackageContext}: point all file APIs at
- * device-encrypted storage.
+ * device-protected storage.
*
* @hide
*/
- public static final int CONTEXT_DEVICE_ENCRYPTED_STORAGE = 0x00000008;
+ public static final int CONTEXT_DEVICE_PROTECTED_STORAGE = 0x00000008;
/**
* Flag for use with {@link #createPackageContext}: point all file APIs at
- * credential-encrypted storage.
+ * credential-protected storage.
*
* @hide
*/
- public static final int CONTEXT_CREDENTIAL_ENCRYPTED_STORAGE = 0x00000010;
+ public static final int CONTEXT_CREDENTIAL_PROTECTED_STORAGE = 0x00000010;
/**
* @hide Used to indicate we should tell the activity manager about the process
@@ -4154,53 +4166,73 @@
/**
* Return a new Context object for the current Context but whose storage
- * APIs are backed by device-encrypted storage.
+ * APIs are backed by device-protected storage.
* <p>
- * Data stored in device-encrypted storage is typically encrypted with a key
- * tied to the physical device, and it can be accessed when the device has
- * booted successfully, both <em>before and after</em> the user has
- * authenticated with their credentials (such as a lock pattern or PIN).
- * Because device-encrypted data is available before user authentication,
- * you should carefully consider what data you store using this Context.
+ * When a device is encrypted, data stored in this location is encrypted
+ * with a key tied to the physical device, and it can be accessed
+ * immediately after the device has booted successfully, both
+ * <em>before and after</em> the user has authenticated with their
+ * credentials (such as a lock pattern or PIN).
+ * <p>
+ * Because device-protected data is available without user authentication,
+ * you should carefully limit the data you store using this Context. For
+ * example, storing sensitive authentication tokens or passwords in the
+ * device-protected area is strongly discouraged.
* <p>
* If the underlying device does not have the ability to store
- * device-encrypted and credential-encrypted data using different keys, then
- * both storage areas will become available at the same time. They remain
- * two distinct storage areas, and only the window of availability changes.
+ * device-protected and credential-protected data using different keys, then
+ * both storage areas will become available at the same time. They remain as
+ * two distinct storage locations on disk, and only the window of
+ * availability changes.
* <p>
* Each call to this method returns a new instance of a Context object;
* Context objects are not shared, however common state (ClassLoader, other
* Resources for the same configuration) may be so the Context itself can be
* fairly lightweight.
*
- * @see #isDeviceEncryptedStorage()
+ * @see #isDeviceProtectedStorage()
*/
- public abstract Context createDeviceEncryptedStorageContext();
+ public abstract Context createDeviceProtectedStorageContext();
+
+ /** @removed */
+ @Deprecated
+ public Context createDeviceEncryptedStorageContext() {
+ return createDeviceProtectedStorageContext();
+ }
/**
* Return a new Context object for the current Context but whose storage
- * APIs are backed by credential-encrypted storage.
+ * APIs are backed by credential-protected storage. This is the default
+ * storage area for apps unless
+ * {@link android.R.attr#defaultToDeviceProtectedStorage} was requested.
* <p>
- * Data stored in credential-encrypted storage is typically encrypted with a
- * key tied to user credentials, and they can be accessed
+ * When a device is encrypted, data stored in this location is encrypted
+ * with a key tied to user credentials, which can be accessed
* <em>only after</em> the user has entered their credentials (such as a
* lock pattern or PIN).
* <p>
* If the underlying device does not have the ability to store
- * device-encrypted and credential-encrypted data using different keys, then
- * both storage areas will become available at the same time. They remain
- * two distinct storage areas, and only the window of availability changes.
+ * device-protected and credential-protected data using different keys, then
+ * both storage areas will become available at the same time. They remain as
+ * two distinct storage locations on disk, and only the window of
+ * availability changes.
* <p>
* Each call to this method returns a new instance of a Context object;
* Context objects are not shared, however common state (ClassLoader, other
* Resources for the same configuration) may be so the Context itself can be
* fairly lightweight.
*
- * @see #isCredentialEncryptedStorage()
+ * @see #isCredentialProtectedStorage()
* @hide
*/
@SystemApi
- public abstract Context createCredentialEncryptedStorageContext();
+ public abstract Context createCredentialProtectedStorageContext();
+
+ /** @removed */
+ @Deprecated
+ public Context createCredentialEncryptedStorageContext() {
+ return createCredentialProtectedStorageContext();
+ }
/**
* Gets the display adjustments holder for this context. This information
@@ -4226,19 +4258,31 @@
/**
* Indicates if the storage APIs of this Context are backed by
- * device-encrypted storage.
+ * device-protected storage.
*
- * @see #createDeviceEncryptedStorageContext()
+ * @see #createDeviceProtectedStorageContext()
*/
- public abstract boolean isDeviceEncryptedStorage();
+ public abstract boolean isDeviceProtectedStorage();
+
+ /** @removed */
+ @Deprecated
+ public boolean isDeviceEncryptedStorage() {
+ return isDeviceProtectedStorage();
+ }
/**
* Indicates if the storage APIs of this Context are backed by
- * credential-encrypted storage.
+ * credential-protected storage.
*
- * @see #createCredentialEncryptedStorageContext()
+ * @see #createCredentialProtectedStorageContext()
* @hide
*/
@SystemApi
- public abstract boolean isCredentialEncryptedStorage();
+ public abstract boolean isCredentialProtectedStorage();
+
+ /** @removed */
+ @Deprecated
+ public boolean isCredentialEncryptedStorage() {
+ return isCredentialProtectedStorage();
+ }
}
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index 323c9bf..b2df207 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -33,8 +33,8 @@
import android.os.IBinder;
import android.os.Looper;
import android.os.UserHandle;
-import android.view.DisplayAdjustments;
import android.view.Display;
+import android.view.DisplayAdjustments;
import java.io.File;
import java.io.FileInputStream;
@@ -170,8 +170,8 @@
}
@Override
- public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {
- return mBase.migrateSharedPreferencesFrom(sourceContext, name);
+ public boolean moveSharedPreferencesFrom(Context sourceContext, String name) {
+ return mBase.moveSharedPreferencesFrom(sourceContext, name);
}
@Override
@@ -288,8 +288,8 @@
}
@Override
- public boolean migrateDatabaseFrom(Context sourceContext, String name) {
- return mBase.migrateDatabaseFrom(sourceContext, name);
+ public boolean moveDatabaseFrom(Context sourceContext, String name) {
+ return mBase.moveDatabaseFrom(sourceContext, name);
}
@Override
@@ -818,26 +818,26 @@
}
@Override
- public Context createDeviceEncryptedStorageContext() {
- return mBase.createDeviceEncryptedStorageContext();
+ public Context createDeviceProtectedStorageContext() {
+ return mBase.createDeviceProtectedStorageContext();
}
/** {@hide} */
@SystemApi
@Override
- public Context createCredentialEncryptedStorageContext() {
- return mBase.createCredentialEncryptedStorageContext();
+ public Context createCredentialProtectedStorageContext() {
+ return mBase.createCredentialProtectedStorageContext();
}
@Override
- public boolean isDeviceEncryptedStorage() {
- return mBase.isDeviceEncryptedStorage();
+ public boolean isDeviceProtectedStorage() {
+ return mBase.isDeviceProtectedStorage();
}
/** {@hide} */
@SystemApi
@Override
- public boolean isCredentialEncryptedStorage() {
- return mBase.isCredentialEncryptedStorage();
+ public boolean isCredentialProtectedStorage() {
+ return mBase.isCredentialProtectedStorage();
}
}
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 58d75f7..104feb5 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -16,7 +16,9 @@
package android.content.pm;
+import android.annotation.SystemApi;
import android.annotation.TestApi;
+import android.content.Context;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
@@ -24,7 +26,6 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.os.UserHandle;
-import android.os.storage.StorageManager;
import android.text.TextUtils;
import android.util.Printer;
@@ -109,8 +110,8 @@
* include/exclude criteria.
* <p>If android:allowBackup is set to false, this attribute is ignored.
*
- * @see {@link android.content.Context#getNoBackupFilesDir}
- * @see {@link #FLAG_ALLOW_BACKUP}
+ * @see android.content.Context#getNoBackupFilesDir()
+ * @see #FLAG_ALLOW_BACKUP
*
* @hide
*/
@@ -469,20 +470,20 @@
public static final int PRIVATE_FLAG_HAS_DOMAIN_URLS = 1<<4;
/**
- * When set, default data storage directory for given app is pointed at
- * device-encrypted location.
+ * When set, the default data storage directory for this app is pointed at
+ * the device-protected location.
*
* @hide
*/
- public static final int PRIVATE_FLAG_FORCE_DEVICE_ENCRYPTED = 1 << 5;
+ public static final int PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE = 1 << 5;
/**
- * When set, assume that all components under the given app are encryption
+ * When set, assume that all components under the given app are direct boot
* aware, unless otherwise specified.
*
* @hide
*/
- public static final int PRIVATE_FLAG_ENCRYPTION_AWARE = 1 << 6;
+ public static final int PRIVATE_FLAG_DIRECT_BOOT_AWARE = 1 << 6;
/**
* Value for {@link #privateFlags}: set to {@code true} if the application
@@ -493,11 +494,12 @@
public static final int PRIVATE_FLAG_AUTOPLAY = 1 << 7;
/**
- * When set, at least one component inside this application is encryption aware.
+ * When set, at least one component inside this application is direct boot
+ * aware.
*
* @hide
*/
- public static final int PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE = 1 << 8;
+ public static final int PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE = 1 << 8;
/**
* Value for {@link #flags}: {@code true} if the application is blocked via restrictions
@@ -627,15 +629,28 @@
public String dataDir;
/**
- * Full path to the device-encrypted directory assigned to the package for
+ * Full path to the device-protected directory assigned to the package for
* its persistent data.
+ *
+ * @see Context#createDeviceProtectedStorageContext()
*/
+ public String deviceProtectedDataDir;
+
+ /** @removed */
+ @Deprecated
public String deviceEncryptedDataDir;
/**
- * Full path to the credential-encrypted directory assigned to the package
+ * Full path to the credential-protected directory assigned to the package
* for its persistent data.
+ *
+ * @hide
*/
+ @SystemApi
+ public String credentialProtectedDataDir;
+
+ /** @removed */
+ @Deprecated
public String credentialEncryptedDataDir;
/**
@@ -790,8 +805,8 @@
}
pw.println(prefix + "dataDir=" + dataDir);
if ((flags&DUMP_FLAG_DETAILS) != 0) {
- pw.println(prefix + "deviceEncryptedDataDir=" + deviceEncryptedDataDir);
- pw.println(prefix + "credentialEncryptedDataDir=" + credentialEncryptedDataDir);
+ pw.println(prefix + "deviceProtectedDataDir=" + deviceProtectedDataDir);
+ pw.println(prefix + "credentialProtectedDataDir=" + credentialProtectedDataDir);
if (sharedLibraryFiles != null) {
pw.println(prefix + "sharedLibraryFiles=" + Arrays.toString(sharedLibraryFiles));
}
@@ -889,8 +904,8 @@
seinfo = orig.seinfo;
sharedLibraryFiles = orig.sharedLibraryFiles;
dataDir = orig.dataDir;
- deviceEncryptedDataDir = orig.deviceEncryptedDataDir;
- credentialEncryptedDataDir = orig.credentialEncryptedDataDir;
+ deviceEncryptedDataDir = deviceProtectedDataDir = orig.deviceProtectedDataDir;
+ credentialEncryptedDataDir = credentialProtectedDataDir = orig.credentialProtectedDataDir;
uid = orig.uid;
minSdkVersion = orig.minSdkVersion;
targetSdkVersion = orig.targetSdkVersion;
@@ -944,8 +959,8 @@
dest.writeString(seinfo);
dest.writeStringArray(sharedLibraryFiles);
dest.writeString(dataDir);
- dest.writeString(deviceEncryptedDataDir);
- dest.writeString(credentialEncryptedDataDir);
+ dest.writeString(deviceProtectedDataDir);
+ dest.writeString(credentialProtectedDataDir);
dest.writeInt(uid);
dest.writeString(minSdkVersion);
dest.writeInt(targetSdkVersion);
@@ -999,8 +1014,8 @@
seinfo = source.readString();
sharedLibraryFiles = source.readStringArray();
dataDir = source.readString();
- deviceEncryptedDataDir = source.readString();
- credentialEncryptedDataDir = source.readString();
+ deviceEncryptedDataDir = deviceProtectedDataDir = source.readString();
+ credentialEncryptedDataDir = credentialProtectedDataDir = source.readString();
uid = source.readInt();
minSdkVersion = source.readString();
targetSdkVersion = source.readInt();
@@ -1056,18 +1071,18 @@
return;
}
- deviceEncryptedDataDir = Environment
+ deviceEncryptedDataDir = deviceProtectedDataDir = Environment
.getDataUserDePackageDirectory(volumeUuid, userId, packageName)
.getAbsolutePath();
- credentialEncryptedDataDir = Environment
+ credentialEncryptedDataDir = credentialProtectedDataDir = Environment
.getDataUserCePackageDirectory(volumeUuid, userId, packageName)
.getAbsolutePath();
- if ((privateFlags & PRIVATE_FLAG_FORCE_DEVICE_ENCRYPTED) != 0
- && PackageManager.APPLY_FORCE_DEVICE_ENCRYPTED) {
- dataDir = deviceEncryptedDataDir;
+ if ((privateFlags & PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE) != 0
+ && PackageManager.APPLY_DEFAULT_TO_DEVICE_PROTECTED_STORAGE) {
+ dataDir = deviceProtectedDataDir;
} else {
- dataDir = credentialEncryptedDataDir;
+ dataDir = credentialProtectedDataDir;
}
}
@@ -1134,18 +1149,19 @@
}
/** @hide */
- public boolean isForceDeviceEncrypted() {
- return (privateFlags & ApplicationInfo.PRIVATE_FLAG_FORCE_DEVICE_ENCRYPTED) != 0;
+ public boolean isDefaultToDeviceProtectedStorage() {
+ return (privateFlags
+ & ApplicationInfo.PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE) != 0;
}
/** @hide */
- public boolean isEncryptionAware() {
- return (privateFlags & ApplicationInfo.PRIVATE_FLAG_ENCRYPTION_AWARE) != 0;
+ public boolean isDirectBootAware() {
+ return (privateFlags & ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE) != 0;
}
/** @hide */
- public boolean isPartiallyEncryptionAware() {
- return (privateFlags & ApplicationInfo.PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE) != 0;
+ public boolean isPartiallyDirectBootAware() {
+ return (privateFlags & ApplicationInfo.PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE) != 0;
}
/**
diff --git a/core/java/android/content/pm/ComponentInfo.java b/core/java/android/content/pm/ComponentInfo.java
index 63a163d..5cd15dd 100644
--- a/core/java/android/content/pm/ComponentInfo.java
+++ b/core/java/android/content/pm/ComponentInfo.java
@@ -66,10 +66,14 @@
public boolean exported = false;
/**
- * Indicate if this component is aware of encryption lifecycle, and can be
+ * Indicates if this component is aware of direct boot lifecycle, and can be
* safely run before the user has entered their credentials (such as a lock
* pattern or PIN).
*/
+ public boolean directBootAware = false;
+
+ /** @removed */
+ @Deprecated
public boolean encryptionAware = false;
public ComponentInfo() {
@@ -82,7 +86,7 @@
descriptionRes = orig.descriptionRes;
enabled = orig.enabled;
exported = orig.exported;
- encryptionAware = orig.encryptionAware;
+ encryptionAware = directBootAware = orig.directBootAware;
}
@Override public CharSequence loadLabel(PackageManager pm) {
@@ -160,7 +164,7 @@
pw.println(prefix + "processName=" + processName);
}
pw.println(prefix + "enabled=" + enabled + " exported=" + exported
- + " encryptionAware=" + encryptionAware);
+ + " directBootAware=" + directBootAware);
if (descriptionRes != 0) {
pw.println(prefix + "description=" + descriptionRes);
}
@@ -194,7 +198,7 @@
dest.writeInt(descriptionRes);
dest.writeInt(enabled ? 1 : 0);
dest.writeInt(exported ? 1 : 0);
- dest.writeInt(encryptionAware ? 1 : 0);
+ dest.writeInt(directBootAware ? 1 : 0);
}
protected ComponentInfo(Parcel source) {
@@ -207,9 +211,9 @@
descriptionRes = source.readInt();
enabled = (source.readInt() != 0);
exported = (source.readInt() != 0);
- encryptionAware = (source.readInt() != 0);
+ encryptionAware = directBootAware = (source.readInt() != 0);
}
-
+
/**
* @hide
*/
diff --git a/core/java/android/content/pm/InstrumentationInfo.java b/core/java/android/content/pm/InstrumentationInfo.java
index 44bdf4e..cbeed35 100644
--- a/core/java/android/content/pm/InstrumentationInfo.java
+++ b/core/java/android/content/pm/InstrumentationInfo.java
@@ -62,9 +62,9 @@
public String dataDir;
/** {@hide} */
- public String deviceEncryptedDataDir;
+ public String deviceProtectedDataDir;
/** {@hide} */
- public String credentialEncryptedDataDir;
+ public String credentialProtectedDataDir;
/**
* Full path to the directory where the native JNI libraries are stored.
@@ -92,8 +92,8 @@
splitSourceDirs = orig.splitSourceDirs;
splitPublicSourceDirs = orig.splitPublicSourceDirs;
dataDir = orig.dataDir;
- deviceEncryptedDataDir = orig.deviceEncryptedDataDir;
- credentialEncryptedDataDir = orig.credentialEncryptedDataDir;
+ deviceProtectedDataDir = orig.deviceProtectedDataDir;
+ credentialProtectedDataDir = orig.credentialProtectedDataDir;
nativeLibraryDir = orig.nativeLibraryDir;
handleProfiling = orig.handleProfiling;
functionalTest = orig.functionalTest;
@@ -117,8 +117,8 @@
dest.writeStringArray(splitSourceDirs);
dest.writeStringArray(splitPublicSourceDirs);
dest.writeString(dataDir);
- dest.writeString(deviceEncryptedDataDir);
- dest.writeString(credentialEncryptedDataDir);
+ dest.writeString(deviceProtectedDataDir);
+ dest.writeString(credentialProtectedDataDir);
dest.writeString(nativeLibraryDir);
dest.writeInt((handleProfiling == false) ? 0 : 1);
dest.writeInt((functionalTest == false) ? 0 : 1);
@@ -142,8 +142,8 @@
splitSourceDirs = source.readStringArray();
splitPublicSourceDirs = source.readStringArray();
dataDir = source.readString();
- deviceEncryptedDataDir = source.readString();
- credentialEncryptedDataDir = source.readString();
+ deviceProtectedDataDir = source.readString();
+ credentialProtectedDataDir = source.readString();
nativeLibraryDir = source.readString();
handleProfiling = source.readInt() != 0;
functionalTest = source.readInt() != 0;
@@ -157,8 +157,8 @@
ai.splitSourceDirs = splitSourceDirs;
ai.splitPublicSourceDirs = splitPublicSourceDirs;
ai.dataDir = dataDir;
- ai.deviceEncryptedDataDir = deviceEncryptedDataDir;
- ai.credentialEncryptedDataDir = credentialEncryptedDataDir;
+ ai.deviceProtectedDataDir = deviceProtectedDataDir;
+ ai.credentialProtectedDataDir = credentialProtectedDataDir;
ai.nativeLibraryDir = nativeLibraryDir;
}
}
diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java
index 8724d5e..d865f345 100644
--- a/core/java/android/content/pm/LauncherApps.java
+++ b/core/java/android/content/pm/LauncherApps.java
@@ -160,7 +160,8 @@
* as defined in {@link #hasShortcutHostPermission()}, will receive it.
*
* @param packageName The name of the package that has the shortcuts.
- * @param shortcuts all shortcuts from the package (dynamic and/or pinned).
+ * @param shortcuts all shortcuts from the package (dynamic and/or pinned). Only "key"
+ * information will be provided, as defined in {@link ShortcutInfo#hasKeyFieldsOnly()}.
* @param user The UserHandle of the profile that generated the change.
*/
public void onShortcutsChanged(@NonNull String packageName,
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index c179596..1079f97 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -48,6 +48,7 @@
import android.os.Handler;
import android.os.RemoteException;
import android.os.UserHandle;
+import android.os.UserManager;
import android.os.storage.VolumeInfo;
import android.util.AndroidException;
import android.util.Log;
@@ -69,7 +70,7 @@
private static final String TAG = "PackageManager";
/** {@hide} */
- public static final boolean APPLY_FORCE_DEVICE_ENCRYPTED = true;
+ public static final boolean APPLY_DEFAULT_TO_DEVICE_PROTECTED_STORAGE = true;
/**
* This exception is thrown when a given package, application, or component
@@ -154,9 +155,8 @@
MATCH_DEFAULT_ONLY,
MATCH_DISABLED_COMPONENTS,
MATCH_DISABLED_UNTIL_USED_COMPONENTS,
- MATCH_ENCRYPTION_AWARE,
- MATCH_ENCRYPTION_AWARE_AND_UNAWARE,
- MATCH_ENCRYPTION_UNAWARE,
+ MATCH_DIRECT_BOOT_AWARE,
+ MATCH_DIRECT_BOOT_UNAWARE,
MATCH_SYSTEM_ONLY,
MATCH_UNINSTALLED_PACKAGES,
})
@@ -173,9 +173,8 @@
MATCH_DISABLED_COMPONENTS,
MATCH_DISABLED_UNTIL_USED_COMPONENTS,
MATCH_DEFAULT_ONLY,
- MATCH_ENCRYPTION_AWARE,
- MATCH_ENCRYPTION_AWARE_AND_UNAWARE,
- MATCH_ENCRYPTION_UNAWARE,
+ MATCH_DIRECT_BOOT_AWARE,
+ MATCH_DIRECT_BOOT_UNAWARE,
MATCH_SYSTEM_ONLY,
MATCH_UNINSTALLED_PACKAGES,
})
@@ -365,21 +364,47 @@
public static final int MATCH_ALL = 0x00020000;
/**
- * Querying flag: include only components which are encryption unaware in
+ * Querying flag: match components which are direct boot <em>unaware</em> in
* the returned info, regardless of the current user state.
+ * <p>
+ * When neither {@link #MATCH_DIRECT_BOOT_AWARE} nor
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE} are specified, the default behavior is
+ * to match only runnable components based on the user state. For example,
+ * when a user is started but credentials have not been presented yet, the
+ * user is running "locked" and only {@link #MATCH_DIRECT_BOOT_AWARE}
+ * components are returned. Once the user credentials have been presented,
+ * the user is running "unlocked" and both {@link #MATCH_DIRECT_BOOT_AWARE}
+ * and {@link #MATCH_DIRECT_BOOT_UNAWARE} components are returned.
+ *
+ * @see UserManager#isUserUnlocked()
*/
+ public static final int MATCH_DIRECT_BOOT_UNAWARE = 0x00040000;
+
+ /**
+ * Querying flag: match components which are direct boot <em>aware</em> in
+ * the returned info, regardless of the current user state.
+ * <p>
+ * When neither {@link #MATCH_DIRECT_BOOT_AWARE} nor
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE} are specified, the default behavior is
+ * to match only runnable components based on the user state. For example,
+ * when a user is started but credentials have not been presented yet, the
+ * user is running "locked" and only {@link #MATCH_DIRECT_BOOT_AWARE}
+ * components are returned. Once the user credentials have been presented,
+ * the user is running "unlocked" and both {@link #MATCH_DIRECT_BOOT_AWARE}
+ * and {@link #MATCH_DIRECT_BOOT_UNAWARE} components are returned.
+ *
+ * @see UserManager#isUserUnlocked()
+ */
+ public static final int MATCH_DIRECT_BOOT_AWARE = 0x00080000;
+
+ /** @removed */
+ @Deprecated
public static final int MATCH_ENCRYPTION_UNAWARE = 0x00040000;
-
- /**
- * Querying flag: include only components which are encryption aware in the
- * returned info, regardless of the current user state.
- */
+ /** @removed */
+ @Deprecated
public static final int MATCH_ENCRYPTION_AWARE = 0x00080000;
-
- /**
- * Querying flag: include both encryption aware and unaware components in
- * the returned info, regardless of the current user state.
- */
+ /** @removed */
+ @Deprecated
public static final int MATCH_ENCRYPTION_AWARE_AND_UNAWARE = MATCH_ENCRYPTION_AWARE
| MATCH_ENCRYPTION_UNAWARE;
@@ -401,7 +426,8 @@
* </ul>
*
* @see #MATCH_UNINSTALLED_PACKAGES
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @hide
*/
public static final int MATCH_DEBUG_TRIAGED_MISSING = 0x10000000;
@@ -2742,21 +2768,21 @@
* class.
*
* @param component The full component name (i.e.
- * com.google.apps.contacts/com.google.apps.contacts.ContactsList) of an Activity
- * class.
+ * com.google.apps.contacts/com.google.apps.contacts.
+ * ContactsList) of an Activity class.
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
- * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_ENCRYPTION_AWARE}, {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE},
- * {@link #MATCH_ENCRYPTION_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
- * {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
- * @return An {@link ActivityInfo} containing information about the activity.
+ * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
+ * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
+ * @return An {@link ActivityInfo} containing information about the
+ * activity.
* @throws NameNotFoundException if a package with the given name cannot be
* found on the system.
- *
* @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES
* @see #MATCH_ALL
@@ -2764,9 +2790,8 @@
* @see #MATCH_DEFAULT_ONLY
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -2778,21 +2803,21 @@
* class.
*
* @param component The full component name (i.e.
- * com.google.apps.calendar/com.google.apps.calendar.CalendarAlarm) of a Receiver
- * class.
+ * com.google.apps.calendar/com.google.apps.calendar.
+ * CalendarAlarm) of a Receiver class.
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
- * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_ENCRYPTION_AWARE}, {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE},
- * {@link #MATCH_ENCRYPTION_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
- * {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
- * @return An {@link ActivityInfo} containing information about the receiver.
+ * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
+ * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
+ * @return An {@link ActivityInfo} containing information about the
+ * receiver.
* @throws NameNotFoundException if a package with the given name cannot be
* found on the system.
- *
* @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES
* @see #MATCH_ALL
@@ -2800,9 +2825,8 @@
* @see #MATCH_DEFAULT_ONLY
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -2810,25 +2834,24 @@
@ComponentInfoFlags int flags) throws NameNotFoundException;
/**
- * Retrieve all of the information we know about a particular service
- * class.
+ * Retrieve all of the information we know about a particular service class.
*
* @param component The full component name (i.e.
- * com.google.apps.media/com.google.apps.media.BackgroundPlayback) of a Service
- * class.
+ * com.google.apps.media/com.google.apps.media.
+ * BackgroundPlayback) of a Service class.
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
- * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_ENCRYPTION_AWARE}, {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE},
- * {@link #MATCH_ENCRYPTION_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
- * {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
- * @return A {@link ServiceInfo} object containing information about the service.
+ * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
+ * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
+ * @return A {@link ServiceInfo} object containing information about the
+ * service.
* @throws NameNotFoundException if a package with the given name cannot be
* found on the system.
- *
* @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES
* @see #MATCH_ALL
@@ -2836,9 +2859,8 @@
* @see #MATCH_DEFAULT_ONLY
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -2850,21 +2872,21 @@
* provider class.
*
* @param component The full component name (i.e.
- * com.google.providers.media/com.google.providers.media.MediaProvider) of a
- * ContentProvider class.
+ * com.google.providers.media/com.google.providers.media.
+ * MediaProvider) of a ContentProvider class.
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
- * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_ENCRYPTION_AWARE}, {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE},
- * {@link #MATCH_ENCRYPTION_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
- * {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
- * @return A {@link ProviderInfo} object containing information about the provider.
+ * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
+ * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
+ * @return A {@link ProviderInfo} object containing information about the
+ * provider.
* @throws NameNotFoundException if a package with the given name cannot be
* found on the system.
- *
* @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES
* @see #MATCH_ALL
@@ -2872,9 +2894,8 @@
* @see #MATCH_DEFAULT_ONLY
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -3499,36 +3520,37 @@
public abstract boolean hasSystemFeature(String name, int version);
/**
- * Determine the best action to perform for a given Intent. This is how
- * {@link Intent#resolveActivity} finds an activity if a class has not
- * been explicitly specified.
- *
- * <p><em>Note:</em> if using an implicit Intent (without an explicit ComponentName
- * specified), be sure to consider whether to set the {@link #MATCH_DEFAULT_ONLY}
- * only flag. You need to do so to resolve the activity in the same way
- * that {@link android.content.Context#startActivity(Intent)} and
+ * Determine the best action to perform for a given Intent. This is how
+ * {@link Intent#resolveActivity} finds an activity if a class has not been
+ * explicitly specified.
+ * <p>
+ * <em>Note:</em> if using an implicit Intent (without an explicit
+ * ComponentName specified), be sure to consider whether to set the
+ * {@link #MATCH_DEFAULT_ONLY} only flag. You need to do so to resolve the
+ * activity in the same way that
+ * {@link android.content.Context#startActivity(Intent)} and
* {@link android.content.Intent#resolveActivity(PackageManager)
- * Intent.resolveActivity(PackageManager)} do.</p>
+ * Intent.resolveActivity(PackageManager)} do.
+ * </p>
*
* @param intent An intent containing all of the desired specification
- * (action, data, type, category, and/or component).
+ * (action, data, type, category, and/or component).
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned. The most important is
- * {@link #MATCH_DEFAULT_ONLY}, to limit the resolution to only
- * those activities that support the {@link android.content.Intent#CATEGORY_DEFAULT}.
- *
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned. The most important is {@link #MATCH_DEFAULT_ONLY},
+ * to limit the resolution to only those activities that support
+ * the {@link android.content.Intent#CATEGORY_DEFAULT}.
* @return Returns a ResolveInfo object containing the final activity intent
- * that was determined to be the best action. Returns null if no
+ * that was determined to be the best action. Returns null if no
* matching activity was found. If multiple matching activities are
* found and there is no default set, returns a ResolveInfo object
* containing something else, such as the activity resolver.
- *
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3536,46 +3558,46 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
public abstract ResolveInfo resolveActivity(Intent intent, @ResolveInfoFlags int flags);
/**
- * Determine the best action to perform for a given Intent for a given user. This
- * is how {@link Intent#resolveActivity} finds an activity if a class has not
- * been explicitly specified.
- *
- * <p><em>Note:</em> if using an implicit Intent (without an explicit ComponentName
- * specified), be sure to consider whether to set the {@link #MATCH_DEFAULT_ONLY}
- * only flag. You need to do so to resolve the activity in the same way
- * that {@link android.content.Context#startActivity(Intent)} and
+ * Determine the best action to perform for a given Intent for a given user.
+ * This is how {@link Intent#resolveActivity} finds an activity if a class
+ * has not been explicitly specified.
+ * <p>
+ * <em>Note:</em> if using an implicit Intent (without an explicit
+ * ComponentName specified), be sure to consider whether to set the
+ * {@link #MATCH_DEFAULT_ONLY} only flag. You need to do so to resolve the
+ * activity in the same way that
+ * {@link android.content.Context#startActivity(Intent)} and
* {@link android.content.Intent#resolveActivity(PackageManager)
- * Intent.resolveActivity(PackageManager)} do.</p>
+ * Intent.resolveActivity(PackageManager)} do.
+ * </p>
*
* @param intent An intent containing all of the desired specification
- * (action, data, type, category, and/or component).
+ * (action, data, type, category, and/or component).
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned. The most important is
- * {@link #MATCH_DEFAULT_ONLY}, to limit the resolution to only
- * those activities that support the {@link android.content.Intent#CATEGORY_DEFAULT}.
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned. The most important is {@link #MATCH_DEFAULT_ONLY},
+ * to limit the resolution to only those activities that support
+ * the {@link android.content.Intent#CATEGORY_DEFAULT}.
* @param userId The user id.
- *
* @return Returns a ResolveInfo object containing the final activity intent
- * that was determined to be the best action. Returns null if no
+ * that was determined to be the best action. Returns null if no
* matching activity was found. If multiple matching activities are
* found and there is no default set, returns a ResolveInfo object
* containing something else, such as the activity resolver.
- *
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3583,12 +3605,10 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
- *
* @hide
*/
public abstract ResolveInfo resolveActivityAsUser(Intent intent, @ResolveInfoFlags int flags,
@@ -3599,22 +3619,22 @@
*
* @param intent The desired intent as per resolveActivity().
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned. The most important is
- * {@link #MATCH_DEFAULT_ONLY}, to limit the resolution to only
- * those activities that support the {@link android.content.Intent#CATEGORY_DEFAULT}.
- * Or, set {@link #MATCH_ALL} to prevent any filtering of the results.
- *
- * @return Returns a List of ResolveInfo objects containing one entry for each
- * matching activity, ordered from best to worst. In other words, the
- * first item is what would be returned by {@link #resolveActivity}.
- * If there are no matching activities, an empty list is returned.
- *
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned. The most important is {@link #MATCH_DEFAULT_ONLY},
+ * to limit the resolution to only those activities that support
+ * the {@link android.content.Intent#CATEGORY_DEFAULT}. Or, set
+ * {@link #MATCH_ALL} to prevent any filtering of the results.
+ * @return Returns a List of ResolveInfo objects containing one entry for
+ * each matching activity, ordered from best to worst. In other
+ * words, the first item is what would be returned by
+ * {@link #resolveActivity}. If there are no matching activities, an
+ * empty list is returned.
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3622,9 +3642,8 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -3632,26 +3651,27 @@
@ResolveInfoFlags int flags);
/**
- * Retrieve all activities that can be performed for the given intent, for a specific user.
+ * Retrieve all activities that can be performed for the given intent, for a
+ * specific user.
*
* @param intent The desired intent as per resolveActivity().
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned. The most important is
- * {@link #MATCH_DEFAULT_ONLY}, to limit the resolution to only
- * those activities that support the {@link android.content.Intent#CATEGORY_DEFAULT}.
- * Or, set {@link #MATCH_ALL} to prevent any filtering of the results.
- *
- * @return Returns a List of ResolveInfo objects containing one entry for each
- * matching activity, ordered from best to worst. In other words, the
- * first item is what would be returned by {@link #resolveActivity}.
- * If there are no matching activities, an empty list is returned.
- *
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned. The most important is {@link #MATCH_DEFAULT_ONLY},
+ * to limit the resolution to only those activities that support
+ * the {@link android.content.Intent#CATEGORY_DEFAULT}. Or, set
+ * {@link #MATCH_ALL} to prevent any filtering of the results.
+ * @return Returns a List of ResolveInfo objects containing one entry for
+ * each matching activity, ordered from best to worst. In other
+ * words, the first item is what would be returned by
+ * {@link #resolveActivity}. If there are no matching activities, an
+ * empty list is returned.
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3659,12 +3679,10 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
- *
* @hide
*/
public abstract List<ResolveInfo> queryIntentActivitiesAsUser(Intent intent,
@@ -3672,36 +3690,35 @@
/**
* Retrieve a set of activities that should be presented to the user as
- * similar options. This is like {@link #queryIntentActivities}, except it
+ * similar options. This is like {@link #queryIntentActivities}, except it
* also allows you to supply a list of more explicit Intents that you would
* like to resolve to particular options, and takes care of returning the
* final ResolveInfo list in a reasonable order, with no duplicates, based
* on those inputs.
*
- * @param caller The class name of the activity that is making the
- * request. This activity will never appear in the output
- * list. Can be null.
- * @param specifics An array of Intents that should be resolved to the
- * first specific results. Can be null.
+ * @param caller The class name of the activity that is making the request.
+ * This activity will never appear in the output list. Can be
+ * null.
+ * @param specifics An array of Intents that should be resolved to the first
+ * specific results. Can be null.
* @param intent The desired intent as per resolveActivity().
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned. The most important is
- * {@link #MATCH_DEFAULT_ONLY}, to limit the resolution to only
- * those activities that support the {@link android.content.Intent#CATEGORY_DEFAULT}.
- *
- * @return Returns a List of ResolveInfo objects containing one entry for each
- * matching activity. The list is ordered first by all of the intents resolved
- * in <var>specifics</var> and then any additional activities that
- * can handle <var>intent</var> but did not get included by one of
- * the <var>specifics</var> intents. If there are no matching
- * activities, an empty list is returned.
- *
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned. The most important is {@link #MATCH_DEFAULT_ONLY},
+ * to limit the resolution to only those activities that support
+ * the {@link android.content.Intent#CATEGORY_DEFAULT}.
+ * @return Returns a List of ResolveInfo objects containing one entry for
+ * each matching activity. The list is ordered first by all of the
+ * intents resolved in <var>specifics</var> and then any additional
+ * activities that can handle <var>intent</var> but did not get
+ * included by one of the <var>specifics</var> intents. If there are
+ * no matching activities, an empty list is returned.
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3709,9 +3726,8 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -3723,18 +3739,17 @@
*
* @param intent The desired intent as per resolveActivity().
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
- * @return Returns a List of ResolveInfo objects containing one entry for each
- * matching receiver, ordered from best to worst. If there are no matching
- * receivers, an empty list or null is returned.
- *
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
+ * @return Returns a List of ResolveInfo objects containing one entry for
+ * each matching receiver, ordered from best to worst. If there are
+ * no matching receivers, an empty list or null is returned.
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3742,9 +3757,8 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -3752,24 +3766,23 @@
@ResolveInfoFlags int flags);
/**
- * Retrieve all receivers that can handle a broadcast of the given intent, for a specific
- * user.
+ * Retrieve all receivers that can handle a broadcast of the given intent,
+ * for a specific user.
*
* @param intent The desired intent as per resolveActivity().
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
* @param userHandle UserHandle of the user being queried.
- *
- * @return Returns a List of ResolveInfo objects containing one entry for each
- * matching receiver, ordered from best to worst. If there are no matching
- * receivers, an empty list or null is returned.
- *
+ * @return Returns a List of ResolveInfo objects containing one entry for
+ * each matching receiver, ordered from best to worst. If there are
+ * no matching receivers, an empty list or null is returned.
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3777,12 +3790,10 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
- *
* @hide
*/
@SystemApi
@@ -3810,20 +3821,19 @@
* Determine the best service to handle for a given Intent.
*
* @param intent An intent containing all of the desired specification
- * (action, data, type, category, and/or component).
+ * (action, data, type, category, and/or component).
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
* @return Returns a ResolveInfo object containing the final service intent
- * that was determined to be the best action. Returns null if no
+ * that was determined to be the best action. Returns null if no
* matching service was found.
- *
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3831,9 +3841,8 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -3844,19 +3853,19 @@
*
* @param intent The desired intent as per resolveService().
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
- * @return Returns a List of ResolveInfo objects containing one entry for each
- * matching service, ordered from best to worst. In other words, the first
- * item is what would be returned by {@link #resolveService}. If there are
- * no matching services, an empty list or null is returned.
- *
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
+ * @return Returns a List of ResolveInfo objects containing one entry for
+ * each matching service, ordered from best to worst. In other
+ * words, the first item is what would be returned by
+ * {@link #resolveService}. If there are no matching services, an
+ * empty list or null is returned.
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3864,9 +3873,8 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -3878,20 +3886,20 @@
*
* @param intent The desired intent as per resolveService().
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
* @param userId The user id.
- *
- * @return Returns a List of ResolveInfo objects containing one entry for each
- * matching service, ordered from best to worst. In other words, the first
- * item is what would be returned by {@link #resolveService}. If there are
- * no matching services, an empty list or null is returned.
- *
+ * @return Returns a List of ResolveInfo objects containing one entry for
+ * each matching service, ordered from best to worst. In other
+ * words, the first item is what would be returned by
+ * {@link #resolveService}. If there are no matching services, an
+ * empty list or null is returned.
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3899,12 +3907,10 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
- *
* @hide
*/
public abstract List<ResolveInfo> queryIntentServicesAsUser(Intent intent,
@@ -3916,19 +3922,18 @@
* @param intent An intent containing all of the desired specification
* (action, data, type, category, and/or component).
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
* @param userId The user id.
- *
- * @return Returns a List of ResolveInfo objects containing one entry for each
- * matching provider, ordered from best to worst. If there are no
- * matching services, an empty list or null is returned.
- *
+ * @return Returns a List of ResolveInfo objects containing one entry for
+ * each matching provider, ordered from best to worst. If there are
+ * no matching services, an empty list or null is returned.
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3936,12 +3941,10 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
- *
* @hide
*/
public abstract List<ResolveInfo> queryIntentContentProvidersAsUser(
@@ -3953,18 +3956,17 @@
* @param intent An intent containing all of the desired specification
* (action, data, type, category, and/or component).
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
- * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_ENCRYPTION_AWARE},
- * {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE}, {@link #MATCH_ENCRYPTION_UNAWARE},
- * {@link #MATCH_SYSTEM_ONLY}, {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
- * @return Returns a List of ResolveInfo objects containing one entry for each
- * matching provider, ordered from best to worst. If there are no
- * matching services, an empty list or null is returned.
- *
+ * {@link #GET_META_DATA}, {@link #GET_RESOLVED_FILTER},
+ * {@link #GET_SHARED_LIBRARY_FILES}, {@link #MATCH_ALL},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DEFAULT_ONLY}, {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
+ * @return Returns a List of ResolveInfo objects containing one entry for
+ * each matching provider, ordered from best to worst. If there are
+ * no matching services, an empty list or null is returned.
* @see #GET_META_DATA
* @see #GET_RESOLVED_FILTER
* @see #GET_SHARED_LIBRARY_FILES
@@ -3972,9 +3974,8 @@
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
* @see #MATCH_DEFAULT_ONLY
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -3986,17 +3987,16 @@
*
* @param name The name of the provider to find.
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
- * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_ENCRYPTION_AWARE}, {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE},
- * {@link #MATCH_ENCRYPTION_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
- * {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
- * @return A {@link ProviderInfo} object containing information about the provider.
- * If a provider was not found, returns null.
- *
+ * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
+ * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
+ * @return A {@link ProviderInfo} object containing information about the
+ * provider. If a provider was not found, returns null.
* @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES
* @see #MATCH_ALL
@@ -4004,9 +4004,8 @@
* @see #MATCH_DEFAULT_ONLY
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -4018,18 +4017,17 @@
*
* @param name The name of the provider to find.
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
- * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_ENCRYPTION_AWARE}, {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE},
- * {@link #MATCH_ENCRYPTION_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
- * {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
+ * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
+ * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
* @param userId The user id.
- *
- * @return A {@link ProviderInfo} object containing information about the provider.
- * If a provider was not found, returns null.
- *
+ * @return A {@link ProviderInfo} object containing information about the
+ * provider. If a provider was not found, returns null.
* @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES
* @see #MATCH_ALL
@@ -4037,12 +4035,10 @@
* @see #MATCH_DEFAULT_ONLY
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
- *
* @hide
*/
public abstract ProviderInfo resolveContentProviderAsUser(String name,
@@ -4050,29 +4046,28 @@
/**
* Retrieve content provider information.
- *
- * <p><em>Note: unlike most other methods, an empty result set is indicated
+ * <p>
+ * <em>Note: unlike most other methods, an empty result set is indicated
* by a null return instead of an empty list.</em>
*
* @param processName If non-null, limits the returned providers to only
- * those that are hosted by the given process. If null,
- * all content providers are returned.
+ * those that are hosted by the given process. If null, all
+ * content providers are returned.
* @param uid If <var>processName</var> is non-null, this is the required
- * uid owning the requested content providers.
+ * uid owning the requested content providers.
* @param flags Additional option flags. Use any combination of
- * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
- * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
- * {@link #MATCH_DISABLED_COMPONENTS}, {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
- * {@link #MATCH_ENCRYPTION_AWARE}, {@link #MATCH_ENCRYPTION_AWARE_AND_UNAWARE},
- * {@link #MATCH_ENCRYPTION_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
- * {@link #MATCH_UNINSTALLED_PACKAGES}
- * to modify the data returned.
- *
+ * {@link #GET_META_DATA}, {@link #GET_SHARED_LIBRARY_FILES},
+ * {@link #MATCH_ALL}, {@link #MATCH_DEFAULT_ONLY},
+ * {@link #MATCH_DISABLED_COMPONENTS},
+ * {@link #MATCH_DISABLED_UNTIL_USED_COMPONENTS},
+ * {@link #MATCH_DIRECT_BOOT_AWARE},
+ * {@link #MATCH_DIRECT_BOOT_UNAWARE}, {@link #MATCH_SYSTEM_ONLY}
+ * or {@link #MATCH_UNINSTALLED_PACKAGES} to modify the data
+ * returned.
* @return A list of {@link ProviderInfo} objects containing one entry for
* each provider either matching <var>processName</var> or, if
* <var>processName</var> is null, all known content providers.
* <em>If there are no matching providers, null is returned.</em>
- *
* @see #GET_META_DATA
* @see #GET_SHARED_LIBRARY_FILES
* @see #MATCH_ALL
@@ -4080,9 +4075,8 @@
* @see #MATCH_DEFAULT_ONLY
* @see #MATCH_DISABLED_COMPONENTS
* @see #MATCH_DISABLED_UNTIL_USED_COMPONENTS
- * @see #MATCH_ENCRYPTION_AWARE
- * @see #MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- * @see #MATCH_ENCRYPTION_UNAWARE
+ * @see #MATCH_DIRECT_BOOT_AWARE
+ * @see #MATCH_DIRECT_BOOT_UNAWARE
* @see #MATCH_SYSTEM_ONLY
* @see #MATCH_UNINSTALLED_PACKAGES
*/
@@ -4618,13 +4612,13 @@
final PackageParser parser = new PackageParser();
final File apkFile = new File(archiveFilePath);
try {
- if ((flags & (MATCH_ENCRYPTION_UNAWARE | MATCH_ENCRYPTION_AWARE)) != 0) {
+ if ((flags & (MATCH_DIRECT_BOOT_UNAWARE | MATCH_DIRECT_BOOT_AWARE)) != 0) {
// Caller expressed an explicit opinion about what encryption
// aware/unaware components they want to see, so fall through and
// give them what they want
} else {
// Caller expressed no opinion, so match everything
- flags |= MATCH_ENCRYPTION_AWARE_AND_UNAWARE;
+ flags |= MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE;
}
PackageParser.Package pkg = parser.parseMonolithicPackage(apkFile, 0);
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 7d7be9a..db7ca2a 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -2865,13 +2865,13 @@
ai.flags |= ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS;
}
- if (sa.getBoolean(R.styleable.AndroidManifestApplication_forceDeviceEncrypted, false)
- && (flags & PARSE_IS_SYSTEM) != 0) {
- ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_FORCE_DEVICE_ENCRYPTED;
+ if (sa.getBoolean(R.styleable.AndroidManifestApplication_defaultToDeviceProtectedStorage,
+ false) && (flags & PARSE_IS_SYSTEM) != 0) {
+ ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE;
}
- if (sa.getBoolean(R.styleable.AndroidManifestApplication_encryptionAware, false)
+ if (sa.getBoolean(R.styleable.AndroidManifestApplication_directBootAware, false)
&& (flags & PARSE_IS_SYSTEM) != 0) {
- ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_ENCRYPTION_AWARE;
+ ai.privateFlags |= ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE;
}
if (sa.getBoolean(R.styleable.AndroidManifestApplication_resizeableActivity,
@@ -3493,9 +3493,9 @@
a.info.lockTaskLaunchMode =
sa.getInt(R.styleable.AndroidManifestActivity_lockTaskMode, 0);
- a.info.encryptionAware = sa.getBoolean(
- R.styleable.AndroidManifestActivity_encryptionAware,
- owner.applicationInfo.isEncryptionAware());
+ a.info.encryptionAware = a.info.directBootAware = sa.getBoolean(
+ R.styleable.AndroidManifestActivity_directBootAware,
+ owner.applicationInfo.isDirectBootAware());
} else {
a.info.launchMode = ActivityInfo.LAUNCH_MULTIPLE;
a.info.configChanges = 0;
@@ -3511,14 +3511,14 @@
}
}
- a.info.encryptionAware = sa.getBoolean(
- R.styleable.AndroidManifestActivity_encryptionAware,
- owner.applicationInfo.isEncryptionAware());
+ a.info.encryptionAware = a.info.directBootAware = sa.getBoolean(
+ R.styleable.AndroidManifestActivity_directBootAware,
+ owner.applicationInfo.isDirectBootAware());
}
- if (a.info.encryptionAware) {
+ if (a.info.directBootAware) {
owner.applicationInfo.privateFlags |=
- ApplicationInfo.PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE;
+ ApplicationInfo.PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE;
}
sa.recycle();
@@ -3732,7 +3732,7 @@
info.maxRecents = target.info.maxRecents;
info.layout = target.info.layout;
info.resizeMode = target.info.resizeMode;
- info.encryptionAware = target.info.encryptionAware;
+ info.encryptionAware = info.directBootAware = target.info.directBootAware;
Activity a = new Activity(mParseActivityAliasArgs, info);
if (outError[0] != null) {
@@ -3921,12 +3921,12 @@
}
}
- p.info.encryptionAware = sa.getBoolean(
- R.styleable.AndroidManifestProvider_encryptionAware,
- owner.applicationInfo.isEncryptionAware());
- if (p.info.encryptionAware) {
+ p.info.encryptionAware = p.info.directBootAware = sa.getBoolean(
+ R.styleable.AndroidManifestProvider_directBootAware,
+ owner.applicationInfo.isDirectBootAware());
+ if (p.info.directBootAware) {
owner.applicationInfo.privateFlags |=
- ApplicationInfo.PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE;
+ ApplicationInfo.PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE;
}
sa.recycle();
@@ -4213,12 +4213,12 @@
}
}
- s.info.encryptionAware = sa.getBoolean(
- R.styleable.AndroidManifestService_encryptionAware,
- owner.applicationInfo.isEncryptionAware());
- if (s.info.encryptionAware) {
+ s.info.encryptionAware = s.info.directBootAware = sa.getBoolean(
+ R.styleable.AndroidManifestService_directBootAware,
+ owner.applicationInfo.isDirectBootAware());
+ if (s.info.directBootAware) {
owner.applicationInfo.privateFlags |=
- ApplicationInfo.PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE;
+ ApplicationInfo.PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE;
}
sa.recycle();
diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java
index 38e0044..e85311d 100644
--- a/core/java/android/content/pm/PackageUserState.java
+++ b/core/java/android/content/pm/PackageUserState.java
@@ -23,8 +23,8 @@
import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
import static android.content.pm.PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS;
-import static android.content.pm.PackageManager.MATCH_ENCRYPTION_AWARE;
-import static android.content.pm.PackageManager.MATCH_ENCRYPTION_UNAWARE;
+import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
+import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
import android.util.ArraySet;
@@ -98,10 +98,10 @@
}
}
- final boolean matchesUnaware = ((flags & MATCH_ENCRYPTION_UNAWARE) != 0)
- && !componentInfo.encryptionAware;
- final boolean matchesAware = ((flags & MATCH_ENCRYPTION_AWARE) != 0)
- && componentInfo.encryptionAware;
+ final boolean matchesUnaware = ((flags & MATCH_DIRECT_BOOT_UNAWARE) != 0)
+ && !componentInfo.directBootAware;
+ final boolean matchesAware = ((flags & MATCH_DIRECT_BOOT_AWARE) != 0)
+ && componentInfo.directBootAware;
return matchesUnaware || matchesAware;
}
diff --git a/core/java/android/content/pm/RegisteredServicesCache.java b/core/java/android/content/pm/RegisteredServicesCache.java
index bb28bde..6162d1a 100644
--- a/core/java/android/content/pm/RegisteredServicesCache.java
+++ b/core/java/android/content/pm/RegisteredServicesCache.java
@@ -365,7 +365,8 @@
protected List<ResolveInfo> queryIntentServices(int userId) {
final PackageManager pm = mContext.getPackageManager();
return pm.queryIntentServicesAsUser(new Intent(mInterfaceName),
- PackageManager.GET_META_DATA | PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE,
+ PackageManager.GET_META_DATA | PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
userId);
}
diff --git a/core/java/android/content/pm/ShortcutInfo.java b/core/java/android/content/pm/ShortcutInfo.java
index b5c1f30..ae75e3f 100644
--- a/core/java/android/content/pm/ShortcutInfo.java
+++ b/core/java/android/content/pm/ShortcutInfo.java
@@ -46,8 +46,6 @@
* if necessary, and persisted.
*
* We will disallow byte[] icons, because they can easily go over binder size limit.
- *
- * TODO Move save/load to this class
*/
public class ShortcutInfo implements Parcelable {
/* @hide */
diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index 04e64af..ffd9d89 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -1099,6 +1099,11 @@
if (oldHandler == null) {
updateCallbackLocked(callback, handler);
}
+
+ // If not connected to camera service, schedule a reconnect to camera service.
+ if (mCameraService == null) {
+ scheduleCameraServiceReconnectionLocked();
+ }
}
}
@@ -1123,6 +1128,11 @@
if (oldHandler == null) {
updateTorchCallbackLocked(callback, handler);
}
+
+ // If not connected to camera service, schedule a reconnect to camera service.
+ if (mCameraService == null) {
+ scheduleCameraServiceReconnectionLocked();
+ }
}
}
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index e1c7ad77..6df2a9d 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -477,10 +477,10 @@
* also be bumped.
*/
static final String[] USER_ACTIVITY_TYPES = {
- "other", "button", "touch"
+ "other", "button", "touch", "accessibility"
};
- public static final int NUM_USER_ACTIVITY_TYPES = 3;
+ public static final int NUM_USER_ACTIVITY_TYPES = 4;
public abstract void noteUserActivityLocked(int type);
public abstract boolean hasUserActivity();
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index 2a4507c..cb4caea 100644
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -318,6 +318,13 @@
public static final int USER_ACTIVITY_EVENT_TOUCH = 2;
/**
+ * User activity event type: Accessibility taking action on behalf of user.
+ * @hide
+ */
+ @SystemApi
+ public static final int USER_ACTIVITY_EVENT_ACCESSIBILITY = 3;
+
+ /**
* User activity flag: If already dimmed, extend the dim timeout
* but do not brighten. This flag is useful for keeping the screen on
* a little longer without causing a visible change such as when
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index e2675b1..92e1862 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package android.os;
import android.Manifest;
@@ -882,25 +883,13 @@
}
}
- /**
- * Return whether the calling user is running in a "locked" state. A user is
- * unlocked only after they've entered their credentials (such as a lock
- * pattern or PIN), and credential-encrypted private app data storage is
- * available.
- */
+ /** @removed */
@Deprecated
public boolean isUserRunningAndLocked() {
return isUserRunningAndLocked(Process.myUserHandle());
}
- /**
- * Return whether the given user is running in a "locked" state. A user
- * is unlocked only after they've entered their credentials (such as a lock
- * pattern or PIN), and credential-encrypted private app data storage is
- * available.
- *
- * @param user to retrieve the unlocked state for.
- */
+ /** @removed */
@Deprecated
public boolean isUserRunningAndLocked(UserHandle user) {
try {
@@ -911,25 +900,13 @@
}
}
- /**
- * Return whether the calling user is running in an "unlocked" state. A user
- * is unlocked only after they've entered their credentials (such as a lock
- * pattern or PIN), and credential-encrypted private app data storage is
- * available.
- */
+ /** @removed */
@Deprecated
public boolean isUserRunningAndUnlocked() {
return isUserRunningAndUnlocked(Process.myUserHandle());
}
- /**
- * Return whether the given user is running in an "unlocked" state. A user
- * is unlocked only after they've entered their credentials (such as a lock
- * pattern or PIN), and credential-encrypted private app data storage is
- * available.
- *
- * @param user to retrieve the unlocked state for.
- */
+ /** @removed */
@Deprecated
public boolean isUserRunningAndUnlocked(UserHandle user) {
try {
@@ -944,7 +921,11 @@
* Return whether the calling user is running in an "unlocked" state. A user
* is unlocked only after they've entered their credentials (such as a lock
* pattern or PIN), and credential-encrypted private app data storage is
+ * available. When a user is locked, only device-protected data storage is
* available.
+ *
+ * @see Intent#ACTION_USER_UNLOCKED
+ * @see Context#createDeviceProtectedStorageContext()
*/
public boolean isUserUnlocked() {
return isUserUnlocked(Process.myUserHandle());
@@ -953,10 +934,13 @@
/**
* Return whether the given user is running in an "unlocked" state. A user
* is unlocked only after they've entered their credentials (such as a lock
- * pattern or PIN), and credential-encrypted private app data storage is
+ * pattern or PIN), and credential-protected private app data storage is
+ * available. When a user is locked, only device-protected data storage is
* available.
*
* @param user to retrieve the unlocked state for.
+ * @see Intent#ACTION_USER_UNLOCKED
+ * @see Context#createDeviceProtectedStorageContext()
*/
public boolean isUserUnlocked(UserHandle user) {
return isUserUnlocked(user.getIdentifier());
diff --git a/core/java/android/preference/PreferenceManager.java b/core/java/android/preference/PreferenceManager.java
index ebb12fd..c36680c 100644
--- a/core/java/android/preference/PreferenceManager.java
+++ b/core/java/android/preference/PreferenceManager.java
@@ -113,8 +113,8 @@
private int mSharedPreferencesMode;
private static final int STORAGE_DEFAULT = 0;
- private static final int STORAGE_DEVICE_ENCRYPTED = 1;
- private static final int STORAGE_CREDENTIAL_ENCRYPTED = 2;
+ private static final int STORAGE_DEVICE_PROTECTED = 1;
+ private static final int STORAGE_CREDENTIAL_PROTECTED = 2;
private int mStorage = STORAGE_DEFAULT;
@@ -360,35 +360,58 @@
/**
* Explicitly set the storage location used internally by this class to be
- * device-encrypted storage.
+ * device-protected storage.
* <p>
- * Data stored in device-encrypted storage is typically encrypted with a key
- * tied to the physical device, and it can be accessed when the device has
- * booted successfully, both <em>before and after</em> the user has
- * authenticated with their credentials (such as a lock pattern or PIN).
- * Because device-encrypted data is available before user authentication,
- * you should carefully consider what data you store using this mode.
+ * <p>
+ * When a device is encrypted, data stored in this location is encrypted
+ * with a key tied to the physical device, and it can be accessed
+ * immediately after the device has booted successfully, both
+ * <em>before and after</em> the user has authenticated with their
+ * credentials (such as a lock pattern or PIN).
+ * <p>
+ * Because device-protected data is available without user authentication,
+ * you should carefully limit the data you store using this Context. For
+ * example, storing sensitive authentication tokens or passwords in the
+ * device-protected area is strongly discouraged.
*
- * @see Context#createDeviceEncryptedStorageContext()
+ * @see Context#createDeviceProtectedStorageContext()
*/
- public void setStorageDeviceEncrypted() {
- mStorage = STORAGE_DEVICE_ENCRYPTED;
+ public void setStorageDeviceProtected() {
+ mStorage = STORAGE_DEVICE_PROTECTED;
mSharedPreferences = null;
}
+ /** @removed */
+ @Deprecated
+ public void setStorageDeviceEncrypted() {
+ setStorageDeviceProtected();
+ }
+
/**
* Explicitly set the storage location used internally by this class to be
- * credential-encrypted storage.
+ * credential-protected storage. This is the default storage area for apps
+ * unless {@code forceDeviceProtectedStorage} was requested.
+ * <p>
+ * When a device is encrypted, data stored in this location is encrypted
+ * with a key tied to user credentials, which can be accessed
+ * <em>only after</em> the user has entered their credentials (such as a
+ * lock pattern or PIN).
*
- * @see Context#createCredentialEncryptedStorageContext()
+ * @see Context#createCredentialProtectedStorageContext()
* @hide
*/
@SystemApi
- public void setStorageCredentialEncrypted() {
- mStorage = STORAGE_CREDENTIAL_ENCRYPTED;
+ public void setStorageCredentialProtected() {
+ mStorage = STORAGE_CREDENTIAL_PROTECTED;
mSharedPreferences = null;
}
+ /** @removed */
+ @Deprecated
+ public void setStorageCredentialEncrypted() {
+ setStorageCredentialProtected();
+ }
+
/**
* Gets a SharedPreferences instance that preferences managed by this will
* use.
@@ -400,11 +423,11 @@
if (mSharedPreferences == null) {
final Context storageContext;
switch (mStorage) {
- case STORAGE_DEVICE_ENCRYPTED:
- storageContext = mContext.createDeviceEncryptedStorageContext();
+ case STORAGE_DEVICE_PROTECTED:
+ storageContext = mContext.createDeviceProtectedStorageContext();
break;
- case STORAGE_CREDENTIAL_ENCRYPTED:
- storageContext = mContext.createCredentialEncryptedStorageContext();
+ case STORAGE_CREDENTIAL_PROTECTED:
+ storageContext = mContext.createCredentialProtectedStorageContext();
break;
default:
storageContext = mContext;
diff --git a/core/java/android/provider/BlockedNumberContract.java b/core/java/android/provider/BlockedNumberContract.java
index def303a..b06d503 100644
--- a/core/java/android/provider/BlockedNumberContract.java
+++ b/core/java/android/provider/BlockedNumberContract.java
@@ -44,7 +44,8 @@
* Only the system, the default SMS application, and the default phone app
* (See {@link android.telecom.TelecomManager#getDefaultDialerPackage()}), and carrier apps
* (See {@link android.service.carrier.CarrierService}) can read, and write to the blockednumber
- * provider.
+ * provider. However, {@link #canCurrentUserBlockNumbers(Context)} can be accessed by any
+ * application.
* </p>
*
* <h3> Data </h3>
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index aa11e3f..816d9c4 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -4994,6 +4994,8 @@
if (child.hasFocus()) {
requestChildFocus(child, child.findFocus());
}
+ dispatchVisibilityAggregated(isAttachedToWindow() && getWindowVisibility() == VISIBLE
+ && isShown());
}
/**
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 4bcb406..942cbcb 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1827,7 +1827,7 @@
return;
}
- Layout layout = getActiveLayout();
+ Layout layout = mTextView.getLayout();
final int offset = mTextView.getSelectionStart();
final int line = layout.getLineForOffset(offset);
final int top = layout.getLineTop(line);
@@ -2192,27 +2192,35 @@
mCursorDrawable[cursorIndex] = mTextView.getContext().getDrawable(
mTextView.mCursorDrawableRes);
final Drawable drawable = mCursorDrawable[cursorIndex];
- final int left = clampCursorHorizontalPosition(drawable, horizontal);
+ final int left = clampHorizontalPosition(drawable, horizontal);
final int width = drawable.getIntrinsicWidth();
drawable.setBounds(left, top - mTempRect.top, left + width,
bottom + mTempRect.bottom);
}
/**
- * Return clamped position for the cursor. If the cursor is within the boundaries of the view,
- * then it is offset with the left padding of the cursor drawable. If the cursor is at
+ * Return clamped position for the drawable. If the drawable is within the boundaries of the
+ * view, then it is offset with the left padding of the cursor drawable. If the drawable is at
* the beginning or the end of the text then its drawable edge is aligned with left or right of
- * the view boundary.
+ * the view boundary. If the drawable is null, horizontal parameter is aligned to left or right
+ * of the view.
*
- * @param drawable Cursor drawable.
- * @param horizontal Horizontal position for the cursor.
- * @return The clamped horizontal position for the cursor.
+ * @param drawable Drawable. Can be null.
+ * @param horizontal Horizontal position for the drawable.
+ * @return The clamped horizontal position for the drawable.
*/
- private final int clampCursorHorizontalPosition(final Drawable drawable, float
- horizontal) {
+ private int clampHorizontalPosition(@Nullable final Drawable drawable, float horizontal) {
horizontal = Math.max(0.5f, horizontal - 0.5f);
if (mTempRect == null) mTempRect = new Rect();
- drawable.getPadding(mTempRect);
+
+ int drawableWidth = 0;
+ if (drawable != null) {
+ drawable.getPadding(mTempRect);
+ drawableWidth = drawable.getIntrinsicWidth();
+ } else {
+ mTempRect.setEmpty();
+ }
+
int scrollX = mTextView.getScrollX();
float horizontalDiff = horizontal - scrollX;
int viewClippedWidth = mTextView.getWidth() - mTextView.getCompoundPaddingLeft()
@@ -2221,9 +2229,11 @@
final int left;
if (horizontalDiff >= (viewClippedWidth - 1f)) {
// at the rightmost position
- final int cursorWidth = drawable.getIntrinsicWidth();
- left = viewClippedWidth + scrollX - (cursorWidth - mTempRect.right);
- } else if (Math.abs(horizontalDiff) <= 1f) {
+ left = viewClippedWidth + scrollX - (drawableWidth - mTempRect.right);
+ } else if (Math.abs(horizontalDiff) <= 1f ||
+ (TextUtils.isEmpty(mTextView.getText())
+ && (TextView.VERY_WIDE - scrollX) <= (viewClippedWidth + 1f)
+ && horizontal <= 1f)) {
// at the leftmost position
left = scrollX - mTempRect.left;
} else {
@@ -3772,10 +3782,10 @@
+ mHandleHeight);
} else {
// We have a single cursor.
- Layout layout = getActiveLayout();
+ Layout layout = mTextView.getLayout();
int line = layout.getLineForOffset(mTextView.getSelectionStart());
- float primaryHorizontal =
- layout.getPrimaryHorizontal(mTextView.getSelectionStart());
+ float primaryHorizontal = clampHorizontalPosition(null,
+ layout.getPrimaryHorizontal(mTextView.getSelectionStart()));
mSelectionBounds.set(
primaryHorizontal,
layout.getLineTop(line),
@@ -4152,7 +4162,7 @@
prepareCursorControllers();
return;
}
- layout = getActiveLayout();
+ layout = mTextView.getLayout();
boolean offsetChanged = offset != mPreviousOffset;
if (offsetChanged || parentScrolled) {
@@ -4322,19 +4332,6 @@
public void onDetached() {}
}
- /**
- * Returns the active layout (hint or text layout). Note that the text layout can be null.
- */
- private Layout getActiveLayout() {
- Layout layout = mTextView.getLayout();
- Layout hintLayout = mTextView.getHintLayout();
- if (TextUtils.isEmpty(layout.getText()) && hintLayout != null &&
- !TextUtils.isEmpty(hintLayout.getText())) {
- layout = hintLayout;
- }
- return layout;
- }
-
private class InsertionHandleView extends HandleView {
private static final int DELAY_BEFORE_HANDLE_FADES_OUT = 4000;
private static final int RECENT_CUT_COPY_DURATION = 15 * 1000; // seconds
@@ -4431,7 +4428,7 @@
final Drawable drawable = mCursorCount > 0 ? mCursorDrawable[0] : null;
if (drawable != null) {
final float horizontal = layout.getPrimaryHorizontal(offset);
- return clampCursorHorizontalPosition(drawable, horizontal) + mTempRect.left;
+ return clampHorizontalPosition(drawable, horizontal) + mTempRect.left;
}
return super.getCursorHorizontalPosition(layout, offset);
}
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 04d344f..222a040 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -913,7 +913,9 @@
if (mDrawable != null) {
mDrawable.setCallback(null);
unscheduleDrawable(mDrawable);
- mDrawable.setVisible(false, false);
+ if (isAttachedToWindow()) {
+ mDrawable.setVisible(false, false);
+ }
}
mDrawable = d;
@@ -924,8 +926,9 @@
if (d.isStateful()) {
d.setState(getDrawableState());
}
- d.setVisible(isAttachedToWindow() && getWindowVisibility() == VISIBLE && isShown(),
- true);
+ if (isAttachedToWindow()) {
+ d.setVisible(getWindowVisibility() == VISIBLE && isShown(), true);
+ }
d.setLevel(mLevel);
mDrawableWidth = d.getIntrinsicWidth();
mDrawableHeight = d.getIntrinsicHeight();
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 5060350..3195097 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -285,8 +285,8 @@
private static final RectF TEMP_RECTF = new RectF();
- // XXX should be much larger
- private static final int VERY_WIDE = 1024*1024;
+ /** @hide */
+ static final int VERY_WIDE = 1024 * 1024; // XXX should be much larger
private static final int ANIMATED_SCROLL_GAP = 250;
private static final InputFilter[] NO_FILTERS = new InputFilter[0];
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 8de9c09..d11787d 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -107,7 +107,7 @@
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
- private static final int VERSION = 141 + (USE_OLD_HISTORY ? 1000 : 0);
+ private static final int VERSION = 142 + (USE_OLD_HISTORY ? 1000 : 0);
// Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000;
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 6444c6c..97a51d5 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2959,8 +2959,8 @@
android:icon="@drawable/ic_launcher_android"
android:supportsRtl="true"
android:theme="@style/Theme.Material.DayNight.DarkActionBar"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<activity android:name="com.android.internal.app.ChooserActivity"
android:theme="@style/Theme.DeviceDefault.Resolver"
android:finishOnCloseSystemDialogs="true"
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index d0d1d5a..5716823 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -109,13 +109,6 @@
included in the system image. Third-party apps cannot use it.</em> -->
<attr name="allowClearUserData" format="boolean" />
- <!-- Option to let applications specify that user data should
- never be encrypted if an Encrypted File System solution
- is enabled. Specifically, this is an "opt-out" feature, meaning
- that, by default, user data will be encrypted if the EFS feature
- is enabled. -->
- <attr name="neverEncrypt" format="boolean" />
-
<!-- Option to indicate this application is only for testing purposes.
For example, it may expose functionality or data outside of itself
that would cause a security hole, but is useful for testing. This
@@ -579,10 +572,10 @@
single integer, with higher numbers considered to be better. -->
<attr name="priority" format="integer" />
- <!-- Indicate if this component is aware of encryption lifecycle, and can be
+ <!-- Indicate if this component is aware of direct boot lifecycle, and can be
safely run before the user has entered their credentials (such as a lock
pattern or PIN). -->
- <attr name="encryptionAware" format="boolean" />
+ <attr name="directBootAware" format="boolean" />
<!-- Specify how an activity should be launched. See the
<a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back
@@ -1262,7 +1255,6 @@
<attr name="restoreNeedsApplication" />
<attr name="restoreAnyVersion" />
<attr name="backupInForeground" />
- <attr name="neverEncrypt" />
<!-- Request that your application's processes be created with
a large Dalvik heap. This applies to <em>all</em> processes
created for the application. It only applies to the first
@@ -1306,8 +1298,8 @@
<attr name="usesCleartextTraffic" />
<attr name="multiArch" />
<attr name="extractNativeLibs" />
- <attr name="forceDeviceEncrypted" format="boolean" />
- <attr name="encryptionAware" />
+ <attr name="defaultToDeviceProtectedStorage" format="boolean" />
+ <attr name="directBootAware" />
<attr name="resizeableActivity" />
</declare-styleable>
<!-- The <code>permission</code> tag declares a security permission that can be
@@ -1686,7 +1678,7 @@
<attr name="enabled" />
<attr name="exported" />
<attr name="singleUser" />
- <attr name="encryptionAware" />
+ <attr name="directBootAware" />
</declare-styleable>
<!-- Attributes that can be supplied in an AndroidManifest.xml
@@ -1770,7 +1762,7 @@
with it is through the Service API (binding and starting). -->
<attr name="isolatedProcess" format="boolean" />
<attr name="singleUser" />
- <attr name="encryptionAware" />
+ <attr name="directBootAware" />
<!-- If the service is an {@link android.R.attr#isolatedProcess} service, this permits a
client to bind to the service as if it were running it its own package. The service
must also be {@link android.R.attr#exported} if this flag is set. -->
@@ -1810,7 +1802,7 @@
<attr name="enabled" />
<attr name="exported" />
<attr name="singleUser" />
- <attr name="encryptionAware" />
+ <attr name="directBootAware" />
</declare-styleable>
<!-- The <code>activity</code> tag declares an
@@ -1883,7 +1875,7 @@
<attr name="supportsPictureInPicture" />
<attr name="lockTaskMode" />
<attr name="showForAllUsers" />
- <attr name="encryptionAware" />
+ <attr name="directBootAware" />
<!-- @hide This activity is always focusable regardless of if it is in a task/stack whose
activities are normally not focusable.
For example, {@link android.R.attr#supportsPictureInPicture} activities are placed
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 4e8740a..3c5b4c0 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2679,8 +2679,8 @@
<public type="attr" name="contextPopupMenuStyle" />
<public type="attr" name="textAppearancePopupMenuHeader" />
<public type="attr" name="windowBackgroundFallback" />
- <public type="attr" name="forceDeviceEncrypted" />
- <public type="attr" name="encryptionAware" />
+ <public type="attr" name="defaultToDeviceProtectedStorage" />
+ <public type="attr" name="directBootAware" />
<public type="attr" name="preferenceFragmentStyle" />
<public type="attr" name="canControlMagnification" />
<public type="attr" name="languageTag" />
diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml
index bfa2b10..b780778 100644
--- a/core/tests/coretests/AndroidManifest.xml
+++ b/core/tests/coretests/AndroidManifest.xml
@@ -111,7 +111,7 @@
<!-- accessibility test permissions -->
<uses-permission android:name="android.permission.RETRIEVE_WINDOW_CONTENT" />
- <application android:theme="@style/Theme">
+ <application android:theme="@style/Theme" android:supportsRtl="true">
<uses-library android:name="android.test.runner" />
<uses-library android:name="org.apache.http.legacy" android:required="false" />
<meta-data
diff --git a/core/tests/coretests/src/android/text/method/BackspaceTest.java b/core/tests/coretests/src/android/text/method/BackspaceTest.java
index 3be9cfc..e1b305f 100644
--- a/core/tests/coretests/src/android/text/method/BackspaceTest.java
+++ b/core/tests/coretests/src/android/text/method/BackspaceTest.java
@@ -69,6 +69,10 @@
public void testCombiningEnclosingKeycaps() {
EditorState state = new EditorState();
+ state.setByString("'1' U+E0101 U+20E3 |");
+ backspace(state, 0);
+ state.assertEquals("|");
+
// multiple COMBINING ENCLOSING KEYCAP
state.setByString("'1' U+20E3 U+20E3 |");
backspace(state, 0);
@@ -157,6 +161,19 @@
public void testEmojiZWJSequence() {
EditorState state = new EditorState();
+ // U+200D is ZERO WIDTH JOINER.
+ state.setByString("U+1F441 U+200D U+1F5E8 |");
+ backspace(state, 0);
+ state.assertEquals("|");
+
+ state.setByString("U+1F441 U+200D U+1F5E8 U+FE0E |");
+ backspace(state, 0);
+ state.assertEquals("|");
+
+ state.setByString("U+1F468 U+200D U+2764 U+FE0F U+200D U+1F48B U+200D U+1F468 |");
+ backspace(state, 0);
+ state.assertEquals("|");
+
// End with ZERO WIDTH JOINER
state.setByString("U+1F441 U+200D |");
backspace(state, 0);
@@ -224,6 +241,11 @@
public void testEmojiModifier() {
EditorState state = new EditorState();
+ // U+1F3FB is EMOJI MODIFIER FITZPATRICK TYPE-1-2.
+ state.setByString("U+1F466 U+1F3FB |");
+ backspace(state, 0);
+ state.assertEquals("|");
+
// Isolated emoji modifier
state.setByString("U+1F3FB |");
backspace(state, 0);
diff --git a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
index f7dab2d..0fed77c 100644
--- a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
+++ b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java
@@ -137,6 +137,15 @@
public void testEmojiZeroWidthJoinerSequence() {
EditorState state = new EditorState();
+ // U+200D is ZERO WIDTH JOINER.
+ state.setByString("| U+1F441 U+200D U+1F5E8");
+ forwardDelete(state, 0);
+ state.assertEquals("|");
+
+ state.setByString("| U+1F468 U+200D U+2764 U+FE0F U+200D U+1F48B U+200D U+1F468");
+ forwardDelete(state, 0);
+ state.assertEquals("|");
+
// End with ZERO WIDTH JOINER
state.setByString("| U+1F441 U+200D");
forwardDelete(state, 0);
@@ -188,6 +197,11 @@
public void testEmojiModifier() {
EditorState state = new EditorState();
+ // U+1F3FB is EMOJI MODIFIER FITZPATRICK TYPE-1-2.
+ state.setByString("| U+1F466 U+1F3FB");
+ forwardDelete(state, 0);
+ state.assertEquals("|");
+
// Isolated emoji modifier
state.setByString("| U+1F3FB");
forwardDelete(state, 0);
diff --git a/core/tests/coretests/src/android/widget/EditorCursorTest.java b/core/tests/coretests/src/android/widget/EditorCursorTest.java
index 04c8b8c..6d650ff 100644
--- a/core/tests/coretests/src/android/widget/EditorCursorTest.java
+++ b/core/tests/coretests/src/android/widget/EditorCursorTest.java
@@ -16,16 +16,34 @@
package android.widget;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
+import android.view.Choreographer;
import android.view.ViewGroup;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.widget.espresso.TextViewAssertions.hasInsertionPointerOnLeft;
+import static android.widget.espresso.TextViewAssertions.hasInsertionPointerOnRight;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
+
public class EditorCursorTest extends ActivityInstrumentationTestCase2<TextViewActivity> {
+
+ private final static String LTR_STRING = "aaaaaaaaaaaaaaaaaaaaaa";
+ private final static String LTR_HINT = "hint";
+ private final static String RTL_STRING = "مرØبا الروبوت مرØبا الروبوت مرØبا الروبوت";
+ private final static String RTL_HINT = "الروبوت";
+ private final static int CURSOR_BLINK_MS = 500;
+
private EditText mEditText;
- private final String RTL_STRING = "مرØبا الروبوت مرØبا الروبوت مرØبا الروبوت";
public EditorCursorTest() {
super(TextViewActivity.class);
@@ -55,110 +73,160 @@
@Override
public void run() {
getActivity().setContentView(layout);
- mEditText.requestFocus();
}
});
getInstrumentation().waitForIdleSync();
+ onView(sameInstance(mEditText)).perform(click());
}
@SmallTest
- public void testCursorIsInViewBoundariesWhenOnRightForLtr() throws Exception {
+ public void testCursorIsInViewBoundariesWhenOnRightForLtr() {
// Asserts that when an EditText has LTR text, and cursor is at the end (right),
// cursor is drawn to the right edge of the view
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- mEditText.setText("aaaaaaaaaaaaaaaaaaaaaa");
- int length = mEditText.getText().length();
- mEditText.setSelection(length, length);
- }
- });
- getInstrumentation().waitForIdleSync();
+ setEditTextText(LTR_STRING, LTR_STRING.length());
- Editor editor = mEditText.getEditorForTesting();
- Drawable drawable = editor.getCursorDrawable()[0];
- Rect drawableBounds = drawable.getBounds();
- Rect drawablePadding = new Rect();
- drawable.getPadding(drawablePadding);
-
- // right edge of the view including the scroll
- int maxRight = mEditText.getWidth() - mEditText.getCompoundPaddingRight()
- - mEditText.getCompoundPaddingLeft() + +mEditText.getScrollX();
- int diff = drawableBounds.right - drawablePadding.right - maxRight;
- assertTrue(diff >= 0 && diff <= 1);
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnRight());
}
@SmallTest
- public void testCursorIsInViewBoundariesWhenOnLeftForLtr() throws Exception {
+ public void testCursorIsInViewBoundariesWhenOnLeftForLtr() {
// Asserts that when an EditText has LTR text, and cursor is at the beginning,
// cursor is drawn to the left edge of the view
+ setEditTextText(LTR_STRING, 0);
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- mEditText.setText("aaaaaaaaaaaaaaaaaaaaaa");
- mEditText.setSelection(0, 0);
- }
- });
- getInstrumentation().waitForIdleSync();
-
- Drawable drawable = mEditText.getEditorForTesting().getCursorDrawable()[0];
- Rect drawableBounds = drawable.getBounds();
- Rect drawablePadding = new Rect();
- drawable.getPadding(drawablePadding);
-
- int diff = drawableBounds.left + drawablePadding.left;
- assertTrue(diff >= 0 && diff <= 1);
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnLeft());
}
@SmallTest
- public void testCursorIsInViewBoundariesWhenOnRightForRtl() throws Exception {
+ public void testCursorIsInViewBoundariesWhenOnRightForRtl() {
// Asserts that when an EditText has RTL text, and cursor is at the end,
// cursor is drawn to the left edge of the view
+ setEditTextText(RTL_STRING, 0);
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- mEditText.setText(RTL_STRING);
- mEditText.setSelection(0, 0);
- }
- });
- getInstrumentation().waitForIdleSync();
-
- Drawable drawable = mEditText.getEditorForTesting().getCursorDrawable()[0];
- Rect drawableBounds = drawable.getBounds();
- Rect drawablePadding = new Rect();
- drawable.getPadding(drawablePadding);
-
- int maxRight = mEditText.getWidth() - mEditText.getCompoundPaddingRight()
- - mEditText.getCompoundPaddingLeft() + mEditText.getScrollX();
-
- int diff = drawableBounds.right - drawablePadding.right - maxRight;
- assertTrue(diff >= 0 && diff <= 1);
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnRight());
}
@SmallTest
- public void testCursorIsInViewBoundariesWhenOnLeftForRtl() throws Exception {
+ public void testCursorIsInViewBoundariesWhenOnLeftForRtl() {
// Asserts that when an EditText has RTL text, and cursor is at the beginning,
// cursor is drawn to the right edge of the view
+ setEditTextText(RTL_STRING, RTL_STRING.length());
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnLeft());
+ }
+
+ /* Tests for cursor positioning with hint */
+ @SmallTest
+ public void testCursorIsOnLeft_withFirstStrongLtrAlgorithm() {
+ setEditTextHint(null, TextView.TEXT_DIRECTION_FIRST_STRONG_LTR, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+ assertThat(mEditText.getHint(), nullValue());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnLeft());
+
+ setEditTextHint(RTL_HINT, TextView.TEXT_DIRECTION_FIRST_STRONG_LTR, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnLeft());
+
+ setEditTextHint(LTR_HINT, TextView.TEXT_DIRECTION_FIRST_STRONG_LTR, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnLeft());
+ }
+
+ @SmallTest
+ public void testCursorIsOnRight_withFirstStrongRtlAlgorithm() {
+ setEditTextHint(null, TextView.TEXT_DIRECTION_FIRST_STRONG_RTL, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+ assertThat(mEditText.getHint(), nullValue());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnRight());
+
+ setEditTextHint(LTR_HINT, TextView.TEXT_DIRECTION_FIRST_STRONG_RTL, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnRight());
+
+ setEditTextHint(RTL_HINT, TextView.TEXT_DIRECTION_FIRST_STRONG_RTL, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnRight());
+ }
+
+ @SmallTest
+ public void testCursorIsOnLeft_withLtrAlgorithm() {
+ setEditTextHint(null, TextView.TEXT_DIRECTION_LTR, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+ assertThat(mEditText.getHint(), nullValue());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnLeft());
+
+ setEditTextHint(RTL_HINT, TextView.TEXT_DIRECTION_LTR, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnLeft());
+
+ setEditTextHint(LTR_HINT, TextView.TEXT_DIRECTION_LTR, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnLeft());
+ }
+
+ @SmallTest
+ public void testCursorIsOnRight_withRtlAlgorithm() {
+ setEditTextHint(null, TextView.TEXT_DIRECTION_RTL, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+ assertThat(mEditText.getHint(), nullValue());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnRight());
+
+ setEditTextHint(LTR_HINT, TextView.TEXT_DIRECTION_RTL, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnRight());
+
+ setEditTextHint(RTL_HINT, TextView.TEXT_DIRECTION_RTL, 0);
+ assertThat(mEditText.getText().toString(), isEmptyString());
+
+ onView(sameInstance(mEditText)).check(hasInsertionPointerOnRight());
+ }
+
+ private void setEditTextProperties(final String text, final String hint,
+ final Integer textDirection, final Integer selection) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
- mEditText.setText(RTL_STRING);
- int length = mEditText.getText().length();
- mEditText.setSelection(length, length);
+ if (textDirection != null) mEditText.setTextDirection(textDirection);
+ if (text != null) mEditText.setText(text);
+ if (hint != null) mEditText.setHint(hint);
+ if (selection != null) mEditText.setSelection(selection);
}
});
getInstrumentation().waitForIdleSync();
- Drawable drawable = mEditText.getEditorForTesting().getCursorDrawable()[0];
- Rect drawableBounds = drawable.getBounds();
- Rect drawablePadding = new Rect();
- drawable.getPadding(drawablePadding);
-
- int diff = drawableBounds.left - mEditText.getScrollX() + drawablePadding.left;
- assertTrue(diff >= 0 && diff <= 1);
+ // wait for cursor to be drawn. updateCursorPositions function is called during draw() and
+ // only when cursor is visible during blink.
+ final CountDownLatch latch = new CountDownLatch(1);
+ mEditText.postOnAnimationDelayed(new Runnable() {
+ @Override
+ public void run() {
+ latch.countDown();
+ }
+ }, CURSOR_BLINK_MS);
+ try {
+ assertThat("Problem while waiting for the cursor to blink",
+ latch.await(10, TimeUnit.SECONDS), equalTo(true));
+ } catch (Exception e) {
+ fail("Problem while waiting for the cursor to blink");
+ }
}
+ private void setEditTextHint(final String hint, final int textDirection, final int selection) {
+ setEditTextProperties(null, hint, textDirection, selection);
+ }
+
+ private void setEditTextText(final String text, final Integer selection) {
+ setEditTextProperties(text, null, null, selection);
+ }
}
diff --git a/core/tests/coretests/src/android/widget/TextViewActivityTest.java b/core/tests/coretests/src/android/widget/TextViewActivityTest.java
index 4a4727f..91d57e7 100644
--- a/core/tests/coretests/src/android/widget/TextViewActivityTest.java
+++ b/core/tests/coretests/src/android/widget/TextViewActivityTest.java
@@ -16,8 +16,10 @@
package android.widget;
+import static android.support.test.espresso.action.ViewActions.longClick;
import static android.widget.espresso.DragHandleUtils.assertNoSelectionHandles;
import static android.widget.espresso.DragHandleUtils.onHandleView;
+import static android.widget.espresso.FloatingToolbarEspressoUtils.onFloatingToolBarItem;
import static android.widget.espresso.TextViewActions.clickOnTextAtIndex;
import static android.widget.espresso.TextViewActions.doubleTapAndDragOnText;
import static android.widget.espresso.TextViewActions.doubleClickOnTextAtIndex;
@@ -49,6 +51,7 @@
import android.test.suitebuilder.annotation.SmallTest;
import android.text.Selection;
import android.text.Spannable;
+import android.text.InputType;
import android.view.KeyEvent;
import static org.hamcrest.Matchers.anyOf;
@@ -234,6 +237,33 @@
}
@SmallTest
+ public void testToolbarAppearsAfterSelection_withFirstStringLtrAlgorithmAndRtlHint()
+ throws Exception {
+ // after the hint layout change, the floating toolbar was not visible in the case below
+ // this test tests that the floating toolbar is displayed on the screen and is visible to
+ // user.
+ final TextView textView = (TextView) getActivity().findViewById(R.id.textview);
+ textView.post(new Runnable() {
+ @Override
+ public void run() {
+ textView.setTextDirection(TextView.TEXT_DIRECTION_FIRST_STRONG_LTR);
+ textView.setInputType(InputType.TYPE_CLASS_TEXT);
+ textView.setSingleLine(true);
+ textView.setHint("الروبوت");
+ }
+ });
+ getInstrumentation().waitForIdleSync();
+
+ onView(withId(R.id.textview)).perform(typeTextIntoFocusedView("test"));
+ onView(withId(R.id.textview)).perform(longPressOnTextAtIndex(1));
+ onFloatingToolBarItem(withText(com.android.internal.R.string.cut)).perform(click());
+ onView(withId(R.id.textview)).perform(longClick());
+ sleepForFloatingToolbarPopup();
+
+ assertFloatingToolbarIsDisplayed();
+ }
+
+ @SmallTest
public void testToolbarAndInsertionHandle() throws Exception {
final String text = "text";
onView(withId(R.id.textview)).perform(click());
diff --git a/core/tests/coretests/src/android/widget/espresso/FloatingToolbarEspressoUtils.java b/core/tests/coretests/src/android/widget/espresso/FloatingToolbarEspressoUtils.java
index f02fe00..0f7f359 100644
--- a/core/tests/coretests/src/android/widget/espresso/FloatingToolbarEspressoUtils.java
+++ b/core/tests/coretests/src/android/widget/espresso/FloatingToolbarEspressoUtils.java
@@ -54,6 +54,16 @@
}
/**
+ * Creates a {@link ViewInteraction} for the floating bar menu item with the given matcher.
+ *
+ * @param matcher The matcher for the menu item.
+ */
+ public static ViewInteraction onFloatingToolBarItem(Matcher<View> matcher) {
+ return onView(matcher)
+ .inRoot(withDecorView(hasDescendant(withTagValue(is(TAG)))));
+ }
+
+ /**
* Asserts that the floating toolbar is displayed on screen.
*
* @throws AssertionError if the assertion fails
diff --git a/core/tests/coretests/src/android/widget/espresso/TextViewAssertions.java b/core/tests/coretests/src/android/widget/espresso/TextViewAssertions.java
index 37c7425..6e44cd8 100644
--- a/core/tests/coretests/src/android/widget/espresso/TextViewAssertions.java
+++ b/core/tests/coretests/src/android/widget/espresso/TextViewAssertions.java
@@ -19,15 +19,23 @@
import static android.support.test.espresso.matcher.ViewMatchers.assertThat;
import static com.android.internal.util.Preconditions.checkNotNull;
import static org.hamcrest.Matchers.is;
+import static org.hamcrest.number.IsCloseTo.closeTo;
+import android.annotation.IntDef;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
import android.support.test.espresso.NoMatchingViewException;
import android.support.test.espresso.ViewAssertion;
import android.view.View;
+import android.widget.EditText;
import android.widget.TextView;
import junit.framework.AssertionFailedError;
import org.hamcrest.Matcher;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
* A collection of assertions on a {@link android.widget.TextView}.
*/
@@ -113,6 +121,22 @@
}
/**
+ * Returns a {@link ViewAssertion} that asserts that the EditText insertion pointer is on
+ * the left edge.
+ */
+ public static ViewAssertion hasInsertionPointerOnLeft() {
+ return new CursorPositionAssertion(CursorPositionAssertion.LEFT);
+ }
+
+ /**
+ * Returns a {@link ViewAssertion} that asserts that the EditText insertion pointer is on
+ * the right edge.
+ */
+ public static ViewAssertion hasInsertionPointerOnRight() {
+ return new CursorPositionAssertion(CursorPositionAssertion.RIGHT);
+ }
+
+ /**
* A {@link ViewAssertion} to check the selected text in a {@link TextView}.
*/
private static final class TextSelectionAssertion implements ViewAssertion {
@@ -142,4 +166,54 @@
}
}
}
+
+ /**
+ * {@link ViewAssertion} to check that EditText cursor is on a given position.
+ */
+ static class CursorPositionAssertion implements ViewAssertion {
+
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({LEFT, RIGHT})
+ public @interface CursorEdgePositionType {}
+ public static final int LEFT = 0;
+ public static final int RIGHT = 1;
+
+ private final int mPosition;
+
+ private CursorPositionAssertion(@CursorEdgePositionType int position) {
+ this.mPosition = position;
+ }
+
+ @Override
+ public void check(View view, NoMatchingViewException exception) {
+ if (!(view instanceof EditText)) {
+ throw new AssertionFailedError("View should be an instance of EditText");
+ }
+ EditText editText = (EditText) view;
+ Drawable drawable = editText.getEditorForTesting().getCursorDrawable()[0];
+ Rect drawableBounds = drawable.getBounds();
+ Rect drawablePadding = new Rect();
+ drawable.getPadding(drawablePadding);
+
+ final int diff;
+ final String positionStr;
+ switch (mPosition) {
+ case LEFT:
+ positionStr = "left";
+ diff = drawableBounds.left - editText.getScrollX() + drawablePadding.left;
+ break;
+ case RIGHT:
+ positionStr = "right";
+ int maxRight = editText.getWidth() - editText.getCompoundPaddingRight()
+ - editText.getCompoundPaddingLeft() + editText.getScrollX();
+ diff = drawableBounds.right - drawablePadding.right - maxRight;
+ break;
+ default:
+ throw new AssertionFailedError("Unknown position for cursor assertion");
+ }
+
+ assertThat("Cursor should be on the " + positionStr, Double.valueOf(diff),
+ closeTo(0f, 1f));
+ }
+ }
}
diff --git a/docs/html/guide/topics/graphics/hardware-accel.jd b/docs/html/guide/topics/graphics/hardware-accel.jd
index e3f1d9e..ca7255b 100644
--- a/docs/html/guide/topics/graphics/hardware-accel.jd
+++ b/docs/html/guide/topics/graphics/hardware-accel.jd
@@ -284,7 +284,7 @@
</tr>
<tr>
<td class="label_neg">drawPicture()</td>
- <td class="value_neg">23</td>
+ <td class="value_pos">23</td>
</tr>
<tr>
<td class="label_pos">drawPosText()</td>
@@ -421,14 +421,6 @@
<td colspan="5" class="s5">Xfermode</td>
</tr>
<tr>
- <td class="label_neg">AvoidXfermode</td>
- <td class="value_neg">✗</td>
- </tr>
- <tr>
- <td class="label_neg">PixelXorXfermode</td>
- <td class="value_neg">✗</td>
- </tr>
- <tr>
<td class="label_neg">PorterDuff.Mode.DARKEN (framebuffer)</td>
<td class="value_neg">✗</td>
</tr>
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 1fc236a..ed358d3 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -605,8 +605,9 @@
// not only getting information from EXIF but also from some JPEG special segments such as
// MARKER_COM for user comment and MARKER_SOFx for image width and height.
- // Identifier for APP1 segment in JPEG
- private static final byte[] IDENTIFIER_APP1 = "Exif\0\0".getBytes(Charset.forName("US-ASCII"));
+ // Identifier for EXIF APP1 segment in JPEG
+ private static final byte[] IDENTIFIER_EXIF_APP1 =
+ "Exif\0\0".getBytes(Charset.forName("US-ASCII"));
// JPEG segment markers, that each marker consumes two bytes beginning with 0xff and ending with
// the indicator. There is no SOF4, SOF8, SOF16 markers in JPEG and SOFx markers indicates start
// of frame(baseline DCT) and the image size info exists in its beginning part.
@@ -1125,7 +1126,9 @@
String time = getAttribute(TAG_GPS_TIMESTAMP);
if (date == null || time == null
|| (!sNonZeroTimePattern.matcher(date).matches()
- && !sNonZeroTimePattern.matcher(time).matches())) return -1;
+ && !sNonZeroTimePattern.matcher(time).matches())) {
+ return -1;
+ }
String dateTimeString = date + ' ' + time;
@@ -1176,7 +1179,6 @@
DataInputStream dataInputStream = new DataInputStream(inputStream);
byte marker;
int bytesRead = 0;
- ++bytesRead;
if ((marker = dataInputStream.readByte()) != MARKER) {
throw new IOException("Invalid marker: " + Integer.toHexString(marker & 0xff));
}
@@ -1184,8 +1186,8 @@
if (dataInputStream.readByte() != MARKER_SOI) {
throw new IOException("Invalid marker: " + Integer.toHexString(marker & 0xff));
}
+ ++bytesRead;
while (true) {
- ++bytesRead;
marker = dataInputStream.readByte();
if (marker != MARKER) {
throw new IOException("Invalid marker:" + Integer.toHexString(marker & 0xff));
@@ -1195,36 +1197,40 @@
if (DEBUG) {
Log.d(TAG, "Found JPEG segment indicator: " + Integer.toHexString(marker & 0xff));
}
+ ++bytesRead;
// EOI indicates the end of an image and in case of SOS, JPEG image stream starts and
// the image data will terminate right after.
if (marker == MARKER_EOI || marker == MARKER_SOS) {
break;
}
- bytesRead += 2;
int length = dataInputStream.readUnsignedShort() - 2;
+ bytesRead += 2;
+ if (DEBUG) {
+ Log.d(TAG, "JPEG segment: " + marker + " (length: " + (length + 2) + ")");
+ }
if (length < 0) {
throw new IOException("Invalid length");
}
- bytesRead += length;
switch (marker) {
case MARKER_APP1: {
if (DEBUG) {
Log.d(TAG, "MARKER_APP1");
}
- bytesRead -= length;
if (length < 6) {
- throw new IOException("Invalid exif");
+ // Skip if it's not an EXIF APP1 segment.
+ break;
}
byte[] identifier = new byte[6];
if (inputStream.read(identifier) != 6) {
throw new IOException("Invalid exif");
}
- if (!Arrays.equals(identifier, IDENTIFIER_APP1)) {
- throw new IOException("Invalid app1 identifier");
- }
bytesRead += 6;
length -= 6;
+ if (!Arrays.equals(identifier, IDENTIFIER_EXIF_APP1)) {
+ // Skip if it's not an EXIF APP1 segment.
+ break;
+ }
if (length <= 0) {
throw new IOException("Invalid exif");
}
@@ -1246,6 +1252,7 @@
if (dataInputStream.read(bytes) != length) {
throw new IOException("Invalid exif");
}
+ length = 0;
setAttribute("UserComment", new String(bytes, Charset.forName("US-ASCII")));
break;
}
@@ -1279,6 +1286,7 @@
throw new IOException("Invalid length");
}
dataInputStream.skipBytes(length);
+ bytesRead += length;
}
}
@@ -1292,68 +1300,84 @@
}
DataInputStream dataInputStream = new DataInputStream(inputStream);
ExifDataOutputStream dataOutputStream = new ExifDataOutputStream(outputStream);
- int bytesRead = 0;
- ++bytesRead;
if (dataInputStream.readByte() != MARKER) {
throw new IOException("Invalid marker");
}
dataOutputStream.writeByte(MARKER);
- ++bytesRead;
if (dataInputStream.readByte() != MARKER_SOI) {
throw new IOException("Invalid marker");
}
dataOutputStream.writeByte(MARKER_SOI);
+ // Write EXIF APP1 segment
+ dataOutputStream.writeByte(MARKER);
+ dataOutputStream.writeByte(MARKER_APP1);
+ writeExifSegment(dataOutputStream, 6);
+
byte[] bytes = new byte[4096];
while (true) {
- ++bytesRead;
if (dataInputStream.readByte() != MARKER) {
throw new IOException("Invalid marker");
}
- dataOutputStream.writeByte(MARKER);
- ++bytesRead;
byte marker = dataInputStream.readByte();
- dataOutputStream.writeByte(marker);
switch (marker) {
case MARKER_APP1: {
- // Rewrite EXIF segment
int length = dataInputStream.readUnsignedShort() - 2;
if (length < 0) {
throw new IOException("Invalid length");
}
- bytesRead += 2;
+ byte[] identifier = new byte[6];
+ if (length >= 6) {
+ if (dataInputStream.read(identifier) != 6) {
+ throw new IOException("Invalid exif");
+ }
+ if (Arrays.equals(identifier, IDENTIFIER_EXIF_APP1)) {
+ // Skip the original EXIF APP1 segment.
+ if (dataInputStream.skip(length - 6) != length - 6) {
+ throw new IOException("Invalid length");
+ }
+ break;
+ }
+ }
+ // Copy non-EXIF APP1 segment.
+ dataOutputStream.writeUnsignedShort(length + 2);
+ if (length >= 6) {
+ length -= 6;
+ dataOutputStream.write(identifier);
+ }
int read;
- while ((read = dataInputStream.read(
- bytes, 0, Math.min(length, bytes.length))) > 0) {
+ while (length > 0 && (read = dataInputStream.read(
+ bytes, 0, Math.min(length, bytes.length))) >= 0) {
+ dataOutputStream.write(bytes, 0, read);
length -= read;
}
- bytesRead += length;
- writeExifSegment(dataOutputStream, bytesRead);
break;
}
case MARKER_EOI:
case MARKER_SOS: {
+ dataOutputStream.writeByte(MARKER);
+ dataOutputStream.writeByte(marker);
// Copy all the remaining data
Streams.copy(dataInputStream, dataOutputStream);
return;
}
default: {
// Copy JPEG segment
+ dataOutputStream.writeByte(MARKER);
+ dataOutputStream.writeByte(marker);
int length = dataInputStream.readUnsignedShort();
dataOutputStream.writeUnsignedShort(length);
+ length -= 2;
if (length < 0) {
throw new IOException("Invalid length");
}
- length -= 2;
- bytesRead += 2;
int read;
- while ((read = dataInputStream.read(
- bytes, 0, Math.min(length, bytes.length))) > 0) {
+ while (length > 0 && (read = dataInputStream.read(
+ bytes, 0, Math.min(length, bytes.length))) >= 0) {
dataOutputStream.write(bytes, 0, read);
length -= read;
}
- bytesRead += length;
break;
}
}
@@ -1924,7 +1948,7 @@
// Write TIFF Headers. See JEITA CP-3451C Table 1. page 10.
dataOutputStream.writeUnsignedShort(totalSize);
- dataOutputStream.write(IDENTIFIER_APP1);
+ dataOutputStream.write(IDENTIFIER_EXIF_APP1);
dataOutputStream.writeShort(BYTE_ALIGN_MM);
dataOutputStream.writeUnsignedShort(0x2a);
dataOutputStream.writeUnsignedInt(8);
diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java
index 89e4577..3eb3359 100644
--- a/media/java/android/media/tv/TvInputManager.java
+++ b/media/java/android/media/tv/TvInputManager.java
@@ -302,7 +302,6 @@
* Interface used to receive the created session.
* @hide
*/
- @SystemApi
public abstract static class SessionCallback {
/**
* This is called after {@link TvInputManager#createSession} has been processed.
@@ -418,9 +417,7 @@
* @param top Top position.
* @param right Right position.
* @param bottom Bottom position.
- * @hide
*/
- @SystemApi
public void onLayoutSurface(Session session, int left, int top, int right, int bottom) {
}
@@ -430,9 +427,7 @@
* @param session A {@link TvInputManager.Session} associated with this callback
* @param eventType The type of the event.
* @param eventArgs Optional arguments of the event.
- * @hide
*/
- @SystemApi
public void onSessionEvent(Session session, String eventType, Bundle eventArgs) {
}
@@ -1347,7 +1342,6 @@
* @param handler A {@link Handler} that the session creation will be delivered to.
* @hide
*/
- @SystemApi
public void createSession(@NonNull String inputId, @NonNull final SessionCallback callback,
@NonNull Handler handler) {
createSessionInternal(inputId, false, callback, handler);
@@ -1364,7 +1358,6 @@
* @param handler A {@link Handler} that the session creation will be delivered to.
* @hide
*/
- @SystemApi
public void createRecordingSession(@NonNull String inputId,
@NonNull final SessionCallback callback, @NonNull Handler handler) {
createSessionInternal(inputId, true, callback, handler);
@@ -1544,7 +1537,6 @@
* The Session provides the per-session functionality of TV inputs.
* @hide
*/
- @SystemApi
public static final class Session {
static final int DISPATCH_IN_PROGRESS = -1;
static final int DISPATCH_NOT_HANDLED = 0;
@@ -1656,9 +1648,7 @@
* @param format The new PixelFormat of the surface.
* @param width The new width of the surface.
* @param height The new height of the surface.
- * @hide
*/
- @SystemApi
public void dispatchSurfaceChanged(int format, int width, int height) {
if (mToken == null) {
Log.w(TAG, "The session has been already released");
@@ -1706,9 +1696,7 @@
*
* @param channelUri The URI of a channel.
* @param params A set of extra parameters which might be handled with this tune event.
- * @hide
*/
- @SystemApi
public void tune(@NonNull Uri channelUri, Bundle params) {
Preconditions.checkNotNull(channelUri);
if (mToken == null) {
@@ -2065,9 +2053,7 @@
* i.e. prefixed with a package name you own, so that different developers will
* not create conflicting commands.
* @param data Any data to include with the command.
- * @hide
*/
- @SystemApi
public void sendAppPrivateCommand(String action, Bundle data) {
if (mToken == null) {
Log.w(TAG, "The session has been already released");
diff --git a/packages/DefaultContainerService/AndroidManifest.xml b/packages/DefaultContainerService/AndroidManifest.xml
index ccf1501..55d000c 100644
--- a/packages/DefaultContainerService/AndroidManifest.xml
+++ b/packages/DefaultContainerService/AndroidManifest.xml
@@ -13,8 +13,8 @@
<application android:label="@string/service_name"
android:allowBackup="false"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<service android:name=".DefaultContainerService"
android:enabled="true"
diff --git a/packages/DocumentsUI/res/values/config.xml b/packages/DocumentsUI/res/values/config.xml
index 86087c3..ebb3969 100644
--- a/packages/DocumentsUI/res/values/config.xml
+++ b/packages/DocumentsUI/res/values/config.xml
@@ -21,4 +21,8 @@
<!-- Intentionally unset. Vendors should set this in an overlay. -->
<string name="trusted_quick_viewer_package" translatable="false"></string>
<bool name="list_divider_inset_left">true</bool>
+ <!-- Indicates if the home directory should be hidden in the roots list, that is presented
+ in the drawer/left side panel ) -->
+ <bool name="home_root_hidden">true</bool>
+
</resources>
diff --git a/packages/DocumentsUI/res/values/strings.xml b/packages/DocumentsUI/res/values/strings.xml
index e7406e68..0d098e6 100644
--- a/packages/DocumentsUI/res/values/strings.xml
+++ b/packages/DocumentsUI/res/values/strings.xml
@@ -211,13 +211,29 @@
<!-- Text in the button asking user to deny access to a given directory. -->
<string name="deny">Deny</string>
<!-- Dialog text shown to users when asking if they want to delete files (a confirmation). -->
- <plurals name="delete_confirmation_message">
- <item quantity="one">Delete <xliff:g id="count" example="1">%1$d</xliff:g> file?</item>
- <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> files?</item>
- </plurals>
<!-- Label text showing user how many items are selected. Can be one or more elements. -->
<plurals name="elements_selected">
<item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> selected</item>
<item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> selected</item>
</plurals>
+
+ <!-- Dialog text shown to users when asking if they want to delete a file (a confirmation) -->
+ <string name="delete_filename_confirmation_message">Delete \"<xliff:g id="name" example="cat.jpg">%1$s</xliff:g>\"?</string>
+ <!-- Dialog text shown to users when asking if they want to delete a folder (a confirmation) -->
+ <string name="delete_foldername_confirmation_message">Delete folder \"<xliff:g id="name" example="Photos">%1$s</xliff:g>\" and its contents?</string>
+ <!-- Dialog text shown to users when asking if they want to delete files (a confirmation). -->
+ <plurals name="delete_files_confirmation_message">
+ <item quantity="one">Delete <xliff:g id="count" example="1">%1$d</xliff:g> file?</item>
+ <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> files?</item>
+ </plurals>
+ <!-- Dialog text shown to users when asking if they want to delete folders (a confirmation). -->
+ <plurals name="delete_folders_confirmation_message">
+ <item quantity="one">Delete <xliff:g id="count" example="1">%1$d</xliff:g> folder and its contents?</item>
+ <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> folders and their contents?</item>
+ </plurals>
+ <!-- Dialog text shown to users when asking if they want to delete mixed type items: files and folders (a confirmation). -->
+ <plurals name="delete_items_confirmation_message">
+ <item quantity="one">Delete <xliff:g id="count" example="1">%1$d</xliff:g> item?</item>
+ <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> items?</item>
+ </plurals>
</resources>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
index 9f83c04..54e6287 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java
@@ -317,7 +317,10 @@
for (final RootInfo root : roots) {
final RootItem item = new RootItem(root);
- if (root.isLibrary()) {
+
+ if (root.isHome() && isHomeRootHidden(context)) {
+ continue;
+ } else if (root.isLibrary()) {
if (DEBUG) Log.d(TAG, "Adding " + root + " as library.");
libraries.add(item);
} else {
@@ -367,6 +370,13 @@
}
}
+ /*
+ * Indicates if the home directory should be hidden in the roots list.
+ */
+ private boolean isHomeRootHidden(Context context) {
+ return context.getResources().getBoolean(R.bool.home_root_hidden);
+ }
+
@Override
public View getView(int position, View convertView, ViewGroup parent) {
final Item item = getItem(position);
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Shared.java b/packages/DocumentsUI/src/com/android/documentsui/Shared.java
index c32bbff..6f1863e 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/Shared.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/Shared.java
@@ -151,6 +151,14 @@
return sCollator.compare(lhs, rhs);
}
+ /**
+ * Compare two strings against each other using system default collator in a
+ * case-insensitive mode.
+ */
+ public static int compareToIgnoreCase(String lhs, String rhs) {
+ return sCollator.compare(lhs, rhs);
+ }
+
public static boolean isHardwareKeyboardAvailable(Context context) {
return context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 63a834f..60e4b9a 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -688,6 +688,39 @@
}.execute(selected);
}
+ private String generateDeleteMessage(final List<DocumentInfo> docs) {
+ String message;
+ int dirsCount = 0;
+
+ for (DocumentInfo doc : docs) {
+ if (doc.isDirectory()) {
+ ++dirsCount;
+ }
+ }
+
+ if (docs.size() == 1) {
+ // Deleteing 1 file xor 1 folder in cwd
+ message = dirsCount == 0
+ ? getActivity().getString(R.string.delete_filename_confirmation_message,
+ docs.get(0).displayName)
+ : getActivity().getString(R.string.delete_foldername_confirmation_message,
+ docs.get(0).displayName);
+ } else if (dirsCount == 0) {
+ // Deleting only files in cwd
+ message = Shared.getQuantityString(getActivity(),
+ R.plurals.delete_files_confirmation_message, docs.size());
+ } else if (dirsCount == docs.size()) {
+ // Deleting only folders in cwd
+ message = Shared.getQuantityString(getActivity(),
+ R.plurals.delete_folders_confirmation_message, docs.size());
+ } else {
+ // Deleting mixed items (files and folders) in cwd
+ message = Shared.getQuantityString(getActivity(),
+ R.plurals.delete_items_confirmation_message, docs.size());
+ }
+ return message;
+ }
+
private void deleteDocuments(final Selection selected) {
assert(!selected.isEmpty());
@@ -698,11 +731,7 @@
TextView message =
(TextView) mInflater.inflate(R.layout.dialog_delete_confirmation, null);
- message.setText(
- Shared.getQuantityString(
- getActivity(),
- R.plurals.delete_confirmation_message,
- docs.size()));
+ message.setText(generateDeleteMessage(docs));
// This "insta-hides" files that are being deleted, because
// the delete operation may be not execute immediately (it
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
index c5ee592..3642b01 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
@@ -20,10 +20,9 @@
import static com.android.documentsui.State.SORT_ORDER_DISPLAY_NAME;
import static com.android.documentsui.State.SORT_ORDER_LAST_MODIFIED;
import static com.android.documentsui.State.SORT_ORDER_SIZE;
-import static com.android.documentsui.model.DocumentInfo.getCursorLong;
-import static com.android.documentsui.model.DocumentInfo.getCursorString;
import android.database.Cursor;
+import android.database.MergeCursor;
import android.os.Bundle;
import android.provider.DocumentsContract;
import android.provider.DocumentsContract.Document;
@@ -48,6 +47,7 @@
@VisibleForTesting
public class Model {
private static final String TAG = "Model";
+ private static final String EMPTY = "";
private boolean mIsLoading;
private List<UpdateListener> mUpdateListeners = new ArrayList<>();
@@ -62,34 +62,17 @@
private String mIds[] = new String[0];
private int mSortOrder = SORT_ORDER_DISPLAY_NAME;
+ private int mAuthorityIndex = -1;
+ private int mDocIdIndex = -1;
+ private int mMimeTypeIndex = -1;
+ private int mDisplayNameIndex = -1;
+ private int mSizeIndex = -1;
+ private int mLastModifiedIndex = -1;
+
@Nullable String info;
@Nullable String error;
@Nullable DocumentInfo doc;
- /**
- * Generates a Model ID for a cursor entry that refers to a document. The Model ID is a unique
- * string that can be used to identify the document referred to by the cursor.
- *
- * @param c A cursor that refers to a document.
- */
- private static String createModelId(Cursor c) {
- // TODO: Maybe more efficient to use just the document ID, in cases where there is only one
- // authority (which should be the majority of cases).
- return createModelId(
- getCursorString(c, RootCursorWrapper.COLUMN_AUTHORITY),
- getCursorString(c, Document.COLUMN_DOCUMENT_ID));
- }
-
- /**
- * Generates a Model ID for a cursor entry that refers to a document. The Model ID is a unique
- * string that can be used to identify the document referred to by the cursor.
- *
- * @param c A cursor that refers to a document.
- */
- static String createModelId(String authority, String docId) {
- return authority + "|" + docId;
- }
-
private void notifyUpdateListeners() {
for (UpdateListener listener: mUpdateListeners) {
listener.onModelUpdate(this);
@@ -127,6 +110,14 @@
mCursor = result.cursor;
mCursorCount = mCursor.getCount();
mSortOrder = result.sortOrder;
+ mAuthorityIndex = mCursor.getColumnIndex(RootCursorWrapper.COLUMN_AUTHORITY);
+ assert(mAuthorityIndex != -1);
+ mDocIdIndex = mCursor.getColumnIndex(Document.COLUMN_DOCUMENT_ID);
+ mMimeTypeIndex = mCursor.getColumnIndex(Document.COLUMN_MIME_TYPE);
+ mDisplayNameIndex = mCursor.getColumnIndex(Document.COLUMN_DISPLAY_NAME);
+ mLastModifiedIndex = mCursor.getColumnIndex(Document.COLUMN_LAST_MODIFIED);
+ mSizeIndex = mCursor.getColumnIndex(Document.COLUMN_SIZE);
+
doc = result.doc;
updateModelData();
@@ -173,22 +164,29 @@
for (int pos = 0; pos < mCursorCount; ++pos) {
mCursor.moveToNext();
positions[pos] = pos;
- mIds[pos] = createModelId(mCursor);
- mimeType = getCursorString(mCursor, Document.COLUMN_MIME_TYPE);
+ // Generates a Model ID for a cursor entry that refers to a document. The Model ID is a
+ // unique string that can be used to identify the document referred to by the cursor.
+ // If the cursor is a merged cursor over multiple authorities, then prefix the ids
+ // with the authority to avoid collisions.
+ if (mCursor instanceof MergeCursor) {
+ mIds[pos] = getStringOrEmpty(mAuthorityIndex) + "|" + getStringOrEmpty(mDocIdIndex);
+ } else {
+ mIds[pos] = getStringOrEmpty(mDocIdIndex);
+ }
+
+ mimeType = getStringOrEmpty(mMimeTypeIndex);
isDirs[pos] = Document.MIME_TYPE_DIR.equals(mimeType);
- switch(mSortOrder) {
+ switch (mSortOrder) {
case SORT_ORDER_DISPLAY_NAME:
- final String displayName = getCursorString(
- mCursor, Document.COLUMN_DISPLAY_NAME);
- displayNames[pos] = displayName;
+ displayNames[pos] = getStringOrEmpty(mDisplayNameIndex);
break;
case SORT_ORDER_LAST_MODIFIED:
- longValues[pos] = getLastModified(mCursor);
+ longValues[pos] = getLastModified();
break;
case SORT_ORDER_SIZE:
- longValues[pos] = getCursorLong(mCursor, Document.COLUMN_SIZE);
+ longValues[pos] = getDocSize();
break;
}
}
@@ -244,7 +242,7 @@
} else {
final String lhs = pivotValue;
final String rhs = sortKey[mid];
- compare = Shared.compareToIgnoreCaseNullable(lhs, rhs);
+ compare = Shared.compareToIgnoreCase(lhs, rhs);
}
if (compare < 0) {
@@ -365,13 +363,42 @@
}
/**
- * @return Timestamp for the given document. Some docs (e.g. active downloads) have a null
- * timestamp - these will be replaced with MAX_LONG so that such files get sorted to the top
- * when sorting by date.
+ * @return Value of the string column, or an empty string if no value, or empty value.
*/
- long getLastModified(Cursor cursor) {
- long l = getCursorLong(mCursor, Document.COLUMN_LAST_MODIFIED);
- return (l == -1) ? Long.MAX_VALUE : l;
+ private String getStringOrEmpty(int columnIndex) {
+ if (columnIndex == -1)
+ return EMPTY;
+ final String result = mCursor.getString(columnIndex);
+ return result != null ? result : EMPTY;
+ }
+
+ /**
+ * @return Timestamp for the given document. Some docs (e.g. active downloads) have a null
+ * or missing timestamp - these will be replaced with MAX_LONG so that such files get sorted to
+ * the top when sorting by date.
+ */
+ private long getLastModified() {
+ if (mLastModifiedIndex == -1)
+ return Long.MAX_VALUE;
+ try {
+ final long result = mCursor.getLong(mLastModifiedIndex);
+ return result > 0 ? result : Long.MAX_VALUE;
+ } catch (NumberFormatException e) {
+ return Long.MAX_VALUE;
+ }
+ }
+
+ /**
+ * @return Size for the given document. If the size is unknown or invalid, returns 0.
+ */
+ private long getDocSize() {
+ if (mSizeIndex == -1)
+ return 0;
+ try {
+ return mCursor.getLong(mSizeIndex);
+ } catch (NumberFormatException e) {
+ return 0;
+ }
}
public @Nullable Cursor getItem(String modelId) {
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
index e4afc3d..f294919 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/FilesActivityUiTest.java
@@ -58,18 +58,23 @@
public void testRootsListed() throws Exception {
initTestFiles();
- bots.roots.openRoot(ROOT_0_ID);
-
// Should also have Drive, but that requires pre-configuration of devices
// We omit for now.
- bots.roots.assertHasRoots(
+ bots.roots.assertRootsPresent(
"Images",
"Videos",
"Audio",
"Downloads",
- "Documents",
ROOT_0_ID,
ROOT_1_ID);
+
+ // Separate logic for "Documents" root, which presence depends on the config setting
+ boolean homeRootHidden = context.getResources().getBoolean(R.bool.home_root_hidden);
+ if (homeRootHidden) {
+ bots.roots.assertRootsAbsent("Documents");
+ } else {
+ bots.roots.assertRootsPresent("Documents");
+ }
}
public void testFilesListed() throws Exception {
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/RootsListBot.java b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/RootsListBot.java
index 356fd01..096af10 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/bots/RootsListBot.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/bots/RootsListBot.java
@@ -69,7 +69,7 @@
mDevice.waitForIdle();
}
- public void assertHasRoots(String... labels) throws UiObjectNotFoundException {
+ public void assertRootsPresent(String... labels) throws UiObjectNotFoundException {
List<String> missing = new ArrayList<>();
for (String label : labels) {
if (!findRoot(label).exists()) {
@@ -82,6 +82,18 @@
}
}
+ public void assertRootsAbsent(String... labels) throws UiObjectNotFoundException {
+ List<String> unexpected = new ArrayList<>();
+ for (String label : labels) {
+ if (findRoot(label).exists()) {
+ unexpected.add(label);
+ }
+ }
+ if (!unexpected.isEmpty()) {
+ Assert.fail("Unexpected roots " + unexpected);
+ }
+ }
+
public void assertHasFocus() {
assertHasFocus(ROOTS_LIST_ID);
}
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelTest.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelTest.java
index c6ad511..3536593 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelTest.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/ModelTest.java
@@ -284,7 +284,7 @@
String id = Integer.toString(i);
row.add(RootCursorWrapper.COLUMN_AUTHORITY, AUTHORITY);
row.add(Document.COLUMN_DOCUMENT_ID, id);
- currentDownloads.add(Model.createModelId(AUTHORITY, id));
+ currentDownloads.add(id);
}
DirectoryResult r = new DirectoryResult();
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestModel.java b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestModel.java
index d8c29db..2d819ff 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestModel.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/dirlist/TestModel.java
@@ -62,9 +62,7 @@
update(r);
}
- // Note that model id includes authority qualifier and is distinct
- // WRT documentId because of this.
String idForPosition(int p) {
- return createModelId(mAuthority, Integer.toString(p));
+ return Integer.toString(p);
}
}
diff --git a/packages/ExtServices/AndroidManifest.xml b/packages/ExtServices/AndroidManifest.xml
index 519db66..c2ca998 100644
--- a/packages/ExtServices/AndroidManifest.xml
+++ b/packages/ExtServices/AndroidManifest.xml
@@ -22,8 +22,8 @@
coreApp="true">
<application android:label="@string/app_name"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<library android:name="android.ext.services"/>
diff --git a/packages/ExtShared/AndroidManifest.xml b/packages/ExtShared/AndroidManifest.xml
index e2e81d0..04d865e 100644
--- a/packages/ExtShared/AndroidManifest.xml
+++ b/packages/ExtShared/AndroidManifest.xml
@@ -22,8 +22,8 @@
<application android:label="@string/app_name"
android:allowBackup="false"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<library android:name="android.ext.shared"/>
diff --git a/packages/FakeOemFeatures/AndroidManifest.xml b/packages/FakeOemFeatures/AndroidManifest.xml
index fe74ad8..a66521d 100644
--- a/packages/FakeOemFeatures/AndroidManifest.xml
+++ b/packages/FakeOemFeatures/AndroidManifest.xml
@@ -12,8 +12,8 @@
android:allowBackup="false"
android:hardwareAccelerated="true"
android:label="Fake OEM Features"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<service android:name=".FakeCoreService" android:process=":core"
android:label="Fake OEM Core Service" />
diff --git a/packages/FusedLocation/AndroidManifest.xml b/packages/FusedLocation/AndroidManifest.xml
index ed84c0d..a8319ab 100644
--- a/packages/FusedLocation/AndroidManifest.xml
+++ b/packages/FusedLocation/AndroidManifest.xml
@@ -29,8 +29,8 @@
<application
android:label="@string/app_label"
android:process="system"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<uses-library android:name="com.android.location.provider" />
diff --git a/packages/InputDevices/AndroidManifest.xml b/packages/InputDevices/AndroidManifest.xml
index 07885ea..9507c9f 100644
--- a/packages/InputDevices/AndroidManifest.xml
+++ b/packages/InputDevices/AndroidManifest.xml
@@ -7,8 +7,8 @@
android:allowClearUserData="false"
android:label="@string/app_label"
android:process="system"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<receiver android:name=".InputDeviceReceiver"
android:label="@string/keyboard_layouts_label">
diff --git a/packages/Keyguard/AndroidManifest.xml b/packages/Keyguard/AndroidManifest.xml
index 54972b4..165fe05 100644
--- a/packages/Keyguard/AndroidManifest.xml
+++ b/packages/Keyguard/AndroidManifest.xml
@@ -46,8 +46,8 @@
android:process="com.android.systemui"
android:persistent="true"
android:supportsRtl="true"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
</application>
</manifest>
diff --git a/packages/SettingsProvider/AndroidManifest.xml b/packages/SettingsProvider/AndroidManifest.xml
index ba991fb..6c06d05 100644
--- a/packages/SettingsProvider/AndroidManifest.xml
+++ b/packages/SettingsProvider/AndroidManifest.xml
@@ -9,8 +9,8 @@
android:backupAgent="SettingsBackupAgent"
android:killAfterRestore="false"
android:icon="@mipmap/ic_launcher_settings"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<provider android:name="SettingsProvider"
android:authorities="settings"
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 5b865f9..0c35573 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -113,8 +113,8 @@
<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
<application android:label="@string/app_label"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.android.shell"
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 334035c..073cf14 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -167,8 +167,8 @@
android:process="com.android.systemui"
android:supportsRtl="true"
android:theme="@style/systemui_theme"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<!-- Keep theme in sync with SystemUIApplication.onCreate().
Setting the theme on the application does not affect views inflated by services.
The application theme is set again from onCreate to take effect for those views. -->
diff --git a/packages/services/Proxy/AndroidManifest.xml b/packages/services/Proxy/AndroidManifest.xml
index 88f8381..51531e3 100644
--- a/packages/services/Proxy/AndroidManifest.xml
+++ b/packages/services/Proxy/AndroidManifest.xml
@@ -8,8 +8,8 @@
<application
android:label="@string/app_label"
android:process="com.android.proxyhandler"
- android:forceDeviceEncrypted="true"
- android:encryptionAware="true">
+ android:defaultToDeviceProtectedStorage="true"
+ android:directBootAware="true">
<service android:name=".ProxyService"
android:exported="true">
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index b4b40ae..9ce81ed2 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -56,6 +56,7 @@
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
+import android.os.PowerManager;
import android.os.Process;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
@@ -174,6 +175,8 @@
private final PackageManager mPackageManager;
+ private final PowerManager mPowerManager;
+
private final WindowManagerInternal mWindowManagerService;
private final SecurityPolicy mSecurityPolicy;
@@ -232,6 +235,7 @@
public AccessibilityManagerService(Context context) {
mContext = context;
mPackageManager = mContext.getPackageManager();
+ mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
mWindowManagerService = LocalServices.getService(WindowManagerInternal.class);
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mSecurityPolicy = new SecurityPolicy();
@@ -1013,7 +1017,8 @@
PackageManager.GET_SERVICES
| PackageManager.GET_META_DATA
| PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
- | PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE,
+ | PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
mCurrentUserId);
for (int i = 0, count = installedServices.size(); i < count; i++) {
@@ -1801,7 +1806,8 @@
private KeyEventDispatcher getKeyEventDispatcher() {
if (mKeyEventDispatcher == null) {
mKeyEventDispatcher = new KeyEventDispatcher(
- mMainHandler, MainHandler.MSG_SEND_KEY_EVENT_TO_INPUT_FILTER, mLock);
+ mMainHandler, MainHandler.MSG_SEND_KEY_EVENT_TO_INPUT_FILTER, mLock,
+ mPowerManager);
}
return mKeyEventDispatcher;
}
@@ -2702,6 +2708,11 @@
final int interrogatingPid = Binder.getCallingPid();
final long identityToken = Binder.clearCallingIdentity();
try {
+ // Regardless of whether or not the action succeeds, it was generated by an
+ // accessibility service that is driven by user actions, so note user activity.
+ mPowerManager.userActivity(SystemClock.uptimeMillis(),
+ PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY, 0);
+
connection.performAccessibilityAction(accessibilityNodeId, action, arguments,
interactionId, callback, mFetchFlags, interrogatingPid, interrogatingTid);
} catch (RemoteException re) {
@@ -2723,6 +2734,8 @@
}
final long identity = Binder.clearCallingIdentity();
try {
+ mPowerManager.userActivity(SystemClock.uptimeMillis(),
+ PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY, 0);
switch (action) {
case AccessibilityService.GLOBAL_ACTION_BACK: {
sendDownAndUpKeyEvents(KeyEvent.KEYCODE_BACK);
diff --git a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
index 3469565..e03c16e 100644
--- a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
+++ b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java
@@ -17,8 +17,10 @@
package com.android.server.accessibility;
import android.accessibilityservice.AccessibilityServiceInfo;
+import android.os.Binder;
import android.os.Handler;
import android.os.Message;
+import android.os.PowerManager;
import android.os.RemoteException;
import android.util.ArrayMap;
import android.util.Pools;
@@ -69,6 +71,7 @@
private final Handler mHandlerToSendKeyEventsToInputFilter;
private final int mMessageTypeForSendKeyEvent;
private final Handler mKeyEventTimeoutHandler;
+ private final PowerManager mPowerManager;
/**
* @param handlerToSendKeyEventsToInputFilter The handler to which to post {@code KeyEvent}s
@@ -77,9 +80,12 @@
* message that carries a {@code KeyEvent} to be sent to the input filter
* @param lock The lock used for all synchronization in this package. This lock must be held
* when calling {@code notifyKeyEventLocked}
+ * @param powerManager The power manager to alert to user activity if a KeyEvent is processed
+ * by a service
*/
public KeyEventDispatcher(Handler handlerToSendKeyEventsToInputFilter,
- int messageTypeForSendKeyEvent, Object lock) {
+ int messageTypeForSendKeyEvent, Object lock,
+ PowerManager powerManager) {
if (InputEventConsistencyVerifier.isInstrumentationEnabled()) {
mSentEventsVerifier = new InputEventConsistencyVerifier(
this, 0, KeyEventDispatcher.class.getSimpleName());
@@ -91,6 +97,7 @@
mKeyEventTimeoutHandler =
new Handler(mHandlerToSendKeyEventsToInputFilter.getLooper(), new Callback());
mLock = lock;
+ mPowerManager = powerManager;
}
/**
@@ -165,7 +172,16 @@
PendingKeyEvent pendingEvent =
removeEventFromListLocked(mPendingEventsMap.get(service), sequence);
if (pendingEvent != null) {
- pendingEvent.handled |= handled;
+ if (handled && !pendingEvent.handled) {
+ pendingEvent.handled = handled;
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ mPowerManager.userActivity(pendingEvent.event.getEventTime(),
+ PowerManager.USER_ACTIVITY_EVENT_ACCESSIBILITY, 0);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
removeReferenceToPendingEventLocked(pendingEvent);
}
}
@@ -241,7 +257,7 @@
int policyFlags = pendingEvent.policyFlags | WindowManagerPolicy.FLAG_PASS_TO_USER;
mHandlerToSendKeyEventsToInputFilter
.obtainMessage(mMessageTypeForSendKeyEvent, policyFlags, 0, pendingEvent.event)
- .sendToTarget();
+ .sendToTarget();
} else {
pendingEvent.event.recycle();
}
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index a4f85db..8febecc 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -2487,7 +2487,8 @@
// from a profile that is still locked, so let them see those
// widgets.
if (isProfileWithUnlockedParent(userId)) {
- flags |= PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE;
+ flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
}
// Widgets referencing shared libraries need to have their
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index 4536e04..65a22b9 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -809,7 +809,9 @@
if (user.isSystemOnly()) continue;
final ProviderInfo provider = mPms.resolveContentProvider(MediaStore.AUTHORITY,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, user.id);
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ user.id);
if (provider != null) {
final IActivityManager am = ActivityManagerNative.getDefault();
try {
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 8310c97..322df04 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -3825,7 +3825,7 @@
final ActivityManager am = mContext.getSystemService(ActivityManager.class);
if (am.isUserRunningAndLocked(mAccounts.userId)
- && !authenticatorInfo.componentInfo.encryptionAware) {
+ && !authenticatorInfo.componentInfo.directBootAware) {
Slog.w(TAG, "Blocking binding to authenticator " + authenticatorInfo.componentName
+ " which isn't encryption aware");
return false;
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 6361db5..4f0f770 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -267,7 +267,7 @@
import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;
import static android.content.pm.PackageManager.GET_PROVIDERS;
import static android.content.pm.PackageManager.MATCH_DEBUG_TRIAGED_MISSING;
-import static android.content.pm.PackageManager.MATCH_ENCRYPTION_UNAWARE;
+import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -1910,7 +1910,7 @@
mRecentTasks.loadUserRecentsLocked(userId);
}
if (userId == UserHandle.USER_SYSTEM) {
- startPersistentApps(PackageManager.MATCH_ENCRYPTION_UNAWARE);
+ startPersistentApps(PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
}
installEncryptionUnawareProviders(userId);
break;
@@ -10961,7 +10961,7 @@
// We're only interested in providers that are encryption unaware, and
// we don't care about uninstalled apps, since there's no way they're
// running at this point.
- final int matchFlags = GET_PROVIDERS | MATCH_ENCRYPTION_UNAWARE;
+ final int matchFlags = GET_PROVIDERS | MATCH_DIRECT_BOOT_UNAWARE;
synchronized (this) {
final int NP = mProcessNames.getMap().size();
@@ -12882,7 +12882,7 @@
synchronized (this) {
// Only start up encryption-aware persistent apps; once user is
// unlocked we'll come back around and start unaware apps
- startPersistentApps(PackageManager.MATCH_ENCRYPTION_AWARE);
+ startPersistentApps(PackageManager.MATCH_DIRECT_BOOT_AWARE);
// Start up initial activity.
mBooting = true;
diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java
index fa62c98..efa7420 100644
--- a/services/core/java/com/android/server/am/ActivityStarter.java
+++ b/services/core/java/com/android/server/am/ActivityStarter.java
@@ -620,7 +620,8 @@
&& userManager.isUserUnlocked(parent.getUserHandle())
&& !userManager.isUserUnlocked(userInfo.getUserHandle())) {
rInfo = mSupervisor.resolveIntent(intent, resolvedType, userId,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
}
}
}
diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java
index 7209814..fb1cda7 100644
--- a/services/core/java/com/android/server/am/RecentTasks.java
+++ b/services/core/java/com/android/server/am/RecentTasks.java
@@ -37,10 +37,7 @@
import android.graphics.Bitmap;
import android.os.Environment;
import android.os.RemoteException;
-import android.os.SystemClock;
import android.os.UserHandle;
-import android.provider.Settings.System;
-import android.util.ArraySet;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
@@ -116,6 +113,7 @@
// on file when we loaded them.
if (mPersistedTaskIds.get(userId) == null) {
mPersistedTaskIds.put(userId, mTaskPersister.loadPersistedTaskIdsForUser(userId));
+ Slog.i(TAG, "Loaded persisted task ids for user " + userId);
}
}
@@ -146,6 +144,12 @@
TaskRecord task = get(i);
if (task.isPersistable && (task.stack == null || !task.stack.isHomeStack())) {
// Set of persisted taskIds for task.userId should not be null here
+ // TODO Investigate why it can happen. For now initialize with an empty set
+ if (mPersistedTaskIds.get(task.userId) == null) {
+ Slog.wtf(TAG, "No task ids found for userId " + task.userId + ". task=" + task
+ + " mPersistedTaskIds=" + mPersistedTaskIds);
+ mPersistedTaskIds.put(task.userId, new SparseBooleanArray());
+ }
mPersistedTaskIds.get(task.userId).put(task.taskId, true);
}
}
diff --git a/services/core/java/com/android/server/am/TaskPersister.java b/services/core/java/com/android/server/am/TaskPersister.java
index 11fd3bc..ceb7db6 100644
--- a/services/core/java/com/android/server/am/TaskPersister.java
+++ b/services/core/java/com/android/server/am/TaskPersister.java
@@ -88,6 +88,7 @@
private final ActivityStackSupervisor mStackSupervisor;
private final RecentTasks mRecentTasks;
private final SparseArray<SparseBooleanArray> mTaskIdsInFile = new SparseArray<>();
+ private final File mTaskIdsDir;
/**
* Value determines write delay mode as follows: < 0 We are Flushing. No delays between writes
@@ -139,12 +140,22 @@
}
}
+ mTaskIdsDir = new File(Environment.getDataDirectory(), "system_de");
mStackSupervisor = stackSupervisor;
mService = service;
mRecentTasks = recentTasks;
mLazyTaskWriterThread = new LazyTaskWriterThread("LazyTaskWriterThread");
}
+ @VisibleForTesting
+ TaskPersister(File workingDir) {
+ mTaskIdsDir = workingDir;
+ mStackSupervisor = null;
+ mService = null;
+ mRecentTasks = null;
+ mLazyTaskWriterThread = new LazyTaskWriterThread("LazyTaskWriterThreadTest");
+ }
+
void startPersisting() {
if (!mLazyTaskWriterThread.isAlive()) {
mLazyTaskWriterThread.start();
@@ -207,8 +218,8 @@
return persistedTaskIds.clone();
}
- private void maybeWritePersistedTaskIdsForUser(@NonNull SparseBooleanArray taskIds,
- int userId) {
+ @VisibleForTesting
+ void maybeWritePersistedTaskIdsForUser(@NonNull SparseBooleanArray taskIds, int userId) {
if (userId < 0) {
return;
}
@@ -565,8 +576,12 @@
return BitmapFactory.decodeFile(filename);
}
- static File getUserPersistedTaskIdsFile(int userId) {
- return new File(Environment.getDataSystemDeDirectory(userId), PERSISTED_TASK_IDS_FILENAME);
+ private File getUserPersistedTaskIdsFile(int userId) {
+ File userTaskIdsDir = new File(mTaskIdsDir, String.valueOf(userId));
+ if (!userTaskIdsDir.exists() && !userTaskIdsDir.mkdirs()) {
+ Slog.e(TAG, "Error while creating user directory: " + userTaskIdsDir);
+ }
+ return new File(userTaskIdsDir, PERSISTED_TASK_IDS_FILENAME);
}
static File getUserTasksDir(int userId) {
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index b4df689..f471af6 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1384,8 +1384,13 @@
synchronized (mHdmiPlaybackClient) {
int keyCode = (direction == -1) ? KeyEvent.KEYCODE_VOLUME_DOWN :
KeyEvent.KEYCODE_VOLUME_UP;
- mHdmiPlaybackClient.sendKeyEvent(keyCode, true);
- mHdmiPlaybackClient.sendKeyEvent(keyCode, false);
+ final long ident = Binder.clearCallingIdentity();
+ try {
+ mHdmiPlaybackClient.sendKeyEvent(keyCode, true);
+ mHdmiPlaybackClient.sendKeyEvent(keyCode, false);
+ } finally {
+ Binder.restoreCallingIdentity(ident);
+ }
}
}
}
diff --git a/services/core/java/com/android/server/connectivity/ApfFilter.java b/services/core/java/com/android/server/connectivity/ApfFilter.java
index 8195319..d62a0b3 100644
--- a/services/core/java/com/android/server/connectivity/ApfFilter.java
+++ b/services/core/java/com/android/server/connectivity/ApfFilter.java
@@ -90,7 +90,7 @@
}
private static final String TAG = "ApfFilter";
- private static final boolean VDBG = true;
+ private static final boolean VDBG = false;
private final ConnectivityService mConnectivityService;
private final NetworkAgentInfo mNai;
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java
index 033a243..3c04b78 100644
--- a/services/core/java/com/android/server/input/InputManagerService.java
+++ b/services/core/java/com/android/server/input/InputManagerService.java
@@ -1109,7 +1109,8 @@
final PackageManager pm = mContext.getPackageManager();
Intent intent = new Intent(InputManager.ACTION_QUERY_KEYBOARD_LAYOUTS);
for (ResolveInfo resolveInfo : pm.queryBroadcastReceivers(intent,
- PackageManager.GET_META_DATA | PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE)) {
+ PackageManager.GET_META_DATA | PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE)) {
final ActivityInfo activityInfo = resolveInfo.activityInfo;
final int priority = resolveInfo.priority;
visitKeyboardLayoutsInPackage(pm, activityInfo, null, priority, visitor);
@@ -1125,7 +1126,8 @@
ActivityInfo receiver = pm.getReceiverInfo(
new ComponentName(d.packageName, d.receiverName),
PackageManager.GET_META_DATA
- | PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);
+ | PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
visitKeyboardLayoutsInPackage(pm, receiver, d.keyboardLayoutName, 0, visitor);
} catch (NameNotFoundException ex) {
}
diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index cee46195..9fd7f90 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -311,10 +311,10 @@
}
toCancel = mJobs.getJobByUidAndJobId(uId, job.getId());
- }
- startTrackingJob(jobStatus, toCancel);
- if (toCancel != null) {
- cancelJobImpl(toCancel);
+ if (toCancel != null) {
+ cancelJobImpl(toCancel);
+ }
+ startTrackingJob(jobStatus, toCancel);
}
mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
return JobScheduler.RESULT_SUCCESS;
@@ -1219,7 +1219,8 @@
final ComponentName service = job.getService();
try {
ServiceInfo si = pm.getServiceInfo(service,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE,
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
UserHandle.getUserId(uid));
if (si == null) {
throw new IllegalArgumentException("No such service " + service);
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 3acd2ca..56edcca 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -2509,8 +2509,9 @@
// update rules for all installed applications
final List<UserInfo> users = mUserManager.getUsers();
final List<ApplicationInfo> apps = pm.getInstalledApplications(
- PackageManager.GET_UNINSTALLED_PACKAGES | PackageManager.GET_DISABLED_COMPONENTS
- | PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);
+ PackageManager.MATCH_UNINSTALLED_PACKAGES | PackageManager.MATCH_DISABLED_COMPONENTS
+ | PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
final int usersSize = users.size();
final int appsSize = apps.size();
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index e8a6528..575de16 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -3552,6 +3552,9 @@
public void onPackagesChanged(boolean queryReplace, String[] pkgList) {
if (DEBUG) Slog.d(TAG, "onPackagesChanged queryReplace=" + queryReplace
+ " pkgList=" + (pkgList == null ? null : Arrays.asList(pkgList)));
+ if (mRankerServicePackageName == null) {
+ return;
+ }
if (pkgList != null && (pkgList.length > 0)) {
for (String pkgName : pkgList) {
@@ -3564,6 +3567,10 @@
protected void registerRanker() {
// Find the updatable ranker and register it.
+ if (mRankerServicePackageName == null) {
+ Slog.w(TAG, "could not start ranker service: no package specified!");
+ return;
+ }
Set<ComponentName> rankerComponents = queryPackageForServices(
mRankerServicePackageName, UserHandle.USER_SYSTEM, null);
Iterator<ComponentName> iterator = rankerComponents.iterator();
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
index 27c8293..13a96ae 100644
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -59,7 +59,8 @@
private static final String TAG = "DefaultPermGrantPolicy"; // must be <= 23 chars
private static final boolean DEBUG = false;
- private static final int DEFAULT_FLAGS = PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE;
+ private static final int DEFAULT_FLAGS = PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
private static final String AUDIO_MIME_TYPE = "audio/mpeg";
diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java
index 5b0ceca..2f0532a 100644
--- a/services/core/java/com/android/server/pm/LauncherAppsService.java
+++ b/services/core/java/com/android/server/pm/LauncherAppsService.java
@@ -218,7 +218,8 @@
int packageUid = -1;
try {
packageUid = mPm.getPackageUidAsUser(callingPackage,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
| PackageManager.MATCH_UNINSTALLED_PACKAGES,
UserHandle.getUserId(getCallingUid()));
} catch (NameNotFoundException e) {
@@ -256,7 +257,9 @@
long ident = Binder.clearCallingIdentity();
try {
List<ResolveInfo> apps = mPm.queryIntentActivitiesAsUser(mainIntent,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, user.getIdentifier());
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ user.getIdentifier());
return new ParceledListSlice<>(apps);
} finally {
Binder.restoreCallingIdentity(ident);
@@ -274,7 +277,9 @@
long ident = Binder.clearCallingIdentity();
try {
ResolveInfo app = mPm.resolveActivityAsUser(intent,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, user.getIdentifier());
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ user.getIdentifier());
return app;
} finally {
Binder.restoreCallingIdentity(ident);
@@ -293,7 +298,9 @@
try {
IPackageManager pm = AppGlobals.getPackageManager();
PackageInfo info = pm.getPackageInfo(packageName,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, user.getIdentifier());
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ user.getIdentifier());
return info != null && info.applicationInfo.enabled;
} finally {
Binder.restoreCallingIdentity(ident);
@@ -421,7 +428,9 @@
try {
IPackageManager pm = AppGlobals.getPackageManager();
ActivityInfo info = pm.getActivityInfo(component,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, user.getIdentifier());
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ user.getIdentifier());
return info != null;
} finally {
Binder.restoreCallingIdentity(ident);
@@ -445,7 +454,9 @@
try {
IPackageManager pm = AppGlobals.getPackageManager();
ActivityInfo info = pm.getActivityInfo(component,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, user.getIdentifier());
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ user.getIdentifier());
if (!info.exported) {
throw new SecurityException("Cannot launch non-exported components "
+ component);
@@ -455,7 +466,9 @@
// as calling startActivityAsUser ignores the category and just
// resolves based on the component if present.
List<ResolveInfo> apps = mPm.queryIntentActivitiesAsUser(launchIntent,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, user.getIdentifier());
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ user.getIdentifier());
final int size = apps.size();
for (int i = 0; i < size; ++i) {
ActivityInfo activityInfo = apps.get(i).activityInfo;
@@ -537,7 +550,7 @@
}
}
- void postToPackageMonitor(Runnable r) {
+ void postToPackageMonitorHandler(Runnable r) {
mPackageMonitor.getRegisteredHandler().post(r);
}
@@ -681,7 +694,7 @@
@Override
public void onShortcutChanged(@NonNull String packageName,
@UserIdInt int userId) {
- postToPackageMonitor(() -> onShortcutChangedInner(packageName, userId));
+ postToPackageMonitorHandler(() -> onShortcutChangedInner(packageName, userId));
}
private void onShortcutChangedInner(@NonNull String packageName,
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index c7578f0..c2e0992 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -61,10 +61,9 @@
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;
import static android.content.pm.PackageManager.MATCH_ALL;
import static android.content.pm.PackageManager.MATCH_DEBUG_TRIAGED_MISSING;
+import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
+import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
-import static android.content.pm.PackageManager.MATCH_ENCRYPTION_AWARE;
-import static android.content.pm.PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE;
-import static android.content.pm.PackageManager.MATCH_ENCRYPTION_UNAWARE;
import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;
import static android.content.pm.PackageManager.MOVE_FAILED_DEVICE_ADMIN;
@@ -2565,7 +2564,8 @@
final Intent intent = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
final List<ResolveInfo> matches = queryIntentReceiversInternal(intent, PACKAGE_MIME_TYPE,
- MATCH_SYSTEM_ONLY | MATCH_ENCRYPTION_AWARE_AND_UNAWARE, UserHandle.USER_SYSTEM);
+ MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE,
+ UserHandle.USER_SYSTEM);
if (matches.size() == 1) {
return matches.get(0).getComponentInfo().packageName;
} else {
@@ -2580,7 +2580,8 @@
intent.setDataAndType(Uri.fromFile(new File("foo.apk")), PACKAGE_MIME_TYPE);
final List<ResolveInfo> matches = queryIntentActivitiesInternal(intent, PACKAGE_MIME_TYPE,
- MATCH_SYSTEM_ONLY | MATCH_ENCRYPTION_AWARE_AND_UNAWARE, UserHandle.USER_SYSTEM);
+ MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE,
+ UserHandle.USER_SYSTEM);
if (matches.size() == 1) {
return matches.get(0).getComponentInfo().packageName;
} else {
@@ -2592,7 +2593,8 @@
final Intent intent = new Intent(Intent.ACTION_INTENT_FILTER_NEEDS_VERIFICATION);
final List<ResolveInfo> matches = queryIntentReceiversInternal(intent, PACKAGE_MIME_TYPE,
- MATCH_SYSTEM_ONLY | MATCH_ENCRYPTION_AWARE_AND_UNAWARE, UserHandle.USER_SYSTEM);
+ MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE,
+ UserHandle.USER_SYSTEM);
ResolveInfo best = null;
final int N = matches.size();
for (int i = 0; i < N; i++) {
@@ -2627,7 +2629,8 @@
final Intent resolverIntent = new Intent(Intent.ACTION_RESOLVE_EPHEMERAL_PACKAGE);
final List<ResolveInfo> resolvers = queryIntentServicesInternal(resolverIntent, null,
- MATCH_SYSTEM_ONLY | MATCH_ENCRYPTION_AWARE_AND_UNAWARE, UserHandle.USER_SYSTEM);
+ MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE,
+ UserHandle.USER_SYSTEM);
final int N = resolvers.size();
if (N == 0) {
@@ -2672,7 +2675,8 @@
intent.setDataAndType(Uri.fromFile(new File("foo.apk")), PACKAGE_MIME_TYPE);
final List<ResolveInfo> matches = queryIntentActivitiesInternal(intent, PACKAGE_MIME_TYPE,
- MATCH_SYSTEM_ONLY | MATCH_ENCRYPTION_AWARE_AND_UNAWARE, UserHandle.USER_SYSTEM);
+ MATCH_SYSTEM_ONLY | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE,
+ UserHandle.USER_SYSTEM);
if (matches.size() == 0) {
return null;
} else if (matches.size() == 1) {
@@ -2886,8 +2890,8 @@
throw new SecurityException("Package " + packageName + " is currently frozen!");
}
- if (!userKeyUnlocked && !(ps.pkg.applicationInfo.isEncryptionAware()
- || ps.pkg.applicationInfo.isPartiallyEncryptionAware())) {
+ if (!userKeyUnlocked && !(ps.pkg.applicationInfo.isDirectBootAware()
+ || ps.pkg.applicationInfo.isPartiallyDirectBootAware())) {
throw new SecurityException("Package " + packageName + " is not encryption aware!");
}
}
@@ -3255,17 +3259,17 @@
* Update given flags based on encryption status of current user.
*/
private int updateFlags(int flags, int userId) {
- if ((flags & (PackageManager.MATCH_ENCRYPTION_UNAWARE
- | PackageManager.MATCH_ENCRYPTION_AWARE)) != 0) {
+ if ((flags & (PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_DIRECT_BOOT_AWARE)) != 0) {
// Caller expressed an explicit opinion about what encryption
// aware/unaware components they want to see, so fall through and
// give them what they want
} else {
// Caller expressed no opinion, so match based on user state
if (isUserKeyUnlocked(userId)) {
- flags |= PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE;
+ flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE;
} else {
- flags |= PackageManager.MATCH_ENCRYPTION_AWARE;
+ flags |= PackageManager.MATCH_DIRECT_BOOT_AWARE;
}
}
return flags;
@@ -3280,8 +3284,8 @@
| PackageManager.GET_SERVICES | PackageManager.GET_PROVIDERS)) != 0) {
// Caller is asking for component details, so they'd better be
// asking for specific encryption matching behavior, or be triaged
- if ((flags & (PackageManager.MATCH_ENCRYPTION_UNAWARE
- | PackageManager.MATCH_ENCRYPTION_AWARE
+ if ((flags & (PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_DIRECT_BOOT_AWARE
| PackageManager.MATCH_DEBUG_TRIAGED_MISSING)) == 0) {
triaged = false;
}
@@ -3318,8 +3322,8 @@
boolean triaged = true;
// Caller is asking for component details, so they'd better be
// asking for specific encryption matching behavior, or be triaged
- if ((flags & (PackageManager.MATCH_ENCRYPTION_UNAWARE
- | PackageManager.MATCH_ENCRYPTION_AWARE
+ if ((flags & (PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_DIRECT_BOOT_AWARE
| PackageManager.MATCH_DEBUG_TRIAGED_MISSING)) == 0) {
triaged = false;
}
@@ -6126,10 +6130,10 @@
final PackageParser.Package p = i.next();
if (p.applicationInfo == null) continue;
- final boolean matchesUnaware = ((flags & MATCH_ENCRYPTION_UNAWARE) != 0)
- && !p.applicationInfo.isEncryptionAware();
- final boolean matchesAware = ((flags & MATCH_ENCRYPTION_AWARE) != 0)
- && p.applicationInfo.isEncryptionAware();
+ final boolean matchesUnaware = ((flags & MATCH_DIRECT_BOOT_UNAWARE) != 0)
+ && !p.applicationInfo.isDirectBootAware();
+ final boolean matchesAware = ((flags & MATCH_DIRECT_BOOT_AWARE) != 0)
+ && p.applicationInfo.isDirectBootAware();
if ((p.applicationInfo.flags & ApplicationInfo.FLAG_PERSISTENT) != 0
&& (!mSafeMode || isSystemApp(p))
@@ -8289,8 +8293,8 @@
a.info.splitSourceDirs = pkg.applicationInfo.splitSourceDirs;
a.info.splitPublicSourceDirs = pkg.applicationInfo.splitPublicSourceDirs;
a.info.dataDir = pkg.applicationInfo.dataDir;
- a.info.deviceEncryptedDataDir = pkg.applicationInfo.deviceEncryptedDataDir;
- a.info.credentialEncryptedDataDir = pkg.applicationInfo.credentialEncryptedDataDir;
+ a.info.deviceProtectedDataDir = pkg.applicationInfo.deviceProtectedDataDir;
+ a.info.credentialProtectedDataDir = pkg.applicationInfo.credentialProtectedDataDir;
// TODO: Update instrumentation.nativeLibraryDir as well ? Does it
// need other information about the application, like the ABI and what not ?
@@ -18386,13 +18390,13 @@
/**
* For system apps on non-FBE devices, this method migrates any existing
- * CE/DE data to match the {@code forceDeviceEncrypted} flag requested by
- * the app.
+ * CE/DE data to match the {@code defaultToDeviceProtectedStorage} flag
+ * requested by the app.
*/
private boolean maybeMigrateAppData(String volumeUuid, int userId, PackageParser.Package pkg) {
if (pkg.isSystemApp() && !StorageManager.isFileEncryptedNativeOrEmulated()
- && PackageManager.APPLY_FORCE_DEVICE_ENCRYPTED) {
- final int storageTarget = pkg.applicationInfo.isForceDeviceEncrypted()
+ && PackageManager.APPLY_DEFAULT_TO_DEVICE_PROTECTED_STORAGE) {
+ final int storageTarget = pkg.applicationInfo.isDefaultToDeviceProtectedStorage()
? StorageManager.FLAG_STORAGE_DE : StorageManager.FLAG_STORAGE_CE;
synchronized (mInstallLock) {
try {
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 4c77f28..e66ec3c 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -3048,7 +3048,8 @@
tmpPa.dump(new LogPrinter(Log.DEBUG, TAG), " ");
}
Intent intent = new Intent();
- int flags = PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE;
+ int flags = PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
intent.setAction(tmpPa.getAction(0));
for (int i=0; i<tmpPa.countCategories(); i++) {
String cat = tmpPa.getCategory(i);
@@ -4175,10 +4176,10 @@
ApplicationInfo.PRIVATE_FLAG_FORWARD_LOCK, "FORWARD_LOCK",
ApplicationInfo.PRIVATE_FLAG_PRIVILEGED, "PRIVILEGED",
ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS, "HAS_DOMAIN_URLS",
- ApplicationInfo.PRIVATE_FLAG_FORCE_DEVICE_ENCRYPTED, "FORCE_DEVICE_ENCRYPTED",
- ApplicationInfo.PRIVATE_FLAG_ENCRYPTION_AWARE, "ENCRYPTION_AWARE",
+ ApplicationInfo.PRIVATE_FLAG_DEFAULT_TO_DEVICE_PROTECTED_STORAGE, "DEFAULT_TO_DEVICE_PROTECTED_STORAGE",
+ ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE, "DIRECT_BOOT_AWARE",
ApplicationInfo.PRIVATE_FLAG_AUTOPLAY, "AUTOPLAY",
- ApplicationInfo.PRIVATE_FLAG_PARTIALLY_ENCRYPTION_AWARE, "PARTIALLY_ENCRYPTION_AWARE",
+ ApplicationInfo.PRIVATE_FLAG_PARTIALLY_DIRECT_BOOT_AWARE, "PARTIALLY_DIRECT_BOOT_AWARE",
ApplicationInfo.PRIVATE_FLAG_EPHEMERAL, "EPHEMERAL",
ApplicationInfo.PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER, "REQUIRED_FOR_SYSTEM_USER",
ApplicationInfo.PRIVATE_FLAG_RESIZEABLE_ACTIVITIES, "RESIZEABLE_ACTIVITIES",
diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 197b2fa..e831bb1 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -44,6 +44,7 @@
import android.os.Binder;
import android.os.Environment;
import android.os.Handler;
+import android.os.Looper;
import android.os.ParcelFileDescriptor;
import android.os.PersistableBundle;
import android.os.Process;
@@ -96,20 +97,18 @@
/**
* TODO:
*
- * - Detect when already registered instances are passed to APIs again, which might break
- * internal bitmap handling.
+ * - Default launcher check does take a few ms. Worth caching.
*
* - Listen to PACKAGE_*, remove orphan info, update timestamp for icon res
* -> Need to scan all packages when a user starts too.
* -> Clear data -> remove all dynamic? but not the pinned?
*
- * - Pinned per each launcher package (multiple launchers)
- *
- * - Make save async (should we?)
- *
* - Scan and remove orphan bitmaps (just in case).
*
* - Backup & restore
+ *
+ * - Detect when already registered instances are passed to APIs again, which might break
+ * internal bitmap handling.
*/
public class ShortcutService extends IShortcutService.Stub {
static final String TAG = "ShortcutService";
@@ -138,7 +137,8 @@
@VisibleForTesting
static final int DEFAULT_ICON_PERSIST_QUALITY = 100;
- private static final int SAVE_DELAY_MS = 5000; // in milliseconds.
+ @VisibleForTesting
+ static final int DEFAULT_SAVE_DELAY_MS = 3000;
@VisibleForTesting
static final String FILENAME_BASE_STATE = "shortcut_service.xml";
@@ -151,36 +151,19 @@
static final String DIRECTORY_BITMAPS = "bitmaps";
- static final String TAG_ROOT = "root";
- static final String TAG_USER = "user";
- static final String TAG_PACKAGE = "package";
- static final String TAG_LAST_RESET_TIME = "last_reset_time";
- static final String TAG_INTENT_EXTRAS = "intent-extras";
- static final String TAG_EXTRAS = "extras";
- static final String TAG_SHORTCUT = "shortcut";
- static final String TAG_LAUNCHER = "launcher";
- static final String TAG_PIN = "pin";
- static final String TAG_LAUNCHER_PINS = "launcher-pins";
+ private static final String TAG_ROOT = "root";
+ private static final String TAG_LAST_RESET_TIME = "last_reset_time";
- static final String ATTR_VALUE = "value";
- static final String ATTR_NAME = "name";
- static final String ATTR_DYNAMIC_COUNT = "dynamic-count";
- static final String ATTR_CALL_COUNT = "call-count";
- static final String ATTR_LAST_RESET = "last-reset";
- static final String ATTR_ID = "id";
- static final String ATTR_ACTIVITY = "activity";
- static final String ATTR_TITLE = "title";
- static final String ATTR_INTENT = "intent";
- static final String ATTR_WEIGHT = "weight";
- static final String ATTR_TIMESTAMP = "timestamp";
- static final String ATTR_FLAGS = "flags";
- static final String ATTR_ICON_RES = "icon-res";
- static final String ATTR_BITMAP_PATH = "bitmap-path";
- static final String ATTR_PACKAGE_NAME = "package-name";
+ private static final String ATTR_VALUE = "value";
@VisibleForTesting
interface ConfigConstants {
/**
+ * Key name for the save delay, in milliseconds. (int)
+ */
+ String KEY_SAVE_DELAY_MILLIS = "save_delay_ms";
+
+ /**
* Key name for the throttling reset interval, in seconds. (long)
*/
String KEY_RESET_INTERVAL_SEC = "reset_interval_sec";
@@ -257,12 +240,22 @@
private CompressFormat mIconPersistFormat;
private int mIconPersistQuality;
+ private int mSaveDelayMillis;
+
private final PackageManagerInternal mPackageManagerInternal;
+ @GuardedBy("mLock")
+ private List<Integer> mDirtyUserIds = new ArrayList<>();
+
public ShortcutService(Context context) {
+ this(context, BackgroundThread.get().getLooper());
+ }
+
+ @VisibleForTesting
+ ShortcutService(Context context, Looper looper) {
mContext = Preconditions.checkNotNull(context);
LocalServices.addService(ShortcutServiceInternal.class, new LocalService());
- mHandler = new Handler(BackgroundThread.get().getLooper());
+ mHandler = new Handler(looper);
mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);
}
@@ -290,7 +283,7 @@
@Override
public void onCleanupUser(int userHandle) {
synchronized (mService.mLock) {
- mService.onCleanupUserInner(userHandle);
+ mService.onCleanupUserLocked(userHandle);
}
}
@@ -321,7 +314,10 @@
}
/** lifecycle event */
- void onCleanupUserInner(int userId) {
+ void onCleanupUserLocked(int userId) {
+ // Save all dirty information.
+ saveDirtyInfo();
+
// Unload
mUsers.delete(userId);
}
@@ -367,6 +363,9 @@
result = false;
}
+ mSaveDelayMillis = (int) parser.getLong(ConfigConstants.KEY_SAVE_DELAY_MILLIS,
+ DEFAULT_SAVE_DELAY_MS);
+
mResetInterval = parser.getLong(
ConfigConstants.KEY_RESET_INTERVAL_SEC, DEFAULT_RESET_INTERVAL_SEC)
* 1000L;
@@ -508,7 +507,7 @@
void saveBaseStateLocked() {
final AtomicFile file = getBaseStateFile();
if (DEBUG) {
- Slog.i(TAG, "Saving to " + file.getBaseFile());
+ Slog.d(TAG, "Saving to " + file.getBaseFile());
}
FileOutputStream outs = null;
@@ -541,7 +540,7 @@
final AtomicFile file = getBaseStateFile();
if (DEBUG) {
- Slog.i(TAG, "Loading from " + file.getBaseFile());
+ Slog.d(TAG, "Loading from " + file.getBaseFile());
}
try (FileInputStream in = file.openRead()) {
XmlPullParser parser = Xml.newPullParser();
@@ -586,7 +585,7 @@
private void saveUserLocked(@UserIdInt int userId) {
final File path = new File(injectUserDataPath(userId), FILENAME_USER_PACKAGES);
if (DEBUG) {
- Slog.i(TAG, "Saving to " + path);
+ Slog.d(TAG, "Saving to " + path);
}
path.mkdirs();
final AtomicFile file = new AtomicFile(path);
@@ -619,7 +618,7 @@
private UserShortcuts loadUserLocked(@UserIdInt int userId) {
final File path = new File(injectUserDataPath(userId), FILENAME_USER_PACKAGES);
if (DEBUG) {
- Slog.i(TAG, "Loading from " + path);
+ Slog.d(TAG, "Loading from " + path);
}
final AtomicFile file = new AtomicFile(path);
@@ -628,7 +627,7 @@
in = file.openRead();
} catch (FileNotFoundException e) {
if (DEBUG) {
- Slog.i(TAG, "Not found " + path);
+ Slog.d(TAG, "Not found " + path);
}
return null;
}
@@ -649,7 +648,7 @@
Slog.d(TAG, String.format("depth=%d type=%d name=%s",
depth, type, tag));
}
- if ((depth == 1) && TAG_USER.equals(tag)) {
+ if ((depth == 1) && UserShortcuts.TAG_ROOT.equals(tag)) {
ret = UserShortcuts.loadFromXml(parser, userId);
continue;
}
@@ -664,29 +663,58 @@
}
}
- // TODO Actually make it async.
private void scheduleSaveBaseState() {
- synchronized (mLock) {
- saveBaseStateLocked();
- }
+ scheduleSave(UserHandle.USER_NULL); // Special case -- use USER_NULL for base state.
}
- // TODO Actually make it async.
void scheduleSaveUser(@UserIdInt int userId) {
+ scheduleSave(userId);
+ }
+
+ // In order to re-schedule, we need to reuse the same instance, so keep it in final.
+ private final Runnable mSaveDirtyInfoRunner = this::saveDirtyInfo;
+
+ private void scheduleSave(@UserIdInt int userId) {
+ if (DEBUG) {
+ Slog.d(TAG, "Scheduling to save for " + userId);
+ }
synchronized (mLock) {
- saveUserLocked(userId);
+ if (!mDirtyUserIds.contains(userId)) {
+ mDirtyUserIds.add(userId);
+ }
+ }
+ // If already scheduled, remove that and re-schedule in N seconds.
+ mHandler.removeCallbacks(mSaveDirtyInfoRunner);
+ mHandler.postDelayed(mSaveDirtyInfoRunner, mSaveDelayMillis);
+ }
+
+ @VisibleForTesting
+ void saveDirtyInfo() {
+ if (DEBUG) {
+ Slog.d(TAG, "saveDirtyInfo");
+ }
+ synchronized (mLock) {
+ for (int i = mDirtyUserIds.size() - 1; i >= 0; i--) {
+ final int userId = mDirtyUserIds.get(i);
+ if (userId == UserHandle.USER_NULL) { // USER_NULL for base state.
+ saveBaseStateLocked();
+ } else {
+ saveUserLocked(userId);
+ }
+ }
+ mDirtyUserIds.clear();
}
}
/** Return the last reset time. */
long getLastResetTimeLocked() {
- updateTimes();
+ updateTimesLocked();
return mRawLastResetTime;
}
/** Return the next reset time. */
long getNextResetTimeLocked() {
- updateTimes();
+ updateTimesLocked();
return mRawLastResetTime + mResetInterval;
}
@@ -697,7 +725,7 @@
/**
* Update the last reset time.
*/
- private void updateTimes() {
+ private void updateTimesLocked() {
final long now = injectCurrentTimeMillis();
@@ -709,13 +737,14 @@
} else if (now < mRawLastResetTime) {
// Clock rewound.
if (isClockValid(now)) {
+ Slog.w(TAG, "Clock rewound");
// TODO Randomize??
mRawLastResetTime = now;
}
} else {
- // TODO Do it properly.
- while ((mRawLastResetTime + mResetInterval) <= now) {
- mRawLastResetTime += mResetInterval;
+ if ((mRawLastResetTime + mResetInterval) <= now) {
+ final long offset = mRawLastResetTime % mResetInterval;
+ mRawLastResetTime = ((now / mResetInterval) * mResetInterval) + offset;
}
}
if (prevLastResetTime != mRawLastResetTime) {
@@ -985,12 +1014,11 @@
// Test overrides it.
int injectGetPackageUid(@NonNull String packageName, @UserIdInt int userId) {
try {
-
- // TODO Is MATCH_UNINSTALLED_PACKAGES correct to get SD card app info?
-
return mContext.getPackageManager().getPackageUidAsUser(packageName,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- | PackageManager.MATCH_UNINSTALLED_PACKAGES, userId);
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_UNINSTALLED_PACKAGES,
+ userId);
} catch (NameNotFoundException e) {
return -1;
}
@@ -1896,6 +1924,11 @@
class UserShortcuts {
private static final String TAG = ShortcutService.TAG;
+ static final String TAG_ROOT = "user";
+ private static final String TAG_LAUNCHER = "launcher";
+
+ private static final String ATTR_VALUE = "value";
+
@UserIdInt
final int mUserId;
@@ -1936,9 +1969,9 @@
}
public void saveToXml(XmlSerializer out) throws IOException, XmlPullParserException {
- out.startTag(null, ShortcutService.TAG_USER);
+ out.startTag(null, TAG_ROOT);
- ShortcutService.writeTagValue(out, ShortcutService.TAG_LAUNCHER,
+ ShortcutService.writeTagValue(out, TAG_LAUNCHER,
mLauncherComponent);
final int lsize = mLaunchers.size();
@@ -1951,7 +1984,7 @@
mPackages.valueAt(i).saveToXml(out);
}
- out.endTag(null, ShortcutService.TAG_USER);
+ out.endTag(null, TAG_ROOT);
}
public static UserShortcuts loadFromXml(XmlPullParser parser, int userId)
@@ -1968,12 +2001,12 @@
final int depth = parser.getDepth();
final String tag = parser.getName();
switch (tag) {
- case ShortcutService.TAG_LAUNCHER: {
+ case TAG_LAUNCHER: {
ret.mLauncherComponent = ShortcutService.parseComponentNameAttribute(
- parser, ShortcutService.ATTR_VALUE);
+ parser, ATTR_VALUE);
continue;
}
- case ShortcutService.TAG_PACKAGE: {
+ case PackageShortcuts.TAG_ROOT: {
final PackageShortcuts shortcuts = PackageShortcuts.loadFromXml(parser, userId);
// Don't use addShortcut(), we don't need to save the icon.
@@ -1981,7 +2014,7 @@
continue;
}
- case ShortcutService.TAG_LAUNCHER_PINS: {
+ case LauncherShortcuts.TAG_ROOT: {
final LauncherShortcuts shortcuts =
LauncherShortcuts.loadFromXml(parser, userId);
@@ -2037,6 +2070,14 @@
class LauncherShortcuts {
private static final String TAG = ShortcutService.TAG;
+ static final String TAG_ROOT = "launcher-pins";
+
+ private static final String TAG_PACKAGE = "package";
+ private static final String TAG_PIN = "pin";
+
+ private static final String ATTR_VALUE = "value";
+ private static final String ATTR_PACKAGE_NAME = "package-name";
+
@UserIdInt
final int mUserId;
@@ -2094,25 +2135,25 @@
* Persist.
*/
public void saveToXml(XmlSerializer out) throws IOException {
- out.startTag(null, ShortcutService.TAG_LAUNCHER_PINS);
- ShortcutService.writeAttr(out, ShortcutService.ATTR_PACKAGE_NAME,
+ out.startTag(null, TAG_ROOT);
+ ShortcutService.writeAttr(out, ATTR_PACKAGE_NAME,
mPackageName);
final int size = mPinnedShortcuts.size();
for (int i = 0; i < size; i++) {
- out.startTag(null, ShortcutService.TAG_PACKAGE);
- ShortcutService.writeAttr(out, ShortcutService.ATTR_PACKAGE_NAME,
+ out.startTag(null, TAG_PACKAGE);
+ ShortcutService.writeAttr(out, ATTR_PACKAGE_NAME,
mPinnedShortcuts.keyAt(i));
final ArraySet<String> ids = mPinnedShortcuts.valueAt(i);
final int idSize = ids.size();
for (int j = 0; j < idSize; j++) {
- ShortcutService.writeTagValue(out, ShortcutService.TAG_PIN, ids.valueAt(j));
+ ShortcutService.writeTagValue(out, TAG_PIN, ids.valueAt(j));
}
- out.endTag(null, ShortcutService.TAG_PACKAGE);
+ out.endTag(null, TAG_PACKAGE);
}
- out.endTag(null, ShortcutService.TAG_LAUNCHER_PINS);
+ out.endTag(null, TAG_ROOT);
}
/**
@@ -2121,7 +2162,7 @@
public static LauncherShortcuts loadFromXml(XmlPullParser parser, int userId)
throws IOException, XmlPullParserException {
final String launcherPackageName = ShortcutService.parseStringAttribute(parser,
- ShortcutService.ATTR_PACKAGE_NAME);
+ ATTR_PACKAGE_NAME);
final LauncherShortcuts ret = new LauncherShortcuts(userId, launcherPackageName);
@@ -2136,16 +2177,16 @@
final int depth = parser.getDepth();
final String tag = parser.getName();
switch (tag) {
- case ShortcutService.TAG_PACKAGE: {
+ case TAG_PACKAGE: {
final String packageName = ShortcutService.parseStringAttribute(parser,
- ShortcutService.ATTR_PACKAGE_NAME);
+ ATTR_PACKAGE_NAME);
ids = new ArraySet<>();
ret.mPinnedShortcuts.put(packageName, ids);
continue;
}
- case ShortcutService.TAG_PIN: {
+ case TAG_PIN: {
ids.add(ShortcutService.parseStringAttribute(parser,
- ShortcutService.ATTR_VALUE));
+ ATTR_VALUE));
continue;
}
}
@@ -2190,6 +2231,25 @@
class PackageShortcuts {
private static final String TAG = ShortcutService.TAG;
+ static final String TAG_ROOT = "package";
+ private static final String TAG_INTENT_EXTRAS = "intent-extras";
+ private static final String TAG_EXTRAS = "extras";
+ private static final String TAG_SHORTCUT = "shortcut";
+
+ private static final String ATTR_NAME = "name";
+ private static final String ATTR_DYNAMIC_COUNT = "dynamic-count";
+ private static final String ATTR_CALL_COUNT = "call-count";
+ private static final String ATTR_LAST_RESET = "last-reset";
+ private static final String ATTR_ID = "id";
+ private static final String ATTR_ACTIVITY = "activity";
+ private static final String ATTR_TITLE = "title";
+ private static final String ATTR_INTENT = "intent";
+ private static final String ATTR_WEIGHT = "weight";
+ private static final String ATTR_TIMESTAMP = "timestamp";
+ private static final String ATTR_FLAGS = "flags";
+ private static final String ATTR_ICON_RES = "icon-res";
+ private static final String ATTR_BITMAP_PATH = "bitmap-path";
+
@UserIdInt
final int mUserId;
@@ -2378,12 +2438,19 @@
final long now = s.injectCurrentTimeMillis();
if (ShortcutService.isClockValid(now) && mLastResetTime > now) {
- // Clock rewound. // TODO Test it
+ Slog.w(TAG, "Clock rewound");
+ // Clock rewound.
mLastResetTime = now;
+ mApiCallCount = 0;
+ return mApiCallCount;
}
// If not reset yet, then reset.
if (mLastResetTime < last) {
+ if (ShortcutService.DEBUG) {
+ Slog.d(TAG, String.format("My last reset=%d, now=%d, last=%d: resetting",
+ mLastResetTime, now, last));
+ }
mApiCallCount = 0;
mLastResetTime = last;
}
@@ -2502,58 +2569,58 @@
}
public void saveToXml(@NonNull XmlSerializer out) throws IOException, XmlPullParserException {
- out.startTag(null, ShortcutService.TAG_PACKAGE);
+ out.startTag(null, TAG_ROOT);
- ShortcutService.writeAttr(out, ShortcutService.ATTR_NAME, mPackageName);
- ShortcutService.writeAttr(out, ShortcutService.ATTR_DYNAMIC_COUNT, mDynamicShortcutCount);
- ShortcutService.writeAttr(out, ShortcutService.ATTR_CALL_COUNT, mApiCallCount);
- ShortcutService.writeAttr(out, ShortcutService.ATTR_LAST_RESET, mLastResetTime);
+ ShortcutService.writeAttr(out, ATTR_NAME, mPackageName);
+ ShortcutService.writeAttr(out, ATTR_DYNAMIC_COUNT, mDynamicShortcutCount);
+ ShortcutService.writeAttr(out, ATTR_CALL_COUNT, mApiCallCount);
+ ShortcutService.writeAttr(out, ATTR_LAST_RESET, mLastResetTime);
final int size = mShortcuts.size();
for (int j = 0; j < size; j++) {
saveShortcut(out, mShortcuts.valueAt(j));
}
- out.endTag(null, ShortcutService.TAG_PACKAGE);
+ out.endTag(null, TAG_ROOT);
}
private static void saveShortcut(XmlSerializer out, ShortcutInfo si)
throws IOException, XmlPullParserException {
- out.startTag(null, ShortcutService.TAG_SHORTCUT);
- ShortcutService.writeAttr(out, ShortcutService.ATTR_ID, si.getId());
+ out.startTag(null, TAG_SHORTCUT);
+ ShortcutService.writeAttr(out, ATTR_ID, si.getId());
// writeAttr(out, "package", si.getPackageName()); // not needed
- ShortcutService.writeAttr(out, ShortcutService.ATTR_ACTIVITY, si.getActivityComponent());
+ ShortcutService.writeAttr(out, ATTR_ACTIVITY, si.getActivityComponent());
// writeAttr(out, "icon", si.getIcon()); // We don't save it.
- ShortcutService.writeAttr(out, ShortcutService.ATTR_TITLE, si.getTitle());
- ShortcutService.writeAttr(out, ShortcutService.ATTR_INTENT, si.getIntentNoExtras());
- ShortcutService.writeAttr(out, ShortcutService.ATTR_WEIGHT, si.getWeight());
- ShortcutService.writeAttr(out, ShortcutService.ATTR_TIMESTAMP,
+ ShortcutService.writeAttr(out, ATTR_TITLE, si.getTitle());
+ ShortcutService.writeAttr(out, ATTR_INTENT, si.getIntentNoExtras());
+ ShortcutService.writeAttr(out, ATTR_WEIGHT, si.getWeight());
+ ShortcutService.writeAttr(out, ATTR_TIMESTAMP,
si.getLastChangedTimestamp());
- ShortcutService.writeAttr(out, ShortcutService.ATTR_FLAGS, si.getFlags());
- ShortcutService.writeAttr(out, ShortcutService.ATTR_ICON_RES, si.getIconResourceId());
- ShortcutService.writeAttr(out, ShortcutService.ATTR_BITMAP_PATH, si.getBitmapPath());
+ ShortcutService.writeAttr(out, ATTR_FLAGS, si.getFlags());
+ ShortcutService.writeAttr(out, ATTR_ICON_RES, si.getIconResourceId());
+ ShortcutService.writeAttr(out, ATTR_BITMAP_PATH, si.getBitmapPath());
- ShortcutService.writeTagExtra(out, ShortcutService.TAG_INTENT_EXTRAS,
+ ShortcutService.writeTagExtra(out, TAG_INTENT_EXTRAS,
si.getIntentPersistableExtras());
- ShortcutService.writeTagExtra(out, ShortcutService.TAG_EXTRAS, si.getExtras());
+ ShortcutService.writeTagExtra(out, TAG_EXTRAS, si.getExtras());
- out.endTag(null, ShortcutService.TAG_SHORTCUT);
+ out.endTag(null, TAG_SHORTCUT);
}
public static PackageShortcuts loadFromXml(XmlPullParser parser, int userId)
throws IOException, XmlPullParserException {
final String packageName = ShortcutService.parseStringAttribute(parser,
- ShortcutService.ATTR_NAME);
+ ATTR_NAME);
final PackageShortcuts ret = new PackageShortcuts(userId, packageName);
ret.mDynamicShortcutCount =
- ShortcutService.parseIntAttribute(parser, ShortcutService.ATTR_DYNAMIC_COUNT);
+ ShortcutService.parseIntAttribute(parser, ATTR_DYNAMIC_COUNT);
ret.mApiCallCount =
- ShortcutService.parseIntAttribute(parser, ShortcutService.ATTR_CALL_COUNT);
+ ShortcutService.parseIntAttribute(parser, ATTR_CALL_COUNT);
ret.mLastResetTime =
- ShortcutService.parseLongAttribute(parser, ShortcutService.ATTR_LAST_RESET);
+ ShortcutService.parseLongAttribute(parser, ATTR_LAST_RESET);
final int outerDepth = parser.getDepth();
int type;
@@ -2565,7 +2632,7 @@
final int depth = parser.getDepth();
final String tag = parser.getName();
switch (tag) {
- case ShortcutService.TAG_SHORTCUT:
+ case TAG_SHORTCUT:
final ShortcutInfo si = parseShortcut(parser, packageName);
// Don't use addShortcut(), we don't need to save the icon.
@@ -2592,17 +2659,17 @@
int iconRes;
String bitmapPath;
- id = ShortcutService.parseStringAttribute(parser, ShortcutService.ATTR_ID);
+ id = ShortcutService.parseStringAttribute(parser, ATTR_ID);
activityComponent = ShortcutService.parseComponentNameAttribute(parser,
- ShortcutService.ATTR_ACTIVITY);
- title = ShortcutService.parseStringAttribute(parser, ShortcutService.ATTR_TITLE);
- intent = ShortcutService.parseIntentAttribute(parser, ShortcutService.ATTR_INTENT);
- weight = (int) ShortcutService.parseLongAttribute(parser, ShortcutService.ATTR_WEIGHT);
+ ATTR_ACTIVITY);
+ title = ShortcutService.parseStringAttribute(parser, ATTR_TITLE);
+ intent = ShortcutService.parseIntentAttribute(parser, ATTR_INTENT);
+ weight = (int) ShortcutService.parseLongAttribute(parser, ATTR_WEIGHT);
lastChangedTimestamp = (int) ShortcutService.parseLongAttribute(parser,
- ShortcutService.ATTR_TIMESTAMP);
- flags = (int) ShortcutService.parseLongAttribute(parser, ShortcutService.ATTR_FLAGS);
- iconRes = (int) ShortcutService.parseLongAttribute(parser, ShortcutService.ATTR_ICON_RES);
- bitmapPath = ShortcutService.parseStringAttribute(parser, ShortcutService.ATTR_BITMAP_PATH);
+ ATTR_TIMESTAMP);
+ flags = (int) ShortcutService.parseLongAttribute(parser, ATTR_FLAGS);
+ iconRes = (int) ShortcutService.parseLongAttribute(parser, ATTR_ICON_RES);
+ bitmapPath = ShortcutService.parseStringAttribute(parser, ATTR_BITMAP_PATH);
final int outerDepth = parser.getDepth();
int type;
@@ -2618,10 +2685,10 @@
depth, type, tag));
}
switch (tag) {
- case ShortcutService.TAG_INTENT_EXTRAS:
+ case TAG_INTENT_EXTRAS:
intentPersistableExtras = PersistableBundle.restoreFromXml(parser);
continue;
- case ShortcutService.TAG_EXTRAS:
+ case TAG_EXTRAS:
extras = PersistableBundle.restoreFromXml(parser);
continue;
}
diff --git a/services/core/java/com/android/server/policy/ShortcutManager.java b/services/core/java/com/android/server/policy/ShortcutManager.java
index 57ae523..a47f250 100644
--- a/services/core/java/com/android/server/policy/ShortcutManager.java
+++ b/services/core/java/com/android/server/policy/ShortcutManager.java
@@ -138,16 +138,18 @@
ComponentName componentName = new ComponentName(packageName, className);
try {
info = packageManager.getActivityInfo(componentName,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- | PackageManager.MATCH_UNINSTALLED_PACKAGES);
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_UNINSTALLED_PACKAGES);
} catch (PackageManager.NameNotFoundException e) {
String[] packages = packageManager.canonicalToCurrentPackageNames(
new String[] { packageName });
componentName = new ComponentName(packages[0], className);
try {
info = packageManager.getActivityInfo(componentName,
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE
- | PackageManager.MATCH_UNINSTALLED_PACKAGES);
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_UNINSTALLED_PACKAGES);
} catch (PackageManager.NameNotFoundException e1) {
Log.w(TAG, "Unable to add bookmark: " + packageName
+ "/" + className, e);
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 6ddc6c8..5302253 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -21,6 +21,9 @@
import static android.app.admin.DevicePolicyManager.WIPE_EXTERNAL_STORAGE;
import static android.app.admin.DevicePolicyManager.WIPE_RESET_PROTECTION_DATA;
import static android.content.pm.PackageManager.GET_UNINSTALLED_PACKAGES;
+import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
+import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
+
import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_DPM_LOCK_NOW;
import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
import static org.xmlpull.v1.XmlPullParser.END_TAG;
@@ -1272,10 +1275,10 @@
final String adminPackage = aa.info.getPackageName();
if (packageName == null || packageName.equals(adminPackage)) {
if (mIPackageManager.getPackageInfo(adminPackage, 0, userHandle) == null
- || mIPackageManager.getReceiverInfo(
- aa.info.getComponent(),
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE,
- userHandle) == null) {
+ || mIPackageManager.getReceiverInfo(aa.info.getComponent(),
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ userHandle) == null) {
removed = true;
policy.mAdminList.remove(i);
policy.mAdminMap.remove(aa.info.getComponent());
@@ -2096,8 +2099,9 @@
try {
ai = mIPackageManager.getReceiverInfo(adminName,
PackageManager.GET_META_DATA |
- PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS |
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE, userHandle);
+ PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS |
+ PackageManager.MATCH_DIRECT_BOOT_AWARE |
+ PackageManager.MATCH_DIRECT_BOOT_UNAWARE, userHandle);
} catch (RemoteException e) {
// shouldn't happen.
}
@@ -7193,11 +7197,13 @@
try {
int parentUserId = getProfileParentId(userId);
- List<ResolveInfo> activitiesToEnable = mIPackageManager.queryIntentActivities(
- intent,
- intent.resolveTypeIfNeeded(mContext.getContentResolver()),
- PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE,
- parentUserId).getList();
+ List<ResolveInfo> activitiesToEnable = mIPackageManager
+ .queryIntentActivities(intent,
+ intent.resolveTypeIfNeeded(mContext.getContentResolver()),
+ PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
+ parentUserId)
+ .getList();
if (VERBOSE_LOG) {
Slog.d(LOG_TAG, "Enabling system activities: " + activitiesToEnable);
diff --git a/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java b/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java
new file mode 100644
index 0000000..e440a0d
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/am/TaskPersisterTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server.am;
+
+import android.content.pm.UserInfo;
+import android.os.Environment;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.test.AndroidTestCase;
+import android.util.Log;
+import android.util.SparseBooleanArray;
+
+import com.android.server.am.TaskPersister;
+
+import java.io.File;
+import java.util.Random;
+
+public class TaskPersisterTest extends AndroidTestCase {
+ private static final String TEST_USER_NAME = "AM-Test-User";
+
+ private TaskPersister mTaskPersister;
+ private int testUserId;
+ private UserManager mUserManager;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mUserManager = UserManager.get(getContext());
+ mTaskPersister = new TaskPersister(getContext().getFilesDir());
+ testUserId = createUser(TEST_USER_NAME, 0);
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ mTaskPersister.unloadUserDataFromMemory(testUserId);
+ removeUser(testUserId);
+ }
+
+ private int getRandomTaskIdForUser(int userId) {
+ int taskId = (int) (Math.random() * UserHandle.PER_USER_RANGE);
+ taskId += UserHandle.PER_USER_RANGE * userId;
+ return taskId;
+ }
+
+ public void testTaskIdsPersistence() {
+ SparseBooleanArray taskIdsOnFile = mTaskPersister.loadPersistedTaskIdsForUser(testUserId);
+ for (int i = 0; i < 100; i++) {
+ taskIdsOnFile.put(getRandomTaskIdForUser(testUserId), true);
+ }
+ mTaskPersister.maybeWritePersistedTaskIdsForUser(taskIdsOnFile, testUserId);
+ SparseBooleanArray newTaskIdsOnFile = mTaskPersister
+ .loadPersistedTaskIdsForUser(testUserId);
+ assertTrue("TaskIds written differ from TaskIds read back from file",
+ taskIdsOnFile.equals(newTaskIdsOnFile));
+ }
+
+ private int createUser(String name, int flags) {
+ UserInfo user = mUserManager.createUser(name, flags);
+ if (user == null) {
+ fail("Error while creating the test user: " + TEST_USER_NAME);
+ }
+ return user.id;
+ }
+
+ private void removeUser(int userId) {
+ if (!mUserManager.removeUser(userId)) {
+ fail("Error while removing the test user: " + TEST_USER_NAME);
+ }
+ }
+}
\ No newline at end of file
diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java
index 5c51139..ad86fd0 100644
--- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java
@@ -166,8 +166,8 @@
private final class ShortcutServiceTestable extends ShortcutService {
final ServiceContext mContext;
- public ShortcutServiceTestable(ServiceContext context) {
- super(context);
+ public ShortcutServiceTestable(ServiceContext context, Looper looper) {
+ super(context, looper);
mContext = context;
}
@@ -248,7 +248,12 @@
@Override
void postToHandler(Runnable r) {
final long token = mContext.injectClearCallingIdentity();
- r.run();
+ super.postToHandler(r);
+ try {
+ runTestOnUiThread(() -> {});
+ } catch (Throwable e) {
+ fail("runTestOnUiThread failed: " + e);
+ }
mContext.injectRestoreCallingIdentity(token);
}
@@ -302,7 +307,7 @@
}
@Override
- void postToPackageMonitor(Runnable r) {
+ void postToPackageMonitorHandler(Runnable r) {
final long token = mContext.injectClearCallingIdentity();
r.run();
mContext.injectRestoreCallingIdentity(token);
@@ -368,7 +373,7 @@
private static final int USER_10 = 10;
private static final int USER_11 = 11;
- private static final long START_TIME = 1234560000000L;
+ private static final long START_TIME = 1440000000101L;
private static final long INTERVAL = 10000;
@@ -424,7 +429,7 @@
LocalServices.removeServiceForTest(ShortcutServiceInternal.class);
// Instantiate targets.
- mService = new ShortcutServiceTestable(mServiceContext);
+ mService = new ShortcutServiceTestable(mServiceContext, Looper.getMainLooper());
mManager = new ShortcutManagerTestable(mClientContext, mService);
mInternal = LocalServices.getService(ShortcutServiceInternal.class);
@@ -509,6 +514,7 @@
* For debugging, dump the main state file on logcat.
*/
private void dumpBaseStateFile() {
+ mService.saveDirtyInfo();
dumpFileOnLogcat(mInjectedFilePathRoot.getAbsolutePath()
+ "/system/" + ShortcutService.FILENAME_BASE_STATE);
}
@@ -517,6 +523,7 @@
* For debugging, dump per-user state file on logcat.
*/
private void dumpUserFile(int userId) {
+ mService.saveDirtyInfo();
dumpFileOnLogcat(mInjectedFilePathRoot.getAbsolutePath()
+ "/user-" + userId
+ "/" + ShortcutService.FILENAME_USER_PACKAGES);
@@ -890,6 +897,8 @@
dumpBaseStateFile();
+ mService.saveDirtyInfo();
+
// Restore.
initService();
@@ -1125,51 +1134,102 @@
assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
assertEquals(2, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL, mManager.getRateLimitResetTime());
mInjectedCurrentTimeLillis++;
assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
assertEquals(1, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL, mManager.getRateLimitResetTime());
mInjectedCurrentTimeLillis++;
assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
assertEquals(0, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL, mManager.getRateLimitResetTime());
// Reached the max
mInjectedCurrentTimeLillis++;
assertFalse(mManager.setDynamicShortcuts(Arrays.asList(si1)));
assertEquals(0, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL, mManager.getRateLimitResetTime());
// Still throttled
mInjectedCurrentTimeLillis = START_TIME + INTERVAL - 1;
assertFalse(mManager.setDynamicShortcuts(Arrays.asList(si1)));
assertEquals(0, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL, mManager.getRateLimitResetTime());
// Now it should work.
mInjectedCurrentTimeLillis++;
assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1))); // fail
assertEquals(2, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL * 2, mManager.getRateLimitResetTime());
mInjectedCurrentTimeLillis++;
assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
assertEquals(1, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL * 2, mManager.getRateLimitResetTime());
mInjectedCurrentTimeLillis++;
assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
assertEquals(0, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL * 2, mManager.getRateLimitResetTime());
mInjectedCurrentTimeLillis++;
assertFalse(mManager.setDynamicShortcuts(Arrays.asList(si1)));
assertEquals(0, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL * 2, mManager.getRateLimitResetTime());
// 4 days later...
mInjectedCurrentTimeLillis = START_TIME + 4 * INTERVAL;
assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
assertEquals(2, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL * 5, mManager.getRateLimitResetTime());
- // Make sure getRemainingCallCount() itself gets reset withou calling setDynamicShortcuts().
+ mInjectedCurrentTimeLillis++;
+ assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
+ assertEquals(1, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL * 5, mManager.getRateLimitResetTime());
+
+ // Make sure getRemainingCallCount() itself gets reset without calling setDynamicShortcuts().
mInjectedCurrentTimeLillis = START_TIME + 8 * INTERVAL;
assertEquals(3, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL * 9, mManager.getRateLimitResetTime());
+
+ mInjectedCurrentTimeLillis++;
+ assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
+ assertEquals(2, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL * 9, mManager.getRateLimitResetTime());
+ }
+
+ public void testThrottling_rewind() {
+ final ShortcutInfo si1 = makeShortcut("shortcut1");
+
+ assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
+ assertEquals(2, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL, mManager.getRateLimitResetTime());
+
+ mInjectedCurrentTimeLillis = 12345; // Clock reset!
+
+ // Since the clock looks invalid, the counter shouldn't have reset.
+ assertEquals(2, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL, mManager.getRateLimitResetTime());
+
+ // Forward again. Still haven't reset yet.
+ mInjectedCurrentTimeLillis = START_TIME + INTERVAL - 1;
+ assertEquals(2, mManager.getRemainingCallCount());
+ assertEquals(START_TIME + INTERVAL, mManager.getRateLimitResetTime());
+
+ // Now rewind -- this will reset the counters.
+ mInjectedCurrentTimeLillis = START_TIME - 100000;
+ assertEquals(3, mManager.getRemainingCallCount());
+
+ assertTrue(mManager.setDynamicShortcuts(Arrays.asList(si1)));
+ assertEquals(2, mManager.getRemainingCallCount());
+
+ // Forward again, should be reset now.
+ mInjectedCurrentTimeLillis += INTERVAL;
+ assertEquals(3, mManager.getRemainingCallCount());
}
public void testThrottling_perPackage() {
@@ -1291,6 +1351,7 @@
"none");
// Re-initialize and load from the files.
+ mService.saveDirtyInfo();
initService();
// Load from launcher.
@@ -1943,6 +2004,7 @@
});
// Re-initialize and load from the files.
+ mService.saveDirtyInfo();
initService();
runWithCaller(LAUNCHER_1, USER_0, () -> {
@@ -2270,6 +2332,7 @@
dumpUserFile(0);
// Restore.
+ mService.saveDirtyInfo();
initService();
assertEquals(0, mManager.getDynamicShortcuts().size());
@@ -2366,6 +2429,7 @@
mService, new ComponentName("pkg1", "class"));
// Restore.
+ mService.saveDirtyInfo();
initService();
// Before the load, the map should be empty.
@@ -2414,7 +2478,7 @@
assertNull(mService.getShortcutsForTest().get(USER_10).getLauncherComponent());
// Try stopping the user
- mService.onCleanupUserInner(USER_10);
+ mService.onCleanupUserLocked(USER_10);
// Now it's unloaded.
assertEquals(1, mService.getShortcutsForTest().size());
diff --git a/telecomm/java/android/telecom/Log.java b/telecomm/java/android/telecom/Log.java
index 2ab0525..a965342 100644
--- a/telecomm/java/android/telecom/Log.java
+++ b/telecomm/java/android/telecom/Log.java
@@ -44,6 +44,7 @@
public static final boolean ERROR = isLoggable(android.util.Log.ERROR);
private static MessageDigest sMessageDigest;
+ private static final Object sMessageDigestLock = new Object();
private Log() {}
@@ -57,7 +58,9 @@
} catch (NoSuchAlgorithmException e) {
md = null;
}
- sMessageDigest = md;
+ synchronized (sMessageDigestLock) {
+ sMessageDigest = md;
+ }
return null;
}
}.execute();
@@ -187,13 +190,15 @@
}
private static String secureHash(byte[] input) {
- if (sMessageDigest != null) {
- sMessageDigest.reset();
- sMessageDigest.update(input);
- byte[] result = sMessageDigest.digest();
- return encodeHex(result);
- } else {
- return "Uninitialized SHA1";
+ synchronized (sMessageDigestLock) {
+ if (sMessageDigest != null) {
+ sMessageDigest.reset();
+ sMessageDigest.update(input);
+ byte[] result = sMessageDigest.digest();
+ return encodeHex(result);
+ } else {
+ return "Uninitialized SHA1";
+ }
}
}
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
index 84cffe1..b739ead 100644
--- a/test-runner/src/android/test/mock/MockContext.java
+++ b/test-runner/src/android/test/mock/MockContext.java
@@ -151,7 +151,7 @@
}
@Override
- public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {
+ public boolean moveSharedPreferencesFrom(Context sourceContext, String name) {
throw new UnsupportedOperationException();
}
@@ -258,7 +258,7 @@
}
@Override
- public boolean migrateDatabaseFrom(Context sourceContext, String name) {
+ public boolean moveDatabaseFrom(Context sourceContext, String name) {
throw new UnsupportedOperationException();
}
@@ -726,26 +726,26 @@
}
@Override
- public Context createDeviceEncryptedStorageContext() {
+ public Context createDeviceProtectedStorageContext() {
throw new UnsupportedOperationException();
}
/** {@hide} */
@SystemApi
@Override
- public Context createCredentialEncryptedStorageContext() {
+ public Context createCredentialProtectedStorageContext() {
throw new UnsupportedOperationException();
}
@Override
- public boolean isDeviceEncryptedStorage() {
+ public boolean isDeviceProtectedStorage() {
throw new UnsupportedOperationException();
}
/** {@hide} */
@SystemApi
@Override
- public boolean isCredentialEncryptedStorage() {
+ public boolean isCredentialProtectedStorage() {
throw new UnsupportedOperationException();
}
}
diff --git a/tools/fonts/fontchain_lint.py b/tools/fonts/fontchain_lint.py
index fb172d4..c16de7b 100755
--- a/tools/fonts/fontchain_lint.py
+++ b/tools/fonts/fontchain_lint.py
@@ -164,6 +164,7 @@
def check_emoji_defaults():
default_emoji_chars = _emoji_properties['Emoji_Presentation']
+ missing_text_chars = _emoji_properties['Emoji'] - default_emoji_chars
emoji_font_seen = False
for name, scripts, variant, weight, style, font in _fallback_chain:
if 'Zsye' in scripts:
@@ -176,32 +177,39 @@
if emoji_font_seen and not scripts:
continue
- if font[1] is None:
- emoji_to_skip = set()
- else:
- # CJK font, skip checking the following characters for now.
- # See b/26153752
- emoji_to_skip = ({
- 0x26BD, # SOCCER BALL
- 0x26BE, # BASEBALL
- 0x1F18E, # NEGATIVE SQUARED AB
- 0x1F201, # SQUARED KATAKANA KOKO
- 0x1F21A, # SQUARED CJK UNIFIED IDEOGRAPH-7121
- 0x1F22F, # SQUARED CJK UNIFIED IDEOGRAPH-6307
- } | set(xrange(0x1F191, 0x1F19A+1))
- | set(xrange(0x1F232, 0x1F236+1))
- | set(xrange(0x1F238, 0x1F23A+1))
- | set(xrange(0x1F250, 0x1F251+1)))
+ # Check default emoji-style characters
+ assert_font_supports_none_of_chars(font, sorted(default_emoji_chars))
- assert_font_supports_none_of_chars(font,
- sorted(default_emoji_chars - emoji_to_skip))
+ # Mark default text-style characters appearing in fonts above the emoji
+ # font as seen
+ if not emoji_font_seen:
+ missing_text_chars -= set(get_best_cmap(font))
+
+ # Noto does not have monochrome symbols for Unicode 7.0 wingdings and
+ # webdings
+ missing_text_chars -= _chars_by_age['7.0']
+ # TODO: Remove these after b/26113320 is fixed
+ missing_text_chars -= {
+ 0x263A, # WHITE SMILING FACE
+ 0x270C, # VICTORY HAND
+ 0x2744, # SNOWFLAKE
+ 0x2764, # HEAVY BLACK HEART
+ }
+ assert missing_text_chars == set(), (
+ 'Text style version of some emoji characters are missing.')
-def parse_ucd(ucd_path):
- global _emoji_properties
- _emoji_properties = collections.defaultdict(set)
- with open(path.join(ucd_path, 'emoji-data.txt')) as emoji_data_txt:
- for line in emoji_data_txt:
+# Setting reverse to true returns a dictionary that maps the values to sets of
+# characters, useful for some binary properties. Otherwise, we get a
+# dictionary that maps characters to the property values, assuming there's only
+# one property in the file.
+def parse_unicode_datafile(file_path, reverse=False):
+ if reverse:
+ output_dict = collections.defaultdict(set)
+ else:
+ output_dict = {}
+ with open(file_path) as datafile:
+ for line in datafile:
if '#' in line:
line = line[:line.index('#')]
line = line.strip()
@@ -216,7 +224,22 @@
char_start = char_end = char_range
char_start = int(char_start, 16)
char_end = int(char_end, 16)
- _emoji_properties[prop].update(xrange(char_start, char_end+1))
+ char_range = xrange(char_start, char_end+1)
+ if reverse:
+ output_dict[prop].update(char_range)
+ else:
+ for char in char_range:
+ assert char not in output_dict
+ output_dict[char] = prop
+ return output_dict
+
+
+def parse_ucd(ucd_path):
+ global _emoji_properties, _chars_by_age
+ _emoji_properties = parse_unicode_datafile(
+ path.join(ucd_path, 'emoji-data.txt'), reverse=True)
+ _chars_by_age = parse_unicode_datafile(
+ path.join(ucd_path, 'DerivedAge.txt'), reverse=True)
def main():
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
index c7ae6fc..b3f1ee1 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -1258,7 +1258,7 @@
}
@Override
- public boolean migrateDatabaseFrom(Context sourceContext, String name) {
+ public boolean moveDatabaseFrom(Context sourceContext, String name) {
// pass
return false;
}
@@ -1451,7 +1451,7 @@
}
@Override
- public boolean migrateSharedPreferencesFrom(Context sourceContext, String name) {
+ public boolean moveSharedPreferencesFrom(Context sourceContext, String name) {
// pass
return false;
}
@@ -1838,24 +1838,24 @@
}
@Override
- public Context createDeviceEncryptedStorageContext() {
+ public Context createDeviceProtectedStorageContext() {
// pass
return null;
}
@Override
- public Context createCredentialEncryptedStorageContext() {
+ public Context createCredentialProtectedStorageContext() {
// pass
return null;
}
@Override
- public boolean isDeviceEncryptedStorage() {
+ public boolean isDeviceProtectedStorage() {
return false;
}
@Override
- public boolean isCredentialEncryptedStorage() {
+ public boolean isCredentialProtectedStorage() {
return false;
}
}