diff options
305 files changed, 8831 insertions, 3348 deletions
diff --git a/Android.mk b/Android.mk index d4d2baa81c55..10d11f357eef 100644 --- a/Android.mk +++ b/Android.mk @@ -46,6 +46,7 @@ aidl_files := \ frameworks/base/telephony/java/android/telephony/NeighboringCellInfo.aidl \ frameworks/base/telephony/java/android/telephony/ModemActivityInfo.aidl \ frameworks/base/telephony/java/android/telephony/UiccAccessRule.aidl \ + frameworks/base/telephony/java/android/telephony/data/DataCallResponse.aidl \ frameworks/base/telephony/java/android/telephony/data/DataProfile.aidl \ frameworks/base/telephony/java/android/telephony/euicc/DownloadableSubscription.aidl \ frameworks/base/telephony/java/android/telephony/euicc/EuiccInfo.aidl \ @@ -655,6 +656,10 @@ checkbuild: doc-comment-check-docs # Check comment when you are updating the API update-api: doc-comment-check-docs +# Generate API diffs as part of docs builds +docs: offline-sdk-referenceonly-diff +docs: offline-system-sdk-referenceonly-diff + # ==== static html in the sdk ================================== include $(CLEAR_VARS) diff --git a/api/current.txt b/api/current.txt index 1b42cf6652d5..f56f1a16b966 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6323,6 +6323,7 @@ package android.app.admin { method public android.os.UserHandle createAndManageUser(android.content.ComponentName, java.lang.String, android.content.ComponentName, android.os.PersistableBundle, int); method public void enableSystemApp(android.content.ComponentName, java.lang.String); method public int enableSystemApp(android.content.ComponentName, android.content.Intent); + method public android.security.AttestedKeyPair generateKeyPair(android.content.ComponentName, java.lang.String, android.security.keystore.KeyGenParameterSpec); method public java.lang.String[] getAccountTypesWithManagementDisabled(); method public java.util.List<android.content.ComponentName> getActiveAdmins(); method public java.util.Set<java.lang.String> getAffiliationIds(android.content.ComponentName); @@ -9973,6 +9974,7 @@ package android.content { } public class QuickViewConstants { + field public static final java.lang.String FEATURE_DELETE = "android:delete"; field public static final java.lang.String FEATURE_DOWNLOAD = "android:download"; field public static final java.lang.String FEATURE_EDIT = "android:edit"; field public static final java.lang.String FEATURE_PRINT = "android:print"; @@ -37149,6 +37151,11 @@ package android.sax { package android.security { + public final class AttestedKeyPair { + method public java.util.List<java.security.cert.Certificate> getAttestationRecord(); + method public java.security.KeyPair getKeyPair(); + } + public final class KeyChain { ctor public KeyChain(); method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String); diff --git a/api/system-current.txt b/api/system-current.txt index 1d206c17ef28..33fa246a9f51 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4177,6 +4177,25 @@ package android.telephony { package android.telephony.data { + public final class DataCallResponse implements android.os.Parcelable { + ctor public DataCallResponse(int, int, int, int, java.lang.String, java.lang.String, java.util.List<android.telephony.data.InterfaceAddress>, java.util.List<java.net.InetAddress>, java.util.List<java.net.InetAddress>, java.util.List<java.lang.String>, int); + ctor public DataCallResponse(android.os.Parcel); + method public int describeContents(); + method public int getActive(); + method public java.util.List<android.telephony.data.InterfaceAddress> getAddresses(); + method public int getCallId(); + method public java.util.List<java.net.InetAddress> getDnses(); + method public java.util.List<java.net.InetAddress> getGateways(); + method public java.lang.String getIfname(); + method public int getMtu(); + method public java.util.List<java.lang.String> getPcscfs(); + method public int getStatus(); + method public int getSuggestedRetryTime(); + method public java.lang.String getType(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telephony.data.DataCallResponse> CREATOR; + } + public final class DataProfile implements android.os.Parcelable { ctor public DataProfile(int, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, int, int, int, int, boolean, int, java.lang.String, int, int, java.lang.String, java.lang.String, boolean); ctor public DataProfile(android.os.Parcel); @@ -4206,6 +4225,17 @@ package android.telephony.data { field public static final int TYPE_COMMON = 0; // 0x0 } + public final class InterfaceAddress implements android.os.Parcelable { + ctor public InterfaceAddress(java.net.InetAddress, int); + ctor public InterfaceAddress(java.lang.String, int) throws java.net.UnknownHostException; + ctor public InterfaceAddress(android.os.Parcel); + method public int describeContents(); + method public java.net.InetAddress getAddress(); + method public int getNetworkPrefixLength(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telephony.data.InterfaceAddress> CREATOR; + } + } package android.telephony.ims { diff --git a/api/test-current.txt b/api/test-current.txt index 52c1731d1d3c..3c3521feff95 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -425,7 +425,7 @@ package android.provider { public static final class Settings.Secure extends android.provider.Settings.NameValueTable { field public static final java.lang.String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED = "accessibility_display_magnification_enabled"; - field public static final java.lang.String AUTOFILL_FEATURE_FIELD_DETECTION = "autofill_field_detection"; + field public static final java.lang.String AUTOFILL_FEATURE_FIELD_CLASSIFICATION = "autofill_field_classification"; field public static final java.lang.String AUTOFILL_SERVICE = "autofill_service"; field public static final java.lang.String DISABLED_PRINT_SERVICES = "disabled_print_services"; field public static final deprecated java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages"; @@ -457,9 +457,17 @@ package android.service.autofill { method public void apply(android.service.autofill.ValueFinder, android.widget.RemoteViews, int) throws java.lang.Exception; } + public final class EditDistanceScorer extends android.service.autofill.InternalScorer implements android.os.Parcelable android.service.autofill.Scorer { + method public int describeContents(); + method public static android.service.autofill.EditDistanceScorer getInstance(); + method public float getScore(android.view.autofill.AutofillValue, java.lang.String); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.service.autofill.EditDistanceScorer> CREATOR; + } + public final class FieldClassification implements android.os.Parcelable { method public int describeContents(); - method public android.service.autofill.FieldClassification.Match getTopMatch(); + method public java.util.List<android.service.autofill.FieldClassification.Match> getMatches(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.service.autofill.FieldClassification> CREATOR; } @@ -467,15 +475,11 @@ package android.service.autofill { public static final class FieldClassification.Match implements android.os.Parcelable { method public int describeContents(); method public java.lang.String getRemoteId(); - method public int getScore(); + method public float getScore(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.service.autofill.FieldClassification.Match> CREATOR; } - public final class FieldsClassificationScorer { - method public static int getScore(android.view.autofill.AutofillValue, java.lang.String); - } - public static final class FillEventHistory.Event { method public java.util.Map<android.view.autofill.AutofillId, android.service.autofill.FieldClassification> getFieldsClassification(); } @@ -492,6 +496,11 @@ package android.service.autofill { ctor public InternalSanitizer(); } + public abstract class InternalScorer implements android.os.Parcelable android.service.autofill.Scorer { + ctor public InternalScorer(); + method public abstract float getScore(android.view.autofill.AutofillValue, java.lang.String); + } + public abstract class InternalTransformation implements android.os.Parcelable android.service.autofill.Transformation { ctor public InternalTransformation(); } @@ -509,6 +518,9 @@ package android.service.autofill { method public boolean isValid(android.service.autofill.ValueFinder); } + public abstract interface Scorer { + } + public final class TextValueSanitizer extends android.service.autofill.InternalSanitizer implements android.os.Parcelable android.service.autofill.Sanitizer { method public android.view.autofill.AutofillValue sanitize(android.view.autofill.AutofillValue); } @@ -524,7 +536,7 @@ package android.service.autofill { } public static final class UserData.Builder { - ctor public UserData.Builder(java.lang.String, java.lang.String); + ctor public UserData.Builder(android.service.autofill.Scorer, java.lang.String, java.lang.String); method public android.service.autofill.UserData.Builder add(java.lang.String, java.lang.String); method public android.service.autofill.UserData build(); } @@ -978,6 +990,7 @@ package android.view.autofill { public final class AutofillManager { method public android.service.autofill.UserData getUserData(); + method public boolean isFieldClassificationEnabled(); method public void setUserData(android.service.autofill.UserData); } diff --git a/cmds/statsd/Android.mk b/cmds/statsd/Android.mk index 87cde032ba79..337aeaaf37ab 100644 --- a/cmds/statsd/Android.mk +++ b/cmds/statsd/Android.mk @@ -161,6 +161,7 @@ LOCAL_SRC_FILES := \ tests/LogEntryMatcher_test.cpp \ tests/LogReader_test.cpp \ tests/MetricsManager_test.cpp \ + tests/StatsLogProcessor_test.cpp \ tests/UidMap_test.cpp \ tests/condition/CombinationConditionTracker_test.cpp \ tests/condition/SimpleConditionTracker_test.cpp \ diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp index c29164781e47..2df0c90e9baf 100644 --- a/cmds/statsd/src/StatsLogProcessor.cpp +++ b/cmds/statsd/src/StatsLogProcessor.cpp @@ -86,9 +86,7 @@ void StatsLogProcessor::OnLogEvent(const LogEvent& msg) { // pass the event to metrics managers. for (auto& pair : mMetricsManagers) { pair.second->onLogEvent(msg); - // TODO: THIS CHECK FAILS BECAUSE ONCE UIDMAP SIZE EXCEEDS LIMIT, DROPPING METRICS DATA - // DOESN'T HELP. FIX THIS. - // flushIfNecessary(msg.GetTimestampNs(), pair.first, pair.second); + flushIfNecessary(msg.GetTimestampNs(), pair.first, *(pair.second)); } // Hard-coded logic to update the isolated uid's in the uid-map. @@ -217,23 +215,32 @@ void StatsLogProcessor::OnConfigRemoved(const ConfigKey& key) { mLastBroadcastTimes.erase(key); } -void StatsLogProcessor::flushIfNecessary(uint64_t timestampNs, - const ConfigKey& key, - const unique_ptr<MetricsManager>& metricsManager) { +void StatsLogProcessor::flushIfNecessary(uint64_t timestampNs, const ConfigKey& key, + MetricsManager& metricsManager) { std::lock_guard<std::mutex> lock(mBroadcastTimesMutex); - size_t totalBytes = metricsManager->byteSize() + mUidMap->getBytesUsed(); - // TODO: Find a way to test that the dropping and broadcasts are sent when memory is exceeded. - if (totalBytes > kMaxSerializedBytes) { // Too late. We need to start clearing data. + auto lastCheckTime = mLastByteSizeTimes.find(key); + if (lastCheckTime != mLastByteSizeTimes.end()) { + if (timestampNs - lastCheckTime->second < StatsdStats::kMinByteSizeCheckPeriodNs) { + return; + } + } + + // We suspect that the byteSize() computation is expensive, so we set a rate limit. + size_t totalBytes = metricsManager.byteSize(); + mLastByteSizeTimes[key] = timestampNs; + if (totalBytes > + StatsdStats::kMaxMetricsBytesPerConfig) { // Too late. We need to start clearing data. // We ignore the return value so we force each metric producer to clear its contents. - metricsManager->onDumpReport(); + metricsManager.onDumpReport(); StatsdStats::getInstance().noteDataDropped(key); VLOG("StatsD had to toss out metrics for %s", key.ToString().c_str()); - } else if (totalBytes > - .9 * kMaxSerializedBytes) { // Send broadcast so that receivers can pull data. - auto lastFlushNs = mLastBroadcastTimes.find(key); - if (lastFlushNs != mLastBroadcastTimes.end()) { - if (timestampNs - lastFlushNs->second < kMinBroadcastPeriod) { + } else if (totalBytes > .9 * StatsdStats::kMaxMetricsBytesPerConfig) { + // Send broadcast so that receivers can pull data. + auto lastBroadcastTime = mLastBroadcastTimes.find(key); + if (lastBroadcastTime != mLastBroadcastTimes.end()) { + if (timestampNs - lastBroadcastTime->second < StatsdStats::kMinBroadcastPeriodNs) { + VLOG("StatsD would've sent a broadcast but the rate limit stopped us."); return; } } diff --git a/cmds/statsd/src/StatsLogProcessor.h b/cmds/statsd/src/StatsLogProcessor.h index e9ac01536b42..a4df23a16c0f 100644 --- a/cmds/statsd/src/StatsLogProcessor.h +++ b/cmds/statsd/src/StatsLogProcessor.h @@ -60,29 +60,25 @@ private: std::unordered_map<ConfigKey, long> mLastBroadcastTimes; + // Tracks when we last checked the bytes consumed for each config key. + std::unordered_map<ConfigKey, long> mLastByteSizeTimes; + sp<UidMap> mUidMap; // Reference to the UidMap to lookup app name and version for each uid. sp<AnomalyMonitor> mAnomalyMonitor; - /* Max *serialized* size of the logs kept in memory before flushing through binder call. - Proto lite does not implement the SpaceUsed() function which gives the in memory byte size. - So we cap memory usage by limiting the serialized size. Note that protobuf's in memory size - is higher than its serialized size. - */ - static const size_t kMaxSerializedBytes = 16 * 1024; - /* Check if we should send a broadcast if approaching memory limits and if we're over, we * actually delete the data. */ - void flushIfNecessary(uint64_t timestampNs, - const ConfigKey& key, - const unique_ptr<MetricsManager>& metricsManager); + void flushIfNecessary(uint64_t timestampNs, const ConfigKey& key, + MetricsManager& metricsManager); // Function used to send a broadcast so that receiver for the config key can call getData // to retrieve the stored data. std::function<void(const ConfigKey& key)> mSendBroadcast; - /* Minimum period between two broadcasts in nanoseconds. Currently set to 60 seconds. */ - static const unsigned long long kMinBroadcastPeriod = 60 * NS_PER_SEC; + FRIEND_TEST(StatsLogProcessorTest, TestRateLimitByteSize); + FRIEND_TEST(StatsLogProcessorTest, TestRateLimitBroadcast); + FRIEND_TEST(StatsLogProcessorTest, TestDropWhenByteSizeTooLarge); }; } // namespace statsd diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index fa7fe0c0bae7..dc12efb2666e 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -72,7 +72,7 @@ void CompanionDeathRecipient::binderDied(const wp<IBinder>& who) { // ====================================================================== StatsService::StatsService(const sp<Looper>& handlerLooper) - : mAnomalyMonitor(new AnomalyMonitor(2)) // TODO: Put this comment somewhere better + : mAnomalyMonitor(new AnomalyMonitor(MIN_DIFF_TO_UPDATE_REGISTERED_ALARM_SECS)) { mUidMap = new UidMap(); mConfigManager = new ConfigManager(); diff --git a/cmds/statsd/src/StatsService.h b/cmds/statsd/src/StatsService.h index bdae1ef62ff0..e434f65872a6 100644 --- a/cmds/statsd/src/StatsService.h +++ b/cmds/statsd/src/StatsService.h @@ -46,6 +46,10 @@ public: StatsService(const sp<Looper>& handlerLooper); virtual ~StatsService(); + /** The anomaly alarm registered with AlarmManager won't be updated by less than this. */ + // TODO: Consider making this configurable. And choose a good number. + const uint32_t MIN_DIFF_TO_UPDATE_REGISTERED_ALARM_SECS = 5; + virtual status_t onTransact(uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags); virtual status_t dump(int fd, const Vector<String16>& args); virtual status_t command(FILE* in, FILE* out, FILE* err, Vector<String8>& args); diff --git a/cmds/statsd/src/anomaly/AnomalyMonitor.cpp b/cmds/statsd/src/anomaly/AnomalyMonitor.cpp index 2b2bcfc18fbf..4912648b648d 100644 --- a/cmds/statsd/src/anomaly/AnomalyMonitor.cpp +++ b/cmds/statsd/src/anomaly/AnomalyMonitor.cpp @@ -18,6 +18,7 @@ #include "Log.h" #include "anomaly/AnomalyMonitor.h" +#include "guardrail/StatsdStats.h" namespace android { namespace os { @@ -76,10 +77,7 @@ void AnomalyMonitor::remove(sp<const AnomalyAlarm> alarm) { if (!wasPresent) return; if (mPq.empty()) { if (DEBUG) ALOGD("Queue is empty. Cancel any alarm."); - mRegisteredAlarmTimeSec = 0; - if (mStatsCompanionService != nullptr) { - mStatsCompanionService->cancelAnomalyAlarm(); - } + cancelRegisteredAlarmTime_l(); return; } uint32_t soonestAlarmTimeSec = mPq.top()->timestampSec; @@ -106,10 +104,7 @@ unordered_set<sp<const AnomalyAlarm>, SpHash<AnomalyAlarm>> AnomalyMonitor::popS if (!oldAlarms.empty()) { if (mPq.empty()) { if (DEBUG) ALOGD("Queue is empty. Cancel any alarm."); - mRegisteredAlarmTimeSec = 0; - if (mStatsCompanionService != nullptr) { - mStatsCompanionService->cancelAnomalyAlarm(); - } + cancelRegisteredAlarmTime_l(); } else { // Always update the registered alarm in this case (unlike remove()). updateRegisteredAlarmTime_l(mPq.top()->timestampSec); @@ -123,6 +118,16 @@ void AnomalyMonitor::updateRegisteredAlarmTime_l(uint32_t timestampSec) { mRegisteredAlarmTimeSec = timestampSec; if (mStatsCompanionService != nullptr) { mStatsCompanionService->setAnomalyAlarm(secToMs(mRegisteredAlarmTimeSec)); + StatsdStats::getInstance().noteRegisteredAnomalyAlarmChanged(); + } +} + +void AnomalyMonitor::cancelRegisteredAlarmTime_l() { + if (DEBUG) ALOGD("Cancelling reg alarm."); + mRegisteredAlarmTimeSec = 0; + if (mStatsCompanionService != nullptr) { + mStatsCompanionService->cancelAnomalyAlarm(); + StatsdStats::getInstance().noteRegisteredAnomalyAlarmChanged(); } } diff --git a/cmds/statsd/src/anomaly/AnomalyMonitor.h b/cmds/statsd/src/anomaly/AnomalyMonitor.h index e19c46929a19..7acc7904bb57 100644 --- a/cmds/statsd/src/anomaly/AnomalyMonitor.h +++ b/cmds/statsd/src/anomaly/AnomalyMonitor.h @@ -138,6 +138,12 @@ private: */ void updateRegisteredAlarmTime_l(uint32_t timestampSec); + /** + * Cancels the alarm registered with StatsCompanionService. + * Also correspondingly sets mRegisteredAlarmTimeSec to 0. + */ + void cancelRegisteredAlarmTime_l(); + /** Converts uint32 timestamp in seconds to a Java long in msec. */ int64_t secToMs(uint32_t timeSec); }; diff --git a/cmds/statsd/src/anomaly/AnomalyTracker.cpp b/cmds/statsd/src/anomaly/AnomalyTracker.cpp index 7bacb441ee48..e8b408328181 100644 --- a/cmds/statsd/src/anomaly/AnomalyTracker.cpp +++ b/cmds/statsd/src/anomaly/AnomalyTracker.cpp @@ -18,6 +18,7 @@ #include "Log.h" #include "AnomalyTracker.h" +#include "guardrail/StatsdStats.h" #include <android/os/IIncidentManager.h> #include <android/os/IncidentReportArgs.h> @@ -31,8 +32,9 @@ namespace statsd { // TODO: Separate DurationAnomalyTracker as a separate subclass and let each MetricProducer // decide and let which one it wants. // TODO: Get rid of bucketNumbers, and return to the original circular array method. -AnomalyTracker::AnomalyTracker(const Alert& alert) +AnomalyTracker::AnomalyTracker(const Alert& alert, const ConfigKey& configKey) : mAlert(alert), + mConfigKey(configKey), mNumOfPastBuckets(mAlert.number_of_buckets() - 1) { VLOG("AnomalyTracker() called"); if (mAlert.number_of_buckets() <= 0) { @@ -220,6 +222,8 @@ void AnomalyTracker::declareAnomaly(const uint64_t& timestampNs) { } else { ALOGW("An anomaly has occurred! (But informing incidentd not requested.)"); } + + StatsdStats::getInstance().noteAnomalyDeclared(mConfigKey, mAlert.name()); } void AnomalyTracker::declareAnomalyIfAlarmExpired(const HashableDimensionKey& dimensionKey, diff --git a/cmds/statsd/src/anomaly/AnomalyTracker.h b/cmds/statsd/src/anomaly/AnomalyTracker.h index 49e83235f73b..874add2ba798 100644 --- a/cmds/statsd/src/anomaly/AnomalyTracker.h +++ b/cmds/statsd/src/anomaly/AnomalyTracker.h @@ -18,6 +18,7 @@ #include <gtest/gtest_prod.h> #include "AnomalyMonitor.h" +#include "config/ConfigKey.h" #include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" // Alert #include "stats_util.h" // HashableDimensionKey and DimToValMap @@ -35,7 +36,7 @@ using std::shared_ptr; // Does NOT allow negative values. class AnomalyTracker : public virtual RefBase { public: - AnomalyTracker(const Alert& alert); + AnomalyTracker(const Alert& alert, const ConfigKey& configKey); virtual ~AnomalyTracker(); @@ -107,9 +108,13 @@ public: protected: void flushPastBuckets(const int64_t& currBucketNum); + // statsd_config.proto Alert message that defines this tracker. const Alert mAlert; + // A reference to the Alert's config key. + const ConfigKey& mConfigKey; + // Number of past buckets. One less than the total number of buckets needed // for the anomaly detection (since the current bucket is not in the past). int mNumOfPastBuckets; diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 968d08f90992..c81fc1dec7ab 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -103,7 +103,11 @@ message Atom { * resulted in a particular bit of work being done. */ message WorkSource { - // TODO + // The uid for a given element in the attribution chain. + repeated int32 uid = 1; + // The (optional) string tag for an element in the attribution chain. If the + // element has no tag, it is encoded as an empty string. + repeated string tag = 2; } /* @@ -413,8 +417,10 @@ message WakelockStateChanged { optional string tag = 3; enum State { - OFF = 0; - ON = 1; + RELEASE = 0; + ACQUIRE = 1; + CHANGE_RELEASE = 2; + CHANGE_ACQUIRE = 3; } optional State state = 4; } @@ -1066,4 +1072,4 @@ message ModemActivityInfoPulled { optional uint64 controller_rx_time_ms = 9; // product of current(mA), voltage(V) and time(ms) optional uint64 energy_used = 10; -} +}
\ No newline at end of file diff --git a/cmds/statsd/src/atoms_copy.proto b/cmds/statsd/src/atoms_copy.proto index 58e225a317f0..18b21449ebc6 100644 --- a/cmds/statsd/src/atoms_copy.proto +++ b/cmds/statsd/src/atoms_copy.proto @@ -99,7 +99,11 @@ message Atom { * resulted in a particular bit of work being done. */ message WorkSource { - // TODO + // The uid for a given element in the attribution chain. + repeated int32 uid = 1; + // The (optional) string tag for an element in the attribution chain. If the + // element has no tag, it is encoded as an empty string. + repeated string tag = 2; } /* @@ -404,8 +408,10 @@ message WakelockStateChanged { optional string tag = 3; enum State { - OFF = 0; - ON = 1; + RELEASE = 0; + ACQUIRE = 1; + CHANGE_RELEASE = 2; + CHANGE_ACQUIRE = 3; } optional State state = 4; } @@ -907,4 +913,4 @@ message CpuTimePerUidFreqPulled { optional uint64 uid = 1; optional uint64 freq_idx = 2; optional uint64 time_ms = 3; -} +}
\ No newline at end of file diff --git a/cmds/statsd/src/condition/ConditionWizard.h b/cmds/statsd/src/condition/ConditionWizard.h index 1a01afa7fbdc..30a368412c8e 100644 --- a/cmds/statsd/src/condition/ConditionWizard.h +++ b/cmds/statsd/src/condition/ConditionWizard.h @@ -24,7 +24,7 @@ namespace android { namespace os { namespace statsd { -// Held by MetricProducer, to query a condition state with input defined in EventConditionLink. +// Held by MetricProducer, to query a condition state with input defined in MetricConditionLink. class ConditionWizard : public virtual android::RefBase { public: ConditionWizard(){}; // for testing diff --git a/cmds/statsd/src/condition/condition_util.cpp b/cmds/statsd/src/condition/condition_util.cpp index 669a4b77f3b4..ff0e3bc0d21a 100644 --- a/cmds/statsd/src/condition/condition_util.cpp +++ b/cmds/statsd/src/condition/condition_util.cpp @@ -94,17 +94,17 @@ ConditionState evaluateCombinationCondition(const std::vector<int>& children, } HashableDimensionKey getDimensionKeyForCondition(const LogEvent& event, - const EventConditionLink& link) { + const MetricConditionLink& link) { vector<KeyMatcher> eventKey; - eventKey.reserve(link.key_in_main().size()); + eventKey.reserve(link.key_in_what().size()); - for (const auto& key : link.key_in_main()) { + for (const auto& key : link.key_in_what()) { eventKey.push_back(key); } vector<KeyValuePair> dimensionKey = getDimensionKey(event, eventKey); - for (int i = 0; i < link.key_in_main_size(); i++) { + for (int i = 0; i < link.key_in_what_size(); i++) { auto& kv = dimensionKey[i]; kv.set_key(link.key_in_condition(i).key()); } diff --git a/cmds/statsd/src/condition/condition_util.h b/cmds/statsd/src/condition/condition_util.h index 4167bf922b19..934c2076ddfa 100644 --- a/cmds/statsd/src/condition/condition_util.h +++ b/cmds/statsd/src/condition/condition_util.h @@ -37,7 +37,7 @@ ConditionState evaluateCombinationCondition(const std::vector<int>& children, const std::vector<ConditionState>& conditionCache); HashableDimensionKey getDimensionKeyForCondition(const LogEvent& event, - const EventConditionLink& link); + const MetricConditionLink& link); } // namespace statsd } // namespace os } // namespace android diff --git a/cmds/statsd/src/config/ConfigManager.cpp b/cmds/statsd/src/config/ConfigManager.cpp index 4f636e8578ad..540199d59910 100644 --- a/cmds/statsd/src/config/ConfigManager.cpp +++ b/cmds/statsd/src/config/ConfigManager.cpp @@ -273,9 +273,9 @@ StatsdConfig build_fake_config() { keyMatcher = metric->add_dimension(); keyMatcher->set_key(WAKE_LOCK_UID_KEY_ID); metric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON"); - EventConditionLink* link = metric->add_links(); + MetricConditionLink* link = metric->add_links(); link->set_condition("APP_IS_BACKGROUND"); - link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID); + link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID); link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID); // Duration of an app holding any wl, while screen on and app in background, slice by uid @@ -289,7 +289,7 @@ StatsdConfig build_fake_config() { durationMetric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON"); link = durationMetric->add_links(); link->set_condition("APP_IS_BACKGROUND"); - link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID); + link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID); link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID); // max Duration of an app holding any wl, while screen on and app in background, slice by uid @@ -303,7 +303,7 @@ StatsdConfig build_fake_config() { durationMetric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON"); link = durationMetric->add_links(); link->set_condition("APP_IS_BACKGROUND"); - link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID); + link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID); link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID); // Duration of an app holding any wl, while screen on and app in background @@ -315,7 +315,7 @@ StatsdConfig build_fake_config() { durationMetric->set_condition("APP_IS_BACKGROUND_AND_SCREEN_ON"); link = durationMetric->add_links(); link->set_condition("APP_IS_BACKGROUND"); - link->add_key_in_main()->set_key(WAKE_LOCK_UID_KEY_ID); + link->add_key_in_what()->set_key(WAKE_LOCK_UID_KEY_ID); link->add_key_in_condition()->set_key(APP_USAGE_UID_KEY_ID); // Duration of screen on time. diff --git a/cmds/statsd/src/guardrail/StatsdStats.cpp b/cmds/statsd/src/guardrail/StatsdStats.cpp index 29574579b2a0..b02b9daa4b2d 100644 --- a/cmds/statsd/src/guardrail/StatsdStats.cpp +++ b/cmds/statsd/src/guardrail/StatsdStats.cpp @@ -41,11 +41,9 @@ using std::vector; const int FIELD_ID_BEGIN_TIME = 1; const int FIELD_ID_END_TIME = 2; const int FIELD_ID_CONFIG_STATS = 3; -const int FIELD_ID_MATCHER_STATS = 4; -const int FIELD_ID_CONDITION_STATS = 5; -const int FIELD_ID_METRIC_STATS = 6; const int FIELD_ID_ATOM_STATS = 7; const int FIELD_ID_UIDMAP_STATS = 8; +const int FIELD_ID_ANOMALY_ALARM_STATS = 9; const int FIELD_ID_MATCHER_STATS_NAME = 1; const int FIELD_ID_MATCHER_STATS_COUNT = 2; @@ -59,6 +57,8 @@ const int FIELD_ID_METRIC_STATS_COUNT = 2; const int FIELD_ID_ATOM_STATS_TAG = 1; const int FIELD_ID_ATOM_STATS_COUNT = 2; +const int FIELD_ID_ANOMALY_ALARMS_REGISTERED = 1; + // TODO: add stats for pulled atoms. StatsdStats::StatsdStats() { mPushedAtomStats.resize(android::util::kMaxPushedAtomId + 1); @@ -101,11 +101,12 @@ void StatsdStats::noteConfigRemovedInternalLocked(const ConfigKey& key) { if (it != mConfigStats.end()) { int32_t nowTimeSec = time(nullptr); it->second.set_deletion_time_sec(nowTimeSec); - // Add condition stats, metrics stats, matcher stats - addSubStatsToConfig(key, it->second); + // Add condition stats, metrics stats, matcher stats, alert stats + addSubStatsToConfigLocked(key, it->second); // Remove them after they are added to the config stats. mMatcherStats.erase(key); mMetricsStats.erase(key); + mAlertStats.erase(key); mConditionStats.erase(key); mIceBox.push_back(it->second); mConfigStats.erase(it); @@ -219,6 +220,17 @@ void StatsdStats::noteMatcherMatched(const ConfigKey& key, const string& name) { matcherStats[name]++; } +void StatsdStats::noteAnomalyDeclared(const ConfigKey& key, const string& name) { + lock_guard<std::mutex> lock(mLock); + auto& alertStats = mAlertStats[key]; + alertStats[name]++; +} + +void StatsdStats::noteRegisteredAnomalyAlarmChanged() { + lock_guard<std::mutex> lock(mLock); + mAnomalyAlarmRegisteredStats++; +} + void StatsdStats::noteAtomLogged(int atomId, int32_t timeSec) { lock_guard<std::mutex> lock(mLock); @@ -246,6 +258,8 @@ void StatsdStats::resetInternalLocked() { mConditionStats.clear(); mMetricsStats.clear(); std::fill(mPushedAtomStats.begin(), mPushedAtomStats.end(), 0); + mAlertStats.clear(); + mAnomalyAlarmRegisteredStats = 0; mMatcherStats.clear(); for (auto& config : mConfigStats) { config.second.clear_broadcast_sent_time_sec(); @@ -254,10 +268,11 @@ void StatsdStats::resetInternalLocked() { config.second.clear_matcher_stats(); config.second.clear_condition_stats(); config.second.clear_metric_stats(); + config.second.clear_alert_stats(); } } -void StatsdStats::addSubStatsToConfig(const ConfigKey& key, +void StatsdStats::addSubStatsToConfigLocked(const ConfigKey& key, StatsdStatsReport_ConfigStats& configStats) { // Add matcher stats if (mMatcherStats.find(key) != mMatcherStats.end()) { @@ -289,6 +304,16 @@ void StatsdStats::addSubStatsToConfig(const ConfigKey& key, VLOG("metrics %s max output tuple size %d", stats.first.c_str(), stats.second); } } + // Add anomaly detection alert stats + if (mAlertStats.find(key) != mAlertStats.end()) { + const auto& alertStats = mAlertStats[key]; + for (const auto& stats : alertStats) { + auto output = configStats.add_alert_stats(); + output->set_name(stats.first); + output->set_declared_times(stats.second); + VLOG("alert %s declared %d times", stats.first.c_str(), stats.second); + } + } } void StatsdStats::dumpStats(std::vector<uint8_t>* output, bool reset) { @@ -358,7 +383,7 @@ void StatsdStats::dumpStats(std::vector<uint8_t>* output, bool reset) { } } - addSubStatsToConfig(pair.first, configStats); + addSubStatsToConfigLocked(pair.first, configStats); const int numBytes = configStats.ByteSize(); vector<char> buffer(numBytes); @@ -370,6 +395,7 @@ void StatsdStats::dumpStats(std::vector<uint8_t>* output, bool reset) { configStats.clear_matcher_stats(); configStats.clear_condition_stats(); configStats.clear_metric_stats(); + configStats.clear_alert_stats(); } VLOG("********Atom stats***********"); @@ -386,6 +412,15 @@ void StatsdStats::dumpStats(std::vector<uint8_t>* output, bool reset) { } } + if (mAnomalyAlarmRegisteredStats > 0) { + VLOG("********AnomalyAlarmStats stats***********"); + long long token = proto.start(FIELD_TYPE_MESSAGE | FIELD_ID_ANOMALY_ALARM_STATS); + proto.write(FIELD_TYPE_INT32 | FIELD_ID_ANOMALY_ALARMS_REGISTERED, + mAnomalyAlarmRegisteredStats); + proto.end(token); + VLOG("Anomaly alarm registrations: %d", mAnomalyAlarmRegisteredStats); + } + const int numBytes = mUidMapStats.ByteSize(); vector<char> buffer(numBytes); mUidMapStats.SerializeToArray(&buffer[0], numBytes); diff --git a/cmds/statsd/src/guardrail/StatsdStats.h b/cmds/statsd/src/guardrail/StatsdStats.h index d6f6566cbc33..4cf168eb40bf 100644 --- a/cmds/statsd/src/guardrail/StatsdStats.h +++ b/cmds/statsd/src/guardrail/StatsdStats.h @@ -19,6 +19,7 @@ #include "frameworks/base/cmds/statsd/src/stats_log.pb.h" #include <gtest/gtest_prod.h> +#include <log/log_time.h> #include <mutex> #include <string> #include <vector> @@ -45,10 +46,20 @@ public: const static int kMaxTimestampCount = 20; + // Max memory allowed for storing metrics per configuration. When this limit is approached, + // statsd will send a broadcast so that the client can fetch the data and clear this memory. + static const size_t kMaxMetricsBytesPerConfig = 128 * 1024; + // Cap the UID map's memory usage to this. This should be fairly high since the UID information // is critical for understanding the metrics. const static size_t kMaxBytesUsedUidMap = 50 * 1024; + /* Minimum period between two broadcasts in nanoseconds. */ + static const unsigned long long kMinBroadcastPeriodNs = 60 * NS_PER_SEC; + + /* Min period between two checks of byte size per config key in nanoseconds. */ + static const unsigned long long kMinByteSizeCheckPeriodNs = 10 * NS_PER_SEC; + /** * Report a new config has been received and report the static stats about the config. * @@ -112,11 +123,24 @@ public: void noteMatcherMatched(const ConfigKey& key, const std::string& name); /** + * Report that an anomaly detection alert has been declared. + * + * [key]: The config key that this alert belongs to. + * [name]: The name of the alert. + */ + void noteAnomalyDeclared(const ConfigKey& key, const std::string& name); + + /** * Report an atom event has been logged. */ void noteAtomLogged(int atomId, int32_t timeSec); /** + * Report that statsd modified the anomaly alarm registered with StatsCompanionService. + */ + void noteRegisteredAnomalyAlarmChanged(); + + /** * Records the number of snapshot and delta entries that are being dropped from the uid map. */ void noteUidMapDropped(int snapshots, int deltas); @@ -174,6 +198,14 @@ private: // This is a vector, not a map because it will be accessed A LOT -- for each stats log. std::vector<int> mPushedAtomStats; + // Stores the number of times statsd modified the anomaly alarm registered with + // StatsCompanionService. + int mAnomalyAlarmRegisteredStats = 0; + + // Stores the number of times an anomaly detection alert has been declared + // (per config, per alert name). + std::map<const ConfigKey, std::map<const std::string, int>> mAlertStats; + // Stores how many times a matcher have been matched. std::map<const ConfigKey, std::map<const std::string, int>> mMatcherStats; @@ -181,7 +213,8 @@ private: void resetInternalLocked(); - void addSubStatsToConfig(const ConfigKey& key, StatsdStatsReport_ConfigStats& configStats); + void addSubStatsToConfigLocked(const ConfigKey& key, + StatsdStatsReport_ConfigStats& configStats); void noteDataDropped(const ConfigKey& key, int32_t timeSec); @@ -195,6 +228,7 @@ private: FRIEND_TEST(StatsdStatsTest, TestSubStats); FRIEND_TEST(StatsdStatsTest, TestAtomLog); FRIEND_TEST(StatsdStatsTest, TestTimestampThreshold); + FRIEND_TEST(StatsdStatsTest, TestAnomalyMonitor); }; } // namespace statsd diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.cpp b/cmds/statsd/src/metrics/DurationMetricProducer.cpp index fd484c25dbaa..cedea301de27 100644 --- a/cmds/statsd/src/metrics/DurationMetricProducer.cpp +++ b/cmds/statsd/src/metrics/DurationMetricProducer.cpp @@ -111,7 +111,7 @@ sp<AnomalyTracker> DurationMetricProducer::createAnomalyTracker(const Alert &ale return nullptr; } // TODO: return a DurationAnomalyTracker (which should sublclass AnomalyTracker) - return new AnomalyTracker(alert); + return new AnomalyTracker(alert, mConfigKey); } void DurationMetricProducer::startNewProtoOutputStreamLocked(long long startTime) { diff --git a/cmds/statsd/src/metrics/MetricProducer.h b/cmds/statsd/src/metrics/MetricProducer.h index 819df7705a75..adeb3cdf258a 100644 --- a/cmds/statsd/src/metrics/MetricProducer.h +++ b/cmds/statsd/src/metrics/MetricProducer.h @@ -94,7 +94,7 @@ public: } virtual sp<AnomalyTracker> createAnomalyTracker(const Alert &alert) { - return new AnomalyTracker(alert); + return new AnomalyTracker(alert, mConfigKey); } void addAnomalyTracker(sp<AnomalyTracker> tracker) { @@ -137,7 +137,7 @@ protected: // that StatsLogReport wants. std::unordered_map<HashableDimensionKey, std::vector<KeyValuePair>> mDimensionKeyMap; - std::vector<EventConditionLink> mConditionLinks; + std::vector<MetricConditionLink> mConditionLinks; std::vector<sp<AnomalyTracker>> mAnomalyTrackers; @@ -149,7 +149,7 @@ protected: * [eventKey]: the extracted dimension key for the final output. if the metric doesn't have * dimensions, it will be DEFAULT_DIMENSION_KEY * [conditionKey]: the keys of conditions which should be used to query the condition for this - * target event (from EventConditionLink). This is passed to individual metrics + * target event (from MetricConditionLink). This is passed to individual metrics * because DurationMetric needs it to be cached. * [condition]: whether condition is met. If condition is sliced, this is the result coming from * query with ConditionWizard; If condition is not sliced, this is the diff --git a/cmds/statsd/src/metrics/MetricsManager.h b/cmds/statsd/src/metrics/MetricsManager.h index 4e6a0ce5439b..86c47333d7e6 100644 --- a/cmds/statsd/src/metrics/MetricsManager.h +++ b/cmds/statsd/src/metrics/MetricsManager.h @@ -36,7 +36,7 @@ class MetricsManager { public: MetricsManager(const ConfigKey& configKey, const StatsdConfig& config); - ~MetricsManager(); + virtual ~MetricsManager(); // Return whether the configuration is valid. bool isConfigValid() const; @@ -52,11 +52,11 @@ public: void setAnomalyMonitor(const sp<AnomalyMonitor>& anomalyMonitor); // Config source owner can call onDumpReport() to get all the metrics collected. - std::vector<std::unique_ptr<std::vector<uint8_t>>> onDumpReport(); + virtual std::vector<std::unique_ptr<std::vector<uint8_t>>> onDumpReport(); // Computes the total byte size of all metrics managed by a single config source. // Does not change the state. - size_t byteSize(); + virtual size_t byteSize(); private: const ConfigKey mConfigKey; diff --git a/cmds/statsd/src/metrics/metrics_manager_util.cpp b/cmds/statsd/src/metrics/metrics_manager_util.cpp index 1fc4d425a6bd..943becb6fb3c 100644 --- a/cmds/statsd/src/metrics/metrics_manager_util.cpp +++ b/cmds/statsd/src/metrics/metrics_manager_util.cpp @@ -64,7 +64,7 @@ bool handleMetricWithLogTrackers(const string what, const int metricIndex, bool handleMetricWithConditions( const string condition, const int metricIndex, const unordered_map<string, int>& conditionTrackerMap, - const ::google::protobuf::RepeatedPtrField<::android::os::statsd::EventConditionLink>& + const ::google::protobuf::RepeatedPtrField<::android::os::statsd::MetricConditionLink>& links, vector<sp<ConditionTracker>>& allConditionTrackers, int& conditionIndex, unordered_map<int, std::vector<int>>& conditionToMetricMap) { @@ -232,7 +232,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, } } else { if (metric.links_size() > 0) { - ALOGW("metrics has a EventConditionLink but doesn't have a condition"); + ALOGW("metrics has a MetricConditionLink but doesn't have a condition"); return false; } } @@ -303,7 +303,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, } } else { if (metric.links_size() > 0) { - ALOGW("metrics has a EventConditionLink but doesn't have a condition"); + ALOGW("metrics has a MetricConditionLink but doesn't have a condition"); return false; } } @@ -340,7 +340,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, } } else { if (metric.links_size() > 0) { - ALOGW("metrics has a EventConditionLink but doesn't have a condition"); + ALOGW("metrics has a MetricConditionLink but doesn't have a condition"); return false; } } @@ -390,7 +390,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, } } else { if (metric.links_size() > 0) { - ALOGW("metrics has a EventConditionLink but doesn't have a condition"); + ALOGW("metrics has a MetricConditionLink but doesn't have a condition"); return false; } } @@ -439,7 +439,7 @@ bool initMetrics(const ConfigKey& key, const StatsdConfig& config, } } else { if (metric.links_size() > 0) { - ALOGW("metrics has a EventConditionLink but doesn't have a condition"); + ALOGW("metrics has a MetricConditionLink but doesn't have a condition"); return false; } } diff --git a/cmds/statsd/src/metrics/metrics_manager_util.h b/cmds/statsd/src/metrics/metrics_manager_util.h index 751d8dff02f8..8e9c8e3616ab 100644 --- a/cmds/statsd/src/metrics/metrics_manager_util.h +++ b/cmds/statsd/src/metrics/metrics_manager_util.h @@ -62,7 +62,7 @@ bool initConditions(const ConfigKey& key, const StatsdConfig& config, std::unordered_map<std::string, int>& conditionTrackerMap, std::vector<sp<ConditionTracker>>& allConditionTrackers, std::unordered_map<int, std::vector<int>>& trackerToConditionMap, - std::unordered_map<int, std::vector<EventConditionLink>>& eventConditionLinks); + std::unordered_map<int, std::vector<MetricConditionLink>>& eventConditionLinks); // Initialize MetricProducers. // input: @@ -79,7 +79,7 @@ bool initMetrics( const ConfigKey& key, const StatsdConfig& config, const std::unordered_map<std::string, int>& logTrackerMap, const std::unordered_map<std::string, int>& conditionTrackerMap, - const std::unordered_map<int, std::vector<EventConditionLink>>& eventConditionLinks, + const std::unordered_map<int, std::vector<MetricConditionLink>>& eventConditionLinks, const vector<sp<LogMatchingTracker>>& allAtomMatchers, vector<sp<ConditionTracker>>& allConditionTrackers, std::vector<sp<MetricProducer>>& allMetricProducers, diff --git a/cmds/statsd/src/stats_log.proto b/cmds/statsd/src/stats_log.proto index 60d9a3dbb9d2..f8b91fe0ef0a 100644 --- a/cmds/statsd/src/stats_log.proto +++ b/cmds/statsd/src/stats_log.proto @@ -193,6 +193,11 @@ message StatsdStatsReport { optional int32 max_tuple_counts = 2; } + message AlertStats { + optional string name = 1; + optional int32 declared_times = 2; + } + message ConfigStats { optional int32 uid = 1; optional string name = 2; @@ -210,6 +215,7 @@ message StatsdStatsReport { repeated MatcherStats matcher_stats = 13; repeated ConditionStats condition_stats = 14; repeated MetricStats metric_stats = 15; + repeated AlertStats alert_stats = 16; } repeated ConfigStats config_stats = 3; @@ -229,4 +235,9 @@ message StatsdStatsReport { optional int32 dropped_changes = 5; } optional UidMapStats uidmap_stats = 8; + + message AnomalyAlarmStats { + optional int32 alarms_registered = 1; + } + optional AnomalyAlarmStats anomaly_alarm_stats = 9; }
\ No newline at end of file diff --git a/cmds/statsd/src/statsd_config.proto b/cmds/statsd/src/statsd_config.proto index ca63b033a625..c9654af13137 100644 --- a/cmds/statsd/src/statsd_config.proto +++ b/cmds/statsd/src/statsd_config.proto @@ -112,10 +112,10 @@ message Bucket { optional int64 bucket_size_millis = 1; } -message EventConditionLink { +message MetricConditionLink { optional string condition = 1; - repeated KeyMatcher key_in_main = 2; + repeated KeyMatcher key_in_what = 2; repeated KeyMatcher key_in_condition = 3; } @@ -127,7 +127,7 @@ message EventMetric { optional string condition = 3; - repeated EventConditionLink links = 4; + repeated MetricConditionLink links = 4; } message CountMetric { @@ -141,7 +141,7 @@ message CountMetric { optional Bucket bucket = 5; - repeated EventConditionLink links = 6; + repeated MetricConditionLink links = 6; } message DurationMetric { @@ -151,7 +151,7 @@ message DurationMetric { optional string condition = 3; - repeated EventConditionLink links = 4; + repeated MetricConditionLink links = 4; enum AggregationType { SUM = 1; @@ -178,7 +178,7 @@ message GaugeMetric { optional Bucket bucket = 6; - repeated EventConditionLink links = 7; + repeated MetricConditionLink links = 7; } message ValueMetric { @@ -194,7 +194,7 @@ message ValueMetric { optional Bucket bucket = 6; - repeated EventConditionLink links = 7; + repeated MetricConditionLink links = 7; enum AggregationType { SUM = 1; } optional AggregationType aggregation_type = 8 [default = SUM]; diff --git a/cmds/statsd/tests/StatsLogProcessor_test.cpp b/cmds/statsd/tests/StatsLogProcessor_test.cpp new file mode 100644 index 000000000000..ff04d955ecd0 --- /dev/null +++ b/cmds/statsd/tests/StatsLogProcessor_test.cpp @@ -0,0 +1,117 @@ +// Copyright (C) 2017 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. + +#include "StatsLogProcessor.h" +#include "config/ConfigKey.h" +#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" +#include "guardrail/StatsdStats.h" +#include "logd/LogEvent.h" +#include "packages/UidMap.h" +#include "statslog.h" + +#include <gmock/gmock.h> +#include <gtest/gtest.h> + +#include <stdio.h> + +using namespace android; +using namespace testing; + +namespace android { +namespace os { +namespace statsd { + +#ifdef __ANDROID__ + +/** + * Mock MetricsManager (ByteSize() is called). + */ +class MockMetricsManager : public MetricsManager { +public: + MockMetricsManager() : MetricsManager(ConfigKey(1, "key"), StatsdConfig()) { + } + + MOCK_METHOD0(byteSize, size_t()); + MOCK_METHOD0(onDumpReport, std::vector<std::unique_ptr<std::vector<uint8_t>>>()); +}; + +TEST(StatsLogProcessorTest, TestRateLimitByteSize) { + sp<UidMap> m = new UidMap(); + sp<AnomalyMonitor> anomalyMonitor; + // Construct the processor with a dummy sendBroadcast function that does nothing. + StatsLogProcessor p(m, anomalyMonitor, [](const ConfigKey& key) {}); + + MockMetricsManager mockMetricsManager; + + ConfigKey key(100, "key"); + // Expect only the first flush to trigger a check for byte size since the last two are + // rate-limited. + EXPECT_CALL(mockMetricsManager, byteSize()).Times(1); + p.flushIfNecessary(99, key, mockMetricsManager); + p.flushIfNecessary(100, key, mockMetricsManager); + p.flushIfNecessary(101, key, mockMetricsManager); +} + +TEST(StatsLogProcessorTest, TestRateLimitBroadcast) { + sp<UidMap> m = new UidMap(); + sp<AnomalyMonitor> anomalyMonitor; + int broadcastCount = 0; + StatsLogProcessor p(m, anomalyMonitor, + [&broadcastCount](const ConfigKey& key) { broadcastCount++; }); + + MockMetricsManager mockMetricsManager; + + ConfigKey key(100, "key"); + EXPECT_CALL(mockMetricsManager, byteSize()) + .Times(2) + .WillRepeatedly(Return(int(StatsdStats::kMaxMetricsBytesPerConfig * .95))); + + // Expect only one broadcast despite always returning a size that should trigger broadcast. + p.flushIfNecessary(1, key, mockMetricsManager); + EXPECT_EQ(1, broadcastCount); + + // This next call to flush should not trigger a broadcast. + p.mLastByteSizeTimes.clear(); // Force another check for byte size. + p.flushIfNecessary(2, key, mockMetricsManager); + EXPECT_EQ(1, broadcastCount); +} + +TEST(StatsLogProcessorTest, TestDropWhenByteSizeTooLarge) { + sp<UidMap> m = new UidMap(); + sp<AnomalyMonitor> anomalyMonitor; + int broadcastCount = 0; + StatsLogProcessor p(m, anomalyMonitor, + [&broadcastCount](const ConfigKey& key) { broadcastCount++; }); + + MockMetricsManager mockMetricsManager; + + ConfigKey key(100, "key"); + EXPECT_CALL(mockMetricsManager, byteSize()) + .Times(1) + .WillRepeatedly(Return(int(StatsdStats::kMaxMetricsBytesPerConfig * 1.2))); + + EXPECT_CALL(mockMetricsManager, onDumpReport()).Times(1); + + // Expect to call the onDumpReport and skip the broadcast. + p.flushIfNecessary(1, key, mockMetricsManager); + EXPECT_EQ(0, broadcastCount); +} + +#else +GTEST_LOG_(INFO) << "This test does nothing.\n"; +#endif + +} // namespace statsd +} // namespace os +} // namespace android
\ No newline at end of file diff --git a/cmds/statsd/tests/anomaly/AnomalyTracker_test.cpp b/cmds/statsd/tests/anomaly/AnomalyTracker_test.cpp index 65c2a05543b9..f38576398f11 100644 --- a/cmds/statsd/tests/anomaly/AnomalyTracker_test.cpp +++ b/cmds/statsd/tests/anomaly/AnomalyTracker_test.cpp @@ -30,6 +30,8 @@ namespace android { namespace os { namespace statsd { +const ConfigKey kConfigKey(0, "test"); + void AddValueToBucket(const std::vector<std::pair<string, long>>& key_value_pair_list, std::shared_ptr<DimToValMap> bucket) { for (auto itr = key_value_pair_list.begin(); itr != key_value_pair_list.end(); itr++) { @@ -51,7 +53,7 @@ TEST(AnomalyTrackerTest, TestConsecutiveBuckets) { alert.set_refractory_period_secs(2 * bucketSizeNs / NS_PER_SEC); alert.set_trigger_if_sum_gt(2); - AnomalyTracker anomalyTracker(alert); + AnomalyTracker anomalyTracker(alert, kConfigKey); std::shared_ptr<DimToValMap> bucket0 = MockBucket({{"a", 1}, {"b", 2}, {"c", 1}}); int64_t eventTimestamp0 = 10; @@ -168,7 +170,7 @@ TEST(AnomalyTrackerTest, TestSparseBuckets) { alert.set_refractory_period_secs(2 * bucketSizeNs / NS_PER_SEC); alert.set_trigger_if_sum_gt(2); - AnomalyTracker anomalyTracker(alert); + AnomalyTracker anomalyTracker(alert, kConfigKey); std::shared_ptr<DimToValMap> bucket9 = MockBucket({{"a", 1}, {"b", 2}, {"c", 1}}); std::shared_ptr<DimToValMap> bucket16 = MockBucket({{"b", 4}}); diff --git a/cmds/statsd/tests/guardrail/StatsdStats_test.cpp b/cmds/statsd/tests/guardrail/StatsdStats_test.cpp index a8193dd92e8c..9fed4f8b5e30 100644 --- a/cmds/statsd/tests/guardrail/StatsdStats_test.cpp +++ b/cmds/statsd/tests/guardrail/StatsdStats_test.cpp @@ -118,6 +118,10 @@ TEST(StatsdStatsTest, TestSubStats) { stats.noteMetricDimensionSize(key, "metric1", 201); stats.noteMetricDimensionSize(key, "metric1", 202); + stats.noteAnomalyDeclared(key, "alert1"); + stats.noteAnomalyDeclared(key, "alert1"); + stats.noteAnomalyDeclared(key, "alert2"); + // broadcast-> 2 stats.noteBroadcastSent(key); stats.noteBroadcastSent(key); @@ -142,7 +146,6 @@ TEST(StatsdStatsTest, TestSubStats) { EXPECT_EQ(3, configReport.dump_report_time_sec_size()); EXPECT_EQ(2, configReport.matcher_stats_size()); - // matcher1 is the first in the list if (!configReport.matcher_stats(0).name().compare("matcher1")) { EXPECT_EQ(2, configReport.matcher_stats(0).matched_times()); @@ -157,6 +160,13 @@ TEST(StatsdStatsTest, TestSubStats) { EXPECT_EQ("matcher1", configReport.matcher_stats(1).name()); } + EXPECT_EQ(2, configReport.alert_stats_size()); + bool alert1first = !configReport.alert_stats(0).name().compare("alert1"); + EXPECT_EQ("alert1", configReport.alert_stats(alert1first ? 0 : 1).name()); + EXPECT_EQ(2, configReport.alert_stats(alert1first ? 0 : 1).declared_times()); + EXPECT_EQ("alert2", configReport.alert_stats(alert1first ? 1 : 0).name()); + EXPECT_EQ(1, configReport.alert_stats(alert1first ? 1 : 0).declared_times()); + EXPECT_EQ(1, configReport.condition_stats_size()); EXPECT_EQ("condition1", configReport.condition_stats(0).name()); EXPECT_EQ(250, configReport.condition_stats(0).max_tuple_counts()); @@ -169,6 +179,7 @@ TEST(StatsdStatsTest, TestSubStats) { stats.noteMatcherMatched(key, "matcher99"); stats.noteConditionDimensionSize(key, "condition99", 300); stats.noteMetricDimensionSize(key, "metric99", 270); + stats.noteAnomalyDeclared(key, "alert99"); // now the config stats should only contain the stats about the new event. stats.dumpStats(&output, false); @@ -187,6 +198,10 @@ TEST(StatsdStatsTest, TestSubStats) { EXPECT_EQ(1, configReport2.metric_stats_size()); EXPECT_EQ("metric99", configReport2.metric_stats(0).name()); EXPECT_EQ(270, configReport2.metric_stats(0).max_tuple_counts()); + + EXPECT_EQ(1, configReport2.alert_stats_size()); + EXPECT_EQ("alert99", configReport2.alert_stats(0).name()); + EXPECT_EQ(1, configReport2.alert_stats(0).declared_times()); } TEST(StatsdStatsTest, TestAtomLog) { @@ -224,6 +239,21 @@ TEST(StatsdStatsTest, TestAtomLog) { EXPECT_TRUE(sensorAtomGood); } + +TEST(StatsdStatsTest, TestAnomalyMonitor) { + StatsdStats stats; + stats.noteRegisteredAnomalyAlarmChanged(); + stats.noteRegisteredAnomalyAlarmChanged(); + + vector<uint8_t> output; + stats.dumpStats(&output, false); + StatsdStatsReport report; + bool good = report.ParseFromArray(&output[0], output.size()); + EXPECT_TRUE(good); + + EXPECT_EQ(2, report.anomaly_alarm_stats().alarms_registered()); +} + TEST(StatsdStatsTest, TestTimestampThreshold) { StatsdStats stats; vector<int32_t> timestamps; diff --git a/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp b/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp index dc42943e8233..d973ba1676a9 100644 --- a/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp @@ -141,9 +141,9 @@ TEST(CountMetricProducerTest, TestEventsWithSlicedCondition) { metric.set_name("1"); metric.mutable_bucket()->set_bucket_size_millis(bucketSizeNs / 1000000); metric.set_condition("APP_IN_BACKGROUND_PER_UID_AND_SCREEN_ON"); - EventConditionLink* link = metric.add_links(); + MetricConditionLink* link = metric.add_links(); link->set_condition("APP_IN_BACKGROUND_PER_UID"); - link->add_key_in_main()->set_key(1); + link->add_key_in_what()->set_key(1); link->add_key_in_condition()->set_key(2); LogEvent event1(1, bucketStartTimeNs + 1); @@ -196,7 +196,7 @@ TEST(CountMetricProducerTest, TestAnomalyDetection) { int64_t bucket2StartTimeNs = bucketStartTimeNs + bucketSizeNs; int64_t bucket3StartTimeNs = bucketStartTimeNs + 2 * bucketSizeNs; - sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert); + sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert, kConfigKey); CountMetric metric; metric.set_name("1"); diff --git a/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp b/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp index 724ad59eeab6..f3302fd5b8e9 100644 --- a/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp @@ -91,9 +91,9 @@ TEST(EventMetricProducerTest, TestEventsWithSlicedCondition) { EventMetric metric; metric.set_name("1"); metric.set_condition("APP_IN_BACKGROUND_PER_UID_AND_SCREEN_ON"); - EventConditionLink* link = metric.add_links(); + MetricConditionLink* link = metric.add_links(); link->set_condition("APP_IN_BACKGROUND_PER_UID"); - link->add_key_in_main()->set_key(1); + link->add_key_in_what()->set_key(1); link->add_key_in_condition()->set_key(2); LogEvent event1(1, bucketStartTimeNs + 1); diff --git a/cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp b/cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp index ed13db25397a..59475d266217 100644 --- a/cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/GaugeMetricProducer_test.cpp @@ -33,6 +33,8 @@ namespace android { namespace os { namespace statsd { +const ConfigKey kConfigKey(0, "test"); + TEST(GaugeMetricProducerTest, TestWithCondition) { int64_t bucketStartTimeNs = 10000000000; int64_t bucketSizeNs = 60 * 1000 * 1000 * 1000LL; @@ -148,7 +150,7 @@ TEST(GaugeMetricProducerTest, TestAnomalyDetection) { alert.set_metric_name("1"); alert.set_trigger_if_sum_gt(25); alert.set_number_of_buckets(2); - sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert); + sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert, kConfigKey); gaugeProducer.addAnomalyTracker(anomalyTracker); std::shared_ptr<LogEvent> event1 = std::make_shared<LogEvent>(1, bucketStartTimeNs + 1); diff --git a/cmds/statsd/tests/metrics/MaxDurationTracker_test.cpp b/cmds/statsd/tests/metrics/MaxDurationTracker_test.cpp index 1adcc1146c42..4e5e0d6dbfb3 100644 --- a/cmds/statsd/tests/metrics/MaxDurationTracker_test.cpp +++ b/cmds/statsd/tests/metrics/MaxDurationTracker_test.cpp @@ -208,7 +208,7 @@ TEST(MaxDurationTrackerTest, TestAnomalyDetection) { uint64_t eventStartTimeNs = bucketStartTimeNs + NS_PER_SEC + 1; uint64_t bucketSizeNs = 30 * NS_PER_SEC; - sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert); + sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert, kConfigKey); MaxDurationTracker tracker(kConfigKey, "metric", eventKey, wizard, -1, true, bucketStartTimeNs, bucketSizeNs, {anomalyTracker}); diff --git a/cmds/statsd/tests/metrics/OringDurationTracker_test.cpp b/cmds/statsd/tests/metrics/OringDurationTracker_test.cpp index fa7b9a734524..99d3e054d893 100644 --- a/cmds/statsd/tests/metrics/OringDurationTracker_test.cpp +++ b/cmds/statsd/tests/metrics/OringDurationTracker_test.cpp @@ -269,7 +269,7 @@ TEST(OringDurationTrackerTest, TestPredictAnomalyTimestamp) { uint64_t eventStartTimeNs = bucketStartTimeNs + NS_PER_SEC + 1; uint64_t bucketSizeNs = 30 * NS_PER_SEC; - sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert); + sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert, kConfigKey); OringDurationTracker tracker(kConfigKey, "metric", eventKey, wizard, 1, true, bucketStartTimeNs, bucketSizeNs, {anomalyTracker}); @@ -331,7 +331,7 @@ TEST(OringDurationTrackerTest, TestAnomalyDetection) { uint64_t eventStartTimeNs = bucketStartTimeNs + NS_PER_SEC + 1; uint64_t bucketSizeNs = 30 * NS_PER_SEC; - sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert); + sp<AnomalyTracker> anomalyTracker = new AnomalyTracker(alert, kConfigKey); OringDurationTracker tracker(kConfigKey, "metric", eventKey, wizard, 1, true /*nesting*/, bucketStartTimeNs, bucketSizeNs, {anomalyTracker}); diff --git a/cmds/statsd/tools/loadtest/AndroidManifest.xml b/cmds/statsd/tools/loadtest/AndroidManifest.xml index d74c707a011f..2bf8ca95d846 100644 --- a/cmds/statsd/tools/loadtest/AndroidManifest.xml +++ b/cmds/statsd/tools/loadtest/AndroidManifest.xml @@ -39,5 +39,6 @@ </activity> <receiver android:name=".LoadtestActivity$PusherAlarmReceiver" /> <receiver android:name=".LoadtestActivity$StopperAlarmReceiver"/> + <receiver android:name=".PerfData$PerfAlarmReceiver"/> </application> </manifest> diff --git a/cmds/statsd/tools/loadtest/res/layout/activity_loadtest.xml b/cmds/statsd/tools/loadtest/res/layout/activity_loadtest.xml index 82964ab1d821..1e28f6730709 100644 --- a/cmds/statsd/tools/loadtest/res/layout/activity_loadtest.xml +++ b/cmds/statsd/tools/loadtest/res/layout/activity_loadtest.xml @@ -166,12 +166,6 @@ android:layout_height="wrap_content" android:text="@string/display_output" android:textSize="30dp"/> - <Button - android:id="@+id/display_perf" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/display_perf" - android:textSize="30dp"/> <Space android:layout_width="1dp" @@ -179,6 +173,7 @@ <TextView android:id="@+id/report_text" + android:gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/cmds/statsd/tools/loadtest/res/values/strings.xml b/cmds/statsd/tools/loadtest/res/values/strings.xml index 991350332da0..cb38298873f0 100644 --- a/cmds/statsd/tools/loadtest/res/values/strings.xml +++ b/cmds/statsd/tools/loadtest/res/values/strings.xml @@ -21,7 +21,6 @@ <string name="bucket_label">bucket size (mins): </string> <string name="burst_label">burst: </string> <string name="display_output">Show metrics data</string> - <string name="display_perf">Show perf data</string> <string name="placebo">placebo</string> <string name="period_label">logging period (secs): </string> <string name="replication_label">metric replication: </string> diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/BatteryDataRecorder.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/BatteryDataRecorder.java new file mode 100644 index 000000000000..d2ff892680a7 --- /dev/null +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/BatteryDataRecorder.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2017 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.statsd.loadtest; + +import android.annotation.Nullable; +import android.content.Context; +import android.util.Log; +import java.text.ParseException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class BatteryDataRecorder extends PerfDataRecorder { + private static final String TAG = "loadtest.BatteryDataRecorder"; + private static final String DUMP_FILENAME = TAG + "_dump.tmp"; + + public BatteryDataRecorder(boolean placebo, int replication, long bucketMins, long periodSecs, + int burst) { + super(placebo, replication, bucketMins, periodSecs, burst); + } + + @Override + public void startRecording(Context context) { + // Reset batterystats. + runDumpsysStats(context, DUMP_FILENAME, "batterystats", "--reset"); + } + + @Override + public void onAlarm(Context context) { + // Nothing to do as for battery, the whole data is in the final dumpsys call. + } + + @Override + public void stopRecording(Context context) { + StringBuilder sb = new StringBuilder(); + // Don't use --checkin. + runDumpsysStats(context, DUMP_FILENAME, "batterystats"); + readDumpData(context, DUMP_FILENAME, new BatteryStatsParser(), sb); + writeData(context, "battery_", "time,battery_level", sb); + } +} diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/BatteryStatsParser.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/BatteryStatsParser.java index 96e6bef600d1..203d97acefd8 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/BatteryStatsParser.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/BatteryStatsParser.java @@ -21,13 +21,13 @@ import java.text.ParseException; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class BatteryStatsParser { +public class BatteryStatsParser implements PerfParser { private static final Pattern LINE_PATTERN = Pattern.compile("\\s*\\+*(\\S*)\\s\\(\\d+\\)\\s(\\d\\d\\d)\\s.*"); private static final Pattern TIME_PATTERN = Pattern.compile("(\\d+)?(h)?(\\d+)?(m)?(\\d+)?(s)?(\\d+)?(ms)?"); - private static final String TAG = "BatteryStatsParser"; + private static final String TAG = "loadtest.BatteryStatsParser"; private boolean mHistoryStarted; private boolean mHistoryEnded; @@ -35,6 +35,7 @@ public class BatteryStatsParser { public BatteryStatsParser() { } + @Override @Nullable public String parseLine(String line) { if (mHistoryEnded) { diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java index 8d20f9759c96..0d890fbb6e56 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ConfigFactory.java @@ -18,13 +18,12 @@ package com.android.statsd.loadtest; import android.content.Context; import android.content.res.Resources; import android.util.Log; -import android.util.StatsLog; import com.android.internal.os.StatsdConfigProto.Bucket; import com.android.internal.os.StatsdConfigProto.Predicate; import com.android.internal.os.StatsdConfigProto.CountMetric; import com.android.internal.os.StatsdConfigProto.DurationMetric; -import com.android.internal.os.StatsdConfigProto.EventConditionLink; +import com.android.internal.os.StatsdConfigProto.MetricConditionLink; import com.android.internal.os.StatsdConfigProto.EventMetric; import com.android.internal.os.StatsdConfigProto.GaugeMetric; import com.android.internal.os.StatsdConfigProto.ValueMetric; @@ -45,7 +44,7 @@ import java.util.List; public class ConfigFactory { public static final String CONFIG_NAME = "LOADTEST"; - private static final String TAG = "ConfigFactory"; + private static final String TAG = "loadtest.ConfigFactory"; private final StatsdConfig mTemplate; @@ -130,13 +129,13 @@ public class ConfigFactory { } /** - * Creates {@link EventConditionLink}s that are identical to the one passed to this method, + * Creates {@link MetricConditionLink}s that are identical to the one passed to this method, * except that the names are appended with the provided suffix. */ - private List<EventConditionLink> getLinks( - List<EventConditionLink> links, int suffix) { - List<EventConditionLink> newLinks = new ArrayList(); - for (EventConditionLink link : links) { + private List<MetricConditionLink> getLinks( + List<MetricConditionLink> links, int suffix) { + List<MetricConditionLink> newLinks = new ArrayList(); + for (MetricConditionLink link : links) { newLinks.add(link.toBuilder() .setCondition(link.getCondition() + suffix) .build()); @@ -156,7 +155,7 @@ public class ConfigFactory { metric.setCondition(template.getCondition() + suffix); } if (template.getLinksCount() > 0) { - List<EventConditionLink> links = getLinks(template.getLinksList(), suffix); + List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix); metric.clearLinks(); metric.addAllLinks(links); } @@ -182,7 +181,7 @@ public class ConfigFactory { metric.setCondition(template.getCondition() + suffix); } if (template.getLinksCount() > 0) { - List<EventConditionLink> links = getLinks(template.getLinksList(), suffix); + List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix); metric.clearLinks(); metric.addAllLinks(links); } @@ -203,7 +202,7 @@ public class ConfigFactory { metric.setCondition(template.getCondition() + suffix); } if (template.getLinksCount() > 0) { - List<EventConditionLink> links = getLinks(template.getLinksList(), suffix); + List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix); metric.clearLinks(); metric.addAllLinks(links); } @@ -224,7 +223,7 @@ public class ConfigFactory { metric.setCondition(template.getCondition() + suffix); } if (template.getLinksCount() > 0) { - List<EventConditionLink> links = getLinks(template.getLinksList(), suffix); + List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix); metric.clearLinks(); metric.addAllLinks(links); } @@ -245,7 +244,7 @@ public class ConfigFactory { metric.setCondition(template.getCondition() + suffix); } if (template.getLinksCount() > 0) { - List<EventConditionLink> links = getLinks(template.getLinksList(), suffix); + List<MetricConditionLink> links = getLinks(template.getLinksList(), suffix); metric.clearLinks(); metric.addAllLinks(links); } diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/LoadtestActivity.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/LoadtestActivity.java index 3ae85a7d0bf2..522dea61d188 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/LoadtestActivity.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/LoadtestActivity.java @@ -65,8 +65,9 @@ import android.widget.Toast; public class LoadtestActivity extends Activity { private static final String TAG = "StatsdLoadtest"; - private static final String TYPE = "type"; - private static final String ALARM = "push_alarm"; + public static final String TYPE = "type"; + private static final String PUSH_ALARM = "push_alarm"; + public static final String PERF_ALARM = "perf_alarm"; private static final String START = "start"; private static final String STOP = "stop"; @@ -74,7 +75,7 @@ public class LoadtestActivity extends Activity { @Override public void onReceive(Context context, Intent intent) { Intent activityIntent = new Intent(context, LoadtestActivity.class); - activityIntent.putExtra(TYPE, ALARM); + activityIntent.putExtra(TYPE, PUSH_ALARM); context.startActivity(activityIntent); } } @@ -105,6 +106,9 @@ public class LoadtestActivity extends Activity { private TextView mReportText; private CheckBox mPlaceboCheckBox; + /** When the load test started. */ + private long mStartedTimeMillis; + /** For measuring perf data. */ private PerfData mPerfData; @@ -180,7 +184,7 @@ public class LoadtestActivity extends Activity { @Override public void onClick(View view) { if (mStarted) { - stopLoadtest(true); + stopLoadtest(); } else { startLoadtest(); } @@ -194,20 +198,11 @@ public class LoadtestActivity extends Activity { } }); - findViewById(R.id.display_perf).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - mPerfData.publishData(LoadtestActivity.this, mPlacebo, mReplication, mBucketMins, - mPeriodSecs, mBurst); - } - }); - mAlarmMgr = (AlarmManager) getSystemService(Context.ALARM_SERVICE); mStatsManager = (StatsManager) getSystemService("stats"); mPowerManager = (PowerManager) getSystemService(Context.POWER_SERVICE); mFactory = new ConfigFactory(this); - mPerfData = new PerfData(); - stopLoadtest(false); + stopLoadtest(); mReportText.setText(""); } @@ -218,14 +213,17 @@ public class LoadtestActivity extends Activity { return; } switch (type) { - case ALARM: - onAlarm(intent); - break; + case PERF_ALARM: + onPerfAlarm(); + break; + case PUSH_ALARM: + onAlarm(); + break; case START: startLoadtest(); break; - case STOP: - stopLoadtest(true); + case STOP: + stopLoadtest(); break; default: throw new IllegalArgumentException("Unknown type: " + type); @@ -235,12 +233,23 @@ public class LoadtestActivity extends Activity { @Override public void onDestroy() { Log.d(TAG, "Destroying"); - stopLoadtest(false); + mPerfData.onDestroy(); + stopLoadtest(); clearConfigs(); super.onDestroy(); } - private void onAlarm(Intent intent) { + private void onPerfAlarm() { + if (mPerfData != null) { + mPerfData.onAlarm(this); + } + // Piggy-back on that alarm to show the elapsed time. + long elapsedTimeMins = (long) Math.floor( + (SystemClock.elapsedRealtime() - mStartedTimeMillis) / 60 / 1000); + mReportText.setText("Loadtest in progress. Elapsed time = " + elapsedTimeMins + " min(s)"); + } + + private void onAlarm() { Log.d(TAG, "ON ALARM"); // Set the next task. @@ -259,7 +268,7 @@ public class LoadtestActivity extends Activity { /** Schedules the next cycle of pushing atoms into logd. */ private void scheduleNext() { Intent intent = new Intent(this, PusherAlarmReceiver.class); - intent.putExtra(TYPE, ALARM); + intent.putExtra(TYPE, PUSH_ALARM); mPushPendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); long nextTime = SystemClock.elapsedRealtime() + mPeriodSecs * 1000; mAlarmMgr.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextTime, mPushPendingIntent); @@ -271,7 +280,7 @@ public class LoadtestActivity extends Activity { } // Clean up the state. - stopLoadtest(false); + stopLoadtest(); // Prepare to push a sequence of atoms to logd. mPusher = new SequencePusher(mBurst, mPlacebo); @@ -291,15 +300,17 @@ public class LoadtestActivity extends Activity { // Log atoms. scheduleNext(); - // Reset battery data. - mPerfData.resetData(this); + // Start tracking performance. + mPerfData = new PerfData(this, mPlacebo, mReplication, mBucketMins, mPeriodSecs, mBurst); + mPerfData.startRecording(this); - mReportText.setText(""); + mReportText.setText("Loadtest in progress."); + mStartedTimeMillis = SystemClock.elapsedRealtime(); updateStarted(true); } - private synchronized void stopLoadtest(boolean publishPerfData) { + private synchronized void stopLoadtest() { if (mPushPendingIntent != null) { Log.d(TAG, "Canceling pre-existing push alarm"); mAlarmMgr.cancel(mPushPendingIntent); @@ -314,12 +325,17 @@ public class LoadtestActivity extends Activity { mWakeLock.release(); mWakeLock = null; } - fetchAndDisplayData(); + if (mPerfData != null) { + mPerfData.stopRecording(this); + mPerfData.onDestroy(); + mPerfData = null; + } + + long elapsedTimeMins = (long) Math.floor( + (SystemClock.elapsedRealtime() - mStartedTimeMillis) / 60 / 1000); + mReportText.setText("Loadtest ended. Elapsed time = " + elapsedTimeMins + " min(s)"); clearConfigs(); updateStarted(false); - if (publishPerfData) { - mPerfData.publishData(this, mPlacebo, mReplication, mBucketMins, mPeriodSecs, mBurst); - } } private synchronized void updateStarted(boolean started) { diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemInfoParser.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemInfoParser.java new file mode 100644 index 000000000000..01eebf2ad1cf --- /dev/null +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemInfoParser.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2017 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.statsd.loadtest; + +import android.annotation.Nullable; +import android.os.SystemClock; +import android.util.Log; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** Parses PSS info from dumpsys meminfo */ +public class MemInfoParser implements PerfParser { + + private static final Pattern LINE_PATTERN = + Pattern.compile("\\s*(\\d*,*\\d*)K:\\s(\\S*)\\s\\.*"); + private static final String PSS_BY_PROCESS = "Total PSS by process:"; + private static final String TAG = "loadtest.MemInfoParser"; + + private boolean mPssStarted; + private boolean mPssEnded; + private final long mStartTimeMillis; + + public MemInfoParser(long startTimeMillis) { + mStartTimeMillis = startTimeMillis; + } + + @Override + @Nullable + public String parseLine(String line) { + if (mPssEnded) { + return null; + } + if (!mPssStarted) { + if (line.contains(PSS_BY_PROCESS)) { + mPssStarted = true; + } + return null; + } + if (line.isEmpty()) { + mPssEnded = true; + return null; + } + Matcher lineMatcher = LINE_PATTERN.matcher(line); + if (lineMatcher.find() && lineMatcher.group(1) != null && lineMatcher.group(2) != null) { + if (lineMatcher.group(2).equals("statsd")) { + long timeDeltaMillis = SystemClock.elapsedRealtime() - mStartTimeMillis; + return timeDeltaMillis + "," + convertToPss(lineMatcher.group(1)); + } + } + return null; + } + + private String convertToPss(String input) { + return input.replace(",", ""); + } +} diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemoryDataRecorder.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemoryDataRecorder.java new file mode 100644 index 000000000000..d82a0eadea65 --- /dev/null +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemoryDataRecorder.java @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2017 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.statsd.loadtest; + +import android.content.Context; +import android.os.SystemClock; +import android.util.Log; + +public class MemoryDataRecorder extends PerfDataRecorder { + private static final String TAG = "loadtest.MemoryDataDataRecorder"; + private static final String DUMP_FILENAME = TAG + "_dump.tmp"; + + private long mStartTimeMillis; + private StringBuilder mSb; + + public MemoryDataRecorder(boolean placebo, int replication, long bucketMins, long periodSecs, + int burst) { + super(placebo, replication, bucketMins, periodSecs, burst); + } + + @Override + public void startRecording(Context context) { + mStartTimeMillis = SystemClock.elapsedRealtime(); + mSb = new StringBuilder(); + } + + @Override + public void onAlarm(Context context) { + Log.d(TAG, "GOT ALARM IN MEM"); + runDumpsysStats(context, DUMP_FILENAME, "meminfo"); + readDumpData(context, DUMP_FILENAME, new MemInfoParser(mStartTimeMillis), mSb); + } + + @Override + public void stopRecording(Context context) { + writeData(context, "meminfo_", "time,pss", mSb); + } +} diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/NumericalWatcher.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/NumericalWatcher.java index 57f85b5db317..81a84f53b503 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/NumericalWatcher.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/NumericalWatcher.java @@ -15,29 +15,14 @@ */ package com.android.statsd.loadtest; -import android.app.Activity; -import android.app.AlarmManager; -import android.app.PendingIntent; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; import android.util.Log; -import android.util.StatsLog; -import android.util.StatsManager; -import android.view.View; -import android.widget.EditText; import android.widget.TextView; -import android.widget.Toast; -import android.os.IStatsManager; -import android.os.ServiceManager; -import android.view.View.OnFocusChangeListener; public abstract class NumericalWatcher implements TextWatcher { - private static final String TAG = "NumericalWatcher"; + private static final String TAG = "loadtest.NumericalWatcher"; private final TextView mTextView; private final int mMin; diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfData.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfData.java index e3e23f58a26f..466524756c48 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfData.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfData.java @@ -16,147 +16,86 @@ package com.android.statsd.loadtest; import android.annotation.Nullable; -import android.app.Activity; import android.app.AlarmManager; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.os.Bundle; -import android.os.Environment; +import android.os.SystemClock; import android.util.Log; -import android.os.Debug; - -import java.io.BufferedReader; -import java.io.Closeable; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; + +import java.util.HashSet; +import java.util.Set; /** Prints some information about the device via Dumpsys in order to evaluate health metrics. */ -public class PerfData { +public class PerfData extends PerfDataRecorder { - private static final String TAG = "PerfData"; - private static final String DUMP_FILENAME = TAG + "_dump.tmp"; + private static final String TAG = "loadtest.PerfData"; - public void resetData(Context context) { - runDumpsysStats(context, "batterystats", "--reset"); - } + /** Polling period for performance snapshots like memory. */ + private static final long POLLING_PERIOD_MILLIS = 1 * 60 * 1000; - public void publishData(Context context, boolean placebo, int replication, long bucketMins, - long periodSecs, int burst) { - publishBatteryData(context, placebo, replication, bucketMins, periodSecs, burst); + public final static class PerfAlarmReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + Intent activityIntent = new Intent(context, LoadtestActivity.class); + activityIntent.putExtra(LoadtestActivity.TYPE, LoadtestActivity.PERF_ALARM); + context.startActivity(activityIntent); + } } - private void publishBatteryData(Context context, boolean placebo, int replication, - long bucketMins, long periodSecs, int burst) { - // Don't use --checkin. - runDumpsysStats(context, "batterystats"); - writeBatteryData(context, placebo, replication, bucketMins, periodSecs, burst); - } + private AlarmManager mAlarmMgr; - private void runDumpsysStats(Context context, String cmd, String... args) { - boolean success = false; - // Call dumpsys Dump statistics to a file. - FileOutputStream fo = null; - try { - fo = context.openFileOutput(DUMP_FILENAME, Context.MODE_PRIVATE); - if (!Debug.dumpService(cmd, fo.getFD(), args)) { - Log.w(TAG, "Dumpsys failed."); - } - success = true; - } catch (IOException | SecurityException | NullPointerException e) { - // SecurityException may occur when trying to dump multi-user info. - // NPE can occur during dumpService (root cause unknown). - throw new RuntimeException(e); - } finally { - closeQuietly(fo); - } + /** Used to periodically poll some dumpsys data. */ + private PendingIntent mPendingIntent; + + private final Set<PerfDataRecorder> mRecorders; + + public PerfData(Context context, boolean placebo, int replication, long bucketMins, + long periodSecs, int burst) { + super(placebo, replication, bucketMins, periodSecs, burst); + mRecorders = new HashSet(); + mRecorders.add(new BatteryDataRecorder(placebo, replication, bucketMins, periodSecs, burst)); + mRecorders.add(new MemoryDataRecorder(placebo, replication, bucketMins, periodSecs, burst)); + mAlarmMgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); } - private String readDumpFile(Context context) { - StringBuilder sb = new StringBuilder(); - FileInputStream fi = null; - BufferedReader br = null; - try { - fi = context.openFileInput(DUMP_FILENAME); - br = new BufferedReader(new InputStreamReader(fi)); - String line = br.readLine(); - while (line != null) { - sb.append(line); - sb.append(System.lineSeparator()); - line = br.readLine(); - } - } catch (IOException e) { - throw new RuntimeException(e); - } finally { - closeQuietly(br); + public void onDestroy() { + if (mPendingIntent != null) { + mAlarmMgr.cancel(mPendingIntent); + mPendingIntent = null; } - return sb.toString(); } - private static void closeQuietly(@Nullable Closeable c) { - if (c != null) { - try { - c.close(); - } catch (IOException ignore) { - } + @Override + public void startRecording(Context context) { + Intent intent = new Intent(context, PerfAlarmReceiver.class); + intent.putExtra(LoadtestActivity.TYPE, LoadtestActivity.PERF_ALARM); + mPendingIntent = PendingIntent.getBroadcast(context, 0, intent, 0); + mAlarmMgr.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, -1 /* now */, + POLLING_PERIOD_MILLIS, mPendingIntent); + + for (PerfDataRecorder recorder : mRecorders) { + recorder.startRecording(context); } } - public void writeBatteryData(Context context, boolean placebo, int replication, long bucketMins, - long periodSecs, int burst) { - BatteryStatsParser parser = new BatteryStatsParser(); - FileInputStream fi = null; - BufferedReader br = null; - String suffix = new SimpleDateFormat("YYYY_MM_dd_HH_mm_ss").format(new Date()); - File batteryDataFile = new File(getStorageDir(), "battery_" + suffix + ".csv"); - Log.d(TAG, "Writing battery data to " + batteryDataFile.getAbsolutePath()); - - FileWriter writer = null; - try { - fi = context.openFileInput(DUMP_FILENAME); - writer = new FileWriter(batteryDataFile); - writer.append("time,battery_level" - + getColumnName(placebo, replication, bucketMins, periodSecs, burst) + "\n"); - br = new BufferedReader(new InputStreamReader(fi)); - String line = br.readLine(); - while (line != null) { - String recordLine = parser.parseLine(line); - if (recordLine != null) { - writer.append(recordLine); - } - line = br.readLine(); - } - writer.flush(); - } catch (IOException e) { - throw new RuntimeException(e); - } finally { - closeQuietly(writer); - closeQuietly(br); + @Override + public void onAlarm(Context context) { + for (PerfDataRecorder recorder : mRecorders) { + recorder.onAlarm(context); } } - private File getStorageDir() { - File file = new File(Environment.getExternalStoragePublicDirectory( - Environment.DIRECTORY_DOCUMENTS), "loadtest"); - if (!file.mkdirs()) { - Log.e(TAG, "Directory not created"); + @Override + public void stopRecording(Context context) { + if (mPendingIntent != null) { + mAlarmMgr.cancel(mPendingIntent); + mPendingIntent = null; } - return file; - } - private String getColumnName(boolean placebo, int replication, long bucketMins, long periodSecs, - int burst) { - if (placebo) { - return "_placebo_p=" + periodSecs; + for (PerfDataRecorder recorder : mRecorders) { + recorder.stopRecording(context); } - return "_r=" + replication + "_bkt=" + bucketMins + "_p=" + periodSecs + "_bst=" + burst; } } diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfDataRecorder.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfDataRecorder.java new file mode 100644 index 000000000000..15a8e5c87131 --- /dev/null +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfDataRecorder.java @@ -0,0 +1,149 @@ +/* + * Copyright (C) 2017 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.statsd.loadtest; + +import android.annotation.Nullable; +import android.content.Context; +import android.os.Environment; +import android.util.Log; +import android.os.Debug; + +import java.io.BufferedReader; +import java.io.Closeable; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.InputStreamReader; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; + +public abstract class PerfDataRecorder { + private static final String TAG = "loadtest.PerfDataRecorder"; + + protected final String mFileSuffix; + protected final String mColumnSuffix; + + protected PerfDataRecorder(boolean placebo, int replication, long bucketMins, long periodSecs, + int burst) { + mFileSuffix = new SimpleDateFormat("YYYY_MM_dd_HH_mm_ss").format(new Date()); + mColumnSuffix = getColumnSuffix(placebo, replication, bucketMins, periodSecs, burst); + } + + /** Starts recording performance data. */ + public abstract void startRecording(Context context); + + /** Called periodically. For the recorder to sample data, if needed. */ + public abstract void onAlarm(Context context); + + /** Stops recording performance data, and writes it to disk. */ + public abstract void stopRecording(Context context); + + /** Runs the dumpsys command. */ + protected void runDumpsysStats(Context context, String dumpFilename, String cmd, + String... args) { + boolean success = false; + // Call dumpsys Dump statistics to a file. + FileOutputStream fo = null; + try { + fo = context.openFileOutput(dumpFilename, Context.MODE_PRIVATE); + if (!Debug.dumpService(cmd, fo.getFD(), args)) { + Log.w(TAG, "Dumpsys failed."); + } + success = true; + } catch (IOException | SecurityException | NullPointerException e) { + // SecurityException may occur when trying to dump multi-user info. + // NPE can occur during dumpService (root cause unknown). + throw new RuntimeException(e); + } finally { + closeQuietly(fo); + } + } + + /** + * Reads a text file and parses each line, one by one. The result of the parsing is stored + * in the passed {@link StringBuffer}. + */ + protected void readDumpData(Context context, String dumpFilename, PerfParser parser, + StringBuilder sb) { + FileInputStream fi = null; + BufferedReader br = null; + try { + fi = context.openFileInput(dumpFilename); + br = new BufferedReader(new InputStreamReader(fi)); + String line = br.readLine(); + while (line != null) { + String recordLine = parser.parseLine(line); + if (recordLine != null) { + sb.append(recordLine).append('\n'); + } + line = br.readLine(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + closeQuietly(br); + } + } + + /** Writes CSV data to a file. */ + protected void writeData(Context context, String filePrefix, String columnPrefix, + StringBuilder sb) { + File dataFile = new File(getStorageDir(), filePrefix + mFileSuffix + ".csv"); + + FileWriter writer = null; + try { + writer = new FileWriter(dataFile); + writer.append(columnPrefix + mColumnSuffix + "\n"); + writer.append(sb.toString()); + writer.flush(); + Log.d(TAG, "Finished writing data at " + dataFile.getAbsolutePath()); + } catch (IOException e) { + throw new RuntimeException(e); + } finally { + closeQuietly(writer); + } + } + + /** Gets the suffix to use in the column name for perf data. */ + private String getColumnSuffix(boolean placebo, int replication, long bucketMins, + long periodSecs, int burst) { + if (placebo) { + return "_placebo_p=" + periodSecs; + } + return "_r=" + replication + "_bkt=" + bucketMins + "_p=" + periodSecs + "_bst=" + burst; + } + + + private File getStorageDir() { + File file = new File(Environment.getExternalStoragePublicDirectory( + Environment.DIRECTORY_DOCUMENTS), "loadtest"); + if (!file.mkdirs()) { + Log.e(TAG, "Directory not created"); + } + return file; + } + + private void closeQuietly(@Nullable Closeable c) { + if (c != null) { + try { + c.close(); + } catch (IOException ignore) { + } + } + } +} diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfParser.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfParser.java new file mode 100644 index 000000000000..e000918fa0f7 --- /dev/null +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfParser.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2017 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.statsd.loadtest; + +import android.annotation.Nullable; + +public interface PerfParser { + + /** + * Parses one line of the dumpsys output, and returns a string to write to the data file, + * or null if no string should be written. + */ + @Nullable String parseLine(String line); +} diff --git a/cmds/uiautomator/instrumentation/Android.mk b/cmds/uiautomator/instrumentation/Android.mk index e6cbdb4ec49b..008bb935cb71 100644 --- a/cmds/uiautomator/instrumentation/Android.mk +++ b/cmds/uiautomator/instrumentation/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, testrunner-src) \ $(call all-java-files-under, ../library/core-src) LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit +LOCAL_STATIC_JAVA_LIBRARIES := junit LOCAL_MODULE := uiautomator-instrumentation # TODO: change this to 18 when it's available LOCAL_SDK_VERSION := current diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk index 4bf856f8cbfa..22cffe60b2a8 100644 --- a/cmds/uiautomator/library/Android.mk +++ b/cmds/uiautomator/library/Android.mk @@ -28,8 +28,8 @@ uiautomator_internal_removed_api_file := \ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(uiautomator.core_src_files) LOCAL_MODULE := uiautomator.core -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base +LOCAL_STATIC_JAVA_LIBRARIES := junit include $(BUILD_STATIC_JAVA_LIBRARY) ############################################### diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 03a3631b111f..aa099eb19d37 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -7070,7 +7070,13 @@ public class Activity extends ContextThemeWrapper mActivityTransitionState.enterReady(this); } - final void performRestart() { + /** + * Restart the activity. + * @param start Indicates whether the activity should also be started after restart. + * The option to not start immediately is needed in case a transaction with + * multiple lifecycle transitions is in progress. + */ + final void performRestart(boolean start) { mCanEnterPictureInPicture = true; mFragments.noteStateNotSaved(); @@ -7108,12 +7114,14 @@ public class Activity extends ContextThemeWrapper "Activity " + mComponent.toShortString() + " did not call through to super.onRestart()"); } - performStart(); + if (start) { + performStart(); + } } } final void performResume() { - performRestart(); + performRestart(true /* start */); mFragments.execPendingActions(); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index b84833b973b9..8a4d29bb7bdb 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -16,6 +16,13 @@ package android.app; +import static android.app.servertransaction.ActivityLifecycleItem.ON_CREATE; +import static android.app.servertransaction.ActivityLifecycleItem.ON_DESTROY; +import static android.app.servertransaction.ActivityLifecycleItem.ON_PAUSE; +import static android.app.servertransaction.ActivityLifecycleItem.ON_RESUME; +import static android.app.servertransaction.ActivityLifecycleItem.ON_START; +import static android.app.servertransaction.ActivityLifecycleItem.ON_STOP; +import static android.app.servertransaction.ActivityLifecycleItem.PRE_ON_CREATE; import static android.view.Display.INVALID_DISPLAY; import android.annotation.NonNull; @@ -23,8 +30,12 @@ import android.annotation.Nullable; import android.app.assist.AssistContent; import android.app.assist.AssistStructure; import android.app.backup.BackupAgent; +import android.app.servertransaction.ActivityLifecycleItem.LifecycleState; import android.app.servertransaction.ActivityResultItem; import android.app.servertransaction.ClientTransaction; +import android.app.servertransaction.PendingTransactionActions; +import android.app.servertransaction.PendingTransactionActions.StopInfo; +import android.app.servertransaction.TransactionExecutor; import android.content.BroadcastReceiver; import android.content.ComponentCallbacks2; import android.content.ComponentName; @@ -84,7 +95,6 @@ import android.os.StrictMode; import android.os.SystemClock; import android.os.SystemProperties; import android.os.Trace; -import android.os.TransactionTooLargeException; import android.os.UserHandle; import android.provider.BlockedNumberContract; import android.provider.CalendarContract; @@ -102,7 +112,6 @@ import android.util.DisplayMetrics; import android.util.EventLog; import android.util.Log; import android.util.LogPrinter; -import android.util.LogWriter; import android.util.Pair; import android.util.PrintWriterPrinter; import android.util.Slog; @@ -122,6 +131,7 @@ import android.view.WindowManagerGlobal; import android.webkit.WebView; import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IVoiceInteractor; import com.android.internal.content.ReferrerIntent; import com.android.internal.os.BinderInternal; @@ -129,7 +139,6 @@ import com.android.internal.os.RuntimeInit; import com.android.internal.os.SomeArgs; import com.android.internal.util.ArrayUtils; import com.android.internal.util.FastPrintWriter; -import com.android.internal.util.IndentingPrintWriter; import com.android.org.conscrypt.OpenSSLSocketImpl; import com.android.org.conscrypt.TrustedCertificateStore; import com.android.server.am.proto.MemInfoProto; @@ -190,7 +199,7 @@ public final class ActivityThread extends ClientTransactionHandler { private static final boolean DEBUG_BACKUP = false; public static final boolean DEBUG_CONFIGURATION = false; private static final boolean DEBUG_SERVICE = false; - private static final boolean DEBUG_MEMORY_TRIM = false; + public static final boolean DEBUG_MEMORY_TRIM = false; private static final boolean DEBUG_PROVIDER = false; private static final boolean DEBUG_ORDER = false; private static final long MIN_TIME_BETWEEN_GCS = 5*1000; @@ -206,10 +215,6 @@ public final class ActivityThread extends ClientTransactionHandler { /** Type for IActivityManager.serviceDoneExecuting: done stopping (destroying) service */ public static final int SERVICE_DONE_EXECUTING_STOP = 2; - // Details for pausing activity. - private static final int USER_LEAVING = 1; - private static final int DONT_REPORT = 2; - // Whether to invoke an activity callback after delivering new configuration. private static final boolean REPORT_TO_ACTIVITY = true; @@ -289,12 +294,8 @@ public final class ActivityThread extends ClientTransactionHandler { final ArrayList<ActivityClientRecord> mRelaunchingActivities = new ArrayList<>(); @GuardedBy("mResourcesManager") Configuration mPendingConfiguration = null; - // Because we merge activity relaunch operations we can't depend on the ordering provided by - // the handler messages. We need to introduce secondary ordering mechanism, which will allow - // us to drop certain events, if we know that they happened before relaunch we already executed. - // This represents the order of receiving the request from AM. - @GuardedBy("mResourcesManager") - int mLifecycleSeq = 0; + // An executor that performs multi-step transactions. + private final TransactionExecutor mTransactionExecutor = new TransactionExecutor(this); private final ResourcesManager mResourcesManager; @@ -342,8 +343,9 @@ public final class ActivityThread extends ClientTransactionHandler { Bundle mCoreSettings = null; - static final class ActivityClientRecord { - IBinder token; + /** Activity client record, used for bookkeeping for the real {@link Activity} instance. */ + public static final class ActivityClientRecord { + public IBinder token; int ident; Intent intent; String referrer; @@ -355,6 +357,7 @@ public final class ActivityThread extends ClientTransactionHandler { Activity parent; String embeddedID; Activity.NonConfigurationInstances lastNonConfigurationInstances; + // TODO(lifecycler): Use mLifecycleState instead. boolean paused; boolean stopped; boolean hideForNow; @@ -371,13 +374,13 @@ public final class ActivityThread extends ClientTransactionHandler { ActivityInfo activityInfo; CompatibilityInfo compatInfo; - LoadedApk packageInfo; + public LoadedApk packageInfo; List<ResultInfo> pendingResults; List<ReferrerIntent> pendingIntents; boolean startsNotResumed; - boolean isForward; + public final boolean isForward; int pendingConfigChanges; boolean onlyLocalRequest; @@ -385,15 +388,42 @@ public final class ActivityThread extends ClientTransactionHandler { WindowManager mPendingRemoveWindowManager; boolean mPreserveWindow; - // Set for relaunch requests, indicates the order number of the relaunch operation, so it - // can be compared with other lifecycle operations. - int relaunchSeq = 0; + @LifecycleState + private int mLifecycleState = PRE_ON_CREATE; - // Can only be accessed from the UI thread. This represents the latest processed message - // that is related to lifecycle events/ - int lastProcessedSeq = 0; + @VisibleForTesting + public ActivityClientRecord() { + this.isForward = false; + init(); + } - ActivityClientRecord() { + public ActivityClientRecord(IBinder token, Intent intent, int ident, + ActivityInfo info, Configuration overrideConfig, CompatibilityInfo compatInfo, + String referrer, IVoiceInteractor voiceInteractor, Bundle state, + PersistableBundle persistentState, List<ResultInfo> pendingResults, + List<ReferrerIntent> pendingNewIntents, boolean isForward, + ProfilerInfo profilerInfo, ClientTransactionHandler client) { + this.token = token; + this.ident = ident; + this.intent = intent; + this.referrer = referrer; + this.voiceInteractor = voiceInteractor; + this.activityInfo = info; + this.compatInfo = compatInfo; + this.state = state; + this.persistentState = persistentState; + this.pendingResults = pendingResults; + this.pendingIntents = pendingNewIntents; + this.isForward = isForward; + this.profilerInfo = profilerInfo; + this.overrideConfig = overrideConfig; + this.packageInfo = client.getPackageInfoNoCheck(activityInfo.applicationInfo, + compatInfo); + init(); + } + + /** Common initializer for all constructors. */ + private void init() { parent = null; embeddedID = null; paused = false; @@ -410,6 +440,38 @@ public final class ActivityThread extends ClientTransactionHandler { }; } + /** Get the current lifecycle state. */ + public int getLifecycleState() { + return mLifecycleState; + } + + /** Update the current lifecycle state for internal bookkeeping. */ + public void setState(@LifecycleState int newLifecycleState) { + mLifecycleState = newLifecycleState; + switch (mLifecycleState) { + case ON_CREATE: + paused = true; + stopped = true; + break; + case ON_START: + paused = true; + stopped = false; + break; + case ON_RESUME: + paused = false; + stopped = false; + break; + case ON_PAUSE: + paused = true; + stopped = false; + break; + case ON_STOP: + paused = true; + stopped = true; + break; + } + } + public boolean isPreHoneycomb() { if (activity != null) { return activity.getApplicationInfo().targetSdkVersion @@ -1315,13 +1377,6 @@ public final class ActivityThread extends ClientTransactionHandler { mAppThread.updateProcessState(processState, fromIpc); } - @Override - public int getLifecycleSeq() { - synchronized (mResourcesManager) { - return mLifecycleSeq++; - } - } - class H extends Handler { public static final int BIND_APPLICATION = 110; public static final int EXIT_APPLICATION = 111; @@ -1586,7 +1641,7 @@ public final class ActivityThread extends ClientTransactionHandler { (String[]) ((SomeArgs) msg.obj).arg2); break; case EXECUTE_TRANSACTION: - ((ClientTransaction) msg.obj).execute(ActivityThread.this); + mTransactionExecutor.execute(((ClientTransaction) msg.obj)); break; } Object obj = msg.obj; @@ -1796,6 +1851,7 @@ public final class ActivityThread extends ClientTransactionHandler { registerPackage); } + @Override public final LoadedApk getPackageInfoNoCheck(ApplicationInfo ai, CompatibilityInfo compatInfo) { return getPackageInfo(ai, compatInfo, null, false, true, false); @@ -2479,13 +2535,21 @@ public final class ActivityThread extends ClientTransactionHandler { + ", comp=" + name + ", token=" + token); } - return performLaunchActivity(r, null); + // TODO(lifecycler): Can't switch to use #handleLaunchActivity() because it will try to + // call #reportSizeConfigurations(), but the server might not know anything about the + // activity if it was launched from LocalAcvitivyManager. + return performLaunchActivity(r); } public final Activity getActivity(IBinder token) { return mActivities.get(token).activity; } + @Override + public ActivityClientRecord getActivityClient(IBinder token) { + return mActivities.get(token); + } + public final void sendActivityResult( IBinder token, String id, int requestCode, int resultCode, Intent data) { @@ -2493,8 +2557,8 @@ public final class ActivityThread extends ClientTransactionHandler { + " req=" + requestCode + " res=" + resultCode + " data=" + data); ArrayList<ResultInfo> list = new ArrayList<ResultInfo>(); list.add(new ResultInfo(id, requestCode, resultCode, data)); - final ClientTransaction clientTransaction = new ClientTransaction(mAppThread, token); - clientTransaction.addCallback(new ActivityResultItem(list)); + final ClientTransaction clientTransaction = ClientTransaction.obtain(mAppThread, token); + clientTransaction.addCallback(ActivityResultItem.obtain(list)); try { mAppThread.scheduleTransaction(clientTransaction); } catch (RemoteException e) { @@ -2553,9 +2617,8 @@ public final class ActivityThread extends ClientTransactionHandler { sendMessage(H.CLEAN_UP_CONTEXT, cci); } - private Activity performLaunchActivity(ActivityClientRecord r, Intent customIntent) { - // System.out.println("##### [" + System.currentTimeMillis() + "] ActivityThread.performLaunchActivity(" + r + ")"); - + /** Core implementation of activity launch. */ + private Activity performLaunchActivity(ActivityClientRecord r) { ActivityInfo aInfo = r.activityInfo; if (r.packageInfo == null) { r.packageInfo = getPackageInfo(aInfo.applicationInfo, r.compatInfo, @@ -2625,9 +2688,6 @@ public final class ActivityThread extends ClientTransactionHandler { r.embeddedID, r.lastNonConfigurationInstances, config, r.referrer, r.voiceInteractor, window, r.configCallback); - if (customIntent != null) { - activity.mIntent = customIntent; - } r.lastNonConfigurationInstances = null; checkAndBlockForNetworkAccess(); activity.mStartedActivity = false; @@ -2648,37 +2708,8 @@ public final class ActivityThread extends ClientTransactionHandler { " did not call through to super.onCreate()"); } r.activity = activity; - r.stopped = true; - if (!r.activity.mFinished) { - activity.performStart(); - r.stopped = false; - } - if (!r.activity.mFinished) { - if (r.isPersistable()) { - if (r.state != null || r.persistentState != null) { - mInstrumentation.callActivityOnRestoreInstanceState(activity, r.state, - r.persistentState); - } - } else if (r.state != null) { - mInstrumentation.callActivityOnRestoreInstanceState(activity, r.state); - } - } - if (!r.activity.mFinished) { - activity.mCalled = false; - if (r.isPersistable()) { - mInstrumentation.callActivityOnPostCreate(activity, r.state, - r.persistentState); - } else { - mInstrumentation.callActivityOnPostCreate(activity, r.state); - } - if (!activity.mCalled) { - throw new SuperNotCalledException( - "Activity " + r.intent.getComponent().toShortString() + - " did not call through to super.onPostCreate()"); - } - } } - r.paused = true; + r.setState(ON_CREATE); mActivities.put(r.token, r); @@ -2696,6 +2727,60 @@ public final class ActivityThread extends ClientTransactionHandler { return activity; } + @Override + public void handleStartActivity(ActivityClientRecord r, + PendingTransactionActions pendingActions) { + final Activity activity = r.activity; + if (r.activity == null) { + // TODO(lifecycler): What do we do in this case? + return; + } + if (!r.stopped) { + throw new IllegalStateException("Can't start activity that is not stopped."); + } + if (r.activity.mFinished) { + // TODO(lifecycler): How can this happen? + return; + } + + // Start + activity.performStart(); + r.setState(ON_START); + + if (pendingActions == null) { + // No more work to do. + return; + } + + // Restore instance state + if (pendingActions.shouldRestoreInstanceState()) { + if (r.isPersistable()) { + if (r.state != null || r.persistentState != null) { + mInstrumentation.callActivityOnRestoreInstanceState(activity, r.state, + r.persistentState); + } + } else if (r.state != null) { + mInstrumentation.callActivityOnRestoreInstanceState(activity, r.state); + } + } + + // Call postOnCreate() + if (pendingActions.shouldCallOnPostCreate()) { + activity.mCalled = false; + if (r.isPersistable()) { + mInstrumentation.callActivityOnPostCreate(activity, r.state, + r.persistentState); + } else { + mInstrumentation.callActivityOnPostCreate(activity, r.state); + } + if (!activity.mCalled) { + throw new SuperNotCalledException( + "Activity " + r.intent.getComponent().toShortString() + + " did not call through to super.onPostCreate()"); + } + } + } + /** * Checks if {@link #mNetworkBlockSeq} is {@link #INVALID_PROC_STATE_SEQ} and if so, returns * immediately. Otherwise, makes a blocking call to ActivityManagerService to wait for the @@ -2742,38 +2827,12 @@ public final class ActivityThread extends ClientTransactionHandler { return appContext; } + /** + * Extended implementation of activity launch. Used when server requests a launch or relaunch. + */ @Override - public void handleLaunchActivity(IBinder token, Intent intent, int ident, ActivityInfo info, - Configuration overrideConfig, CompatibilityInfo compatInfo, String referrer, - IVoiceInteractor voiceInteractor, Bundle state, PersistableBundle persistentState, - List<ResultInfo> pendingResults, List<ReferrerIntent> pendingNewIntents, - boolean notResumed, boolean isForward, ProfilerInfo profilerInfo) { - ActivityClientRecord r = new ActivityClientRecord(); - - r.token = token; - r.ident = ident; - r.intent = intent; - r.referrer = referrer; - r.voiceInteractor = voiceInteractor; - r.activityInfo = info; - r.compatInfo = compatInfo; - r.state = state; - r.persistentState = persistentState; - - r.pendingResults = pendingResults; - r.pendingIntents = pendingNewIntents; - - r.startsNotResumed = notResumed; - r.isForward = isForward; - - r.profilerInfo = profilerInfo; - - r.overrideConfig = overrideConfig; - r.packageInfo = getPackageInfoNoCheck(r.activityInfo.applicationInfo, r.compatInfo); - handleLaunchActivity(r, null /* customIntent */, "LAUNCH_ACTIVITY"); - } - - private void handleLaunchActivity(ActivityClientRecord r, Intent customIntent, String reason) { + public Activity handleLaunchActivity(ActivityClientRecord r, + PendingTransactionActions pendingActions) { // If we are getting ready to gc after going to the background, well // we are back active so skip it. unscheduleGcIdler(); @@ -2796,44 +2855,28 @@ public final class ActivityThread extends ClientTransactionHandler { } WindowManagerGlobal.initialize(); - Activity a = performLaunchActivity(r, customIntent); + final Activity a = performLaunchActivity(r); if (a != null) { r.createdConfig = new Configuration(mConfiguration); reportSizeConfigurations(r); - Bundle oldState = r.state; - handleResumeActivity(r.token, false, r.isForward, - !r.activity.mFinished && !r.startsNotResumed, r.lastProcessedSeq, reason); - - if (!r.activity.mFinished && r.startsNotResumed) { - // The activity manager actually wants this one to start out paused, because it - // needs to be visible but isn't in the foreground. We accomplish this by going - // through the normal startup (because activities expect to go through onResume() - // the first time they run, before their window is displayed), and then pausing it. - // However, in this case we do -not- need to do the full pause cycle (of freezing - // and such) because the activity manager assumes it can just retain the current - // state it has. - performPauseActivityIfNeeded(r, reason); - - // We need to keep around the original state, in case we need to be created again. - // But we only do this for pre-Honeycomb apps, which always save their state when - // pausing, so we can not have them save their state when restarting from a paused - // state. For HC and later, we want to (and can) let the state be saved as the - // normal part of stopping the activity. - if (r.isPreHoneycomb()) { - r.state = oldState; - } + if (!r.activity.mFinished && pendingActions != null) { + pendingActions.setOldState(r.state); + pendingActions.setRestoreInstanceState(true); + pendingActions.setCallOnPostCreate(true); } } else { // If there was an error, for any reason, tell the activity manager to stop us. try { ActivityManager.getService() - .finishActivity(r.token, Activity.RESULT_CANCELED, null, - Activity.DONT_FINISH_TASK_WITH_ACTIVITY); + .finishActivity(r.token, Activity.RESULT_CANCELED, null, + Activity.DONT_FINISH_TASK_WITH_ACTIVITY); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); } } + + return a; } private void reportSizeConfigurations(ActivityClientRecord r) { @@ -3477,8 +3520,7 @@ public final class ActivityThread extends ClientTransactionHandler { //Slog.i(TAG, "Running services: " + mServices); } - public final ActivityClientRecord performResumeActivity(IBinder token, - boolean clearHide, String reason) { + ActivityClientRecord performResumeActivity(IBinder token, boolean clearHide, String reason) { ActivityClientRecord r = mActivities.get(token); if (localLOGV) Slog.v(TAG, "Performing resume of " + r + " finished=" + r.activity.mFinished); @@ -3518,10 +3560,9 @@ public final class ActivityThread extends ClientTransactionHandler { EventLog.writeEvent(LOG_AM_ON_RESUME_CALLED, UserHandle.myUserId(), r.activity.getComponentName().getClassName(), reason); - r.paused = false; - r.stopped = false; r.state = null; r.persistentState = null; + r.setState(ON_RESUME); } catch (Exception e) { if (!mInstrumentation.onException(r.activity, e)) { throw new RuntimeException( @@ -3553,19 +3594,14 @@ public final class ActivityThread extends ClientTransactionHandler { @Override public void handleResumeActivity(IBinder token, boolean clearHide, boolean isForward, - boolean reallyResume, int seq, String reason) { - ActivityClientRecord r = mActivities.get(token); - if (!checkAndUpdateLifecycleSeq(seq, r, "resumeActivity")) { - return; - } - + String reason) { // If we are getting ready to gc after going to the background, well // we are back active so skip it. unscheduleGcIdler(); mSomeActivitiesChanged = true; // TODO Push resumeArgs into the activity for consideration - r = performResumeActivity(token, clearHide, reason); + final ActivityClientRecord r = performResumeActivity(token, clearHide, reason); if (r != null) { final Activity a = r.activity; @@ -3677,16 +3713,6 @@ public final class ActivityThread extends ClientTransactionHandler { Looper.myQueue().addIdleHandler(new Idler()); } r.onlyLocalRequest = false; - - // Tell the activity manager we have resumed. - if (reallyResume) { - try { - ActivityManager.getService().activityResumed(token); - } catch (RemoteException ex) { - throw ex.rethrowFromSystemServer(); - } - } - } else { // If an exception was thrown when trying to resume, then // just end this activity. @@ -3757,21 +3783,17 @@ public final class ActivityThread extends ClientTransactionHandler { } @Override - public void handlePauseActivity(IBinder token, boolean finished, - boolean userLeaving, int configChanges, boolean dontReport, int seq) { + public void handlePauseActivity(IBinder token, boolean finished, boolean userLeaving, + int configChanges, boolean dontReport, PendingTransactionActions pendingActions) { ActivityClientRecord r = mActivities.get(token); - if (DEBUG_ORDER) Slog.d(TAG, "handlePauseActivity " + r + ", seq: " + seq); - if (!checkAndUpdateLifecycleSeq(seq, r, "pauseActivity")) { - return; - } if (r != null) { - //Slog.v(TAG, "userLeaving=" + userLeaving + " handling pause of " + r); if (userLeaving) { performUserLeavingActivity(r); } r.activity.mConfigChangeFlags |= configChanges; - performPauseActivity(token, finished, r.isPreHoneycomb(), "handlePauseActivity"); + performPauseActivity(token, finished, r.isPreHoneycomb(), "handlePauseActivity", + pendingActions); // Make sure any pending writes are now committed. if (r.isPreHoneycomb()) { @@ -3795,13 +3817,15 @@ public final class ActivityThread extends ClientTransactionHandler { } final Bundle performPauseActivity(IBinder token, boolean finished, - boolean saveState, String reason) { + boolean saveState, String reason, PendingTransactionActions pendingActions) { ActivityClientRecord r = mActivities.get(token); - return r != null ? performPauseActivity(r, finished, saveState, reason) : null; + return r != null + ? performPauseActivity(r, finished, saveState, reason, pendingActions) + : null; } - final Bundle performPauseActivity(ActivityClientRecord r, boolean finished, - boolean saveState, String reason) { + private Bundle performPauseActivity(ActivityClientRecord r, boolean finished, boolean saveState, + String reason, PendingTransactionActions pendingActions) { if (r.paused) { if (r.activity.mFinished) { // If we are finishing, we won't call onResume() in certain cases. @@ -3835,6 +3859,18 @@ public final class ActivityThread extends ClientTransactionHandler { listeners.get(i).onPaused(r.activity); } + final Bundle oldState = pendingActions != null ? pendingActions.getOldState() : null; + if (oldState != null) { + // We need to keep around the original state, in case we need to be created again. + // But we only do this for pre-Honeycomb apps, which always save their state when + // pausing, so we can not have them save their state when restarting from a paused + // state. For HC and later, we want to (and can) let the state be saved as the + // normal part of stopping the activity. + if (r.isPreHoneycomb()) { + r.state = oldState; + } + } + return !r.activity.mFinished && saveState ? r.state : null; } @@ -3861,7 +3897,7 @@ public final class ActivityThread extends ClientTransactionHandler { + safeToComponentShortString(r.intent) + ": " + e.toString(), e); } } - r.paused = true; + r.setState(ON_PAUSE); } final void performStopActivity(IBinder token, boolean saveState, String reason) { @@ -3869,37 +3905,6 @@ public final class ActivityThread extends ClientTransactionHandler { performStopActivityInner(r, null, false, saveState, reason); } - private static class StopInfo implements Runnable { - ActivityClientRecord activity; - Bundle state; - PersistableBundle persistentState; - CharSequence description; - - @Override public void run() { - // Tell activity manager we have been stopped. - try { - if (DEBUG_MEMORY_TRIM) Slog.v(TAG, "Reporting activity stopped: " + activity); - ActivityManager.getService().activityStopped( - activity.token, state, persistentState, description); - } catch (RemoteException ex) { - // Dump statistics about bundle to help developers debug - final LogWriter writer = new LogWriter(Log.WARN, TAG); - final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); - pw.println("Bundle stats:"); - Bundle.dumpStats(pw, state); - pw.println("PersistableBundle stats:"); - Bundle.dumpStats(pw, persistentState); - - if (ex instanceof TransactionTooLargeException - && activity.packageInfo.getTargetSdkVersion() < Build.VERSION_CODES.N) { - Log.e(TAG, "App sent too much data in instance state, so it was ignored", ex); - return; - } - throw ex.rethrowFromSystemServer(); - } - } - } - private static final class ProviderRefCount { public final ContentProviderHolder holder; public final ProviderClientRecord client; @@ -3930,8 +3935,8 @@ public final class ActivityThread extends ClientTransactionHandler { * For the client, we want to call onStop()/onStart() to indicate when * the activity's UI visibility changes. */ - private void performStopActivityInner(ActivityClientRecord r, - StopInfo info, boolean keepShown, boolean saveState, String reason) { + private void performStopActivityInner(ActivityClientRecord r, StopInfo info, boolean keepShown, + boolean saveState, String reason) { if (localLOGV) Slog.v(TAG, "Performing stop of " + r); if (r != null) { if (!keepShown && r.stopped) { @@ -3956,7 +3961,7 @@ public final class ActivityThread extends ClientTransactionHandler { // First create a thumbnail for the activity... // For now, don't create the thumbnail here; we are // doing that by doing a screen snapshot. - info.description = r.activity.onCreateDescription(); + info.setDescription(r.activity.onCreateDescription()); } catch (Exception e) { if (!mInstrumentation.onException(r.activity, e)) { throw new RuntimeException( @@ -3986,7 +3991,7 @@ public final class ActivityThread extends ClientTransactionHandler { + ": " + e.toString(), e); } } - r.stopped = true; + r.setState(ON_STOP); EventLog.writeEvent(LOG_AM_ON_STOP_CALLED, UserHandle.myUserId(), r.activity.getComponentName().getClassName(), reason); } @@ -4022,15 +4027,13 @@ public final class ActivityThread extends ClientTransactionHandler { } @Override - public void handleStopActivity(IBinder token, boolean show, int configChanges, int seq) { - ActivityClientRecord r = mActivities.get(token); - if (!checkAndUpdateLifecycleSeq(seq, r, "stopActivity")) { - return; - } + public void handleStopActivity(IBinder token, boolean show, int configChanges, + PendingTransactionActions pendingActions) { + final ActivityClientRecord r = mActivities.get(token); r.activity.mConfigChangeFlags |= configChanges; - StopInfo info = new StopInfo(); - performStopActivityInner(r, info, show, true, "handleStopActivity"); + final StopInfo stopInfo = new StopInfo(); + performStopActivityInner(r, stopInfo, show, true, "handleStopActivity"); if (localLOGV) Slog.v( TAG, "Finishing stop of " + r + ": show=" + show @@ -4043,37 +4046,32 @@ public final class ActivityThread extends ClientTransactionHandler { QueuedWork.waitToFinish(); } - // Schedule the call to tell the activity manager we have - // stopped. We don't do this immediately, because we want to - // have a chance for any other pending work (in particular memory - // trim requests) to complete before you tell the activity - // manager to proceed and allow us to go fully into the background. - info.activity = r; - info.state = r.state; - info.persistentState = r.persistentState; - mH.post(info); + stopInfo.setActivity(r); + stopInfo.setState(r.state); + stopInfo.setPersistentState(r.persistentState); + pendingActions.setStopInfo(stopInfo); mSomeActivitiesChanged = true; } - private static boolean checkAndUpdateLifecycleSeq(int seq, ActivityClientRecord r, - String action) { - if (r == null) { - return true; - } - if (seq < r.lastProcessedSeq) { - if (DEBUG_ORDER) Slog.d(TAG, action + " for " + r + " ignored, because seq=" + seq - + " < mCurrentLifecycleSeq=" + r.lastProcessedSeq); - return false; - } - r.lastProcessedSeq = seq; - return true; + /** + * Schedule the call to tell the activity manager we have stopped. We don't do this + * immediately, because we want to have a chance for any other pending work (in particular + * memory trim requests) to complete before you tell the activity manager to proceed and allow + * us to go fully into the background. + */ + @Override + public void reportStop(PendingTransactionActions pendingActions) { + mH.post(pendingActions.getStopInfo()); } - final void performRestartActivity(IBinder token) { + @Override + public void performRestartActivity(IBinder token, boolean start) { ActivityClientRecord r = mActivities.get(token); if (r.stopped) { - r.activity.performRestart(); - r.stopped = false; + r.activity.performRestart(start); + if (start) { + r.setState(ON_START); + } } } @@ -4093,8 +4091,8 @@ public final class ActivityThread extends ClientTransactionHandler { // we are back active so skip it. unscheduleGcIdler(); - r.activity.performRestart(); - r.stopped = false; + r.activity.performRestart(true /* start */); + r.setState(ON_START); } if (r.activity.mDecor != null) { if (false) Slog.v( @@ -4132,7 +4130,7 @@ public final class ActivityThread extends ClientTransactionHandler { + ": " + e.toString(), e); } } - r.stopped = true; + r.setState(ON_STOP); EventLog.writeEvent(LOG_AM_ON_STOP_CALLED, UserHandle.myUserId(), r.activity.getComponentName().getClassName(), "sleeping"); } @@ -4150,8 +4148,8 @@ public final class ActivityThread extends ClientTransactionHandler { } } else { if (r.stopped && r.activity.mVisibleFromServer) { - r.activity.performRestart(); - r.stopped = false; + r.activity.performRestart(true /* start */); + r.setState(ON_START); } } } @@ -4268,11 +4266,8 @@ public final class ActivityThread extends ClientTransactionHandler { } } - public final ActivityClientRecord performDestroyActivity(IBinder token, boolean finishing) { - return performDestroyActivity(token, finishing, 0, false); - } - - private ActivityClientRecord performDestroyActivity(IBinder token, boolean finishing, + /** Core implementation of activity destroy call. */ + ActivityClientRecord performDestroyActivity(IBinder token, boolean finishing, int configChanges, boolean getNonConfigInstance) { ActivityClientRecord r = mActivities.get(token); Class<? extends Activity> activityClass = null; @@ -4299,7 +4294,7 @@ public final class ActivityThread extends ClientTransactionHandler { + ": " + e.toString(), e); } } - r.stopped = true; + r.setState(ON_STOP); EventLog.writeEvent(LOG_AM_ON_STOP_CALLED, UserHandle.myUserId(), r.activity.getComponentName().getClassName(), "destroy"); } @@ -4336,6 +4331,7 @@ public final class ActivityThread extends ClientTransactionHandler { + ": " + e.toString(), e); } } + r.setState(ON_DESTROY); } mActivities.remove(token); StrictMode.decrementExpectedActivityCount(activityClass); @@ -4496,10 +4492,7 @@ public final class ActivityThread extends ClientTransactionHandler { target.overrideConfig = overrideConfig; } target.pendingConfigChanges |= configChanges; - target.relaunchSeq = getLifecycleSeq(); } - if (DEBUG_ORDER) Slog.d(TAG, "relaunchActivity " + ActivityThread.this + ", target " - + target + " operation received seq: " + target.relaunchSeq); } private void handleRelaunchActivity(ActivityClientRecord tmp) { @@ -4544,12 +4537,6 @@ public final class ActivityThread extends ClientTransactionHandler { } } - if (tmp.lastProcessedSeq > tmp.relaunchSeq) { - Slog.wtf(TAG, "For some reason target: " + tmp + " has lower sequence: " - + tmp.relaunchSeq + " than current sequence: " + tmp.lastProcessedSeq); - } else { - tmp.lastProcessedSeq = tmp.relaunchSeq; - } if (tmp.createdConfig != null) { // If the activity manager is passing us its current config, // assume that is really what we want regardless of what we @@ -4590,9 +4577,6 @@ public final class ActivityThread extends ClientTransactionHandler { r.activity.mConfigChangeFlags |= configChanges; r.onlyLocalRequest = tmp.onlyLocalRequest; r.mPreserveWindow = tmp.mPreserveWindow; - r.lastProcessedSeq = tmp.lastProcessedSeq; - r.relaunchSeq = tmp.relaunchSeq; - Intent currentIntent = r.activity.mIntent; r.activity.mChangingConfigurations = true; @@ -4618,7 +4602,8 @@ public final class ActivityThread extends ClientTransactionHandler { // Need to ensure state is saved. if (!r.paused) { - performPauseActivity(r.token, false, r.isPreHoneycomb(), "handleRelaunchActivity"); + performPauseActivity(r.token, false, r.isPreHoneycomb(), "handleRelaunchActivity", + null /* pendingActions */); } if (r.state == null && !r.stopped && !r.isPreHoneycomb()) { callCallActivityOnSaveInstanceState(r); @@ -4648,7 +4633,15 @@ public final class ActivityThread extends ClientTransactionHandler { r.startsNotResumed = tmp.startsNotResumed; r.overrideConfig = tmp.overrideConfig; - handleLaunchActivity(r, currentIntent, "handleRelaunchActivity"); + // TODO(lifecycler): Move relaunch to lifecycler. + PendingTransactionActions pendingActions = new PendingTransactionActions(); + handleLaunchActivity(r, pendingActions); + handleStartActivity(r, pendingActions); + handleResumeActivity(r.token, false /* clearHide */, r.isForward, "relaunch"); + if (r.startsNotResumed) { + performPauseActivity(r, false /* finished */, r.isPreHoneycomb(), "relaunch", + pendingActions); + } if (!tmp.onlyLocalRequest) { try { diff --git a/core/java/android/app/ClientTransactionHandler.java b/core/java/android/app/ClientTransactionHandler.java index f7f4c716d0b7..ef66af0c60f4 100644 --- a/core/java/android/app/ClientTransactionHandler.java +++ b/core/java/android/app/ClientTransactionHandler.java @@ -16,15 +16,12 @@ package android.app; import android.app.servertransaction.ClientTransaction; -import android.content.Intent; -import android.content.pm.ActivityInfo; +import android.app.servertransaction.PendingTransactionActions; +import android.content.pm.ApplicationInfo; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; -import android.os.Bundle; import android.os.IBinder; -import android.os.PersistableBundle; -import com.android.internal.app.IVoiceInteractor; import com.android.internal.content.ReferrerIntent; import java.util.List; @@ -40,7 +37,7 @@ public abstract class ClientTransactionHandler { /** Prepare and schedule transaction for execution. */ void scheduleTransaction(ClientTransaction transaction) { - transaction.prepare(this); + transaction.preExecute(this); sendMessage(ActivityThread.H.EXECUTE_TRANSACTION, transaction); } @@ -50,9 +47,6 @@ public abstract class ClientTransactionHandler { // Prepare phase related logic and handlers. Methods that inform about about pending changes or // do other internal bookkeeping. - /** Get current lifecycle request number to maintain correct ordering. */ - public abstract int getLifecycleSeq(); - /** Set pending config in case it will be updated by other transaction item. */ public abstract void updatePendingConfiguration(Configuration config); @@ -69,15 +63,21 @@ public abstract class ClientTransactionHandler { /** Pause the activity. */ public abstract void handlePauseActivity(IBinder token, boolean finished, boolean userLeaving, - int configChanges, boolean dontReport, int seq); + int configChanges, boolean dontReport, PendingTransactionActions pendingActions); /** Resume the activity. */ public abstract void handleResumeActivity(IBinder token, boolean clearHide, boolean isForward, - boolean reallyResume, int seq, String reason); + String reason); /** Stop the activity. */ public abstract void handleStopActivity(IBinder token, boolean show, int configChanges, - int seq); + PendingTransactionActions pendingActions); + + /** Report that activity was stopped to server. */ + public abstract void reportStop(PendingTransactionActions pendingActions); + + /** Restart the activity after it was stopped. */ + public abstract void performRestartActivity(IBinder token, boolean start); /** Deliver activity (override) configuration change. */ public abstract void handleActivityConfigurationChanged(IBinder activityToken, @@ -102,13 +102,23 @@ public abstract class ClientTransactionHandler { public abstract void handleWindowVisibility(IBinder token, boolean show); /** Perform activity launch. */ - public abstract void handleLaunchActivity(IBinder token, Intent intent, int ident, - ActivityInfo info, Configuration overrideConfig, CompatibilityInfo compatInfo, - String referrer, IVoiceInteractor voiceInteractor, Bundle state, - PersistableBundle persistentState, List<ResultInfo> pendingResults, - List<ReferrerIntent> pendingNewIntents, boolean notResumed, boolean isForward, - ProfilerInfo profilerInfo); + public abstract Activity handleLaunchActivity(ActivityThread.ActivityClientRecord r, + PendingTransactionActions pendingActions); + + /** Perform activity start. */ + public abstract void handleStartActivity(ActivityThread.ActivityClientRecord r, + PendingTransactionActions pendingActions); + + /** Get package info. */ + public abstract LoadedApk getPackageInfoNoCheck(ApplicationInfo ai, + CompatibilityInfo compatInfo); /** Deliver app configuration change notification. */ public abstract void handleConfigurationChanged(Configuration config); + + /** + * Get {@link android.app.ActivityThread.ActivityClientRecord} instance that corresponds to the + * provided token. + */ + public abstract ActivityThread.ActivityClientRecord getActivityClient(IBinder token); } diff --git a/core/java/android/app/LocalActivityManager.java b/core/java/android/app/LocalActivityManager.java index 3b273bc1c4b6..998ac5f2a487 100644 --- a/core/java/android/app/LocalActivityManager.java +++ b/core/java/android/app/LocalActivityManager.java @@ -22,6 +22,7 @@ import android.os.Binder; import android.os.Bundle; import android.util.Log; import android.view.Window; + import com.android.internal.content.ReferrerIntent; import java.util.ArrayList; @@ -161,12 +162,12 @@ public class LocalActivityManager { case CREATED: if (desiredState == STARTED) { if (localLOGV) Log.v(TAG, r.id + ": restarting"); - mActivityThread.performRestartActivity(r); + mActivityThread.performRestartActivity(r, true /* start */); r.curState = STARTED; } if (desiredState == RESUMED) { if (localLOGV) Log.v(TAG, r.id + ": restarting and resuming"); - mActivityThread.performRestartActivity(r); + mActivityThread.performRestartActivity(r, true /* start */); mActivityThread.performResumeActivity(r, true, "moveToState-CREATED"); r.curState = RESUMED; } @@ -207,7 +208,7 @@ public class LocalActivityManager { private void performPause(LocalActivityRecord r, boolean finishing) { final boolean needState = r.instanceState == null; final Bundle instanceState = mActivityThread.performPauseActivity( - r, finishing, needState, "performPause"); + r, finishing, needState, "performPause", null /* pendingActions */); if (needState) { r.instanceState = instanceState; } @@ -361,7 +362,8 @@ public class LocalActivityManager { performPause(r, finish); } if (localLOGV) Log.v(TAG, r.id + ": destroying"); - mActivityThread.performDestroyActivity(r, finish); + mActivityThread.performDestroyActivity(r, finish, 0 /* configChanges */, + false /* getNonConfigInstance */); r.activity = null; r.window = null; if (finish) { @@ -625,7 +627,8 @@ public class LocalActivityManager { for (int i=0; i<N; i++) { LocalActivityRecord r = mActivityArray.get(i); if (localLOGV) Log.v(TAG, r.id + ": destroying"); - mActivityThread.performDestroyActivity(r, finishing); + mActivityThread.performDestroyActivity(r, finishing, 0 /* configChanges */, + false /* getNonConfigInstance */); } mActivities.clear(); mActivityArray.clear(); diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 42c1347e265d..fb9efe6f321d 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1941,6 +1941,7 @@ public class Notification implements Parcelable mSortKey = parcel.readString(); extras = Bundle.setDefusable(parcel.readBundle(), true); // may be null + fixDuplicateExtras(); actions = parcel.createTypedArray(Action.CREATOR); // may be null @@ -2389,6 +2390,33 @@ public class Notification implements Parcelable }; /** + * Parcelling creates multiple copies of objects in {@code extras}. Fix them. + * <p> + * For backwards compatibility {@code extras} holds some references to "real" member data such + * as {@link getLargeIcon()} which is mirrored by {@link #EXTRA_LARGE_ICON}. This is mostly + * fine as long as the object stays in one process. + * <p> + * However, once the notification goes into a parcel each reference gets marshalled separately, + * wasting memory. Especially with large images on Auto and TV, this is worth fixing. + */ + private void fixDuplicateExtras() { + if (extras != null) { + fixDuplicateExtra(mSmallIcon, EXTRA_SMALL_ICON); + fixDuplicateExtra(mLargeIcon, EXTRA_LARGE_ICON); + } + } + + /** + * If we find an extra that's exactly the same as one of the "real" fields but refers to a + * separate object, replace it with the field's version to avoid holding duplicate copies. + */ + private void fixDuplicateExtra(@Nullable Parcelable original, @NonNull String extraName) { + if (original != null && extras.getParcelable(extraName) != null) { + extras.putParcelable(extraName, original); + } + } + + /** * Sets the {@link #contentView} field to be a view with the standard "Latest Event" * layout. * diff --git a/core/java/android/app/VrManager.java b/core/java/android/app/VrManager.java index 392387a99897..61b90e1766e5 100644 --- a/core/java/android/app/VrManager.java +++ b/core/java/android/app/VrManager.java @@ -4,6 +4,7 @@ import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.TestApi; import android.content.ComponentName; import android.content.Context; import android.os.Handler; @@ -214,4 +215,22 @@ public class VrManager { e.rethrowFromSystemServer(); } } + + /** + * Start VR Input method for the packageName in {@link ComponentName}. + * This method notifies InputMethodManagerService to use VR IME instead of + * regular phone IME. + * @param componentName ComponentName of a VR InputMethod that should be set as selected + * input by InputMethodManagerService. + * @hide + */ + @TestApi + @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) + public void setVrInputMethod(ComponentName componentName) { + try { + mService.setVrInputMethod(componentName); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + } + } } diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index db1f3af592fc..562b981941a7 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -57,7 +57,12 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; import android.provider.ContactsContract.Directory; +import android.security.AttestedKeyPair; import android.security.Credentials; +import android.security.KeyChain; +import android.security.KeyChainException; +import android.security.keystore.KeyGenParameterSpec; +import android.security.keystore.ParcelableKeyGenParameterSpec; import android.service.restrictions.RestrictionsReceiver; import android.telephony.TelephonyManager; import android.util.ArraySet; @@ -75,6 +80,7 @@ import java.lang.annotation.RetentionPolicy; import java.net.InetSocketAddress; import java.net.Proxy; import java.security.KeyFactory; +import java.security.KeyPair; import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; import java.security.cert.Certificate; @@ -3943,6 +3949,50 @@ public class DevicePolicyManager { } /** + * Called by a device or profile owner, or delegated certificate installer, to generate a + * new private/public key pair. If the device supports key generation via secure hardware, + * this method is useful for creating a key in KeyChain that never left the secure hardware. + * + * Access to the key is controlled the same way as in {@link #installKeyPair}. + * @param admin Which {@link DeviceAdminReceiver} this request is associated with, or + * {@code null} if calling from a delegated certificate installer. + * @param algorithm The key generation algorithm, see {@link java.security.KeyPairGenerator}. + * @param keySpec Specification of the key to generate, see + * {@link java.security.KeyPairGenerator}. + * @return A non-null {@code AttestedKeyPair} if the key generation succeeded, null otherwise. + * @throws SecurityException if {@code admin} is not {@code null} and not a device or profile + * owner. + * @throws IllegalArgumentException if the alias in {@code keySpec} is empty, or if the + * algorithm specification in {@code keySpec} is not {@code RSAKeyGenParameterSpec} + * or {@code ECGenParameterSpec}. + */ + public AttestedKeyPair generateKeyPair(@Nullable ComponentName admin, + @NonNull String algorithm, @NonNull KeyGenParameterSpec keySpec) { + throwIfParentInstance("generateKeyPair"); + try { + final ParcelableKeyGenParameterSpec parcelableSpec = + new ParcelableKeyGenParameterSpec(keySpec); + final boolean success = mService.generateKeyPair( + admin, mContext.getPackageName(), algorithm, parcelableSpec); + if (!success) { + Log.e(TAG, "Error generating key via DevicePolicyManagerService."); + return null; + } + + final KeyPair keyPair = KeyChain.getKeyPair(mContext, keySpec.getKeystoreAlias()); + return new AttestedKeyPair(keyPair, null); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } catch (KeyChainException e) { + Log.w(TAG, "Failed to generate key", e); + } catch (InterruptedException e) { + Log.w(TAG, "Interrupted while generating key", e); + Thread.currentThread().interrupt(); + } + return null; + } + + /** * @return the alias of a given CA certificate in the certificate store, or {@code null} if it * doesn't exist. */ diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 1f17dbc20c7c..c525df725d47 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -36,6 +36,7 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.os.RemoteCallback; import android.os.UserHandle; +import android.security.keystore.ParcelableKeyGenParameterSpec; import java.util.List; @@ -165,6 +166,7 @@ interface IDevicePolicyManager { in byte[] certBuffer, in byte[] certChainBuffer, String alias, boolean requestAccess, boolean isUserSelectable); boolean removeKeyPair(in ComponentName who, in String callerPackage, String alias); + boolean generateKeyPair(in ComponentName who, in String callerPackage, in String algorithm, in ParcelableKeyGenParameterSpec keySpec); void choosePrivateKeyAlias(int uid, in Uri uri, in String alias, IBinder aliasCallback); void setDelegatedScopes(in ComponentName who, in String delegatePackage, in List<String> scopes); diff --git a/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java b/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java index 07001e2b0ad7..a2b7d5809c4d 100644 --- a/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java +++ b/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java @@ -19,25 +19,25 @@ package android.app.servertransaction; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; import static android.view.Display.INVALID_DISPLAY; +import android.app.ClientTransactionHandler; import android.content.res.Configuration; import android.os.IBinder; import android.os.Parcel; import android.os.Trace; +import java.util.Objects; + /** * Activity configuration changed callback. * @hide */ public class ActivityConfigurationChangeItem extends ClientTransactionItem { - private final Configuration mConfiguration; - - public ActivityConfigurationChangeItem(Configuration configuration) { - mConfiguration = configuration; - } + private Configuration mConfiguration; @Override - public void execute(android.app.ClientTransactionHandler client, IBinder token) { + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { // TODO(lifecycler): detect if PIP or multi-window mode changed and report it here. Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityConfigChanged"); client.handleActivityConfigurationChanged(token, mConfiguration, INVALID_DISPLAY); @@ -45,6 +45,29 @@ public class ActivityConfigurationChangeItem extends ClientTransactionItem { } + // ObjectPoolItem implementation + + private ActivityConfigurationChangeItem() {} + + /** Obtain an instance initialized with provided params. */ + public static ActivityConfigurationChangeItem obtain(Configuration config) { + ActivityConfigurationChangeItem instance = + ObjectPool.obtain(ActivityConfigurationChangeItem.class); + if (instance == null) { + instance = new ActivityConfigurationChangeItem(); + } + instance.mConfiguration = config; + + return instance; + } + + @Override + public void recycle() { + mConfiguration = null; + ObjectPool.recycle(this); + } + + // Parcelable implementation /** Write to Parcel. */ @@ -78,11 +101,16 @@ public class ActivityConfigurationChangeItem extends ClientTransactionItem { return false; } final ActivityConfigurationChangeItem other = (ActivityConfigurationChangeItem) o; - return mConfiguration.equals(other.mConfiguration); + return Objects.equals(mConfiguration, other.mConfiguration); } @Override public int hashCode() { return mConfiguration.hashCode(); } + + @Override + public String toString() { + return "ActivityConfigurationChange{config=" + mConfiguration + "}"; + } } diff --git a/core/java/android/app/servertransaction/ActivityLifecycleItem.java b/core/java/android/app/servertransaction/ActivityLifecycleItem.java index a64108db7c21..24141e5152b9 100644 --- a/core/java/android/app/servertransaction/ActivityLifecycleItem.java +++ b/core/java/android/app/servertransaction/ActivityLifecycleItem.java @@ -27,16 +27,19 @@ import java.lang.annotation.RetentionPolicy; */ public abstract class ActivityLifecycleItem extends ClientTransactionItem { - static final boolean DEBUG_ORDER = false; - - @IntDef({UNDEFINED, RESUMED, PAUSED, STOPPED, DESTROYED}) + @IntDef({UNDEFINED, PRE_ON_CREATE, ON_CREATE, ON_START, ON_RESUME, ON_PAUSE, ON_STOP, + ON_DESTROY, ON_RESTART}) @Retention(RetentionPolicy.SOURCE) - @interface LifecycleState{} + public @interface LifecycleState{} public static final int UNDEFINED = -1; - public static final int RESUMED = 0; - public static final int PAUSED = 1; - public static final int STOPPED = 2; - public static final int DESTROYED = 3; + public static final int PRE_ON_CREATE = 0; + public static final int ON_CREATE = 1; + public static final int ON_START = 2; + public static final int ON_RESUME = 3; + public static final int ON_PAUSE = 4; + public static final int ON_STOP = 5; + public static final int ON_DESTROY = 6; + public static final int ON_RESTART = 7; /** A final lifecycle state that an activity should reach. */ @LifecycleState diff --git a/core/java/android/app/servertransaction/ActivityResultItem.java b/core/java/android/app/servertransaction/ActivityResultItem.java index 76664d8e59e6..73b5ec440441 100644 --- a/core/java/android/app/servertransaction/ActivityResultItem.java +++ b/core/java/android/app/servertransaction/ActivityResultItem.java @@ -16,9 +16,10 @@ package android.app.servertransaction; -import static android.app.servertransaction.ActivityLifecycleItem.PAUSED; +import static android.app.servertransaction.ActivityLifecycleItem.ON_PAUSE; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; +import android.app.ClientTransactionHandler; import android.app.ResultInfo; import android.os.IBinder; import android.os.Parcel; @@ -26,6 +27,7 @@ import android.os.Parcelable; import android.os.Trace; import java.util.List; +import java.util.Objects; /** * Activity result delivery callback. @@ -33,25 +35,44 @@ import java.util.List; */ public class ActivityResultItem extends ClientTransactionItem { - private final List<ResultInfo> mResultInfoList; - - public ActivityResultItem(List<ResultInfo> resultInfos) { - mResultInfoList = resultInfos; - } + private List<ResultInfo> mResultInfoList; @Override public int getPreExecutionState() { - return PAUSED; + return ON_PAUSE; } @Override - public void execute(android.app.ClientTransactionHandler client, IBinder token) { + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityDeliverResult"); client.handleSendResult(token, mResultInfoList); Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); } + // ObjectPoolItem implementation + + private ActivityResultItem() {} + + /** Obtain an instance initialized with provided params. */ + public static ActivityResultItem obtain(List<ResultInfo> resultInfoList) { + ActivityResultItem instance = ObjectPool.obtain(ActivityResultItem.class); + if (instance == null) { + instance = new ActivityResultItem(); + } + instance.mResultInfoList = resultInfoList; + + return instance; + } + + @Override + public void recycle() { + mResultInfoList = null; + ObjectPool.recycle(this); + } + + // Parcelable implementation /** Write to Parcel. */ @@ -85,11 +106,16 @@ public class ActivityResultItem extends ClientTransactionItem { return false; } final ActivityResultItem other = (ActivityResultItem) o; - return mResultInfoList.equals(other.mResultInfoList); + return Objects.equals(mResultInfoList, other.mResultInfoList); } @Override public int hashCode() { return mResultInfoList.hashCode(); } + + @Override + public String toString() { + return "ActivityResultItem{resultInfoList=" + mResultInfoList + "}"; + } } diff --git a/core/java/android/app/servertransaction/BaseClientRequest.java b/core/java/android/app/servertransaction/BaseClientRequest.java index 4bd01afb5061..c91e0ca5ffc1 100644 --- a/core/java/android/app/servertransaction/BaseClientRequest.java +++ b/core/java/android/app/servertransaction/BaseClientRequest.java @@ -24,7 +24,7 @@ import android.os.IBinder; * Each of them can be prepared before scheduling and, eventually, executed. * @hide */ -public interface BaseClientRequest { +public interface BaseClientRequest extends ObjectPoolItem { /** * Prepare the client request before scheduling. @@ -33,13 +33,25 @@ public interface BaseClientRequest { * @param client Target client handler. * @param token Target activity token. */ - default void prepare(ClientTransactionHandler client, IBinder token) { + default void preExecute(ClientTransactionHandler client, IBinder token) { } /** * Execute the request. * @param client Target client handler. * @param token Target activity token. + * @param pendingActions Container that may have data pending to be used. */ - void execute(ClientTransactionHandler client, IBinder token); + void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions); + + /** + * Perform all actions that need to happen after execution, e.g. report the result to server. + * @param client Target client handler. + * @param token Target activity token. + * @param pendingActions Container that may have data pending to be used. + */ + default void postExecute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { + } } diff --git a/core/java/android/app/servertransaction/ClientTransaction.java b/core/java/android/app/servertransaction/ClientTransaction.java index d2289ba0d745..764ceede5d20 100644 --- a/core/java/android/app/servertransaction/ClientTransaction.java +++ b/core/java/android/app/servertransaction/ClientTransaction.java @@ -16,6 +16,7 @@ package android.app.servertransaction; +import android.annotation.Nullable; import android.app.ClientTransactionHandler; import android.app.IApplicationThread; import android.os.IBinder; @@ -36,7 +37,7 @@ import java.util.Objects; * @see ActivityLifecycleItem * @hide */ -public class ClientTransaction implements Parcelable { +public class ClientTransaction implements Parcelable, ObjectPoolItem { /** A list of individual callbacks to a client. */ private List<ClientTransactionItem> mActivityCallbacks; @@ -53,11 +54,6 @@ public class ClientTransaction implements Parcelable { /** Target client activity. Might be null if the entire transaction is targeting an app. */ private IBinder mActivityToken; - public ClientTransaction(IApplicationThread client, IBinder activityToken) { - mClient = client; - mActivityToken = activityToken; - } - /** * Add a message to the end of the sequence of callbacks. * @param activityCallback A single message that can contain a lifecycle request/callback. @@ -69,6 +65,23 @@ public class ClientTransaction implements Parcelable { mActivityCallbacks.add(activityCallback); } + /** Get the list of callbacks. */ + @Nullable + List<ClientTransactionItem> getCallbacks() { + return mActivityCallbacks; + } + + /** Get the target activity. */ + @Nullable + public IBinder getActivityToken() { + return mActivityToken; + } + + /** Get the target state lifecycle request. */ + ActivityLifecycleItem getLifecycleStateRequest() { + return mLifecycleStateRequest; + } + /** * Set the lifecycle state in which the client should be after executing the transaction. * @param stateRequest A lifecycle request initialized with right parameters. @@ -82,50 +95,68 @@ public class ClientTransaction implements Parcelable { * @param clientTransactionHandler Handler on the client side that will executed all operations * requested by transaction items. */ - public void prepare(android.app.ClientTransactionHandler clientTransactionHandler) { + public void preExecute(android.app.ClientTransactionHandler clientTransactionHandler) { if (mActivityCallbacks != null) { final int size = mActivityCallbacks.size(); for (int i = 0; i < size; ++i) { - mActivityCallbacks.get(i).prepare(clientTransactionHandler, mActivityToken); + mActivityCallbacks.get(i).preExecute(clientTransactionHandler, mActivityToken); } } if (mLifecycleStateRequest != null) { - mLifecycleStateRequest.prepare(clientTransactionHandler, mActivityToken); - } - } - - /** - * Execute the transaction. - * @param clientTransactionHandler Handler on the client side that will execute all operations - * requested by transaction items. - */ - public void execute(android.app.ClientTransactionHandler clientTransactionHandler) { - if (mActivityCallbacks != null) { - final int size = mActivityCallbacks.size(); - for (int i = 0; i < size; ++i) { - mActivityCallbacks.get(i).execute(clientTransactionHandler, mActivityToken); - } - } - if (mLifecycleStateRequest != null) { - mLifecycleStateRequest.execute(clientTransactionHandler, mActivityToken); + mLifecycleStateRequest.preExecute(clientTransactionHandler, mActivityToken); } } /** * Schedule the transaction after it was initialized. It will be send to client and all its * individual parts will be applied in the following sequence: - * 1. The client calls {@link #prepare(ClientTransactionHandler)}, which triggers all work that - * needs to be done before actually scheduling the transaction for callbacks and lifecycle - * state request. + * 1. The client calls {@link #preExecute(ClientTransactionHandler)}, which triggers all work + * that needs to be done before actually scheduling the transaction for callbacks and + * lifecycle state request. * 2. The transaction message is scheduled. - * 3. The client calls {@link #execute(ClientTransactionHandler)}, which executes all callbacks - * and necessary lifecycle transitions. + * 3. The client calls {@link TransactionExecutor#execute(ClientTransaction)}, which executes + * all callbacks and necessary lifecycle transitions. */ public void schedule() throws RemoteException { mClient.scheduleTransaction(this); } + // ObjectPoolItem implementation + + private ClientTransaction() {} + + /** Obtain an instance initialized with provided params. */ + public static ClientTransaction obtain(IApplicationThread client, IBinder activityToken) { + ClientTransaction instance = ObjectPool.obtain(ClientTransaction.class); + if (instance == null) { + instance = new ClientTransaction(); + } + instance.mClient = client; + instance.mActivityToken = activityToken; + + return instance; + } + + @Override + public void recycle() { + if (mActivityCallbacks != null) { + int size = mActivityCallbacks.size(); + for (int i = 0; i < size; i++) { + mActivityCallbacks.get(i).recycle(); + } + mActivityCallbacks.clear(); + } + if (mLifecycleStateRequest != null) { + mLifecycleStateRequest.recycle(); + mLifecycleStateRequest = null; + } + mClient = null; + mActivityToken = null; + ObjectPool.recycle(this); + } + + // Parcelable implementation /** Write to Parcel. */ diff --git a/core/java/android/app/servertransaction/ConfigurationChangeItem.java b/core/java/android/app/servertransaction/ConfigurationChangeItem.java index 055923ec8efd..4ab7251e4d8a 100644 --- a/core/java/android/app/servertransaction/ConfigurationChangeItem.java +++ b/core/java/android/app/servertransaction/ConfigurationChangeItem.java @@ -16,32 +16,55 @@ package android.app.servertransaction; +import android.app.ClientTransactionHandler; import android.content.res.Configuration; import android.os.IBinder; import android.os.Parcel; +import java.util.Objects; + /** * App configuration change message. * @hide */ public class ConfigurationChangeItem extends ClientTransactionItem { - private final Configuration mConfiguration; - - public ConfigurationChangeItem(Configuration configuration) { - mConfiguration = new Configuration(configuration); - } + private Configuration mConfiguration; @Override - public void prepare(android.app.ClientTransactionHandler client, IBinder token) { + public void preExecute(android.app.ClientTransactionHandler client, IBinder token) { client.updatePendingConfiguration(mConfiguration); } @Override - public void execute(android.app.ClientTransactionHandler client, IBinder token) { + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { client.handleConfigurationChanged(mConfiguration); } + + // ObjectPoolItem implementation + + private ConfigurationChangeItem() {} + + /** Obtain an instance initialized with provided params. */ + public static ConfigurationChangeItem obtain(Configuration config) { + ConfigurationChangeItem instance = ObjectPool.obtain(ConfigurationChangeItem.class); + if (instance == null) { + instance = new ConfigurationChangeItem(); + } + instance.mConfiguration = config; + + return instance; + } + + @Override + public void recycle() { + mConfiguration = null; + ObjectPool.recycle(this); + } + + // Parcelable implementation /** Write to Parcel. */ @@ -75,11 +98,16 @@ public class ConfigurationChangeItem extends ClientTransactionItem { return false; } final ConfigurationChangeItem other = (ConfigurationChangeItem) o; - return mConfiguration.equals(other.mConfiguration); + return Objects.equals(mConfiguration, other.mConfiguration); } @Override public int hashCode() { return mConfiguration.hashCode(); } + + @Override + public String toString() { + return "ConfigurationChangeItem{config=" + mConfiguration + "}"; + } } diff --git a/core/java/android/app/servertransaction/DestroyActivityItem.java b/core/java/android/app/servertransaction/DestroyActivityItem.java index 38fd5fb6c779..83da5f33c62a 100644 --- a/core/java/android/app/servertransaction/DestroyActivityItem.java +++ b/core/java/android/app/servertransaction/DestroyActivityItem.java @@ -29,16 +29,12 @@ import android.os.Trace; */ public class DestroyActivityItem extends ActivityLifecycleItem { - private final boolean mFinished; - private final int mConfigChanges; - - public DestroyActivityItem(boolean finished, int configChanges) { - mFinished = finished; - mConfigChanges = configChanges; - } + private boolean mFinished; + private int mConfigChanges; @Override - public void execute(ClientTransactionHandler client, IBinder token) { + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityDestroy"); client.handleDestroyActivity(token, mFinished, mConfigChanges, false /* getNonConfigInstance */); @@ -47,7 +43,31 @@ public class DestroyActivityItem extends ActivityLifecycleItem { @Override public int getTargetState() { - return DESTROYED; + return ON_DESTROY; + } + + + // ObjectPoolItem implementation + + private DestroyActivityItem() {} + + /** Obtain an instance initialized with provided params. */ + public static DestroyActivityItem obtain(boolean finished, int configChanges) { + DestroyActivityItem instance = ObjectPool.obtain(DestroyActivityItem.class); + if (instance == null) { + instance = new DestroyActivityItem(); + } + instance.mFinished = finished; + instance.mConfigChanges = configChanges; + + return instance; + } + + @Override + public void recycle() { + mFinished = false; + mConfigChanges = 0; + ObjectPool.recycle(this); } @@ -96,4 +116,10 @@ public class DestroyActivityItem extends ActivityLifecycleItem { result = 31 * result + mConfigChanges; return result; } + + @Override + public String toString() { + return "DestroyActivityItem{finished=" + mFinished + ",mConfigChanges=" + + mConfigChanges + "}"; + } } diff --git a/core/java/android/app/servertransaction/LaunchActivityItem.java b/core/java/android/app/servertransaction/LaunchActivityItem.java index 417ebac8ea20..7be82bf9f505 100644 --- a/core/java/android/app/servertransaction/LaunchActivityItem.java +++ b/core/java/android/app/servertransaction/LaunchActivityItem.java @@ -18,6 +18,7 @@ package android.app.servertransaction; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; +import android.app.ActivityThread.ActivityClientRecord; import android.app.ClientTransactionHandler; import android.app.ProfilerInfo; import android.app.ResultInfo; @@ -42,68 +43,69 @@ import java.util.Objects; * Request to launch an activity. * @hide */ -public class LaunchActivityItem extends ActivityLifecycleItem { - - private final Intent mIntent; - private final int mIdent; - private final ActivityInfo mInfo; - private final Configuration mCurConfig; - private final Configuration mOverrideConfig; - private final CompatibilityInfo mCompatInfo; - private final String mReferrer; - private final IVoiceInteractor mVoiceInteractor; - private final int mProcState; - private final Bundle mState; - private final PersistableBundle mPersistentState; - private final List<ResultInfo> mPendingResults; - private final List<ReferrerIntent> mPendingNewIntents; - // TODO(lifecycler): use lifecycle request instead of this param. - private final boolean mNotResumed; - private final boolean mIsForward; - private final ProfilerInfo mProfilerInfo; - - public LaunchActivityItem(Intent intent, int ident, ActivityInfo info, - Configuration curConfig, Configuration overrideConfig, CompatibilityInfo compatInfo, - String referrer, IVoiceInteractor voiceInteractor, int procState, Bundle state, - PersistableBundle persistentState, List<ResultInfo> pendingResults, - List<ReferrerIntent> pendingNewIntents, boolean notResumed, boolean isForward, - ProfilerInfo profilerInfo) { - mIntent = intent; - mIdent = ident; - mInfo = info; - mCurConfig = curConfig; - mOverrideConfig = overrideConfig; - mCompatInfo = compatInfo; - mReferrer = referrer; - mVoiceInteractor = voiceInteractor; - mProcState = procState; - mState = state; - mPersistentState = persistentState; - mPendingResults = pendingResults; - mPendingNewIntents = pendingNewIntents; - mNotResumed = notResumed; - mIsForward = isForward; - mProfilerInfo = profilerInfo; - } +public class LaunchActivityItem extends ClientTransactionItem { + + private Intent mIntent; + private int mIdent; + private ActivityInfo mInfo; + private Configuration mCurConfig; + private Configuration mOverrideConfig; + private CompatibilityInfo mCompatInfo; + private String mReferrer; + private IVoiceInteractor mVoiceInteractor; + private int mProcState; + private Bundle mState; + private PersistableBundle mPersistentState; + private List<ResultInfo> mPendingResults; + private List<ReferrerIntent> mPendingNewIntents; + private boolean mIsForward; + private ProfilerInfo mProfilerInfo; @Override - public void prepare(ClientTransactionHandler client, IBinder token) { + public void preExecute(ClientTransactionHandler client, IBinder token) { client.updateProcessState(mProcState, false); client.updatePendingConfiguration(mCurConfig); } @Override - public void execute(ClientTransactionHandler client, IBinder token) { + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityStart"); - client.handleLaunchActivity(token, mIntent, mIdent, mInfo, mOverrideConfig, mCompatInfo, - mReferrer, mVoiceInteractor, mState, mPersistentState, mPendingResults, - mPendingNewIntents, mNotResumed, mIsForward, mProfilerInfo); + ActivityClientRecord r = new ActivityClientRecord(token, mIntent, mIdent, mInfo, + mOverrideConfig, mCompatInfo, mReferrer, mVoiceInteractor, mState, mPersistentState, + mPendingResults, mPendingNewIntents, mIsForward, + mProfilerInfo, client); + client.handleLaunchActivity(r, pendingActions); Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); } + + // ObjectPoolItem implementation + + private LaunchActivityItem() {} + + /** Obtain an instance initialized with provided params. */ + public static LaunchActivityItem obtain(Intent intent, int ident, ActivityInfo info, + Configuration curConfig, Configuration overrideConfig, CompatibilityInfo compatInfo, + String referrer, IVoiceInteractor voiceInteractor, int procState, Bundle state, + PersistableBundle persistentState, List<ResultInfo> pendingResults, + List<ReferrerIntent> pendingNewIntents, boolean isForward, ProfilerInfo profilerInfo) { + LaunchActivityItem instance = ObjectPool.obtain(LaunchActivityItem.class); + if (instance == null) { + instance = new LaunchActivityItem(); + } + setValues(instance, intent, ident, info, curConfig, overrideConfig, compatInfo, referrer, + voiceInteractor, procState, state, persistentState, pendingResults, + pendingNewIntents, isForward, profilerInfo); + + return instance; + } + @Override - public int getTargetState() { - return mNotResumed ? PAUSED : RESUMED; + public void recycle() { + setValues(this, null, 0, null, null, null, null, null, null, 0, null, null, null, null, + false, null); + ObjectPool.recycle(this); } @@ -119,35 +121,28 @@ public class LaunchActivityItem extends ActivityLifecycleItem { dest.writeTypedObject(mOverrideConfig, flags); dest.writeTypedObject(mCompatInfo, flags); dest.writeString(mReferrer); - dest.writeStrongBinder(mVoiceInteractor != null ? mVoiceInteractor.asBinder() : null); + dest.writeStrongInterface(mVoiceInteractor); dest.writeInt(mProcState); dest.writeBundle(mState); dest.writePersistableBundle(mPersistentState); dest.writeTypedList(mPendingResults, flags); dest.writeTypedList(mPendingNewIntents, flags); - dest.writeBoolean(mNotResumed); dest.writeBoolean(mIsForward); dest.writeTypedObject(mProfilerInfo, flags); } /** Read from Parcel. */ private LaunchActivityItem(Parcel in) { - mIntent = in.readTypedObject(Intent.CREATOR); - mIdent = in.readInt(); - mInfo = in.readTypedObject(ActivityInfo.CREATOR); - mCurConfig = in.readTypedObject(Configuration.CREATOR); - mOverrideConfig = in.readTypedObject(Configuration.CREATOR); - mCompatInfo = in.readTypedObject(CompatibilityInfo.CREATOR); - mReferrer = in.readString(); - mVoiceInteractor = (IVoiceInteractor) in.readStrongBinder(); - mProcState = in.readInt(); - mState = in.readBundle(getClass().getClassLoader()); - mPersistentState = in.readPersistableBundle(getClass().getClassLoader()); - mPendingResults = in.createTypedArrayList(ResultInfo.CREATOR); - mPendingNewIntents = in.createTypedArrayList(ReferrerIntent.CREATOR); - mNotResumed = in.readBoolean(); - mIsForward = in.readBoolean(); - mProfilerInfo = in.readTypedObject(ProfilerInfo.CREATOR); + setValues(this, in.readTypedObject(Intent.CREATOR), in.readInt(), + in.readTypedObject(ActivityInfo.CREATOR), in.readTypedObject(Configuration.CREATOR), + in.readTypedObject(Configuration.CREATOR), + in.readTypedObject(CompatibilityInfo.CREATOR), in.readString(), + IVoiceInteractor.Stub.asInterface(in.readStrongBinder()), in.readInt(), + in.readBundle(getClass().getClassLoader()), + in.readPersistableBundle(getClass().getClassLoader()), + in.createTypedArrayList(ResultInfo.CREATOR), + in.createTypedArrayList(ReferrerIntent.CREATOR), in.readBoolean(), + in.readTypedObject(ProfilerInfo.CREATOR)); } public static final Creator<LaunchActivityItem> CREATOR = @@ -170,7 +165,9 @@ public class LaunchActivityItem extends ActivityLifecycleItem { return false; } final LaunchActivityItem other = (LaunchActivityItem) o; - return mIntent.filterEquals(other.mIntent) && mIdent == other.mIdent + final boolean intentsEqual = (mIntent == null && other.mIntent == null) + || (mIntent != null && mIntent.filterEquals(other.mIntent)); + return intentsEqual && mIdent == other.mIdent && activityInfoEqual(other.mInfo) && Objects.equals(mCurConfig, other.mCurConfig) && Objects.equals(mOverrideConfig, other.mOverrideConfig) && Objects.equals(mCompatInfo, other.mCompatInfo) @@ -179,7 +176,7 @@ public class LaunchActivityItem extends ActivityLifecycleItem { && areBundlesEqual(mPersistentState, other.mPersistentState) && Objects.equals(mPendingResults, other.mPendingResults) && Objects.equals(mPendingNewIntents, other.mPendingNewIntents) - && mNotResumed == other.mNotResumed && mIsForward == other.mIsForward + && mIsForward == other.mIsForward && Objects.equals(mProfilerInfo, other.mProfilerInfo); } @@ -197,14 +194,17 @@ public class LaunchActivityItem extends ActivityLifecycleItem { result = 31 * result + (mPersistentState != null ? mPersistentState.size() : 0); result = 31 * result + Objects.hashCode(mPendingResults); result = 31 * result + Objects.hashCode(mPendingNewIntents); - result = 31 * result + (mNotResumed ? 1 : 0); result = 31 * result + (mIsForward ? 1 : 0); result = 31 * result + Objects.hashCode(mProfilerInfo); return result; } private boolean activityInfoEqual(ActivityInfo other) { - return mInfo.flags == other.flags && mInfo.maxAspectRatio == other.maxAspectRatio + if (mInfo == null) { + return other == null; + } + return other != null && mInfo.flags == other.flags + && mInfo.maxAspectRatio == other.maxAspectRatio && Objects.equals(mInfo.launchToken, other.launchToken) && Objects.equals(mInfo.getComponentName(), other.getComponentName()); } @@ -229,4 +229,38 @@ public class LaunchActivityItem extends ActivityLifecycleItem { } return true; } + + @Override + public String toString() { + return "LaunchActivityItem{intent=" + mIntent + ",ident=" + mIdent + ",info=" + mInfo + + ",curConfig=" + mCurConfig + ",overrideConfig=" + mOverrideConfig + + ",referrer=" + mReferrer + ",procState=" + mProcState + ",state=" + mState + + ",persistentState=" + mPersistentState + ",pendingResults=" + mPendingResults + + ",pendingNewIntents=" + mPendingNewIntents + ",profilerInfo=" + mProfilerInfo + + "}"; + } + + // Using the same method to set and clear values to make sure we don't forget anything + private static void setValues(LaunchActivityItem instance, Intent intent, int ident, + ActivityInfo info, Configuration curConfig, Configuration overrideConfig, + CompatibilityInfo compatInfo, String referrer, IVoiceInteractor voiceInteractor, + int procState, Bundle state, PersistableBundle persistentState, + List<ResultInfo> pendingResults, List<ReferrerIntent> pendingNewIntents, + boolean isForward, ProfilerInfo profilerInfo) { + instance.mIntent = intent; + instance.mIdent = ident; + instance.mInfo = info; + instance.mCurConfig = curConfig; + instance.mOverrideConfig = overrideConfig; + instance.mCompatInfo = compatInfo; + instance.mReferrer = referrer; + instance.mVoiceInteractor = voiceInteractor; + instance.mProcState = procState; + instance.mState = state; + instance.mPersistentState = persistentState; + instance.mPendingResults = pendingResults; + instance.mPendingNewIntents = pendingNewIntents; + instance.mIsForward = isForward; + instance.mProfilerInfo = profilerInfo; + } } diff --git a/core/java/android/app/servertransaction/MoveToDisplayItem.java b/core/java/android/app/servertransaction/MoveToDisplayItem.java index ccd80d88620c..b3dddfb37eaa 100644 --- a/core/java/android/app/servertransaction/MoveToDisplayItem.java +++ b/core/java/android/app/servertransaction/MoveToDisplayItem.java @@ -18,33 +18,56 @@ package android.app.servertransaction; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; +import android.app.ClientTransactionHandler; import android.content.res.Configuration; import android.os.IBinder; import android.os.Parcel; import android.os.Trace; +import java.util.Objects; + /** * Activity move to a different display message. * @hide */ public class MoveToDisplayItem extends ClientTransactionItem { - private final int mTargetDisplayId; - private final Configuration mConfiguration; - - public MoveToDisplayItem(int targetDisplayId, Configuration configuration) { - mTargetDisplayId = targetDisplayId; - mConfiguration = configuration; - } + private int mTargetDisplayId; + private Configuration mConfiguration; @Override - public void execute(android.app.ClientTransactionHandler client, IBinder token) { + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityMovedToDisplay"); client.handleActivityConfigurationChanged(token, mConfiguration, mTargetDisplayId); Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); } + // ObjectPoolItem implementation + + private MoveToDisplayItem() {} + + /** Obtain an instance initialized with provided params. */ + public static MoveToDisplayItem obtain(int targetDisplayId, Configuration configuration) { + MoveToDisplayItem instance = ObjectPool.obtain(MoveToDisplayItem.class); + if (instance == null) { + instance = new MoveToDisplayItem(); + } + instance.mTargetDisplayId = targetDisplayId; + instance.mConfiguration = configuration; + + return instance; + } + + @Override + public void recycle() { + mTargetDisplayId = 0; + mConfiguration = null; + ObjectPool.recycle(this); + } + + // Parcelable implementation /** Write to Parcel. */ @@ -80,7 +103,7 @@ public class MoveToDisplayItem extends ClientTransactionItem { } final MoveToDisplayItem other = (MoveToDisplayItem) o; return mTargetDisplayId == other.mTargetDisplayId - && mConfiguration.equals(other.mConfiguration); + && Objects.equals(mConfiguration, other.mConfiguration); } @Override @@ -90,4 +113,10 @@ public class MoveToDisplayItem extends ClientTransactionItem { result = 31 * result + mConfiguration.hashCode(); return result; } + + @Override + public String toString() { + return "MoveToDisplayItem{targetDisplayId=" + mTargetDisplayId + + ",configuration=" + mConfiguration + "}"; + } } diff --git a/core/java/android/app/servertransaction/MultiWindowModeChangeItem.java b/core/java/android/app/servertransaction/MultiWindowModeChangeItem.java index a0c617fa66c3..c3022d6facc7 100644 --- a/core/java/android/app/servertransaction/MultiWindowModeChangeItem.java +++ b/core/java/android/app/servertransaction/MultiWindowModeChangeItem.java @@ -16,10 +16,13 @@ package android.app.servertransaction; +import android.app.ClientTransactionHandler; import android.content.res.Configuration; import android.os.IBinder; import android.os.Parcel; +import java.util.Objects; + /** * Multi-window mode change message. * @hide @@ -28,18 +31,38 @@ import android.os.Parcel; // communicate multi-window mode change with WindowConfiguration. public class MultiWindowModeChangeItem extends ClientTransactionItem { - private final boolean mIsInMultiWindowMode; - private final Configuration mOverrideConfig; + private boolean mIsInMultiWindowMode; + private Configuration mOverrideConfig; + + @Override + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { + client.handleMultiWindowModeChanged(token, mIsInMultiWindowMode, mOverrideConfig); + } + + + // ObjectPoolItem implementation - public MultiWindowModeChangeItem(boolean isInMultiWindowMode, + private MultiWindowModeChangeItem() {} + + /** Obtain an instance initialized with provided params. */ + public static MultiWindowModeChangeItem obtain(boolean isInMultiWindowMode, Configuration overrideConfig) { - mIsInMultiWindowMode = isInMultiWindowMode; - mOverrideConfig = overrideConfig; + MultiWindowModeChangeItem instance = ObjectPool.obtain(MultiWindowModeChangeItem.class); + if (instance == null) { + instance = new MultiWindowModeChangeItem(); + } + instance.mIsInMultiWindowMode = isInMultiWindowMode; + instance.mOverrideConfig = overrideConfig; + + return instance; } @Override - public void execute(android.app.ClientTransactionHandler client, IBinder token) { - client.handleMultiWindowModeChanged(token, mIsInMultiWindowMode, mOverrideConfig); + public void recycle() { + mIsInMultiWindowMode = false; + mOverrideConfig = null; + ObjectPool.recycle(this); } @@ -79,7 +102,7 @@ public class MultiWindowModeChangeItem extends ClientTransactionItem { } final MultiWindowModeChangeItem other = (MultiWindowModeChangeItem) o; return mIsInMultiWindowMode == other.mIsInMultiWindowMode - && mOverrideConfig.equals(other.mOverrideConfig); + && Objects.equals(mOverrideConfig, other.mOverrideConfig); } @Override @@ -89,4 +112,10 @@ public class MultiWindowModeChangeItem extends ClientTransactionItem { result = 31 * result + mOverrideConfig.hashCode(); return result; } + + @Override + public String toString() { + return "MultiWindowModeChangeItem{isInMultiWindowMode=" + mIsInMultiWindowMode + + ",overrideConfig=" + mOverrideConfig + "}"; + } } diff --git a/core/java/android/app/servertransaction/NewIntentItem.java b/core/java/android/app/servertransaction/NewIntentItem.java index 61a8965aae7f..7dfde73c0534 100644 --- a/core/java/android/app/servertransaction/NewIntentItem.java +++ b/core/java/android/app/servertransaction/NewIntentItem.java @@ -16,9 +16,7 @@ package android.app.servertransaction; -import static android.app.servertransaction.ActivityLifecycleItem.PAUSED; -import static android.app.servertransaction.ActivityLifecycleItem.RESUMED; - +import android.app.ClientTransactionHandler; import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; @@ -27,6 +25,7 @@ import android.os.Trace; import com.android.internal.content.ReferrerIntent; import java.util.List; +import java.util.Objects; /** * New intent message. @@ -34,32 +33,53 @@ import java.util.List; */ public class NewIntentItem extends ClientTransactionItem { - private final List<ReferrerIntent> mIntents; - private final boolean mPause; - - public NewIntentItem(List<ReferrerIntent> intents, boolean pause) { - mIntents = intents; - mPause = pause; - } + private List<ReferrerIntent> mIntents; + private boolean mPause; - @Override + // TODO(lifecycler): Switch new intent handling to this scheme. + /*@Override public int getPreExecutionState() { - return PAUSED; + return ON_PAUSE; } @Override public int getPostExecutionState() { - return RESUMED; - } + return ON_RESUME; + }*/ @Override - public void execute(android.app.ClientTransactionHandler client, IBinder token) { + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "activityNewIntent"); client.handleNewIntent(token, mIntents, mPause); Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); } + // ObjectPoolItem implementation + + private NewIntentItem() {} + + /** Obtain an instance initialized with provided params. */ + public static NewIntentItem obtain(List<ReferrerIntent> intents, boolean pause) { + NewIntentItem instance = ObjectPool.obtain(NewIntentItem.class); + if (instance == null) { + instance = new NewIntentItem(); + } + instance.mIntents = intents; + instance.mPause = pause; + + return instance; + } + + @Override + public void recycle() { + mIntents = null; + mPause = false; + ObjectPool.recycle(this); + } + + // Parcelable implementation /** Write to Parcel. */ @@ -95,7 +115,7 @@ public class NewIntentItem extends ClientTransactionItem { return false; } final NewIntentItem other = (NewIntentItem) o; - return mPause == other.mPause && mIntents.equals(other.mIntents); + return mPause == other.mPause && Objects.equals(mIntents, other.mIntents); } @Override @@ -105,4 +125,9 @@ public class NewIntentItem extends ClientTransactionItem { result = 31 * result + mIntents.hashCode(); return result; } + + @Override + public String toString() { + return "NewIntentItem{pause=" + mPause + ",intents=" + mIntents + "}"; + } } diff --git a/core/java/android/app/servertransaction/ObjectPool.java b/core/java/android/app/servertransaction/ObjectPool.java new file mode 100644 index 000000000000..98121253f486 --- /dev/null +++ b/core/java/android/app/servertransaction/ObjectPool.java @@ -0,0 +1,73 @@ +/* + * Copyright 2017 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 android.app.servertransaction; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; + +/** + * An object pool that can provide reused objects if available. + * @hide + */ +class ObjectPool { + + private static final Object sPoolSync = new Object(); + private static final Map<Class, LinkedList<? extends ObjectPoolItem>> sPoolMap = + new HashMap<>(); + + private static final int MAX_POOL_SIZE = 50; + + /** + * Obtain an instance of a specific class from the pool + * @param itemClass The class of the object we're looking for. + * @return An instance or null if there is none. + */ + public static <T extends ObjectPoolItem> T obtain(Class<T> itemClass) { + synchronized (sPoolSync) { + @SuppressWarnings("unchecked") + LinkedList<T> itemPool = (LinkedList<T>) sPoolMap.get(itemClass); + if (itemPool != null && !itemPool.isEmpty()) { + return itemPool.poll(); + } + return null; + } + } + + /** + * Recycle the object to the pool. The object should be properly cleared before this. + * @param item The object to recycle. + * @see ObjectPoolItem#recycle() + */ + public static <T extends ObjectPoolItem> void recycle(T item) { + synchronized (sPoolSync) { + @SuppressWarnings("unchecked") + LinkedList<T> itemPool = (LinkedList<T>) sPoolMap.get(item.getClass()); + if (itemPool == null) { + itemPool = new LinkedList<>(); + sPoolMap.put(item.getClass(), itemPool); + } + if (itemPool.contains(item)) { + throw new IllegalStateException("Trying to recycle already recycled item"); + } + + if (itemPool.size() < MAX_POOL_SIZE) { + itemPool.add(item); + } + } + } +} diff --git a/core/java/android/app/servertransaction/ObjectPoolItem.java b/core/java/android/app/servertransaction/ObjectPoolItem.java new file mode 100644 index 000000000000..17bd4f30640f --- /dev/null +++ b/core/java/android/app/servertransaction/ObjectPoolItem.java @@ -0,0 +1,29 @@ +/* + * Copyright 2017 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 android.app.servertransaction; + +/** + * Base interface for all lifecycle items that can be put in object pool. + * @hide + */ +public interface ObjectPoolItem { + /** + * Clear the contents of the item and putting it to a pool. The implementation should call + * {@link ObjectPool#recycle(ObjectPoolItem)} passing itself. + */ + void recycle(); +} diff --git a/core/java/android/app/servertransaction/PauseActivityItem.java b/core/java/android/app/servertransaction/PauseActivityItem.java index e561a4b51427..880fef73c6f2 100644 --- a/core/java/android/app/servertransaction/PauseActivityItem.java +++ b/core/java/android/app/servertransaction/PauseActivityItem.java @@ -18,11 +18,12 @@ package android.app.servertransaction; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; +import android.app.ActivityManager; import android.app.ClientTransactionHandler; import android.os.IBinder; import android.os.Parcel; +import android.os.RemoteException; import android.os.Trace; -import android.util.Slog; /** * Request to move an activity to paused state. @@ -32,43 +33,81 @@ public class PauseActivityItem extends ActivityLifecycleItem { private static final String TAG = "PauseActivityItem"; - private final boolean mFinished; - private final boolean mUserLeaving; - private final int mConfigChanges; - private final boolean mDontReport; + private boolean mFinished; + private boolean mUserLeaving; + private int mConfigChanges; + private boolean mDontReport; - private int mLifecycleSeq; + @Override + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { + Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityPause"); + client.handlePauseActivity(token, mFinished, mUserLeaving, mConfigChanges, mDontReport, + pendingActions); + Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); + } - public PauseActivityItem(boolean finished, boolean userLeaving, int configChanges, - boolean dontReport) { - mFinished = finished; - mUserLeaving = userLeaving; - mConfigChanges = configChanges; - mDontReport = dontReport; + @Override + public int getTargetState() { + return ON_PAUSE; } @Override - public void prepare(ClientTransactionHandler client, IBinder token) { - mLifecycleSeq = client.getLifecycleSeq(); - if (DEBUG_ORDER) { - Slog.d(TAG, "Pause transaction for " + client + " received seq: " - + mLifecycleSeq); + public void postExecute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { + if (mDontReport) { + return; + } + try { + // TODO(lifecycler): Use interface callback instead of AMS. + ActivityManager.getService().activityPaused(token); + } catch (RemoteException ex) { + throw ex.rethrowFromSystemServer(); } } - @Override - public void execute(ClientTransactionHandler client, IBinder token) { - Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityPause"); - client.handlePauseActivity(token, mFinished, mUserLeaving, mConfigChanges, mDontReport, - mLifecycleSeq); - Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); + + // ObjectPoolItem implementation + + private PauseActivityItem() {} + + /** Obtain an instance initialized with provided params. */ + public static PauseActivityItem obtain(boolean finished, boolean userLeaving, int configChanges, + boolean dontReport) { + PauseActivityItem instance = ObjectPool.obtain(PauseActivityItem.class); + if (instance == null) { + instance = new PauseActivityItem(); + } + instance.mFinished = finished; + instance.mUserLeaving = userLeaving; + instance.mConfigChanges = configChanges; + instance.mDontReport = dontReport; + + return instance; } - @Override - public int getTargetState() { - return PAUSED; + /** Obtain an instance initialized with default params. */ + public static PauseActivityItem obtain() { + PauseActivityItem instance = ObjectPool.obtain(PauseActivityItem.class); + if (instance == null) { + instance = new PauseActivityItem(); + } + instance.mFinished = false; + instance.mUserLeaving = false; + instance.mConfigChanges = 0; + instance.mDontReport = true; + + return instance; } + @Override + public void recycle() { + mFinished = false; + mUserLeaving = false; + mConfigChanges = 0; + mDontReport = false; + ObjectPool.recycle(this); + } // Parcelable implementation @@ -122,4 +161,10 @@ public class PauseActivityItem extends ActivityLifecycleItem { result = 31 * result + (mDontReport ? 1 : 0); return result; } + + @Override + public String toString() { + return "PauseActivityItem{finished=" + mFinished + ",userLeaving=" + mUserLeaving + + ",configChanges=" + mConfigChanges + ",dontReport=" + mDontReport + "}"; + } } diff --git a/core/java/android/app/servertransaction/PendingTransactionActions.java b/core/java/android/app/servertransaction/PendingTransactionActions.java new file mode 100644 index 000000000000..073d28cfa27f --- /dev/null +++ b/core/java/android/app/servertransaction/PendingTransactionActions.java @@ -0,0 +1,145 @@ +/* + * Copyright 2017 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 android.app.servertransaction; + +import static android.app.ActivityThread.DEBUG_MEMORY_TRIM; + +import android.app.ActivityManager; +import android.app.ActivityThread.ActivityClientRecord; +import android.os.Build; +import android.os.Bundle; +import android.os.PersistableBundle; +import android.os.RemoteException; +import android.os.TransactionTooLargeException; +import android.util.Log; +import android.util.LogWriter; +import android.util.Slog; + +import com.android.internal.util.IndentingPrintWriter; + +/** + * Container that has data pending to be used at later stages of + * {@link android.app.servertransaction.ClientTransaction}. + * An instance of this class is passed to each individual transaction item, so it can use some + * information from previous steps or add some for the following steps. + * + * @hide + */ +public class PendingTransactionActions { + private boolean mRestoreInstanceState; + private boolean mCallOnPostCreate; + private Bundle mOldState; + private StopInfo mStopInfo; + + public PendingTransactionActions() { + clear(); + } + + /** Reset the state of the instance to default, non-initialized values. */ + public void clear() { + mRestoreInstanceState = false; + mCallOnPostCreate = false; + mOldState = null; + mStopInfo = null; + } + + /** Getter */ + public boolean shouldRestoreInstanceState() { + return mRestoreInstanceState; + } + + public void setRestoreInstanceState(boolean restoreInstanceState) { + mRestoreInstanceState = restoreInstanceState; + } + + /** Getter */ + public boolean shouldCallOnPostCreate() { + return mCallOnPostCreate; + } + + public void setCallOnPostCreate(boolean callOnPostCreate) { + mCallOnPostCreate = callOnPostCreate; + } + + public Bundle getOldState() { + return mOldState; + } + + public void setOldState(Bundle oldState) { + mOldState = oldState; + } + + public StopInfo getStopInfo() { + return mStopInfo; + } + + public void setStopInfo(StopInfo stopInfo) { + mStopInfo = stopInfo; + } + + /** Reports to server about activity stop. */ + public static class StopInfo implements Runnable { + private static final String TAG = "ActivityStopInfo"; + + private ActivityClientRecord mActivity; + private Bundle mState; + private PersistableBundle mPersistentState; + private CharSequence mDescription; + + public void setActivity(ActivityClientRecord activity) { + mActivity = activity; + } + + public void setState(Bundle state) { + mState = state; + } + + public void setPersistentState(PersistableBundle persistentState) { + mPersistentState = persistentState; + } + + public void setDescription(CharSequence description) { + mDescription = description; + } + + @Override + public void run() { + // Tell activity manager we have been stopped. + try { + if (DEBUG_MEMORY_TRIM) Slog.v(TAG, "Reporting activity stopped: " + mActivity); + // TODO(lifecycler): Use interface callback instead of AMS. + ActivityManager.getService().activityStopped( + mActivity.token, mState, mPersistentState, mDescription); + } catch (RemoteException ex) { + // Dump statistics about bundle to help developers debug + final LogWriter writer = new LogWriter(Log.WARN, TAG); + final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); + pw.println("Bundle stats:"); + Bundle.dumpStats(pw, mState); + pw.println("PersistableBundle stats:"); + Bundle.dumpStats(pw, mPersistentState); + + if (ex instanceof TransactionTooLargeException + && mActivity.packageInfo.getTargetSdkVersion() < Build.VERSION_CODES.N) { + Log.e(TAG, "App sent too much data in instance state, so it was ignored", ex); + return; + } + throw ex.rethrowFromSystemServer(); + } + } + } +} diff --git a/core/java/android/app/servertransaction/PipModeChangeItem.java b/core/java/android/app/servertransaction/PipModeChangeItem.java index 923839eec15b..b999cd7e295e 100644 --- a/core/java/android/app/servertransaction/PipModeChangeItem.java +++ b/core/java/android/app/servertransaction/PipModeChangeItem.java @@ -16,10 +16,13 @@ package android.app.servertransaction; +import android.app.ClientTransactionHandler; import android.content.res.Configuration; import android.os.IBinder; import android.os.Parcel; +import java.util.Objects; + /** * Picture in picture mode change message. * @hide @@ -28,17 +31,37 @@ import android.os.Parcel; // communicate multi-window mode change with WindowConfiguration. public class PipModeChangeItem extends ClientTransactionItem { - private final boolean mIsInPipMode; - private final Configuration mOverrideConfig; + private boolean mIsInPipMode; + private Configuration mOverrideConfig; + + @Override + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { + client.handlePictureInPictureModeChanged(token, mIsInPipMode, mOverrideConfig); + } + + + // ObjectPoolItem implementation - public PipModeChangeItem(boolean isInPipMode, Configuration overrideConfig) { - mIsInPipMode = isInPipMode; - mOverrideConfig = overrideConfig; + private PipModeChangeItem() {} + + /** Obtain an instance initialized with provided params. */ + public static PipModeChangeItem obtain(boolean isInPipMode, Configuration overrideConfig) { + PipModeChangeItem instance = ObjectPool.obtain(PipModeChangeItem.class); + if (instance == null) { + instance = new PipModeChangeItem(); + } + instance.mIsInPipMode = isInPipMode; + instance.mOverrideConfig = overrideConfig; + + return instance; } @Override - public void execute(android.app.ClientTransactionHandler client, IBinder token) { - client.handlePictureInPictureModeChanged(token, mIsInPipMode, mOverrideConfig); + public void recycle() { + mIsInPipMode = false; + mOverrideConfig = null; + ObjectPool.recycle(this); } @@ -76,7 +99,8 @@ public class PipModeChangeItem extends ClientTransactionItem { return false; } final PipModeChangeItem other = (PipModeChangeItem) o; - return mIsInPipMode == other.mIsInPipMode && mOverrideConfig.equals(other.mOverrideConfig); + return mIsInPipMode == other.mIsInPipMode + && Objects.equals(mOverrideConfig, other.mOverrideConfig); } @Override @@ -86,4 +110,10 @@ public class PipModeChangeItem extends ClientTransactionItem { result = 31 * result + mOverrideConfig.hashCode(); return result; } + + @Override + public String toString() { + return "PipModeChangeItem{isInPipMode=" + mIsInPipMode + + ",overrideConfig=" + mOverrideConfig + "}"; + } } diff --git a/core/java/android/app/servertransaction/ResumeActivityItem.java b/core/java/android/app/servertransaction/ResumeActivityItem.java index ea31a461f1f3..9249c6e8ed54 100644 --- a/core/java/android/app/servertransaction/ResumeActivityItem.java +++ b/core/java/android/app/servertransaction/ResumeActivityItem.java @@ -18,11 +18,12 @@ package android.app.servertransaction; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; +import android.app.ActivityManager; import android.app.ClientTransactionHandler; import android.os.IBinder; import android.os.Parcel; +import android.os.RemoteException; import android.os.Trace; -import android.util.Slog; /** * Request to move an activity to resumed state. @@ -32,37 +33,78 @@ public class ResumeActivityItem extends ActivityLifecycleItem { private static final String TAG = "ResumeActivityItem"; - private final int mProcState; - private final boolean mIsForward; - - private int mLifecycleSeq; - - public ResumeActivityItem(int procState, boolean isForward) { - mProcState = procState; - mIsForward = isForward; - } + private int mProcState; + private boolean mUpdateProcState; + private boolean mIsForward; @Override - public void prepare(ClientTransactionHandler client, IBinder token) { - mLifecycleSeq = client.getLifecycleSeq(); - if (DEBUG_ORDER) { - Slog.d(TAG, "Resume transaction for " + client + " received seq: " - + mLifecycleSeq); + public void preExecute(ClientTransactionHandler client, IBinder token) { + if (mUpdateProcState) { + client.updateProcessState(mProcState, false); } - client.updateProcessState(mProcState, false); } @Override - public void execute(ClientTransactionHandler client, IBinder token) { + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityResume"); - client.handleResumeActivity(token, true /* clearHide */, mIsForward, - true /* reallyResume */, mLifecycleSeq, "RESUME_ACTIVITY"); + client.handleResumeActivity(token, true /* clearHide */, mIsForward, "RESUME_ACTIVITY"); Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); } @Override + public void postExecute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { + try { + // TODO(lifecycler): Use interface callback instead of AMS. + ActivityManager.getService().activityResumed(token); + } catch (RemoteException ex) { + throw ex.rethrowFromSystemServer(); + } + } + + @Override public int getTargetState() { - return RESUMED; + return ON_RESUME; + } + + + // ObjectPoolItem implementation + + private ResumeActivityItem() {} + + /** Obtain an instance initialized with provided params. */ + public static ResumeActivityItem obtain(int procState, boolean isForward) { + ResumeActivityItem instance = ObjectPool.obtain(ResumeActivityItem.class); + if (instance == null) { + instance = new ResumeActivityItem(); + } + instance.mProcState = procState; + instance.mUpdateProcState = true; + instance.mIsForward = isForward; + + return instance; + } + + /** Obtain an instance initialized with provided params. */ + public static ResumeActivityItem obtain(boolean isForward) { + ResumeActivityItem instance = ObjectPool.obtain(ResumeActivityItem.class); + if (instance == null) { + instance = new ResumeActivityItem(); + } + instance.mProcState = ActivityManager.PROCESS_STATE_UNKNOWN; + instance.mUpdateProcState = false; + instance.mIsForward = isForward; + + return instance; + } + + @Override + public void recycle() { + mProcState = ActivityManager.PROCESS_STATE_UNKNOWN; + mUpdateProcState = false; + mIsForward = false; + ObjectPool.recycle(this); } @@ -72,12 +114,14 @@ public class ResumeActivityItem extends ActivityLifecycleItem { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mProcState); + dest.writeBoolean(mUpdateProcState); dest.writeBoolean(mIsForward); } /** Read from Parcel. */ private ResumeActivityItem(Parcel in) { mProcState = in.readInt(); + mUpdateProcState = in.readBoolean(); mIsForward = in.readBoolean(); } @@ -101,14 +145,22 @@ public class ResumeActivityItem extends ActivityLifecycleItem { return false; } final ResumeActivityItem other = (ResumeActivityItem) o; - return mProcState == other.mProcState && mIsForward == other.mIsForward; + return mProcState == other.mProcState && mUpdateProcState == other.mUpdateProcState + && mIsForward == other.mIsForward; } @Override public int hashCode() { int result = 17; result = 31 * result + mProcState; + result = 31 * result + (mUpdateProcState ? 1 : 0); result = 31 * result + (mIsForward ? 1 : 0); return result; } + + @Override + public String toString() { + return "ResumeActivityItem{procState=" + mProcState + + ",updateProcState=" + mUpdateProcState + ",isForward=" + mIsForward + "}"; + } } diff --git a/core/java/android/app/servertransaction/StopActivityItem.java b/core/java/android/app/servertransaction/StopActivityItem.java index d62c507770a2..5c5c3041344f 100644 --- a/core/java/android/app/servertransaction/StopActivityItem.java +++ b/core/java/android/app/servertransaction/StopActivityItem.java @@ -22,7 +22,6 @@ import android.app.ClientTransactionHandler; import android.os.IBinder; import android.os.Parcel; import android.os.Trace; -import android.util.Slog; /** * Request to move an activity to stopped state. @@ -32,35 +31,50 @@ public class StopActivityItem extends ActivityLifecycleItem { private static final String TAG = "StopActivityItem"; - private final boolean mShowWindow; - private final int mConfigChanges; + private boolean mShowWindow; + private int mConfigChanges; - private int mLifecycleSeq; - - public StopActivityItem(boolean showWindow, int configChanges) { - mShowWindow = showWindow; - mConfigChanges = configChanges; + @Override + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { + Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityStop"); + client.handleStopActivity(token, mShowWindow, mConfigChanges, pendingActions); + Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); } @Override - public void prepare(ClientTransactionHandler client, IBinder token) { - mLifecycleSeq = client.getLifecycleSeq(); - if (DEBUG_ORDER) { - Slog.d(TAG, "Stop transaction for " + client + " received seq: " - + mLifecycleSeq); - } + public void postExecute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { + client.reportStop(pendingActions); } @Override - public void execute(ClientTransactionHandler client, IBinder token) { - Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityStop"); - client.handleStopActivity(token, mShowWindow, mConfigChanges, mLifecycleSeq); - Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); + public int getTargetState() { + return ON_STOP; + } + + + // ObjectPoolItem implementation + + private StopActivityItem() {} + + /** Obtain an instance initialized with provided params. */ + public static StopActivityItem obtain(boolean showWindow, int configChanges) { + StopActivityItem instance = ObjectPool.obtain(StopActivityItem.class); + if (instance == null) { + instance = new StopActivityItem(); + } + instance.mShowWindow = showWindow; + instance.mConfigChanges = configChanges; + + return instance; } @Override - public int getTargetState() { - return STOPPED; + public void recycle() { + mShowWindow = false; + mConfigChanges = 0; + ObjectPool.recycle(this); } @@ -109,4 +123,10 @@ public class StopActivityItem extends ActivityLifecycleItem { result = 31 * result + mConfigChanges; return result; } + + @Override + public String toString() { + return "StopActivityItem{showWindow=" + mShowWindow + ",configChanges=" + mConfigChanges + + "}"; + } } diff --git a/core/java/android/app/servertransaction/TransactionExecutor.java b/core/java/android/app/servertransaction/TransactionExecutor.java new file mode 100644 index 000000000000..5b0ea6b1f9d4 --- /dev/null +++ b/core/java/android/app/servertransaction/TransactionExecutor.java @@ -0,0 +1,248 @@ +/* + * Copyright 2017 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 android.app.servertransaction; + +import static android.app.servertransaction.ActivityLifecycleItem.ON_CREATE; +import static android.app.servertransaction.ActivityLifecycleItem.ON_DESTROY; +import static android.app.servertransaction.ActivityLifecycleItem.ON_PAUSE; +import static android.app.servertransaction.ActivityLifecycleItem.ON_RESTART; +import static android.app.servertransaction.ActivityLifecycleItem.ON_RESUME; +import static android.app.servertransaction.ActivityLifecycleItem.ON_START; +import static android.app.servertransaction.ActivityLifecycleItem.ON_STOP; +import static android.app.servertransaction.ActivityLifecycleItem.UNDEFINED; + +import android.app.ActivityThread.ActivityClientRecord; +import android.app.ClientTransactionHandler; +import android.os.IBinder; +import android.util.IntArray; +import android.util.Slog; + +import com.android.internal.annotations.VisibleForTesting; + +import java.util.List; + +/** + * Class that manages transaction execution in the correct order. + * @hide + */ +public class TransactionExecutor { + + private static final boolean DEBUG_RESOLVER = false; + private static final String TAG = "TransactionExecutor"; + + private ClientTransactionHandler mTransactionHandler; + private PendingTransactionActions mPendingActions = new PendingTransactionActions(); + + // Temp holder for lifecycle path. + // No direct transition between two states should take more than one complete cycle of 6 states. + @ActivityLifecycleItem.LifecycleState + private IntArray mLifecycleSequence = new IntArray(6); + + /** Initialize an instance with transaction handler, that will execute all requested actions. */ + public TransactionExecutor(ClientTransactionHandler clientTransactionHandler) { + mTransactionHandler = clientTransactionHandler; + } + + /** + * Resolve transaction. + * First all callbacks will be executed in the order they appear in the list. If a callback + * requires a certain pre- or post-execution state, the client will be transitioned accordingly. + * Then the client will cycle to the final lifecycle state if provided. Otherwise, it will + * either remain in the initial state, or last state needed by a callback. + */ + public void execute(ClientTransaction transaction) { + final IBinder token = transaction.getActivityToken(); + log("Start resolving transaction for client: " + mTransactionHandler + ", token: " + token); + + executeCallbacks(transaction); + + executeLifecycleState(transaction); + mPendingActions.clear(); + log("End resolving transaction"); + } + + /** Cycle through all states requested by callbacks and execute them at proper times. */ + @VisibleForTesting + public void executeCallbacks(ClientTransaction transaction) { + final List<ClientTransactionItem> callbacks = transaction.getCallbacks(); + if (callbacks == null) { + // No callbacks to execute, return early. + return; + } + log("Resolving callbacks"); + + final IBinder token = transaction.getActivityToken(); + ActivityClientRecord r = mTransactionHandler.getActivityClient(token); + final int size = callbacks.size(); + for (int i = 0; i < size; ++i) { + final ClientTransactionItem item = callbacks.get(i); + log("Resolving callback: " + item); + final int preExecutionState = item.getPreExecutionState(); + if (preExecutionState != UNDEFINED) { + cycleToPath(r, preExecutionState); + } + + item.execute(mTransactionHandler, token, mPendingActions); + item.postExecute(mTransactionHandler, token, mPendingActions); + if (r == null) { + // Launch activity request will create an activity record. + r = mTransactionHandler.getActivityClient(token); + } + + final int postExecutionState = item.getPostExecutionState(); + if (postExecutionState != UNDEFINED) { + cycleToPath(r, postExecutionState); + } + } + } + + /** Transition to the final state if requested by the transaction. */ + private void executeLifecycleState(ClientTransaction transaction) { + final ActivityLifecycleItem lifecycleItem = transaction.getLifecycleStateRequest(); + if (lifecycleItem == null) { + // No lifecycle request, return early. + return; + } + log("Resolving lifecycle state: " + lifecycleItem); + + final IBinder token = transaction.getActivityToken(); + final ActivityClientRecord r = mTransactionHandler.getActivityClient(token); + + // Cycle to the state right before the final requested state. + cycleToPath(r, lifecycleItem.getTargetState(), true /* excludeLastState */); + + // Execute the final transition with proper parameters. + lifecycleItem.execute(mTransactionHandler, token, mPendingActions); + lifecycleItem.postExecute(mTransactionHandler, token, mPendingActions); + } + + /** Transition the client between states. */ + @VisibleForTesting + public void cycleToPath(ActivityClientRecord r, int finish) { + cycleToPath(r, finish, false /* excludeLastState */); + } + + /** + * Transition the client between states with an option not to perform the last hop in the + * sequence. This is used when resolving lifecycle state request, when the last transition must + * be performed with some specific parameters. + */ + private void cycleToPath(ActivityClientRecord r, int finish, + boolean excludeLastState) { + final int start = r.getLifecycleState(); + log("Cycle from: " + start + " to: " + finish + " excludeLastState:" + excludeLastState); + initLifecyclePath(start, finish, excludeLastState); + performLifecycleSequence(r); + } + + /** Transition the client through previously initialized state sequence. */ + private void performLifecycleSequence(ActivityClientRecord r) { + final int size = mLifecycleSequence.size(); + for (int i = 0, state; i < size; i++) { + state = mLifecycleSequence.get(i); + log("Transitioning to state: " + state); + switch (state) { + case ON_CREATE: + mTransactionHandler.handleLaunchActivity(r, mPendingActions); + break; + case ON_START: + mTransactionHandler.handleStartActivity(r, mPendingActions); + break; + case ON_RESUME: + mTransactionHandler.handleResumeActivity(r.token, false /* clearHide */, + r.isForward, "LIFECYCLER_RESUME_ACTIVITY"); + break; + case ON_PAUSE: + mTransactionHandler.handlePauseActivity(r.token, false /* finished */, + false /* userLeaving */, 0 /* configChanges */, + true /* dontReport */, mPendingActions); + break; + case ON_STOP: + mTransactionHandler.handleStopActivity(r.token, false /* show */, + 0 /* configChanges */, mPendingActions); + break; + case ON_DESTROY: + mTransactionHandler.handleDestroyActivity(r.token, false /* finishing */, + 0 /* configChanges */, false /* getNonConfigInstance */); + break; + case ON_RESTART: + mTransactionHandler.performRestartActivity(r.token, false /* start */); + break; + default: + throw new IllegalArgumentException("Unexpected lifecycle state: " + state); + } + } + } + + /** + * Calculate the path through main lifecycle states for an activity and fill + * @link #mLifecycleSequence} with values starting with the state that follows the initial + * state. + */ + public void initLifecyclePath(int start, int finish, boolean excludeLastState) { + mLifecycleSequence.clear(); + if (finish >= start) { + // just go there + for (int i = start + 1; i <= finish; i++) { + mLifecycleSequence.add(i); + } + } else { // finish < start, can't just cycle down + if (start == ON_PAUSE && finish == ON_RESUME) { + // Special case when we can just directly go to resumed state. + mLifecycleSequence.add(ON_RESUME); + } else if (start <= ON_STOP && finish >= ON_START) { + // Restart and go to required state. + + // Go to stopped state first. + for (int i = start + 1; i <= ON_STOP; i++) { + mLifecycleSequence.add(i); + } + // Restart + mLifecycleSequence.add(ON_RESTART); + // Go to required state + for (int i = ON_START; i <= finish; i++) { + mLifecycleSequence.add(i); + } + } else { + // Relaunch and go to required state + + // Go to destroyed state first. + for (int i = start + 1; i <= ON_DESTROY; i++) { + mLifecycleSequence.add(i); + } + // Go to required state + for (int i = ON_CREATE; i <= finish; i++) { + mLifecycleSequence.add(i); + } + } + } + + // Remove last transition in case we want to perform it with some specific params. + if (excludeLastState && mLifecycleSequence.size() != 0) { + mLifecycleSequence.remove(mLifecycleSequence.size() - 1); + } + } + + @VisibleForTesting + public int[] getLifecycleSequence() { + return mLifecycleSequence.toArray(); + } + + private static void log(String message) { + if (DEBUG_RESOLVER) Slog.d(TAG, message); + } +} diff --git a/core/java/android/app/servertransaction/WindowVisibilityItem.java b/core/java/android/app/servertransaction/WindowVisibilityItem.java index 8e88b38d50b1..d9956b1348b1 100644 --- a/core/java/android/app/servertransaction/WindowVisibilityItem.java +++ b/core/java/android/app/servertransaction/WindowVisibilityItem.java @@ -18,6 +18,7 @@ package android.app.servertransaction; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; +import android.app.ClientTransactionHandler; import android.os.IBinder; import android.os.Parcel; import android.os.Trace; @@ -28,20 +29,39 @@ import android.os.Trace; */ public class WindowVisibilityItem extends ClientTransactionItem { - private final boolean mShowWindow; - - public WindowVisibilityItem(boolean showWindow) { - mShowWindow = showWindow; - } + private boolean mShowWindow; @Override - public void execute(android.app.ClientTransactionHandler client, IBinder token) { + public void execute(ClientTransactionHandler client, IBinder token, + PendingTransactionActions pendingActions) { Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "activityShowWindow"); client.handleWindowVisibility(token, mShowWindow); Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); } + // ObjectPoolItem implementation + + private WindowVisibilityItem() {} + + /** Obtain an instance initialized with provided params. */ + public static WindowVisibilityItem obtain(boolean showWindow) { + WindowVisibilityItem instance = ObjectPool.obtain(WindowVisibilityItem.class); + if (instance == null) { + instance = new WindowVisibilityItem(); + } + instance.mShowWindow = showWindow; + + return instance; + } + + @Override + public void recycle() { + mShowWindow = false; + ObjectPool.recycle(this); + } + + // Parcelable implementation /** Write to Parcel. */ @@ -82,4 +102,9 @@ public class WindowVisibilityItem extends ClientTransactionItem { public int hashCode() { return 17 + 31 * (mShowWindow ? 1 : 0); } + + @Override + public String toString() { + return "WindowVisibilityItem{showWindow=" + mShowWindow + "}"; + } } diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java index 1241f2306c73..838d3153d54c 100644 --- a/core/java/android/bluetooth/BluetoothHeadset.java +++ b/core/java/android/bluetooth/BluetoothHeadset.java @@ -678,33 +678,6 @@ public final class BluetoothHeadset implements BluetoothProfile { } /** - * Get battery usage hint for Bluetooth Headset service. - * This is a monotonically increasing integer. Wraps to 0 at - * Integer.MAX_INT, and at boot. - * Current implementation returns the number of AT commands handled since - * boot. This is a good indicator for spammy headset/handsfree units that - * can keep the device awake by polling for cellular status updates. As a - * rule of thumb, each AT command prevents the CPU from sleeping for 500 ms - * - * @param device the bluetooth headset. - * @return monotonically increasing battery usage hint, or a negative error code on error - * @hide - */ - public int getBatteryUsageHint(BluetoothDevice device) { - if (VDBG) log("getBatteryUsageHint()"); - final IBluetoothHeadset service = mService; - if (service != null && isEnabled() && isValidDevice(device)) { - try { - return service.getBatteryUsageHint(device); - } catch (RemoteException e) { - Log.e(TAG, Log.getStackTraceString(new Throwable())); - } - } - if (service == null) Log.w(TAG, "Proxy not attached to service"); - return -1; - } - - /** * Indicates if current platform supports voice dialing over bluetooth SCO. * * @return true if voice dialing over bluetooth is supported, false otherwise. @@ -716,49 +689,6 @@ public final class BluetoothHeadset implements BluetoothProfile { } /** - * Accept the incoming connection. - * Note: This is an internal function and shouldn't be exposed - * - * @hide - */ - public boolean acceptIncomingConnect(BluetoothDevice device) { - if (DBG) log("acceptIncomingConnect"); - final IBluetoothHeadset service = mService; - if (service != null && isEnabled()) { - try { - return service.acceptIncomingConnect(device); - } catch (RemoteException e) { - Log.e(TAG, e.toString()); - } - } else { - Log.w(TAG, "Proxy not attached to service"); - if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); - } - return false; - } - - /** - * Reject the incoming connection. - * - * @hide - */ - public boolean rejectIncomingConnect(BluetoothDevice device) { - if (DBG) log("rejectIncomingConnect"); - final IBluetoothHeadset service = mService; - if (service != null) { - try { - return service.rejectIncomingConnect(device); - } catch (RemoteException e) { - Log.e(TAG, e.toString()); - } - } else { - Log.w(TAG, "Proxy not attached to service"); - if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); - } - return false; - } - - /** * Get the current audio state of the Headset. * Note: This is an internal function and shouldn't be exposed * @@ -1053,50 +983,6 @@ public final class BluetoothHeadset implements BluetoothProfile { } /** - * enable WBS codec setting. - * - * @return true if successful false if there was some error such as there is no connected - * headset - * @hide - */ - public boolean enableWBS() { - final IBluetoothHeadset service = mService; - if (service != null && isEnabled()) { - try { - return service.enableWBS(); - } catch (RemoteException e) { - Log.e(TAG, e.toString()); - } - } else { - Log.w(TAG, "Proxy not attached to service"); - if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); - } - return false; - } - - /** - * disable WBS codec settting. It set NBS codec. - * - * @return true if successful false if there was some error such as there is no connected - * headset - * @hide - */ - public boolean disableWBS() { - final IBluetoothHeadset service = mService; - if (service != null && isEnabled()) { - try { - return service.disableWBS(); - } catch (RemoteException e) { - Log.e(TAG, e.toString()); - } - } else { - Log.w(TAG, "Proxy not attached to service"); - if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); - } - return false; - } - - /** * check if in-band ringing is supported for this platform. * * @return true if in-band ringing is supported false if in-band ringing is not supported @@ -1107,30 +993,6 @@ public final class BluetoothHeadset implements BluetoothProfile { com.android.internal.R.bool.config_bluetooth_hfp_inband_ringing_support); } - /** - * Send Headset the BIND response from AG to report change in the status of the - * HF indicators to the headset - * - * @param indId Assigned Number of the indicator (defined by SIG) - * @param indStatus possible values- false-Indicator is disabled, no value changes shall be - * sent for this indicator true-Indicator is enabled, value changes may be sent for this - * indicator - * @hide - */ - public void bindResponse(int indId, boolean indStatus) { - final IBluetoothHeadset service = mService; - if (service != null && isEnabled()) { - try { - service.bindResponse(indId, indStatus); - } catch (RemoteException e) { - Log.e(TAG, e.toString()); - } - } else { - Log.w(TAG, "Proxy not attached to service"); - if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable())); - } - } - private final IBluetoothProfileServiceConnection mConnection = new IBluetoothProfileServiceConnection.Stub() { @Override diff --git a/core/java/android/bluetooth/BluetoothHidDevice.java b/core/java/android/bluetooth/BluetoothHidDevice.java index bfee27974f57..4a0048673c28 100644 --- a/core/java/android/bluetooth/BluetoothHidDevice.java +++ b/core/java/android/bluetooth/BluetoothHidDevice.java @@ -31,36 +31,33 @@ import java.util.Arrays; import java.util.List; /** - * Provides the public APIs to control the Bluetooth HID Device - * profile. + * Provides the public APIs to control the Bluetooth HID Device profile. * - * BluetoothHidDevice is a proxy object for controlling the Bluetooth HID - * Device Service via IPC. Use {@link BluetoothAdapter#getProfileProxy} to get - * the BluetoothHidDevice proxy object. + * <p>BluetoothHidDevice is a proxy object for controlling the Bluetooth HID Device Service via IPC. + * Use {@link BluetoothAdapter#getProfileProxy} to get the BluetoothHidDevice proxy object. * - * {@hide} + * <p>{@hide} */ public final class BluetoothHidDevice implements BluetoothProfile { private static final String TAG = BluetoothHidDevice.class.getSimpleName(); /** - * Intent used to broadcast the change in connection state of the Input - * Host profile. + * Intent used to broadcast the change in connection state of the Input Host profile. * * <p>This intent will have 3 extras: + * * <ul> - * <li> {@link #EXTRA_STATE} - The current state of the profile. </li> - * <li> {@link #EXTRA_PREVIOUS_STATE}- The previous state of the profile.</li> - * <li> {@link BluetoothDevice#EXTRA_DEVICE} - The remote device. </li> + * <li>{@link #EXTRA_STATE} - The current state of the profile. + * <li>{@link #EXTRA_PREVIOUS_STATE}- The previous state of the profile. + * <li>{@link BluetoothDevice#EXTRA_DEVICE} - The remote device. * </ul> * - * <p>{@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of - * {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING}, - * {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTING}. + * <p>{@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of {@link + * #STATE_DISCONNECTED}, {@link #STATE_CONNECTING}, {@link #STATE_CONNECTED}, {@link + * #STATE_DISCONNECTING}. * - * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to - * receive. + * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to receive. */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_CONNECTION_STATE_CHANGED = @@ -69,9 +66,8 @@ public final class BluetoothHidDevice implements BluetoothProfile { /** * Constants representing device subclass. * - * @see #registerApp - * (BluetoothHidDeviceAppQosSettings, BluetoothHidDeviceAppQosSettings, - * BluetoothHidDeviceAppQosSettings, BluetoothHidDeviceCallback) + * @see #registerApp (BluetoothHidDeviceAppQosSettings, BluetoothHidDeviceAppQosSettings, + * BluetoothHidDeviceAppQosSettings, BluetoothHidDeviceCallback) */ public static final byte SUBCLASS1_NONE = (byte) 0x00; public static final byte SUBCLASS1_KEYBOARD = (byte) 0x40; @@ -110,8 +106,8 @@ public final class BluetoothHidDevice implements BluetoothProfile { public static final byte ERROR_RSP_UNKNOWN = (byte) 14; /** - * Constants representing protocol mode used set by host. Default is always - * {@link #PROTOCOL_REPORT_MODE} unless notified otherwise. + * Constants representing protocol mode used set by host. Default is always {@link + * #PROTOCOL_REPORT_MODE} unless notified otherwise. * * @see BluetoothHidDeviceCallback#onSetProtocol(BluetoothDevice, byte) */ @@ -126,8 +122,8 @@ public final class BluetoothHidDevice implements BluetoothProfile { private BluetoothAdapter mAdapter; - private static class BluetoothHidDeviceCallbackWrapper extends - IBluetoothHidDeviceCallback.Stub { + private static class BluetoothHidDeviceCallbackWrapper + extends IBluetoothHidDeviceCallback.Stub { private BluetoothHidDeviceCallback mCallback; @@ -184,13 +180,11 @@ public final class BluetoothHidDevice implements BluetoothProfile { doBind(); } } catch (IllegalStateException e) { - Log.e(TAG, - "onBluetoothStateChange: could not bind to HID Dev " - + "service: ", e); + Log.e(TAG, "onBluetoothStateChange: could not bind to HID Dev " + + "service: ", e); } catch (SecurityException e) { - Log.e(TAG, - "onBluetoothStateChange: could not bind to HID Dev " - + "service: ", e); + Log.e(TAG, "onBluetoothStateChange: could not bind to HID Dev " + + "service: ", e); } } else { Log.d(TAG, "Unbinding service..."); @@ -200,23 +194,25 @@ public final class BluetoothHidDevice implements BluetoothProfile { } }; - private final ServiceConnection mConnection = new ServiceConnection() { - public void onServiceConnected(ComponentName className, IBinder service) { - Log.d(TAG, "onServiceConnected()"); - mService = IBluetoothHidDevice.Stub.asInterface(service); - if (mServiceListener != null) { - mServiceListener.onServiceConnected(BluetoothProfile.HID_DEVICE, - BluetoothHidDevice.this); - } - } - public void onServiceDisconnected(ComponentName className) { - Log.d(TAG, "onServiceDisconnected()"); - mService = null; - if (mServiceListener != null) { - mServiceListener.onServiceDisconnected(BluetoothProfile.HID_DEVICE); - } - } - }; + private final ServiceConnection mConnection = + new ServiceConnection() { + public void onServiceConnected(ComponentName className, IBinder service) { + Log.d(TAG, "onServiceConnected()"); + mService = IBluetoothHidDevice.Stub.asInterface(service); + if (mServiceListener != null) { + mServiceListener.onServiceConnected( + BluetoothProfile.HID_DEVICE, BluetoothHidDevice.this); + } + } + + public void onServiceDisconnected(ComponentName className) { + Log.d(TAG, "onServiceDisconnected()"); + mService = null; + if (mServiceListener != null) { + mServiceListener.onServiceDisconnected(BluetoothProfile.HID_DEVICE); + } + } + }; BluetoothHidDevice(Context context, ServiceListener listener) { Log.v(TAG, "BluetoothHidDevice"); @@ -280,9 +276,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { mServiceListener = null; } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ @Override public List<BluetoothDevice> getConnectedDevices() { Log.v(TAG, "getConnectedDevices()"); @@ -301,9 +295,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { return new ArrayList<BluetoothDevice>(); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ @Override public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) { Log.v(TAG, "getDevicesMatchingConnectionStates(): states=" + Arrays.toString(states)); @@ -322,9 +314,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { return new ArrayList<BluetoothDevice>(); } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ @Override public int getConnectionState(BluetoothDevice device) { Log.v(TAG, "getConnectionState(): device=" + device); @@ -344,33 +334,31 @@ public final class BluetoothHidDevice implements BluetoothProfile { } /** - * Registers application to be used for HID device. Connections to HID - * Device are only possible when application is registered. Only one - * application can be registered at time. When no longer used, application - * should be unregistered using - * {@link #unregisterApp()}. - * The registration status should be tracked by the application by handling callback from - * BluetoothHidDeviceCallback#onAppStatusChanged. The app registration status is not related - * to the return value of this method. + * Registers application to be used for HID device. Connections to HID Device are only possible + * when application is registered. Only one application can be registered at one time. When an + * application is registered, the HID Host service will be disabled until it is unregistered. + * When no longer used, application should be unregistered using {@link #unregisterApp()}. The + * registration status should be tracked by the application by handling callback from + * BluetoothHidDeviceCallback#onAppStatusChanged. The app registration status is not related to + * the return value of this method. * - * @param sdp {@link BluetoothHidDeviceAppSdpSettings} object of HID Device SDP record. - * The HID Device SDP record is required. - * @param inQos {@link BluetoothHidDeviceAppQosSettings} object of Incoming QoS Settings. - * The Incoming QoS Settings is not required. Use null or default - * BluetoothHidDeviceAppQosSettings.Builder for default values. - * @param outQos {@link BluetoothHidDeviceAppQosSettings} object of Outgoing QoS Settings. - * The Outgoing QoS Settings is not required. Use null or default - * BluetoothHidDeviceAppQosSettings.Builder for default values. + * @param sdp {@link BluetoothHidDeviceAppSdpSettings} object of HID Device SDP record. The HID + * Device SDP record is required. + * @param inQos {@link BluetoothHidDeviceAppQosSettings} object of Incoming QoS Settings. The + * Incoming QoS Settings is not required. Use null or default + * BluetoothHidDeviceAppQosSettings.Builder for default values. + * @param outQos {@link BluetoothHidDeviceAppQosSettings} object of Outgoing QoS Settings. The + * Outgoing QoS Settings is not required. Use null or default + * BluetoothHidDeviceAppQosSettings.Builder for default values. * @param callback {@link BluetoothHidDeviceCallback} object to which callback messages will be - * sent. - * The BluetoothHidDeviceCallback object is required. + * sent. The BluetoothHidDeviceCallback object is required. * @return true if the command is successfully sent; otherwise false. */ public boolean registerApp(BluetoothHidDeviceAppSdpSettings sdp, BluetoothHidDeviceAppQosSettings inQos, BluetoothHidDeviceAppQosSettings outQos, BluetoothHidDeviceCallback callback) { Log.v(TAG, "registerApp(): sdp=" + sdp + " inQos=" + inQos + " outQos=" + outQos - + " callback=" + callback); + + " callback=" + callback); boolean result = false; @@ -395,14 +383,13 @@ public final class BluetoothHidDevice implements BluetoothProfile { } /** - * Unregisters application. Active connection will be disconnected and no - * new connections will be allowed until registered again using - * {@link #registerApp + * Unregisters application. Active connection will be disconnected and no new connections will + * be allowed until registered again using {@link #registerApp * (BluetoothHidDeviceAppQosSettings, BluetoothHidDeviceAppQosSettings, - * BluetoothHidDeviceAppQosSettings, BluetoothHidDeviceCallback)} - * The registration status should be tracked by the application by handling callback from - * BluetoothHidDeviceCallback#onAppStatusChanged. The app registration status is not related - * to the return value of this method. + * BluetoothHidDeviceAppQosSettings, BluetoothHidDeviceCallback)} The registration status should + * be tracked by the application by handling callback from + * BluetoothHidDeviceCallback#onAppStatusChanged. The app registration status is not related to + * the return value of this method. * * @return true if the command is successfully sent; otherwise false. */ @@ -429,7 +416,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { * Sends report to remote host using interrupt channel. * * @param id Report Id, as defined in descriptor. Can be 0 in case Report Id are not defined in - * descriptor. + * descriptor. * @param data Report data, not including Report Id. * @return true if the command is successfully sent; otherwise false. */ @@ -451,8 +438,8 @@ public final class BluetoothHidDevice implements BluetoothProfile { } /** - * Sends report to remote host as reply for GET_REPORT request from - * {@link BluetoothHidDeviceCallback#onGetReport(BluetoothDevice, byte, byte, int)}. + * Sends report to remote host as reply for GET_REPORT request from {@link + * BluetoothHidDeviceCallback#onGetReport(BluetoothDevice, byte, byte, int)}. * * @param type Report Type, as in request. * @param id Report Id, as in request. @@ -479,8 +466,8 @@ public final class BluetoothHidDevice implements BluetoothProfile { } /** - * Sends error handshake message as reply for invalid SET_REPORT request - * from {@link BluetoothHidDeviceCallback#onSetReport(BluetoothDevice, byte, byte, byte[])}. + * Sends error handshake message as reply for invalid SET_REPORT request from {@link + * BluetoothHidDeviceCallback#onSetReport(BluetoothDevice, byte, byte, byte[])}. * * @param error Error to be sent for SET_REPORT via HANDSHAKE. * @return true if the command is successfully sent; otherwise false. @@ -508,6 +495,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { * Sends Virtual Cable Unplug to currently connected host. * * @return + * {@hide} */ public boolean unplug(BluetoothDevice device) { Log.v(TAG, "unplug(): device=" + device); @@ -529,11 +517,11 @@ public final class BluetoothHidDevice implements BluetoothProfile { } /** - * Initiates connection to host which is currently paired with this device. - * If the application is not registered, #connect(BluetoothDevice) will fail. - * The connection state should be tracked by the application by handling callback from - * BluetoothHidDeviceCallback#onConnectionStateChanged. The connection state is not related - * to the return value of this method. + * Initiates connection to host which is currently paired with this device. If the application + * is not registered, #connect(BluetoothDevice) will fail. The connection state should be + * tracked by the application by handling callback from + * BluetoothHidDeviceCallback#onConnectionStateChanged. The connection state is not related to + * the return value of this method. * * @return true if the command is successfully sent; otherwise false. */ @@ -557,10 +545,9 @@ public final class BluetoothHidDevice implements BluetoothProfile { } /** - * Disconnects from currently connected host. - * The connection state should be tracked by the application by handling callback from - * BluetoothHidDeviceCallback#onConnectionStateChanged. The connection state is not related - * to the return value of this method. + * Disconnects from currently connected host. The connection state should be tracked by the + * application by handling callback from BluetoothHidDeviceCallback#onConnectionStateChanged. + * The connection state is not related to the return value of this method. * * @return true if the command is successfully sent; otherwise false. */ diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java b/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java index 881ae98d9889..4609d52df0c0 100644 --- a/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java +++ b/core/java/android/bluetooth/BluetoothHidDeviceAppQosSettings.java @@ -20,15 +20,14 @@ import android.os.Parcel; import android.os.Parcelable; /** - * Represents the Quality of Service (QoS) settings for a Bluetooth HID Device - * application. + * Represents the Quality of Service (QoS) settings for a Bluetooth HID Device application. * - * The BluetoothHidDevice framework will update the L2CAP QoS settings for the - * app during registration. + * <p>The BluetoothHidDevice framework will update the L2CAP QoS settings for the app during + * registration. * - * {@see BluetoothHidDevice} + * <p>{@see BluetoothHidDevice} * - * {@hide} + * <p>{@hide} */ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { @@ -46,13 +45,12 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { public static final int MAX = (int) 0xffffffff; /** - * Create a BluetoothHidDeviceAppQosSettings object for the Bluetooth L2CAP channel. - * The QoS Settings is optional. - * Recommended to use BluetoothHidDeviceAppQosSettings.Builder. - * {@see <a href="https://www.bluetooth.com/specifications/profiles-overview"> - * https://www.bluetooth.com/specifications/profiles-overview - * </a> - * Bluetooth HID Specfication v1.1.1 Section 5.2 and Appendix D } + * Create a BluetoothHidDeviceAppQosSettings object for the Bluetooth L2CAP channel. The QoS + * Settings is optional. Recommended to use BluetoothHidDeviceAppQosSettings.Builder. {@see <a + * href="https://www.bluetooth.com/specifications/profiles-overview"> + * https://www.bluetooth.com/specifications/profiles-overview </a> Bluetooth HID Specfication + * v1.1.1 Section 5.2 and Appendix D } + * * @param serviceType L2CAP service type * @param tokenRate L2CAP token rate * @param tokenBucketSize L2CAP token bucket size @@ -123,13 +121,11 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { /** @return an int array representation of this instance */ public int[] toArray() { return new int[] { - serviceType, tokenRate, tokenBucketSize, peakBandwidth, latency, delayVariation + serviceType, tokenRate, tokenBucketSize, peakBandwidth, latency, delayVariation }; } - /** - * A helper to build the BluetoothHidDeviceAppQosSettings object. - */ + /** A helper to build the BluetoothHidDeviceAppQosSettings object. */ public static class Builder { // Optional parameters - initialized to default values private int mServiceType = SERVICE_BEST_EFFORT; @@ -141,8 +137,9 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { /** * Set the service type. + * * @param val service type. Should be one of {SERVICE_NO_TRAFFIC, SERVICE_BEST_EFFORT, - * SERVICE_GUARANTEED}, with SERVICE_BEST_EFFORT being the default one. + * SERVICE_GUARANTEED}, with SERVICE_BEST_EFFORT being the default one. * @return BluetoothHidDeviceAppQosSettings Builder with specified service type. */ public Builder serviceType(int val) { @@ -151,6 +148,7 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { } /** * Set the token rate. + * * @param val token rate * @return BluetoothHidDeviceAppQosSettings Builder with specified token rate. */ @@ -161,6 +159,7 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { /** * Set the bucket size. + * * @param val bucket size * @return BluetoothHidDeviceAppQosSettings Builder with specified bucket size. */ @@ -171,6 +170,7 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { /** * Set the peak bandwidth. + * * @param val peak bandwidth * @return BluetoothHidDeviceAppQosSettings Builder with specified peak bandwidth. */ @@ -180,6 +180,7 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { } /** * Set the latency. + * * @param val latency * @return BluetoothHidDeviceAppQosSettings Builder with specified latency. */ @@ -190,6 +191,7 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { /** * Set the delay variation. + * * @param val delay variation * @return BluetoothHidDeviceAppQosSettings Builder with specified delay variation. */ @@ -200,6 +202,7 @@ public final class BluetoothHidDeviceAppQosSettings implements Parcelable { /** * Build the BluetoothHidDeviceAppQosSettings object. + * * @return BluetoothHidDeviceAppQosSettings object with current settings. */ public BluetoothHidDeviceAppQosSettings build() { diff --git a/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java b/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java index 4669637043af..2da64e5a5023 100644 --- a/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java +++ b/core/java/android/bluetooth/BluetoothHidDeviceAppSdpSettings.java @@ -22,16 +22,14 @@ import android.os.Parcelable; import java.util.Arrays; /** - * Represents the Service Discovery Protocol (SDP) settings for a Bluetooth - * HID Device application. + * Represents the Service Discovery Protocol (SDP) settings for a Bluetooth HID Device application. * - * The BluetoothHidDevice framework adds the SDP record during app - * registration, so that the Android device can be discovered as a Bluetooth - * HID Device. + * <p>The BluetoothHidDevice framework adds the SDP record during app registration, so that the + * Android device can be discovered as a Bluetooth HID Device. * - * {@see BluetoothHidDevice} + * <p>{@see BluetoothHidDevice} * - * {@hide} + * <p>{@hide} */ public final class BluetoothHidDeviceAppSdpSettings implements Parcelable { @@ -43,18 +41,19 @@ public final class BluetoothHidDeviceAppSdpSettings implements Parcelable { /** * Create a BluetoothHidDeviceAppSdpSettings object for the Bluetooth SDP record. + * * @param name Name of this Bluetooth HID device. Maximum length is 50 bytes. * @param description Description for this Bluetooth HID device. Maximum length is 50 bytes. * @param provider Provider of this Bluetooth HID device. Maximum length is 50 bytes. - * @param subclass Subclass of this Bluetooth HID device. - * See <a href="www.usb.org/developers/hidpage/HID1_11.pdf"> + * @param subclass Subclass of this Bluetooth HID device. See <a + * href="www.usb.org/developers/hidpage/HID1_11.pdf"> * www.usb.org/developers/hidpage/HID1_11.pdf Section 4.2</a> - * @param descriptors Descriptors of this Bluetooth HID device. - * See <a href="www.usb.org/developers/hidpage/HID1_11.pdf"> + * @param descriptors Descriptors of this Bluetooth HID device. See <a + * href="www.usb.org/developers/hidpage/HID1_11.pdf"> * www.usb.org/developers/hidpage/HID1_11.pdf Chapter 6</a> Maximum length is 2048 bytes. */ - public BluetoothHidDeviceAppSdpSettings(String name, String description, String provider, - byte subclass, byte[] descriptors) { + public BluetoothHidDeviceAppSdpSettings( + String name, String description, String provider, byte subclass, byte[] descriptors) { this.name = name; this.description = description; this.provider = provider; diff --git a/core/java/android/bluetooth/BluetoothHidDeviceCallback.java b/core/java/android/bluetooth/BluetoothHidDeviceCallback.java index dc6f9fa1abf3..6ed19654b4c5 100644 --- a/core/java/android/bluetooth/BluetoothHidDeviceCallback.java +++ b/core/java/android/bluetooth/BluetoothHidDeviceCallback.java @@ -19,46 +19,43 @@ package android.bluetooth; import android.util.Log; /** - * The template class that applications use to call callback functions on - * events from the HID host. Callback functions are wrapped in this class and - * registered to the Android system during app registration. + * The template class that applications use to call callback functions on events from the HID host. + * Callback functions are wrapped in this class and registered to the Android system during app + * registration. * - * {@see BluetoothHidDevice} + * <p>{@see BluetoothHidDevice} * - * {@hide} + * <p>{@hide} */ public abstract class BluetoothHidDeviceCallback { private static final String TAG = "BluetoothHidDevCallback"; /** - * Callback called when application registration state changes. Usually it's - * called due to either - * {@link BluetoothHidDevice#registerApp - * (String, String, String, byte, byte[], BluetoothHidDeviceCallback)} - * or - * {@link BluetoothHidDevice#unregisterApp()} - * , but can be also unsolicited in case e.g. Bluetooth was turned off in - * which case application is unregistered automatically. + * Callback called when application registration state changes. Usually it's called due to + * either {@link BluetoothHidDevice#registerApp (String, String, String, byte, byte[], + * BluetoothHidDeviceCallback)} or {@link BluetoothHidDevice#unregisterApp()} , but can be also + * unsolicited in case e.g. Bluetooth was turned off in which case application is unregistered + * automatically. * * @param pluggedDevice {@link BluetoothDevice} object which represents host that currently has - * Virtual Cable established with device. Only valid when application is registered, can be - * <code>null</code>. + * Virtual Cable established with device. Only valid when application is registered, can be + * <code>null</code>. * @param registered <code>true</code> if application is registered, <code>false</code> - * otherwise. + * otherwise. */ public void onAppStatusChanged(BluetoothDevice pluggedDevice, boolean registered) { - Log.d(TAG, "onAppStatusChanged: pluggedDevice=" + pluggedDevice + " registered=" - + registered); + Log.d(TAG, + "onAppStatusChanged: pluggedDevice=" + pluggedDevice + " registered=" + registered); } /** - * Callback called when connection state with remote host was changed. - * Application can assume than Virtual Cable is established when called with - * {@link BluetoothProfile#STATE_CONNECTED} <code>state</code>. + * Callback called when connection state with remote host was changed. Application can assume + * than Virtual Cable is established when called with {@link BluetoothProfile#STATE_CONNECTED} + * <code>state</code>. * * @param device {@link BluetoothDevice} object representing host device which connection state - * was changed. + * was changed. * @param state Connection state as defined in {@link BluetoothProfile}. */ public void onConnectionStateChanged(BluetoothDevice device, int state) { @@ -66,14 +63,14 @@ public abstract class BluetoothHidDeviceCallback { } /** - * Callback called when GET_REPORT is received from remote host. Should be - * replied by application using - * {@link BluetoothHidDevice#replyReport(BluetoothDevice, byte, byte, byte[])}. + * Callback called when GET_REPORT is received from remote host. Should be replied by + * application using {@link BluetoothHidDevice#replyReport(BluetoothDevice, byte, byte, + * byte[])}. * * @param type Requested Report Type. * @param id Requested Report Id, can be 0 if no Report Id are defined in descriptor. * @param bufferSize Requested buffer size, application shall respond with at least given number - * of bytes. + * of bytes. */ public void onGetReport(BluetoothDevice device, byte type, byte id, int bufferSize) { Log.d(TAG, "onGetReport: device=" + device + " type=" + type + " id=" + id + " bufferSize=" @@ -81,9 +78,9 @@ public abstract class BluetoothHidDeviceCallback { } /** - * Callback called when SET_REPORT is received from remote host. In case - * received data are invalid, application shall respond with - * {@link BluetoothHidDevice#reportError(BluetoothDevice, byte)}. + * Callback called when SET_REPORT is received from remote host. In case received data are + * invalid, application shall respond with {@link + * BluetoothHidDevice#reportError(BluetoothDevice, byte)}. * * @param type Report Type. * @param id Report Id. @@ -94,10 +91,9 @@ public abstract class BluetoothHidDeviceCallback { } /** - * Callback called when SET_PROTOCOL is received from remote host. - * Application shall use this information to send only reports valid for - * given protocol mode. By default, - * {@link BluetoothHidDevice#PROTOCOL_REPORT_MODE} shall be assumed. + * Callback called when SET_PROTOCOL is received from remote host. Application shall use this + * information to send only reports valid for given protocol mode. By default, {@link + * BluetoothHidDevice#PROTOCOL_REPORT_MODE} shall be assumed. * * @param protocol Protocol Mode. */ @@ -106,9 +102,8 @@ public abstract class BluetoothHidDeviceCallback { } /** - * Callback called when report data is received over interrupt channel. - * Report Type is assumed to be - * {@link BluetoothHidDevice#REPORT_TYPE_OUTPUT}. + * Callback called when report data is received over interrupt channel. Report Type is assumed + * to be {@link BluetoothHidDevice#REPORT_TYPE_OUTPUT}. * * @param reportId Report Id. * @param data Report data. @@ -118,10 +113,8 @@ public abstract class BluetoothHidDeviceCallback { } /** - * Callback called when Virtual Cable is removed. This can be either due to - * {@link BluetoothHidDevice#unplug(BluetoothDevice)} or request from remote - * side. After this callback is received connection will be disconnected - * automatically. + * Callback called when Virtual Cable is removed. After this callback is + * received connection will be disconnected automatically. */ public void onVirtualCableUnplug(BluetoothDevice device) { Log.d(TAG, "onVirtualCableUnplug: device=" + device); diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 28bd928214ae..6fb1afde22ec 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4915,8 +4915,9 @@ public class Intent implements Parcelable, Cloneable { * <li>Enumeration of features here is not meant to restrict capabilities of the quick viewer. * Quick viewer can implement features not listed below. * <li>Features included at this time are: {@link QuickViewConstants#FEATURE_VIEW}, - * {@link QuickViewConstants#FEATURE_EDIT}, {@link QuickViewConstants#FEATURE_DOWNLOAD}, - * {@link QuickViewConstants#FEATURE_SEND}, {@link QuickViewConstants#FEATURE_PRINT}. + * {@link QuickViewConstants#FEATURE_EDIT}, {@link QuickViewConstants#FEATURE_DELETE}, + * {@link QuickViewConstants#FEATURE_DOWNLOAD}, {@link QuickViewConstants#FEATURE_SEND}, + * {@link QuickViewConstants#FEATURE_PRINT}. * <p> * Requirements: * <li>Quick viewer shouldn't show a feature if the feature is absent in diff --git a/core/java/android/content/QuickViewConstants.java b/core/java/android/content/QuickViewConstants.java index 7455d0cb0944..a25513de3d47 100644 --- a/core/java/android/content/QuickViewConstants.java +++ b/core/java/android/content/QuickViewConstants.java @@ -33,7 +33,7 @@ public class QuickViewConstants { public static final String FEATURE_VIEW = "android:view"; /** - * Feature to view a document using system standard editing mechanism, like + * Feature to edit a document using system standard editing mechanism, like * {@link Intent#ACTION_EDIT}. * * @see Intent#EXTRA_QUICK_VIEW_FEATURES @@ -42,6 +42,15 @@ public class QuickViewConstants { public static final String FEATURE_EDIT = "android:edit"; /** + * Feature to delete an individual document. Quick viewer implementations must use + * Storage Access Framework to both verify delete permission and to delete content. + * + * @see DocumentsContract#Document#FLAG_SUPPORTS_DELETE + * @see DocumentsContract#deleteDocument(ContentResolver resolver, Uri documentUri) + */ + public static final String FEATURE_DELETE = "android:delete"; + + /** * Feature to view a document using system standard sending mechanism, like * {@link Intent#ACTION_SEND}. * diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 9e54e235325c..d09ba0b55a3c 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -265,6 +265,14 @@ public class LauncherApps { /** * Include pinned shortcuts in the result. + * + * <p>If you are the selected assistant app, and wishes to fetch all shortcuts that the + * user owns on the launcher (or by other launchers, in case the user has multiple), use + * {@link #FLAG_MATCH_PINNED_BY_ANY_LAUNCHER} instead. + * + * <p>If you're a regular launcher app, there's no way to get shortcuts pinned by other + * launchers, and {@link #FLAG_MATCH_PINNED_BY_ANY_LAUNCHER} will be ignored. So use this + * flag to get own pinned shortcuts. */ public static final int FLAG_MATCH_PINNED = 1 << 1; @@ -285,8 +293,15 @@ public class LauncherApps { * Include all pinned shortcuts by any launchers, not just by the caller, * in the result. * - * The caller must be the selected assistant app to use this flag, or have the system + * <p>The caller must be the selected assistant app to use this flag, or have the system * {@code ACCESS_SHORTCUTS} permission. + * + * <p>If you are the selected assistant app, and wishes to fetch all shortcuts that the + * user owns on the launcher (or by other launchers, in case the user has multiple), use + * {@link #FLAG_MATCH_PINNED_BY_ANY_LAUNCHER} instead. + * + * <p>If you're a regular launcher app (or any app that's not the selected assistant app) + * then this flag will be ignored. */ public static final int FLAG_MATCH_PINNED_BY_ANY_LAUNCHER = 1 << 10; diff --git a/core/java/android/content/pm/ShortcutServiceInternal.java b/core/java/android/content/pm/ShortcutServiceInternal.java index dadfaa9f1a66..e6f682d22b14 100644 --- a/core/java/android/content/pm/ShortcutServiceInternal.java +++ b/core/java/android/content/pm/ShortcutServiceInternal.java @@ -81,4 +81,7 @@ public abstract class ShortcutServiceInternal { @Nullable IntentSender resultIntent, int userId); public abstract boolean isRequestPinItemSupported(int callingUserId, int requestType); + + public abstract boolean isForegroundDefaultLauncher(@NonNull String callingPackage, + int callingUid); } diff --git a/core/java/android/content/res/XmlResourceParser.java b/core/java/android/content/res/XmlResourceParser.java index 5af49d4d46a2..6be9b9eb0438 100644 --- a/core/java/android/content/res/XmlResourceParser.java +++ b/core/java/android/content/res/XmlResourceParser.java @@ -16,20 +16,19 @@ package android.content.res; -import org.xmlpull.v1.XmlPullParser; - import android.util.AttributeSet; +import org.xmlpull.v1.XmlPullParser; + /** * The XML parsing interface returned for an XML resource. This is a standard - * XmlPullParser interface, as well as an extended AttributeSet interface and - * an additional close() method on this interface for the client to indicate - * when it is done reading the resource. + * {@link XmlPullParser} interface but also extends {@link AttributeSet} and + * adds an additional {@link #close()} method for the client to indicate when + * it is done reading the resource. */ public interface XmlResourceParser extends XmlPullParser, AttributeSet, AutoCloseable { /** - * Close this interface to the resource. Calls on the interface are no - * longer value after this call. + * Close this parser. Calls on the interface are no longer valid after this call. */ public void close(); } diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index a7a3df7ff372..cb11d0f54a7b 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -2729,13 +2729,13 @@ public abstract class CameraMetadata<TKey> { // /** - * <p>Scene change is not detected within AF regions.</p> + * <p>Scene change is not detected within the AF region(s).</p> * @see CaptureResult#CONTROL_AF_SCENE_CHANGE */ public static final int CONTROL_AF_SCENE_CHANGE_NOT_DETECTED = 0; /** - * <p>Scene change is detected within AF regions.</p> + * <p>Scene change is detected within the AF region(s).</p> * @see CaptureResult#CONTROL_AF_SCENE_CHANGE */ public static final int CONTROL_AF_SCENE_CHANGE_DETECTED = 1; diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index b7d7f7d90a31..6d7b06fc609f 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -2185,10 +2185,16 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { new Key<Boolean>("android.control.enableZsl", boolean.class); /** - * <p>Whether scene change is detected within AF regions.</p> - * <p>When AF detects a scene change within current AF regions, it will be set to DETECTED. Otherwise, - * it will be set to NOT_DETECTED. This value will remain NOT_DETECTED if afMode is AF_MODE_OFF or - * AF_MODE_EDOF.</p> + * <p>Whether a significant scene change is detected within the currently-set AF + * region(s).</p> + * <p>When the camera focus routine detects a change in the scene it is looking at, + * such as a large shift in camera viewpoint, significant motion in the scene, or a + * significant illumination change, this value will be set to DETECTED for a single capture + * result. Otherwise the value will be NOT_DETECTED. The threshold for detection is similar + * to what would trigger a new passive focus scan to begin in CONTINUOUS autofocus modes.</p> + * <p>afSceneChange may be DETECTED only if afMode is AF_MODE_CONTINUOUS_VIDEO or + * AF_MODE_CONTINUOUS_PICTURE. In other AF modes, afSceneChange must be NOT_DETECTED.</p> + * <p>This key will be available if the camera device advertises this key via {@link android.hardware.camera2.CameraCharacteristics#getAvailableCaptureResultKeys }.</p> * <p><b>Possible values:</b> * <ul> * <li>{@link #CONTROL_AF_SCENE_CHANGE_NOT_DETECTED NOT_DETECTED}</li> diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index a8acb976a637..766ad8454e6f 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -224,6 +224,12 @@ public class CallLog { public static final int FEATURES_WIFI = 0x8; /** + * Indicates the call underwent Assisted Dialing. + * @hide + */ + public static final Integer FEATURES_ASSISTED_DIALING_USED = 0x10; + + /** * The phone number as the user entered it. * <P>Type: TEXT</P> */ diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 8a75a53c3602..6b1632a0a693 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5330,11 +5330,12 @@ public final class Settings { /** * Experimental autofill feature. * - * <p>TODO(b/67867469): remove once feature is finished + * <p>TODO(b/67867469): document (or remove) once feature is finished * @hide */ @TestApi - public static final String AUTOFILL_FEATURE_FIELD_DETECTION = "autofill_field_detection"; + public static final String AUTOFILL_FEATURE_FIELD_CLASSIFICATION = + "autofill_field_classification"; /** * Experimental autofill feature. @@ -10163,6 +10164,16 @@ public final class Settings { public static final String POLICY_CONTROL = "policy_control"; /** + * {@link android.view.DisplayCutout DisplayCutout} emulation mode. + * + * @hide + */ + public static final String EMULATE_DISPLAY_CUTOUT = "emulate_display_cutout"; + + /** @hide */ public static final int EMULATE_DISPLAY_CUTOUT_OFF = 0; + /** @hide */ public static final int EMULATE_DISPLAY_CUTOUT_ON = 1; + + /** * Defines global zen mode. ZEN_MODE_OFF, ZEN_MODE_IMPORTANT_INTERRUPTIONS, * or ZEN_MODE_NO_INTERRUPTIONS. * diff --git a/core/java/android/service/autofill/EditDistanceScorer.java b/core/java/android/service/autofill/EditDistanceScorer.java new file mode 100644 index 000000000000..e25cd0467cc8 --- /dev/null +++ b/core/java/android/service/autofill/EditDistanceScorer.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2017 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 android.service.autofill; + +import android.annotation.NonNull; +import android.annotation.TestApi; +import android.os.Parcel; +import android.os.Parcelable; +import android.view.autofill.AutofillValue; + +/** + * Helper used to calculate the classification score between an actual {@link AutofillValue} filled + * by the user and the expected value predicted by an autofill service. + * + * TODO(b/67867469): + * - improve javadoc + * - document algorithm / copy from InternalScorer + * - unhide / remove testApi + * @hide + */ +@TestApi +public final class EditDistanceScorer extends InternalScorer implements Scorer, Parcelable { + + private static final EditDistanceScorer sInstance = new EditDistanceScorer(); + + /** + * Gets the singleton instance. + */ + public static EditDistanceScorer getInstance() { + return sInstance; + } + + private EditDistanceScorer() { + } + + @Override + public float getScore(@NonNull AutofillValue actualValue, @NonNull String userData) { + if (actualValue == null || !actualValue.isText() || userData == null) return 0; + // TODO(b/67867469): implement edit distance - currently it's returning either 0, 100%, or + // partial match when number of chars match + final String textValue = actualValue.getTextValue().toString(); + final int total = textValue.length(); + if (total != userData.length()) return 0F; + + int matches = 0; + for (int i = 0; i < total; i++) { + if (Character.toLowerCase(textValue.charAt(i)) == Character + .toLowerCase(userData.charAt(i))) { + matches++; + } + } + + return ((float) matches) / total; + } + + ///////////////////////////////////// + // Object "contract" methods. // + ///////////////////////////////////// + @Override + public String toString() { + return "EditDistanceScorer"; + } + + ///////////////////////////////////// + // Parcelable "contract" methods. // + ///////////////////////////////////// + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel parcel, int flags) { + // Do nothing + } + + public static final Parcelable.Creator<EditDistanceScorer> CREATOR = + new Parcelable.Creator<EditDistanceScorer>() { + @Override + public EditDistanceScorer createFromParcel(Parcel parcel) { + return EditDistanceScorer.getInstance(); + } + + @Override + public EditDistanceScorer[] newArray(int size) { + return new EditDistanceScorer[size]; + } + }; +} diff --git a/core/java/android/service/autofill/FieldClassification.java b/core/java/android/service/autofill/FieldClassification.java index 5d0c81cd59a0..0a60208c45a7 100644 --- a/core/java/android/service/autofill/FieldClassification.java +++ b/core/java/android/service/autofill/FieldClassification.java @@ -26,6 +26,10 @@ import android.view.autofill.Helper; import com.android.internal.util.Preconditions; +import com.google.android.collect.Lists; + +import java.util.List; + /** * Gets the <a href="#FieldsClassification">fields classification</a> results for a given field. * @@ -46,11 +50,15 @@ public final class FieldClassification implements Parcelable { } /** - * Gets the {@link Match} with the highest {@link Match#getScore() score} for the field. + * Gets the {@link Match matches} with the highest {@link Match#getScore() scores}. + * + * <p><b>Note:</b> There's no guarantee of how many matches will be returned. In fact, + * the Android System might return just the top match to minimize the impact of field + * classification in the device's health. */ @NonNull - public Match getTopMatch() { - return mMatch; + public List<Match> getMatches() { + return Lists.newArrayList(mMatch); } @Override @@ -101,10 +109,10 @@ public final class FieldClassification implements Parcelable { public static final class Match implements Parcelable { private final String mRemoteId; - private final int mScore; + private final float mScore; /** @hide */ - public Match(String remoteId, int score) { + public Match(String remoteId, float score) { mRemoteId = Preconditions.checkNotNull(remoteId); mScore = score; } @@ -123,8 +131,8 @@ public final class FieldClassification implements Parcelable { * <p>The score is based in a case-insensitive comparisson of all characters from both the * field value and the user data entry, and it ranges from {@code 0} to {@code 1000000}: * <ul> - * <li>{@code 1000000} represents a full match ({@code 100.0000%}). - * <li>{@code 0} represents a full mismatch ({@code 0.0000%}). + * <li>{@code 1.0} represents a full match ({@code 100%}). + * <li>{@code 0.0} represents a full mismatch ({@code 0%}). * <li>Any other value is a partial match. * </ul> * @@ -132,14 +140,14 @@ public final class FieldClassification implements Parcelable { * For example, if the user data is {@code "abc"} and the field value us {@code " abc"}, * the result could be: * <ul> - * <li>{@code 1000000} if the algorithm trims the values. - * <li>{@code 0} if the algorithm compares the values sequentially. - * <li>{@code 750000} if the algorithm consideres that 3/4 (75%) of the characters match. + * <li>{@code 1.0} if the algorithm trims the values. + * <li>{@code 0.0} if the algorithm compares the values sequentially. + * <li>{@code 0.75} if the algorithm consideres that 3/4 (75%) of the characters match. * </ul> * * <p>Currently, the autofill service cannot configure the algorithm. */ - public int getScore() { + public float getScore() { return mScore; } @@ -164,7 +172,7 @@ public final class FieldClassification implements Parcelable { @Override public void writeToParcel(Parcel parcel, int flags) { parcel.writeString(mRemoteId); - parcel.writeInt(mScore); + parcel.writeFloat(mScore); } @SuppressWarnings("hiding") @@ -172,7 +180,7 @@ public final class FieldClassification implements Parcelable { @Override public Match createFromParcel(Parcel parcel) { - return new Match(parcel.readString(), parcel.readInt()); + return new Match(parcel.readString(), parcel.readFloat()); } @Override diff --git a/core/java/android/service/autofill/FieldsClassificationScorer.java b/core/java/android/service/autofill/FieldsClassificationScorer.java deleted file mode 100644 index b95a7ed74370..000000000000 --- a/core/java/android/service/autofill/FieldsClassificationScorer.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2017 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 android.service.autofill; - -import android.annotation.NonNull; -import android.annotation.TestApi; -import android.view.autofill.AutofillValue; - -/** - * Helper used to calculate the classification score between an actual {@link AutofillValue} filled - * by the user and the expected value predicted by an autofill service. - * - * @hide - */ -@TestApi -public final class FieldsClassificationScorer { - - private static final int MAX_VALUE = 100_0000; // 100.0000% - - /** - * Returns the classification score between an actual {@link AutofillValue} filled - * by the user and the expected value predicted by an autofill service. - * - * <p>A full-match is {@code 1000000} (representing 100.0000%), a full mismatch is {@code 0} and - * partial mathces are something in between, typically using edit-distance algorithms. - */ - public static int getScore(@NonNull AutofillValue actualValue, @NonNull String userData) { - if (actualValue == null || !actualValue.isText() || userData == null) return 0; - // TODO(b/67867469): implement edit distance - currently it's returning either 0, 100%, or - // partial match when number of chars match - final String textValue = actualValue.getTextValue().toString(); - final int total = textValue.length(); - if (total != userData.length()) return 0; - - int matches = 0; - for (int i = 0; i < total; i++) { - if (Character.toLowerCase(textValue.charAt(i)) == Character - .toLowerCase(userData.charAt(i))) { - matches++; - } - } - - final float percentage = ((float) matches) / total; - final int rounded = (int) (percentage * MAX_VALUE); - return rounded; - } - - private FieldsClassificationScorer() { - throw new UnsupportedOperationException("contains only static methods"); - } -} diff --git a/core/java/android/service/autofill/InternalScorer.java b/core/java/android/service/autofill/InternalScorer.java new file mode 100644 index 000000000000..0da5afc2331d --- /dev/null +++ b/core/java/android/service/autofill/InternalScorer.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2017 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 android.service.autofill; + +import android.annotation.NonNull; +import android.annotation.TestApi; +import android.os.Parcelable; +import android.view.autofill.AutofillValue; + +/** + * Superclass of all scorer the system understands. As this is not public all + * subclasses have to implement {@link Scorer} again. + * + * @hide + */ +@TestApi +public abstract class InternalScorer implements Scorer, Parcelable { + + /** + * Returns the classification score between an actual {@link AutofillValue} filled + * by the user and the expected value predicted by an autofill service. + * + * <p>A full-match is {@code 1.0} (representing 100%), a full mismatch is {@code 0.0} and + * partial mathces are something in between, typically using edit-distance algorithms. + */ + public abstract float getScore(@NonNull AutofillValue actualValue, @NonNull String userData); +} diff --git a/core/java/android/service/autofill/Scorer.java b/core/java/android/service/autofill/Scorer.java new file mode 100644 index 000000000000..f6a802a33e14 --- /dev/null +++ b/core/java/android/service/autofill/Scorer.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2017 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 android.service.autofill; + +import android.annotation.TestApi; + +/** + * Helper class used to calculate a score. + * + * <p>Typically used to calculate the field classification score between an actual + * {@link android.view.autofill.AutofillValue} filled by the user and the expected value predicted + * by an autofill service. + * + * TODO(b/67867469): + * - improve javadoc + * - unhide / remove testApi + * @hide + */ +@TestApi +public interface Scorer { + +} diff --git a/core/java/android/service/autofill/UserData.java b/core/java/android/service/autofill/UserData.java index ea5660df2910..0d378153aa0d 100644 --- a/core/java/android/service/autofill/UserData.java +++ b/core/java/android/service/autofill/UserData.java @@ -56,10 +56,12 @@ public final class UserData implements Parcelable { private static final int DEFAULT_MIN_VALUE_LENGTH = 5; private static final int DEFAULT_MAX_VALUE_LENGTH = 100; + private final InternalScorer mScorer; private final String[] mRemoteIds; private final String[] mValues; private UserData(Builder builder) { + mScorer = builder.mScorer; mRemoteIds = new String[builder.mRemoteIds.size()]; builder.mRemoteIds.toArray(mRemoteIds); mValues = new String[builder.mValues.size()]; @@ -67,6 +69,11 @@ public final class UserData implements Parcelable { } /** @hide */ + public InternalScorer getScorer() { + return mScorer; + } + + /** @hide */ public String[] getRemoteIds() { return mRemoteIds; } @@ -78,6 +85,7 @@ public final class UserData implements Parcelable { /** @hide */ public void dump(String prefix, PrintWriter pw) { + pw.print(prefix); pw.print("Scorer: "); pw.println(mScorer); // Cannot disclose remote ids or values because they could contain PII pw.print(prefix); pw.print("Remote ids size: "); pw.println(mRemoteIds.length); for (int i = 0; i < mRemoteIds.length; i++) { @@ -109,6 +117,7 @@ public final class UserData implements Parcelable { */ @TestApi public static final class Builder { + private final InternalScorer mScorer; private final ArrayList<String> mRemoteIds; private final ArrayList<String> mValues; private boolean mDestroyed; @@ -117,11 +126,19 @@ public final class UserData implements Parcelable { * Creates a new builder for the user data used for <a href="#FieldsClassification">fields * classification</a>. * - * @throws IllegalArgumentException if {@code remoteId} or {@code value} are empty or if the - * length of {@code value} is lower than {@link UserData#getMinValueLength()} - * or higher than {@link UserData#getMaxValueLength()}. + * @throws IllegalArgumentException if any of the following occurs: + * <ol> + * <li>{@code remoteId} is empty + * <li>{@code value} is empty + * <li>the length of {@code value} is lower than {@link UserData#getMinValueLength()} + * <li>the length of {@code value} is higher than {@link UserData#getMaxValueLength()} + * <li>{@code scorer} is not instance of a class provided by the Android System. + * </ol> */ - public Builder(@NonNull String remoteId, @NonNull String value) { + public Builder(@NonNull Scorer scorer, @NonNull String remoteId, @NonNull String value) { + Preconditions.checkArgument((scorer instanceof InternalScorer), + "not provided by Android System: " + scorer); + mScorer = (InternalScorer) scorer; checkValidRemoteId(remoteId); checkValidValue(value); final int capacity = getMaxUserDataSize(); @@ -206,8 +223,9 @@ public final class UserData implements Parcelable { public String toString() { if (!sDebug) return super.toString(); - // Cannot disclose keys or values because they could contain PII - final StringBuilder builder = new StringBuilder("UserData: [remoteIds="); + final StringBuilder builder = new StringBuilder("UserData: [scorer=").append(mScorer); + // Cannot disclose remote ids or values because they could contain PII + builder.append(", remoteIds="); Helper.appendRedacted(builder, mRemoteIds); builder.append(", values="); Helper.appendRedacted(builder, mValues); @@ -225,6 +243,7 @@ public final class UserData implements Parcelable { @Override public void writeToParcel(Parcel parcel, int flags) { + parcel.writeParcelable(mScorer, flags); parcel.writeStringArray(mRemoteIds); parcel.writeStringArray(mValues); } @@ -236,9 +255,10 @@ public final class UserData implements Parcelable { // Always go through the builder to ensure the data ingested by // the system obeys the contract of the builder to avoid attacks // using specially crafted parcels. + final InternalScorer scorer = parcel.readParcelable(null); final String[] remoteIds = parcel.readStringArray(); final String[] values = parcel.readStringArray(); - final Builder builder = new Builder(remoteIds[0], values[0]); + final Builder builder = new Builder(scorer, remoteIds[0], values[0]); for (int i = 1; i < remoteIds.length; i++) { builder.add(remoteIds[i], values[i]); } @@ -268,14 +288,14 @@ public final class UserData implements Parcelable { } /** - * Gets the minimum length of values passed to {@link Builder#Builder(String, String)}. + * Gets the minimum length of values passed to {@link Builder#Builder(Scorer, String, String)}. */ public static int getMinValueLength() { return getInt(AUTOFILL_USER_DATA_MIN_VALUE_LENGTH, DEFAULT_MIN_VALUE_LENGTH); } /** - * Gets the maximum length of values passed to {@link Builder#Builder(String, String)}. + * Gets the maximum length of values passed to {@link Builder#Builder(Scorer, String, String)}. */ public static int getMaxValueLength() { return getInt(AUTOFILL_USER_DATA_MAX_VALUE_LENGTH, DEFAULT_MAX_VALUE_LENGTH); diff --git a/core/java/android/service/vr/IVrManager.aidl b/core/java/android/service/vr/IVrManager.aidl index 7285fb40ae02..f7acfc5918a8 100644 --- a/core/java/android/service/vr/IVrManager.aidl +++ b/core/java/android/service/vr/IVrManager.aidl @@ -17,6 +17,7 @@ package android.service.vr; import android.app.Vr2dDisplayProperties; +import android.content.ComponentName; import android.service.vr.IVrStateCallbacks; import android.service.vr.IPersistentVrStateCallbacks; @@ -109,5 +110,13 @@ interface IVrManager { * @param standy True if the device is entering standby, false if it's exiting standby. */ void setStandbyEnabled(boolean standby); + + /** + * Start VR Input method for the given packageName in {@param componentName}. + * This method notifies InputMethodManagerService to use VR IME instead of + * regular phone IME. + */ + void setVrInputMethod(in ComponentName componentName); + } diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index dd0ae3393f1d..e5ab3e1caa3d 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -42,6 +42,7 @@ import android.os.SystemClock; import android.util.Log; import android.util.MergedConfiguration; import android.view.Display; +import android.view.DisplayCutout; import android.view.Gravity; import android.view.IWindowSession; import android.view.InputChannel; @@ -176,6 +177,9 @@ public abstract class WallpaperService extends Service { final Rect mFinalSystemInsets = new Rect(); final Rect mFinalStableInsets = new Rect(); final Rect mBackdropFrame = new Rect(); + final DisplayCutout.ParcelableWrapper mDisplayCutout = + new DisplayCutout.ParcelableWrapper(); + DisplayCutout mDispatchedDisplayCutout = DisplayCutout.NO_CUTOUT; final MergedConfiguration mMergedConfiguration = new MergedConfiguration(); final WindowManager.LayoutParams mLayout @@ -302,7 +306,8 @@ public abstract class WallpaperService extends Service { public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw, MergedConfiguration mergedConfiguration, Rect backDropRect, boolean forceLayout, - boolean alwaysConsumeNavBar, int displayId) { + boolean alwaysConsumeNavBar, int displayId, + DisplayCutout.ParcelableWrapper displayCutout) { Message msg = mCaller.obtainMessageIO(MSG_WINDOW_RESIZED, reportDraw ? 1 : 0, outsets); mCaller.sendMessage(msg); @@ -750,7 +755,7 @@ public abstract class WallpaperService extends Service { mInputChannel = new InputChannel(); if (mSession.addToDisplay(mWindow, mWindow.mSeq, mLayout, View.VISIBLE, Display.DEFAULT_DISPLAY, mContentInsets, mStableInsets, mOutsets, - mInputChannel) < 0) { + mDisplayCutout, mInputChannel) < 0) { Log.w(TAG, "Failed to add window while updating wallpaper surface."); return; } @@ -776,7 +781,7 @@ public abstract class WallpaperService extends Service { mWindow, mWindow.mSeq, mLayout, mWidth, mHeight, View.VISIBLE, 0, mWinFrame, mOverscanInsets, mContentInsets, mVisibleInsets, mStableInsets, mOutsets, mBackdropFrame, - mMergedConfiguration, mSurfaceHolder.mSurface); + mDisplayCutout, mMergedConfiguration, mSurfaceHolder.mSurface); if (DEBUG) Log.v(TAG, "New surface: " + mSurfaceHolder.mSurface + ", frame=" + mWinFrame); @@ -800,6 +805,8 @@ public abstract class WallpaperService extends Service { mStableInsets.top += padding.top; mStableInsets.right += padding.right; mStableInsets.bottom += padding.bottom; + mDisplayCutout.set(mDisplayCutout.get().inset(-padding.left, -padding.top, + -padding.right, -padding.bottom)); } if (mCurWidth != w) { @@ -819,6 +826,7 @@ public abstract class WallpaperService extends Service { insetsChanged |= !mDispatchedContentInsets.equals(mContentInsets); insetsChanged |= !mDispatchedStableInsets.equals(mStableInsets); insetsChanged |= !mDispatchedOutsets.equals(mOutsets); + insetsChanged |= !mDispatchedDisplayCutout.equals(mDisplayCutout.get()); mSurfaceHolder.setSurfaceFrameSize(w, h); mSurfaceHolder.mSurfaceLock.unlock(); @@ -885,12 +893,13 @@ public abstract class WallpaperService extends Service { mDispatchedContentInsets.set(mContentInsets); mDispatchedStableInsets.set(mStableInsets); mDispatchedOutsets.set(mOutsets); + mDispatchedDisplayCutout = mDisplayCutout.get(); mFinalSystemInsets.set(mDispatchedOverscanInsets); mFinalStableInsets.set(mDispatchedStableInsets); WindowInsets insets = new WindowInsets(mFinalSystemInsets, null, mFinalStableInsets, getResources().getConfiguration().isScreenRound(), false, - null /* displayCutout */); + mDispatchedDisplayCutout); if (DEBUG) { Log.v(TAG, "dispatching insets=" + insets); } diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 29baea17da33..80785fd87b65 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -21,6 +21,7 @@ import android.os.SystemProperties; import android.provider.Settings; import android.text.TextUtils; +import java.util.HashMap; import java.util.Map; /** @@ -33,6 +34,17 @@ public class FeatureFlagUtils { public static final String FFLAG_PREFIX = "sys.fflag."; public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override."; + private static final Map<String, String> DEFAULT_FLAGS; + static { + DEFAULT_FLAGS = new HashMap<>(); + DEFAULT_FLAGS.put("device_info_v2", "true"); + DEFAULT_FLAGS.put("new_settings_suggestion", "true"); + DEFAULT_FLAGS.put("settings_search_v2", "false"); + DEFAULT_FLAGS.put("settings_app_info_v2", "false"); + DEFAULT_FLAGS.put("settings_connected_device_v2", "false"); + DEFAULT_FLAGS.put("settings_battery_v2", "false"); + } + /** * Whether or not a flag is enabled. * @@ -41,7 +53,7 @@ public class FeatureFlagUtils { */ public static boolean isEnabled(Context context, String feature) { // Override precedence: - // Settings.Global -> sys.fflag.override.* -> sys.fflag.* + // Settings.Global -> sys.fflag.override.* -> static list // Step 1: check if feature flag is set in Settings.Global. String value; @@ -57,8 +69,8 @@ public class FeatureFlagUtils { if (!TextUtils.isEmpty(value)) { return Boolean.parseBoolean(value); } - // Step 3: check if feature flag has any default value. Flag name: sys.fflag.<feature> - value = SystemProperties.get(FFLAG_PREFIX + feature); + // Step 3: check if feature flag has any default value. + value = getAllFeatureFlags().get(feature); return Boolean.parseBoolean(value); } @@ -73,6 +85,6 @@ public class FeatureFlagUtils { * Returns all feature flags in their raw form. */ public static Map<String, String> getAllFeatureFlags() { - return null; + return DEFAULT_FLAGS; } } diff --git a/core/java/android/view/DisplayCutout.aidl b/core/java/android/view/DisplayCutout.aidl new file mode 100644 index 000000000000..6d13b99b6eff --- /dev/null +++ b/core/java/android/view/DisplayCutout.aidl @@ -0,0 +1,19 @@ +/** + * Copyright (c) 2017, 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 android.view; + +parcelable DisplayCutout.ParcelableWrapper; diff --git a/core/java/android/view/IWindow.aidl b/core/java/android/view/IWindow.aidl index 611cc6337fb4..07a57fb73a0d 100644 --- a/core/java/android/view/IWindow.aidl +++ b/core/java/android/view/IWindow.aidl @@ -23,6 +23,7 @@ import android.os.ParcelFileDescriptor; import android.view.DragEvent; import android.view.KeyEvent; import android.view.MotionEvent; +import android.view.DisplayCutout; import com.android.internal.os.IResultReceiver; import android.util.MergedConfiguration; @@ -50,7 +51,8 @@ oneway interface IWindow { void resized(in Rect frame, in Rect overscanInsets, in Rect contentInsets, in Rect visibleInsets, in Rect stableInsets, in Rect outsets, boolean reportDraw, in MergedConfiguration newMergedConfiguration, in Rect backDropFrame, - boolean forceLayout, boolean alwaysConsumeNavBar, int displayId); + boolean forceLayout, boolean alwaysConsumeNavBar, int displayId, + in DisplayCutout.ParcelableWrapper displayCutout); void moved(int newX, int newY); void dispatchAppVisibility(boolean visible); void dispatchGetNewSurface(); diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index 51d65144f260..ed167c812be1 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -22,6 +22,7 @@ import android.graphics.Rect; import android.graphics.Region; import android.os.Bundle; import android.util.MergedConfiguration; +import android.view.DisplayCutout; import android.view.InputChannel; import android.view.IWindow; import android.view.IWindowId; @@ -40,7 +41,8 @@ interface IWindowSession { out InputChannel outInputChannel); int addToDisplay(IWindow window, int seq, in WindowManager.LayoutParams attrs, in int viewVisibility, in int layerStackId, out Rect outContentInsets, - out Rect outStableInsets, out Rect outOutsets, out InputChannel outInputChannel); + out Rect outStableInsets, out Rect outOutsets, + out DisplayCutout.ParcelableWrapper displayCutout, out InputChannel outInputChannel); int addWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs, in int viewVisibility, out Rect outContentInsets, out Rect outStableInsets); int addToDisplayWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs, @@ -96,6 +98,7 @@ interface IWindowSession { int flags, out Rect outFrame, out Rect outOverscanInsets, out Rect outContentInsets, out Rect outVisibleInsets, out Rect outStableInsets, out Rect outOutsets, out Rect outBackdropFrame, + out DisplayCutout.ParcelableWrapper displayCutout, out MergedConfiguration outMergedConfiguration, out Surface outSurface); /* diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 9cfae8fb4745..623759e178d8 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -25757,6 +25757,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ final Rect mStableInsets = new Rect(); + final DisplayCutout.ParcelableWrapper mDisplayCutout = + new DisplayCutout.ParcelableWrapper(DisplayCutout.NO_CUTOUT); + /** * For windows that include areas that are not covered by real surface these are the outsets * for real surface. diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 1c9d86398a8d..0bae36bf4b04 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -384,12 +384,15 @@ public final class ViewRootImpl implements ViewParent, final Rect mPendingContentInsets = new Rect(); final Rect mPendingOutsets = new Rect(); final Rect mPendingBackDropFrame = new Rect(); + final DisplayCutout.ParcelableWrapper mPendingDisplayCutout = + new DisplayCutout.ParcelableWrapper(DisplayCutout.NO_CUTOUT); boolean mPendingAlwaysConsumeNavBar; final ViewTreeObserver.InternalInsetsInfo mLastGivenInsets = new ViewTreeObserver.InternalInsetsInfo(); final Rect mDispatchContentInsets = new Rect(); final Rect mDispatchStableInsets = new Rect(); + DisplayCutout mDispatchDisplayCutout = DisplayCutout.NO_CUTOUT; private WindowInsets mLastWindowInsets; @@ -730,7 +733,7 @@ public final class ViewRootImpl implements ViewParent, res = mWindowSession.addToDisplay(mWindow, mSeq, mWindowAttributes, getHostVisibility(), mDisplay.getDisplayId(), mAttachInfo.mContentInsets, mAttachInfo.mStableInsets, - mAttachInfo.mOutsets, mInputChannel); + mAttachInfo.mOutsets, mAttachInfo.mDisplayCutout, mInputChannel); } catch (RemoteException e) { mAdded = false; mView = null; @@ -752,6 +755,7 @@ public final class ViewRootImpl implements ViewParent, mPendingOverscanInsets.set(0, 0, 0, 0); mPendingContentInsets.set(mAttachInfo.mContentInsets); mPendingStableInsets.set(mAttachInfo.mStableInsets); + mPendingDisplayCutout.set(mAttachInfo.mDisplayCutout); mPendingVisibleInsets.set(0, 0, 0, 0); mAttachInfo.mAlwaysConsumeNavBar = (res & WindowManagerGlobal.ADD_FLAG_ALWAYS_CONSUME_NAV_BAR) != 0; @@ -1544,15 +1548,20 @@ public final class ViewRootImpl implements ViewParent, if (mLastWindowInsets == null || forceConstruct) { mDispatchContentInsets.set(mAttachInfo.mContentInsets); mDispatchStableInsets.set(mAttachInfo.mStableInsets); + mDispatchDisplayCutout = mAttachInfo.mDisplayCutout.get(); + Rect contentInsets = mDispatchContentInsets; Rect stableInsets = mDispatchStableInsets; + DisplayCutout displayCutout = mDispatchDisplayCutout; // For dispatch we preserve old logic, but for direct requests from Views we allow to // immediately use pending insets. if (!forceConstruct && (!mPendingContentInsets.equals(contentInsets) || - !mPendingStableInsets.equals(stableInsets))) { + !mPendingStableInsets.equals(stableInsets) || + !mPendingDisplayCutout.get().equals(displayCutout))) { contentInsets = mPendingContentInsets; stableInsets = mPendingStableInsets; + displayCutout = mPendingDisplayCutout.get(); } Rect outsets = mAttachInfo.mOutsets; if (outsets.left > 0 || outsets.top > 0 || outsets.right > 0 || outsets.bottom > 0) { @@ -1563,7 +1572,7 @@ public final class ViewRootImpl implements ViewParent, mLastWindowInsets = new WindowInsets(contentInsets, null /* windowDecorInsets */, stableInsets, mContext.getResources().getConfiguration().isScreenRound(), - mAttachInfo.mAlwaysConsumeNavBar, null /* displayCutout */); + mAttachInfo.mAlwaysConsumeNavBar, displayCutout); } return mLastWindowInsets; } @@ -1730,6 +1739,9 @@ public final class ViewRootImpl implements ViewParent, if (!mPendingStableInsets.equals(mAttachInfo.mStableInsets)) { insetsChanged = true; } + if (!mPendingDisplayCutout.equals(mAttachInfo.mDisplayCutout)) { + insetsChanged = true; + } if (!mPendingVisibleInsets.equals(mAttachInfo.mVisibleInsets)) { mAttachInfo.mVisibleInsets.set(mPendingVisibleInsets); if (DEBUG_LAYOUT) Log.v(mTag, "Visible insets changing to: " @@ -1906,7 +1918,8 @@ public final class ViewRootImpl implements ViewParent, + " overscan=" + mPendingOverscanInsets.toShortString() + " content=" + mPendingContentInsets.toShortString() + " visible=" + mPendingVisibleInsets.toShortString() - + " visible=" + mPendingStableInsets.toShortString() + + " stable=" + mPendingStableInsets.toShortString() + + " cutout=" + mPendingDisplayCutout.get().toString() + " outsets=" + mPendingOutsets.toShortString() + " surface=" + mSurface); @@ -1931,6 +1944,8 @@ public final class ViewRootImpl implements ViewParent, mAttachInfo.mVisibleInsets); final boolean stableInsetsChanged = !mPendingStableInsets.equals( mAttachInfo.mStableInsets); + final boolean cutoutChanged = !mPendingDisplayCutout.equals( + mAttachInfo.mDisplayCutout); final boolean outsetsChanged = !mPendingOutsets.equals(mAttachInfo.mOutsets); final boolean surfaceSizeChanged = (relayoutResult & WindowManagerGlobal.RELAYOUT_RES_SURFACE_RESIZED) != 0; @@ -1955,6 +1970,14 @@ public final class ViewRootImpl implements ViewParent, // Need to relayout with content insets. contentInsetsChanged = true; } + if (cutoutChanged) { + mAttachInfo.mDisplayCutout.set(mPendingDisplayCutout); + if (DEBUG_LAYOUT) { + Log.v(mTag, "DisplayCutout changing to: " + mAttachInfo.mDisplayCutout); + } + // Need to relayout with content insets. + contentInsetsChanged = true; + } if (alwaysConsumeNavBarChanged) { mAttachInfo.mAlwaysConsumeNavBar = mPendingAlwaysConsumeNavBar; contentInsetsChanged = true; @@ -2056,6 +2079,7 @@ public final class ViewRootImpl implements ViewParent, mResizeMode = freeformResizing ? RESIZE_MODE_FREEFORM : RESIZE_MODE_DOCKED_DIVIDER; + // TODO: Need cutout? startDragResizing(mPendingBackDropFrame, mWinFrame.equals(mPendingBackDropFrame), mPendingVisibleInsets, mPendingStableInsets, mResizeMode); @@ -3776,6 +3800,7 @@ public final class ViewRootImpl implements ViewParent, && mPendingOverscanInsets.equals(args.arg5) && mPendingContentInsets.equals(args.arg2) && mPendingStableInsets.equals(args.arg6) + && mPendingDisplayCutout.get().equals(args.arg9) && mPendingVisibleInsets.equals(args.arg3) && mPendingOutsets.equals(args.arg7) && mPendingBackDropFrame.equals(args.arg8) @@ -3808,6 +3833,7 @@ public final class ViewRootImpl implements ViewParent, || !mPendingOverscanInsets.equals(args.arg5) || !mPendingContentInsets.equals(args.arg2) || !mPendingStableInsets.equals(args.arg6) + || !mPendingDisplayCutout.get().equals(args.arg9) || !mPendingVisibleInsets.equals(args.arg3) || !mPendingOutsets.equals(args.arg7); @@ -3815,6 +3841,7 @@ public final class ViewRootImpl implements ViewParent, mPendingOverscanInsets.set((Rect) args.arg5); mPendingContentInsets.set((Rect) args.arg2); mPendingStableInsets.set((Rect) args.arg6); + mPendingDisplayCutout.set((DisplayCutout) args.arg9); mPendingVisibleInsets.set((Rect) args.arg3); mPendingOutsets.set((Rect) args.arg7); mPendingBackDropFrame.set((Rect) args.arg8); @@ -6258,7 +6285,7 @@ public final class ViewRootImpl implements ViewParent, (int) (mView.getMeasuredHeight() * appScale + 0.5f), viewVisibility, insetsPending ? WindowManagerGlobal.RELAYOUT_INSETS_PENDING : 0, mWinFrame, mPendingOverscanInsets, mPendingContentInsets, mPendingVisibleInsets, - mPendingStableInsets, mPendingOutsets, mPendingBackDropFrame, + mPendingStableInsets, mPendingOutsets, mPendingBackDropFrame, mPendingDisplayCutout, mPendingMergedConfiguration, mSurface); mPendingAlwaysConsumeNavBar = @@ -6541,7 +6568,8 @@ public final class ViewRootImpl implements ViewParent, private void dispatchResized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw, MergedConfiguration mergedConfiguration, Rect backDropFrame, boolean forceLayout, - boolean alwaysConsumeNavBar, int displayId) { + boolean alwaysConsumeNavBar, int displayId, + DisplayCutout.ParcelableWrapper displayCutout) { if (DEBUG_LAYOUT) Log.v(mTag, "Resizing " + this + ": frame=" + frame.toShortString() + " contentInsets=" + contentInsets.toShortString() + " visibleInsets=" + visibleInsets.toShortString() @@ -6578,6 +6606,7 @@ public final class ViewRootImpl implements ViewParent, args.arg6 = sameProcessCall ? new Rect(stableInsets) : stableInsets; args.arg7 = sameProcessCall ? new Rect(outsets) : outsets; args.arg8 = sameProcessCall ? new Rect(backDropFrame) : backDropFrame; + args.arg9 = displayCutout.get(); // DisplayCutout is immutable. args.argi1 = forceLayout ? 1 : 0; args.argi2 = alwaysConsumeNavBar ? 1 : 0; args.argi3 = displayId; @@ -7610,12 +7639,13 @@ public final class ViewRootImpl implements ViewParent, public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw, MergedConfiguration mergedConfiguration, Rect backDropFrame, boolean forceLayout, - boolean alwaysConsumeNavBar, int displayId) { + boolean alwaysConsumeNavBar, int displayId, + DisplayCutout.ParcelableWrapper displayCutout) { final ViewRootImpl viewAncestor = mViewAncestor.get(); if (viewAncestor != null) { viewAncestor.dispatchResized(frame, overscanInsets, contentInsets, visibleInsets, stableInsets, outsets, reportDraw, mergedConfiguration, - backDropFrame, forceLayout, alwaysConsumeNavBar, displayId); + backDropFrame, forceLayout, alwaysConsumeNavBar, displayId, displayCutout); } } diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 905c0715ecb8..7c2c12f56e5f 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1268,6 +1268,35 @@ public interface WindowManager extends ViewManager { }, formatToHexString = true) public int flags; + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef( + flag = true, + value = { + LayoutParams.FLAG2_LAYOUT_IN_DISPLAY_CUTOUT_AREA, + }) + @interface Flags2 {} + + /** + * Window flag: allow placing the window within the area that overlaps with the + * display cutout. + * + * <p> + * The window must correctly position its contents to take the display cutout into account. + * + * @see DisplayCutout + * @hide for now + */ + public static final long FLAG2_LAYOUT_IN_DISPLAY_CUTOUT_AREA = 0x00000001; + + /** + * Various behavioral options/flags. Default is none. + * + * @see #FLAG2_LAYOUT_IN_DISPLAY_CUTOUT_AREA + * @hide for now + */ + @Flags2 public long flags2; + /** * If the window has requested hardware acceleration, but this is not * allowed in the process it is in, then still render it as if it is diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 9a99e5398c8e..419aeb3507a6 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -47,6 +47,7 @@ import android.view.View; import com.android.internal.annotations.GuardedBy; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.util.Preconditions; import java.io.PrintWriter; import java.lang.annotation.Retention; @@ -428,7 +429,7 @@ public final class AutofillManager { * @hide */ public AutofillManager(Context context, IAutoFillManager service) { - mContext = context; + mContext = Preconditions.checkNotNull(context, "context cannot be null"); mService = service; } @@ -457,7 +458,7 @@ public final class AutofillManager { if (mSessionId != NO_SESSION) { ensureServiceClientAddedIfNeededLocked(); - final AutofillClient client = getClientLocked(); + final AutofillClient client = getClient(); if (client != null) { try { final boolean sessionWasRestored = mService.restoreSession(mSessionId, @@ -1057,6 +1058,23 @@ public final class AutofillManager { } /** + * TODO(b/67867469): + * - proper javadoc + * - mention this method in other places + * - unhide / remove testApi + * @hide + */ + @TestApi + public boolean isFieldClassificationEnabled() { + try { + return mService.isFieldClassificationEnabled(); + } catch (RemoteException e) { + e.rethrowFromSystemServer(); + return false; + } + } + + /** * Returns {@code true} if autofill is supported by the current device and * is supported for this user. * @@ -1076,7 +1094,8 @@ public final class AutofillManager { } } - private AutofillClient getClientLocked() { + // Note: don't need to use locked suffix because mContext is final. + private AutofillClient getClient() { final AutofillClient client = mContext.getAutofillClient(); if (client == null && sDebug) { Log.d(TAG, "No AutofillClient for " + mContext.getPackageName() + " on context " @@ -1139,16 +1158,16 @@ public final class AutofillManager { return; } try { - final AutofillClient client = getClientLocked(); + final AutofillClient client = getClient(); + if (client == null) return; // NOTE: getClient() already logd it.. + mSessionId = mService.startSession(mContext.getActivityToken(), mServiceClient.asBinder(), id, bounds, value, mContext.getUserId(), mCallback != null, flags, client.getComponentName()); if (mSessionId != NO_SESSION) { mState = STATE_ACTIVE; } - if (client != null) { - client.autofillCallbackResetableStateAvailable(); - } + client.autofillCallbackResetableStateAvailable(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1200,7 +1219,9 @@ public final class AutofillManager { try { if (restartIfNecessary) { - final AutofillClient client = getClientLocked(); + final AutofillClient client = getClient(); + if (client == null) return; // NOTE: getClient() already logd it.. + final int newId = mService.updateOrRestartSession(mContext.getActivityToken(), mServiceClient.asBinder(), id, bounds, value, mContext.getUserId(), mCallback != null, flags, client.getComponentName(), mSessionId, action); @@ -1208,9 +1229,7 @@ public final class AutofillManager { if (sDebug) Log.d(TAG, "Session restarted: " + mSessionId + "=>" + newId); mSessionId = newId; mState = (mSessionId == NO_SESSION) ? STATE_UNKNOWN : STATE_ACTIVE; - if (client != null) { - client.autofillCallbackResetableStateAvailable(); - } + client.autofillCallbackResetableStateAvailable(); } } else { mService.updateSession(mSessionId, id, bounds, value, action, flags, @@ -1223,7 +1242,7 @@ public final class AutofillManager { } private void ensureServiceClientAddedIfNeededLocked() { - if (getClientLocked() == null) { + if (getClient() == null) { return; } @@ -1306,7 +1325,7 @@ public final class AutofillManager { AutofillCallback callback = null; synchronized (mLock) { if (mSessionId == sessionId) { - AutofillClient client = getClientLocked(); + AutofillClient client = getClient(); if (client != null) { if (client.autofillCallbackRequestShowFillUi(anchor, width, height, @@ -1331,7 +1350,7 @@ public final class AutofillManager { Intent fillInIntent) { synchronized (mLock) { if (sessionId == mSessionId) { - AutofillClient client = getClientLocked(); + final AutofillClient client = getClient(); if (client != null) { client.autofillCallbackAuthenticate(authenticationId, intent, fillInIntent); } @@ -1396,7 +1415,7 @@ public final class AutofillManager { return; } - final AutofillClient client = getClientLocked(); + final AutofillClient client = getClient(); if (client == null) { return; } @@ -1573,7 +1592,7 @@ public final class AutofillManager { // 1. If local and remote session id are off sync the UI would be stuck shown // 2. There is a race between the user state being destroyed due the fill // service being uninstalled and the UI being dismissed. - AutofillClient client = getClientLocked(); + AutofillClient client = getClient(); if (client != null) { if (client.autofillCallbackRequestHideFillUi() && mCallback != null) { callback = mCallback; @@ -1603,7 +1622,7 @@ public final class AutofillManager { AutofillCallback callback = null; synchronized (mLock) { - if (mSessionId == sessionId && getClientLocked() != null) { + if (mSessionId == sessionId && getClient() != null) { callback = mCallback; } } @@ -1660,7 +1679,7 @@ public final class AutofillManager { * @return The view or {@code null} if view was not found */ private View findView(@NonNull AutofillId autofillId) { - final AutofillClient client = getClientLocked(); + final AutofillClient client = getClient(); if (client == null) { return null; @@ -1694,7 +1713,7 @@ public final class AutofillManager { pw.print(pfx); pw.print("sessionId: "); pw.println(mSessionId); pw.print(pfx); pw.print("state: "); pw.println(getStateAsStringLocked()); pw.print(pfx); pw.print("context: "); pw.println(mContext); - pw.print(pfx); pw.print("client: "); pw.println(getClientLocked()); + pw.print(pfx); pw.print("client: "); pw.println(getClient()); pw.print(pfx); pw.print("enabled: "); pw.println(mEnabled); pw.print(pfx); pw.print("hasService: "); pw.println(mService != null); pw.print(pfx); pw.print("hasCallback: "); pw.println(mCallback != null); @@ -1741,7 +1760,7 @@ public final class AutofillManager { } private void post(Runnable runnable) { - final AutofillClient client = getClientLocked(); + final AutofillClient client = getClient(); if (client == null) { if (sVerbose) Log.v(TAG, "ignoring post() because client is null"); return; @@ -1824,7 +1843,7 @@ public final class AutofillManager { * @param trackedIds The views to be tracked */ TrackedViews(@Nullable AutofillId[] trackedIds) { - final AutofillClient client = getClientLocked(); + final AutofillClient client = getClient(); if (trackedIds != null && client != null) { final boolean[] isVisible; @@ -1865,7 +1884,7 @@ public final class AutofillManager { * @param isVisible visible if the view is visible in the view hierarchy. */ void notifyViewVisibilityChanged(@NonNull AutofillId id, boolean isVisible) { - AutofillClient client = getClientLocked(); + AutofillClient client = getClient(); if (sDebug) { Log.d(TAG, "notifyViewVisibilityChanged(): id=" + id + " isVisible=" @@ -1902,7 +1921,7 @@ public final class AutofillManager { void onVisibleForAutofillLocked() { // The visibility of the views might have changed while the client was not be visible, // hence update the visibility state for all views. - AutofillClient client = getClientLocked(); + AutofillClient client = getClient(); ArraySet<AutofillId> updatedVisibleTrackedIds = null; ArraySet<AutofillId> updatedInvisibleTrackedIds = null; if (client != null) { diff --git a/core/java/android/view/autofill/IAutoFillManager.aidl b/core/java/android/view/autofill/IAutoFillManager.aidl index 7d6a19f529ce..f49aa5b4d442 100644 --- a/core/java/android/view/autofill/IAutoFillManager.aidl +++ b/core/java/android/view/autofill/IAutoFillManager.aidl @@ -56,4 +56,5 @@ interface IAutoFillManager { void onPendingSaveUi(int operation, IBinder token); UserData getUserData(); void setUserData(in UserData userData); + boolean isFieldClassificationEnabled(); } diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 92d1de8e5a24..4d96733255d7 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -697,6 +697,19 @@ public final class InputMethodManager { } } + /** + * Returns a list of VR InputMethod currently installed. + * @hide + */ + @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) + public List<InputMethodInfo> getVrInputMethodList() { + try { + return mService.getVrInputMethodList(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + public List<InputMethodInfo> getEnabledInputMethodList() { try { return mService.getEnabledInputMethodList(); diff --git a/core/java/android/view/inputmethod/InputMethodManagerInternal.java b/core/java/android/view/inputmethod/InputMethodManagerInternal.java index 77df4e3883a7..e13813e5199b 100644 --- a/core/java/android/view/inputmethod/InputMethodManagerInternal.java +++ b/core/java/android/view/inputmethod/InputMethodManagerInternal.java @@ -16,6 +16,8 @@ package android.view.inputmethod; +import android.content.ComponentName; + /** * Input method manager local system service interface. * @@ -37,4 +39,9 @@ public interface InputMethodManagerInternal { * Hides the current input method, if visible. */ void hideCurrentInputMethod(); + + /** + * Switches to VR InputMethod defined in the packageName of {@param componentName}. + */ + void startVrInputMethodNoCheck(ComponentName componentName); } diff --git a/core/java/android/widget/TextClock.java b/core/java/android/widget/TextClock.java index 127904039506..7156300e6e47 100644 --- a/core/java/android/widget/TextClock.java +++ b/core/java/android/widget/TextClock.java @@ -570,11 +570,12 @@ public class TextClock extends TextView { mFormatChangeObserver = new FormatChangeObserver(getHandler()); } final ContentResolver resolver = getContext().getContentResolver(); + Uri uri = Settings.System.getUriFor(Settings.System.TIME_12_24); if (mShowCurrentUserTime) { - resolver.registerContentObserver(Settings.System.CONTENT_URI, true, + resolver.registerContentObserver(uri, true, mFormatChangeObserver, UserHandle.USER_ALL); } else { - resolver.registerContentObserver(Settings.System.CONTENT_URI, true, + resolver.registerContentObserver(uri, true, mFormatChangeObserver); } } diff --git a/core/java/com/android/internal/inputmethod/InputMethodUtils.java b/core/java/com/android/internal/inputmethod/InputMethodUtils.java index 3e231d0aaa8b..57efae61a9c6 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodUtils.java +++ b/core/java/com/android/internal/inputmethod/InputMethodUtils.java @@ -836,7 +836,6 @@ public class InputMethodUtils { private final Resources mRes; private final ContentResolver mResolver; private final HashMap<String, InputMethodInfo> mMethodMap; - private final ArrayList<InputMethodInfo> mMethodList; /** * On-memory data store to emulate when {@link #mCopyOnWrite} is {@code true}. @@ -906,7 +905,6 @@ public class InputMethodUtils { mRes = res; mResolver = resolver; mMethodMap = methodMap; - mMethodList = methodList; switchCurrentUser(userId, copyOnWrite); } @@ -1087,7 +1085,7 @@ public class InputMethodUtils { final ArrayList<InputMethodInfo> res = new ArrayList<>(); for (Pair<String, ArrayList<String>> ims: imsList) { InputMethodInfo info = mMethodMap.get(ims.first); - if (info != null) { + if (info != null && !info.isVrOnly()) { res.add(info); } } diff --git a/core/java/com/android/internal/os/SomeArgs.java b/core/java/com/android/internal/os/SomeArgs.java index 8fb56d4757b6..d9aa32532ccd 100644 --- a/core/java/com/android/internal/os/SomeArgs.java +++ b/core/java/com/android/internal/os/SomeArgs.java @@ -48,6 +48,7 @@ public final class SomeArgs { public Object arg6; public Object arg7; public Object arg8; + public Object arg9; public int argi1; public int argi2; public int argi3; diff --git a/core/java/com/android/internal/view/BaseIWindow.java b/core/java/com/android/internal/view/BaseIWindow.java index 361fd3da97c7..7178a0d677af 100644 --- a/core/java/com/android/internal/view/BaseIWindow.java +++ b/core/java/com/android/internal/view/BaseIWindow.java @@ -22,6 +22,7 @@ import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.util.MergedConfiguration; +import android.view.DisplayCutout; import android.view.DragEvent; import android.view.IWindow; import android.view.IWindowSession; @@ -41,7 +42,8 @@ public class BaseIWindow extends IWindow.Stub { public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw, MergedConfiguration mergedConfiguration, Rect backDropFrame, boolean forceLayout, - boolean alwaysConsumeNavBar, int displayId) { + boolean alwaysConsumeNavBar, int displayId, + DisplayCutout.ParcelableWrapper displayCutout) { if (reportDraw) { try { mSession.finishDrawing(this); diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index b9798075ad27..ca8624d9c01e 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -36,6 +36,7 @@ import com.android.internal.view.IInputMethodClient; interface IInputMethodManager { // TODO: Use ParceledListSlice instead List<InputMethodInfo> getInputMethodList(); + List<InputMethodInfo> getVrInputMethodList(); // TODO: Use ParceledListSlice instead List<InputMethodInfo> getEnabledInputMethodList(); List<InputMethodSubtype> getEnabledInputMethodSubtypeList(in String imiId, diff --git a/core/java/com/android/internal/view/RotationPolicy.java b/core/java/com/android/internal/view/RotationPolicy.java index b479cb1fb6d3..d7b91325c961 100644 --- a/core/java/com/android/internal/view/RotationPolicy.java +++ b/core/java/com/android/internal/view/RotationPolicy.java @@ -108,11 +108,19 @@ public final class RotationPolicy { * Enables or disables rotation lock from the system UI toggle. */ public static void setRotationLock(Context context, final boolean enabled) { + final int rotation = areAllRotationsAllowed(context) ? CURRENT_ROTATION : NATURAL_ROTATION; + setRotationLockAtAngle(context, enabled, rotation); + } + + /** + * Enables or disables rotation lock at a specific rotation from system UI. + */ + public static void setRotationLockAtAngle(Context context, final boolean enabled, + final int rotation) { Settings.System.putIntForUser(context.getContentResolver(), Settings.System.HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY, 0, UserHandle.USER_CURRENT); - final int rotation = areAllRotationsAllowed(context) ? CURRENT_ROTATION : NATURAL_ROTATION; setRotationLock(enabled, rotation); } diff --git a/core/java/com/android/internal/widget/NotificationActionListLayout.java b/core/java/com/android/internal/widget/NotificationActionListLayout.java index 26023b499919..e013553ec046 100644 --- a/core/java/com/android/internal/widget/NotificationActionListLayout.java +++ b/core/java/com/android/internal/widget/NotificationActionListLayout.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.graphics.drawable.RippleDrawable; import android.util.AttributeSet; import android.util.Pair; import android.view.Gravity; @@ -203,6 +204,11 @@ public class NotificationActionListLayout extends LinearLayout { public void onViewAdded(View child) { super.onViewAdded(child); clearMeasureOrder(); + // For some reason ripples + notification actions seem to be an unhappy combination + // b/69474443 so just turn them off for now. + if (child.getBackground() instanceof RippleDrawable) { + ((RippleDrawable)child.getBackground()).setForceSoftware(true); + } } @Override diff --git a/core/jni/android_graphics_drawable_VectorDrawable.cpp b/core/jni/android_graphics_drawable_VectorDrawable.cpp index e9ea7022901b..6f4a58aadca3 100644 --- a/core/jni/android_graphics_drawable_VectorDrawable.cpp +++ b/core/jni/android_graphics_drawable_VectorDrawable.cpp @@ -96,6 +96,11 @@ static void setAllowCaching(JNIEnv*, jobject, jlong treePtr, jboolean allowCachi tree->setAllowCaching(allowCaching); } +static void setAntiAlias(JNIEnv*, jobject, jlong treePtr, jboolean aa) { + VectorDrawable::Tree* tree = reinterpret_cast<VectorDrawable::Tree*>(treePtr); + tree->setAntiAlias(aa); +} + /** * Draw */ @@ -363,6 +368,7 @@ static const JNINativeMethod gMethods[] = { {"nSetRendererViewportSize", "(JFF)V", (void*)setTreeViewportSize}, {"nSetRootAlpha", "(JF)Z", (void*)setRootAlpha}, {"nGetRootAlpha", "(J)F", (void*)getRootAlpha}, + {"nSetAntiAlias", "(JZ)V", (void*)setAntiAlias}, {"nSetAllowCaching", "(JZ)V", (void*)setAllowCaching}, {"nCreateFullPath", "()J", (void*)createEmptyFullPath}, diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index 0228edb03a83..915fe9d5ce41 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -200,6 +200,7 @@ message ScreenRotationAnimationProto { message WindowContainerProto { optional ConfigurationContainerProto configuration_container = 1; optional int32 orientation = 2; + optional bool visible = 3; } /* represents ConfigurationContainer */ diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index b4240cd408d8..440b26904cb2 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -79,8 +79,7 @@ <string name="RestrictedOnAllVoiceTitle" msgid="158800171499150681">"কোনো ভয়েস/জরুরী পরিষেবা নেই"</string> <string name="RestrictedStateContent" msgid="4278821484643362350">"সাময়িকভাবে মোবাইল নেটওয়ার্ক আপনার অবস্থানে এই পরিষেবা দিচ্ছে না"</string> <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"নেটওয়ার্কের সিগন্যাল নেই"</string> - <!-- no translation found for NetworkPreferenceSwitchSummary (7056776609127756440) --> - <skip /> + <string name="NetworkPreferenceSwitchSummary" msgid="7056776609127756440">"আরও ভাল সিগন্যাল পাওয়ার জন্য সেটিংস > নেটওয়ার্ক এবং ইন্টারনেট > মোবাইল নেটওয়ার্ক > পছন্দের নেটওয়ার্কের ধরন বিকল্পে গিয়ে অন্য ধরনের নেটওয়ার্ক বেছে নিয়ে দেখুন।"</string> <string name="EmergencyCallWarningTitle" msgid="4790413876281901612">"ওয়াই-ফাই কলিং সক্রিয় আছে"</string> <string name="EmergencyCallWarningSummary" msgid="8973232888021643293">"জরুরি কলের জন্য মোবাইল নেটওয়ার্ক থাকতে হবে।"</string> <string name="notification_channel_network_alert" msgid="4427736684338074967">"সতর্কতা"</string> @@ -213,6 +212,8 @@ <string name="global_action_power_off" msgid="4471879440839879722">"পাওয়ার বন্ধ করুন"</string> <string name="global_action_emergency" msgid="7112311161137421166">"জরুরী"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"ত্রুটির প্রতিবেদন"</string> + <!-- no translation found for global_action_logout (935179188218826050) --> + <skip /> <string name="bugreport_title" msgid="2667494803742548533">"ত্রুটির অভিযোগ করুন"</string> <string name="bugreport_message" msgid="398447048750350456">"এটি একটি ই-মেল মেসেজ পাঠানোর জন্য আপনার ডিভাইসের বর্তমান অবস্থা সম্পর্কে তথ্য সংগ্রহ করবে৷ ত্রুটির প্রতিবেদন শুরুর সময় থেকে এটি পাঠানোর জন্য প্রস্তুত হতে কিছুটা সময় নেবে; অনুগ্রহ করে ধৈর্য রাখুন৷"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ইন্টারেক্টিভ প্রতিবেদন"</string> @@ -1052,12 +1053,9 @@ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"সিস্টেম সেটিংস> অ্যাপ্স> ডাউনলোড করাগুলি এ এটি পুনঃসক্ষম করুন৷"</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g>, বর্তমান প্রদর্শনের আকারের সেটিংস সমর্থন করে না এবং অপ্রত্যাশিত আচরণ করতে পারে৷"</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"সর্বদা দেখান"</string> - <!-- no translation found for unsupported_compile_sdk_message (5030433583092006591) --> - <skip /> - <!-- no translation found for unsupported_compile_sdk_show (2681877855260970231) --> - <skip /> - <!-- no translation found for unsupported_compile_sdk_check_update (3312723623323216101) --> - <skip /> + <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> Android OS এর একটি সামঞ্জস্যহীন ভার্সনের জন্য তৈরি করা হয়েছিল, তাই এখানে সেটি অস্বাভাবিক আচরণ করতে পারে। মনে হয় অ্যাপটির আপডেট করা ভার্সনও আছে।"</string> + <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"সবসময় দেখুন"</string> + <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"আপডেট পাওয়া যাচ্ছে কিনা দেখুন"</string> <string name="smv_application" msgid="3307209192155442829">"অ্যাপ্লিকেশানটি <xliff:g id="APPLICATION">%1$s</xliff:g> (প্রক্রিয়া <xliff:g id="PROCESS">%2$s</xliff:g>) তার স্ব-প্রয়োগ করা কঠোর মোড নীতি লঙ্ঘন করেছে৷"</string> <string name="smv_process" msgid="5120397012047462446">"প্রক্রিয়াটি <xliff:g id="PROCESS">%1$s</xliff:g> তার স্ব-প্রয়োগ করা কঠোর মোড নীতি লঙ্ঘন করেছে৷"</string> <string name="android_upgrading_title" msgid="1584192285441405746">"Android আপগ্রেড করা হচ্ছে..."</string> @@ -1123,12 +1121,10 @@ <string name="network_available_sign_in" msgid="1848877297365446605">"নেটওয়ার্কে সাইন-ইন করুন"</string> <!-- no translation found for network_available_sign_in_detailed (8000081941447976118) --> <skip /> - <!-- no translation found for wifi_no_internet (8938267198124654938) --> - <skip /> + <string name="wifi_no_internet" msgid="8938267198124654938">"ওয়াই-ফাই এ ইন্টারনেট অ্যাক্সেস নেই"</string> <string name="wifi_no_internet_detailed" msgid="8083079241212301741">"বিকল্পগুলির জন্য আলতো চাপুন"</string> <string name="network_switch_metered" msgid="4671730921726992671">"<xliff:g id="NETWORK_TYPE">%1$s</xliff:g> এ পাল্টানো হয়েছে"</string> - <!-- no translation found for network_switch_metered_detail (775163331794506615) --> - <skip /> + <string name="network_switch_metered_detail" msgid="775163331794506615">"<xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> এ ইন্টারনেট অ্যাক্সেস না থাকলে <xliff:g id="NEW_NETWORK">%1$s</xliff:g> ব্যবহার করা হয়৷ ডেটা চার্জ প্রযোজ্য৷"</string> <string name="network_switch_metered_toast" msgid="5779283181685974304">"<xliff:g id="PREVIOUS_NETWORK">%1$s</xliff:g> থেকে <xliff:g id="NEW_NETWORK">%2$s</xliff:g> এ পাল্টানো হয়েছে"</string> <string-array name="network_switch_type_name"> <item msgid="3979506840912951943">"মোবাইল ডেটা"</item> @@ -1505,6 +1501,10 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"শর্টকাটটি চালু থাকলে দুটি ভলিউম বোতাম একসাথে ৩ সেকেন্ড টিপে ধরে রাখলে একটি অ্যাকসেসিবিলিটি বৈশিষ্ট্য চালু হবে।\n\n বর্তমান অ্যাকসেসিবিলিটি বৈশিষ্ট্য:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n আপনি এই বৈশিষ্ট্যটি সেটিংস > অ্যাকসেসিবিলিটিতে গিয়ে পরিবর্তন করতে পারবেন।"</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"শর্টকাট বন্ধ করুন"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"শর্টকাট ব্যবহার করুন"</string> + <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> + <skip /> + <!-- no translation found for color_correction_feature_name (6779391426096954933) --> + <skip /> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"অ্যাক্সেসযোগ্যতা শর্টকাট <xliff:g id="SERVICE_NAME">%1$s</xliff:g> কে চালু করেছে"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"অ্যাক্সেসযোগ্যতা শর্টকাট <xliff:g id="SERVICE_NAME">%1$s</xliff:g> কে বন্ধ করেছে"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"অ্যাক্সেসযোগ্যতা বোতামের সাহায্যে যে বৈশিষ্ট্যটি নিয়ন্ত্রণ করতে চান, সেটি বেছে নিন:"</string> @@ -1644,7 +1644,7 @@ <string name="package_installed_device_owner" msgid="6875717669960212648">"আপনার প্রশাসক ইনস্টল করেছেন"</string> <string name="package_updated_device_owner" msgid="1847154566357862089">"আপনার প্রশাসক আপডেট করেছেন"</string> <string name="package_deleted_device_owner" msgid="2307122077550236438">"আপনার প্রশাসক মুছে দিয়েছেন"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"ব্যাটরির লাইফ উন্নত করতে, ব্যাটারি সাশ্রয়কারী আপনার ডিভাইসের কার্যসম্পাদনা হ্রাস করে এবং কম্পন, লোকেশন পরিষেবাগুলি এবং অধিকাংশ ব্যাকগ্রাউন্ড ডেটা সীমিত করে৷ ইমেল, মেসেজিং এবং অন্যান্য অ্যাপ্লিকেশনগুলিকে যেগুলি সিঙ্কের উপর নির্ভর করে সেগুলিকে আপনি না খোলা পর্যন্ত নাও আপডেট হতে পারে৷\n\nআপনার ডিভাইসটিকে যখন চার্জ করা হয় তখন ব্যাটারি সাশ্রয়কারী নিজে থেকে বন্ধ হয়ে যায়৷"</string> + <string name="battery_saver_description" msgid="5394663545060026162">"ব্যাটরির লাইফ উন্নত করে সাহায্য করতে, ব্যাটারি সেভার আপনার ডিভাইসের পারফরম্যান্স কমিয়ে দেয় এবং কম্পন, লোকেশন পরিষেবা এবং অধিকাংশ ব্যাকগ্রাউন্ড ডেটা সীমিত করে। ইমেল, মেসেজিং এবং সিঙ্কের উপর নির্ভর করে এমন অন্যান্য অ্যাপগুলিকে আপনি না খোলা পর্যন্ত নাও আপডেট হতে পারে।\n\nআপনার ডিভাইসটিকে যখন চার্জ করা হয় তখন ব্যাটারি সেভার নিজে থেকে বন্ধ হয়ে যায়।"</string> <string name="data_saver_description" msgid="6015391409098303235">"ডেটার ব্যবহার কমাতে সহায়তা করার জন্য, ডেটা সেভার পটভূমিতে কিছু অ্যাপ্লিকেশনকে ডেটা পাঠাতে বা গ্রহণ করতে বাধা দেয়৷ আপনি বর্তমানে এমন একটি অ্যাপ্লিকেশন ব্যবহার করছেন যেটি ডেটা অ্যাক্সেস করতে পারে, তবে সেটি কমই করে৷ এর ফলে যা হতে পারে, উদাহরণস্বরূপ, আপনি ছবিগুলিতে আলতো চাপ না দেওয়া পর্যন্ত সেগুলি প্রদর্শিত হবে না৷"</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"ডেটা সেভার চালু করবেন?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"চালু করুন"</string> @@ -1691,6 +1691,8 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"সপ্তাহান্তের রাত্রি"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"সপ্তাহান্ত"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ইভেন্ট"</string> + <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> + <skip /> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> দ্বারা নিঃশব্দ করা হয়েছে"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"আপনার ডিভাইসে একটি অভ্যন্তরীন সমস্যা হয়েছে, এবং আপনি যতক্ষণ না পর্যন্ত এটিকে ফ্যাক্টরি ডেটা রিসেট করছেন ততক্ষণ এটি ঠিকভাবে কাজ নাও করতে পারে৷"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"আপনার ডিভাইসে একটি অভ্যন্তরীন সমস্যা হয়েছে৷ বিস্তারিত জানার জন্য প্রস্তুতকারকের সাথে যোগাযোগ করুন৷"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index ef30b9128861..c9c98eb8ee68 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -214,6 +214,8 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Isključi telefon"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Hitno"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Izvještaj o greškama"</string> + <!-- no translation found for global_action_logout (935179188218826050) --> + <skip /> <string name="bugreport_title" msgid="2667494803742548533">"Kreirajte izvještaj o greškama"</string> <string name="bugreport_message" msgid="398447048750350456">"Ovim će se prikupljati informacije o trenutnom stanju uređaja, koji će biti poslani kao e-poruka. Može malo potrajati dok se izvještaj o greškama ne kreira i bude spreman za slanje. Budite strpljivi."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktivni izvještaj"</string> @@ -1026,9 +1028,9 @@ <string name="whichEditApplication" msgid="144727838241402655">"Uredi koristeći"</string> <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Uredi koristeći %1$s"</string> <string name="whichEditApplicationLabel" msgid="7183524181625290300">"Uredi"</string> - <string name="whichSendApplication" msgid="6902512414057341668">"Podijeli koristeći"</string> - <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Podijeli koristeći %1$s"</string> - <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Podijeli"</string> + <string name="whichSendApplication" msgid="6902512414057341668">"Dijeli koristeći"</string> + <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Dijeli koristeći %1$s"</string> + <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Dijeli"</string> <string name="whichSendToApplication" msgid="8272422260066642057">"Pošalji koristeći"</string> <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Pošalji koristeći %1$s"</string> <string name="whichSendToApplicationLabel" msgid="8878962419005813500">"Pošalji"</string> @@ -1353,7 +1355,7 @@ <string name="progress_erasing" product="default" msgid="6596988875507043042">"Brisanje SD kartice..."</string> <string name="share" msgid="1778686618230011964">"Podijelite"</string> <string name="find" msgid="4808270900322985960">"Pronađi"</string> - <string name="websearch" msgid="4337157977400211589">"Internet pretraga"</string> + <string name="websearch" msgid="4337157977400211589">"Internet pretraživanje"</string> <string name="find_next" msgid="5742124618942193978">"Nađi sljedeći"</string> <string name="find_previous" msgid="2196723669388360506">"Nađi prethodni"</string> <string name="gpsNotifTicker" msgid="5622683912616496172">"Korisnik <xliff:g id="NAME">%s</xliff:g> je poslao zahtjev za utvrđivanje lokacije"</string> @@ -1397,7 +1399,7 @@ <string name="activitychooserview_choose_application" msgid="2125168057199941199">"Odaberite aplikaciju"</string> <string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"Aplikacija <xliff:g id="APPLICATION_NAME">%s</xliff:g> se ne može pokrenuti."</string> <string name="shareactionprovider_share_with" msgid="806688056141131819">"Podijeliti sa"</string> - <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Podijeli koristeći aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> + <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Dijeli koristeći aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Klizni regulator. Dodirnite & držite."</string> <string name="description_target_unlock_tablet" msgid="3833195335629795055">"Prevucite za otključavanje ekrana."</string> <string name="action_bar_home_description" msgid="5293600496601490216">"Vratite se na početnu stranicu"</string> @@ -1524,6 +1526,10 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kada je prečica uključena, pritiskom na oba dugmeta za podešavanje jačine zvuka u trajanju od 3 sekunde pokrenut će se funkcija za pristupačnost.\n\n Trenutna funkcija za pristupačnost je:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funkciju možete promijeniti ako odete u Postavke > Pristupačnost."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Isključi prečicu"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Koristi prečicu"</string> + <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> + <skip /> + <!-- no translation found for color_correction_feature_name (6779391426096954933) --> + <skip /> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Prečica za pristupačnost je uključila uslugu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Prečica za pristupačnost je isključila uslugu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Odaberite funkciju koja će se koristiti kada dodirnete dugme Pristupačnost:"</string> @@ -1719,6 +1725,8 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Radni dan uvečer"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Vikend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Događaj"</string> + <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> + <skip /> <string name="muted_by" msgid="6147073845094180001">"Ton isključila aplikacija <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Postoji problem u vašem uređaju i može biti nestabilan dok ga ne vratite na fabričke postavke."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Postoji problem u vašem uređaju. Za više informacija obratite se proizvođaču."</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 7d9e5312174f..e1b4e0d2d6b9 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -212,6 +212,8 @@ <string name="global_action_power_off" msgid="4471879440839879722">"خاموش کردن"</string> <string name="global_action_emergency" msgid="7112311161137421166">"اضطراری"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"گزارش اشکال"</string> + <!-- no translation found for global_action_logout (935179188218826050) --> + <skip /> <string name="bugreport_title" msgid="2667494803742548533">"گرفتن گزارش اشکال"</string> <string name="bugreport_message" msgid="398447048750350456">"این گزارش اطلاعات مربوط به وضعیت دستگاه کنونی شما را جمعآوری میکند تا به صورت یک پیام رایانامه ارسال شود. از زمان شروع گزارش اشکال تا آماده شدن برای ارسال اندکی زمان میبرد؛ لطفاً شکیبا باشید."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"گزارش تعاملی"</string> @@ -1498,6 +1500,10 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"وقتی میانبر روشن است، اگر هر دو دکمه صدا را ۳ ثانیه فشار دهید یکی از قابلیتهای دسترسپذیری شروع میشود.\n\n قابلیت دسترسپذیری کنونی:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n میتوانید در «تنظیمات > دسترسپذیری»، قابلیت را تغییر دهید."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"خاموش کردن میانبر"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"استفاده از میانبر"</string> + <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> + <skip /> + <!-- no translation found for color_correction_feature_name (6779391426096954933) --> + <skip /> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"«میانبر دسترسپذیری» <xliff:g id="SERVICE_NAME">%1$s</xliff:g> را روشن کرد"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"«میانبر دسترسپذیری» <xliff:g id="SERVICE_NAME">%1$s</xliff:g> را خاموش کرد"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"قابلیتی را انتخاب کنید که هنگام ضربه زدن روی دکمه «دسترسپذیری» استفاده میشود:"</string> @@ -1684,6 +1690,8 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"شب آخر هفته"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"آخر هفته"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"رویداد"</string> + <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> + <skip /> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> آن را بیصدا کرد"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"دستگاهتان یک مشکل داخلی دارد، و ممکن است تا زمانی که بازنشانی دادههای کارخانه انجام نگیرد، بیثبات بماند."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"دستگاهتان یک مشکل داخلی دارد. برای جزئیات آن با سازندهتان تماس بگیرید."</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 19e7b346f7e4..c499ea726d07 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -212,6 +212,8 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Matikan perangkat"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Darurat"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Laporan bug"</string> + <!-- no translation found for global_action_logout (935179188218826050) --> + <skip /> <string name="bugreport_title" msgid="2667494803742548533">"Ambil laporan bug"</string> <string name="bugreport_message" msgid="398447048750350456">"Ini akan mengumpulkan informasi status perangkat Anda saat ini, untuk dikirimkan sebagai pesan email. Harap bersabar, mungkin perlu waktu untuk memulai laporan bug hingga siap dikirim."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Laporan interaktif"</string> @@ -1498,6 +1500,10 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Saat pintasan aktif, menekan kedua tombol volume selama 3 detik akan memulai fitur aksesibilitas.\n\n Fitur aksesibilitas saat ini:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Anda dapat mengubah fitur di Setelan > Aksesibilitas."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Nonaktifkan Pintasan"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Gunakan Pintasan"</string> + <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> + <skip /> + <!-- no translation found for color_correction_feature_name (6779391426096954933) --> + <skip /> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Pintasan Aksesibilitas mengaktifkan <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Pintasan Aksesibilitas menonaktifkan <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Pilih fitur yang akan digunakan saat menge-tap tombol Aksesibilitas:"</string> @@ -1684,6 +1690,8 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Malam hari kerja"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Akhir pekan"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Acara"</string> + <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> + <skip /> <string name="muted_by" msgid="6147073845094180001">"Dinonaktifkan oleh <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Ada masalah dengan perangkat. Hal ini mungkin membuat perangkat jadi tidak stabil dan perlu dikembalikan ke setelan pabrik."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Ada masalah dengan perangkat. Hubungi produsen perangkat untuk informasi selengkapnya."</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 00bc9c2c8f1d..ce07805f2836 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -212,6 +212,8 @@ <string name="global_action_power_off" msgid="4471879440839879722">"კვების გამორთვა"</string> <string name="global_action_emergency" msgid="7112311161137421166">"საგანგებო სამსახურები"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"ხარვეზის შესახებ ანგარიში"</string> + <!-- no translation found for global_action_logout (935179188218826050) --> + <skip /> <string name="bugreport_title" msgid="2667494803742548533">"შექმენით შეცდომის ანგარიში"</string> <string name="bugreport_message" msgid="398447048750350456">"იგი შეაგროვებს ინფორმაციას თქვენი მოწყობილობის ამჟამინდელი მდგომარეობის შესახებ, რათა ის ელფოსტის შეტყობინების სახით გააგზავნოს. ხარვეზის ანგარიშის მომზადებასა და შეტყობინების გაგზავნას გარკვეული დრო სჭირდება. გთხოვთ, მოითმინოთ."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ინტერაქტიული ანგარიში"</string> @@ -1051,7 +1053,7 @@ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"ხელახალი გააქტიურება განყოფილებაში: სისტემის პარამეტრები > აპები > ჩამოტვირთულები."</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ის მიერ ეკრანის ამჟამინდელი პარამეტრები მხარდაუჭერელია და შეიძლება არასათანადოდ იმუშაოს."</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"ყოველთვის ჩვენება"</string> - <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> შექმნილია Android-ის ოპერატიული სისტემის არათავსებადი ვერსიისთვის და შეიძლება გაუმართავად იმუშაოს. შესაძლოა ხელმისაწვდომი იყოს აპის განახლებული ვერსია."</string> + <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> შექმნილია Android-ის ოპერაციული სისტემის არათავსებადი ვერსიისთვის და შეიძლება გაუმართავად იმუშაოს. შესაძლოა ხელმისაწვდომი იყოს აპის განახლებული ვერსია."</string> <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"ყოველთვის ჩვენება"</string> <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"განახლების შემოწმება"</string> <string name="smv_application" msgid="3307209192155442829">"აპმა <xliff:g id="APPLICATION">%1$s</xliff:g> (პროცესი <xliff:g id="PROCESS">%2$s</xliff:g>) დაარღვია საკუთარი StrictMode დებულება."</string> @@ -1498,6 +1500,10 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"მალსახმობის ჩართვის შემთხვევაში, ხმის ორივე ღილაკზე 3 წამის განმავლობაში დაჭერით მარტივი წვდომის ფუნქცია ჩაირთვება.\n\n მარტივი წვდომის ამჟამინდელი ფუნქციაა:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n ამ ფუნქციის შეცვლა შეგიძლიათ აქ: პარამეტრები > მარტივი წვდომა."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"მალსახმობის გამორთვა"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"მალსახმობის გამოყენება"</string> + <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> + <skip /> + <!-- no translation found for color_correction_feature_name (6779391426096954933) --> + <skip /> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"მარტივი წვდომის მალსახმობმა ჩართო <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"მარტივი წვდომის მალსახმობმა გამორთო <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"აირჩიეთ მარტივი წვდომის ღილაკზე შეხებისას გამოსაყენებელი ფუნქცია:"</string> @@ -1684,6 +1690,8 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"სამუშაო კვირის ღამე"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"შაბათ-კვირა"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"მოვლენა"</string> + <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> + <skip /> <string name="muted_by" msgid="6147073845094180001">"დადუმებულია <xliff:g id="THIRD_PARTY">%1$s</xliff:g>-ის მიერ"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"ფიქსირდება თქვენი მ ოწყობილობის შიდა პრობლემა და შეიძლება არასტაბილური იყოს, სანამ ქარხნულ მონაცემების არ განაახლებთ."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"ფიქსირდება თქვენი მოწყობილობის შიდა პრობლემა. დეტალებისათვის, მიმართეთ თქვენს მწარმოებელს."</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 8d022834b16d..3329961c4e26 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -47,8 +47,8 @@ <string name="needPuk2" msgid="4526033371987193070">"Introduza o PUK2 para desbloquear o cartão SIM."</string> <string name="enablePin" msgid="209412020907207950">"Ação sem êxito. Ative o bloqueio do SIM/RUIM."</string> <plurals name="pinpuk_attempts" formatted="false" msgid="1251012001539225582"> - <item quantity="one">Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de o cartão SIM ficar bloqueado.</item> <item quantity="other">Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas antes de o cartão SIM ficar bloqueado.</item> + <item quantity="one">Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de o cartão SIM ficar bloqueado.</item> </plurals> <string name="imei" msgid="2625429890869005782">"IMEI"</string> <string name="meid" msgid="4841221237681254195">"MEID"</string> @@ -162,8 +162,8 @@ <string name="low_memory" product="tv" msgid="516619861191025923">"O armazenamento da TV está cheio. Elimine alguns ficheiros para libertar espaço."</string> <string name="low_memory" product="default" msgid="3475999286680000541">"O armazenamento do telemóvel está cheio. Elimine alguns ficheiros para libertar espaço."</string> <plurals name="ssl_ca_cert_warning" formatted="false" msgid="5106721205300213569"> - <item quantity="one">Autoridade de certificação instalada</item> <item quantity="other">Autoridades de certificação instaladas</item> + <item quantity="one">Autoridade de certificação instalada</item> </plurals> <string name="ssl_ca_cert_noti_by_unknown" msgid="4475437862189850602">"Por um terceiro desconhecido"</string> <string name="ssl_ca_cert_noti_by_administrator" msgid="3541729986326153557">"Pelo gestor do seu perfil de trabalho"</string> @@ -212,6 +212,8 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Desligar"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Emergência"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Relatório de erros"</string> + <!-- no translation found for global_action_logout (935179188218826050) --> + <skip /> <string name="bugreport_title" msgid="2667494803742548533">"Criar relatório de erros"</string> <string name="bugreport_message" msgid="398447048750350456">"Será recolhida informação sobre o estado atual do seu dispositivo a enviar através de uma mensagem de email. Demorará algum tempo até que o relatório de erro esteja pronto para ser enviado. Aguarde um pouco."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Relatório interativo"</string> @@ -219,8 +221,8 @@ <string name="bugreport_option_full_title" msgid="6354382025840076439">"Relatório completo"</string> <string name="bugreport_option_full_summary" msgid="7210859858969115745">"Utilize esta opção para uma interferência mínima do sistema quando o dispositivo não responder ou estiver demasiado lento, ou quando precisar de todas as secções de relatório. Não permite introduzir mais detalhes ou tirar capturas de ecrã adicionais."</string> <plurals name="bugreport_countdown" formatted="false" msgid="6878900193900090368"> - <item quantity="one">A tirar uma captura de ecrã do relatório de erro dentro de <xliff:g id="NUMBER_0">%d</xliff:g> segundo…</item> <item quantity="other">A tirar uma captura de ecrã do relatório de erro dentro de <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</item> + <item quantity="one">A tirar uma captura de ecrã do relatório de erro dentro de <xliff:g id="NUMBER_0">%d</xliff:g> segundo…</item> </plurals> <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Modo silencioso"</string> <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Som desativado"</string> @@ -864,8 +866,8 @@ <string name="oneMonthDurationPast" msgid="7396384508953779925">"Há 1 mês"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Há mais de 1 mês"</string> <plurals name="last_num_days" formatted="false" msgid="5104533550723932025"> - <item quantity="one">Último <xliff:g id="COUNT_0">%d</xliff:g> dia</item> <item quantity="other">Últimos <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="one">Último <xliff:g id="COUNT_0">%d</xliff:g> dia</item> </plurals> <string name="last_month" msgid="3959346739979055432">"Último mês"</string> <string name="older" msgid="5211975022815554840">"Mais antiga"</string> @@ -886,68 +888,68 @@ <string name="years" msgid="6881577717993213522">"anos"</string> <string name="now_string_shortest" msgid="8912796667087856402">"agora"</string> <plurals name="duration_minutes_shortest" formatted="false" msgid="3957499975064245495"> - <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> m</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> m</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> m</item> </plurals> <plurals name="duration_hours_shortest" formatted="false" msgid="3552182110578602356"> - <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> h</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> h</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> h</item> </plurals> <plurals name="duration_days_shortest" formatted="false" msgid="5213655532597081640"> - <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> d</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> d</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> d</item> </plurals> <plurals name="duration_years_shortest" formatted="false" msgid="7848711145196397042"> - <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> a</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> a</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> a</item> </plurals> <plurals name="duration_minutes_shortest_future" formatted="false" msgid="3277614521231489951"> - <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> min</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> min</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> min</item> </plurals> <plurals name="duration_hours_shortest_future" formatted="false" msgid="2152452368397489370"> - <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> h</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> h</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> h</item> </plurals> <plurals name="duration_days_shortest_future" formatted="false" msgid="8088331502820295701"> - <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> d</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> d</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> d</item> </plurals> <plurals name="duration_years_shortest_future" formatted="false" msgid="2317006667145250301"> - <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> a</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> a</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> a</item> </plurals> <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> - <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> </plurals> <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> - <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> hora</item> <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> hora</item> </plurals> <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> - <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> dia</item> <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> dia</item> </plurals> <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> - <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> ano</item> <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> ano</item> </plurals> <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> - <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> </plurals> <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> - <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> hora</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> hora</item> </plurals> <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> - <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> dia</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> dia</item> </plurals> <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> - <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> ano</item> <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> ano</item> </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problema com o vídeo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Este vídeo não é válido para transmissão em fluxo contínuo neste aparelho."</string> @@ -1101,12 +1103,12 @@ <string name="ringtone_picker_title_notification" msgid="4837740874822788802">"Sons de notificação"</string> <string name="ringtone_unknown" msgid="3914515995813061520">"Desconhecido"</string> <plurals name="wifi_available" formatted="false" msgid="7900333017752027322"> - <item quantity="one">Rede Wi-Fi disponível</item> <item quantity="other">Redes Wi-Fi disponíveis</item> + <item quantity="one">Rede Wi-Fi disponível</item> </plurals> <plurals name="wifi_available_detailed" formatted="false" msgid="1140699367193975606"> - <item quantity="one">Rede Wi-Fi aberta disponível</item> <item quantity="other">Redes Wi-Fi abertas disponíveis</item> + <item quantity="one">Rede Wi-Fi aberta disponível</item> </plurals> <string name="wifi_available_title" msgid="3817100557900599505">"Ligar à rede Wi-Fi aberta"</string> <string name="wifi_available_title_connecting" msgid="1557292688310330032">"A ligar à rede Wi-Fi aberta…"</string> @@ -1320,8 +1322,8 @@ <string name="no_matches" msgid="8129421908915840737">"Sem correspondências"</string> <string name="find_on_page" msgid="1946799233822820384">"Localizar na página"</string> <plurals name="matches_found" formatted="false" msgid="1210884353962081884"> - <item quantity="one">1 correspondência</item> <item quantity="other"><xliff:g id="INDEX">%d</xliff:g> de <xliff:g id="TOTAL">%d</xliff:g></item> + <item quantity="one">1 correspondência</item> </plurals> <string name="action_mode_done" msgid="7217581640461922289">"Concluído"</string> <string name="progress_erasing" product="nosdcard" msgid="4521573321524340058">"A apagar memória de armazenamento USB..."</string> @@ -1455,8 +1457,8 @@ <string name="kg_wrong_password" msgid="2333281762128113157">"Palavra-passe Incorreta"</string> <string name="kg_wrong_pin" msgid="1131306510833563801">"PIN Incorreto"</string> <plurals name="kg_too_many_failed_attempts_countdown" formatted="false" msgid="8790651267324125694"> - <item quantity="one">Tente novamente dentro de 1 segundo.</item> <item quantity="other">Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos.</item> + <item quantity="one">Tente novamente dentro de 1 segundo.</item> </plurals> <string name="kg_pattern_instructions" msgid="398978611683075868">"Desenhe a sua sequência"</string> <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Introduzir PIN do cartão SIM"</string> @@ -1498,6 +1500,10 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Quando o atalho está ativado, premir ambos os botões de volume durante 3 segundos inicia uma funcionalidade de acessibilidade.\n\n Funcionalidade de acessibilidade atual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Pode alterar a funcionalidade em Definições > Acessibilidade."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Desativar atalho"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Utilizar atalho"</string> + <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> + <skip /> + <!-- no translation found for color_correction_feature_name (6779391426096954933) --> + <skip /> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"O Atalho de acessibilidade ativou o serviço <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"O Atalho de acessibilidade desativou o serviço <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Escolha uma funcionalidade para utilizar quando tocar no botão Acessibilidade:"</string> @@ -1610,8 +1616,8 @@ <string name="restr_pin_error_doesnt_match" msgid="2224214190906994548">"Os PINs não correspondem. Tente novamente."</string> <string name="restr_pin_error_too_short" msgid="8173982756265777792">"O PIN é demasiado pequeno. Deve ter, no mínimo, 4 dígitos."</string> <plurals name="restr_pin_countdown" formatted="false" msgid="9061246974881224688"> - <item quantity="one">Tente novamente dentro de 1 segundo</item> <item quantity="other">Tente novamente dentro de <xliff:g id="COUNT">%d</xliff:g> segundos</item> + <item quantity="one">Tente novamente dentro de 1 segundo</item> </plurals> <string name="restr_pin_try_later" msgid="973144472490532377">"Tente novamente mais tarde"</string> <string name="immersive_cling_title" msgid="8394201622932303336">"Visualização de ecrã inteiro"</string> @@ -1642,36 +1648,36 @@ <string name="data_saver_enable_title" msgid="4674073932722787417">"Ativar a Poupança de dados?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Ativar"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> - <item quantity="one">Durante um minuto (até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item> <item quantity="other">Durante %1$d minutos (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="one">Durante um minuto (até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item> </plurals> <plurals name="zen_mode_duration_minutes_summary_short" formatted="false" msgid="6830154222366042597"> - <item quantity="one">Durante 1 min (até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item> <item quantity="other">Durante %1$d min (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="one">Durante 1 min (até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item> </plurals> <plurals name="zen_mode_duration_hours_summary" formatted="false" msgid="8152974162096743862"> - <item quantity="one">Durante uma hora (até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item> <item quantity="other">Durante %1$d horas (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="one">Durante uma hora (até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item> </plurals> <plurals name="zen_mode_duration_hours_summary_short" formatted="false" msgid="4787552595253082371"> - <item quantity="one">Durante 1 h (até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item> <item quantity="other">Durante %1$d h (até à(s) <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="one">Durante 1 h (até à(s) <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item> </plurals> <plurals name="zen_mode_duration_minutes" formatted="false" msgid="5127407202506485571"> - <item quantity="one">Durante um minuto</item> <item quantity="other">Durante %d minutos</item> + <item quantity="one">Durante um minuto</item> </plurals> <plurals name="zen_mode_duration_minutes_short" formatted="false" msgid="2199350154433426128"> - <item quantity="one">Durante 1 min</item> <item quantity="other">Durante %d min</item> + <item quantity="one">Durante 1 min</item> </plurals> <plurals name="zen_mode_duration_hours" formatted="false" msgid="3938821308277433854"> - <item quantity="one">Durante uma hora</item> <item quantity="other">Durante %d horas</item> + <item quantity="one">Durante uma hora</item> </plurals> <plurals name="zen_mode_duration_hours_short" formatted="false" msgid="6748277774662434217"> - <item quantity="one">Durante 1 h</item> <item quantity="other">Durante %d h</item> + <item quantity="one">Durante 1 h</item> </plurals> <string name="zen_mode_until" msgid="7336308492289875088">"Até às <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_alarm" msgid="9128205721301330797">"Até <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (próximo alarme)"</string> @@ -1684,6 +1690,8 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Dias da semana à noite"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fim de semana"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Evento"</string> + <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> + <skip /> <string name="muted_by" msgid="6147073845094180001">"Som desativado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Existe um problema interno no seu dispositivo e pode ficar instável até efetuar uma reposição de dados de fábrica."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Existe um problema interno no seu dispositivo. Contacte o fabricante para obter mais informações."</string> @@ -1706,8 +1714,8 @@ <string name="close_button_text" msgid="3937902162644062866">"Fechar"</string> <string name="notification_messaging_title_template" msgid="3452480118762691020">"<xliff:g id="CONVERSATION_TITLE">%1$s</xliff:g>: <xliff:g id="SENDER_NAME">%2$s</xliff:g>"</string> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selecionado</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> + <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selecionado</item> </plurals> <string name="default_notification_channel_label" msgid="5929663562028088222">"Sem categoria"</string> <string name="importance_from_user" msgid="7318955817386549931">"Definiu a importância destas notificações."</string> @@ -1764,8 +1772,8 @@ <string name="autofill_error_cannot_autofill" msgid="7402758580060110371">"Não é possível preencher automaticamente o conteúdo"</string> <string name="autofill_picker_no_suggestions" msgid="3908514303773350735">"Sem sugestões do preenchimento automático"</string> <plurals name="autofill_picker_some_suggestions" formatted="false" msgid="5506565809835815274"> - <item quantity="one">Uma sugestão do preenchimento automático</item> <item quantity="other"><xliff:g id="COUNT">%1$s</xliff:g> sugestões do preenchimento automático</item> + <item quantity="one">Uma sugestão do preenchimento automático</item> </plurals> <string name="autofill_save_title" msgid="3345527308992082601">"Pretende guardar no <b><xliff:g id="LABEL">%1$s</xliff:g></b>?"</string> <string name="autofill_save_title_with_type" msgid="8637809388029313305">"Pretende guardar <xliff:g id="TYPE">%1$s</xliff:g> no <b><xliff:g id="LABEL">%2$s</xliff:g></b>?"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 20b1bbe38b1d..ad6c6bce6800 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -216,6 +216,8 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Вимкнути"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Екстрений виклик"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Звіт про помилки"</string> + <!-- no translation found for global_action_logout (935179188218826050) --> + <skip /> <string name="bugreport_title" msgid="2667494803742548533">"Звіт про помилку"</string> <string name="bugreport_message" msgid="398447048750350456">"Інформація про поточний стан вашого пристрою буде зібрана й надіслана електронною поштою. Підготовка звіту триватиме певний час."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Інтерактивний звіт"</string> @@ -1546,6 +1548,10 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Коли ярлик увімкнено, після натискання обох клавіш гучності й утримування їх протягом 3 секунд увімкнеться функція спеціальних можливостей.\n\n Поточна функція спеціальних можливостей:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Цю функцію можна змінити в меню \"Налаштування\" > \"Спеціальні можливості\"."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Вимкнути ярлик"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Використовувати ярлик"</string> + <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> + <skip /> + <!-- no translation found for color_correction_feature_name (6779391426096954933) --> + <skip /> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Ярлик спеціальних можливостей увімкнув <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Ярлик спеціальних можливостей вимкнув <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Виберіть функцію для кнопки спеціальних можливостей:"</string> @@ -1750,6 +1756,8 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Увечері в будні"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"На вихідних"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Подія"</string> + <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> + <skip /> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> вимикає звук"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Через внутрішню помилку ваш пристрій може працювати нестабільно. Відновіть заводські налаштування."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"На пристрої сталася внутрішня помилка. Зв’яжіться з виробником пристрою, щоб дізнатися більше."</string> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index ef8f6afc5313..5ccaf5cf2f43 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4490,7 +4490,9 @@ <string name="stk_cc_ussd_to_dial">USSD request is modified to DIAL request.</string> <string name="stk_cc_ussd_to_ss">USSD request is modified to SS request.</string> <string name="stk_cc_ussd_to_ussd">USSD request is modified to new USSD request.</string> + <string name="stk_cc_ussd_to_dial_video">USSD request is modified to Video DIAL request.</string> <string name="stk_cc_ss_to_dial">SS request is modified to DIAL request.</string> + <string name="stk_cc_ss_to_dial_video">SS request is modified to Video DIAL request.</string> <string name="stk_cc_ss_to_ussd">SS request is modified to USSD request.</string> <string name="stk_cc_ss_to_ss">SS request is modified to new SS request.</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 6da24bd2657b..f659360199ef 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1048,9 +1048,11 @@ <java-symbol type="string" name="stk_cc_ss_to_dial" /> <java-symbol type="string" name="stk_cc_ss_to_ss" /> <java-symbol type="string" name="stk_cc_ss_to_ussd" /> + <java-symbol type="string" name="stk_cc_ss_to_dial_video" /> <java-symbol type="string" name="stk_cc_ussd_to_dial" /> <java-symbol type="string" name="stk_cc_ussd_to_ss" /> <java-symbol type="string" name="stk_cc_ussd_to_ussd" /> + <java-symbol type="string" name="stk_cc_ussd_to_dial_video" /> <java-symbol type="string" name="safe_media_volume_warning" /> <java-symbol type="string" name="media_route_status_scanning" /> <java-symbol type="string" name="media_route_status_connecting" /> diff --git a/core/tests/BroadcastRadioTests/Android.mk b/core/tests/BroadcastRadioTests/Android.mk index c409e3af7fa7..8df3827935aa 100644 --- a/core/tests/BroadcastRadioTests/Android.mk +++ b/core/tests/BroadcastRadioTests/Android.mk @@ -26,6 +26,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test testng +LOCAL_JAVA_LIBRARIES := android.test.base + LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index d42d2ace15b0..47990a168ab3 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -45,7 +45,14 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ truth-prebuilt \ print-test-util-lib -LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common org.apache.http.legacy +LOCAL_JAVA_LIBRARIES := \ + android.test.runner \ + conscrypt \ + telephony-common \ + org.apache.http.legacy \ + android.test.base \ + android.test.mock \ + LOCAL_PACKAGE_NAME := FrameworksCoreTests LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/core/tests/coretests/src/android/app/NotificationTest.java b/core/tests/coretests/src/android/app/NotificationTest.java index bec862ab7d2f..c14dc90dbacd 100644 --- a/core/tests/coretests/src/android/app/NotificationTest.java +++ b/core/tests/coretests/src/android/app/NotificationTest.java @@ -19,12 +19,17 @@ package android.app; import static com.android.internal.util.NotificationColorUtil.satisfiesTextContrast; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import android.content.Context; import android.content.Intent; +import android.graphics.BitmapFactory; +import android.graphics.drawable.Icon; import android.media.session.MediaSession; import android.os.Parcel; +import android.os.Parcelable; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; @@ -142,6 +147,36 @@ public class NotificationTest { } @Test + public void largeIconMultipleReferences_keptAfterParcelling() { + Icon originalIcon = Icon.createWithBitmap(BitmapFactory.decodeResource( + mContext.getResources(), com.android.frameworks.coretests.R.drawable.test128x96)); + + Notification n = new Notification.Builder(mContext).setLargeIcon(originalIcon).build(); + assertSame(n.getLargeIcon(), originalIcon); + + Notification q = writeAndReadParcelable(n); + assertNotSame(q.getLargeIcon(), n.getLargeIcon()); + + assertTrue(q.getLargeIcon().getBitmap().sameAs(n.getLargeIcon().getBitmap())); + assertSame(q.getLargeIcon(), q.extras.getParcelable(Notification.EXTRA_LARGE_ICON)); + } + + @Test + public void largeIconReferenceInExtrasOnly_keptAfterParcelling() { + Icon originalIcon = Icon.createWithBitmap(BitmapFactory.decodeResource( + mContext.getResources(), com.android.frameworks.coretests.R.drawable.test128x96)); + + Notification n = new Notification.Builder(mContext).build(); + n.extras.putParcelable(Notification.EXTRA_LARGE_ICON, originalIcon); + assertSame(n.getLargeIcon(), null); + + Notification q = writeAndReadParcelable(n); + assertSame(q.getLargeIcon(), null); + assertTrue(((Icon) q.extras.getParcelable(Notification.EXTRA_LARGE_ICON)).getBitmap() + .sameAs(originalIcon.getBitmap())); + } + + @Test public void allPendingIntents_recollectedAfterReusingBuilder() { PendingIntent intent1 = PendingIntent.getActivity(mContext, 0, new Intent("test1"), 0); PendingIntent intent2 = PendingIntent.getActivity(mContext, 0, new Intent("test2"), 0); @@ -187,4 +222,15 @@ public class NotificationTest { .setContentText("Text") .setStyle(new Notification.MediaStyle().setMediaSession(session.getSessionToken())); } + + /** + * Writes an arbitrary {@link Parcelable} into a {@link Parcel} using its writeToParcel + * method before reading it out again to check that it was sent properly. + */ + private static <T extends Parcelable> T writeAndReadParcelable(T original) { + Parcel p = Parcel.obtain(); + p.writeParcelable(original, /* flags */ 0); + p.setDataPosition(0); + return p.readParcelable(/* classLoader */ null); + } } diff --git a/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java b/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java index e0fcf0833232..b1f855246320 100644 --- a/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify; import android.app.ClientTransactionHandler; import android.os.IBinder; +import android.platform.test.annotations.Presubmit; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; @@ -30,49 +31,27 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest -// TODO(lifecycler): Add to presubmit after checking for flakiness. +@Presubmit public class ClientTransactionTests { @Test - public void testPrepare() { + public void testPreExecute() { ClientTransactionItem callback1 = mock(ClientTransactionItem.class); ClientTransactionItem callback2 = mock(ClientTransactionItem.class); ActivityLifecycleItem stateRequest = mock(ActivityLifecycleItem.class); ClientTransactionHandler clientTransactionHandler = mock(ClientTransactionHandler.class); IBinder token = mock(IBinder.class); - ClientTransaction transaction = new ClientTransaction(null /* client */, + ClientTransaction transaction = ClientTransaction.obtain(null /* client */, token /* activityToken */); transaction.addCallback(callback1); transaction.addCallback(callback2); transaction.setLifecycleStateRequest(stateRequest); - transaction.prepare(clientTransactionHandler); + transaction.preExecute(clientTransactionHandler); - verify(callback1, times(1)).prepare(clientTransactionHandler, token); - verify(callback2, times(1)).prepare(clientTransactionHandler, token); - verify(stateRequest, times(1)).prepare(clientTransactionHandler, token); - } - - @Test - public void testExecute() { - ClientTransactionItem callback1 = mock(ClientTransactionItem.class); - ClientTransactionItem callback2 = mock(ClientTransactionItem.class); - ActivityLifecycleItem stateRequest = mock(ActivityLifecycleItem.class); - IBinder token = mock(IBinder.class); - - ClientTransaction transaction = new ClientTransaction(null /* client */, - token /* activityToken */); - transaction.addCallback(callback1); - transaction.addCallback(callback2); - transaction.setLifecycleStateRequest(stateRequest); - - ClientTransactionHandler clientTransactionHandler = mock(ClientTransactionHandler.class); - transaction.prepare(clientTransactionHandler); - transaction.execute(clientTransactionHandler); - - verify(callback1, times(1)).execute(clientTransactionHandler, token); - verify(callback2, times(1)).execute(clientTransactionHandler, token); - verify(stateRequest, times(1)).execute(clientTransactionHandler, token); + verify(callback1, times(1)).preExecute(clientTransactionHandler, token); + verify(callback2, times(1)).preExecute(clientTransactionHandler, token); + verify(stateRequest, times(1)).preExecute(clientTransactionHandler, token); } } diff --git a/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java new file mode 100644 index 000000000000..aefc47e95512 --- /dev/null +++ b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java @@ -0,0 +1,287 @@ +/* + * Copyright 2017 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 android.app.servertransaction; + +import static android.app.servertransaction.TestUtils.config; +import static android.app.servertransaction.TestUtils.referrerIntentList; +import static android.app.servertransaction.TestUtils.resultInfoList; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; + +import android.content.Intent; +import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; +import android.content.res.CompatibilityInfo; +import android.content.res.Configuration; +import android.os.Binder; +import android.os.Bundle; +import android.os.PersistableBundle; +import android.platform.test.annotations.Presubmit; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(AndroidJUnit4.class) +@SmallTest +@Presubmit +public class ObjectPoolTests { + + // 1. Check if two obtained objects from pool are not the same. + // 2. Check if the state of the object is cleared after recycling. + // 3. Check if the same object is obtained from pool after recycling. + + @Test + public void testRecycleActivityConfigurationChangeItem() { + ActivityConfigurationChangeItem emptyItem = ActivityConfigurationChangeItem.obtain(null); + ActivityConfigurationChangeItem item = ActivityConfigurationChangeItem.obtain(config()); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + ActivityConfigurationChangeItem item2 = ActivityConfigurationChangeItem.obtain(config()); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleActivityResultItem() { + ActivityResultItem emptyItem = ActivityResultItem.obtain(null); + ActivityResultItem item = ActivityResultItem.obtain(resultInfoList()); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + ActivityResultItem item2 = ActivityResultItem.obtain(resultInfoList()); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleConfigurationChangeItem() { + ConfigurationChangeItem emptyItem = ConfigurationChangeItem.obtain(null); + ConfigurationChangeItem item = ConfigurationChangeItem.obtain(config()); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + ConfigurationChangeItem item2 = ConfigurationChangeItem.obtain(config()); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleDestroyActivityItem() { + DestroyActivityItem emptyItem = DestroyActivityItem.obtain(false, 0); + DestroyActivityItem item = DestroyActivityItem.obtain(true, 117); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + DestroyActivityItem item2 = DestroyActivityItem.obtain(true, 14); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleLaunchActivityItem() { + Intent intent = new Intent("action"); + int ident = 57; + ActivityInfo activityInfo = new ActivityInfo(); + activityInfo.flags = 42; + activityInfo.maxAspectRatio = 2.4f; + activityInfo.launchToken = "token"; + activityInfo.applicationInfo = new ApplicationInfo(); + activityInfo.packageName = "packageName"; + activityInfo.name = "name"; + Configuration overrideConfig = new Configuration(); + overrideConfig.assetsSeq = 5; + CompatibilityInfo compat = CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO; + String referrer = "referrer"; + int procState = 4; + Bundle bundle = new Bundle(); + bundle.putString("key", "value"); + PersistableBundle persistableBundle = new PersistableBundle(); + persistableBundle.putInt("k", 4); + + LaunchActivityItem emptyItem = LaunchActivityItem.obtain(null, 0, null, null, null, null, + null, null, 0, null, null, null, null, false, null); + LaunchActivityItem item = LaunchActivityItem.obtain(intent, ident, activityInfo, + config(), overrideConfig, compat, referrer, null /* voiceInteractor */, + procState, bundle, persistableBundle, resultInfoList(), referrerIntentList(), + true /* isForward */, null /* profilerInfo */); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + LaunchActivityItem item2 = LaunchActivityItem.obtain(intent, ident, activityInfo, + config(), overrideConfig, compat, referrer, null /* voiceInteractor */, + procState, bundle, persistableBundle, resultInfoList(), referrerIntentList(), + true /* isForward */, null /* profilerInfo */); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleMoveToDisplayItem() { + MoveToDisplayItem emptyItem = MoveToDisplayItem.obtain(0, null); + MoveToDisplayItem item = MoveToDisplayItem.obtain(4, config()); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + MoveToDisplayItem item2 = MoveToDisplayItem.obtain(3, config()); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleMultiWindowModeChangeItem() { + MultiWindowModeChangeItem emptyItem = MultiWindowModeChangeItem.obtain(false, null); + MultiWindowModeChangeItem item = MultiWindowModeChangeItem.obtain(true, config()); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + MultiWindowModeChangeItem item2 = MultiWindowModeChangeItem.obtain(true, config()); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleNewIntentItem() { + NewIntentItem emptyItem = NewIntentItem.obtain(null, false); + NewIntentItem item = NewIntentItem.obtain(referrerIntentList(), true); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + NewIntentItem item2 = NewIntentItem.obtain(referrerIntentList(), true); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecyclePauseActivityItemItem() { + PauseActivityItem emptyItem = PauseActivityItem.obtain(false, false, 0, false); + PauseActivityItem item = PauseActivityItem.obtain(true, true, 5, true); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + PauseActivityItem item2 = PauseActivityItem.obtain(true, false, 5, true); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecyclePipModeChangeItem() { + PipModeChangeItem emptyItem = PipModeChangeItem.obtain(false, null); + PipModeChangeItem item = PipModeChangeItem.obtain(true, config()); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + PipModeChangeItem item2 = PipModeChangeItem.obtain(true, config()); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleResumeActivityItem() { + ResumeActivityItem emptyItem = ResumeActivityItem.obtain(false); + ResumeActivityItem item = ResumeActivityItem.obtain(3, true); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + ResumeActivityItem item2 = ResumeActivityItem.obtain(2, true); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleStopItem() { + StopActivityItem emptyItem = StopActivityItem.obtain(false, 0); + StopActivityItem item = StopActivityItem.obtain(true, 4); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + StopActivityItem item2 = StopActivityItem.obtain(true, 3); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleWindowVisibleItem() { + WindowVisibilityItem emptyItem = WindowVisibilityItem.obtain(false); + WindowVisibilityItem item = WindowVisibilityItem.obtain(true); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + WindowVisibilityItem item2 = WindowVisibilityItem.obtain(true); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } + + @Test + public void testRecycleClientTransaction() { + ClientTransaction emptyItem = ClientTransaction.obtain(null, null); + ClientTransaction item = ClientTransaction.obtain(null, new Binder()); + assertNotSame(item, emptyItem); + assertFalse(item.equals(emptyItem)); + + item.recycle(); + assertEquals(item, emptyItem); + + ClientTransaction item2 = ClientTransaction.obtain(null, new Binder()); + assertSame(item, item2); + assertFalse(item2.equals(emptyItem)); + } +} diff --git a/core/tests/coretests/src/android/app/servertransaction/TestUtils.java b/core/tests/coretests/src/android/app/servertransaction/TestUtils.java new file mode 100644 index 000000000000..e92351609256 --- /dev/null +++ b/core/tests/coretests/src/android/app/servertransaction/TestUtils.java @@ -0,0 +1,74 @@ +/* + * Copyright 2017 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 android.app.servertransaction; + +import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; + +import android.app.ResultInfo; +import android.content.Intent; +import android.content.res.Configuration; + +import com.android.internal.content.ReferrerIntent; + +import java.util.ArrayList; +import java.util.List; + +class TestUtils { + + static Configuration config() { + Configuration config = new Configuration(); + config.densityDpi = 10; + config.fontScale = 0.3f; + config.screenHeightDp = 15; + config.orientation = ORIENTATION_LANDSCAPE; + return config; + } + + static List<ResultInfo> resultInfoList() { + String resultWho1 = "resultWho1"; + int requestCode1 = 7; + int resultCode1 = 4; + Intent data1 = new Intent("action1"); + ResultInfo resultInfo1 = new ResultInfo(resultWho1, requestCode1, resultCode1, data1); + + String resultWho2 = "resultWho2"; + int requestCode2 = 8; + int resultCode2 = 6; + Intent data2 = new Intent("action2"); + ResultInfo resultInfo2 = new ResultInfo(resultWho2, requestCode2, resultCode2, data2); + + List<ResultInfo> resultInfoList = new ArrayList<>(); + resultInfoList.add(resultInfo1); + resultInfoList.add(resultInfo2); + + return resultInfoList; + } + + static List<ReferrerIntent> referrerIntentList() { + Intent intent1 = new Intent("action1"); + ReferrerIntent referrerIntent1 = new ReferrerIntent(intent1, "referrer1"); + + Intent intent2 = new Intent("action2"); + ReferrerIntent referrerIntent2 = new ReferrerIntent(intent2, "referrer2"); + + List<ReferrerIntent> referrerIntents = new ArrayList<>(); + referrerIntents.add(referrerIntent1); + referrerIntents.add(referrerIntent2); + + return referrerIntents; + } +} diff --git a/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java b/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java new file mode 100644 index 000000000000..e575650393f0 --- /dev/null +++ b/core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java @@ -0,0 +1,216 @@ +/* + * Copyright 2017 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 android.app.servertransaction; + +import static android.app.servertransaction.ActivityLifecycleItem.ON_CREATE; +import static android.app.servertransaction.ActivityLifecycleItem.ON_DESTROY; +import static android.app.servertransaction.ActivityLifecycleItem.ON_PAUSE; +import static android.app.servertransaction.ActivityLifecycleItem.ON_RESTART; +import static android.app.servertransaction.ActivityLifecycleItem.ON_RESUME; +import static android.app.servertransaction.ActivityLifecycleItem.ON_START; +import static android.app.servertransaction.ActivityLifecycleItem.ON_STOP; +import static android.app.servertransaction.ActivityLifecycleItem.PRE_ON_CREATE; + +import static org.junit.Assert.assertArrayEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.ActivityThread.ActivityClientRecord; +import android.app.ClientTransactionHandler; +import android.os.IBinder; +import android.platform.test.annotations.Presubmit; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InOrder; + +import java.util.ArrayList; + +/** Test {@link TransactionExecutor} logic. */ +@RunWith(AndroidJUnit4.class) +@SmallTest +@Presubmit +public class TransactionExecutorTests { + + private TransactionExecutor mExecutor; + private ClientTransactionHandler mTransactionHandler; + private ActivityClientRecord mClientRecord; + + @Before + public void setUp() throws Exception { + mTransactionHandler = mock(ClientTransactionHandler.class); + + mClientRecord = new ActivityClientRecord(); + when(mTransactionHandler.getActivityClient(any())).thenReturn(mClientRecord); + + mExecutor = spy(new TransactionExecutor(mTransactionHandler)); + } + + @Test + public void testLifecycleFromPreOnCreate() { + mClientRecord.setState(PRE_ON_CREATE); + assertArrayEquals(new int[] {}, path(PRE_ON_CREATE)); + assertArrayEquals(new int[] {ON_CREATE}, path(ON_CREATE)); + assertArrayEquals(new int[] {ON_CREATE, ON_START}, path(ON_START)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME}, path(ON_RESUME)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME, ON_PAUSE}, path(ON_PAUSE)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME, ON_PAUSE, ON_STOP}, + path(ON_STOP)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME, ON_PAUSE, ON_STOP, ON_DESTROY}, + path(ON_DESTROY)); + } + + @Test + public void testLifecycleFromOnCreate() { + mClientRecord.setState(ON_CREATE); + assertArrayEquals(new int[] {}, path(ON_CREATE)); + assertArrayEquals(new int[] {ON_START}, path(ON_START)); + assertArrayEquals(new int[] {ON_START, ON_RESUME}, path(ON_RESUME)); + assertArrayEquals(new int[] {ON_START, ON_RESUME, ON_PAUSE}, path(ON_PAUSE)); + assertArrayEquals(new int[] {ON_START, ON_RESUME, ON_PAUSE, ON_STOP}, path(ON_STOP)); + assertArrayEquals(new int[] {ON_START, ON_RESUME, ON_PAUSE, ON_STOP, ON_DESTROY}, + path(ON_DESTROY)); + } + + @Test + public void testLifecycleFromOnStart() { + mClientRecord.setState(ON_START); + assertArrayEquals(new int[] {ON_RESUME, ON_PAUSE, ON_STOP, ON_DESTROY, ON_CREATE}, + path(ON_CREATE)); + assertArrayEquals(new int[] {}, path(ON_START)); + assertArrayEquals(new int[] {ON_RESUME}, path(ON_RESUME)); + assertArrayEquals(new int[] {ON_RESUME, ON_PAUSE}, path(ON_PAUSE)); + assertArrayEquals(new int[] {ON_RESUME, ON_PAUSE, ON_STOP}, path(ON_STOP)); + assertArrayEquals(new int[] {ON_RESUME, ON_PAUSE, ON_STOP, ON_DESTROY}, path(ON_DESTROY)); + } + + @Test + public void testLifecycleFromOnResume() { + mClientRecord.setState(ON_RESUME); + assertArrayEquals(new int[] {ON_PAUSE, ON_STOP, ON_DESTROY, ON_CREATE}, path(ON_CREATE)); + assertArrayEquals(new int[] {ON_PAUSE, ON_STOP, ON_RESTART, ON_START}, path(ON_START)); + assertArrayEquals(new int[] {}, path(ON_RESUME)); + assertArrayEquals(new int[] {ON_PAUSE}, path(ON_PAUSE)); + assertArrayEquals(new int[] {ON_PAUSE, ON_STOP}, path(ON_STOP)); + assertArrayEquals(new int[] {ON_PAUSE, ON_STOP, ON_DESTROY}, path(ON_DESTROY)); + } + + @Test + public void testLifecycleFromOnPause() { + mClientRecord.setState(ON_PAUSE); + assertArrayEquals(new int[] {ON_STOP, ON_DESTROY, ON_CREATE}, path(ON_CREATE)); + assertArrayEquals(new int[] {ON_STOP, ON_RESTART, ON_START}, path(ON_START)); + assertArrayEquals(new int[] {ON_RESUME}, path(ON_RESUME)); + assertArrayEquals(new int[] {}, path(ON_PAUSE)); + assertArrayEquals(new int[] {ON_STOP}, path(ON_STOP)); + assertArrayEquals(new int[] {ON_STOP, ON_DESTROY}, path(ON_DESTROY)); + } + + @Test + public void testLifecycleFromOnStop() { + mClientRecord.setState(ON_STOP); + assertArrayEquals(new int[] {ON_DESTROY, ON_CREATE}, path(ON_CREATE)); + assertArrayEquals(new int[] {ON_RESTART, ON_START}, path(ON_START)); + assertArrayEquals(new int[] {ON_RESTART, ON_START, ON_RESUME}, path(ON_RESUME)); + assertArrayEquals(new int[] {ON_RESTART, ON_START, ON_RESUME, ON_PAUSE}, path(ON_PAUSE)); + assertArrayEquals(new int[] {}, path(ON_STOP)); + assertArrayEquals(new int[] {ON_DESTROY}, path(ON_DESTROY)); + } + + @Test + public void testLifecycleFromOnDestroy() { + mClientRecord.setState(ON_DESTROY); + assertArrayEquals(new int[] {ON_CREATE}, path(ON_CREATE)); + assertArrayEquals(new int[] {ON_CREATE, ON_START}, path(ON_START)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME}, path(ON_RESUME)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME, ON_PAUSE}, path(ON_PAUSE)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME, ON_PAUSE, ON_STOP}, + path(ON_STOP)); + assertArrayEquals(new int[] {}, path(ON_DESTROY)); + } + + @Test + public void testLifecycleExcludeLastItem() { + mClientRecord.setState(PRE_ON_CREATE); + assertArrayEquals(new int[] {}, pathExcludeLast(PRE_ON_CREATE)); + assertArrayEquals(new int[] {}, pathExcludeLast(ON_CREATE)); + assertArrayEquals(new int[] {ON_CREATE}, pathExcludeLast(ON_START)); + assertArrayEquals(new int[] {ON_CREATE, ON_START}, pathExcludeLast(ON_RESUME)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME}, pathExcludeLast(ON_PAUSE)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME, ON_PAUSE}, + pathExcludeLast(ON_STOP)); + assertArrayEquals(new int[] {ON_CREATE, ON_START, ON_RESUME, ON_PAUSE, ON_STOP}, + pathExcludeLast(ON_DESTROY)); + } + + @Test + public void testTransactionResolution() { + ClientTransactionItem callback1 = mock(ClientTransactionItem.class); + ClientTransactionItem callback2 = mock(ClientTransactionItem.class); + ActivityLifecycleItem stateRequest = mock(ActivityLifecycleItem.class); + IBinder token = mock(IBinder.class); + + ClientTransaction transaction = ClientTransaction.obtain(null /* client */, + token /* activityToken */); + transaction.addCallback(callback1); + transaction.addCallback(callback2); + transaction.setLifecycleStateRequest(stateRequest); + + transaction.preExecute(mTransactionHandler); + mExecutor.execute(transaction); + + InOrder inOrder = inOrder(mTransactionHandler, callback1, callback2, stateRequest); + inOrder.verify(callback1, times(1)).execute(eq(mTransactionHandler), eq(token), any()); + inOrder.verify(callback2, times(1)).execute(eq(mTransactionHandler), eq(token), any()); + inOrder.verify(stateRequest, times(1)).execute(eq(mTransactionHandler), eq(token), any()); + } + + @Test + public void testRequiredStateResolution() { + ActivityResultItem activityResultItem = ActivityResultItem.obtain(new ArrayList<>()); + + IBinder token = mock(IBinder.class); + ClientTransaction transaction = ClientTransaction.obtain(null /* client */, + token /* activityToken */); + transaction.addCallback(activityResultItem); + + mExecutor.executeCallbacks(transaction); + + verify(mExecutor, times(1)).cycleToPath(eq(mClientRecord), eq(ON_PAUSE)); + } + + private int[] path(int finish) { + mExecutor.initLifecyclePath(mClientRecord.getLifecycleState(), finish, + false /* excludeLastState */); + return mExecutor.getLifecycleSequence(); + } + + private int[] pathExcludeLast(int finish) { + mExecutor.initLifecyclePath(mClientRecord.getLifecycleState(), finish, + true /* excludeLastState */); + return mExecutor.getLifecycleSequence(); + } +} diff --git a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java index 9db7550a6099..4b1f2dab61b9 100644 --- a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java @@ -16,7 +16,9 @@ package android.app.servertransaction; -import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; +import static android.app.servertransaction.TestUtils.config; +import static android.app.servertransaction.TestUtils.referrerIntentList; +import static android.app.servertransaction.TestUtils.resultInfoList; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; @@ -46,6 +48,7 @@ import android.os.ParcelFileDescriptor; import android.os.Parcelable; import android.os.PersistableBundle; import android.os.RemoteException; +import android.platform.test.annotations.Presubmit; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; @@ -56,14 +59,13 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.ArrayList; import java.util.List; import java.util.Map; /** Test parcelling and unparcelling of transactions and transaction items. */ @RunWith(AndroidJUnit4.class) @SmallTest -// TODO(lifecycler): Add to presubmit after checking for flakiness. +@Presubmit public class TransactionParcelTests { private Parcel mParcel; @@ -76,7 +78,7 @@ public class TransactionParcelTests { @Test public void testConfigurationChange() { // Write to parcel - ConfigurationChangeItem item = new ConfigurationChangeItem(config()); + ConfigurationChangeItem item = ConfigurationChangeItem.obtain(config()); writeAndPrepareForReading(item); // Read from parcel and assert @@ -89,7 +91,7 @@ public class TransactionParcelTests { @Test public void testActivityConfigChange() { // Write to parcel - ActivityConfigurationChangeItem item = new ActivityConfigurationChangeItem(config()); + ActivityConfigurationChangeItem item = ActivityConfigurationChangeItem.obtain(config()); writeAndPrepareForReading(item); // Read from parcel and assert @@ -103,7 +105,7 @@ public class TransactionParcelTests { @Test public void testMoveToDisplay() { // Write to parcel - MoveToDisplayItem item = new MoveToDisplayItem(4 /* targetDisplayId */, config()); + MoveToDisplayItem item = MoveToDisplayItem.obtain(4 /* targetDisplayId */, config()); writeAndPrepareForReading(item); // Read from parcel and assert @@ -116,7 +118,7 @@ public class TransactionParcelTests { @Test public void testNewIntent() { // Write to parcel - NewIntentItem item = new NewIntentItem(referrerIntentList(), true /* pause */); + NewIntentItem item = NewIntentItem.obtain(referrerIntentList(), true /* pause */); writeAndPrepareForReading(item); // Read from parcel and assert @@ -129,7 +131,7 @@ public class TransactionParcelTests { @Test public void testActivityResult() { // Write to parcel - ActivityResultItem item = new ActivityResultItem(resultInfoList()); + ActivityResultItem item = ActivityResultItem.obtain(resultInfoList()); writeAndPrepareForReading(item); // Read from parcel and assert @@ -142,7 +144,7 @@ public class TransactionParcelTests { @Test public void testPipModeChange() { // Write to parcel - PipModeChangeItem item = new PipModeChangeItem(true /* isInPipMode */, config()); + PipModeChangeItem item = PipModeChangeItem.obtain(true /* isInPipMode */, config()); writeAndPrepareForReading(item); // Read from parcel and assert @@ -155,7 +157,7 @@ public class TransactionParcelTests { @Test public void testMultiWindowModeChange() { // Write to parcel - MultiWindowModeChangeItem item = new MultiWindowModeChangeItem( + MultiWindowModeChangeItem item = MultiWindowModeChangeItem.obtain( true /* isInMultiWindowMode */, config()); writeAndPrepareForReading(item); @@ -170,7 +172,7 @@ public class TransactionParcelTests { @Test public void testWindowVisibilityChange() { // Write to parcel - WindowVisibilityItem item = new WindowVisibilityItem(true /* showWindow */); + WindowVisibilityItem item = WindowVisibilityItem.obtain(true /* showWindow */); writeAndPrepareForReading(item); // Read from parcel and assert @@ -180,7 +182,7 @@ public class TransactionParcelTests { assertTrue(item.equals(result)); // Check different value - item = new WindowVisibilityItem(false); + item = WindowVisibilityItem.obtain(false); mParcel = Parcel.obtain(); writeAndPrepareForReading(item); @@ -194,7 +196,7 @@ public class TransactionParcelTests { @Test public void testDestroy() { - DestroyActivityItem item = new DestroyActivityItem(true /* finished */, + DestroyActivityItem item = DestroyActivityItem.obtain(true /* finished */, 135 /* configChanges */); writeAndPrepareForReading(item); @@ -227,10 +229,10 @@ public class TransactionParcelTests { PersistableBundle persistableBundle = new PersistableBundle(); persistableBundle.putInt("k", 4); - LaunchActivityItem item = new LaunchActivityItem(intent, ident, activityInfo, + LaunchActivityItem item = LaunchActivityItem.obtain(intent, ident, activityInfo, config(), overrideConfig, compat, referrer, null /* voiceInteractor */, procState, bundle, persistableBundle, resultInfoList(), referrerIntentList(), - true /* notResumed */, true /* isForward */, null /* profilerInfo */); + true /* isForward */, null /* profilerInfo */); writeAndPrepareForReading(item); // Read from parcel and assert @@ -243,8 +245,8 @@ public class TransactionParcelTests { @Test public void testPause() { // Write to parcel - PauseActivityItem item = new PauseActivityItem(true /* finished */, true /* userLeaving */, - 135 /* configChanges */, true /* dontReport */); + PauseActivityItem item = PauseActivityItem.obtain(true /* finished */, + true /* userLeaving */, 135 /* configChanges */, true /* dontReport */); writeAndPrepareForReading(item); // Read from parcel and assert @@ -257,7 +259,8 @@ public class TransactionParcelTests { @Test public void testResume() { // Write to parcel - ResumeActivityItem item = new ResumeActivityItem(27 /* procState */, true /* isForward */); + ResumeActivityItem item = ResumeActivityItem.obtain(27 /* procState */, + true /* isForward */); writeAndPrepareForReading(item); // Read from parcel and assert @@ -270,7 +273,8 @@ public class TransactionParcelTests { @Test public void testStop() { // Write to parcel - StopActivityItem item = new StopActivityItem(true /* showWindow */, 14 /* configChanges */); + StopActivityItem item = StopActivityItem.obtain(true /* showWindow */, + 14 /* configChanges */); writeAndPrepareForReading(item); // Read from parcel and assert @@ -283,16 +287,17 @@ public class TransactionParcelTests { @Test public void testClientTransaction() { // Write to parcel - WindowVisibilityItem callback1 = new WindowVisibilityItem(true); - ActivityConfigurationChangeItem callback2 = new ActivityConfigurationChangeItem(config()); + WindowVisibilityItem callback1 = WindowVisibilityItem.obtain(true); + ActivityConfigurationChangeItem callback2 = ActivityConfigurationChangeItem.obtain( + config()); - StopActivityItem lifecycleRequest = new StopActivityItem(true /* showWindow */, + StopActivityItem lifecycleRequest = StopActivityItem.obtain(true /* showWindow */, 78 /* configChanges */); IApplicationThread appThread = new StubAppThread(); Binder activityToken = new Binder(); - ClientTransaction transaction = new ClientTransaction(appThread, activityToken); + ClientTransaction transaction = ClientTransaction.obtain(appThread, activityToken); transaction.addCallback(callback1); transaction.addCallback(callback2); transaction.setLifecycleStateRequest(lifecycleRequest); @@ -309,13 +314,14 @@ public class TransactionParcelTests { @Test public void testClientTransactionCallbacksOnly() { // Write to parcel - WindowVisibilityItem callback1 = new WindowVisibilityItem(true); - ActivityConfigurationChangeItem callback2 = new ActivityConfigurationChangeItem(config()); + WindowVisibilityItem callback1 = WindowVisibilityItem.obtain(true); + ActivityConfigurationChangeItem callback2 = ActivityConfigurationChangeItem.obtain( + config()); IApplicationThread appThread = new StubAppThread(); Binder activityToken = new Binder(); - ClientTransaction transaction = new ClientTransaction(appThread, activityToken); + ClientTransaction transaction = ClientTransaction.obtain(appThread, activityToken); transaction.addCallback(callback1); transaction.addCallback(callback2); @@ -331,13 +337,13 @@ public class TransactionParcelTests { @Test public void testClientTransactionLifecycleOnly() { // Write to parcel - StopActivityItem lifecycleRequest = new StopActivityItem(true /* showWindow */, + StopActivityItem lifecycleRequest = StopActivityItem.obtain(true /* showWindow */, 78 /* configChanges */); IApplicationThread appThread = new StubAppThread(); Binder activityToken = new Binder(); - ClientTransaction transaction = new ClientTransaction(appThread, activityToken); + ClientTransaction transaction = ClientTransaction.obtain(appThread, activityToken); transaction.setLifecycleStateRequest(lifecycleRequest); writeAndPrepareForReading(transaction); @@ -349,49 +355,6 @@ public class TransactionParcelTests { assertTrue(transaction.equals(result)); } - private static List<ResultInfo> resultInfoList() { - String resultWho1 = "resultWho1"; - int requestCode1 = 7; - int resultCode1 = 4; - Intent data1 = new Intent("action1"); - ResultInfo resultInfo1 = new ResultInfo(resultWho1, requestCode1, resultCode1, data1); - - String resultWho2 = "resultWho2"; - int requestCode2 = 8; - int resultCode2 = 6; - Intent data2 = new Intent("action2"); - ResultInfo resultInfo2 = new ResultInfo(resultWho2, requestCode2, resultCode2, data2); - - List<ResultInfo> resultInfoList = new ArrayList<>(); - resultInfoList.add(resultInfo1); - resultInfoList.add(resultInfo2); - - return resultInfoList; - } - - private static List<ReferrerIntent> referrerIntentList() { - Intent intent1 = new Intent("action1"); - ReferrerIntent referrerIntent1 = new ReferrerIntent(intent1, "referrer1"); - - Intent intent2 = new Intent("action2"); - ReferrerIntent referrerIntent2 = new ReferrerIntent(intent2, "referrer2"); - - List<ReferrerIntent> referrerIntents = new ArrayList<>(); - referrerIntents.add(referrerIntent1); - referrerIntents.add(referrerIntent2); - - return referrerIntents; - } - - private static Configuration config() { - Configuration config = new Configuration(); - config.densityDpi = 10; - config.fontScale = 0.3f; - config.screenHeightDp = 15; - config.orientation = ORIENTATION_LANDSCAPE; - return config; - } - /** Write to {@link #mParcel} and reset its position to prepare for reading from the start. */ private void writeAndPrepareForReading(Parcelable parcelable) { parcelable.writeToParcel(mParcel, 0 /* flags */); diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 03672756275d..0982a4b58c99 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -194,6 +194,7 @@ public class SettingsBackupTest { Settings.Global.DROPBOX_RESERVE_PERCENT, Settings.Global.DROPBOX_TAG_PREFIX, Settings.Global.EMERGENCY_AFFORDANCE_NEEDED, + Settings.Global.EMULATE_DISPLAY_CUTOUT, Settings.Global.ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, Settings.Global.ENABLE_CACHE_QUOTA_CALCULATION, Settings.Global.ENABLE_CELLULAR_ON_BOOT, @@ -420,7 +421,7 @@ public class SettingsBackupTest { Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE, // TODO(b/67867469): Move autofill settings below to // BACKUP_BLACKLISTED_SYSTEM_SETTINGS once feature is moved out of experimental - Settings.Secure.AUTOFILL_FEATURE_FIELD_DETECTION, + Settings.Secure.AUTOFILL_FEATURE_FIELD_CLASSIFICATION, Settings.Secure.AUTOFILL_USER_DATA_MAX_FIELD_CLASSIFICATION_IDS_SIZE, Settings.Secure.AUTOFILL_USER_DATA_MAX_USER_DATA_SIZE, Settings.Secure.AUTOFILL_USER_DATA_MAX_VALUE_LENGTH, diff --git a/core/tests/featureflagtests/Android.mk b/core/tests/featureflagtests/Android.mk index f2d205885c20..6330b8eb4183 100644 --- a/core/tests/featureflagtests/Android.mk +++ b/core/tests/featureflagtests/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := \ LOCAL_DX_FLAGS := --core-library LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib android-support-test -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_PACKAGE_NAME := FrameworksCoreFeatureFlagTests LOCAL_CERTIFICATE := platform diff --git a/core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java b/core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java index b8c41233f6f5..0b1b333a1ddc 100644 --- a/core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java +++ b/core/tests/featureflagtests/src/android/util/FeatureFlagUtilsTest.java @@ -18,6 +18,7 @@ package android.util; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; import android.content.Context; @@ -59,7 +60,7 @@ public class FeatureFlagUtilsTest { @Test public void testGetFlag_enabled_shouldReturnTrue() { - SystemProperties.set(FeatureFlagUtils.FFLAG_PREFIX + TEST_FEATURE_NAME, "true"); + FeatureFlagUtils.getAllFeatureFlags().put(TEST_FEATURE_NAME, "true"); assertTrue(FeatureFlagUtils.isEnabled(mContext, TEST_FEATURE_NAME)); } @@ -96,7 +97,11 @@ public class FeatureFlagUtilsTest { @Test public void testGetFlag_notSet_shouldReturnFalse() { - assertFalse(FeatureFlagUtils.isEnabled(mContext, TEST_FEATURE_NAME)); + assertFalse(FeatureFlagUtils.isEnabled(mContext, TEST_FEATURE_NAME + "does_not_exist")); } + @Test + public void getAllFeatureFlags_shouldNotBeNull() { + assertNotNull(FeatureFlagUtils.getAllFeatureFlags()); + } } diff --git a/core/tests/systemproperties/Android.mk b/core/tests/systemproperties/Android.mk index 4c2e2247a113..57e205994c4e 100644 --- a/core/tests/systemproperties/Android.mk +++ b/core/tests/systemproperties/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := \ LOCAL_DX_FLAGS := --core-library LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_PACKAGE_NAME := FrameworksCoreSystemPropertiesTests LOCAL_CERTIFICATE := platform diff --git a/core/tests/utillib/Android.mk b/core/tests/utillib/Android.mk index 88112561f1d0..be1ab1f73d9f 100644 --- a/core/tests/utillib/Android.mk +++ b/core/tests/utillib/Android.mk @@ -19,7 +19,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_MODULE := frameworks-core-util-lib -LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test +LOCAL_STATIC_JAVA_LIBRARIES := junit +LOCAL_JAVA_LIBRARIES := android.test.base include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/core/tests/utiltests/Android.mk b/core/tests/utiltests/Android.mk index 233d070f9507..2dc105932f04 100644 --- a/core/tests/utiltests/Android.mk +++ b/core/tests/utiltests/Android.mk @@ -19,7 +19,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ frameworks-base-testutils \ mockito-target-minus-junit4 \ -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock LOCAL_PACKAGE_NAME := FrameworksUtilTests diff --git a/data/keyboards/Generic.kl b/data/keyboards/Generic.kl index b3bba07296d2..74f8c71da09f 100644 --- a/data/keyboards/Generic.kl +++ b/data/keyboards/Generic.kl @@ -404,6 +404,8 @@ key 484 B FUNCTION # key 503 KEY_BRL_DOT7 # key 504 KEY_BRL_DOT8 +key 522 STAR +key 523 POUND key 580 APP_SWITCH key 582 VOICE_ASSIST diff --git a/data/keyboards/Generic_Iot.kl b/data/keyboards/Generic_Iot.kl deleted file mode 100644 index 89df22462fc7..000000000000 --- a/data/keyboards/Generic_Iot.kl +++ /dev/null @@ -1,443 +0,0 @@ -# Copyright (C) 2017 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. - -# -# Generic key layout file for full alphabetic US English PC style external keyboards. -# -# This file is intentionally very generic and is intended to support a broad range of keyboards. -# Do not edit the generic key layout to support a specific keyboard; instead, create -# a new key layout file with the required keyboard configuration. -# - -key 1 ESCAPE -key 2 1 -key 3 2 -key 4 3 -key 5 4 -key 6 5 -key 7 6 -key 8 7 -key 9 8 -key 10 9 -key 11 0 -key 12 MINUS -key 13 EQUALS -key 14 DEL -key 15 TAB -key 16 Q -key 17 W -key 18 E -key 19 R -key 20 T -key 21 Y -key 22 U -key 23 I -key 24 O -key 25 P -key 26 LEFT_BRACKET -key 27 RIGHT_BRACKET -key 28 ENTER -key 29 CTRL_LEFT -key 30 A -key 31 S -key 32 D -key 33 F -key 34 G -key 35 H -key 36 J -key 37 K -key 38 L -key 39 SEMICOLON -key 40 APOSTROPHE -key 41 GRAVE -key 42 SHIFT_LEFT -key 43 BACKSLASH -key 44 Z -key 45 X -key 46 C -key 47 V -key 48 B -key 49 N -key 50 M -key 51 COMMA -key 52 PERIOD -key 53 SLASH -key 54 SHIFT_RIGHT -key 55 NUMPAD_MULTIPLY -key 56 ALT_LEFT -key 57 SPACE -key 58 CAPS_LOCK -key 59 F1 -key 60 F2 -key 61 F3 -key 62 F4 -key 63 F5 -key 64 F6 -key 65 F7 -key 66 F8 -key 67 F9 -key 68 F10 -key 69 NUM_LOCK -key 70 SCROLL_LOCK -key 71 NUMPAD_7 -key 72 NUMPAD_8 -key 73 NUMPAD_9 -key 74 NUMPAD_SUBTRACT -key 75 NUMPAD_4 -key 76 NUMPAD_5 -key 77 NUMPAD_6 -key 78 NUMPAD_ADD -key 79 NUMPAD_1 -key 80 NUMPAD_2 -key 81 NUMPAD_3 -key 82 NUMPAD_0 -key 83 NUMPAD_DOT -# key 84 (undefined) -key 85 ZENKAKU_HANKAKU -key 86 BACKSLASH -key 87 F11 -key 88 F12 -key 89 RO -# key 90 "KEY_KATAKANA" -# key 91 "KEY_HIRAGANA" -key 92 HENKAN -key 93 KATAKANA_HIRAGANA -key 94 MUHENKAN -key 95 NUMPAD_COMMA -key 96 NUMPAD_ENTER -key 97 CTRL_RIGHT -key 98 NUMPAD_DIVIDE -key 99 SYSRQ -key 100 ALT_RIGHT -# key 101 "KEY_LINEFEED" -key 102 MOVE_HOME -key 103 DPAD_UP -key 104 PAGE_UP -key 105 DPAD_LEFT -key 106 DPAD_RIGHT -key 107 MOVE_END -key 108 DPAD_DOWN -key 109 PAGE_DOWN -key 110 INSERT -key 111 FORWARD_DEL -# key 112 "KEY_MACRO" -key 113 VOLUME_MUTE -key 114 VOLUME_DOWN -key 115 VOLUME_UP -key 116 POWER -key 117 NUMPAD_EQUALS -# key 118 "KEY_KPPLUSMINUS" -key 119 BREAK -# key 120 (undefined) -key 121 NUMPAD_COMMA -key 122 KANA -key 123 EISU -key 124 YEN -key 125 META_LEFT -key 126 META_RIGHT -key 127 MENU -key 128 MEDIA_STOP -# key 129 "KEY_AGAIN" -# key 130 "KEY_PROPS" -# key 131 "KEY_UNDO" -# key 132 "KEY_FRONT" -key 133 COPY -# key 134 "KEY_OPEN" -key 135 PASTE -# key 136 "KEY_FIND" -key 137 CUT -# key 138 "KEY_HELP" -key 139 MENU -key 140 CALCULATOR -# key 141 "KEY_SETUP" -key 142 SLEEP -key 143 WAKEUP -# key 144 "KEY_FILE" -# key 145 "KEY_SENDFILE" -# key 146 "KEY_DELETEFILE" -# key 147 "KEY_XFER" -# key 148 "KEY_PROG1" -# key 149 "KEY_PROG2" -key 150 EXPLORER -# key 151 "KEY_MSDOS" -key 152 POWER -# key 153 "KEY_DIRECTION" -# key 154 "KEY_CYCLEWINDOWS" -key 155 ENVELOPE -key 156 BOOKMARK -# key 157 "KEY_COMPUTER" -key 158 BACK -key 159 FORWARD -key 160 MEDIA_CLOSE -key 161 MEDIA_EJECT -key 162 MEDIA_EJECT -key 163 MEDIA_NEXT -key 164 MEDIA_PLAY_PAUSE -key 165 MEDIA_PREVIOUS -key 166 MEDIA_STOP -key 167 MEDIA_RECORD -key 168 MEDIA_REWIND -key 169 CALL -# key 170 "KEY_ISO" -key 171 MUSIC -key 172 HOME -# key 173 "KEY_REFRESH" -# key 174 "KEY_EXIT" -# key 175 "KEY_MOVE" -# key 176 "KEY_EDIT" -key 177 PAGE_UP -key 178 PAGE_DOWN -key 179 NUMPAD_LEFT_PAREN -key 180 NUMPAD_RIGHT_PAREN -# key 181 "KEY_NEW" -# key 182 "KEY_REDO" -# key 183 F13 -# key 184 F14 -# key 185 F15 -# key 186 F16 -# key 187 F17 -# key 188 F18 -# key 189 F19 -# key 190 F20 -# key 191 F21 -# key 192 F22 -# key 193 F23 -# key 194 F24 -# key 195 (undefined) -# key 196 (undefined) -# key 197 (undefined) -# key 198 (undefined) -# key 199 (undefined) -key 200 MEDIA_PLAY -key 201 MEDIA_PAUSE -# key 202 "KEY_PROG3" -# key 203 "KEY_PROG4" -# key 204 (undefined) -# key 205 "KEY_SUSPEND" -# key 206 "KEY_CLOSE" -key 207 MEDIA_PLAY -key 208 MEDIA_FAST_FORWARD -# key 209 "KEY_BASSBOOST" -# key 210 "KEY_PRINT" -# key 211 "KEY_HP" -key 212 CAMERA -key 213 MUSIC -# key 214 "KEY_QUESTION" -key 215 ENVELOPE -# key 216 "KEY_CHAT" -key 217 SEARCH -# key 218 "KEY_CONNECT" -# key 219 "KEY_FINANCE" -# key 220 "KEY_SPORT" -# key 221 "KEY_SHOP" -# key 222 "KEY_ALTERASE" -# key 223 "KEY_CANCEL" -key 224 BRIGHTNESS_DOWN -key 225 BRIGHTNESS_UP -key 226 HEADSETHOOK -key 227 POUND -key 228 STAR - -key 256 BUTTON_1 -key 257 BUTTON_2 -key 258 BUTTON_3 -key 259 BUTTON_4 -key 260 BUTTON_5 -key 261 BUTTON_6 -key 262 BUTTON_7 -key 263 BUTTON_8 -key 264 BUTTON_9 -key 265 BUTTON_10 -key 266 BUTTON_11 -key 267 BUTTON_12 -key 268 BUTTON_13 -key 269 BUTTON_14 -key 270 BUTTON_15 -key 271 BUTTON_16 - -key 288 BUTTON_1 -key 289 BUTTON_2 -key 290 BUTTON_3 -key 291 BUTTON_4 -key 292 BUTTON_5 -key 293 BUTTON_6 -key 294 BUTTON_7 -key 295 BUTTON_8 -key 296 BUTTON_9 -key 297 BUTTON_10 -key 298 BUTTON_11 -key 299 BUTTON_12 -key 300 BUTTON_13 -key 301 BUTTON_14 -key 302 BUTTON_15 -key 303 BUTTON_16 - - -key 304 BUTTON_A -key 305 BUTTON_B -key 306 BUTTON_C -key 307 BUTTON_X -key 308 BUTTON_Y -key 309 BUTTON_Z -key 310 BUTTON_L1 -key 311 BUTTON_R1 -key 312 BUTTON_L2 -key 313 BUTTON_R2 -key 314 BUTTON_SELECT -key 315 BUTTON_START -key 316 BUTTON_MODE -key 317 BUTTON_THUMBL -key 318 BUTTON_THUMBR - - -# key 352 "KEY_OK" -key 353 DPAD_CENTER -# key 354 "KEY_GOTO" -# key 355 "KEY_CLEAR" -# key 356 "KEY_POWER2" -# key 357 "KEY_OPTION" -# key 358 "KEY_INFO" -# key 359 "KEY_TIME" -# key 360 "KEY_VENDOR" -# key 361 "KEY_ARCHIVE" -key 362 GUIDE -# key 363 "KEY_CHANNEL" -# key 364 "KEY_FAVORITES" -# key 365 "KEY_EPG" -key 366 DVR -# key 367 "KEY_MHP" -# key 368 "KEY_LANGUAGE" -# key 369 "KEY_TITLE" -# key 370 "KEY_SUBTITLE" -# key 371 "KEY_ANGLE" -# key 372 "KEY_ZOOM" -# key 373 "KEY_MODE" -# key 374 "KEY_KEYBOARD" -# key 375 "KEY_SCREEN" -# key 376 "KEY_PC" -key 377 TV -# key 378 "KEY_TV2" -# key 379 "KEY_VCR" -# key 380 "KEY_VCR2" -# key 381 "KEY_SAT" -# key 382 "KEY_SAT2" -# key 383 "KEY_CD" -# key 384 "KEY_TAPE" -# key 385 "KEY_RADIO" -# key 386 "KEY_TUNER" -# key 387 "KEY_PLAYER" -# key 388 "KEY_TEXT" -# key 389 "KEY_DVD" -# key 390 "KEY_AUX" -# key 391 "KEY_MP3" -# key 392 "KEY_AUDIO" -# key 393 "KEY_VIDEO" -# key 394 "KEY_DIRECTORY" -# key 395 "KEY_LIST" -# key 396 "KEY_MEMO" -key 397 CALENDAR -# key 398 "KEY_RED" -# key 399 "KEY_GREEN" -# key 400 "KEY_YELLOW" -# key 401 "KEY_BLUE" -key 402 CHANNEL_UP -key 403 CHANNEL_DOWN -# key 404 "KEY_FIRST" -# key 405 "KEY_LAST" -# key 406 "KEY_AB" -# key 407 "KEY_NEXT" -# key 408 "KEY_RESTART" -# key 409 "KEY_SLOW" -# key 410 "KEY_SHUFFLE" -# key 411 "KEY_BREAK" -# key 412 "KEY_PREVIOUS" -# key 413 "KEY_DIGITS" -# key 414 "KEY_TEEN" -# key 415 "KEY_TWEN" - -key 429 CONTACTS - -# key 448 "KEY_DEL_EOL" -# key 449 "KEY_DEL_EOS" -# key 450 "KEY_INS_LINE" -# key 451 "KEY_DEL_LINE" - - -key 464 FUNCTION -key 465 ESCAPE FUNCTION -key 466 F1 FUNCTION -key 467 F2 FUNCTION -key 468 F3 FUNCTION -key 469 F4 FUNCTION -key 470 F5 FUNCTION -key 471 F6 FUNCTION -key 472 F7 FUNCTION -key 473 F8 FUNCTION -key 474 F9 FUNCTION -key 475 F10 FUNCTION -key 476 F11 FUNCTION -key 477 F12 FUNCTION -key 478 1 FUNCTION -key 479 2 FUNCTION -key 480 D FUNCTION -key 481 E FUNCTION -key 482 F FUNCTION -key 483 S FUNCTION -key 484 B FUNCTION - - -# key 497 KEY_BRL_DOT1 -# key 498 KEY_BRL_DOT2 -# key 499 KEY_BRL_DOT3 -# key 500 KEY_BRL_DOT4 -# key 501 KEY_BRL_DOT5 -# key 502 KEY_BRL_DOT6 -# key 503 KEY_BRL_DOT7 -# key 504 KEY_BRL_DOT8 - -key 580 APP_SWITCH -key 582 VOICE_ASSIST - -# Keys defined by HID usages -key usage 0x0c006F BRIGHTNESS_UP -key usage 0x0c0070 BRIGHTNESS_DOWN - -# Joystick and game controller axes. -# Axes that are not mapped will be assigned generic axis numbers by the input subsystem. -axis 0x00 X -axis 0x01 Y -axis 0x02 Z -axis 0x03 RX -axis 0x04 RY -axis 0x05 RZ -axis 0x06 THROTTLE -axis 0x07 RUDDER -axis 0x08 WHEEL -axis 0x09 GAS -axis 0x0a BRAKE -axis 0x10 HAT_X -axis 0x11 HAT_Y - -# LEDs -led 0x00 NUM_LOCK -led 0x01 CAPS_LOCK -led 0x02 SCROLL_LOCK -led 0x03 COMPOSE -led 0x04 KANA -led 0x05 SLEEP -led 0x06 SUSPEND -led 0x07 MUTE -led 0x08 MISC -led 0x09 MAIL -led 0x0a CHARGING diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index 7b2e21a40f8b..c71585f32155 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -896,6 +896,13 @@ public class VectorDrawable extends Drawable { return mVectorState.getNativeRenderer(); } + /** + * @hide + */ + public void setAntiAlias(boolean aa) { + nSetAntiAlias(mVectorState.mNativeTree.get(), aa); + } + static class VectorDrawableState extends ConstantState { // Variables below need to be copied (deep copy if applicable) for mutation. int[] mThemeAttrs; @@ -2269,6 +2276,8 @@ public class VectorDrawable extends Drawable { @FastNative private static native float nGetRootAlpha(long rendererPtr); @FastNative + private static native void nSetAntiAlias(long rendererPtr, boolean aa); + @FastNative private static native void nSetAllowCaching(long rendererPtr, boolean allowCaching); @FastNative diff --git a/keystore/java/android/security/AttestedKeyPair.java b/keystore/java/android/security/AttestedKeyPair.java new file mode 100644 index 000000000000..c6bff5c11a5d --- /dev/null +++ b/keystore/java/android/security/AttestedKeyPair.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2017 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 android.security; + +import java.security.KeyPair; +import java.security.cert.Certificate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * The {@code AttestedKeyPair} class contains a {@code KeyPair} instance of + * keys generated by Keystore and owned by KeyChain, as well as an attestation + * record for the key. + * + * <p>Such keys can be obtained by calling + * {@link android.app.admin.DevicePolicyManager#generateKeyPair}. + */ + +public final class AttestedKeyPair { + private final KeyPair mKeyPair; + private final Certificate[] mAttestationRecord; + + /** + * @hide Only created by the platform, no need to expose as public API. + */ + public AttestedKeyPair(KeyPair keyPair, Certificate[] attestationRecord) { + mKeyPair = keyPair; + mAttestationRecord = attestationRecord; + } + + /** + * Returns the generated key pair associated with the attestation record + * in this instance. + */ + public KeyPair getKeyPair() { + return mKeyPair; + } + + /** + * Returns the attestation record for the key pair in this instance. + * + * The attestation record is a chain of certificates. The leaf certificate links to the public + * key of this key pair and other properties of the key or the device. If the key is in secure + * hardware, and if the secure hardware supports attestation, the leaf certificate will be + * signed by a chain of certificates rooted at a trustworthy CA key. Otherwise the chain will be + * rooted at an untrusted certificate. + * + * The attestation record could be for properties of the key, or include device identifiers. + * + * See {@link android.security.keystore.KeyGenParameterSpec.Builder#setAttestationChallenge} + * and <a href="https://developer.android.com/training/articles/security-key-attestation.html"> + * Key Attestation</a> for the format of the attestation record inside the certificate. + */ + public List<Certificate> getAttestationRecord() { + if (mAttestationRecord == null) { + return new ArrayList(); + } + return Arrays.asList(mAttestationRecord); + } +} diff --git a/keystore/java/android/security/IKeyChainService.aidl b/keystore/java/android/security/IKeyChainService.aidl index 635432da7942..b4331b21cf13 100644 --- a/keystore/java/android/security/IKeyChainService.aidl +++ b/keystore/java/android/security/IKeyChainService.aidl @@ -16,6 +16,7 @@ package android.security; import android.content.pm.StringParceledListSlice; +import android.security.keystore.ParcelableKeyGenParameterSpec; /** * Caller is required to ensure that {@link KeyStore#unlock @@ -31,6 +32,8 @@ interface IKeyChainService { boolean isUserSelectable(String alias); void setUserSelectable(String alias, boolean isUserSelectable); + boolean generateKeyPair(in String algorithm, in ParcelableKeyGenParameterSpec spec); + // APIs used by CertInstaller and DevicePolicyManager String installCaCertificate(in byte[] caCertificate); diff --git a/keystore/java/android/security/keystore/ParcelableKeyGenParameterSpec.aidl b/keystore/java/android/security/keystore/ParcelableKeyGenParameterSpec.aidl new file mode 100644 index 000000000000..3fb7b4f99463 --- /dev/null +++ b/keystore/java/android/security/keystore/ParcelableKeyGenParameterSpec.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2017 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 android.security.keystore; + +parcelable ParcelableKeyGenParameterSpec; diff --git a/keystore/java/android/security/keystore/ParcelableKeyGenParameterSpec.java b/keystore/java/android/security/keystore/ParcelableKeyGenParameterSpec.java new file mode 100644 index 000000000000..b15e0a221c6f --- /dev/null +++ b/keystore/java/android/security/keystore/ParcelableKeyGenParameterSpec.java @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2017 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 android.security.keystore; + +import android.os.Parcelable; +import android.os.Parcel; + +import java.math.BigInteger; +import java.security.spec.AlgorithmParameterSpec; +import java.security.spec.ECGenParameterSpec; +import java.security.spec.RSAKeyGenParameterSpec; +import java.util.Date; + +import javax.security.auth.x500.X500Principal; + +/** + * A parcelable version of KeyGenParameterSpec + * @hide only used for communicating with the DPMS. + */ +public final class ParcelableKeyGenParameterSpec implements Parcelable { + private static final int ALGORITHM_PARAMETER_SPEC_NONE = 1; + private static final int ALGORITHM_PARAMETER_SPEC_RSA = 2; + private static final int ALGORITHM_PARAMETER_SPEC_EC = 3; + + private final KeyGenParameterSpec mSpec; + + public ParcelableKeyGenParameterSpec( + KeyGenParameterSpec spec) { + mSpec = spec; + } + + public int describeContents() { + return 0; + } + + private static void writeOptionalDate(Parcel out, Date date) { + if (date != null) { + out.writeBoolean(true); + out.writeLong(date.getTime()); + } else { + out.writeBoolean(false); + } + } + + public void writeToParcel(Parcel out, int flags) { + out.writeString(mSpec.getKeystoreAlias()); + out.writeInt(mSpec.getPurposes()); + out.writeInt(mSpec.getUid()); + out.writeInt(mSpec.getKeySize()); + + // Only needs to support RSAKeyGenParameterSpec and ECGenParameterSpec. + AlgorithmParameterSpec algoSpec = mSpec.getAlgorithmParameterSpec(); + if (algoSpec == null) { + out.writeInt(ALGORITHM_PARAMETER_SPEC_NONE); + } else if (algoSpec instanceof RSAKeyGenParameterSpec) { + RSAKeyGenParameterSpec rsaSpec = (RSAKeyGenParameterSpec) algoSpec; + out.writeInt(ALGORITHM_PARAMETER_SPEC_RSA); + out.writeInt(rsaSpec.getKeysize()); + out.writeByteArray(rsaSpec.getPublicExponent().toByteArray()); + } else if (algoSpec instanceof ECGenParameterSpec) { + ECGenParameterSpec ecSpec = (ECGenParameterSpec) algoSpec; + out.writeInt(ALGORITHM_PARAMETER_SPEC_EC); + out.writeString(ecSpec.getName()); + } else { + throw new IllegalArgumentException( + String.format("Unknown algorithm parameter spec: %s", algoSpec.getClass())); + } + out.writeByteArray(mSpec.getCertificateSubject().getEncoded()); + out.writeByteArray(mSpec.getCertificateSerialNumber().toByteArray()); + writeOptionalDate(out, mSpec.getCertificateNotBefore()); + writeOptionalDate(out, mSpec.getCertificateNotAfter()); + writeOptionalDate(out, mSpec.getKeyValidityStart()); + writeOptionalDate(out, mSpec.getKeyValidityForOriginationEnd()); + writeOptionalDate(out, mSpec.getKeyValidityForConsumptionEnd()); + out.writeStringArray(mSpec.getDigests()); + out.writeStringArray(mSpec.getEncryptionPaddings()); + out.writeStringArray(mSpec.getSignaturePaddings()); + out.writeStringArray(mSpec.getBlockModes()); + out.writeBoolean(mSpec.isRandomizedEncryptionRequired()); + out.writeBoolean(mSpec.isUserAuthenticationRequired()); + out.writeInt(mSpec.getUserAuthenticationValidityDurationSeconds()); + out.writeByteArray(mSpec.getAttestationChallenge()); + out.writeBoolean(mSpec.isUniqueIdIncluded()); + out.writeBoolean(mSpec.isUserAuthenticationValidWhileOnBody()); + out.writeBoolean(mSpec.isInvalidatedByBiometricEnrollment()); + } + + private static Date readDateOrNull(Parcel in) { + boolean hasDate = in.readBoolean(); + if (hasDate) { + return new Date(in.readLong()); + } else { + return null; + } + } + + private ParcelableKeyGenParameterSpec(Parcel in) { + String keystoreAlias = in.readString(); + int purposes = in.readInt(); + KeyGenParameterSpec.Builder builder = new KeyGenParameterSpec.Builder(keystoreAlias, purposes); + builder.setUid(in.readInt()); + builder.setKeySize(in.readInt()); + + int keySpecType = in.readInt(); + AlgorithmParameterSpec algorithmSpec = null; + if (keySpecType == ALGORITHM_PARAMETER_SPEC_NONE) { + algorithmSpec = null; + } else if (keySpecType == ALGORITHM_PARAMETER_SPEC_RSA) { + int rsaKeySize = in.readInt(); + BigInteger publicExponent = new BigInteger(in.createByteArray()); + algorithmSpec = new RSAKeyGenParameterSpec(rsaKeySize, publicExponent); + } else if (keySpecType == ALGORITHM_PARAMETER_SPEC_EC) { + String stdName = in.readString(); + algorithmSpec = new ECGenParameterSpec(stdName); + } else { + throw new IllegalArgumentException( + String.format("Unknown algorithm parameter spec: %d", algorithmSpec)); + } + builder.setAlgorithmParameterSpec(algorithmSpec); + builder.setCertificateSubject(new X500Principal(in.createByteArray())); + builder.setCertificateSerialNumber(new BigInteger(in.createByteArray())); + builder.setCertificateNotBefore(readDateOrNull(in)); + builder.setCertificateNotAfter(readDateOrNull(in)); + builder.setKeyValidityStart(readDateOrNull(in)); + builder.setKeyValidityForOriginationEnd(readDateOrNull(in)); + builder.setKeyValidityForConsumptionEnd(readDateOrNull(in)); + builder.setDigests(in.createStringArray()); + builder.setEncryptionPaddings(in.createStringArray()); + builder.setSignaturePaddings(in.createStringArray()); + builder.setBlockModes(in.createStringArray()); + builder.setRandomizedEncryptionRequired(in.readBoolean()); + builder.setUserAuthenticationRequired(in.readBoolean()); + builder.setUserAuthenticationValidityDurationSeconds(in.readInt()); + builder.setAttestationChallenge(in.createByteArray()); + builder.setUniqueIdIncluded(in.readBoolean()); + builder.setUserAuthenticationValidWhileOnBody(in.readBoolean()); + builder.setInvalidatedByBiometricEnrollment(in.readBoolean()); + mSpec = builder.build(); + } + + public static final Creator<ParcelableKeyGenParameterSpec> CREATOR = new Creator<ParcelableKeyGenParameterSpec>() { + @Override + public ParcelableKeyGenParameterSpec createFromParcel(Parcel in) { + return new ParcelableKeyGenParameterSpec(in); + } + + @Override + public ParcelableKeyGenParameterSpec[] newArray(int size) { + return new ParcelableKeyGenParameterSpec[size]; + } + }; + + public KeyGenParameterSpec getSpec() { + return mSpec; + } +} diff --git a/keystore/tests/Android.mk b/keystore/tests/Android.mk new file mode 100644 index 000000000000..51adde4d68af --- /dev/null +++ b/keystore/tests/Android.mk @@ -0,0 +1,34 @@ +# Copyright (C) 2017 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. + +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +# LOCAL_MODULE := keystore +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := $(call all-java-files-under, src) + +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-test \ + legacy-android-test + +LOCAL_PACKAGE_NAME := KeystoreTests + +LOCAL_JAVA_LIBRARIES := android.test.runner + +LOCAL_CERTIFICATE := platform + +include $(BUILD_PACKAGE) + diff --git a/keystore/tests/AndroidManifest.xml b/keystore/tests/AndroidManifest.xml new file mode 100644 index 000000000000..9bf2d0c761e6 --- /dev/null +++ b/keystore/tests/AndroidManifest.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 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. +--> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="android.security.tests"> + + <application> + <uses-library android:name="android.test.runner" /> + </application> + + <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + android:targetPackage="android.security.tests" + android:label="Tests for Keystore"> + </instrumentation> +</manifest> + diff --git a/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java b/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java new file mode 100644 index 000000000000..73b489f98e1d --- /dev/null +++ b/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java @@ -0,0 +1,180 @@ +/* + * Copyright (C) 2017 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 android.security; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; + +import android.os.Parcel; +import android.security.keystore.KeyGenParameterSpec; +import android.security.keystore.ParcelableKeyGenParameterSpec; +import android.security.keystore.KeyProperties; +import android.support.test.runner.AndroidJUnit4; +import java.math.BigInteger; +import java.security.spec.ECGenParameterSpec; +import java.security.spec.RSAKeyGenParameterSpec; +import java.util.Date; +import javax.security.auth.x500.X500Principal; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** Unit tests for {@link ParcelableKeyGenParameterSpec}. */ +@RunWith(AndroidJUnit4.class) +public final class ParcelableKeyGenParameterSpecTest { + static final String ALIAS = "keystore-alias"; + static final String ANOTHER_ALIAS = "another-keystore-alias"; + static final int KEY_PURPOSES = KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY; + static final int UID = 1230; + static final int KEYSIZE = 2048; + static final X500Principal SUBJECT = new X500Principal("CN=subject"); + static final BigInteger SERIAL = new BigInteger("1234567890"); + static final Date NOT_BEFORE = new Date(1511799590); + static final Date NOT_AFTER = new Date(1511899590); + static final Date KEY_VALIDITY_START = new Date(1511799591); + static final Date KEY_VALIDITY_FOR_ORIG_END = new Date(1511799593); + static final Date KEY_VALIDITY_FOR_CONSUMPTION_END = new Date(1511799594); + static final String DIGEST = KeyProperties.DIGEST_SHA256; + static final String ENCRYPTION_PADDING = KeyProperties.ENCRYPTION_PADDING_RSA_PKCS1; + static final String SIGNATURE_PADDING = KeyProperties.SIGNATURE_PADDING_RSA_PSS; + static final String BLOCK_MODE = KeyProperties.BLOCK_MODE_CBC; + static final int USER_AUTHENTICATION_DURATION = 300; + static final byte[] ATTESTATION_CHALLENGE = new byte[] {'c', 'h'}; + + KeyGenParameterSpec configureDefaultSpec() { + return new KeyGenParameterSpec.Builder(ALIAS, KEY_PURPOSES) + .setUid(UID) + .setKeySize(KEYSIZE) + .setCertificateSubject(SUBJECT) + .setCertificateSerialNumber(SERIAL) + .setCertificateNotBefore(NOT_BEFORE) + .setCertificateNotAfter(NOT_AFTER) + .setKeyValidityStart(KEY_VALIDITY_START) + .setKeyValidityForOriginationEnd(KEY_VALIDITY_FOR_ORIG_END) + .setKeyValidityForConsumptionEnd(KEY_VALIDITY_FOR_CONSUMPTION_END) + .setDigests(DIGEST) + .setEncryptionPaddings(ENCRYPTION_PADDING) + .setSignaturePaddings(SIGNATURE_PADDING) + .setBlockModes(BLOCK_MODE) + .setRandomizedEncryptionRequired(true) + .setUserAuthenticationRequired(true) + .setUserAuthenticationValidityDurationSeconds(USER_AUTHENTICATION_DURATION) + .setAttestationChallenge(ATTESTATION_CHALLENGE) + .setUniqueIdIncluded(true) + .setUserAuthenticationValidWhileOnBody(true) + .setInvalidatedByBiometricEnrollment(true) + .build(); + } + + void validateSpecValues(KeyGenParameterSpec spec, int uid, String alias) { + assertThat(spec.getKeystoreAlias(), is(alias)); + assertThat(spec.getPurposes(), is(KEY_PURPOSES)); + assertThat(spec.getUid(), is(uid)); + assertThat(spec.getKeySize(), is(KEYSIZE)); + assertThat(spec.getCertificateSubject(), is(SUBJECT)); + assertThat(spec.getCertificateSerialNumber(), is(SERIAL)); + assertThat(spec.getCertificateNotBefore(), is(NOT_BEFORE)); + assertThat(spec.getCertificateNotAfter(), is(NOT_AFTER)); + assertThat(spec.getKeyValidityStart(), is(KEY_VALIDITY_START)); + assertThat(spec.getKeyValidityForOriginationEnd(), is(KEY_VALIDITY_FOR_ORIG_END)); + assertThat(spec.getKeyValidityForConsumptionEnd(), is(KEY_VALIDITY_FOR_CONSUMPTION_END)); + assertThat(spec.getDigests(), is(new String[] {DIGEST})); + assertThat(spec.getEncryptionPaddings(), is(new String[] {ENCRYPTION_PADDING})); + assertThat(spec.getSignaturePaddings(), is(new String[] {SIGNATURE_PADDING})); + assertThat(spec.getBlockModes(), is(new String[] {BLOCK_MODE})); + assertThat(spec.isRandomizedEncryptionRequired(), is(true)); + assertThat(spec.isUserAuthenticationRequired(), is(true)); + assertThat( + spec.getUserAuthenticationValidityDurationSeconds(), + is(USER_AUTHENTICATION_DURATION)); + assertThat(spec.getAttestationChallenge(), is(ATTESTATION_CHALLENGE)); + assertThat(spec.isUniqueIdIncluded(), is(true)); + assertThat(spec.isUserAuthenticationValidWhileOnBody(), is(true)); + assertThat(spec.isInvalidatedByBiometricEnrollment(), is(true)); + } + + private Parcel parcelForReading(ParcelableKeyGenParameterSpec spec) { + Parcel parcel = Parcel.obtain(); + spec.writeToParcel(parcel, spec.describeContents()); + + parcel.setDataPosition(0); + return parcel; + } + + @Test + public void testParcelingWithAllValues() { + ParcelableKeyGenParameterSpec spec = + new ParcelableKeyGenParameterSpec(configureDefaultSpec()); + Parcel parcel = parcelForReading(spec); + ParcelableKeyGenParameterSpec fromParcel = + ParcelableKeyGenParameterSpec.CREATOR.createFromParcel(parcel); + validateSpecValues(fromParcel.getSpec(), UID, ALIAS); + assertThat(parcel.dataAvail(), is(0)); + } + + @Test + public void testParcelingWithNullValues() { + ParcelableKeyGenParameterSpec spec = new ParcelableKeyGenParameterSpec( + new KeyGenParameterSpec.Builder(ALIAS, KEY_PURPOSES).build()); + + Parcel parcel = parcelForReading(spec); + KeyGenParameterSpec fromParcel = ParcelableKeyGenParameterSpec.CREATOR + .createFromParcel(parcel) + .getSpec(); + assertThat(fromParcel.getKeystoreAlias(), is(ALIAS)); + assertThat(fromParcel.getPurposes(), is(KEY_PURPOSES)); + assertThat(fromParcel.getCertificateNotBefore(), is(new Date(0L))); + assertThat(fromParcel.getCertificateNotAfter(), is(new Date(2461449600000L))); + assertThat(parcel.dataAvail(), is(0)); + } + + @Test + public void testParcelingRSAAlgoParameter() { + RSAKeyGenParameterSpec rsaSpec = + new RSAKeyGenParameterSpec(2048, new BigInteger("5231123")); + ParcelableKeyGenParameterSpec spec = new ParcelableKeyGenParameterSpec( + new KeyGenParameterSpec.Builder(ALIAS, KEY_PURPOSES) + .setAlgorithmParameterSpec(rsaSpec) + .build()); + + Parcel parcel = parcelForReading(spec); + KeyGenParameterSpec fromParcel = + ParcelableKeyGenParameterSpec.CREATOR.createFromParcel(parcel).getSpec(); + RSAKeyGenParameterSpec parcelSpec = + (RSAKeyGenParameterSpec) fromParcel.getAlgorithmParameterSpec(); + // Compare individual fields as RSAKeyGenParameterSpec, on android, does not + // implement equals() + assertEquals(parcelSpec.getKeysize(), rsaSpec.getKeysize()); + assertEquals(parcelSpec.getPublicExponent(), rsaSpec.getPublicExponent()); + } + + @Test + public void testParcelingECAlgoParameter() { + ECGenParameterSpec ecSpec = new ECGenParameterSpec("P-256"); + ParcelableKeyGenParameterSpec spec = new ParcelableKeyGenParameterSpec( + new KeyGenParameterSpec.Builder(ALIAS, KEY_PURPOSES) + .setAlgorithmParameterSpec(ecSpec) + .build()); + Parcel parcel = parcelForReading(spec); + KeyGenParameterSpec fromParcel = + ParcelableKeyGenParameterSpec.CREATOR.createFromParcel(parcel).getSpec(); + // Compare individual fields as ECGenParameterSpec, on android, does not + // implement equals() + ECGenParameterSpec parcelSpec = (ECGenParameterSpec) fromParcel.getAlgorithmParameterSpec(); + assertEquals(parcelSpec.getName(), ecSpec.getName()); + } +} diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp index ce00488c9728..f118e8d0a53e 100644 --- a/libs/hwui/VectorDrawable.cpp +++ b/libs/hwui/VectorDrawable.cpp @@ -166,7 +166,7 @@ void FullPath::draw(SkCanvas* outCanvas, bool useStagingData) { if (needsFill) { paint.setStyle(SkPaint::Style::kFill_Style); - paint.setAntiAlias(true); + paint.setAntiAlias(mAntiAlias); outCanvas->drawPath(renderPath, paint); } @@ -182,7 +182,7 @@ void FullPath::draw(SkCanvas* outCanvas, bool useStagingData) { } if (needsStroke) { paint.setStyle(SkPaint::Style::kStroke_Style); - paint.setAntiAlias(true); + paint.setAntiAlias(mAntiAlias); paint.setStrokeJoin(SkPaint::Join(properties.getStrokeLineJoin())); paint.setStrokeCap(SkPaint::Cap(properties.getStrokeLineCap())); paint.setStrokeMiter(properties.getStrokeMiterLimit()); diff --git a/libs/hwui/VectorDrawable.h b/libs/hwui/VectorDrawable.h index 7f7560958022..d9cf8ab7eedf 100644 --- a/libs/hwui/VectorDrawable.h +++ b/libs/hwui/VectorDrawable.h @@ -124,6 +124,7 @@ public: virtual void onPropertyChanged(Properties* properties) = 0; virtual ~Node() {} virtual void syncProperties() = 0; + virtual void setAntiAlias(bool aa) = 0; protected: std::string mName; @@ -354,6 +355,7 @@ public: } } } + virtual void setAntiAlias(bool aa) { mAntiAlias = aa; } protected: const SkPath& getUpdatedPath(bool useStagingData, SkPath* tempStagingPath) override; @@ -365,6 +367,8 @@ private: // Intermediate data for drawing, render thread only SkPath mTrimmedSkPath; + // Default to use AntiAlias + bool mAntiAlias = true; }; class ANDROID_API ClipPath : public Path { @@ -373,6 +377,7 @@ public: ClipPath(const char* path, size_t strLength) : Path(path, strLength) {} ClipPath() : Path() {} void draw(SkCanvas* outCanvas, bool useStagingData) override; + virtual void setAntiAlias(bool aa) {} }; class ANDROID_API Group : public Node { @@ -476,6 +481,12 @@ public: } } + virtual void setAntiAlias(bool aa) { + for (auto& child : mChildren) { + child->setAntiAlias(aa); + } + } + private: GroupProperties mProperties = GroupProperties(this); GroupProperties mStagingProperties = GroupProperties(this); @@ -641,6 +652,8 @@ public: */ void updateCache(sp<skiapipeline::VectorDrawableAtlas>& atlas, GrContext* context); + void setAntiAlias(bool aa) { mRootNode->setAntiAlias(aa); } + private: class Cache { public: diff --git a/libs/hwui/tests/unit/VectorDrawableTests.cpp b/libs/hwui/tests/unit/VectorDrawableTests.cpp index a92cbfdf6757..e7496f707318 100644 --- a/libs/hwui/tests/unit/VectorDrawableTests.cpp +++ b/libs/hwui/tests/unit/VectorDrawableTests.cpp @@ -85,32 +85,8 @@ const static TestData sTestDataSet[] = { outPath->rCubicTo(8.0, 8.0, 8.0, 8.0, 8.0, 8.0); outPath->cubicTo(16.0, 16.0, 9.0, 9.0, 9.0, 9.0); outPath->rCubicTo(0.0, 0.0, 9.0, 9.0, 9.0, 9.0); - outPath->cubicTo(18.447775037328352, 20.404243860300607, 17.998389141249767, - 22.8911717921705, 16.737515350332117, 24.986664170401575); - outPath->cubicTo(15.476641559414468, 27.08215654863265, 13.489843598291483, - 28.644011882390082, 11.155893964798905, 29.37447073281729); - outPath->cubicTo(8.821944331306327, 30.1049295832445, 6.299226382436471, - 29.954422532383525, 4.0686829203897235, 28.951642951534332); - outPath->cubicTo(1.838139458342976, 27.94886337068514, 0.05113662931485696, - 26.161860541657013, -0.9516429515343354, 23.931317079610267); - outPath->cubicTo(-1.9544225323835278, 21.70077361756352, -2.1049295832444987, - 19.178055668693663, -1.37447073281729, 16.844106035201087); - outPath->cubicTo(-0.6440118823900814, 14.51015640170851, 0.9178434513673546, - 12.523358440585524, 3.0133358295984305, 11.262484649667876); - outPath->cubicTo(5.108828207829506, 10.001610858750228, 7.5957561396993984, - 9.552224962671648, 10.000000000000005, 10.0); - outPath->cubicTo(10.0, 7.348852265086975, 11.054287646850167, 4.803576729418881, - 12.928932188134523, 2.9289321881345254); - outPath->cubicTo(14.803576729418879, 1.0542876468501696, 17.348852265086972, - 4.870079381441987E-16, 19.999999999999996, 0.0); - outPath->cubicTo(22.65114773491302, -4.870079381441987E-16, 25.19642327058112, - 1.0542876468501678, 27.071067811865476, 2.9289321881345227); - outPath->cubicTo(28.94571235314983, 4.803576729418878, 30.0, 7.348852265086974, 30.0, - 9.999999999999998); - outPath->cubicTo(30.0, 12.651147734913023, 28.94571235314983, 15.19642327058112, - 27.071067811865476, 17.071067811865476); - outPath->cubicTo(25.19642327058112, 18.94571235314983, 22.651147734913028, 20.0, - 20.000000000000004, 20.0); + outPath->arcTo(10.0, 10.0, 0.0, SkPath::kLarge_ArcSize, SkPath::kCW_Direction, 10.0, 10.0); + outPath->arcTo(10.0, 10.0, 0.0, SkPath::kLarge_ArcSize, SkPath::kCW_Direction, 20.0, 20.0); }}, // Check box VectorDrawable path data @@ -181,22 +157,7 @@ const static TestData sTestDataSet[] = { }, [](SkPath* outPath) { outPath->moveTo(300.0, 70.0); - outPath->cubicTo(239.06697794203706, 70.13246340443499, 180.6164396449267, - 94.47383115953485, 137.6004913602211, 137.6302781499585); - outPath->cubicTo(94.58454307551551, 180.78672514038215, 70.43390412842275, - 239.3163266242308, 70.50013586976587, 300.2494566687817); - outPath->cubicTo(70.56636761110899, 361.1825867133326, 94.84418775550249, - 419.65954850554147, 137.9538527586204, 462.72238058830936); - outPath->cubicTo(181.06351776173827, 505.7852126710772, 239.5668339599056, - 529.999456521097, 300.49999999999994, 529.999456521097); - outPath->cubicTo(361.43316604009436, 529.999456521097, 419.93648223826176, - 505.78521267107726, 463.0461472413797, 462.7223805883093); - outPath->cubicTo(506.1558122444976, 419.65954850554135, 530.433632388891, - 361.1825867133324, 530.4998641302341, 300.2494566687815); - outPath->cubicTo(530.5660958715771, 239.31632662423056, 506.4154569244844, - 180.7867251403819, 463.3995086397787, 137.6302781499583); - outPath->cubicTo(420.383560355073, 94.47383115953468, 361.93302205796255, - 70.13246340443492, 300.9999999999996, 70.00000000000003); + outPath->arcTo(230.0, 230.0, 0.0, SkPath::kLarge_ArcSize, SkPath::kCCW_Direction, 301.0, 70.0); outPath->close(); outPath->moveTo(300.0, 70.0); }}, diff --git a/libs/hwui/utils/VectorDrawableUtils.cpp b/libs/hwui/utils/VectorDrawableUtils.cpp index 1931d646fa4a..6b8f3154dd36 100644 --- a/libs/hwui/utils/VectorDrawableUtils.cpp +++ b/libs/hwui/utils/VectorDrawableUtils.cpp @@ -96,132 +96,6 @@ void VectorDrawableUtils::interpolatePaths(PathData* outData, const PathData& fr } } -/** - * Converts an arc to cubic Bezier segments and records them in p. - * - * @param p The target for the cubic Bezier segments - * @param cx The x coordinate center of the ellipse - * @param cy The y coordinate center of the ellipse - * @param a The radius of the ellipse in the horizontal direction - * @param b The radius of the ellipse in the vertical direction - * @param e1x E(eta1) x coordinate of the starting point of the arc - * @param e1y E(eta2) y coordinate of the starting point of the arc - * @param theta The angle that the ellipse bounding rectangle makes with horizontal plane - * @param start The start angle of the arc on the ellipse - * @param sweep The angle (positive or negative) of the sweep of the arc on the ellipse - */ -static void arcToBezier(SkPath* p, double cx, double cy, double a, double b, double e1x, double e1y, - double theta, double start, double sweep) { - // Taken from equations at: http://spaceroots.org/documents/ellipse/node8.html - // and http://www.spaceroots.org/documents/ellipse/node22.html - - // Maximum of 45 degrees per cubic Bezier segment - int numSegments = ceil(fabs(sweep * 4 / M_PI)); - - double eta1 = start; - double cosTheta = cos(theta); - double sinTheta = sin(theta); - double cosEta1 = cos(eta1); - double sinEta1 = sin(eta1); - double ep1x = (-a * cosTheta * sinEta1) - (b * sinTheta * cosEta1); - double ep1y = (-a * sinTheta * sinEta1) + (b * cosTheta * cosEta1); - - double anglePerSegment = sweep / numSegments; - for (int i = 0; i < numSegments; i++) { - double eta2 = eta1 + anglePerSegment; - double sinEta2 = sin(eta2); - double cosEta2 = cos(eta2); - double e2x = cx + (a * cosTheta * cosEta2) - (b * sinTheta * sinEta2); - double e2y = cy + (a * sinTheta * cosEta2) + (b * cosTheta * sinEta2); - double ep2x = -a * cosTheta * sinEta2 - b * sinTheta * cosEta2; - double ep2y = -a * sinTheta * sinEta2 + b * cosTheta * cosEta2; - double tanDiff2 = tan((eta2 - eta1) / 2); - double alpha = sin(eta2 - eta1) * (sqrt(4 + (3 * tanDiff2 * tanDiff2)) - 1) / 3; - double q1x = e1x + alpha * ep1x; - double q1y = e1y + alpha * ep1y; - double q2x = e2x - alpha * ep2x; - double q2y = e2y - alpha * ep2y; - - p->cubicTo((float)q1x, (float)q1y, (float)q2x, (float)q2y, (float)e2x, (float)e2y); - eta1 = eta2; - e1x = e2x; - e1y = e2y; - ep1x = ep2x; - ep1y = ep2y; - } -} - -inline double toRadians(float theta) { - return theta * M_PI / 180; -} - -static void drawArc(SkPath* p, float x0, float y0, float x1, float y1, float a, float b, - float theta, bool isMoreThanHalf, bool isPositiveArc) { - /* Convert rotation angle from degrees to radians */ - double thetaD = toRadians(theta); - /* Pre-compute rotation matrix entries */ - double cosTheta = cos(thetaD); - double sinTheta = sin(thetaD); - /* Transform (x0, y0) and (x1, y1) into unit space */ - /* using (inverse) rotation, followed by (inverse) scale */ - double x0p = (x0 * cosTheta + y0 * sinTheta) / a; - double y0p = (-x0 * sinTheta + y0 * cosTheta) / b; - double x1p = (x1 * cosTheta + y1 * sinTheta) / a; - double y1p = (-x1 * sinTheta + y1 * cosTheta) / b; - - /* Compute differences and averages */ - double dx = x0p - x1p; - double dy = y0p - y1p; - double xm = (x0p + x1p) / 2; - double ym = (y0p + y1p) / 2; - /* Solve for intersecting unit circles */ - double dsq = dx * dx + dy * dy; - if (dsq == 0.0) { - VECTOR_DRAWABLE_LOGD("Points are coincident"); - return; /* Points are coincident */ - } - double disc = 1.0 / dsq - 1.0 / 4.0; - if (disc < 0.0) { - VECTOR_DRAWABLE_LOGD("Points are too far apart %f", dsq); - float adjust = (float)(sqrt(dsq) / 1.99999); - drawArc(p, x0, y0, x1, y1, a * adjust, b * adjust, theta, isMoreThanHalf, isPositiveArc); - return; /* Points are too far apart */ - } - double s = sqrt(disc); - double sdx = s * dx; - double sdy = s * dy; - double cx; - double cy; - if (isMoreThanHalf == isPositiveArc) { - cx = xm - sdy; - cy = ym + sdx; - } else { - cx = xm + sdy; - cy = ym - sdx; - } - - double eta0 = atan2((y0p - cy), (x0p - cx)); - - double eta1 = atan2((y1p - cy), (x1p - cx)); - - double sweep = (eta1 - eta0); - if (isPositiveArc != (sweep >= 0)) { - if (sweep > 0) { - sweep -= 2 * M_PI; - } else { - sweep += 2 * M_PI; - } - } - - cx *= a; - cy *= b; - double tcx = cx; - cx = cx * cosTheta - cy * sinTheta; - cy = tcx * sinTheta + cy * cosTheta; - - arcToBezier(p, cx, cy, a, b, x0, y0, thetaD, eta0, sweep); -} - // Use the given verb, and points in the range [start, end) to insert a command into the SkPath. void PathResolver::addCommand(SkPath* outPath, char previousCmd, char cmd, const std::vector<float>* points, size_t start, size_t end) { @@ -424,18 +298,20 @@ void PathResolver::addCommand(SkPath* outPath, char previousCmd, char cmd, break; case 'a': // Draws an elliptical arc // (rx ry x-axis-rotation large-arc-flag sweep-flag x y) - drawArc(outPath, currentX, currentY, points->at(k + 5) + currentX, - points->at(k + 6) + currentY, points->at(k + 0), points->at(k + 1), - points->at(k + 2), points->at(k + 3) != 0, points->at(k + 4) != 0); + outPath->arcTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), + (SkPath::ArcSize) (points->at(k + 3) != 0), + (SkPath::Direction) (points->at(k + 4) == 0), + points->at(k + 5) + currentX, points->at(k + 6) + currentY); currentX += points->at(k + 5); currentY += points->at(k + 6); ctrlPointX = currentX; ctrlPointY = currentY; break; case 'A': // Draws an elliptical arc - drawArc(outPath, currentX, currentY, points->at(k + 5), points->at(k + 6), - points->at(k + 0), points->at(k + 1), points->at(k + 2), - points->at(k + 3) != 0, points->at(k + 4) != 0); + outPath->arcTo(points->at(k + 0), points->at(k + 1), points->at(k + 2), + (SkPath::ArcSize) (points->at(k + 3) != 0), + (SkPath::Direction) (points->at(k + 4) == 0), + points->at(k + 5), points->at(k + 6)); currentX = points->at(k + 5); currentY = points->at(k + 6); ctrlPointX = currentX; diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 968f596e0cc5..d15ab33eed35 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -184,6 +184,17 @@ public class LocationManager { public static final String MODE_CHANGED_ACTION = "android.location.MODE_CHANGED"; /** + * Broadcast intent action when {@link android.provider.Settings.Secure#LOCATION_MODE} is + * about to be changed through Settings app or Quick Settings. + * For use with the {@link android.provider.Settings.Secure#LOCATION_MODE} API. + * If you're interacting with {@link #isProviderEnabled(String)}, use + * {@link #PROVIDERS_CHANGED_ACTION} instead. + * + * @hide + */ + public static final String MODE_CHANGING_ACTION = "com.android.settings.location.MODE_CHANGING"; + + /** * Broadcast intent action indicating that the GPS has either started or * stopped receiving GPS fixes. An intent extra provides this state as a * boolean, where {@code true} means that the GPS is actively receiving fixes. diff --git a/location/tests/locationtests/Android.mk b/location/tests/locationtests/Android.mk index 73b2bb51a868..44d290e41c16 100644 --- a/location/tests/locationtests/Android.mk +++ b/location/tests/locationtests/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE_TAGS := tests # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_PACKAGE_NAME := FrameworksLocationTests LOCAL_STATIC_JAVA_LIBRARIES := \ diff --git a/lowpan/tests/Android.mk b/lowpan/tests/Android.mk index bb0a944b5e7d..99499dcb2b66 100644 --- a/lowpan/tests/Android.mk +++ b/lowpan/tests/Android.mk @@ -56,6 +56,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \ android.test.runner \ + android.test.base \ LOCAL_PACKAGE_NAME := FrameworksLowpanApiTests LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/packages/EasterEgg/Android.mk b/packages/EasterEgg/Android.mk index d4c1e7094b99..a8255813985f 100644 --- a/packages/EasterEgg/Android.mk +++ b/packages/EasterEgg/Android.mk @@ -2,17 +2,23 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional + LOCAL_STATIC_JAVA_LIBRARIES := \ + jsr305 + +LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-v4 \ android-support-v13 \ android-support-dynamic-animation \ android-support-v7-recyclerview \ android-support-v7-preference \ android-support-v7-appcompat \ - android-support-v14-preference \ - jsr305 + android-support-v14-preference + +LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := EasterEgg LOCAL_CERTIFICATE := platform diff --git a/packages/InputDevices/res/values-in/strings.xml b/packages/InputDevices/res/values-in/strings.xml index 33b9ae35a122..f2409d4345dd 100644 --- a/packages/InputDevices/res/values-in/strings.xml +++ b/packages/InputDevices/res/values-in/strings.xml @@ -25,7 +25,7 @@ <string name="keyboard_layout_swedish" msgid="732959109088479351">"Swedia"</string> <string name="keyboard_layout_finnish" msgid="5585659438924315466">"Finlandia"</string> <string name="keyboard_layout_croatian" msgid="4172229471079281138">"Kroasia"</string> - <string name="keyboard_layout_czech" msgid="1349256901452975343">"Cheska"</string> + <string name="keyboard_layout_czech" msgid="1349256901452975343">"Ceko"</string> <string name="keyboard_layout_estonian" msgid="8775830985185665274">"Estonia"</string> <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"Hungaria"</string> <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"Islandia"</string> diff --git a/packages/Osu2/tests/Android.mk b/packages/Osu2/tests/Android.mk index 4b6e0e60652b..afc743d84249 100644 --- a/packages/Osu2/tests/Android.mk +++ b/packages/Osu2/tests/Android.mk @@ -20,7 +20,7 @@ LOCAL_CERTIFICATE := platform LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_JACK_FLAGS := --multi-dex native diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 49c5467d03e0..9d1c4ca8ec7e 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk @@ -21,6 +21,10 @@ LOCAL_STATIC_JAVA_LIBRARIES += \ LOCAL_STATIC_ANDROID_LIBRARIES += \ android-support-v4 \ apptoolkit-lifecycle-runtime \ + android-support-v7-recyclerview \ + android-support-v7-preference \ + android-support-v7-appcompat \ + android-support-v14-preference \ SettingsLib else LOCAL_RESOURCE_DIR += $(call my-dir)/res diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml index dd420b3c4315..ed0958c54282 100644 --- a/packages/SettingsLib/res/values-bs/strings.xml +++ b/packages/SettingsLib/res/values-bs/strings.xml @@ -225,7 +225,7 @@ <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaži opcije za certifikaciju Bežičnog prikaza"</string> <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Povećajte nivo Wi-Fi zapisivanja, pokazati po SSID RSSI Wi-Fi Picker"</string> <string name="wifi_aggressive_handover_summary" msgid="7266329646559808827">"Kada je omogućeno, Wi-Fi veza će u slučaju slabog signala agresivnije predavati vezu za prijenos podataka na mobilnu vezu"</string> - <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Dozvoli/Zabrani Wi-Fi lutajuće skeniranje na osnovu količine podatkovnog prometa prisutnog na sučelju"</string> + <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Dozvoli/Zabrani Wi-Fi lutajuće skeniranje na osnovu količine podatkovnog prometa prisutnog na interfejsu"</string> <string name="select_logd_size_title" msgid="7433137108348553508">"Veličine bafera za zapisnik"</string> <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Odaberite veličine za Logger prema međumemoriji evidencije"</string> <string name="dev_logpersist_clear_warning_title" msgid="684806692440237967">"Želite li izbrisati trajnu pohranu zapisivača?"</string> diff --git a/packages/SettingsLib/res/values-mr/strings.xml b/packages/SettingsLib/res/values-mr/strings.xml index aeb0ddbe1c4e..bb0a337d3cfb 100644 --- a/packages/SettingsLib/res/values-mr/strings.xml +++ b/packages/SettingsLib/res/values-mr/strings.xml @@ -97,7 +97,7 @@ <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"कनेक्ट केल्यावर पेअरींग तुमचे संपर्क आणि कॉल इतिहास यामध्ये अॅक्सेस देते."</string> <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> शी जोडू शकलो नाही."</string> <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"अयोग्य पिन किंवा पासकीमुळे <xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह जोडू शकलो नाही."</string> - <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> शी संप्रेषण करू शकत नाही."</string> + <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> शी संवाद प्रस्थापित करू शकत नाही."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे पेअरींग नाकारले."</string> <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"संगणक"</string> <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"हेडसेट"</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index eb338427b225..3c46d99906c7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -14,8 +14,10 @@ import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.Drawable; +import android.location.LocationManager; import android.net.ConnectivityManager; import android.os.BatteryManager; +import android.os.UserHandle; import android.os.UserManager; import android.print.PrintManager; import android.provider.Settings; @@ -26,6 +28,10 @@ import com.android.settingslib.drawable.UserIconDrawable; import java.text.NumberFormat; public class Utils { + + private static final String CURRENT_MODE_KEY = "CURRENT_MODE"; + private static final String NEW_MODE_KEY = "NEW_MODE"; + private static Signature[] sSystemSignature; private static String sPermissionControllerPackageName; private static String sServicesSystemSharedLibPackageName; @@ -39,6 +45,16 @@ public class Utils { com.android.internal.R.drawable.ic_wifi_signal_4 }; + public static boolean updateLocationMode(Context context, int oldMode, int newMode, int userId) { + Intent intent = new Intent(LocationManager.MODE_CHANGING_ACTION); + intent.putExtra(CURRENT_MODE_KEY, oldMode); + intent.putExtra(NEW_MODE_KEY, newMode); + context.sendBroadcastAsUser( + intent, UserHandle.of(userId), android.Manifest.permission.WRITE_SECURE_SETTINGS); + return Settings.Secure.putIntForUser( + context.getContentResolver(), Settings.Secure.LOCATION_MODE, newMode, userId); + } + /** * Return string resource that best describes combination of tethering * options available on this device. diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/DashboardCategory.java b/packages/SettingsLib/src/com/android/settingslib/drawer/DashboardCategory.java index a966e8244ba3..3a03644b6226 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/DashboardCategory.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/DashboardCategory.java @@ -75,23 +75,27 @@ public class DashboardCategory implements Parcelable { * Note: the returned list serves as a read-only list. If tiles needs to be added or removed * from the actual tiles list, it should be done through {@link #addTile}, {@link #removeTile}. */ - public List<Tile> getTiles() { - return Collections.unmodifiableList(mTiles); + public synchronized List<Tile> getTiles() { + final List<Tile> result = new ArrayList<>(mTiles.size()); + for (Tile tile : mTiles) { + result.add(tile); + } + return result; } - public void addTile(Tile tile) { + public synchronized void addTile(Tile tile) { mTiles.add(tile); } - public void addTile(int n, Tile tile) { + public synchronized void addTile(int n, Tile tile) { mTiles.add(n, tile); } - public void removeTile(Tile tile) { + public synchronized void removeTile(Tile tile) { mTiles.remove(tile); } - public void removeTile(int n) { + public synchronized void removeTile(int n) { mTiles.remove(n); } @@ -103,7 +107,7 @@ public class DashboardCategory implements Parcelable { return mTiles.get(n); } - public boolean containsComponent(ComponentName component) { + public synchronized boolean containsComponent(ComponentName component) { for (Tile tile : mTiles) { if (TextUtils.equals(tile.intent.getComponent().getClassName(), component.getClassName())) { @@ -129,7 +133,7 @@ public class DashboardCategory implements Parcelable { /** * Sort priority value and package name for tiles in this category. */ - public void sortTiles(String skipPackageName) { + public synchronized void sortTiles(String skipPackageName) { // Sort mTiles based on [priority, package within priority] Collections.sort(mTiles, (tile1, tile2) -> { final String package1 = tile1.intent.getComponent().getPackageName(); diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java new file mode 100644 index 000000000000..e3e27ce17c9a --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java @@ -0,0 +1,292 @@ +/* + * Copyright (C) 2017 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.settingslib.license; + +import android.support.annotation.VisibleForTesting; +import android.text.TextUtils; +import android.util.Log; +import android.util.Xml; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.zip.GZIPInputStream; + +/** + * The utility class that generate a license html file from xml files. + * All the HTML snippets and logic are copied from build/make/tools/generate-notice-files.py. + * + * TODO: Remove duplicate codes once backward support ends. + */ +class LicenseHtmlGeneratorFromXml { + private static final String TAG = "LicenseHtmlGeneratorFromXml"; + + private static final String TAG_ROOT = "licenses"; + private static final String TAG_FILE_NAME = "file-name"; + private static final String TAG_FILE_CONTENT = "file-content"; + private static final String ATTR_CONTENT_ID = "contentId"; + + private static final String HTML_HEAD_STRING = + "<html><head>\n" + + "<style type=\"text/css\">\n" + + "body { padding: 0; font-family: sans-serif; }\n" + + ".same-license { background-color: #eeeeee;\n" + + " border-top: 20px solid white;\n" + + " padding: 10px; }\n" + + ".label { font-weight: bold; }\n" + + ".file-list { margin-left: 1em; color: blue; }\n" + + "</style>\n" + + "</head>" + + "<body topmargin=\"0\" leftmargin=\"0\" rightmargin=\"0\" bottommargin=\"0\">\n" + + "<div class=\"toc\">\n" + + "<ul>"; + + private static final String HTML_MIDDLE_STRING = + "</ul>\n" + + "</div><!-- table of contents -->\n" + + "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">"; + + private static final String HTML_REAR_STRING = + "</table></body></html>"; + + private final List<File> mXmlFiles; + + /* + * A map from a file name to a content id (MD5 sum of file content) for its license. + * For example, "/system/priv-app/TeleService/TeleService.apk" maps to + * "9645f39e9db895a4aa6e02cb57294595". Here "9645f39e9db895a4aa6e02cb57294595" is a MD5 sum + * of the content of packages/services/Telephony/MODULE_LICENSE_APACHE2. + */ + private final Map<String, String> mFileNameToContentIdMap = new HashMap(); + + /* + * A map from a content id (MD5 sum of file content) to a license file content. + * For example, "9645f39e9db895a4aa6e02cb57294595" maps to the content string of + * packages/services/Telephony/MODULE_LICENSE_APACHE2. Here "9645f39e9db895a4aa6e02cb57294595" + * is a MD5 sum of the file content. + */ + private final Map<String, String> mContentIdToFileContentMap = new HashMap(); + + static class ContentIdAndFileNames { + final String mContentId; + final List<String> mFileNameList = new ArrayList(); + + ContentIdAndFileNames(String contentId) { + mContentId = contentId; + } + } + + private LicenseHtmlGeneratorFromXml(List<File> xmlFiles) { + mXmlFiles = xmlFiles; + } + + public static boolean generateHtml(List<File> xmlFiles, File outputFile) { + LicenseHtmlGeneratorFromXml genertor = new LicenseHtmlGeneratorFromXml(xmlFiles); + return genertor.generateHtml(outputFile); + } + + private boolean generateHtml(File outputFile) { + for (File xmlFile : mXmlFiles) { + parse(xmlFile); + } + + if (mFileNameToContentIdMap.isEmpty() || mContentIdToFileContentMap.isEmpty()) { + return false; + } + + PrintWriter writer = null; + try { + writer = new PrintWriter(outputFile); + + generateHtml(mFileNameToContentIdMap, mContentIdToFileContentMap, writer); + + writer.flush(); + writer.close(); + return true; + } catch (FileNotFoundException | SecurityException e) { + Log.e(TAG, "Failed to generate " + outputFile, e); + + if (writer != null) { + writer.close(); + } + return false; + } + } + + private void parse(File xmlFile) { + if (xmlFile == null || !xmlFile.exists() || xmlFile.length() == 0) { + return; + } + + InputStreamReader in = null; + try { + if (xmlFile.getName().endsWith(".gz")) { + in = new InputStreamReader(new GZIPInputStream(new FileInputStream(xmlFile))); + } else { + in = new FileReader(xmlFile); + } + + parse(in, mFileNameToContentIdMap, mContentIdToFileContentMap); + + in.close(); + } catch (XmlPullParserException | IOException e) { + Log.e(TAG, "Failed to parse " + xmlFile, e); + if (in != null) { + try { + in.close(); + } catch (IOException ie) { + Log.w(TAG, "Failed to close " + xmlFile); + } + } + } + } + + /* + * Parses an input stream and fills a map from a file name to a content id for its license + * and a map from a content id to a license file content. + * + * Following xml format is expected from the input stream. + * + * <licenses> + * <file-name contentId="content_id_of_license1">file1</file-name> + * <file-name contentId="content_id_of_license2">file2</file-name> + * ... + * <file-content contentId="content_id_of_license1">license1 file contents</file-content> + * <file-content contentId="content_id_of_license2">license2 file contents</file-content> + * ... + * </licenses> + */ + @VisibleForTesting + static void parse(InputStreamReader in, Map<String, String> outFileNameToContentIdMap, + Map<String, String> outContentIdToFileContentMap) + throws XmlPullParserException, IOException { + Map<String, String> fileNameToContentIdMap = new HashMap<String, String>(); + Map<String, String> contentIdToFileContentMap = new HashMap<String, String>(); + + XmlPullParser parser = Xml.newPullParser(); + parser.setInput(in); + parser.nextTag(); + + parser.require(XmlPullParser.START_TAG, "", TAG_ROOT); + + int state = parser.getEventType(); + while (state != XmlPullParser.END_DOCUMENT) { + if (state == XmlPullParser.START_TAG) { + if (TAG_FILE_NAME.equals(parser.getName())) { + String contentId = parser.getAttributeValue("", ATTR_CONTENT_ID); + if (!TextUtils.isEmpty(contentId)) { + String fileName = readText(parser).trim(); + if (!TextUtils.isEmpty(fileName)) { + fileNameToContentIdMap.put(fileName, contentId); + } + } + } else if (TAG_FILE_CONTENT.equals(parser.getName())) { + String contentId = parser.getAttributeValue("", ATTR_CONTENT_ID); + if (!TextUtils.isEmpty(contentId) + && !outContentIdToFileContentMap.containsKey(contentId) + && !contentIdToFileContentMap.containsKey(contentId)) { + String fileContent = readText(parser); + if (!TextUtils.isEmpty(fileContent)) { + contentIdToFileContentMap.put(contentId, fileContent); + } + } + } + } + + state = parser.next(); + } + outFileNameToContentIdMap.putAll(fileNameToContentIdMap); + outContentIdToFileContentMap.putAll(contentIdToFileContentMap); + } + + private static String readText(XmlPullParser parser) + throws IOException, XmlPullParserException { + StringBuffer result = new StringBuffer(); + int state = parser.next(); + while (state == XmlPullParser.TEXT) { + result.append(parser.getText()); + state = parser.next(); + } + return result.toString(); + } + + @VisibleForTesting + static void generateHtml(Map<String, String> fileNameToContentIdMap, + Map<String, String> contentIdToFileContentMap, PrintWriter writer) { + List<String> fileNameList = new ArrayList(); + fileNameList.addAll(fileNameToContentIdMap.keySet()); + Collections.sort(fileNameList); + + writer.println(HTML_HEAD_STRING); + + int count = 0; + Map<String, Integer> contentIdToOrderMap = new HashMap(); + List<ContentIdAndFileNames> contentIdAndFileNamesList = new ArrayList(); + + // Prints all the file list with a link to its license file content. + for (String fileName : fileNameList) { + String contentId = fileNameToContentIdMap.get(fileName); + // Assigns an id to a newly referred license file content. + if (!contentIdToOrderMap.containsKey(contentId)) { + contentIdToOrderMap.put(contentId, count); + + // An index in contentIdAndFileNamesList is the order of each element. + contentIdAndFileNamesList.add(new ContentIdAndFileNames(contentId)); + count++; + } + + int id = contentIdToOrderMap.get(contentId); + contentIdAndFileNamesList.get(id).mFileNameList.add(fileName); + writer.format("<li><a href=\"#id%d\">%s</a></li>\n", id, fileName); + } + + writer.println(HTML_MIDDLE_STRING); + + count = 0; + // Prints all contents of the license files in order of id. + for (ContentIdAndFileNames contentIdAndFileNames : contentIdAndFileNamesList) { + writer.format("<tr id=\"id%d\"><td class=\"same-license\">\n", count); + writer.println("<div class=\"label\">Notices for file(s):</div>"); + writer.println("<div class=\"file-list\">"); + for (String fileName : contentIdAndFileNames.mFileNameList) { + writer.format("%s <br/>\n", fileName); + } + writer.println("</div><!-- file-list -->"); + writer.println("<pre class=\"license-text\">"); + writer.println(contentIdToFileContentMap.get( + contentIdAndFileNames.mContentId)); + writer.println("</pre><!-- license-text -->"); + writer.println("</td></tr><!-- same-license -->"); + + count++; + } + + writer.println(HTML_REAR_STRING); + } +} diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java new file mode 100644 index 000000000000..a9fb20ca9e17 --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2017 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.settingslib.license; + +import android.content.Context; +import android.support.annotation.VisibleForTesting; +import android.util.Log; + +import com.android.settingslib.utils.AsyncLoader; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +/** + * LicenseHtmlLoader is a loader which loads a license html file from default license xml files. + */ +public class LicenseHtmlLoader extends AsyncLoader<File> { + private static final String TAG = "LicenseHtmlLoader"; + + private static final String[] DEFAULT_LICENSE_XML_PATHS = { + "/system/etc/NOTICE.xml.gz", + "/vendor/etc/NOTICE.xml.gz", + "/odm/etc/NOTICE.xml.gz", + "/oem/etc/NOTICE.xml.gz"}; + private static final String NOTICE_HTML_FILE_NAME = "NOTICE.html"; + + private Context mContext; + + public LicenseHtmlLoader(Context context) { + super(context); + mContext = context; + } + + @Override + public File loadInBackground() { + return generateHtmlFromDefaultXmlFiles(); + } + + @Override + protected void onDiscardResult(File f) { + } + + private File generateHtmlFromDefaultXmlFiles() { + final List<File> xmlFiles = getVaildXmlFiles(); + if (xmlFiles.isEmpty()) { + Log.e(TAG, "No notice file exists."); + return null; + } + + File cachedHtmlFile = getCachedHtmlFile(); + if (!isCachedHtmlFileOutdated(xmlFiles, cachedHtmlFile) + || generateHtmlFile(xmlFiles, cachedHtmlFile)) { + return cachedHtmlFile; + } + + return null; + } + + @VisibleForTesting + List<File> getVaildXmlFiles() { + final List<File> xmlFiles = new ArrayList(); + for (final String xmlPath : DEFAULT_LICENSE_XML_PATHS) { + File file = new File(xmlPath); + if (file.exists() && file.length() != 0) { + xmlFiles.add(file); + } + } + return xmlFiles; + } + + @VisibleForTesting + File getCachedHtmlFile() { + return new File(mContext.getCacheDir(), NOTICE_HTML_FILE_NAME); + } + + @VisibleForTesting + boolean isCachedHtmlFileOutdated(List<File> xmlFiles, File cachedHtmlFile) { + boolean outdated = true; + if (cachedHtmlFile.exists() && cachedHtmlFile.length() != 0) { + outdated = false; + for (File file : xmlFiles) { + if (cachedHtmlFile.lastModified() < file.lastModified()) { + outdated = true; + break; + } + } + } + return outdated; + } + + @VisibleForTesting + boolean generateHtmlFile(List<File> xmlFiles, File htmlFile) { + return LicenseHtmlGeneratorFromXml.generateHtml(xmlFiles, htmlFile); + } +} diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/AsyncLoader.java b/packages/SettingsLib/src/com/android/settingslib/utils/AsyncLoader.java new file mode 100644 index 000000000000..06770ac09558 --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/utils/AsyncLoader.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2017 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.settingslib.utils; + +import android.content.AsyncTaskLoader; +import android.content.Context; + +/** + * This class fills in some boilerplate for AsyncTaskLoader to actually load things. + * + * Subclasses need to implement {@link AsyncLoader#loadInBackground()} to perform the actual + * background task, and {@link AsyncLoader#onDiscardResult(T)} to clean up previously loaded + * results. + * + * This loader is based on the MailAsyncTaskLoader from the AOSP EmailUnified repo. + * + * @param <T> the data type to be loaded. + */ +public abstract class AsyncLoader<T> extends AsyncTaskLoader<T> { + private T mResult; + + public AsyncLoader(final Context context) { + super(context); + } + + @Override + protected void onStartLoading() { + if (mResult != null) { + deliverResult(mResult); + } + + if (takeContentChanged() || mResult == null) { + forceLoad(); + } + } + + @Override + protected void onStopLoading() { + cancelLoad(); + } + + @Override + public void deliverResult(final T data) { + if (isReset()) { + if (data != null) { + onDiscardResult(data); + } + return; + } + + final T oldResult = mResult; + mResult = data; + + if (isStarted()) { + super.deliverResult(data); + } + + if (oldResult != null && oldResult != mResult) { + onDiscardResult(oldResult); + } + } + + @Override + protected void onReset() { + super.onReset(); + + onStopLoading(); + + if (mResult != null) { + onDiscardResult(mResult); + } + mResult = null; + } + + @Override + public void onCanceled(final T data) { + super.onCanceled(data); + + if (data != null) { + onDiscardResult(data); + } + } + + /** + * Called when discarding the load results so subclasses can take care of clean-up or + * recycling tasks. This is not called if the same result (by way of pointer equality) is + * returned again by a subsequent call to loadInBackground, or if result is null. + * + * Note that this may be called concurrently with loadInBackground(), and in some circumstances + * may be called more than once for a given object. + * + * @param result The value returned from {@link AsyncLoader#loadInBackground()} which + * is to be discarded. + */ + protected abstract void onDiscardResult(T result); +} diff --git a/packages/SettingsLib/tests/integ/Android.mk b/packages/SettingsLib/tests/integ/Android.mk index 7ace048324c3..3c8c8acee9b1 100644 --- a/packages/SettingsLib/tests/integ/Android.mk +++ b/packages/SettingsLib/tests/integ/Android.mk @@ -27,6 +27,8 @@ LOCAL_JACK_FLAGS := --multi-dex native LOCAL_PACKAGE_NAME := SettingsLibTests LOCAL_COMPATIBILITY_SUITE := device-tests +LOCAL_USE_AAPT2 := true + LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ espresso-core \ diff --git a/packages/SettingsLib/tests/robotests/Android.mk b/packages/SettingsLib/tests/robotests/Android.mk index bc1a834535a6..273802754bbb 100644 --- a/packages/SettingsLib/tests/robotests/Android.mk +++ b/packages/SettingsLib/tests/robotests/Android.mk @@ -28,6 +28,8 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res +LOCAL_USE_AAPT2 := true + include frameworks/base/packages/SettingsLib/common.mk include $(BUILD_PACKAGE) diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java index c6cfdb80d851..976bbee64208 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java @@ -15,20 +15,45 @@ */ package com.android.settingslib; +import android.app.ActivityManager; +import android.content.ContentResolver; +import android.content.Context; +import android.content.Intent; +import android.location.LocationManager; +import android.os.UserHandle; +import android.provider.Settings; +import android.provider.Settings.Secure; +import android.text.TextUtils; +import java.util.HashMap; +import java.util.Map; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentMatcher; +import org.mockito.ArgumentMatchers; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import static android.Manifest.permission.WRITE_SECURE_SETTINGS; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.res.Resources; +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; +import org.robolectric.shadows.ShadowSettings; @RunWith(SettingsLibRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = {UtilsTest.ShadowSecure.class}) public class UtilsTest { private static final double[] TEST_PERCENTAGES = {0, 0.4, 0.5, 0.6, 49, 49.3, 49.8, 50, 100}; private static final String PERCENTAGE_0 = "0%"; @@ -37,6 +62,29 @@ public class UtilsTest { private static final String PERCENTAGE_50 = "50%"; private static final String PERCENTAGE_100 = "100%"; + private Context mContext; + + @Before + public void setUp() { + mContext = spy(RuntimeEnvironment.application); + ShadowSecure.reset(); + } + + @Test + public void testUpdateLocationMode_sendBroadcast() { + int currentUserId = ActivityManager.getCurrentUser(); + Utils.updateLocationMode( + mContext, + Secure.LOCATION_MODE_OFF, + Secure.LOCATION_MODE_HIGH_ACCURACY, + currentUserId); + + verify(mContext).sendBroadcastAsUser( + argThat(actionMatches(LocationManager.MODE_CHANGING_ACTION)), + ArgumentMatchers.eq(UserHandle.of(currentUserId)), + ArgumentMatchers.eq(WRITE_SECURE_SETTINGS)); + } + @Test public void testFormatPercentage_RoundTrue_RoundUpIfPossible() { final String[] expectedPercentages = {PERCENTAGE_0, PERCENTAGE_0, PERCENTAGE_1, @@ -74,4 +122,23 @@ public class UtilsTest { .thenReturn(60); assertThat(Utils.getDefaultStorageManagerDaysToRetain(resources)).isEqualTo(60); } + + private static ArgumentMatcher<Intent> actionMatches(String expected) { + return intent -> TextUtils.equals(expected, intent.getAction()); + } + + @Implements(value = Settings.Secure.class) + public static class ShadowSecure extends ShadowSettings.ShadowSecure { + private static Map<String, Integer> map = new HashMap<>(); + + @Implementation + public static boolean putIntForUser(ContentResolver cr, String name, int value, int userHandle) { + map.put(name, value); + return true; + } + + public static void reset() { + map.clear(); + } + } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java new file mode 100644 index 000000000000..c7e9262ec4d8 --- /dev/null +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2017 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.settingslib.license; + +import static com.google.common.truth.Truth.assertThat; + +import com.android.settingslib.TestConfig; +import com.android.settingslib.SettingsLibRobolectricTestRunner; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.annotation.Config; +import org.xmlpull.v1.XmlPullParserException; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.HashMap; +import java.util.Map; + +@RunWith(SettingsLibRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class LicenseHtmlGeneratorFromXmlTest { + private static final String VALILD_XML_STRING = + "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + + "<licenses>\n" + + "<file-name contentId=\"0\">/file0</file-name>\n" + + "<file-name contentId=\"0\">/file1</file-name>\n" + + "<file-content contentId=\"0\"><![CDATA[license content #0]]></file-content>\n" + + "</licenses>"; + + private static final String INVALILD_XML_STRING = + "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + + "<licenses2>\n" + + "<file-name contentId=\"0\">/file0</file-name>\n" + + "<file-name contentId=\"0\">/file1</file-name>\n" + + "<file-content contentId=\"0\"><![CDATA[license content #0]]></file-content>\n" + + "</licenses2>"; + + private static final String EXPECTED_HTML_STRING = + "<html><head>\n" + + "<style type=\"text/css\">\n" + + "body { padding: 0; font-family: sans-serif; }\n" + + ".same-license { background-color: #eeeeee;\n" + + " border-top: 20px solid white;\n" + + " padding: 10px; }\n" + + ".label { font-weight: bold; }\n" + + ".file-list { margin-left: 1em; color: blue; }\n" + + "</style>\n" + + "</head>" + + "<body topmargin=\"0\" leftmargin=\"0\" rightmargin=\"0\" bottommargin=\"0\">\n" + + "<div class=\"toc\">\n" + + "<ul>\n" + + "<li><a href=\"#id0\">/file0</a></li>\n" + + "<li><a href=\"#id0\">/file1</a></li>\n" + + "</ul>\n" + + "</div><!-- table of contents -->\n" + + "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n" + + "<tr id=\"id0\"><td class=\"same-license\">\n" + + "<div class=\"label\">Notices for file(s):</div>\n" + + "<div class=\"file-list\">\n" + + "/file0 <br/>\n" + + "/file1 <br/>\n" + + "</div><!-- file-list -->\n" + + "<pre class=\"license-text\">\n" + + "license content #0\n" + + "</pre><!-- license-text -->\n" + + "</td></tr><!-- same-license -->\n" + + "</table></body></html>\n"; + + @Test + public void testParseValidXmlStream() throws XmlPullParserException, IOException { + Map<String, String> fileNameToContentIdMap = new HashMap<String, String>(); + Map<String, String> contentIdToFileContentMap = new HashMap<String, String>(); + + LicenseHtmlGeneratorFromXml.parse( + new InputStreamReader(new ByteArrayInputStream(VALILD_XML_STRING.getBytes())), + fileNameToContentIdMap, contentIdToFileContentMap); + assertThat(fileNameToContentIdMap.size()).isEqualTo(2); + assertThat(fileNameToContentIdMap.get("/file0")).isEqualTo("0"); + assertThat(fileNameToContentIdMap.get("/file1")).isEqualTo("0"); + assertThat(contentIdToFileContentMap.size()).isEqualTo(1); + assertThat(contentIdToFileContentMap.get("0")).isEqualTo("license content #0"); + } + + @Test(expected = XmlPullParserException.class) + public void testParseInvalidXmlStream() throws XmlPullParserException, IOException { + Map<String, String> fileNameToContentIdMap = new HashMap<String, String>(); + Map<String, String> contentIdToFileContentMap = new HashMap<String, String>(); + + LicenseHtmlGeneratorFromXml.parse( + new InputStreamReader(new ByteArrayInputStream(INVALILD_XML_STRING.getBytes())), + fileNameToContentIdMap, contentIdToFileContentMap); + } + + @Test + public void testGenerateHtml() { + Map<String, String> fileNameToContentIdMap = new HashMap<String, String>(); + Map<String, String> contentIdToFileContentMap = new HashMap<String, String>(); + + fileNameToContentIdMap.put("/file0", "0"); + fileNameToContentIdMap.put("/file1", "0"); + contentIdToFileContentMap.put("0", "license content #0"); + + StringWriter output = new StringWriter(); + LicenseHtmlGeneratorFromXml.generateHtml( + fileNameToContentIdMap, contentIdToFileContentMap, new PrintWriter(output)); + assertThat(output.toString()).isEqualTo(EXPECTED_HTML_STRING); + } +} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java new file mode 100644 index 000000000000..1a6f30c49e46 --- /dev/null +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2017 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.settingslib.license; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + +import android.content.Context; + +import com.android.settingslib.TestConfig; +import com.android.settingslib.SettingsLibRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.annotation.Config; + +import java.io.File; +import java.util.ArrayList; + +@RunWith(SettingsLibRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class LicenseHtmlLoaderTest { + @Mock + private Context mContext; + + LicenseHtmlLoader newLicenseHtmlLoader(ArrayList<File> xmlFiles, + File cachedHtmlFile, boolean isCachedHtmlFileOutdated, + boolean generateHtmlFileSucceeded) { + LicenseHtmlLoader loader = spy(new LicenseHtmlLoader(mContext)); + doReturn(xmlFiles).when(loader).getVaildXmlFiles(); + doReturn(cachedHtmlFile).when(loader).getCachedHtmlFile(); + doReturn(isCachedHtmlFileOutdated).when(loader).isCachedHtmlFileOutdated(any(), any()); + doReturn(generateHtmlFileSucceeded).when(loader).generateHtmlFile(any(), any()); + return loader; + } + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + } + + @Test + public void testLoadInBackground() { + ArrayList<File> xmlFiles = new ArrayList(); + xmlFiles.add(new File("test.xml")); + File cachedHtmlFile = new File("test.html"); + + LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, true, true); + + assertThat(loader.loadInBackground()).isEqualTo(cachedHtmlFile); + verify(loader).generateHtmlFile(any(), any()); + } + + @Test + public void testLoadInBackgroundWithNoVaildXmlFiles() { + ArrayList<File> xmlFiles = new ArrayList(); + File cachedHtmlFile = new File("test.html"); + + LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, true, true); + + assertThat(loader.loadInBackground()).isNull(); + verify(loader, never()).generateHtmlFile(any(), any()); + } + + @Test + public void testLoadInBackgroundWithNonOutdatedCachedHtmlFile() { + ArrayList<File> xmlFiles = new ArrayList(); + xmlFiles.add(new File("test.xml")); + File cachedHtmlFile = new File("test.html"); + + LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, false, true); + + assertThat(loader.loadInBackground()).isEqualTo(cachedHtmlFile); + verify(loader, never()).generateHtmlFile(any(), any()); + } + + @Test + public void testLoadInBackgroundWithGenerateHtmlFileFailed() { + ArrayList<File> xmlFiles = new ArrayList(); + xmlFiles.add(new File("test.xml")); + File cachedHtmlFile = new File("test.html"); + + LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, true, false); + + assertThat(loader.loadInBackground()).isNull(); + verify(loader).generateHtmlFile(any(), any()); + } +} diff --git a/packages/SettingsProvider/test/Android.mk b/packages/SettingsProvider/test/Android.mk index a9707d4ae69b..902f1c7ed388 100644 --- a/packages/SettingsProvider/test/Android.mk +++ b/packages/SettingsProvider/test/Android.mk @@ -12,7 +12,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test -LOCAL_JAVA_LIBRARIES := legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.base LOCAL_PACKAGE_NAME := SettingsProviderTest diff --git a/packages/Shell/res/values-fa/strings.xml b/packages/Shell/res/values-fa/strings.xml index 75e7760b2628..d4bb3c6dc1f5 100644 --- a/packages/Shell/res/values-fa/strings.xml +++ b/packages/Shell/res/values-fa/strings.xml @@ -23,8 +23,8 @@ <string name="bugreport_updating_title" msgid="4423539949559634214">"اضافه کردن جزئیات به گزارش اشکال"</string> <string name="bugreport_updating_wait" msgid="3322151947853929470">"لطفاً منتظر بمانید..."</string> <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"گزارش مشکل بهزودی در تلفن نشان داده میشود"</string> - <string name="bugreport_finished_text" product="tv" msgid="5758325479058638893">"برای به اشتراک گذاشتن گزارش اشکالتان، انتخاب کنید"</string> - <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"برای به اشتراک گذاشتن گزارش اشکال، ضربه بزنید"</string> + <string name="bugreport_finished_text" product="tv" msgid="5758325479058638893">"برای همرسانی گزارش اشکالتان، انتخاب کنید"</string> + <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"برای همرسانی گزارش اشکال، ضربه بزنید"</string> <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"انتخاب کنید تا گزارش اشکالتان بدون عکس صفحهنمایش به اشتراک گذاشته شود یا منتظر بمانید گرفتن عکس از صفحهنمایش تمام شود"</string> <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"برای اشتراکگذاری گزارش مشکل بدون عکس صفحهنمایش، ضربه بزنید یا صبر کنید تا عکس صفحهنمایش گرفته شود."</string> <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"برای اشتراکگذاری گزارش مشکل بدون عکس صفحهنمایش، ضربه بزنید یا صبر کنید تا عکس صفحهنمایش گرفته شود."</string> diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags index 8cc2ce260066..5b8881c1f946 100644 --- a/packages/SystemUI/proguard.flags +++ b/packages/SystemUI/proguard.flags @@ -15,6 +15,7 @@ -keep class com.android.systemui.statusbar.tv.TvStatusBar -keep class com.android.systemui.car.CarSystemUIFactory -keep class com.android.systemui.SystemUIFactory +-keep class * extends com.android.systemui.SystemUI -keepclassmembers class ** { public void onBusEvent(**); diff --git a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml index 4f6fcb956f0a..70d13e67145f 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml @@ -59,8 +59,8 @@ <string name="kg_wrong_password" msgid="4580683060277329277">"Palavra-passe incorreta"</string> <string name="kg_wrong_pin" msgid="4785660766909463466">"PIN incorreto"</string> <plurals name="kg_too_many_failed_attempts_countdown" formatted="false" msgid="4368805541257003755"> - <item quantity="one">Tente novamente dentro de 1 segundo.</item> <item quantity="other">Tente novamente dentro de <xliff:g id="NUMBER">%d</xliff:g> segundos.</item> + <item quantity="one">Tente novamente dentro de 1 segundo.</item> </plurals> <string name="kg_pattern_instructions" msgid="5547646893001491340">"Desenhe o seu padrão"</string> <string name="kg_sim_pin_instructions" msgid="6389000973113699187">"Introduza o PIN do cartão SIM."</string> @@ -97,13 +97,13 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="8364140853305528449">"Desenhou a sequência de desbloqueio incorretamente <xliff:g id="NUMBER_0">%1$d</xliff:g> vezes. Após mais <xliff:g id="NUMBER_1">%2$d</xliff:g> tentativas sem êxito, ser-lhe-á pedido para desbloquear o telemóvel através de uma conta de email.\n\n Tente novamente dentro de <xliff:g id="NUMBER_2">%3$d</xliff:g> segundos."</string> <string name="kg_password_wrong_pin_code_pukked" msgid="3389829202093674267">"Código PIN do cartão SIM incorreto. Tem de contactar o seu operador para desbloquear o dispositivo."</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="4314341367727055967"> - <item quantity="one">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de precisar de contactar o seu operador para desbloquear o dispositivo.</item> <item quantity="other">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas.</item> + <item quantity="one">Código PIN do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de precisar de contactar o seu operador para desbloquear o dispositivo.</item> </plurals> <string name="kg_password_wrong_puk_code_dead" msgid="3329017604125179374">"Cartão SIM inutilizável. Contacte o seu operador."</string> <plurals name="kg_password_wrong_puk_code" formatted="false" msgid="2287504898931957513"> - <item quantity="one">Código PUK do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de o cartão SIM ficar permanentemente inutilizável.</item> <item quantity="other">Código PUK do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas antes de o cartão SIM ficar permanentemente inutilizável.</item> + <item quantity="one">Código PUK do cartão SIM incorreto. Tem mais <xliff:g id="NUMBER_0">%d</xliff:g> tentativa antes de o cartão SIM ficar permanentemente inutilizável.</item> </plurals> <string name="kg_password_pin_failed" msgid="8769990811451236223">"Falha ao introduzir o PIN do cartão SIM!"</string> <string name="kg_password_puk_failed" msgid="1331621440873439974">"Falha ao introduzir o PUK do cartão SIM!"</string> @@ -123,16 +123,16 @@ <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"Dispositivo bloqueado pelo gestor"</string> <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"O dispositivo foi bloqueado manualmente"</string> <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="71299470072448533"> - <item quantity="one">O dispositivo não é desbloqueado há <xliff:g id="NUMBER_0">%d</xliff:g> hora. Confirme o padrão.</item> <item quantity="other">O dispositivo não é desbloqueado há <xliff:g id="NUMBER_1">%d</xliff:g> horas. Confirme o padrão.</item> + <item quantity="one">O dispositivo não é desbloqueado há <xliff:g id="NUMBER_0">%d</xliff:g> hora. Confirme o padrão.</item> </plurals> <plurals name="kg_prompt_reason_time_pin" formatted="false" msgid="34586942088144385"> - <item quantity="one">O dispositivo não é desbloqueado há <xliff:g id="NUMBER_0">%d</xliff:g> hora. Confirme o PIN.</item> <item quantity="other">O dispositivo não é desbloqueado há <xliff:g id="NUMBER_1">%d</xliff:g> horas. Confirme o PIN.</item> + <item quantity="one">O dispositivo não é desbloqueado há <xliff:g id="NUMBER_0">%d</xliff:g> hora. Confirme o PIN.</item> </plurals> <plurals name="kg_prompt_reason_time_password" formatted="false" msgid="257297696215346527"> - <item quantity="one">O dispositivo não é desbloqueado há <xliff:g id="NUMBER_0">%d</xliff:g> hora. Confirme a palavra-passe.</item> <item quantity="other">O dispositivo não é desbloqueado há <xliff:g id="NUMBER_1">%d</xliff:g> horas. Confirme a palavra-passe.</item> + <item quantity="one">O dispositivo não é desbloqueado há <xliff:g id="NUMBER_0">%d</xliff:g> hora. Confirme a palavra-passe.</item> </plurals> <string name="fingerprint_not_recognized" msgid="348813995267914625">"Não reconhecido"</string> </resources> diff --git a/packages/SystemUI/res-keyguard/values/strings.xml b/packages/SystemUI/res-keyguard/values/strings.xml index 3dd0e6c222f7..3a41681f53e9 100644 --- a/packages/SystemUI/res-keyguard/values/strings.xml +++ b/packages/SystemUI/res-keyguard/values/strings.xml @@ -367,4 +367,20 @@ <!-- Fingerprint hint message when finger was not recognized.--> <string name="fingerprint_not_recognized">Not recognized</string> + <!-- Instructions telling the user remaining times when enter SIM PIN view. --> + <plurals name="kg_password_default_pin_message"> + <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining +attempt before you must contact your carrier to unlock your device.</item> + <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining +attempts.</item> + </plurals> + + <!-- Instructions telling the user remaining times when enter SIM PUK view. --> + <plurals name="kg_password_default_puk_message"> + <item quantity="one">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id=" +number">%d</xliff:g> remaining attempt before SIM becomes permanently unusable. Contact carrier for details.</item> + <item quantity="other">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id=" +number">%d</xliff:g> remaining attempts before SIM becomes permanently unusable. Contact carrier for details.</item> + </plurals> + </resources> diff --git a/packages/SystemUI/res/drawable/instant_icon.xml b/packages/SystemUI/res/drawable/instant_icon.xml index 0039c8111f12..8554daa05078 100644 --- a/packages/SystemUI/res/drawable/instant_icon.xml +++ b/packages/SystemUI/res/drawable/instant_icon.xml @@ -14,17 +14,13 @@ limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="40dp" - android:height="40dp" - android:viewportWidth="2.2" - android:viewportHeight="2.2"> + android:height="24dp" + android:width="24dp" + android:viewportHeight="48" + android:viewportWidth="48"> <path android:fillColor="#FFFFFFFF" - android:pathData="M.1,1.1 - c0,.55 .45,1 1,1 - c.55,0 1,-.45 1,-1 - c0,-.55 -.45,-1 -1,-1 - c-.55,0 -1,.45 -1,1z - M1.15,.95 l.5,0 l-.7,1 l0.1,-.7 l-.5,0 l.7,-1 z"/> -</vector> + android:pathData="M35.8,18.9l-9.8,0.1l0.2,-19l-14.1,29.3l9.9,0l0,18.7z" /> + +</vector>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index fac254a0083a..f5637944e72e 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.systemui.HardwareUiLayout +<com.android.systemui.volume.VolumeUiLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" @@ -21,18 +21,19 @@ android:clipChildren="false" > <RelativeLayout android:id="@+id/volume_dialog" - android:layout_width="@dimen/volume_dialog_panel_width" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical|end" android:paddingTop="@dimen/volume_row_padding_bottom" - android:layout_margin="12dp" - android:background="?android:attr/actionBarItemBackground" - android:translationZ="8dp" > + android:background="@drawable/rounded_full_bg_bottom" + android:translationZ="8dp" + android:clipChildren="false" > <LinearLayout android:id="@+id/volume_dialog_content" android:layout_width="match_parent" android:layout_height="wrap_content" + android:clipChildren="false" + android:clipToPadding="false" android:orientation="vertical" > <LinearLayout @@ -42,7 +43,55 @@ android:orientation="vertical" > <!-- volume rows added and removed here! :-) --> </LinearLayout> - </LinearLayout> + <!-- special row for ringer mode --> + <RelativeLayout + android:id="@+id/ringer_mode" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/rounded_bg_full" + android:clipChildren="false" + android:clipToPadding="false" + android:layout_margin="10dp"> + + <com.android.keyguard.AlphaOptimizedImageButton + android:id="@+id/ringer_icon" + style="@style/VolumeButtons" + android:background="?android:selectableItemBackgroundBorderless" + android:layout_width="@dimen/volume_button_size" + android:layout_height="@dimen/volume_button_size" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:soundEffectsEnabled="false" /> + + <TextView + android:id="@+id/ringer_title" + android:text="@string/stream_ring" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="1" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:layout_toEndOf="@+id/ringer_icon" + android:layout_marginStart="64dp" + android:textColor="?android:attr/colorControlNormal" + android:textAppearance="?android:attr/textAppearanceSmall" + android:paddingStart="@dimen/volume_row_header_padding_start" /> + + <TextView + android:id="@+id/ringer_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:layout_marginEnd="14dp" + android:maxLines="1" + android:textColor="?android:attr/colorControlNormal" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + </RelativeLayout> + </LinearLayout> </RelativeLayout> -</com.android.systemui.HardwareUiLayout> +</com.android.systemui.volume.VolumeUiLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index 581ac735887f..577077929352 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -34,14 +34,14 @@ <string name="status_bar_latest_events_title" msgid="6594767438577593172">"বিজ্ঞপ্তিগুলি"</string> <string name="battery_low_title" msgid="6456385927409742437">"ব্যাটারি কম"</string> <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> অবশিষ্ট আছে"</string> - <string name="battery_low_percent_format_saver_started" msgid="6859235584035338833">"<xliff:g id="PERCENTAGE">%s</xliff:g> অবশিষ্ট আছে৷ ব্যাটারি সাশ্রয়কারী চালু আছে৷"</string> + <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> অবশিষ্ট আছে। ব্যাটারি সেভার চালু আছে।"</string> <string name="invalid_charger" msgid="4549105996740522523">"USB চার্জিং সমর্থিত নয়৷\nকেবলমাত্র সরবহারকৃত চার্জার ব্যবহার করুন৷"</string> <string name="invalid_charger_title" msgid="3515740382572798460">"USB চার্জিং সমর্থিত নয়।"</string> <string name="invalid_charger_text" msgid="5474997287953892710">"শুধুমাত্র সরবরাহকৃত চার্জার ব্যবহার করুন।"</string> <string name="battery_low_why" msgid="4553600287639198111">"সেটিংস"</string> - <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"ব্যাটারি সঞ্চয়কারী চালু করবেন?"</string> + <string name="battery_saver_confirmation_title" msgid="2052100465684817154">"ব্যাটারি সেভার চালু করবেন?"</string> <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"চালু করুন"</string> - <string name="battery_saver_start_action" msgid="5576697451677486320">"ব্যাটারি সঞ্চয়কারী চালু"</string> + <string name="battery_saver_start_action" msgid="8187820911065797519">"ব্যাটারি সেভার চালু করুন"</string> <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"সেটিংস"</string> <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"ওয়াই-ফাই"</string> <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"স্বতঃ-ঘূর্ণায়মান স্ক্রিন"</string> @@ -243,8 +243,6 @@ <string name="data_usage_disabled_dialog_title" msgid="3932437232199671967">"ডেট বিরতি দেওয়া হয়েছে"</string> <string name="data_usage_disabled_dialog" msgid="4919541636934603816">"আপনার সেট করা ডেটার সীমা ফুরিয়ে গেছে। আপনি এখন আর মোবাইল ডেটা ব্যবহার করতে পারবেন না।\n\nযদি আপনি আবার শুরু করেন, ডেটা ব্যবহারের জন্য মূল্য প্রযোজ্য হতে পারে।"</string> <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"পুনঃসূচনা করুন"</string> - <string name="status_bar_settings_signal_meter_disconnected" msgid="1940231521274147771">"কোনো ইন্টারনেট সংযোগ নেই"</string> - <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"ওয়াই-ফাই সংযুক্ত হয়েছে"</string> <string name="gps_notification_searching_text" msgid="8574247005642736060">"GPS এর জন্য অনুসন্ধান করা হচ্ছে"</string> <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS এর দ্বারা সেট করা অবস্থান"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"অবস্থান অনুরোধ সক্রিয় রয়েছে"</string> @@ -401,9 +399,9 @@ <string name="user_remove_user_title" msgid="4681256956076895559">"ব্যবহারকারী সরাবেন?"</string> <string name="user_remove_user_message" msgid="1453218013959498039">"এই ব্যবহারকারীর সমস্ত অ্যাপ্লিকেশান ও ডেটা মুছে ফেলা হবে।"</string> <string name="user_remove_user_remove" msgid="7479275741742178297">"সরান"</string> - <string name="battery_saver_notification_title" msgid="237918726750955859">"ব্যাটারি সেভার চালু রয়েছে"</string> + <string name="battery_saver_notification_title" msgid="8614079794522291840">"ব্যাটারি সেভার চালু আছে"</string> <string name="battery_saver_notification_text" msgid="820318788126672692">"কার্য-সম্পাদনা ও পশ্চাদপট ডেটাকে কমিয়ে দেয়"</string> - <string name="battery_saver_notification_action_text" msgid="109158658238110382">"ব্যাটারি সঞ্চয়কারী বন্ধ করুন"</string> + <string name="battery_saver_notification_action_text" msgid="132118784269455533">"ব্যাটারি সেভার বন্ধ করুন"</string> <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> আপনার স্ক্রীনে দেখানো সব কিছু ক্যাপচার করা শুরু করবে।"</string> <string name="media_projection_remember_text" msgid="3103510882172746752">"আর দেখাবেন না"</string> <string name="clear_all_notifications_text" msgid="814192889771462828">"সবকিছু সাফ করুন"</string> @@ -582,8 +580,8 @@ <item quantity="other">%d মিনিট</item> </plurals> <string name="battery_panel_title" msgid="7944156115535366613">"ব্যাটারির ব্যবহার"</string> - <string name="battery_detail_charging_summary" msgid="4055327085770378335">"চার্জ করার সময় ব্যাটারি সেভার কাজ করে না"</string> - <string name="battery_detail_switch_title" msgid="8763441006881907058">"ব্যাটারি সেভার"</string> + <string name="battery_detail_charging_summary" msgid="1279095653533044008">"চার্জ করার সময় ব্যাটারি সেভার উপলব্ধ নয়"</string> + <string name="battery_detail_switch_title" msgid="6285872470260795421">"ব্যাটারি সেভার"</string> <string name="battery_detail_switch_summary" msgid="9049111149407626804">"কার্য-সম্পাদনা ও পশ্চাদপট ডেটাকে কমিয়ে দেয়"</string> <string name="keyboard_key_button_template" msgid="6230056639734377300">"<xliff:g id="NAME">%1$s</xliff:g> বোতাম"</string> <string name="keyboard_key_home" msgid="2243500072071305073">"হোম"</string> @@ -732,10 +730,10 @@ <string name="pip_skip_to_prev" msgid="1955311326688637914">"পিছনে যাওয়ার জন্য এড়িয়ে যান"</string> <string name="thermal_shutdown_title" msgid="4458304833443861111">"আপনার ফোন গরম হওয়ার জন্য বন্ধ হয়ে গেছে"</string> <string name="thermal_shutdown_message" msgid="9006456746902370523">"আপনার ফোন এখন ঠিক-ঠাক চলছে"</string> - <string name="thermal_shutdown_dialog_message" msgid="566347880005304139">"আপনার ফোন খুব বেশি গরম হয়েছিল বলে ঠান্ডা হওয়ার জন্য বন্ধ হয়ে গেছে। আপনার ফোন ঠিক-ঠাক ভাবে চলছে না।\n\nআপনার ফোন খুব বেশি গরম হয়ে যাবে যদি আপনি:\n •এমন অ্যাপ ব্যবহার করলে যেটি আপনার ডিভাইসের রিসোর্স বেশি ব্যবহার করে (যেমন গেমিং, ভিডিও বা নেভিগেশন অ্যাপ)\n • বড় ফাইল ডাউনলোড বা আপলোড করলে\n • বেশি তাপমাত্রায় আপনার ফোন ব্যবহার করলে"</string> + <string name="thermal_shutdown_dialog_message" msgid="566347880005304139">"আপনার ফোন খুব বেশি গরম হয়েছিল বলে ঠাণ্ডা হওয়ার জন্য বন্ধ হয়ে গেছে। আপনার ফোন ঠিক-ঠাক ভাবে চলছে না।\n\nআপনার ফোন খুব বেশি গরম হয়ে যাবে যদি আপনি:\n •এমন অ্যাপ ব্যবহার করলে যেটি আপনার ডিভাইসের রিসোর্স বেশি ব্যবহার করে (যেমন গেমিং, ভিডিও বা নেভিগেশন অ্যাপ)\n • বড় ফাইল ডাউনলোড বা আপলোড করলে\n • বেশি তাপমাত্রায় আপনার ফোন ব্যবহার করলে"</string> <string name="high_temp_title" msgid="4589508026407318374">"ফোনটি গরম হচ্ছে"</string> - <string name="high_temp_notif_message" msgid="5642466103153429279">"ফোনটি ঠান্ডা হওয়ার সময় কিছু বৈশিষ্ট্য সীমিত হতে পারে"</string> - <string name="high_temp_dialog_message" msgid="6840700639374113553">"আপনার ফোনটি নিজে থেকেই ঠান্ডা হওয়ার চেষ্টা করবে৷ আপনি তবুও আপনার ফোন ব্যবহার করতে পারেন, কিন্তু এটি একটু ধীরে চলতে পারে৷\n\nআপনার ফোনটি পুরোপুরি ঠান্ডা হয়ে গেলে এটি স্বাভাবিকভাবে চলবে৷"</string> + <string name="high_temp_notif_message" msgid="5642466103153429279">"ফোনটি ঠাণ্ডা হওয়ার সময় কিছু বৈশিষ্ট্য সীমিত হতে পারে"</string> + <string name="high_temp_dialog_message" msgid="6840700639374113553">"আপনার ফোনটি নিজে থেকেই ঠাণ্ডা হওয়ার চেষ্টা করবে৷ আপনি তবুও আপনার ফোন ব্যবহার করতে পারেন, কিন্তু এটি একটু ধীরে চলতে পারে৷\n\nআপনার ফোনটি পুরোপুরি ঠাণ্ডা হয়ে গেলে এটি স্বাভাবিকভাবে চলবে৷"</string> <string name="lockscreen_shortcut_left" msgid="2182769107618938629">"বাঁদিকের শর্টকাট"</string> <string name="lockscreen_shortcut_right" msgid="3328683699505226536">"ডানদিকের শর্টকাট"</string> <string name="lockscreen_unlock_left" msgid="2043092136246951985">"বাঁদিকের শর্টকাট দিয়েও আনলক করা যায়"</string> @@ -758,7 +756,8 @@ <string name="instant_apps" msgid="6647570248119804907">"ঝটপট অ্যাপ"</string> <string name="instant_apps_message" msgid="8116608994995104836">"ঝটপট অ্যাপ ইনস্টল করার প্রয়োজন হয় না।"</string> <string name="app_info" msgid="6856026610594615344">"অ্যাপের তথ্য"</string> - <string name="go_to_web" msgid="1106022723459948514">"ওয়েবে যান"</string> + <!-- no translation found for go_to_web (2650669128861626071) --> + <skip /> <string name="mobile_data" msgid="7094582042819250762">"মোবাইল ডেটা"</string> <string name="wifi_is_off" msgid="1838559392210456893">"ওয়াই ফাই বন্ধ আছে"</string> <string name="bt_is_off" msgid="2640685272289706392">"ব্লুটুথ বন্ধ আছে"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index 601d8e33bcdb..530c1a8b56aa 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -339,9 +339,9 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Podjela po horizontali"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Podjela po vertikali"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Prilagođena podjela"</string> - <string name="recents_accessibility_split_screen_top" msgid="9056056469282256287">"Podijeli ekran nagore"</string> - <string name="recents_accessibility_split_screen_left" msgid="8987144699630620019">"Podijeli ekran nalijevo"</string> - <string name="recents_accessibility_split_screen_right" msgid="275069779299592867">"Podijeli ekran nadesno"</string> + <string name="recents_accessibility_split_screen_top" msgid="9056056469282256287">"Dijeli ekran nagore"</string> + <string name="recents_accessibility_split_screen_left" msgid="8987144699630620019">"Dijeli ekran nalijevo"</string> + <string name="recents_accessibility_split_screen_right" msgid="275069779299592867">"Dijeli ekran nadesno"</string> <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Napunjeno"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"Punjenje"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"Do kraja punjenja preostalo <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> @@ -764,7 +764,8 @@ <string name="instant_apps" msgid="6647570248119804907">"Instant-aplikacije"</string> <string name="instant_apps_message" msgid="8116608994995104836">"Za instant aplikacije nije potrebna instalacija"</string> <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> - <string name="go_to_web" msgid="1106022723459948514">"Idite na internet"</string> + <!-- no translation found for go_to_web (2650669128861626071) --> + <skip /> <string name="mobile_data" msgid="7094582042819250762">"Mobilni podaci"</string> <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi veza je isključena"</string> <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth je isključen"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index cd1f057fa86a..d107fea93d3c 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -756,7 +756,8 @@ <string name="instant_apps" msgid="6647570248119804907">"برنامههای فوری"</string> <string name="instant_apps_message" msgid="8116608994995104836">"برنامههای فوری نیاز به نصب ندارند."</string> <string name="app_info" msgid="6856026610594615344">"اطلاعات برنامه"</string> - <string name="go_to_web" msgid="1106022723459948514">"رفتن به وب"</string> + <!-- no translation found for go_to_web (2650669128861626071) --> + <skip /> <string name="mobile_data" msgid="7094582042819250762">"داده تلفن همراه"</string> <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi خاموش است"</string> <string name="bt_is_off" msgid="2640685272289706392">"بلوتوث خاموش است"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 075edf108e78..b4709bb4c77d 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -756,7 +756,8 @@ <string name="instant_apps" msgid="6647570248119804907">"Aplikasi Instan"</string> <string name="instant_apps_message" msgid="8116608994995104836">"Aplikasi instan tidak perlu diinstal."</string> <string name="app_info" msgid="6856026610594615344">"Info aplikasi"</string> - <string name="go_to_web" msgid="1106022723459948514">"Buka di web"</string> + <!-- no translation found for go_to_web (2650669128861626071) --> + <skip /> <string name="mobile_data" msgid="7094582042819250762">"Data seluler"</string> <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi nonaktif"</string> <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth nonaktif"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 1b80410a7fe7..e871c6abe9e3 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -756,7 +756,8 @@ <string name="instant_apps" msgid="6647570248119804907">"მყისიერი აპები"</string> <string name="instant_apps_message" msgid="8116608994995104836">"მყისიერი აპები ინსტალაციას არ საჭიროებს."</string> <string name="app_info" msgid="6856026610594615344">"აპის შესახებ"</string> - <string name="go_to_web" msgid="1106022723459948514">"ვებზე გადასვლა"</string> + <!-- no translation found for go_to_web (2650669128861626071) --> + <skip /> <string name="mobile_data" msgid="7094582042819250762">"მობილური ინტერნეტი"</string> <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi გამორთულია"</string> <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth გამორთულია"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index ec4e0824d274..b5b3475b6ca1 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -26,8 +26,8 @@ <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"Os ecrãs recentes aparecem aqui"</string> <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Ignorar aplicações recentes"</string> <plurals name="status_bar_accessibility_recent_apps" formatted="false" msgid="9138535907802238759"> - <item quantity="one">1 ecrã na Vista geral</item> <item quantity="other">%d ecrãs na Vista geral</item> + <item quantity="one">1 ecrã na Vista geral</item> </plurals> <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"Sem notificações"</string> <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"Em curso"</string> @@ -249,8 +249,8 @@ <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> - <item quantity="one">Mais <xliff:g id="NUMBER_0">%s</xliff:g> notificação no grupo.</item> <item quantity="other">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item> + <item quantity="one">Mais <xliff:g id="NUMBER_0">%s</xliff:g> notificação no grupo.</item> </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Definições de notificação"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Definições do <xliff:g id="APP_NAME">%s</xliff:g>"</string> @@ -551,13 +551,13 @@ <string name="notification_default_channel_desc" msgid="2506053815870808359">"Esta aplicação não tem categorias de notificação"</string> <string name="notification_unblockable_desc" msgid="3561016061737896906">"Não é possível desativar as notificações desta aplicação"</string> <plurals name="notification_num_channels_desc" formatted="false" msgid="5492793452274077663"> - <item quantity="one">1 de <xliff:g id="NUMBER_0">%s</xliff:g> categoria de notificação desta aplicação</item> <item quantity="other">1 de <xliff:g id="NUMBER_1">%s</xliff:g> categorias de notificação desta aplicação</item> + <item quantity="one">1 de <xliff:g id="NUMBER_0">%s</xliff:g> categoria de notificação desta aplicação</item> </plurals> <string name="notification_channels_list_desc_2" msgid="6214732715833946441">"<xliff:g id="CHANNEL_NAME_1">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2">%2$s</xliff:g>"</string> <plurals name="notification_channels_list_desc_2_and_others" formatted="false" msgid="2747813553355336157"> - <item quantity="one"><xliff:g id="CHANNEL_NAME_1_0">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_1">%2$s</xliff:g> e mais <xliff:g id="NUMBER_2">%3$d</xliff:g></item> <item quantity="other"><xliff:g id="CHANNEL_NAME_1_3">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_4">%2$s</xliff:g> e mais <xliff:g id="NUMBER_5">%3$d</xliff:g></item> + <item quantity="one"><xliff:g id="CHANNEL_NAME_1_0">%1$s</xliff:g>, <xliff:g id="CHANNEL_NAME_2_1">%2$s</xliff:g> e mais <xliff:g id="NUMBER_2">%3$d</xliff:g></item> </plurals> <string name="notification_channel_controls_opened_accessibility" msgid="6553950422055908113">"Controlos de notificações da aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> abertos"</string> <string name="notification_channel_controls_closed_accessibility" msgid="7521619812603693144">"Controlos de notificações da aplicação <xliff:g id="APP_NAME">%1$s</xliff:g> fechados"</string> @@ -572,12 +572,12 @@ <string name="snooze_undo" msgid="6074877317002985129">"ANULAR"</string> <string name="snoozed_for_time" msgid="2390718332980204462">"Suspensa por <xliff:g id="TIME_AMOUNT">%1$s</xliff:g>"</string> <plurals name="snoozeHourOptions" formatted="false" msgid="2124335842674413030"> - <item quantity="one">%d hora</item> <item quantity="other">%d horas</item> + <item quantity="one">%d hora</item> </plurals> <plurals name="snoozeMinuteOptions" formatted="false" msgid="4127251700591510196"> - <item quantity="one">%d minuto</item> <item quantity="other">%d minutos</item> + <item quantity="one">%d minuto</item> </plurals> <string name="battery_panel_title" msgid="7944156115535366613">"Utiliz. da bateria"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Poupança de bateria não disponível durante o carregamento"</string> @@ -756,7 +756,8 @@ <string name="instant_apps" msgid="6647570248119804907">"Aplicações instantâneas"</string> <string name="instant_apps_message" msgid="8116608994995104836">"As Aplicações instantâneas não requerem instalação."</string> <string name="app_info" msgid="6856026610594615344">"Informações da aplicação"</string> - <string name="go_to_web" msgid="1106022723459948514">"Aceder à Web"</string> + <!-- no translation found for go_to_web (2650669128861626071) --> + <skip /> <string name="mobile_data" msgid="7094582042819250762">"Dados móveis"</string> <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi desativado"</string> <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth desativado"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 5b9ff78d9dc5..95cd2d078817 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -770,7 +770,8 @@ <string name="instant_apps" msgid="6647570248119804907">"Додатки з миттєвим запуском"</string> <string name="instant_apps_message" msgid="8116608994995104836">"Додатки з миттєвим запуском не потрібно встановлювати."</string> <string name="app_info" msgid="6856026610594615344">"Про додаток"</string> - <string name="go_to_web" msgid="1106022723459948514">"Перейти на веб-сайт"</string> + <!-- no translation found for go_to_web (2650669128861626071) --> + <skip /> <string name="mobile_data" msgid="7094582042819250762">"Мобільний трафік"</string> <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi вимкнено"</string> <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth вимкнено"</string> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 8e065d1bf06b..5e7f9c6a40e5 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -316,6 +316,40 @@ <!-- SystemUIFactory component --> <string name="config_systemUIFactoryComponent" translatable="false">com.android.systemui.SystemUIFactory</string> + <!-- SystemUI Services: The classes of the stuff to start. --> + <string-array name="config_systemUIServiceComponents" translatable="false"> + <item>com.android.systemui.Dependency</item> + <item>com.android.systemui.util.NotificationChannels</item> + <item>com.android.systemui.statusbar.CommandQueue$CommandQueueStart</item> + <item>com.android.systemui.keyguard.KeyguardViewMediator</item> + <item>com.android.systemui.recents.Recents</item> + <item>com.android.systemui.volume.VolumeUI</item> + <item>com.android.systemui.stackdivider.Divider</item> + <item>com.android.systemui.SystemBars</item> + <item>com.android.systemui.usb.StorageNotification</item> + <item>com.android.systemui.power.PowerUI</item> + <item>com.android.systemui.media.RingtonePlayer</item> + <item>com.android.systemui.keyboard.KeyboardUI</item> + <item>com.android.systemui.pip.PipUI</item> + <item>com.android.systemui.shortcut.ShortcutKeyDispatcher</item> + <item>@string/config_systemUIVendorServiceComponent</item> + <item>com.android.systemui.util.leak.GarbageMonitor$Service</item> + <item>com.android.systemui.LatencyTester</item> + <item>com.android.systemui.globalactions.GlobalActionsComponent</item> + <item>com.android.systemui.RoundedCorners</item> + <item>com.android.systemui.EmulatedDisplayCutout</item> + </string-array> + + <!-- SystemUI vender service, used in config_systemUIServiceComponents. --> + <string name="config_systemUIVendorServiceComponent" translatable="false">com.android.systemui.VendorServices</string> + + <!-- SystemUI Services (per user): The classes of the stuff to start for each user. This is a subset of the config_systemUIServiceComponents --> + <string-array name="config_systemUIServiceComponentsPerUser" translatable="false"> + <item>com.android.systemui.Dependency</item> + <item>com.android.systemui.util.NotificationChannels</item> + <item>com.android.systemui.recents.Recents</item> + </string-array> + <!-- Nav bar button default ordering/layout --> <string name="config_navBarLayout" translatable="false">left[.5W],back[1WC];home;recent[1WC],right[.5W]</string> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index ca85445e197e..62ab74d50713 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1248,6 +1248,10 @@ <string name="stream_tts" translatable="false">Transmitted Through Speaker</string> <!-- STREAM_TTS --> <string name="stream_accessibility">Accessibility</string> <!-- STREAM_ACCESSIBILITY --> + <string name="volume_ringer_status_normal">Ring</string> + <string name="volume_ringer_status_vibrate">Vibrate</string> + <string name="volume_ringer_status_silent">Mute</string> + <string name="volume_stream_muted" translatable="false">%s silent</string> <string name="volume_stream_vibrate" translatable="false">%s vibrate</string> <string name="volume_stream_suppressed" translatable="false">%1$s silent — %2$s</string> @@ -1989,8 +1993,8 @@ <!-- Action label for launching app info on the specified app [CHAR LIMIT=20] --> <string name="app_info">App info</string> - <!-- Action label for switching to web for an instant app [CHAR LIMIT=20] --> - <string name="go_to_web">Go to web</string> + <!-- Action label for switching to a browser for an instant app [CHAR LIMIT=20] --> + <string name="go_to_web">Go to browser</string> <!-- Quick settings tile for toggling mobile data [CHAR LIMIT=20] --> <string name="mobile_data">Mobile data</string> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java index 17cb0d80f6ab..7db3ac6e3889 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java @@ -43,6 +43,9 @@ public abstract class TaskStackChangeListener { public void onActivityDismissingDockedStack() { } public void onActivityLaunchOnSecondaryDisplayFailed() { } public void onTaskProfileLocked(int taskId, int userId) { } + public void onTaskRemoved(int taskId) { } + public void onTaskMovedToFront(int taskId) { } + public void onActivityRequestedOrientationChanged(int taskId, int requestedOrientation) { } /** * Checks that the current user matches the process. Since diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java index 81c37a95a4f3..857e0eadb1bc 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java @@ -145,6 +145,23 @@ public class TaskStackChangeListeners extends TaskStackListener { mHandler.obtainMessage(H.ON_TASK_SNAPSHOT_CHANGED, taskId, 0, snapshot).sendToTarget(); } + @Override + public void onTaskRemoved(int taskId) throws RemoteException { + mHandler.obtainMessage(H.ON_TASK_REMOVED, taskId, 0).sendToTarget(); + } + + @Override + public void onTaskMovedToFront(int taskId) throws RemoteException { + mHandler.obtainMessage(H.ON_TASK_MOVED_TO_FRONT, taskId, 0).sendToTarget(); + } + + @Override + public void onActivityRequestedOrientationChanged(int taskId, int requestedOrientation) + throws RemoteException { + mHandler.obtainMessage(H.ON_ACTIVITY_REQUESTED_ORIENTATION_CHANGE, taskId, + requestedOrientation).sendToTarget(); + } + private final class H extends Handler { private static final int ON_TASK_STACK_CHANGED = 1; private static final int ON_TASK_SNAPSHOT_CHANGED = 2; @@ -157,6 +174,10 @@ public class TaskStackChangeListeners extends TaskStackListener { private static final int ON_PINNED_STACK_ANIMATION_STARTED = 9; private static final int ON_ACTIVITY_UNPINNED = 10; private static final int ON_ACTIVITY_LAUNCH_ON_SECONDARY_DISPLAY_FAILED = 11; + private static final int ON_TASK_REMOVED = 12; + private static final int ON_TASK_MOVED_TO_FRONT = 13; + private static final int ON_ACTIVITY_REQUESTED_ORIENTATION_CHANGE = 14; + public H(Looper looper) { super(looper); @@ -241,6 +262,25 @@ public class TaskStackChangeListeners extends TaskStackListener { } break; } + case ON_TASK_REMOVED: { + for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) { + mTaskStackListeners.get(i).onTaskRemoved(msg.arg1); + } + break; + } + case ON_TASK_MOVED_TO_FRONT: { + for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) { + mTaskStackListeners.get(i).onTaskMovedToFront(msg.arg1); + } + break; + } + case ON_ACTIVITY_REQUESTED_ORIENTATION_CHANGE: { + for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) { + mTaskStackListeners.get(i).onActivityRequestedOrientationChanged( + msg.arg1, msg.arg2); + } + break; + } } } } diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java index 432b4061b5d0..6e0b56e25a3f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java @@ -53,8 +53,13 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { private ProgressDialog mSimUnlockProgressDialog = null; private CheckSimPin mCheckSimPinThread; + // Below flag is set to true during power-up or when a new SIM card inserted on device. + // When this is true and when SIM card is PIN locked state, on PIN lock screen, message would + // be displayed to inform user about the number of remaining PIN attempts left. + private boolean mShowDefaultMessage = true; + private int mRemainingAttempts = -1; private AlertDialog mRemainingAttemptsDialog; - private int mSubId; + private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; private ImageView mSimImageView; KeyguardUpdateMonitorCallback mUpdateMonitorCallback = new KeyguardUpdateMonitorCallback() { @@ -91,32 +96,69 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { public void resetState() { super.resetState(); if (DEBUG) Log.v(TAG, "Resetting state"); - KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); - mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED); + handleSubInfoChangeIfNeeded(); + if (mShowDefaultMessage) { + showDefaultMessage(); + } boolean isEsimLocked = KeyguardEsimArea.isEsimLocked(mContext, mSubId); - if (SubscriptionManager.isValidSubscriptionId(mSubId)) { - int count = TelephonyManager.getDefault().getSimCount(); - Resources rez = getResources(); - String msg; - int color = Color.WHITE; - if (count < 2) { - msg = rez.getString(R.string.kg_sim_pin_instructions); - } else { - SubscriptionInfo info = monitor.getSubscriptionInfoForSubId(mSubId); - CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash - msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName); - if (info != null) { - color = info.getIconTint(); - } + + KeyguardEsimArea esimButton = findViewById(R.id.keyguard_esim_area); + esimButton.setVisibility(isEsimLocked ? View.VISIBLE : View.GONE); + } + + private void showDefaultMessage() { + if (mRemainingAttempts >= 0) { + mSecurityMessageDisplay.setMessage(getPinPasswordErrorMessage( + mRemainingAttempts, true)); + return; + } + + boolean isEsimLocked = KeyguardEsimArea.isEsimLocked(mContext, mSubId); + int count = TelephonyManager.getDefault().getSimCount(); + Resources rez = getResources(); + String msg; + int color = Color.WHITE; + if (count < 2) { + msg = rez.getString(R.string.kg_sim_pin_instructions); + } else { + SubscriptionInfo info = KeyguardUpdateMonitor.getInstance(mContext). + getSubscriptionInfoForSubId(mSubId); + CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash + msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName); + if (info != null) { + color = info.getIconTint(); } - if (isEsimLocked) { - msg = msg + " " + rez.getString(R.string.kg_sim_lock_instructions_esim); + } + + if (isEsimLocked) { + msg = msg + " " + rez.getString(R.string.kg_sim_lock_instructions_esim); + } + + mSecurityMessageDisplay.setMessage(msg); + mSimImageView.setImageTintList(ColorStateList.valueOf(color)); + + // Sending empty PIN here to query the number of remaining PIN attempts + new CheckSimPin("", mSubId) { + void onSimCheckResponse(final int result, final int attemptsRemaining) { + Log.d(LOG_TAG, "onSimCheckResponse " + " dummy One result" + result + + " attemptsRemaining=" + attemptsRemaining); + if (attemptsRemaining >= 0) { + mRemainingAttempts = attemptsRemaining; + mSecurityMessageDisplay.setMessage( + getPinPasswordErrorMessage(attemptsRemaining, true)); + } } - mSecurityMessageDisplay.setMessage(msg); - mSimImageView.setImageTintList(ColorStateList.valueOf(color)); + }.start(); + } + + private void handleSubInfoChangeIfNeeded() { + KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); + int subId = monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED); + if (subId != mSubId && SubscriptionManager.isValidSubscriptionId(subId)) { + mSubId = subId; + mShowDefaultMessage = true; + mRemainingAttempts = -1; } - KeyguardEsimArea esimButton = findViewById(R.id.keyguard_esim_area); - esimButton.setVisibility(isEsimLocked ? View.VISIBLE : View.GONE); } @Override @@ -131,17 +173,19 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { return 0; } - private String getPinPasswordErrorMessage(int attemptsRemaining) { + private String getPinPasswordErrorMessage(int attemptsRemaining, boolean isDefault) { String displayMessage; - + int msgId; if (attemptsRemaining == 0) { displayMessage = getContext().getString(R.string.kg_password_wrong_pin_code_pukked); } else if (attemptsRemaining > 0) { + msgId = isDefault ? R.plurals.kg_password_default_pin_message : + R.plurals.kg_password_wrong_pin_code; displayMessage = getContext().getResources() - .getQuantityString(R.plurals.kg_password_wrong_pin_code, attemptsRemaining, - attemptsRemaining); + .getQuantityString(msgId, attemptsRemaining, attemptsRemaining); } else { - displayMessage = getContext().getString(R.string.kg_password_pin_failed); + msgId = isDefault ? R.string.kg_sim_pin_instructions : R.string.kg_password_pin_failed; + displayMessage = getContext().getString(msgId); } if (DEBUG) Log.d(LOG_TAG, "getPinPasswordErrorMessage:" + " attemptsRemaining=" + attemptsRemaining + " displayMessage=" + displayMessage); @@ -252,7 +296,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { } private Dialog getSimRemainingAttemptsDialog(int remaining) { - String msg = getPinPasswordErrorMessage(remaining); + String msg = getPinPasswordErrorMessage(remaining, false); if (mRemainingAttemptsDialog == null) { Builder builder = new AlertDialog.Builder(mContext); builder.setMessage(msg); @@ -288,6 +332,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { post(new Runnable() { @Override public void run() { + mRemainingAttempts = attemptsRemaining; if (mSimUnlockProgressDialog != null) { mSimUnlockProgressDialog.hide(); } @@ -296,8 +341,13 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { if (result == PhoneConstants.PIN_RESULT_SUCCESS) { KeyguardUpdateMonitor.getInstance(getContext()) .reportSimUnlocked(mSubId); - mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser()); + mRemainingAttempts = -1; + mShowDefaultMessage = true; + if (mCallback != null) { + mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser()); + } } else { + mShowDefaultMessage = false; if (result == PhoneConstants.PIN_PASSWORD_INCORRECT) { if (attemptsRemaining <= 2) { // this is getting critical - show dialog @@ -305,7 +355,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView { } else { // show message mSecurityMessageDisplay.setMessage( - getPinPasswordErrorMessage(attemptsRemaining)); + getPinPasswordErrorMessage(attemptsRemaining, false)); } } else { // "PIN operation failed!" - no idea what this was and no way to diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java index 7f79008b7c91..876d170e08cd 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java @@ -52,11 +52,17 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { private ProgressDialog mSimUnlockProgressDialog = null; private CheckSimPuk mCheckSimPukThread; + + // Below flag is set to true during power-up or when a new SIM card inserted on device. + // When this is true and when SIM card is PUK locked state, on PIN lock screen, message would + // be displayed to inform user about the number of remaining PUK attempts left. + private boolean mShowDefaultMessage = true; + private int mRemainingAttempts = -1; private String mPukText; private String mPinText; private StateMachine mStateMachine = new StateMachine(); private AlertDialog mRemainingAttemptsDialog; - private int mSubId; + private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; private ImageView mSimImageView; KeyguardUpdateMonitorCallback mUpdateMonitorCallback = new KeyguardUpdateMonitorCallback() { @@ -132,34 +138,17 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { } } + void reset() { mPinText=""; mPukText=""; state = ENTER_PUK; - KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); - mSubId = monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED); - boolean isEsimLocked = KeyguardEsimArea.isEsimLocked(mContext, mSubId); - if (SubscriptionManager.isValidSubscriptionId(mSubId)) { - int count = TelephonyManager.getDefault().getSimCount(); - Resources rez = getResources(); - String msg; - int color = Color.WHITE; - if (count < 2) { - msg = rez.getString(R.string.kg_puk_enter_puk_hint); - } else { - SubscriptionInfo info = monitor.getSubscriptionInfoForSubId(mSubId); - CharSequence displayName = info != null ? info.getDisplayName() : ""; - msg = rez.getString(R.string.kg_puk_enter_puk_hint_multi, displayName); - if (info != null) { - color = info.getIconTint(); - } - } - if (isEsimLocked) { - msg = msg + " " + rez.getString(R.string.kg_sim_lock_instructions_esim); - } - mSecurityMessageDisplay.setMessage(msg); - mSimImageView.setImageTintList(ColorStateList.valueOf(color)); + handleSubInfoChangeIfNeeded(); + if (mShowDefaultMessage) { + showDefaultMessage(); } + boolean isEsimLocked = KeyguardEsimArea.isEsimLocked(mContext, mSubId); + KeyguardEsimArea esimButton = findViewById(R.id.keyguard_esim_area); esimButton.setVisibility(isEsimLocked ? View.VISIBLE : View.GONE); mPasswordEntry.requestFocus(); @@ -168,23 +157,79 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { } + private void showDefaultMessage() { + if (mRemainingAttempts >= 0) { + mSecurityMessageDisplay.setMessage(getPukPasswordErrorMessage( + mRemainingAttempts, true)); + return; + } + + boolean isEsimLocked = KeyguardEsimArea.isEsimLocked(mContext, mSubId); + int count = TelephonyManager.getDefault().getSimCount(); + Resources rez = getResources(); + String msg; + int color = Color.WHITE; + if (count < 2) { + msg = rez.getString(R.string.kg_puk_enter_puk_hint); + } else { + SubscriptionInfo info = KeyguardUpdateMonitor.getInstance(mContext). + getSubscriptionInfoForSubId(mSubId); + CharSequence displayName = info != null ? info.getDisplayName() : ""; + msg = rez.getString(R.string.kg_puk_enter_puk_hint_multi, displayName); + if (info != null) { + color = info.getIconTint(); + } + } + if (isEsimLocked) { + msg = msg + " " + rez.getString(R.string.kg_sim_lock_instructions_esim); + } + mSecurityMessageDisplay.setMessage(msg); + mSimImageView.setImageTintList(ColorStateList.valueOf(color)); + + // Sending empty PUK here to query the number of remaining PIN attempts + new CheckSimPuk("", "", mSubId) { + void onSimLockChangedResponse(final int result, final int attemptsRemaining) { + Log.d(LOG_TAG, "onSimCheckResponse " + " dummy One result" + result + + " attemptsRemaining=" + attemptsRemaining); + if (attemptsRemaining >= 0) { + mRemainingAttempts = attemptsRemaining; + mSecurityMessageDisplay.setMessage( + getPukPasswordErrorMessage(attemptsRemaining, true)); + } + } + }.start(); + } + + private void handleSubInfoChangeIfNeeded() { + KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); + int subId = monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED); + if (subId != mSubId && SubscriptionManager.isValidSubscriptionId(subId)) { + mSubId = subId; + mShowDefaultMessage = true; + mRemainingAttempts = -1; + } + } + @Override protected int getPromtReasonStringRes(int reason) { // No message on SIM Puk return 0; } - private String getPukPasswordErrorMessage(int attemptsRemaining) { + private String getPukPasswordErrorMessage(int attemptsRemaining, boolean isDefault) { String displayMessage; if (attemptsRemaining == 0) { displayMessage = getContext().getString(R.string.kg_password_wrong_puk_code_dead); } else if (attemptsRemaining > 0) { + int msgId = isDefault ? R.plurals.kg_password_default_puk_message : + R.plurals.kg_password_wrong_puk_code; displayMessage = getContext().getResources() - .getQuantityString(R.plurals.kg_password_wrong_puk_code, attemptsRemaining, - attemptsRemaining); + .getQuantityString(msgId, attemptsRemaining, attemptsRemaining); } else { - displayMessage = getContext().getString(R.string.kg_password_puk_failed); + int msgId = isDefault ? R.string.kg_puk_enter_puk_hint : + R.string.kg_password_puk_failed; + displayMessage = getContext().getString(msgId); } if (DEBUG) Log.d(LOG_TAG, "getPukPasswordErrorMessage:" + " attemptsRemaining=" + attemptsRemaining + " displayMessage=" + displayMessage); @@ -303,7 +348,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { } private Dialog getPukRemainingAttemptsDialog(int remaining) { - String msg = getPukPasswordErrorMessage(remaining); + String msg = getPukPasswordErrorMessage(remaining, false); if (mRemainingAttemptsDialog == null) { AlertDialog.Builder builder = new AlertDialog.Builder(mContext); builder.setMessage(msg); @@ -359,16 +404,25 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView { if (result == PhoneConstants.PIN_RESULT_SUCCESS) { KeyguardUpdateMonitor.getInstance(getContext()) .reportSimUnlocked(mSubId); - mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser()); + mRemainingAttempts = -1; + mShowDefaultMessage = true; + if (mCallback != null) { + mCallback.dismiss(true, KeyguardUpdateMonitor.getCurrentUser()); + } } else { + mShowDefaultMessage = false; if (result == PhoneConstants.PIN_PASSWORD_INCORRECT) { + // show message + mSecurityMessageDisplay.setMessage(getPukPasswordErrorMessage( + attemptsRemaining, false)); if (attemptsRemaining <= 2) { // this is getting critical - show dialog getPukRemainingAttemptsDialog(attemptsRemaining).show(); } else { // show message mSecurityMessageDisplay.setMessage( - getPukPasswordErrorMessage(attemptsRemaining)); + getPukPasswordErrorMessage( + attemptsRemaining, false)); } } else { mSecurityMessageDisplay.setMessage(getContext().getString( diff --git a/packages/SystemUI/src/com/android/systemui/EmulatedDisplayCutout.java b/packages/SystemUI/src/com/android/systemui/EmulatedDisplayCutout.java new file mode 100644 index 000000000000..edd1748c7380 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/EmulatedDisplayCutout.java @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2017 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.systemui; + +import android.content.Context; +import android.database.ContentObserver; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Path; +import android.graphics.PixelFormat; +import android.graphics.Point; +import android.os.Handler; +import android.os.Looper; +import android.os.UserHandle; +import android.provider.Settings; +import android.view.DisplayCutout; +import android.view.Gravity; +import android.view.View; +import android.view.ViewGroup; +import android.view.ViewGroup.LayoutParams; +import android.view.WindowInsets; +import android.view.WindowManager; + +import java.util.ArrayList; + +/** + * Emulates a display cutout by drawing its shape in an overlay as supplied by + * {@link DisplayCutout}. + */ +public class EmulatedDisplayCutout extends SystemUI { + private View mOverlay; + private boolean mAttached; + private WindowManager mWindowManager; + + @Override + public void start() { + mWindowManager = mContext.getSystemService(WindowManager.class); + mContext.getContentResolver().registerContentObserver( + Settings.Global.getUriFor(Settings.Global.EMULATE_DISPLAY_CUTOUT), + false, mObserver, UserHandle.USER_ALL); + mObserver.onChange(false); + } + + private void setAttached(boolean attached) { + if (attached && !mAttached) { + if (mOverlay == null) { + mOverlay = new CutoutView(mContext); + mOverlay.setLayoutParams(getLayoutParams()); + } + mWindowManager.addView(mOverlay, mOverlay.getLayoutParams()); + mAttached = true; + } else if (!attached && mAttached) { + mWindowManager.removeView(mOverlay); + mAttached = false; + } + } + + private WindowManager.LayoutParams getLayoutParams() { + final WindowManager.LayoutParams lp = new WindowManager.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL, + WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE + | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE + | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL + | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH + | WindowManager.LayoutParams.FLAG_SLIPPERY + | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN + | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR, + PixelFormat.TRANSLUCENT); + lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS + | WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY; + lp.setTitle("EmulatedDisplayCutout"); + lp.gravity = Gravity.TOP; + return lp; + } + + private ContentObserver mObserver = new ContentObserver(new Handler(Looper.getMainLooper())) { + @Override + public void onChange(boolean selfChange) { + boolean emulateCutout = Settings.Global.getInt( + mContext.getContentResolver(), Settings.Global.EMULATE_DISPLAY_CUTOUT, + Settings.Global.EMULATE_DISPLAY_CUTOUT_OFF) + != Settings.Global.EMULATE_DISPLAY_CUTOUT_OFF; + setAttached(emulateCutout); + } + }; + + private static class CutoutView extends View { + private Paint mPaint = new Paint(); + private Path mPath = new Path(); + private ArrayList<Point> mBoundingPolygon = new ArrayList<>(); + + CutoutView(Context context) { + super(context); + } + + @Override + public WindowInsets onApplyWindowInsets(WindowInsets insets) { + insets.getDisplayCutout().getBoundingPolygon(mBoundingPolygon); + invalidate(); + return insets.consumeCutout(); + } + + @Override + protected void onDraw(Canvas canvas) { + if (!mBoundingPolygon.isEmpty()) { + mPaint.setColor(Color.DKGRAY); + mPaint.setStyle(Paint.Style.FILL); + + mPath.reset(); + for (int i = 0; i < mBoundingPolygon.size(); i++) { + Point point = mBoundingPolygon.get(i); + if (i == 0) { + mPath.moveTo(point.x, point.y); + } else { + mPath.lineTo(point.x, point.y); + } + } + mPath.close(); + canvas.drawPath(mPath, mPaint); + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java index 9adafda7adf5..3538327130d4 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java @@ -37,9 +37,7 @@ import com.android.systemui.keyboard.KeyboardUI; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.media.RingtonePlayer; import com.android.systemui.pip.PipUI; -import com.android.systemui.plugins.GlobalActions; import com.android.systemui.plugins.OverlayPlugin; -import com.android.systemui.plugins.Plugin; import com.android.systemui.plugins.PluginListener; import com.android.systemui.plugins.PluginManager; import com.android.systemui.power.PowerUI; @@ -54,6 +52,7 @@ import com.android.systemui.util.NotificationChannels; import com.android.systemui.util.leak.GarbageMonitor; import com.android.systemui.volume.VolumeUI; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -66,44 +65,9 @@ public class SystemUIApplication extends Application implements SysUiServiceProv private static final boolean DEBUG = false; /** - * The classes of the stuff to start. - */ - private final Class<?>[] SERVICES = new Class[] { - Dependency.class, - NotificationChannels.class, - CommandQueue.CommandQueueStart.class, - KeyguardViewMediator.class, - Recents.class, - VolumeUI.class, - Divider.class, - SystemBars.class, - StorageNotification.class, - PowerUI.class, - RingtonePlayer.class, - KeyboardUI.class, - PipUI.class, - ShortcutKeyDispatcher.class, - VendorServices.class, - GarbageMonitor.Service.class, - LatencyTester.class, - GlobalActionsComponent.class, - RoundedCorners.class, - }; - - /** - * The classes of the stuff to start for each user. This is a subset of the services listed - * above. - */ - private final Class<?>[] SERVICES_PER_USER = new Class[] { - Dependency.class, - NotificationChannels.class, - Recents.class - }; - - /** * Hold a reference on the stuff we start. */ - private final SystemUI[] mServices = new SystemUI[SERVICES.length]; + private SystemUI[] mServices; private boolean mServicesStarted; private boolean mBootCompleted; private final Map<Class<?>, Object> mComponents = new HashMap<>(); @@ -149,7 +113,7 @@ public class SystemUIApplication extends Application implements SysUiServiceProv // been broadcasted on startup for the primary SystemUI process. Instead, for // components which require the SystemUI component to be initialized per-user, we // start those components now for the current non-system user. - startServicesIfNeeded(SERVICES_PER_USER); + startSecondaryUserServicesIfNeeded(); } } @@ -161,7 +125,8 @@ public class SystemUIApplication extends Application implements SysUiServiceProv */ public void startServicesIfNeeded() { - startServicesIfNeeded(SERVICES); + String[] names = getResources().getStringArray(R.array.config_systemUIServiceComponents); + startServicesIfNeeded(names); } /** @@ -171,13 +136,16 @@ public class SystemUIApplication extends Application implements SysUiServiceProv * <p>This method must only be called from the main thread.</p> */ void startSecondaryUserServicesIfNeeded() { - startServicesIfNeeded(SERVICES_PER_USER); + String[] names = + getResources().getStringArray(R.array.config_systemUIServiceComponentsPerUser); + startServicesIfNeeded(names); } - private void startServicesIfNeeded(Class<?>[] services) { + private void startServicesIfNeeded(String[] services) { if (mServicesStarted) { return; } + mServices = new SystemUI[services.length]; if (!mBootCompleted) { // check to see if maybe it was already completed long before we began @@ -195,14 +163,16 @@ public class SystemUIApplication extends Application implements SysUiServiceProv log.traceBegin("StartServices"); final int N = services.length; for (int i = 0; i < N; i++) { - Class<?> cl = services[i]; - if (DEBUG) Log.d(TAG, "loading: " + cl); - log.traceBegin("StartServices" + cl.getSimpleName()); + String clsName = services[i]; + if (DEBUG) Log.d(TAG, "loading: " + clsName); + log.traceBegin("StartServices" + clsName); long ti = System.currentTimeMillis(); + Class cls; try { - - Object newService = SystemUIFactory.getInstance().createInstance(cl); - mServices[i] = (SystemUI) ((newService == null) ? cl.newInstance() : newService); + cls = Class.forName(clsName); + mServices[i] = (SystemUI) cls.newInstance(); + } catch(ClassNotFoundException ex){ + throw new RuntimeException(ex); } catch (IllegalAccessException ex) { throw new RuntimeException(ex); } catch (InstantiationException ex) { @@ -218,7 +188,7 @@ public class SystemUIApplication extends Application implements SysUiServiceProv // Warn if initialization of component takes too long ti = System.currentTimeMillis() - ti; if (ti > 1000) { - Log.w(TAG, "Initialization of " + cl.getName() + " took " + ti + " ms"); + Log.w(TAG, "Initialization of " + cls.getName() + " took " + ti + " ms"); } if (mBootCompleted) { mServices[i].onBootCompleted(); diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java index f28096f083c2..45b11aac5f35 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIFactory.java @@ -109,10 +109,6 @@ public class SystemUIFactory { return new QSTileHost(context, statusBar, iconController); } - public <T> T createInstance(Class<T> classType) { - return null; - } - public void injectDependencies(ArrayMap<Object, DependencyProvider> providers, Context context) { providers.put(NotificationLockscreenUserManager.class, diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java index 5ffd7859a487..8d50d4b71cce 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java @@ -45,6 +45,7 @@ import android.widget.Toast; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto; import com.android.keyguard.KeyguardStatusView; +import com.android.keyguard.KeyguardUpdateMonitor; import com.android.settingslib.Utils; import com.android.settingslib.drawable.UserIconDrawable; import com.android.systemui.Dependency; @@ -431,7 +432,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter, @Override public void onUserInfoChanged(String name, Drawable picture, String userAccount) { if (picture != null && - UserManager.get(mContext).isGuestUser(ActivityManager.getCurrentUser()) && + UserManager.get(mContext).isGuestUser(KeyguardUpdateMonitor.getCurrentUser()) && !(picture instanceof UserIconDrawable)) { picture = picture.getConstantState().newDrawable(mContext.getResources()).mutate(); picture.setColorFilter( diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index 4a91ee026953..cdf0c0f32d9b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -63,6 +63,7 @@ public class QSFragment extends Fragment implements QS { private QSContainerImpl mContainer; private int mLayoutDirection; private QSFooter mFooter; + private float mLastQSExpansion = -1; @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @@ -227,6 +228,7 @@ public class QSFragment extends Fragment implements QS { public void setKeyguardShowing(boolean keyguardShowing) { if (DEBUG) Log.d(TAG, "setKeyguardShowing " + keyguardShowing); mKeyguardShowing = keyguardShowing; + mLastQSExpansion = -1; if (mQSAnimator != null) { mQSAnimator.setOnKeyguard(keyguardShowing); @@ -268,6 +270,10 @@ public class QSFragment extends Fragment implements QS { getView().setTranslationY(mKeyguardShowing ? (translationScaleY * height) : headerTranslation); } + if (expansion == mLastQSExpansion) { + return; + } + mLastQSExpansion = expansion; mHeader.setExpansion(mKeyguardShowing ? 1 : expansion); mFooter.setExpansion(mKeyguardShowing ? 1 : expansion); int heightDiff = mQSPanel.getBottom() - mHeader.getBottom() + mHeader.getPaddingBottom() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java index b3d6e32d90ca..db19d2f0cac9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java @@ -80,10 +80,21 @@ public abstract class ExpandableOutlineView extends ExpandableView { private final ViewOutlineProvider mProvider = new ViewOutlineProvider() { @Override public void getOutline(View view, Outline outline) { - Path clipPath = getClipPath(); - if (clipPath != null && clipPath.isConvex()) { - // The path might not be convex in border cases where the view is small and clipped - outline.setConvexPath(clipPath); + if (!mCustomOutline && mCurrentTopRoundness == 0.0f + && mCurrentBottomRoundness == 0.0f && !mAlwaysRoundBothCorners) { + int translation = mShouldTranslateContents ? (int) getTranslation() : 0; + int left = Math.max(translation + mCurrentSidePaddings, mCurrentSidePaddings); + int top = mClipTopAmount + mBackgroundTop; + int right = getWidth() - mCurrentSidePaddings + Math.min(translation, 0); + int bottom = Math.max(getActualHeight() - mClipBottomAmount, top); + outline.setRect(left, top, right, bottom); + } else { + Path clipPath = getClipPath(); + if (clipPath != null && clipPath.isConvex()) { + // The path might not be convex in border cases where the view is small and + // clipped + outline.setConvexPath(clipPath); + } } outline.setAlpha(mOutlineAlpha); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java new file mode 100644 index 000000000000..6bcd174adeae --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationListener.java @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2017 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.systemui.statusbar; + +import static com.android.systemui.statusbar.RemoteInputController.processForRemoteInput; +import static com.android.systemui.statusbar.phone.StatusBar.DEBUG; +import static com.android.systemui.statusbar.phone.StatusBar.ENABLE_CHILD_NOTIFICATIONS; + +import android.content.ComponentName; +import android.content.Context; +import android.os.RemoteException; +import android.os.UserHandle; +import android.service.notification.StatusBarNotification; +import android.util.Log; + +import com.android.systemui.statusbar.phone.NotificationListenerWithPlugins; + +/** + * This class handles listening to notification updates and passing them along to + * NotificationPresenter to be displayed to the user. + */ +public class NotificationListener extends NotificationListenerWithPlugins { + private static final String TAG = "NotificationListener"; + + private final NotificationPresenter mPresenter; + private final Context mContext; + + public NotificationListener(NotificationPresenter presenter, Context context) { + mPresenter = presenter; + mContext = context; + } + + @Override + public void onListenerConnected() { + if (DEBUG) Log.d(TAG, "onListenerConnected"); + onPluginConnected(); + final StatusBarNotification[] notifications = getActiveNotifications(); + if (notifications == null) { + Log.w(TAG, "onListenerConnected unable to get active notifications."); + return; + } + final RankingMap currentRanking = getCurrentRanking(); + mPresenter.getHandler().post(() -> { + for (StatusBarNotification sbn : notifications) { + mPresenter.addNotification(sbn, currentRanking); + } + }); + } + + @Override + public void onNotificationPosted(final StatusBarNotification sbn, + final RankingMap rankingMap) { + if (DEBUG) Log.d(TAG, "onNotificationPosted: " + sbn); + if (sbn != null && !onPluginNotificationPosted(sbn, rankingMap)) { + mPresenter.getHandler().post(() -> { + processForRemoteInput(sbn.getNotification(), mContext); + String key = sbn.getKey(); + mPresenter.getKeysKeptForRemoteInput().remove(key); + boolean isUpdate = mPresenter.getNotificationData().get(key) != null; + // In case we don't allow child notifications, we ignore children of + // notifications that have a summary, since` we're not going to show them + // anyway. This is true also when the summary is canceled, + // because children are automatically canceled by NoMan in that case. + if (!ENABLE_CHILD_NOTIFICATIONS + && mPresenter.getGroupManager().isChildInGroupWithSummary(sbn)) { + if (DEBUG) { + Log.d(TAG, "Ignoring group child due to existing summary: " + sbn); + } + + // Remove existing notification to avoid stale data. + if (isUpdate) { + mPresenter.removeNotification(key, rankingMap); + } else { + mPresenter.getNotificationData().updateRanking(rankingMap); + } + return; + } + if (isUpdate) { + mPresenter.updateNotification(sbn, rankingMap); + } else { + mPresenter.addNotification(sbn, rankingMap); + } + }); + } + } + + @Override + public void onNotificationRemoved(StatusBarNotification sbn, + final RankingMap rankingMap) { + if (DEBUG) Log.d(TAG, "onNotificationRemoved: " + sbn); + if (sbn != null && !onPluginNotificationRemoved(sbn, rankingMap)) { + final String key = sbn.getKey(); + mPresenter.getHandler().post(() -> mPresenter.removeNotification(key, rankingMap)); + } + } + + @Override + public void onNotificationRankingUpdate(final RankingMap rankingMap) { + if (DEBUG) Log.d(TAG, "onRankingUpdate"); + if (rankingMap != null) { + RankingMap r = onPluginRankingUpdate(rankingMap); + mPresenter.getHandler().post(() -> mPresenter.updateNotificationRanking(r)); + } + } + + public void register() { + try { + registerAsSystemService(mContext, + new ComponentName(mContext.getPackageName(), getClass().getCanonicalName()), + UserHandle.USER_ALL); + } catch (RemoteException e) { + Log.e(TAG, "Unable to register notification listener", e); + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java index 867088793f8b..4eca2415d5c3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationPresenter.java @@ -19,6 +19,8 @@ import android.content.Intent; import android.os.Handler; import android.service.notification.NotificationListenerService; +import java.util.Set; + /** * An abstraction of something that presents notifications, e.g. StatusBar. Contains methods * for both querying the state of the system (some modularised piece of functionality may @@ -26,7 +28,8 @@ import android.service.notification.NotificationListenerService; * for affecting the state of the system (e.g. starting an intent, given that the presenter may * want to perform some action before doing so). */ -public interface NotificationPresenter { +public interface NotificationPresenter extends NotificationUpdateHandler, + NotificationData.Environment { /** * Returns true if the presenter is not visible. For example, it may not be necessary to do @@ -66,12 +69,6 @@ public interface NotificationPresenter { */ void updateMediaMetaData(boolean metaDataChanged, boolean allowEnterAnimation); - // TODO: Create NotificationUpdateHandler and move this method to there. - /** - * Removes a notification. - */ - void removeNotification(String key, NotificationListenerService.RankingMap ranking); - // TODO: Create NotificationEntryManager and move this method to there. /** * Gets the latest ranking map. @@ -84,6 +81,14 @@ public interface NotificationPresenter { void onWorkChallengeChanged(); /** + * Notifications in this set are kept around when they were canceled in response to a remote + * input interaction. This allows us to show what you replied and allows you to continue typing + * into it. + */ + // TODO: Create NotificationEntryManager and move this method to there. + Set<String> getKeysKeptForRemoteInput(); + + /** * Called when the current user changes. * @param newUserId new user id */ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUpdateHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUpdateHandler.java new file mode 100644 index 000000000000..0044194e886c --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUpdateHandler.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2017 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.systemui.statusbar; + +import android.service.notification.NotificationListenerService; +import android.service.notification.StatusBarNotification; + +/** + * Interface for accepting notification updates from {@link NotificationListener}. + */ +public interface NotificationUpdateHandler { + /** + * Add a new notification and update the current notification ranking map. + * + * @param notification Notification to add + * @param ranking RankingMap to update with + */ + void addNotification(StatusBarNotification notification, + NotificationListenerService.RankingMap ranking); + + /** + * Remove a notification and update the current notification ranking map. + * + * @param key Key identifying the notification to remove + * @param ranking RankingMap to update with + */ + void removeNotification(String key, NotificationListenerService.RankingMap ranking); + + /** + * Update a given notification and the current notification ranking map. + * + * @param notification Updated notification + * @param ranking RankingMap to update with + */ + void updateNotification(StatusBarNotification notification, + NotificationListenerService.RankingMap ranking); + + /** + * Update with a new notification ranking map. + * + * @param ranking RankingMap to update with + */ + void updateNotificationRanking(NotificationListenerService.RankingMap ranking); +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java index ff6c775ce7ea..97e3d22c6a46 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/RemoteInputController.java @@ -21,17 +21,24 @@ import com.android.systemui.Dependency; import com.android.systemui.statusbar.phone.StatusBarWindowManager; import com.android.systemui.statusbar.policy.RemoteInputView; +import android.app.Notification; +import android.app.RemoteInput; +import android.content.Context; +import android.os.SystemProperties; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Pair; import java.lang.ref.WeakReference; import java.util.ArrayList; +import java.util.List; /** * Keeps track of the currently active {@link RemoteInputView}s. */ public class RemoteInputController { + private static final boolean ENABLE_REMOTE_INPUT = + SystemProperties.getBoolean("debug.enable_remote_input", true); private final ArrayList<Pair<WeakReference<NotificationData.Entry>, Object>> mOpen = new ArrayList<>(); @@ -45,6 +52,53 @@ public class RemoteInputController { } /** + * Adds RemoteInput actions from the WearableExtender; to be removed once more apps support this + * via first-class API. + * + * TODO: Remove once enough apps specify remote inputs on their own. + */ + public static void processForRemoteInput(Notification n, Context context) { + if (!ENABLE_REMOTE_INPUT) { + return; + } + + if (n.extras != null && n.extras.containsKey("android.wearable.EXTENSIONS") && + (n.actions == null || n.actions.length == 0)) { + Notification.Action viableAction = null; + Notification.WearableExtender we = new Notification.WearableExtender(n); + + List<Notification.Action> actions = we.getActions(); + final int numActions = actions.size(); + + for (int i = 0; i < numActions; i++) { + Notification.Action action = actions.get(i); + if (action == null) { + continue; + } + RemoteInput[] remoteInputs = action.getRemoteInputs(); + if (remoteInputs == null) { + continue; + } + for (RemoteInput ri : remoteInputs) { + if (ri.getAllowFreeFormInput()) { + viableAction = action; + break; + } + } + if (viableAction != null) { + break; + } + } + + if (viableAction != null) { + Notification.Builder rebuilder = Notification.Builder.recoverBuilder(context, n); + rebuilder.setActions(viableAction); + rebuilder.build(); // will rewrite n + } + } + } + + /** * Adds a currently active remote input. * * @param entry the entry for which a remote input is now active. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java index 99debee2dad3..c281379fb796 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java @@ -102,7 +102,7 @@ public class KeyguardBouncer { return; } - final int activeUserId = ActivityManager.getCurrentUser(); + final int activeUserId = KeyguardUpdateMonitor.getCurrentUser(); final boolean isSystemUser = UserManager.isSplitSystemUser() && activeUserId == UserHandle.USER_SYSTEM; final boolean allowDismissKeyguard = !isSystemUser && activeUserId == keyguardUserId; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 3e3244629630..80bab7293a8b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -200,6 +200,7 @@ import com.android.systemui.statusbar.NotificationData; import com.android.systemui.statusbar.NotificationData.Entry; import com.android.systemui.statusbar.NotificationGutsManager; import com.android.systemui.statusbar.NotificationInfo; +import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationMediaManager; import com.android.systemui.statusbar.NotificationPresenter; @@ -249,6 +250,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.Stack; public class StatusBar extends SystemUI implements DemoMode, @@ -649,15 +651,6 @@ public class StatusBar extends SystemUI implements DemoMode, .Callback() { @Override public void onFinished() { - notifyKeyguardState(); - } - - @Override - public void onCancelled() { - notifyKeyguardState(); - } - - private void notifyKeyguardState() { if (mStatusBarKeyguardViewManager == null) { Log.w(TAG, "Tried to notify keyguard visibility when " + "mStatusBarKeyguardViewManager was null"); @@ -665,6 +658,12 @@ public class StatusBar extends SystemUI implements DemoMode, } mStatusBarKeyguardViewManager.onKeyguardFadedAway(); } + + @Override + public void onCancelled() { + // Transition was cancelled because another one took over. + // Nothing to do in here but wait. + } }; private NotificationMessagingUtil mMessagingUtil; @@ -819,14 +818,8 @@ public class StatusBar extends SystemUI implements DemoMode, } // Set up the initial notification state. - try { - mNotificationListener.registerAsSystemService(mContext, - new ComponentName(mContext.getPackageName(), getClass().getCanonicalName()), - UserHandle.USER_ALL); - } catch (RemoteException e) { - Log.e(TAG, "Unable to register notification listener", e); - } - + mNotificationListener = new NotificationListener(this, mContext); + mNotificationListener.register(); if (DEBUG) { Log.d(TAG, String.format( @@ -1519,13 +1512,19 @@ public class StatusBar extends SystemUI implements DemoMode, SystemServicesProxy.getInstance(mContext).awakenDreamsAsync(); } - public void addNotification(StatusBarNotification notification, RankingMap ranking) - throws InflationException { + @Override + public void addNotification(StatusBarNotification notification, RankingMap ranking) { String key = notification.getKey(); if (DEBUG) Log.d(TAG, "addNotification key=" + key); mNotificationData.updateRanking(ranking); - Entry shadeEntry = createNotificationViews(notification); + Entry shadeEntry = null; + try { + shadeEntry = createNotificationViews(notification); + } catch (InflationException e) { + handleInflationException(notification, e); + return; + } boolean isHeadsUped = shouldPeek(shadeEntry); if (!isHeadsUped && notification.getNotification().fullScreenIntent != null) { if (shouldSuppressFullScreenIntent(key)) { @@ -1539,11 +1538,11 @@ public class StatusBar extends SystemUI implements DemoMode, + key); } } else { - // Stop screensaver if the notification has a full-screen intent. + // Stop screensaver if the notification has a fullscreen intent. // (like an incoming phone call) awakenDreams(); - // not immersive & a full-screen alert should be shown + // not immersive & a fullscreen alert should be shown if (DEBUG) Log.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent"); try { @@ -1620,7 +1619,8 @@ public class StatusBar extends SystemUI implements DemoMode, } } - protected void updateNotificationRanking(RankingMap ranking) { + @Override + public void updateNotificationRanking(RankingMap ranking) { mNotificationData.updateRanking(ranking); updateNotifications(); } @@ -1673,7 +1673,7 @@ public class StatusBar extends SystemUI implements DemoMode, newNotification, sbn.getUser(), sbn.getOverrideGroupKey(), sbn.getPostTime()); boolean updated = false; try { - updateNotification(newSbn, null); + updateNotificationInternal(newSbn, null); updated = true; } catch (InflationException e) { deferRemoval = false; @@ -3697,23 +3697,35 @@ public class StatusBar extends SystemUI implements DemoMode, * See also StatusBar.setPanelExpanded for another place where we attempt to do this. */ private void handleVisibleToUserChangedImpl(boolean visibleToUser) { - try { - if (visibleToUser) { - boolean pinnedHeadsUp = mHeadsUpManager.hasPinnedHeadsUp(); - boolean clearNotificationEffects = - !isPresenterFullyCollapsed() && - (mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED); - int notificationLoad = mNotificationData.getActiveNotifications().size(); - if (pinnedHeadsUp && isPresenterFullyCollapsed()) { - notificationLoad = 1; - } - mBarService.onPanelRevealed(clearNotificationEffects, notificationLoad); - } else { - mBarService.onPanelHidden(); + if (visibleToUser) { + boolean pinnedHeadsUp = mHeadsUpManager.hasPinnedHeadsUp(); + boolean clearNotificationEffects = + !isPresenterFullyCollapsed() && + (mState == StatusBarState.SHADE + || mState == StatusBarState.SHADE_LOCKED); + int notificationLoad = mNotificationData.getActiveNotifications().size(); + if (pinnedHeadsUp && isPresenterFullyCollapsed()) { + notificationLoad = 1; } - } catch (RemoteException ex) { - // Won't fail unless the world has ended. + final int finalNotificationLoad = notificationLoad; + mUiOffloadThread.submit(() -> { + try { + mBarService.onPanelRevealed(clearNotificationEffects, + finalNotificationLoad); + } catch (RemoteException ex) { + // Won't fail unless the world has ended. + } + }); + } else { + mUiOffloadThread.submit(() -> { + try { + mBarService.onPanelHidden(); + } catch (RemoteException ex) { + // Won't fail unless the world has ended. + } + }); } + } private void stopNotificationLogging() { @@ -3749,21 +3761,23 @@ public class StatusBar extends SystemUI implements DemoMode, newlyVisible.toArray(new NotificationVisibility[newlyVisible.size()]); NotificationVisibility[] noLongerVisibleAr = noLongerVisible.toArray(new NotificationVisibility[noLongerVisible.size()]); - try { - mBarService.onNotificationVisibilityChanged(newlyVisibleAr, noLongerVisibleAr); - } catch (RemoteException e) { - // Ignore. - } - - final int N = newlyVisible.size(); - if (N > 0) { - String[] newlyVisibleKeyAr = new String[N]; - for (int i = 0; i < N; i++) { - newlyVisibleKeyAr[i] = newlyVisibleAr[i].key; + mUiOffloadThread.submit(() -> { + try { + mBarService.onNotificationVisibilityChanged(newlyVisibleAr, noLongerVisibleAr); + } catch (RemoteException e) { + // Ignore. } - setNotificationsShown(newlyVisibleKeyAr); - } + final int N = newlyVisible.size(); + if (N > 0) { + String[] newlyVisibleKeyAr = new String[N]; + for (int i = 0; i < N; i++) { + newlyVisibleKeyAr[i] = newlyVisibleAr[i].key; + } + + setNotificationsShown(newlyVisibleKeyAr); + } + }); } // State logging @@ -5694,90 +5708,7 @@ public class StatusBar extends SystemUI implements DemoMode, } }; - private final NotificationListenerWithPlugins mNotificationListener = - new NotificationListenerWithPlugins() { - @Override - public void onListenerConnected() { - if (DEBUG) Log.d(TAG, "onListenerConnected"); - onPluginConnected(); - final StatusBarNotification[] notifications = getActiveNotifications(); - if (notifications == null) { - Log.w(TAG, "onListenerConnected unable to get active notifications."); - return; - } - final RankingMap currentRanking = getCurrentRanking(); - mHandler.post(() -> { - for (StatusBarNotification sbn : notifications) { - try { - addNotification(sbn, currentRanking); - } catch (InflationException e) { - handleInflationException(sbn, e); - } - } - }); - } - - @Override - public void onNotificationPosted(final StatusBarNotification sbn, - final RankingMap rankingMap) { - if (DEBUG) Log.d(TAG, "onNotificationPosted: " + sbn); - if (sbn != null && !onPluginNotificationPosted(sbn, rankingMap)) { - mHandler.post(() -> { - processForRemoteInput(sbn.getNotification()); - String key = sbn.getKey(); - mKeysKeptForRemoteInput.remove(key); - boolean isUpdate = mNotificationData.get(key) != null; - // In case we don't allow child notifications, we ignore children of - // notifications that have a summary, since we're not going to show them - // anyway. This is true also when the summary is canceled, - // because children are automatically canceled by NoMan in that case. - if (!ENABLE_CHILD_NOTIFICATIONS - && mGroupManager.isChildInGroupWithSummary(sbn)) { - if (DEBUG) { - Log.d(TAG, "Ignoring group child due to existing summary: " + sbn); - } - - // Remove existing notification to avoid stale data. - if (isUpdate) { - removeNotification(key, rankingMap); - } else { - mNotificationData.updateRanking(rankingMap); - } - return; - } - try { - if (isUpdate) { - updateNotification(sbn, rankingMap); - } else { - addNotification(sbn, rankingMap); - } - } catch (InflationException e) { - handleInflationException(sbn, e); - } - }); - } - } - - @Override - public void onNotificationRemoved(StatusBarNotification sbn, - final RankingMap rankingMap) { - if (DEBUG) Log.d(TAG, "onNotificationRemoved: " + sbn); - if (sbn != null && !onPluginNotificationRemoved(sbn, rankingMap)) { - final String key = sbn.getKey(); - mHandler.post(() -> removeNotification(key, rankingMap)); - } - } - - @Override - public void onNotificationRankingUpdate(final RankingMap rankingMap) { - if (DEBUG) Log.d(TAG, "onRankingUpdate"); - if (rankingMap != null) { - RankingMap r = onPluginRankingUpdate(rankingMap); - mHandler.post(() -> updateNotificationRanking(r)); - } - } - - }; + protected NotificationListener mNotificationListener; protected void notifyUserAboutHiddenNotifications() { if (0 != Settings.Secure.getInt(mContext.getContentResolver(), @@ -6064,51 +5995,6 @@ public class StatusBar extends SystemUI implements DemoMode, row.updateNotification(entry); } - /** - * Adds RemoteInput actions from the WearableExtender; to be removed once more apps support this - * via first-class API. - * - * TODO: Remove once enough apps specify remote inputs on their own. - */ - private void processForRemoteInput(Notification n) { - if (!ENABLE_REMOTE_INPUT) return; - - if (n.extras != null && n.extras.containsKey("android.wearable.EXTENSIONS") && - (n.actions == null || n.actions.length == 0)) { - Notification.Action viableAction = null; - Notification.WearableExtender we = new Notification.WearableExtender(n); - - List<Notification.Action> actions = we.getActions(); - final int numActions = actions.size(); - - for (int i = 0; i < numActions; i++) { - Notification.Action action = actions.get(i); - if (action == null) { - continue; - } - RemoteInput[] remoteInputs = action.getRemoteInputs(); - if (remoteInputs == null) { - continue; - } - for (RemoteInput ri : remoteInputs) { - if (ri.getAllowFreeFormInput()) { - viableAction = action; - break; - } - } - if (viableAction != null) { - break; - } - } - - if (viableAction != null) { - Notification.Builder rebuilder = Notification.Builder.recoverBuilder(mContext, n); - rebuilder.setActions(viableAction); - rebuilder.build(); // will rewrite n - } - } - } - public void startPendingIntentDismissingKeyguard(final PendingIntent intent) { if (!isDeviceProvisioned()) return; @@ -6497,8 +6383,9 @@ public class StatusBar extends SystemUI implements DemoMode, mScrimController.setNotificationCount(mStackScroller.getNotGoneChildCount()); } - public void updateNotification(StatusBarNotification notification, RankingMap ranking) - throws InflationException { + // TODO: Move this to NotificationEntryManager once it is created. + private void updateNotificationInternal(StatusBarNotification notification, + RankingMap ranking) throws InflationException { if (DEBUG) Log.d(TAG, "updateNotification(" + notification + ")"); final String key = notification.getKey(); @@ -6548,6 +6435,15 @@ public class StatusBar extends SystemUI implements DemoMode, setAreThereNotifications(); } + @Override + public void updateNotification(StatusBarNotification notification, RankingMap ranking) { + try { + updateNotificationInternal(notification, ranking); + } catch (InflationException e) { + handleInflationException(notification, e); + } + } + protected void notifyHeadsUpGoingToSleep() { maybeEscalateHeadsUp(); } @@ -6744,6 +6640,11 @@ public class StatusBar extends SystemUI implements DemoMode, return mLatestRankingMap; } + @Override + public Set<String> getKeysKeptForRemoteInput() { + return mKeysKeptForRemoteInput; + } + private final NotificationInfo.CheckSaveListener mCheckSaveListener = (Runnable saveImportance, StatusBarNotification sbn) -> { // If the user has security enabled, show challenge if the setting is changed. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java index 874f0d9d5b5f..4ee4ef492ec1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java @@ -39,6 +39,8 @@ import com.android.systemui.util.Utils; import java.util.ArrayList; import java.util.List; +import static com.android.settingslib.Utils.updateLocationMode; + /** * A controller to manage changes of location related states and update the views accordingly. */ @@ -106,12 +108,13 @@ public class LocationControllerImpl extends BroadcastReceiver implements Locatio final ContentResolver cr = mContext.getContentResolver(); // When enabling location, a user consent dialog will pop up, and the // setting won't be fully enabled until the user accepts the agreement. + int currentMode = Settings.Secure.getIntForUser(cr, Settings.Secure.LOCATION_MODE, + Settings.Secure.LOCATION_MODE_OFF, currentUserId); int mode = enabled ? Settings.Secure.LOCATION_MODE_PREVIOUS : Settings.Secure.LOCATION_MODE_OFF; // QuickSettings always runs as the owner, so specifically set the settings // for the current foreground user. - return Settings.Secure - .putIntForUser(cr, Settings.Secure.LOCATION_MODE, mode, currentUserId); + return updateLocationMode(mContext, currentMode, mode, currentUserId); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RotationLockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RotationLockController.java index 722874b07c97..f258fb19ff7d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RotationLockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RotationLockController.java @@ -24,6 +24,7 @@ public interface RotationLockController extends Listenable, boolean isRotationLockAffordanceVisible(); boolean isRotationLocked(); void setRotationLocked(boolean locked); + void setRotationLockedAtAngle(boolean locked, int rotation); public interface RotationLockControllerCallback { void onRotationLockStateChanged(boolean rotationLocked, boolean affordanceVisible); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RotationLockControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RotationLockControllerImpl.java index 4f964964cd68..5418dc14e0bb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RotationLockControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RotationLockControllerImpl.java @@ -63,6 +63,10 @@ public final class RotationLockControllerImpl implements RotationLockController RotationPolicy.setRotationLock(mContext, locked); } + public void setRotationLockedAtAngle(boolean locked, int rotation){ + RotationPolicy.setRotationLockAtAngle(mContext, locked, rotation); + } + public boolean isRotationLockAffordanceVisible() { return RotationPolicy.isRotationLockToggleVisible(mContext); } diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 0d41e2029086..3e70980fdc67 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -30,7 +30,6 @@ import android.app.KeyguardManager; import android.content.Context; import android.content.DialogInterface; import android.content.res.ColorStateList; -import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Color; import android.graphics.Rect; @@ -67,8 +66,6 @@ import android.widget.TextView; import com.android.settingslib.Utils; import com.android.systemui.Dependency; -import com.android.systemui.HardwareUiLayout; -import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.plugins.VolumeDialog; import com.android.systemui.plugins.VolumeDialogController; @@ -97,11 +94,12 @@ public class VolumeDialogImpl implements VolumeDialog { private final VolumeDialogController mController; private Window mWindow; - private HardwareUiLayout mHardwareLayout; private CustomDialog mDialog; private ViewGroup mDialogView; private ViewGroup mDialogRowsView; private ViewGroup mDialogContentView; + private ImageButton mRingerIcon; + private TextView mRingerStatus; private final List<VolumeRow> mRows = new ArrayList<>(); private ConfigurableTexts mConfigurableTexts; private final SparseBooleanArray mDynamic = new SparseBooleanArray(); @@ -111,6 +109,7 @@ public class VolumeDialogImpl implements VolumeDialog { private final Accessibility mAccessibility = new Accessibility(); private final ColorStateList mActiveSliderTint; private final ColorStateList mInactiveSliderTint; + private VolumeUiLayout mHardwareLayout; private boolean mShowing; private boolean mShowA11yStream; @@ -160,17 +159,34 @@ public class VolumeDialogImpl implements VolumeDialog { mWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); mWindow.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); - mWindow.addFlags( - WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN - | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL - | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED - | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH - | WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED); + mWindow.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE + | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN + | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL + | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED + | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH + | WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED); + mWindow.setTitle(VolumeDialogImpl.class.getSimpleName()); mWindow.setType(WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY); mWindow.setWindowAnimations(com.android.internal.R.style.Animation_Toast); mDialog.setContentView(R.layout.volume_dialog); - mDialogView = (ViewGroup) mDialog.findViewById(R.id.volume_dialog); + mDialog.setOnShowListener(new DialogInterface.OnShowListener() { + @Override + public void onShow(DialogInterface dialog) { + mDialogView.setTranslationY(-mDialogView.getHeight()); + mDialogView.setAlpha(0); + mDialogView.animate() + .alpha(1) + .translationY(0) + .setDuration(300) + .setInterpolator(new SystemUIInterpolators.LogDecelerateInterpolator()) + .withEndAction(() -> { + mWindow.getDecorView().requestAccessibilityFocus(); + }) + .start(); + } + }); + mDialogView = mDialog.findViewById(R.id.volume_dialog); mDialogView.setOnHoverListener(new View.OnHoverListener() { @Override public boolean onHover(View v, MotionEvent event) { @@ -181,18 +197,20 @@ public class VolumeDialogImpl implements VolumeDialog { return true; } }); - mHardwareLayout = HardwareUiLayout.get(mDialogView); + mHardwareLayout = VolumeUiLayout.get(mDialogView); mHardwareLayout.setOutsideTouchListener(view -> dismiss(DISMISS_REASON_TOUCH_OUTSIDE)); mDialogContentView = mDialog.findViewById(R.id.volume_dialog_content); mDialogRowsView = mDialogContentView.findViewById(R.id.volume_dialog_rows); + mRingerIcon = mDialogContentView.findViewById(R.id.ringer_icon); + mRingerStatus = mDialogContentView.findViewById(R.id.ringer_status); if (mRows.isEmpty()) { addRow(AudioManager.STREAM_MUSIC, R.drawable.ic_volume_media, R.drawable.ic_volume_media_mute, true); if (!AudioSystem.isSingleVolume(mContext)) { addRow(AudioManager.STREAM_RING, - R.drawable.ic_volume_ringer, R.drawable.ic_volume_ringer_mute, true); + R.drawable.ic_volume_ringer, R.drawable.ic_volume_ringer_mute, false); addRow(AudioManager.STREAM_ALARM, R.drawable.ic_volume_alarm, R.drawable.ic_volume_alarm_mute, false); addRow(AudioManager.STREAM_VOICE_CALL, @@ -208,6 +226,7 @@ public class VolumeDialogImpl implements VolumeDialog { addExistingRows(); } updateRowsH(getActiveRow()); + initRingerH(); } private ColorStateList loadColorStateList(int colorResId) { @@ -374,6 +393,30 @@ public class VolumeDialogImpl implements VolumeDialog { } } + public void initRingerH() { + mRingerIcon.setOnClickListener(v -> { + Events.writeEvent(mContext, Events.EVENT_ICON_CLICK, AudioManager.STREAM_RING, + mRingerIcon.getTag()); + final StreamState ss = mState.states.get(AudioManager.STREAM_RING); + final boolean hasVibrator = mController.hasVibrator(); + if (mState.ringerModeInternal == AudioManager.RINGER_MODE_NORMAL) { + if (hasVibrator) { + mController.setRingerMode(AudioManager.RINGER_MODE_VIBRATE, false); + } else { + final boolean wasZero = ss.level == 0; + mController.setStreamVolume(AudioManager.STREAM_RING, wasZero ? 1 : 0); + } + } else { + mController.setRingerMode(AudioManager.RINGER_MODE_NORMAL, false); + if (ss.level == 0) { + mController.setStreamVolume(AudioManager.STREAM_RING, 1); + } + } + updateRingerH(); + }); + updateRingerH(); + } + public void show(int reason) { mHandler.obtainMessage(H.SHOW, reason, 0).sendToTarget(); } @@ -389,27 +432,12 @@ public class VolumeDialogImpl implements VolumeDialog { rescheduleTimeoutH(); if (mShowing) return; mShowing = true; - mHardwareLayout.setTranslationX(getAnimTranslation()); - mHardwareLayout.setAlpha(0); - mHardwareLayout.animate() - .alpha(1) - .translationX(0) - .setDuration(300) - .setInterpolator(Interpolators.FAST_OUT_SLOW_IN) - .withEndAction(() -> { - mDialog.show(); - mWindow.getDecorView().requestAccessibilityFocus(); - }) - .start(); + + mDialog.show(); Events.writeEvent(mContext, Events.EVENT_SHOW_DIALOG, reason, mKeyguard.isKeyguardLocked()); mController.notifyVisible(true); } - private float getAnimTranslation() { - return mContext.getResources().getDimension( - R.dimen.volume_dialog_panel_width) / 2; - } - protected void rescheduleTimeoutH() { mHandler.removeMessages(H.DISMISS); final int timeout = computeTimeoutH(); @@ -423,7 +451,6 @@ public class VolumeDialogImpl implements VolumeDialog { if (mAccessibility.mFeedbackEnabled) return 20000; if (mHovering) return 16000; if (mSafetyWarning != null) return 5000; - if (mActiveStream == AudioManager.STREAM_MUSIC) return 1500; return 3000; } @@ -431,16 +458,22 @@ public class VolumeDialogImpl implements VolumeDialog { mHandler.removeMessages(H.DISMISS); mHandler.removeMessages(H.SHOW); if (!mShowing) return; + mDialogView.animate().cancel(); mShowing = false; - mHardwareLayout.setTranslationX(0); - mHardwareLayout.setAlpha(1); - mHardwareLayout.animate() + + mDialogView.setTranslationY(0); + mDialogView.setAlpha(1); + mDialogView.animate() .alpha(0) - .translationX(getAnimTranslation()) - .setDuration(300) - .withEndAction(() -> mDialog.dismiss()) + .translationY(-mDialogView.getHeight()) + .setDuration(250) .setInterpolator(new SystemUIInterpolators.LogAccelerateInterpolator()) + .withEndAction(() -> mHandler.postDelayed(() -> { + if (D.BUG) Log.d(TAG, "mDialog.dismiss()"); + mDialog.dismiss(); + }, 50)) .start(); + if (mAccessibilityMgr.isEnabled()) { AccessibilityEvent event = AccessibilityEvent.obtain(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED); @@ -493,6 +526,53 @@ public class VolumeDialogImpl implements VolumeDialog { } } + protected void updateRingerH() { + if (mState != null) { + final StreamState ss = mState.states.get(AudioManager.STREAM_RING); + switch (mState.ringerModeInternal) { + case AudioManager.RINGER_MODE_VIBRATE: + mRingerStatus.setText(R.string.volume_ringer_status_vibrate); + mRingerIcon.setImageResource(R.drawable.ic_volume_ringer_vibrate); + mRingerIcon.setTag(Events.ICON_STATE_VIBRATE); + break; + case AudioManager.RINGER_MODE_SILENT: + mRingerStatus.setText(R.string.volume_ringer_status_silent); + mRingerIcon.setImageResource(R.drawable.ic_volume_ringer_mute); + mRingerIcon.setContentDescription(mContext.getString( + R.string.volume_stream_content_description_unmute, + getStreamLabelH(ss))); + mRingerIcon.setTag(Events.ICON_STATE_MUTE); + break; + case AudioManager.RINGER_MODE_NORMAL: + default: + boolean muted = (mAutomute && ss.level == 0) || ss.muted ? true : false; + if (muted) { + mRingerStatus.setText(R.string.volume_ringer_status_silent); + mRingerIcon.setImageResource(R.drawable.ic_volume_ringer_mute); + mRingerIcon.setContentDescription(mContext.getString( + R.string.volume_stream_content_description_unmute, + getStreamLabelH(ss))); + mRingerIcon.setTag(Events.ICON_STATE_MUTE); + } else { + mRingerStatus.setText(R.string.volume_ringer_status_normal); + mRingerIcon.setImageResource(R.drawable.ic_volume_ringer); + if (mController.hasVibrator()) { + mRingerIcon.setContentDescription(mContext.getString( + mShowA11yStream + ? R.string.volume_stream_content_description_vibrate_a11y + : R.string.volume_stream_content_description_vibrate, + getStreamLabelH(ss))); + + } else { + mRingerIcon.setContentDescription(getStreamLabelH(ss)); + } + mRingerIcon.setTag(Events.ICON_STATE_UNMUTE); + } + break; + } + } + } + private void trimObsoleteH() { if (D.BUG) Log.d(TAG, "trimObsoleteH"); for (int i = mRows.size() - 1; i >= 0; i--) { @@ -529,6 +609,7 @@ public class VolumeDialogImpl implements VolumeDialog { for (VolumeRow row : mRows) { updateVolumeRowH(row); } + updateRingerH(); } private void updateVolumeRowH(VolumeRow row) { diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeUiLayout.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeUiLayout.java new file mode 100644 index 000000000000..49ac9b6b7ffe --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeUiLayout.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2017 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.systemui.volume; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewOutlineProvider; +import android.view.ViewTreeObserver; +import android.widget.FrameLayout; + +public class VolumeUiLayout extends FrameLayout { + + public VolumeUiLayout(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + getViewTreeObserver().addOnComputeInternalInsetsListener(mInsetsListener); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + getViewTreeObserver().removeOnComputeInternalInsetsListener(mInsetsListener); + } + + @Override + public ViewOutlineProvider getOutlineProvider() { + return super.getOutlineProvider(); + } + + public void setOutsideTouchListener(OnClickListener onClickListener) { + requestLayout(); + setOnClickListener(onClickListener); + setClickable(true); + setFocusable(true); + } + + public static VolumeUiLayout get(View v) { + if (v instanceof VolumeUiLayout) return (VolumeUiLayout) v; + if (v.getParent() instanceof View) { + return get((View) v.getParent()); + } + return null; + } + + private final ViewTreeObserver.OnComputeInternalInsetsListener mInsetsListener = inoutInfo -> { + inoutInfo.setTouchableInsets( + ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME); + }; +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java new file mode 100644 index 000000000000..6ecfe3e6be47 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationListenerTest.java @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2017 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.systemui.statusbar; + +import static junit.framework.Assert.assertTrue; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.Notification; +import android.os.Handler; +import android.os.Looper; +import android.os.UserHandle; +import android.service.notification.NotificationListenerService; +import android.service.notification.StatusBarNotification; +import android.support.test.filters.SmallTest; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; + +import com.android.systemui.SysuiTestCase; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.HashSet; +import java.util.Set; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +@TestableLooper.RunWithLooper +public class NotificationListenerTest extends SysuiTestCase { + private static final String TEST_PACKAGE_NAME = "test"; + private static final int TEST_UID = 0; + + private NotificationPresenter mPresenter; + private Handler mHandler; + private NotificationListener mListener; + private StatusBarNotification mSbn; + private NotificationListenerService.RankingMap mRanking; + private Set<String> mKeysKeptForRemoteInput; + private NotificationData mNotificationData; + + @Before + public void setUp() { + mHandler = new Handler(Looper.getMainLooper()); + mPresenter = mock(NotificationPresenter.class); + mNotificationData = mock(NotificationData.class); + mRanking = mock(NotificationListenerService.RankingMap.class); + mKeysKeptForRemoteInput = new HashSet<>(); + + when(mPresenter.getHandler()).thenReturn(mHandler); + when(mPresenter.getNotificationData()).thenReturn(mNotificationData); + when(mPresenter.getKeysKeptForRemoteInput()).thenReturn(mKeysKeptForRemoteInput); + + mListener = new NotificationListener(mPresenter, mContext); + mSbn = new StatusBarNotification(TEST_PACKAGE_NAME, TEST_PACKAGE_NAME, 0, null, TEST_UID, 0, + new Notification(), UserHandle.CURRENT, null, 0); + } + + @Test + public void testNotificationAddCallsAddNotification() { + mListener.onNotificationPosted(mSbn, mRanking); + waitForIdleSync(mHandler); + verify(mPresenter).addNotification(mSbn, mRanking); + } + + @Test + public void testPostNotificationRemovesKeyKeptForRemoteInput() { + mKeysKeptForRemoteInput.add(mSbn.getKey()); + mListener.onNotificationPosted(mSbn, mRanking); + waitForIdleSync(mHandler); + assertTrue(mKeysKeptForRemoteInput.isEmpty()); + } + + @Test + public void testNotificationUpdateCallsUpdateNotification() { + when(mNotificationData.get(mSbn.getKey())).thenReturn(new NotificationData.Entry(mSbn)); + mListener.onNotificationPosted(mSbn, mRanking); + waitForIdleSync(mHandler); + verify(mPresenter).updateNotification(mSbn, mRanking); + } + + @Test + public void testNotificationRemovalCallsRemoveNotification() { + mListener.onNotificationRemoved(mSbn, mRanking); + waitForIdleSync(mHandler); + verify(mPresenter).removeNotification(mSbn.getKey(), mRanking); + } + + @Test + public void testRankingUpdateCallsNotificationRankingUpdate() { + mListener.onNotificationRankingUpdate(mRanking); + waitForIdleSync(mHandler); + // RankingMap may be modified by plugins. + verify(mPresenter).updateNotificationRanking(any()); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index 0aeb7b6bf34c..5ff90d91b333 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -430,6 +430,7 @@ public class StatusBarTest extends SysuiTestCase { public void testLogHidden() { try { mStatusBar.handleVisibleToUserChanged(false); + waitForUiOffloadThread(); verify(mBarService, times(1)).onPanelHidden(); verify(mBarService, never()).onPanelRevealed(anyBoolean(), anyInt()); } catch (RemoteException e) { @@ -447,7 +448,7 @@ public class StatusBarTest extends SysuiTestCase { try { mStatusBar.handleVisibleToUserChanged(true); - + waitForUiOffloadThread(); verify(mBarService, never()).onPanelHidden(); verify(mBarService, times(1)).onPanelRevealed(false, 1); } catch (RemoteException e) { @@ -466,7 +467,7 @@ public class StatusBarTest extends SysuiTestCase { try { mStatusBar.handleVisibleToUserChanged(true); - + waitForUiOffloadThread(); verify(mBarService, never()).onPanelHidden(); verify(mBarService, times(1)).onPanelRevealed(true, 5); } catch (RemoteException e) { @@ -485,7 +486,7 @@ public class StatusBarTest extends SysuiTestCase { try { mStatusBar.handleVisibleToUserChanged(true); - + waitForUiOffloadThread(); verify(mBarService, never()).onPanelHidden(); verify(mBarService, times(1)).onPanelRevealed(false, 5); } catch (RemoteException e) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeRotationLockController.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeRotationLockController.java index d60fe78e9d6e..be110242a3eb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeRotationLockController.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeRotationLockController.java @@ -49,4 +49,9 @@ public class FakeRotationLockController extends BaseLeakChecker<RotationLockCont public void setRotationLocked(boolean locked) { } + + @Override + public void setRotationLockedAtAngle(boolean locked, int rotation) { + + } } diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 6faf1f9dcd71..ba6bb23e9dca 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -4138,6 +4138,19 @@ message MetricsEvent { // OS: O FIELD_NOTIFICATION_GROUP_SUMMARY = 947; + // An app attempted to forge a different component name in the AssisStructure that would be + // passed to the autofill service. + // OS: O (security patch) + // Package: Real package of the app being autofilled + // Tag FIELD_AUTOFILL_SERVICE: Package of the autofill service that processed the request + // TAG FIELD_AUTOFILL_FORGED_COMPONENT_NAME: Component name being forged + AUTOFILL_FORGED_COMPONENT_ATTEMPT = 948; + + // FIELD - The component that an app tried tro forged. + // Type: string + // OS: O (security patch) + FIELD_AUTOFILL_FORGED_COMPONENT_NAME = 949; + // ---- End O Constants, all O constants go above this line ---- // OPEN: Settings > System > Languages & input > Advanced > Lift to open camera diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java index 02912763509f..690c45b06149 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java @@ -610,6 +610,21 @@ public final class AutofillManagerService extends SystemService { } @Override + public boolean isFieldClassificationEnabled() throws RemoteException { + UserHandle user = getCallingUserHandle(); + int uid = getCallingUid(); + + synchronized (mLock) { + AutofillManagerServiceImpl service = peekServiceForUserLocked(user.getIdentifier()); + if (service != null) { + return service.isFieldClassificationEnabled(); + } + } + + return false; + } + + @Override public boolean restoreSession(int sessionId, IBinder activityToken, IBinder appCallback) throws RemoteException { activityToken = Preconditions.checkNotNull(activityToken, "activityToken"); diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index a46549524d54..b2a0ce53e3bc 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -32,6 +32,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ServiceInfo; import android.graphics.Rect; import android.graphics.drawable.Drawable; @@ -43,6 +44,7 @@ import android.os.Looper; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.os.SystemClock; +import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.service.autofill.AutofillService; @@ -465,6 +467,8 @@ final class AutofillManagerServiceImpl { sessionId = sRandom.nextInt(); } while (sessionId == NO_SESSION || mSessions.indexOfKey(sessionId) >= 0); + assertCallerLocked(componentName); + final Session newSession = new Session(this, mUi, mContext, mHandlerCaller, mUserId, mLock, sessionId, uid, activityToken, appCallbackToken, hasCallback, mUiLatencyHistory, mInfo.getServiceInfo().getComponentName(), componentName); @@ -474,6 +478,34 @@ final class AutofillManagerServiceImpl { } /** + * Asserts the component is owned by the caller. + */ + private void assertCallerLocked(@NonNull ComponentName componentName) { + final PackageManager pm = mContext.getPackageManager(); + final int callingUid = Binder.getCallingUid(); + final int packageUid; + try { + packageUid = pm.getPackageUidAsUser(componentName.getPackageName(), + UserHandle.getCallingUserId()); + } catch (NameNotFoundException e) { + throw new SecurityException("Could not verify UID for " + componentName); + } + if (callingUid != packageUid) { + final String[] packages = pm.getPackagesForUid(callingUid); + final String callingPackage = packages != null ? packages[0] : "uid-" + callingUid; + Slog.w(TAG, "App (package=" + callingPackage + ", UID=" + callingUid + + ") passed component (" + componentName + ") owned by UID " + packageUid); + mMetricsLogger.write( + Helper.newLogMaker(MetricsEvent.AUTOFILL_FORGED_COMPONENT_ATTEMPT, + callingPackage, getServicePackageName()) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_FORGED_COMPONENT_NAME, + componentName == null ? "null" : componentName.flattenToShortString())); + + throw new SecurityException("Invalid component: " + componentName); + } + } + + /** * Restores a session after an activity was temporarily destroyed. * * @param sessionId The id of the session to restore @@ -683,14 +715,14 @@ final class AutofillManagerServiceImpl { @Nullable ArrayList<String> changedDatasetIds, @Nullable ArrayList<AutofillId> manuallyFilledFieldIds, @Nullable ArrayList<ArrayList<String>> manuallyFilledDatasetIds, - @NonNull ArrayList<AutofillId> detectedFieldIdsList, - @NonNull ArrayList<Match> detectedMatchesList) { + @Nullable ArrayList<AutofillId> detectedFieldIdsList, + @Nullable ArrayList<Match> detectedMatchesList) { synchronized (mLock) { if (isValidEventLocked("logDatasetNotSelected()", sessionId)) { AutofillId[] detectedFieldsIds = null; Match[] detectedMatches = null; - if (!detectedFieldIdsList.isEmpty()) { + if (detectedFieldIdsList != null) { detectedFieldsIds = new AutofillId[detectedFieldIdsList.size()]; detectedFieldIdsList.toArray(detectedFieldsIds); detectedMatches = new Match[detectedMatchesList.size()]; @@ -769,7 +801,8 @@ final class AutofillManagerServiceImpl { pw.print(prefix); pw.print("Default component: "); pw.println(mContext.getString(R.string.config_defaultAutofillService)); pw.print(prefix); pw.print("Disabled: "); pw.println(mDisabled); - pw.print(prefix); pw.print("Field detection: "); pw.println(isFieldDetectionEnabled()); + pw.print(prefix); pw.print("Field classification enabled: "); + pw.println(isFieldClassificationEnabled()); pw.print(prefix); pw.print("Setup complete: "); pw.println(mSetupComplete); pw.print(prefix); pw.print("Last prune: "); pw.println(mLastPrune); @@ -1026,10 +1059,10 @@ final class AutofillManagerServiceImpl { return false; } - // TODO(b/67867469): remove once feature is finished - boolean isFieldDetectionEnabled() { + boolean isFieldClassificationEnabled() { return Settings.Secure.getIntForUser( - mContext.getContentResolver(), Settings.Secure.AUTOFILL_FEATURE_FIELD_DETECTION, 0, + mContext.getContentResolver(), + Settings.Secure.AUTOFILL_FEATURE_FIELD_CLASSIFICATION, 0, mUserId) == 1; } diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index b6d8869f3672..4e64afb63341 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -65,7 +65,7 @@ import android.service.autofill.SaveInfo; import android.service.autofill.SaveRequest; import android.service.autofill.UserData; import android.service.autofill.ValueFinder; -import android.service.autofill.FieldsClassificationScorer; +import android.service.autofill.EditDistanceScorer; import android.util.ArrayMap; import android.util.ArraySet; import android.util.LocalLog; @@ -238,10 +238,15 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState structure.ensureData(); // Sanitize structure before it's sent to service. - if (!mComponentName.equals(structure.getActivityComponent())) { + final ComponentName componentNameFromApp = structure.getActivityComponent(); + if (!mComponentName.equals(componentNameFromApp)) { Slog.w(TAG, "Activity " + mComponentName + " forged different component on " - + "AssistStructure: " + structure.getActivityComponent()); + + "AssistStructure: " + componentNameFromApp); structure.setActivityComponent(mComponentName); + mMetricsLogger.write(newLogMaker(MetricsEvent.AUTOFILL_FORGED_COMPONENT_ATTEMPT) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_FORGED_COMPONENT_NAME, + componentNameFromApp == null ? "null" + : componentNameFromApp.flattenToShortString())); } structure.sanitizeForParceling(true); @@ -501,7 +506,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } // TODO(b/67867469): remove once feature is finished - if (response.getFieldClassificationIds() != null && !mService.isFieldDetectionEnabled()) { + if (response.getFieldClassificationIds() != null && !mService.isFieldClassificationEnabled()) { Slog.w(TAG, "Ignoring " + response + " because field detection is disabled"); processNullResponseLocked(requestFlags); return; @@ -1124,10 +1129,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState return; } String remoteId = null; - int topScore = 0; + float topScore = 0; for (int i = 0; i < userValues.length; i++) { final String value = userValues[i]; - final int score = FieldsClassificationScorer.getScore(currentValue, value); + final float score = userData.getScorer().getScore(currentValue, value); if (score > topScore) { topScore = score; remoteId = remoteIds[i]; @@ -1706,7 +1711,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState break; case ACTION_VIEW_ENTERED: if (sVerbose && virtualBounds != null) { - Slog.w(TAG, "entered on virtual child " + id + ": " + virtualBounds); + Slog.v(TAG, "entered on virtual child " + id + ": " + virtualBounds); } requestNewFillResponseIfNecessaryLocked(id, viewState, flags); diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index fc57a0d58400..dc35051d2dfe 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -108,6 +108,8 @@ import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; +import android.service.vr.IVrManager; +import android.service.vr.IVrStateCallbacks; import android.text.TextUtils; import android.text.style.SuggestionSpan; import android.util.ArrayMap; @@ -189,6 +191,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub static final int MSG_CREATE_SESSION = 1050; static final int MSG_START_INPUT = 2000; + static final int MSG_START_VR_INPUT = 2010; static final int MSG_UNBIND_CLIENT = 3000; static final int MSG_BIND_CLIENT = 3010; @@ -317,6 +320,28 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } + /** + * VR state callback. + * Listens for when VR mode finishes. + */ + private final IVrStateCallbacks mVrStateCallbacks = new IVrStateCallbacks.Stub() { + @Override + public void onVrStateChanged(boolean enabled) { + if (!enabled) { + restoreNonVrImeFromSettingsNoCheck(); + } + } + }; + + private void restoreNonVrImeFromSettingsNoCheck() { + // switch back to non-VR InputMethod from settings. + synchronized (mMethodMap) { + final String lastInputId = mSettings.getSelectedInputMethod(); + setInputMethodLocked(lastInputId, + mSettings.getSelectedInputMethodSubtypeId(lastInputId)); + } + } + static final class ClientState { final IInputMethodClient client; final IInputContext inputContext; @@ -863,6 +888,30 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } /** + * Start a VR InputMethod that matches IME with package name of {@param component}. + * Note: This method is called from {@link VrManager}. + */ + private void startVrInputMethodNoCheck(@Nullable ComponentName component) { + if (component == null) { + // clear the current VR-only IME (if any) and restore normal IME. + restoreNonVrImeFromSettingsNoCheck(); + return; + } + + synchronized (mMethodMap) { + String packageName = component.getPackageName(); + for (InputMethodInfo info : mMethodList) { + if (TextUtils.equals(info.getPackageName(), packageName) && info.isVrOnly()) { + // set this is as current inputMethod without updating settings. + setInputMethodEnabled(info.getId(), true); + setInputMethodLocked(info.getId(), NOT_A_SUBTYPE_ID); + break; + } + } + } + } + + /** * Handles {@link Intent#ACTION_LOCALE_CHANGED}. * * <p>Note: For historical reasons, {@link Intent#ACTION_LOCALE_CHANGED} has been sent to all @@ -1338,6 +1387,15 @@ public class InputMethodManagerService extends IInputMethodManager.Stub mFileManager = new InputMethodFileManager(mMethodMap, userId); mSwitchingController = InputMethodSubtypeSwitchingController.createInstanceLocked( mSettings, context); + // Register VR-state listener. + IVrManager vrManager = (IVrManager) ServiceManager.getService(Context.VR_SERVICE); + if (vrManager != null) { + try { + vrManager.registerListener(mVrStateCallbacks); + } catch (RemoteException e) { + Slog.e(TAG, "Failed to register VR mode state listener."); + } + } } private void resetDefaultImeLocked(Context context) { @@ -1562,12 +1620,27 @@ public class InputMethodManagerService extends IInputMethodManager.Stub @Override public List<InputMethodInfo> getInputMethodList() { + return getInputMethodList(false /* isVrOnly */); + } + + public List<InputMethodInfo> getVrInputMethodList() { + return getInputMethodList(true /* isVrOnly */); + } + + private List<InputMethodInfo> getInputMethodList(final boolean isVrOnly) { // TODO: Make this work even for non-current users? if (!calledFromValidUser()) { return Collections.emptyList(); } synchronized (mMethodMap) { - return new ArrayList<>(mMethodList); + ArrayList<InputMethodInfo> methodList = new ArrayList<>(); + for (InputMethodInfo info : mMethodList) { + + if (info.isVrOnly() == isVrOnly) { + methodList.add(info); + } + } + return methodList; } } @@ -3356,6 +3429,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub case MSG_SET_INTERACTIVE: handleSetInteractive(msg.arg1 != 0); return true; + case MSG_START_VR_INPUT: + startVrInputMethodNoCheck((ComponentName) msg.obj); + return true; case MSG_SWITCH_IME: handleSwitchInputMethod(msg.arg1 != 0); return true; @@ -3876,8 +3952,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private void setSelectedInputMethodAndSubtypeLocked(InputMethodInfo imi, int subtypeId, boolean setSubtypeOnly) { - // Update the history of InputMethod and Subtype - mSettings.saveCurrentInputMethodAndSubtypeToHistory(mCurMethodId, mCurrentSubtype); + // Updates to InputMethod are transient in VR mode. Its not included in history. + final boolean isVrInput = imi != null && imi.isVrOnly(); + if (!isVrInput) { + // Update the history of InputMethod and Subtype + mSettings.saveCurrentInputMethodAndSubtypeToHistory(mCurMethodId, mCurrentSubtype); + } mCurUserActionNotificationSequenceNumber = Math.max(mCurUserActionNotificationSequenceNumber + 1, 1); @@ -3892,6 +3972,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub mCurUserActionNotificationSequenceNumber, mCurClient)); } + if (isVrInput) { + // Updates to InputMethod are transient in VR mode. Any changes to Settings are skipped. + return; + } + // Set Subtype here if (imi == null || subtypeId < 0) { mSettings.putSelectedSubtype(NOT_A_SUBTYPE_ID); @@ -4351,6 +4436,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub mHandler.removeMessages(MSG_HIDE_CURRENT_INPUT_METHOD); mHandler.sendEmptyMessage(MSG_HIDE_CURRENT_INPUT_METHOD); } + + @Override + public void startVrInputMethodNoCheck(@Nullable ComponentName componentName) { + mHandler.sendMessage(mHandler.obtainMessage(MSG_START_VR_INPUT, componentName)); + } } private static String imeWindowStatusToString(final int imeWindowVis) { diff --git a/services/core/java/com/android/server/am/ActivityDisplay.java b/services/core/java/com/android/server/am/ActivityDisplay.java index 2d2424fe7b59..9bfdd0c5009c 100644 --- a/services/core/java/com/android/server/am/ActivityDisplay.java +++ b/services/core/java/com/android/server/am/ActivityDisplay.java @@ -433,7 +433,9 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> { || !otherStack.affectedBySplitScreenResize()) { continue; } - otherStack.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY); + otherStack.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, + false /* animate */, false /* showRecents */, + false /* sendNonResizeableNotification */); } } finally { mSupervisor.mWindowManager.continueSurfaceLayout(); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 2ca2c27d0958..5d6cf749bd1c 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8877,7 +8877,10 @@ public class ActivityManagerService extends IActivityManager.Stub final int callingAppId = UserHandle.getAppId(callingUid); if ((callingAppId == SYSTEM_UID) || (callingAppId == ROOT_UID)) { if ("com.android.settings.files".equals(grantUri.uri.getAuthority())) { - // Exempted authority for cropping user photos in Settings app + // Exempted authority for + // 1. cropping user photos and sharing a generated license html + // file in Settings app + // 2. sharing a generated license html file in TvSettings app } else { Slog.w(TAG, "For security reasons, the system cannot issue a Uri permission" + " grant to " + grantUri + "; use startActivityAsCaller() instead"); @@ -10567,7 +10570,8 @@ public class ActivityManagerService extends IActivityManager.Stub if (toTop) { stack.moveToFront("setTaskWindowingModeSplitScreenPrimary", task); } - stack.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, animate, showRecents); + stack.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, animate, showRecents, + true /* sendNonResizeableNotification */); return windowingMode != task.getWindowingMode(); } finally { Binder.restoreCallingIdentity(ident); @@ -20676,7 +20680,7 @@ public class ActivityManagerService extends IActivityManager.Stub if (DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION, "Sending to proc " + app.processName + " new config " + configCopy); mLifecycleManager.scheduleTransaction(app.thread, - new ConfigurationChangeItem(configCopy)); + ConfigurationChangeItem.obtain(configCopy)); } } catch (Exception e) { Slog.e(TAG_CONFIGURATION, "Failed to schedule configuration change", e); diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index a089e6ceef78..60a623677825 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -618,7 +618,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo + ", displayId=" + displayId + ", config=" + config); service.mLifecycleManager.scheduleTransaction(app.thread, appToken, - new MoveToDisplayItem(displayId, config)); + MoveToDisplayItem.obtain(displayId, config)); } catch (RemoteException e) { // If process died, whatever. } @@ -636,7 +636,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo + config); service.mLifecycleManager.scheduleTransaction(app.thread, appToken, - new ActivityConfigurationChangeItem(config)); + ActivityConfigurationChangeItem.obtain(config)); } catch (RemoteException e) { // If process died, whatever. } @@ -663,7 +663,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo private void scheduleMultiWindowModeChanged(Configuration overrideConfig) { try { service.mLifecycleManager.scheduleTransaction(app.thread, appToken, - new MultiWindowModeChangeItem(mLastReportedMultiWindowMode, + MultiWindowModeChangeItem.obtain(mLastReportedMultiWindowMode, overrideConfig)); } catch (Exception e) { // If process died, I don't care. @@ -691,7 +691,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo private void schedulePictureInPictureModeChanged(Configuration overrideConfig) { try { service.mLifecycleManager.scheduleTransaction(app.thread, appToken, - new PipModeChangeItem(mLastReportedPictureInPictureMode, + PipModeChangeItem.obtain(mLastReportedPictureInPictureMode, overrideConfig)); } catch (Exception e) { // If process died, no one cares. @@ -1380,7 +1380,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo ArrayList<ReferrerIntent> ar = new ArrayList<>(1); ar.add(rintent); service.mLifecycleManager.scheduleTransaction(app.thread, appToken, - new NewIntentItem(ar, state == PAUSED)); + NewIntentItem.obtain(ar, state == PAUSED)); unsent = false; } catch (RemoteException e) { Slog.w(TAG, "Exception thrown sending new intent to " + this, e); @@ -1603,7 +1603,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo sleeping = false; app.pendingUiClean = true; service.mLifecycleManager.scheduleTransaction(app.thread, appToken, - new WindowVisibilityItem(true /* showWindow */)); + WindowVisibilityItem.obtain(true /* showWindow */)); // The activity may be waiting for stop, but that is no longer appropriate for it. mStackSupervisor.mStoppingActivities.remove(this); mStackSupervisor.mGoingToSleepActivities.remove(this); diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index edf9813497e0..cf40be53e70d 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -483,10 +483,12 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai @Override public void setWindowingMode(int windowingMode) { - setWindowingMode(windowingMode, false /* animate */, true /* showRecents */); + setWindowingMode(windowingMode, false /* animate */, true /* showRecents */, + true /* sendNonResizeableNotification */); } - void setWindowingMode(int preferredWindowingMode, boolean animate, boolean showRecents) { + void setWindowingMode(int preferredWindowingMode, boolean animate, boolean showRecents, + boolean sendNonResizeableNotification) { final int currentMode = getWindowingMode(); final ActivityDisplay display = getDisplay(); final TaskRecord topTask = topTask(); @@ -505,7 +507,8 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai final boolean alreadyInSplitScreenMode = display.hasSplitScreenPrimaryStack(); // Take any required action due to us not supporting the preferred windowing mode. - if (windowingMode != preferredWindowingMode && isActivityTypeStandardOrUndefined()) { + if (sendNonResizeableNotification + && windowingMode != preferredWindowingMode && isActivityTypeStandardOrUndefined()) { if (alreadyInSplitScreenMode && (preferredWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY || preferredWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY)) { @@ -524,8 +527,9 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai final WindowManagerService wm = mService.mWindowManager; final ActivityRecord topActivity = getTopActivity(); - if (windowingMode != WINDOWING_MODE_FULLSCREEN && topActivity != null - && topActivity.isNonResizableOrForcedResizable() && !topActivity.noDisplay) { + if (sendNonResizeableNotification && windowingMode != WINDOWING_MODE_FULLSCREEN + && topActivity != null && topActivity.isNonResizableOrForcedResizable() + && !topActivity.noDisplay) { // Inform the user that they are starting an app that may not work correctly in // multi-window mode. final String packageName = topActivity.appInfo.packageName; @@ -1430,7 +1434,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai mService.updateUsageStats(prev, false); mService.mLifecycleManager.scheduleTransaction(prev.app.thread, prev.appToken, - new PauseActivityItem(prev.finishing, userLeaving, + PauseActivityItem.obtain(prev.finishing, userLeaving, prev.configChangeFlags, pauseImmediately)); } catch (Exception e) { // Ignore exception, if process died other code will cleanup. @@ -2061,7 +2065,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Scheduling invisibility: " + r); mService.mLifecycleManager.scheduleTransaction(r.app.thread, r.appToken, - new WindowVisibilityItem(false /* showWindow */)); + WindowVisibilityItem.obtain(false /* showWindow */)); } // Reset the flag indicating that an app can enter picture-in-picture once the @@ -2589,13 +2593,13 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai if (DEBUG_RESULTS) Slog.v(TAG_RESULTS, "Delivering results to " + next + ": " + a); mService.mLifecycleManager.scheduleTransaction(next.app.thread, - next.appToken, new ActivityResultItem(a)); + next.appToken, ActivityResultItem.obtain(a)); } } if (next.newIntents != null) { mService.mLifecycleManager.scheduleTransaction(next.app.thread, - next.appToken, new NewIntentItem(next.newIntents, + next.appToken, NewIntentItem.obtain(next.newIntents, false /* andPause */)); } @@ -2614,7 +2618,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai next.app.forceProcessStateUpTo(mService.mTopProcessState); next.clearOptionsLocked(); mService.mLifecycleManager.scheduleTransaction(next.app.thread, next.appToken, - new ResumeActivityItem(next.app.repProcState, + ResumeActivityItem.obtain(next.app.repProcState, mService.isNextTransitionForward())); if (DEBUG_STATES) Slog.d(TAG_STATES, "resumeTopActivityLocked: Resumed " @@ -3266,7 +3270,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai list.add(new ResultInfo(resultWho, requestCode, resultCode, data)); mService.mLifecycleManager.scheduleTransaction(r.app.thread, r.appToken, - new ActivityResultItem(list)); + ActivityResultItem.obtain(list)); return; } catch (Exception e) { Slog.w(TAG, "Exception thrown sending result to " + r, e); @@ -3395,7 +3399,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai EventLogTags.writeAmStopActivity( r.userId, System.identityHashCode(r), r.shortComponentName); mService.mLifecycleManager.scheduleTransaction(r.app.thread, r.appToken, - new StopActivityItem(r.visible, r.configChangeFlags)); + StopActivityItem.obtain(r.visible, r.configChangeFlags)); if (shouldSleepOrShutDownActivities()) { r.setSleeping(true); } @@ -4201,7 +4205,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai try { if (DEBUG_SWITCH) Slog.i(TAG_SWITCH, "Destroying: " + r); mService.mLifecycleManager.scheduleTransaction(r.app.thread, r.appToken, - new DestroyActivityItem(r.finishing, r.configChangeFlags)); + DestroyActivityItem.obtain(r.finishing, r.configChangeFlags)); } catch (Exception e) { // We can just ignore exceptions here... if the process // has crashed, our death notification will clean things diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index cd3b21c63ad6..edaa51112867 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -114,7 +114,11 @@ import android.app.ResultInfo; import android.app.WaitResult; import android.app.WindowConfiguration.ActivityType; import android.app.WindowConfiguration.WindowingMode; +import android.app.servertransaction.ActivityLifecycleItem; +import android.app.servertransaction.ClientTransaction; import android.app.servertransaction.LaunchActivityItem; +import android.app.servertransaction.PauseActivityItem; +import android.app.servertransaction.ResumeActivityItem; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -1235,9 +1239,16 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D ResolveInfo resolveIntent(Intent intent, String resolvedType, int userId, int flags) { synchronized (mService) { - return mService.getPackageManagerInternalLocked().resolveIntent(intent, resolvedType, - PackageManager.MATCH_INSTANT | PackageManager.MATCH_DEFAULT_ONLY | flags - | ActivityManagerService.STOCK_PM_FLAGS, userId, true); + try { + Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "resolveIntent"); + return mService.getPackageManagerInternalLocked().resolveIntent( + intent, resolvedType, PackageManager.MATCH_INSTANT + | PackageManager.MATCH_DEFAULT_ONLY | flags + | ActivityManagerService.STOCK_PM_FLAGS, userId, true); + + } finally { + Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER); + } } } @@ -1393,16 +1404,33 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D r.setLastReportedConfiguration(mergedConfiguration); logIfTransactionTooLarge(r.intent, r.icicle); - mService.mLifecycleManager.scheduleTransaction(app.thread, r.appToken, - new LaunchActivityItem(new Intent(r.intent), + + + // Create activity launch transaction. + final ClientTransaction clientTransaction = ClientTransaction.obtain(app.thread, + r.appToken); + clientTransaction.addCallback(LaunchActivityItem.obtain(new Intent(r.intent), System.identityHashCode(r), r.info, // TODO: Have this take the merged configuration instead of separate global // and override configs. mergedConfiguration.getGlobalConfiguration(), mergedConfiguration.getOverrideConfiguration(), r.compat, r.launchedFromPackage, task.voiceInteractor, app.repProcState, r.icicle, - r.persistentState, results, newIntents, !andResume, - mService.isNextTransitionForward(), profilerInfo)); + r.persistentState, results, newIntents, mService.isNextTransitionForward(), + profilerInfo)); + + // Set desired final state. + final ActivityLifecycleItem lifecycleItem; + if (andResume) { + lifecycleItem = ResumeActivityItem.obtain(mService.isNextTransitionForward()); + } else { + lifecycleItem = PauseActivityItem.obtain(); + } + clientTransaction.setLifecycleStateRequest(lifecycleItem); + + // Schedule transaction. + mService.mLifecycleManager.scheduleTransaction(clientTransaction); + if ((app.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_CANT_SAVE_STATE) != 0) { // This may be a heavy-weight process! Note that the package diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index dda8e9c18229..10fb6e2a0896 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -96,6 +96,7 @@ import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.os.SystemClock; +import android.os.Trace; import android.os.UserHandle; import android.os.UserManager; import android.service.voice.IVoiceInteractionSession; diff --git a/services/core/java/com/android/server/am/ClientLifecycleManager.java b/services/core/java/com/android/server/am/ClientLifecycleManager.java index c04d103c7ff5..cc70f18dc747 100644 --- a/services/core/java/com/android/server/am/ClientLifecycleManager.java +++ b/services/core/java/com/android/server/am/ClientLifecycleManager.java @@ -43,6 +43,7 @@ class ClientLifecycleManager { */ void scheduleTransaction(ClientTransaction transaction) throws RemoteException { transaction.schedule(); + transaction.recycle(); } /** @@ -100,7 +101,7 @@ class ClientLifecycleManager { */ private static ClientTransaction transactionWithState(@NonNull IApplicationThread client, @NonNull IBinder activityToken, @NonNull ActivityLifecycleItem stateRequest) { - final ClientTransaction clientTransaction = new ClientTransaction(client, activityToken); + final ClientTransaction clientTransaction = ClientTransaction.obtain(client, activityToken); clientTransaction.setLifecycleStateRequest(stateRequest); return clientTransaction; } @@ -113,7 +114,7 @@ class ClientLifecycleManager { */ private static ClientTransaction transactionWithCallback(@NonNull IApplicationThread client, IBinder activityToken, @NonNull ClientTransactionItem callback) { - final ClientTransaction clientTransaction = new ClientTransaction(client, activityToken); + final ClientTransaction clientTransaction = ClientTransaction.obtain(client, activityToken); clientTransaction.addCallback(callback); return clientTransaction; } diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java index 9cd52d779be0..bdfd4bdab3b9 100644 --- a/services/core/java/com/android/server/content/SyncManager.java +++ b/services/core/java/com/android/server/content/SyncManager.java @@ -323,7 +323,7 @@ public class SyncManager { private final BroadcastReceiver mAccountsUpdatedReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - EndPoint target = new EndPoint(null, null, context.getUserId()); + EndPoint target = new EndPoint(null, null, getSendingUserId()); updateRunningAccounts(target /* sync targets for user */); } }; diff --git a/services/core/java/com/android/server/display/ColorDisplayService.java b/services/core/java/com/android/server/display/ColorDisplayService.java index af8ecadd3c97..75f30562d13e 100644 --- a/services/core/java/com/android/server/display/ColorDisplayService.java +++ b/services/core/java/com/android/server/display/ColorDisplayService.java @@ -33,11 +33,8 @@ import android.net.Uri; import android.opengl.Matrix; import android.os.Handler; import android.os.Looper; -import android.os.RemoteException; import android.os.UserHandle; import android.provider.Settings.Secure; -import android.service.vr.IVrManager; -import android.service.vr.IVrStateCallbacks; import android.util.MathUtils; import android.util.Slog; import android.view.animation.AnimationUtils; @@ -51,7 +48,6 @@ import com.android.server.twilight.TwilightState; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.ZoneId; -import java.util.concurrent.atomic.AtomicBoolean; import com.android.internal.R; @@ -84,32 +80,6 @@ public final class ColorDisplayService extends SystemService private static final ColorMatrixEvaluator COLOR_MATRIX_EVALUATOR = new ColorMatrixEvaluator(); private final Handler mHandler; - private final AtomicBoolean mIgnoreAllColorMatrixChanges = new AtomicBoolean(); - private final IVrStateCallbacks mVrStateCallbacks = new IVrStateCallbacks.Stub() { - @Override - public void onVrStateChanged(final boolean enabled) { - // Turn off all night mode display stuff while device is in VR mode. - mIgnoreAllColorMatrixChanges.set(enabled); - mHandler.post(new Runnable() { - @Override - public void run() { - // Cancel in-progress animations - if (mColorMatrixAnimator != null) { - mColorMatrixAnimator.cancel(); - } - - final DisplayTransformManager dtm = - getLocalService(DisplayTransformManager.class); - if (enabled) { - dtm.setColorMatrix(LEVEL_COLOR_MATRIX_NIGHT_DISPLAY, MATRIX_IDENTITY); - } else if (mController != null && mController.isActivated()) { - setMatrix(mController.getColorTemperature(), mMatrixNight); - dtm.setColorMatrix(LEVEL_COLOR_MATRIX_NIGHT_DISPLAY, mMatrixNight); - } - } - }); - } - }; private float[] mMatrixNight = new float[16]; @@ -136,18 +106,6 @@ public final class ColorDisplayService extends SystemService @Override public void onBootPhase(int phase) { - if (phase >= PHASE_SYSTEM_SERVICES_READY) { - final IVrManager vrManager = IVrManager.Stub.asInterface( - getBinderService(Context.VR_SERVICE)); - if (vrManager != null) { - try { - vrManager.registerListener(mVrStateCallbacks); - } catch (RemoteException e) { - Slog.e(TAG, "Failed to register VR mode state listener: " + e); - } - } - } - if (phase >= PHASE_BOOT_COMPLETED) { mBootCompleted = true; @@ -359,11 +317,6 @@ public final class ColorDisplayService extends SystemService mColorMatrixAnimator.cancel(); } - // Don't do any color matrix change animations if we are ignoring them anyway. - if (mIgnoreAllColorMatrixChanges.get()) { - return; - } - final DisplayTransformManager dtm = getLocalService(DisplayTransformManager.class); final float[] from = dtm.getColorMatrix(LEVEL_COLOR_MATRIX_NIGHT_DISPLAY); final float[] to = mIsActivated ? mMatrixNight : MATRIX_IDENTITY; diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 019c7c2fe915..7d64aed4fac3 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -39,8 +39,10 @@ import android.content.pm.ServiceInfo; import android.content.pm.UserInfo; import android.os.Binder; import android.os.Build; +import android.os.Handler; import android.os.IBinder; import android.os.IInterface; +import android.os.Looper; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; @@ -86,6 +88,7 @@ abstract public class ManagedServices { protected final String TAG = getClass().getSimpleName(); protected final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + private static final int ON_BINDING_DIED_REBIND_DELAY_MS = 10000; protected static final String ENABLED_SERVICES_SEPARATOR = ":"; /** @@ -105,12 +108,15 @@ abstract public class ManagedServices { private final IPackageManager mPm; private final UserManager mUm; private final Config mConfig; + private final Handler mHandler = new Handler(Looper.getMainLooper()); // contains connections to all connected services, including app services // and system services private final ArrayList<ManagedServiceInfo> mServices = new ArrayList<>(); // things that will be put into mServices as soon as they're ready private final ArrayList<String> mServicesBinding = new ArrayList<>(); + private final ArraySet<String> mServicesRebinding = new ArraySet<>(); + // lists the component names of all enabled (and therefore potentially connected) // app services for current profiles. private ArraySet<ComponentName> mEnabledServicesForCurrentProfiles @@ -890,6 +896,7 @@ abstract public class ManagedServices { final String servicesBindingTag = name.toString() + "/" + userid; if (mServicesBinding.contains(servicesBindingTag)) { + Slog.v(TAG, "Not registering " + name + " as bind is already in progress"); // stop registering this thing already! we're working on it return; } @@ -938,6 +945,7 @@ abstract public class ManagedServices { boolean added = false; ManagedServiceInfo info = null; synchronized (mMutex) { + mServicesRebinding.remove(servicesBindingTag); mServicesBinding.remove(servicesBindingTag); try { mService = asInterface(binder); @@ -959,6 +967,27 @@ abstract public class ManagedServices { mServicesBinding.remove(servicesBindingTag); Slog.v(TAG, getCaption() + " connection lost: " + name); } + + @Override + public void onBindingDied(ComponentName name) { + Slog.w(TAG, getCaption() + " binding died: " + name); + synchronized (mMutex) { + mServicesBinding.remove(servicesBindingTag); + mContext.unbindService(this); + if (!mServicesRebinding.contains(servicesBindingTag)) { + mServicesRebinding.add(servicesBindingTag); + mHandler.postDelayed(new Runnable() { + @Override + public void run() { + registerService(name, userid); + } + }, ON_BINDING_DIED_REBIND_DELAY_MS); + } else { + Slog.v(TAG, getCaption() + " not rebinding as " + + "a previous rebind attempt was made: " + name); + } + } + } }; if (!mContext.bindServiceAsUser(intent, serviceConnection, diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 8b2854c56977..f60cb06a7756 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -9714,6 +9714,7 @@ public class PackageManagerService extends IPackageManager.Stub // them in the case where we're not upgrading or booting for the first time. String primaryCpuAbiFromSettings = null; String secondaryCpuAbiFromSettings = null; + boolean needToDeriveAbi = (scanFlags & SCAN_FIRST_BOOT_OR_UPGRADE) != 0; // writer synchronized (mPackages) { @@ -9791,11 +9792,14 @@ public class PackageManagerService extends IPackageManager.Stub } } - if ((scanFlags & SCAN_FIRST_BOOT_OR_UPGRADE) == 0) { + if (!needToDeriveAbi) { PackageSetting foundPs = mSettings.getPackageLPr(pkg.packageName); if (foundPs != null) { primaryCpuAbiFromSettings = foundPs.primaryCpuAbiString; secondaryCpuAbiFromSettings = foundPs.secondaryCpuAbiString; + } else { + // when re-adding a system package failed after uninstalling updates. + needToDeriveAbi = true; } } @@ -10011,7 +10015,7 @@ public class PackageManagerService extends IPackageManager.Stub final String cpuAbiOverride = deriveAbiOverride(pkg.cpuAbiOverride, pkgSetting); if ((scanFlags & SCAN_NEW_INSTALL) == 0) { - if ((scanFlags & SCAN_FIRST_BOOT_OR_UPGRADE) != 0) { + if (needToDeriveAbi) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "derivePackageAbi"); final boolean extractNativeLibs = !pkg.isLibrary(); derivePackageAbi(pkg, cpuAbiOverride, extractNativeLibs, mAppLib32InstallDir); diff --git a/services/core/java/com/android/server/pm/SELinuxMMAC.java b/services/core/java/com/android/server/pm/SELinuxMMAC.java index 388491642e1e..f0ce3c9d230e 100644 --- a/services/core/java/com/android/server/pm/SELinuxMMAC.java +++ b/services/core/java/com/android/server/pm/SELinuxMMAC.java @@ -60,8 +60,10 @@ public final class SELinuxMMAC { // to synchronize access during policy load and access attempts. private static List<Policy> sPolicies = new ArrayList<>(); - // Required MAC permissions files. - private static List<File> sMacPermissions = new ArrayList<>(); + /** Path to MAC permissions on system image */ + private static final File[] MAC_PERMISSIONS = + { new File(Environment.getRootDirectory(), "/etc/selinux/plat_mac_permissions.xml"), + new File(Environment.getVendorDirectory(), "/etc/selinux/nonplat_mac_permissions.xml") }; // Append privapp to existing seinfo label private static final String PRIVILEGED_APP_STR = ":privapp"; @@ -74,11 +76,11 @@ public final class SELinuxMMAC { /** * Load the mac_permissions.xml file containing all seinfo assignments used to - * label apps. The loaded mac_permissions.xml files are plat_mac_permissions.xml and - * vendor_mac_permissions.xml, on /system and /vendor partitions, respectively. - * odm_mac_permissions.xml on /odm partition is optional. For further guidance on + * label apps. The loaded mac_permissions.xml file is determined by the + * MAC_PERMISSIONS class variable which is set at class load time which itself + * is based on the USE_OVERRIDE_POLICY class variable. For further guidance on * the proper structure of a mac_permissions.xml file consult the source code - * located at system/sepolicy/private/mac_permissions.xml. + * located at system/sepolicy/mac_permissions.xml. * * @return boolean indicating if policy was correctly loaded. A value of false * typically indicates a structural problem with the xml or incorrectly @@ -91,42 +93,10 @@ public final class SELinuxMMAC { FileReader policyFile = null; XmlPullParser parser = Xml.newPullParser(); - - synchronized (sMacPermissions) { - // Only initialize it once. - if (sMacPermissions.isEmpty()) { - // Platform mac permissions. - sMacPermissions.add(new File( - Environment.getRootDirectory(), "/etc/selinux/plat_mac_permissions.xml")); - - // Vendor mac permissions. - // The filename has been renamed from nonplat_mac_permissions to - // vendor_mac_permissions. Either of them should exist. - File vendorMacPermission = new File( - Environment.getVendorDirectory(), "/etc/selinux/vendor_mac_permissions.xml"); - if (vendorMacPermission.exists()) { - sMacPermissions.add(vendorMacPermission); - } else { - // For backward compatibility. - sMacPermissions.add(new File(Environment.getVendorDirectory(), - "/etc/selinux/nonplat_mac_permissions.xml")); - } - - // ODM mac permissions (optional). - File odmMacPermission = new File( - Environment.getOdmDirectory(), "/etc/selinux/odm_mac_permissions.xml"); - if (odmMacPermission.exists()) { - sMacPermissions.add(odmMacPermission); - } - } - } - - final int count = sMacPermissions.size(); - for (int i = 0; i < count; ++i) { - File macPermission = sMacPermissions.get(i); + for (int i = 0; i < MAC_PERMISSIONS.length; i++) { try { - policyFile = new FileReader(macPermission); - Slog.d(TAG, "Using policy file " + macPermission); + policyFile = new FileReader(MAC_PERMISSIONS[i]); + Slog.d(TAG, "Using policy file " + MAC_PERMISSIONS[i]); parser.setInput(policyFile); parser.nextTag(); @@ -150,13 +120,13 @@ public final class SELinuxMMAC { StringBuilder sb = new StringBuilder("Exception @"); sb.append(parser.getPositionDescription()); sb.append(" while parsing "); - sb.append(macPermission); + sb.append(MAC_PERMISSIONS[i]); sb.append(":"); sb.append(ex); Slog.w(TAG, sb.toString()); return false; } catch (IOException ioe) { - Slog.w(TAG, "Exception parsing " + macPermission, ioe); + Slog.w(TAG, "Exception parsing " + MAC_PERMISSIONS[i], ioe); return false; } finally { IoUtils.closeQuietly(policyFile); diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 0907dd7c5a9e..ee2f3742c811 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -2739,6 +2739,26 @@ public class ShortcutService extends IShortcutService.Stub { public boolean isRequestPinItemSupported(int callingUserId, int requestType) { return ShortcutService.this.isRequestPinItemSupported(callingUserId, requestType); } + + @Override + public boolean isForegroundDefaultLauncher(@NonNull String callingPackage, int callingUid) { + Preconditions.checkNotNull(callingPackage); + + final int userId = UserHandle.getUserId(callingUid); + final ComponentName defaultLauncher = getDefaultLauncher(userId); + if (defaultLauncher == null) { + return false; + } + if (!callingPackage.equals(defaultLauncher.getPackageName())) { + return false; + } + synchronized (mLock) { + if (!isUidForegroundLocked(callingUid)) { + return false; + } + } + return true; + } } final BroadcastReceiver mReceiver = new BroadcastReceiver() { diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 4da74521dd20..61591bbef08d 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -48,6 +48,7 @@ import static android.view.WindowManager.INPUT_CONSUMER_NAVIGATION; import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW; +import static android.view.WindowManager.LayoutParams.FLAG2_LAYOUT_IN_DISPLAY_CUTOUT_AREA; import static android.view.WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON; import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; import static android.view.WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN; @@ -211,6 +212,7 @@ import android.util.Slog; import android.util.SparseArray; import android.util.proto.ProtoOutputStream; import android.view.Display; +import android.view.DisplayCutout; import android.view.Gravity; import android.view.HapticFeedbackConstants; import android.view.IApplicationToken; @@ -606,6 +608,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { PointerLocationView mPointerLocationView; + boolean mEmulateDisplayCutout = false; + // During layout, the layer at which the doc window is placed. int mDockLayer; // During layout, this is the layer of the status bar. @@ -964,6 +968,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { resolver.registerContentObserver(Settings.Global.getUriFor( Settings.Global.POLICY_CONTROL), false, this, UserHandle.USER_ALL); + resolver.registerContentObserver(Settings.Global.getUriFor( + Settings.Global.EMULATE_DISPLAY_CUTOUT), false, this, + UserHandle.USER_ALL); updateSettings(); } @@ -2395,6 +2402,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (mImmersiveModeConfirmation != null) { mImmersiveModeConfirmation.loadSetting(mCurrentUserId); } + mEmulateDisplayCutout = Settings.Global.getInt(resolver, + Settings.Global.EMULATE_DISPLAY_CUTOUT, + Settings.Global.EMULATE_DISPLAY_CUTOUT_OFF) + != Settings.Global.EMULATE_DISPLAY_CUTOUT_OFF; } synchronized (mWindowManagerFuncs.getWindowManagerLock()) { PolicyControl.reloadFromSetting(mContext); @@ -4337,7 +4348,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // TODO: Should probably be moved into DisplayFrames. public boolean getInsetHintLw(WindowManager.LayoutParams attrs, Rect taskBounds, DisplayFrames displayFrames, Rect outContentInsets, Rect outStableInsets, - Rect outOutsets) { + Rect outOutsets, DisplayCutout.ParcelableWrapper outDisplayCutout) { final int fl = PolicyControl.getWindowFlags(null, attrs); final int sysuiVis = PolicyControl.getSystemUiVisibility(null, attrs); final int systemUiVisibility = (sysuiVis | attrs.subtreeSystemUiVisibility); @@ -4363,12 +4374,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { if ((fl & (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR)) == (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR)) { + Rect frame; int availRight, availBottom; if (canHideNavigationBar() && (systemUiVisibility & View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) != 0) { + frame = displayFrames.mUnrestricted; availRight = displayFrames.mUnrestricted.right; availBottom = displayFrames.mUnrestricted.bottom; } else { + frame = displayFrames.mRestricted; availRight = displayFrames.mRestricted.right; availBottom = displayFrames.mRestricted.bottom; } @@ -4399,10 +4413,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { calculateRelevantTaskInsets(taskBounds, outStableInsets, displayWidth, displayHeight); } + outDisplayCutout.set(displayFrames.mDisplayCutout.calculateRelativeTo(frame)); return mForceShowSystemBars; } outContentInsets.setEmpty(); outStableInsets.setEmpty(); + outDisplayCutout.set(DisplayCutout.NO_CUTOUT); return mForceShowSystemBars; } @@ -4430,7 +4446,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { /** {@inheritDoc} */ @Override public void beginLayoutLw(DisplayFrames displayFrames, int uiMode) { - displayFrames.onBeginLayout(); + displayFrames.onBeginLayout(mEmulateDisplayCutout, mStatusBarHeight); // TODO(multi-display): This doesn't seem right...Maybe only apply to default display? mSystemGestures.screenWidth = displayFrames.mUnrestricted.width(); mSystemGestures.screenHeight = displayFrames.mUnrestricted.height(); @@ -4500,6 +4516,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } layoutScreenDecorWindows(displayFrames, pf, df, dcf); + + if (displayFrames.mDisplayCutoutSafe.top > displayFrames.mUnrestricted.top) { + // Make sure that the zone we're avoiding for the cutout is at least as tall as the + // status bar; otherwise fullscreen apps will end up cutting halfway into the status + // bar. + displayFrames.mDisplayCutoutSafe.top = Math.max(displayFrames.mDisplayCutoutSafe.top, + displayFrames.mStable.top); + } } private void layoutScreenDecorWindows(DisplayFrames displayFrames, Rect pf, Rect df, Rect dcf) { @@ -4521,7 +4545,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { w.computeFrameLw(pf /* parentFrame */, df /* displayFrame */, df /* overlayFrame */, df /* contentFrame */, df /* visibleFrame */, dcf /* decorFrame */, - df /* stableFrame */, df /* outsetFrame */); + df /* stableFrame */, df /* outsetFrame */, displayFrames.mDisplayCutout); final Rect frame = w.getFrameLw(); if (frame.left <= 0 && frame.top <= 0) { @@ -4583,7 +4607,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // Let the status bar determine its size. mStatusBar.computeFrameLw(pf /* parentFrame */, df /* displayFrame */, vf /* overlayFrame */, vf /* contentFrame */, vf /* visibleFrame */, - dcf /* decorFrame */, vf /* stableFrame */, vf /* outsetFrame */); + dcf /* decorFrame */, vf /* stableFrame */, vf /* outsetFrame */, + displayFrames.mDisplayCutout); // For layout, the status bar is always at the top with our fixed height. displayFrames.mStable.top = displayFrames.mUnrestricted.top + mStatusBarHeight; @@ -4634,11 +4659,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { final Rect dockFrame = displayFrames.mDock; mNavigationBarPosition = navigationBarPosition(displayWidth, displayHeight, rotation); + final Rect cutoutSafeUnrestricted = mTmpRect; + cutoutSafeUnrestricted.set(displayFrames.mUnrestricted); + cutoutSafeUnrestricted.intersectUnchecked(displayFrames.mDisplayCutoutSafe); + if (mNavigationBarPosition == NAV_BAR_BOTTOM) { // It's a system nav bar or a portrait screen; nav bar goes on bottom. - final int top = displayFrames.mUnrestricted.bottom + final int top = cutoutSafeUnrestricted.bottom - getNavigationBarHeight(rotation, uiMode); - mTmpNavigationFrame.set(0, top, displayWidth, displayFrames.mUnrestricted.bottom); + mTmpNavigationFrame.set(0, top, displayWidth, cutoutSafeUnrestricted.bottom); displayFrames.mStable.bottom = displayFrames.mStableFullscreen.bottom = top; if (transientNavBarShowing) { mNavigationBarController.setBarShowingLw(true); @@ -4659,9 +4688,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } else if (mNavigationBarPosition == NAV_BAR_RIGHT) { // Landscape screen; nav bar goes to the right. - final int left = displayFrames.mUnrestricted.right + final int left = cutoutSafeUnrestricted.right - getNavigationBarWidth(rotation, uiMode); - mTmpNavigationFrame.set(left, 0, displayFrames.mUnrestricted.right, displayHeight); + mTmpNavigationFrame.set(left, 0, cutoutSafeUnrestricted.right, displayHeight); displayFrames.mStable.right = displayFrames.mStableFullscreen.right = left; if (transientNavBarShowing) { mNavigationBarController.setBarShowingLw(true); @@ -4682,9 +4711,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } else if (mNavigationBarPosition == NAV_BAR_LEFT) { // Seascape screen; nav bar goes to the left. - final int right = displayFrames.mUnrestricted.left + final int right = cutoutSafeUnrestricted.left + getNavigationBarWidth(rotation, uiMode); - mTmpNavigationFrame.set(displayFrames.mUnrestricted.left, 0, right, displayHeight); + mTmpNavigationFrame.set(cutoutSafeUnrestricted.left, 0, right, displayHeight); displayFrames.mStable.left = displayFrames.mStableFullscreen.left = right; if (transientNavBarShowing) { mNavigationBarController.setBarShowingLw(true); @@ -4714,7 +4743,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // And compute the final frame. mNavigationBar.computeFrameLw(mTmpNavigationFrame, mTmpNavigationFrame, mTmpNavigationFrame, mTmpNavigationFrame, mTmpNavigationFrame, dcf, - mTmpNavigationFrame, mTmpNavigationFrame); + mTmpNavigationFrame, mTmpNavigationFrame, displayFrames.mDisplayCutout); if (DEBUG_LAYOUT) Slog.i(TAG, "mNavigationBar frame: " + mTmpNavigationFrame); return mNavigationBarController.checkHiddenLw(); } @@ -4836,6 +4865,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { final int type = attrs.type; final int fl = PolicyControl.getWindowFlags(win, attrs); + final long fl2 = attrs.flags2; final int pfl = attrs.privateFlags; final int sim = attrs.softInputMode; final int requestedSysUiFl = PolicyControl.getSystemUiVisibility(win, null); @@ -4856,6 +4886,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { final int adjust = sim & SOFT_INPUT_MASK_ADJUST; + final boolean requestedFullscreen = (fl & FLAG_FULLSCREEN) != 0 + || (requestedSysUiFl & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0 + || (requestedSysUiFl & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) != 0; + + final boolean layoutInScreen = (fl & FLAG_LAYOUT_IN_SCREEN) == FLAG_LAYOUT_IN_SCREEN; + final boolean layoutInsetDecor = (fl & FLAG_LAYOUT_INSET_DECOR) == FLAG_LAYOUT_INSET_DECOR; + final boolean layoutInCutout = (fl2 & FLAG2_LAYOUT_IN_DISPLAY_CUTOUT_AREA) != 0; + sf.set(displayFrames.mStable); if (type == TYPE_INPUT_METHOD) { @@ -4865,7 +4903,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { df.set(displayFrames.mDock); pf.set(displayFrames.mDock); // IM dock windows layout below the nav bar... - pf.bottom = df.bottom = of.bottom = displayFrames.mUnrestricted.bottom; + pf.bottom = df.bottom = of.bottom = Math.min(displayFrames.mUnrestricted.bottom, + displayFrames.mDisplayCutoutSafe.bottom); // ...with content insets above the nav bar cf.bottom = vf.bottom = displayFrames.mStable.bottom; if (mStatusBar != null && mFocusedWindow == mStatusBar && canReceiveInput(mStatusBar)) { @@ -4936,8 +4975,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } - if ((fl & (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR)) - == (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR)) { + if (layoutInScreen && layoutInsetDecor) { if (DEBUG_LAYOUT) Slog.v(TAG, "layoutWindowLw(" + attrs.getTitle() + "): IN_SCREEN, INSET_DECOR"); // This is the case for a normal activity window: we want it to cover all of the @@ -5014,6 +5052,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { // moving from a window that is not hiding the status bar to one that is. cf.set(displayFrames.mRestricted); } + if (requestedFullscreen && !layoutInCutout) { + pf.intersectUnchecked(displayFrames.mDisplayCutoutSafe); + } applyStableConstraints(sysUiFl, fl, cf, displayFrames); if (adjust != SOFT_INPUT_ADJUST_NOTHING) { vf.set(displayFrames.mCurrent); @@ -5021,7 +5062,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { vf.set(cf); } } - } else if ((fl & FLAG_LAYOUT_IN_SCREEN) != 0 || (sysUiFl + } else if (layoutInScreen || (sysUiFl & (View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)) != 0) { if (DEBUG_LAYOUT) Slog.v(TAG, "layoutWindowLw(" + attrs.getTitle() @@ -5099,6 +5140,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { of.set(displayFrames.mUnrestricted); df.set(displayFrames.mUnrestricted); pf.set(displayFrames.mUnrestricted); + if (requestedFullscreen && !layoutInCutout) { + pf.intersectUnchecked(displayFrames.mDisplayCutoutSafe); + } } else if ((sysUiFl & View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) != 0) { of.set(displayFrames.mRestricted); df.set(displayFrames.mRestricted); @@ -5169,9 +5213,27 @@ public class PhoneWindowManager implements WindowManagerPolicy { vf.set(cf); } } + pf.intersectUnchecked(displayFrames.mDisplayCutoutSafe); } } + // Ensure that windows that did not request to be laid out in the cutout don't get laid + // out there. + if (!layoutInCutout) { + final Rect displayCutoutSafeExceptMaybeTop = mTmpRect; + displayCutoutSafeExceptMaybeTop.set(displayFrames.mDisplayCutoutSafe); + if (layoutInScreen && layoutInsetDecor) { + // At the top we have the status bar, so apps that are + // LAYOUT_IN_SCREEN | LAYOUT_INSET_DECOR already expect that there's an inset + // there and we don't need to exclude the window from that area. + displayCutoutSafeExceptMaybeTop.top = Integer.MIN_VALUE; + } + pf.intersectUnchecked(displayCutoutSafeExceptMaybeTop); + } + + // Content should never appear in the cutout. + cf.intersectUnchecked(displayFrames.mDisplayCutoutSafe); + // TYPE_SYSTEM_ERROR is above the NavigationBar so it can't be allowed to extend over it. // Also, we don't allow windows in multi-window mode to extend out of the screen. if ((fl & FLAG_LAYOUT_NO_LIMITS) != 0 && type != TYPE_SYSTEM_ERROR @@ -5220,7 +5282,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { + " sf=" + sf.toShortString() + " osf=" + (osf == null ? "null" : osf.toShortString())); - win.computeFrameLw(pf, df, of, cf, vf, dcf, sf, osf); + win.computeFrameLw(pf, df, of, cf, vf, dcf, sf, osf, displayFrames.mDisplayCutout); // Dock windows carve out the bottom of the screen, so normal windows // can't appear underneath them. diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index 3d458c7ce918..bcb7212b620c 100644 --- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java @@ -77,6 +77,7 @@ import android.os.RemoteException; import android.util.Slog; import android.util.proto.ProtoOutputStream; import android.view.Display; +import android.view.DisplayCutout; import android.view.IApplicationToken; import android.view.IWindowManager; import android.view.InputEventReceiver; @@ -210,10 +211,11 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { * @param stableFrame The frame around which stable system decoration is positioned. * @param outsetFrame The frame that includes areas that aren't part of the surface but we * want to treat them as such. + * @param displayCutout the display displayCutout */ public void computeFrameLw(Rect parentFrame, Rect displayFrame, Rect overlayFrame, Rect contentFrame, Rect visibleFrame, Rect decorFrame, - Rect stableFrame, @Nullable Rect outsetFrame); + Rect stableFrame, @Nullable Rect outsetFrame, DisplayCutout displayCutout); /** * Retrieve the current frame of the window that has been assigned by @@ -1144,12 +1146,13 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { * @param outStableInsets The areas covered by stable system windows irrespective of their * current visibility. Expressed as positive insets. * @param outOutsets The areas that are not real display, but we would like to treat as such. + * @param outDisplayCutout The area that has been cut away from the display. * @return Whether to always consume the navigation bar. * See {@link #isNavBarForcedShownLw(WindowState)}. */ default boolean getInsetHintLw(WindowManager.LayoutParams attrs, Rect taskBounds, DisplayFrames displayFrames, Rect outContentInsets, Rect outStableInsets, - Rect outOutsets) { + Rect outOutsets, DisplayCutout.ParcelableWrapper outDisplayCutout) { return false; } diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java index 1f4e64e8b1b3..7d55b68f2c96 100644 --- a/services/core/java/com/android/server/vr/VrManagerService.java +++ b/services/core/java/com/android/server/vr/VrManagerService.java @@ -59,6 +59,7 @@ import android.util.ArraySet; import android.util.Slog; import android.util.SparseArray; import com.android.server.wm.WindowManagerInternal; +import android.view.inputmethod.InputMethodManagerInternal; import com.android.internal.R; import com.android.internal.util.DumpUtils; @@ -609,6 +610,14 @@ public class VrManagerService extends SystemService implements EnabledComponentC } @Override + public void setVrInputMethod(ComponentName componentName) { + enforceCallerPermissionAnyOf(Manifest.permission.RESTRICTED_VR_ACCESS); + InputMethodManagerInternal imm = + LocalServices.getService(InputMethodManagerInternal.class); + imm.startVrInputMethodNoCheck(componentName); + } + + @Override protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index ca8ffca00ee7..91cad469289a 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -135,6 +135,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; import android.os.SystemClock; +import android.os.Trace; import android.util.DisplayMetrics; import android.util.MutableBoolean; import android.util.Slog; @@ -178,20 +179,20 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo /** The containers below are the only child containers the display can have. */ // Contains all window containers that are related to apps (Activities) - private final TaskStackContainers mTaskStackContainers = new TaskStackContainers(); + private final TaskStackContainers mTaskStackContainers = new TaskStackContainers(mService); // Contains all non-app window containers that should be displayed above the app containers // (e.g. Status bar) private final AboveAppWindowContainers mAboveAppWindowsContainers = - new AboveAppWindowContainers("mAboveAppWindowsContainers"); + new AboveAppWindowContainers("mAboveAppWindowsContainers", mService); // Contains all non-app window containers that should be displayed below the app containers // (e.g. Wallpaper). private final NonAppWindowContainers mBelowAppWindowsContainers = - new NonAppWindowContainers("mBelowAppWindowsContainers"); + new NonAppWindowContainers("mBelowAppWindowsContainers", mService); // Contains all IME window containers. Note that the z-ordering of the IME windows will depend // on the IME target. We mainly have this container grouping so we can keep track of all the IME // window containers together and move them in-sync if/when needed. private final NonAppWindowContainers mImeWindowsContainers = - new NonAppWindowContainers("mImeWindowsContainers"); + new NonAppWindowContainers("mImeWindowsContainers", mService); private WindowState mTmpWindow; private WindowState mTmpWindow2; @@ -317,8 +318,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo /** Used for handing back size of display */ private final Rect mTmpBounds = new Rect(); - WindowManagerService mService; - /** Remove this display when animation on it has completed. */ private boolean mDeferredRemoval; @@ -765,6 +764,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo */ DisplayContent(Display display, WindowManagerService service, WallpaperController wallpaperController) { + super(service); if (service.mRoot.getDisplayContent(display.getDisplayId()) != null) { throw new IllegalArgumentException("Display with ID=" + display.getDisplayId() + " already exists=" + service.mRoot.getDisplayContent(display.getDisplayId()) @@ -777,7 +777,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo display.getDisplayInfo(mDisplayInfo); display.getMetrics(mDisplayMetrics); isDefaultDisplay = mDisplayId == DEFAULT_DISPLAY; - mService = service; mDisplayFrames = new DisplayFrames(mDisplayId, mDisplayInfo); initializeDisplayBaseInfo(); mDividerControllerLocked = new DockedStackDividerController(service, this); @@ -2339,6 +2338,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo /** Updates the layer assignment of windows on this display. */ void assignWindowLayers(boolean setLayoutNeeded) { + Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "assignWindowLayers"); assignChildLayers(getPendingTransaction()); if (setLayoutNeeded) { setLayoutNeeded(); @@ -2349,6 +2349,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo // prepareSurfaces. This allows us to synchronize Z-ordering changes with // the hiding and showing of surfaces. scheduleAnimation(); + Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); } // TODO: This should probably be called any time a visual change is made to the hierarchy like @@ -3182,6 +3183,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo */ static class DisplayChildWindowContainer<E extends WindowContainer> extends WindowContainer<E> { + DisplayChildWindowContainer(WindowManagerService service) { + super(service); + } + @Override boolean fillsParent() { return true; @@ -3209,6 +3214,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo private TaskStack mPinnedStack = null; private TaskStack mSplitScreenPrimaryStack = null; + TaskStackContainers(WindowManagerService service) { + super(service); + } + /** * Returns the topmost stack on the display that is compatible with the input windowing mode * and activity type. Null is no compatible stack on the display. @@ -3516,35 +3525,37 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo @Override void assignChildLayers(SurfaceControl.Transaction t) { - final int NORMAL_STACK_STATE = 0; - final int BOOSTED_STATE = 1; - final int ALWAYS_ON_TOP_STATE = 2; + int layer = 0; // We allow stacks to change visual order from the AM specified order due to // Z-boosting during animations. However we must take care to ensure TaskStacks // which are marked as alwaysOnTop remain that way. - int layer = 0; - for (int state = 0; state <= ALWAYS_ON_TOP_STATE; state++) { - for (int i = 0; i < mChildren.size(); i++) { - final TaskStack s = mChildren.get(i); - layer++; - if (state == NORMAL_STACK_STATE) { - s.assignLayer(t, layer); - } else if (state == BOOSTED_STATE && s.needsZBoost()) { - s.assignLayer(t, layer); - } else if (state == ALWAYS_ON_TOP_STATE && - s.isAlwaysOnTop()) { - s.assignLayer(t, layer); - } - s.assignChildLayers(t); + for (int i = 0; i < mChildren.size(); i++) { + final TaskStack s = mChildren.get(i); + s.assignChildLayers(); + if (!s.needsZBoost() && !s.isAlwaysOnTop()) { + s.assignLayer(t, layer++); + } + } + for (int i = 0; i < mChildren.size(); i++) { + final TaskStack s = mChildren.get(i); + if (s.needsZBoost() && !s.isAlwaysOnTop()) { + s.assignLayer(t, layer++); } - // The appropriate place for App-Transitions to occur is right - // above all other animations but still below things in the Picture-and-Picture - // windowing mode. - if (state == BOOSTED_STATE && mAnimationLayer != null) { - t.setLayer(mAnimationLayer, layer + 1); + } + for (int i = 0; i < mChildren.size(); i++) { + final TaskStack s = mChildren.get(i); + if (s.isAlwaysOnTop()) { + s.assignLayer(t, layer++); } } + + // The appropriate place for App-Transitions to occur is right + // above all other animations but still below things in the Picture-and-Picture + // windowing mode. + if (mAnimationLayer != null) { + t.setLayer(mAnimationLayer, layer++); + } } @Override @@ -3560,8 +3571,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } private final class AboveAppWindowContainers extends NonAppWindowContainers { - AboveAppWindowContainers(String name) { - super(name); + AboveAppWindowContainers(String name, WindowManagerService service) { + super(name, service); } void assignChildLayers(SurfaceControl.Transaction t, WindowContainer imeContainer) { @@ -3577,14 +3588,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo if (needAssignIme && layer >= mService.mPolicy.getWindowLayerFromTypeLw( TYPE_INPUT_METHOD_DIALOG, true)) { - t.setRelativeLayer(imeContainer.getSurfaceControl(), - wt.getSurfaceControl(), -1); + imeContainer.assignRelativeLayer(t, wt.getSurfaceControl(), -1); needAssignIme = false; } } if (needAssignIme) { - t.setRelativeLayer(imeContainer.getSurfaceControl(), - getSurfaceControl(), Integer.MAX_VALUE); + imeContainer.assignRelativeLayer(t, getSurfaceControl(), Integer.MAX_VALUE); } } } @@ -3618,7 +3627,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo }; private final String mName; - NonAppWindowContainers(String name) { + NonAppWindowContainers(String name, WindowManagerService service) { + super(service); mName = name; } @@ -3712,8 +3722,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo @Override void assignChildLayers(SurfaceControl.Transaction t) { - t.setLayer(mOverlayLayer, 1) - .setLayer(mWindowingLayer, 0); // These are layers as children of "mWindowingLayer" mBelowAppWindowsContainers.assignLayer(t, 0); @@ -3737,8 +3745,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo // place it in the AboveAppWindowContainers. if (imeTarget != null && !imeTarget.inSplitScreenWindowingMode() && (imeTarget.getSurfaceControl() != null)) { - t.setRelativeLayer(mImeWindowsContainers.getSurfaceControl(), - imeTarget.getSurfaceControl(), + mImeWindowsContainers.assignRelativeLayer(t, imeTarget.getSurfaceControl(), // TODO: We need to use an extra level on the app surface to ensure // this is always above SurfaceView but always below attached window. 1); diff --git a/services/core/java/com/android/server/wm/DisplayFrames.java b/services/core/java/com/android/server/wm/DisplayFrames.java index 0249713ec3c4..015571255f0d 100644 --- a/services/core/java/com/android/server/wm/DisplayFrames.java +++ b/services/core/java/com/android/server/wm/DisplayFrames.java @@ -21,11 +21,17 @@ import static android.view.Surface.ROTATION_270; import static android.view.Surface.ROTATION_90; import static com.android.server.wm.proto.DisplayFramesProto.STABLE_BOUNDS; +import android.annotation.NonNull; +import android.graphics.Point; import android.graphics.Rect; import android.util.proto.ProtoOutputStream; +import android.view.DisplayCutout; import android.view.DisplayInfo; +import com.android.internal.annotations.VisibleForTesting; + import java.io.PrintWriter; +import java.util.Arrays; /** * Container class for all the display frames that affect how we do window layout on a display. @@ -94,6 +100,14 @@ public class DisplayFrames { /** During layout, the current screen borders along which input method windows are placed. */ public final Rect mDock = new Rect(); + /** Definition of the cutout */ + @NonNull public DisplayCutout mDisplayCutout = DisplayCutout.NO_CUTOUT; + + /** + * During layout, the frame that is display-cutout safe, i.e. that does not intersect with it. + */ + public final Rect mDisplayCutoutSafe = new Rect(); + private final Rect mDisplayInfoOverscan = new Rect(); private final Rect mRotatedDisplayInfoOverscan = new Rect(); public int mDisplayWidth; @@ -114,7 +128,7 @@ public class DisplayFrames { info.overscanLeft, info.overscanTop, info.overscanRight, info.overscanBottom); } - public void onBeginLayout() { + public void onBeginLayout(boolean emulateDisplayCutout, int statusBarHeight) { switch (mRotation) { case ROTATION_90: mRotatedDisplayInfoOverscan.left = mDisplayInfoOverscan.top; @@ -152,13 +166,67 @@ public class DisplayFrames { mStable.set(mUnrestricted); mStableFullscreen.set(mUnrestricted); mCurrent.set(mUnrestricted); - + mDisplayCutout = DisplayCutout.NO_CUTOUT; + mDisplayCutoutSafe.set(Integer.MIN_VALUE, Integer.MIN_VALUE, + Integer.MAX_VALUE, Integer.MAX_VALUE); + if (emulateDisplayCutout) { + setEmulatedDisplayCutout((int) (statusBarHeight * 0.8)); + } } public int getInputMethodWindowVisibleHeight() { return mDock.bottom - mCurrent.bottom; } + private void setEmulatedDisplayCutout(int height) { + final boolean swappedDimensions = mRotation == ROTATION_90 || mRotation == ROTATION_270; + + final int screenWidth = swappedDimensions ? mDisplayHeight : mDisplayWidth; + final int screenHeight = swappedDimensions ? mDisplayWidth : mDisplayHeight; + + final int widthTop = (int) (screenWidth * 0.3); + final int widthBottom = widthTop - height; + + switch (mRotation) { + case ROTATION_90: + mDisplayCutout = DisplayCutout.fromBoundingPolygon(Arrays.asList( + new Point(0, (screenWidth - widthTop) / 2), + new Point(height, (screenWidth - widthBottom) / 2), + new Point(height, (screenWidth + widthBottom) / 2), + new Point(0, (screenWidth + widthTop) / 2) + )).calculateRelativeTo(mUnrestricted); + mDisplayCutoutSafe.left = height; + break; + case ROTATION_180: + mDisplayCutout = DisplayCutout.fromBoundingPolygon(Arrays.asList( + new Point((screenWidth - widthTop) / 2, screenHeight), + new Point((screenWidth - widthBottom) / 2, screenHeight - height), + new Point((screenWidth + widthBottom) / 2, screenHeight - height), + new Point((screenWidth + widthTop) / 2, screenHeight) + )).calculateRelativeTo(mUnrestricted); + mDisplayCutoutSafe.bottom = screenHeight - height; + break; + case ROTATION_270: + mDisplayCutout = DisplayCutout.fromBoundingPolygon(Arrays.asList( + new Point(screenHeight, (screenWidth - widthTop) / 2), + new Point(screenHeight - height, (screenWidth - widthBottom) / 2), + new Point(screenHeight - height, (screenWidth + widthBottom) / 2), + new Point(screenHeight, (screenWidth + widthTop) / 2) + )).calculateRelativeTo(mUnrestricted); + mDisplayCutoutSafe.right = screenHeight - height; + break; + default: + mDisplayCutout = DisplayCutout.fromBoundingPolygon(Arrays.asList( + new Point((screenWidth - widthTop) / 2, 0), + new Point((screenWidth - widthBottom) / 2, height), + new Point((screenWidth + widthBottom) / 2, height), + new Point((screenWidth + widthTop) / 2, 0) + )).calculateRelativeTo(mUnrestricted); + mDisplayCutoutSafe.top = height; + break; + } + } + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); mStable.writeToProto(proto, STABLE_BOUNDS); @@ -182,6 +250,7 @@ public class DisplayFrames { dumpFrame(mUnrestricted, "mUnrestricted", myPrefix, pw); dumpFrame(mDisplayInfoOverscan, "mDisplayInfoOverscan", myPrefix, pw); dumpFrame(mRotatedDisplayInfoOverscan, "mRotatedDisplayInfoOverscan", myPrefix, pw); + pw.println(myPrefix + "mDisplayCutout=" + mDisplayCutout); } private void dumpFrame(Rect frame, String name, String prefix, PrintWriter pw) { diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 4008811b2dc8..b08eb18a6f13 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -101,8 +101,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { private static final int SET_SCREEN_BRIGHTNESS_OVERRIDE = 1; private static final int SET_USER_ACTIVITY_TIMEOUT = 2; - WindowManagerService mService; - private boolean mWallpaperForceHidingChanged = false; private Object mLastWindowFreezeSource = null; private Session mHoldScreen = null; @@ -160,7 +158,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { }; RootWindowContainer(WindowManagerService service) { - mService = service; + super(service); mHandler = new MyHandler(service.mH.getLooper()); mWallpaperController = new WallpaperController(mService); } diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index ad7c300a03fa..63eea104c7e7 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -23,9 +23,8 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; import static android.view.WindowManager.LayoutParams.isSystemAlertWindowType; -import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_DRAG; + import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_POSITIONING; -import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACTIONS; import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; @@ -45,13 +44,13 @@ import android.os.UserHandle; import android.util.MergedConfiguration; import android.util.Slog; import android.view.Display; +import android.view.DisplayCutout; import android.view.IWindow; import android.view.IWindowId; import android.view.IWindowSession; import android.view.IWindowSessionCallback; import android.view.InputChannel; import android.view.Surface; -import android.view.SurfaceControl; import android.view.SurfaceSession; import android.view.WindowManager; @@ -192,15 +191,17 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { int viewVisibility, Rect outContentInsets, Rect outStableInsets, InputChannel outInputChannel) { return addToDisplay(window, seq, attrs, viewVisibility, Display.DEFAULT_DISPLAY, - outContentInsets, outStableInsets, null /* outOutsets */, outInputChannel); + outContentInsets, outStableInsets, null /* outOutsets */, null /* cutout */, + outInputChannel); } @Override public int addToDisplay(IWindow window, int seq, WindowManager.LayoutParams attrs, int viewVisibility, int displayId, Rect outContentInsets, Rect outStableInsets, - Rect outOutsets, InputChannel outInputChannel) { + Rect outOutsets, DisplayCutout.ParcelableWrapper outDisplayCutout, + InputChannel outInputChannel) { return mService.addWindow(this, window, seq, attrs, viewVisibility, displayId, - outContentInsets, outStableInsets, outOutsets, outInputChannel); + outContentInsets, outStableInsets, outOutsets, outDisplayCutout, outInputChannel); } @Override @@ -214,7 +215,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { public int addToDisplayWithoutInputChannel(IWindow window, int seq, WindowManager.LayoutParams attrs, int viewVisibility, int displayId, Rect outContentInsets, Rect outStableInsets) { return mService.addWindow(this, window, seq, attrs, viewVisibility, displayId, - outContentInsets, outStableInsets, null /* outOutsets */, null); + outContentInsets, outStableInsets, null /* outOutsets */, null /* cutout */, null); } @Override @@ -232,6 +233,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { int requestedWidth, int requestedHeight, int viewFlags, int flags, Rect outFrame, Rect outOverscanInsets, Rect outContentInsets, Rect outVisibleInsets, Rect outStableInsets, Rect outsets, Rect outBackdropFrame, + DisplayCutout.ParcelableWrapper cutout, MergedConfiguration mergedConfiguration, Surface outSurface) { if (false) Slog.d(TAG_WM, ">>>>>> ENTERED relayout from " + Binder.getCallingPid()); @@ -239,7 +241,8 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { int res = mService.relayoutWindow(this, window, seq, attrs, requestedWidth, requestedHeight, viewFlags, flags, outFrame, outOverscanInsets, outContentInsets, outVisibleInsets, - outStableInsets, outsets, outBackdropFrame, mergedConfiguration, outSurface); + outStableInsets, outsets, outBackdropFrame, cutout, + mergedConfiguration, outSurface); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); if (false) Slog.d(TAG_WM, "<<<<<< EXITING relayout to " + Binder.getCallingPid()); diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 8aa129a45373..6ea8a4790630 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -59,7 +59,6 @@ class Task extends WindowContainer<AppWindowToken> { final int mTaskId; final int mUserId; private boolean mDeferRemoval = false; - final WindowManagerService mService; final Rect mPreparedFrozenBounds = new Rect(); final Configuration mPreparedFrozenMergedConfig = new Configuration(); @@ -102,10 +101,10 @@ class Task extends WindowContainer<AppWindowToken> { Task(int taskId, TaskStack stack, int userId, WindowManagerService service, int resizeMode, boolean supportsPictureInPicture, TaskDescription taskDescription, TaskWindowContainerController controller) { + super(service); mTaskId = taskId; mStack = stack; mUserId = userId; - mService = service; mResizeMode = resizeMode; mSupportsPictureInPicture = supportsPictureInPicture; setController(controller); diff --git a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java index 57f754f8234d..259f8df15e31 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java @@ -57,6 +57,7 @@ import android.os.RemoteException; import android.os.SystemClock; import android.util.MergedConfiguration; import android.util.Slog; +import android.view.DisplayCutout; import android.view.IWindowSession; import android.view.Surface; import android.view.SurfaceControl; @@ -134,6 +135,7 @@ class TaskSnapshotSurface implements StartingSurface { window.setSession(session); final Surface surface = new Surface(); final Rect tmpRect = new Rect(); + final DisplayCutout.ParcelableWrapper tmpCutout = new DisplayCutout.ParcelableWrapper(); final Rect tmpFrame = new Rect(); final Rect taskBounds; final Rect tmpContentInsets = new Rect(); @@ -195,8 +197,8 @@ class TaskSnapshotSurface implements StartingSurface { } try { final int res = session.addToDisplay(window, window.mSeq, layoutParams, - View.VISIBLE, token.getDisplayContent().getDisplayId(), tmpRect, tmpRect, - tmpRect, null); + View.GONE, token.getDisplayContent().getDisplayId(), tmpRect, tmpRect, + tmpRect, tmpCutout, null); if (res < 0) { Slog.w(TAG, "Failed to add snapshot starting window res=" + res); return null; @@ -212,7 +214,7 @@ class TaskSnapshotSurface implements StartingSurface { try { session.relayout(window, window.mSeq, layoutParams, -1, -1, View.VISIBLE, 0, tmpFrame, tmpRect, tmpContentInsets, tmpRect, tmpStableInsets, tmpRect, tmpRect, - tmpMergedConfiguration, surface); + tmpCutout, tmpMergedConfiguration, surface); } catch (RemoteException e) { // Local call. } @@ -438,7 +440,8 @@ class TaskSnapshotSurface implements StartingSurface { public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw, MergedConfiguration mergedConfiguration, Rect backDropFrame, boolean forceLayout, - boolean alwaysConsumeNavBar, int displayId) { + boolean alwaysConsumeNavBar, int displayId, + DisplayCutout.ParcelableWrapper displayCutout) { if (mergedConfiguration != null && mOuter != null && mOuter.mOrientationOnCreation != mergedConfiguration.getMergedConfiguration().orientation) { diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 4a3a3fc960a5..832d3957ef1b 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -75,9 +75,6 @@ public class TaskStack extends WindowContainer<Task> implements /** Unique identifier */ final int mStackId; - /** The service */ - private final WindowManagerService mService; - /** The display this stack sits under. */ // TODO: Track parent marks like this in WindowContainer. private DisplayContent mDisplayContent; @@ -151,7 +148,7 @@ public class TaskStack extends WindowContainer<Task> implements final Rect mTmpDimBoundsRect = new Rect(); TaskStack(WindowManagerService service, int stackId, StackWindowController controller) { - mService = service; + super(service); mStackId = stackId; setController(controller); mDockedStackMinimizeThickness = service.mContext.getResources().getDimensionPixelSize( diff --git a/services/core/java/com/android/server/wm/TransactionFactory.java b/services/core/java/com/android/server/wm/TransactionFactory.java new file mode 100644 index 000000000000..067f08369710 --- /dev/null +++ b/services/core/java/com/android/server/wm/TransactionFactory.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2017 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.wm; + +import android.view.SurfaceControl.Transaction; + +/** + * Helper class to inject custom transaction objects into window manager. + */ +interface TransactionFactory { + Transaction make(); +}; + diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 64675825243e..d6329bfab5a1 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -21,6 +21,7 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; import static com.android.server.wm.proto.WindowContainerProto.CONFIGURATION_CONTAINER; import static com.android.server.wm.proto.WindowContainerProto.ORIENTATION; +import static com.android.server.wm.proto.WindowContainerProto.VISIBLE; import static android.view.SurfaceControl.Transaction; import android.annotation.CallSuper; @@ -71,18 +72,25 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< WindowContainerController mController; protected SurfaceControl mSurfaceControl; + private int mLastLayer = 0; + private SurfaceControl mLastRelativeToLayer = null; /** * Applied as part of the animation pass in "prepareSurfaces". */ - private Transaction mPendingTransaction = new Transaction(); + private final Transaction mPendingTransaction; + protected final WindowManagerService mService; + + WindowContainer(WindowManagerService service) { + mService = service; + mPendingTransaction = service.mTransactionFactory.make(); + } @Override final protected WindowContainer getParent() { return mParent; } - @Override protected int getChildCount() { return mChildren.size(); @@ -755,34 +763,46 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } void assignLayer(Transaction t, int layer) { - if (mSurfaceControl != null) { + final boolean changed = layer != mLastLayer || mLastRelativeToLayer != null; + if (mSurfaceControl != null && changed) { t.setLayer(mSurfaceControl, layer); + mLastLayer = layer; + mLastRelativeToLayer = null; + } + } + + void assignRelativeLayer(Transaction t, SurfaceControl relativeTo, int layer) { + final boolean changed = layer != mLastLayer || mLastRelativeToLayer != relativeTo; + if (mSurfaceControl != null && changed) { + t.setRelativeLayer(mSurfaceControl, relativeTo, layer); + mLastLayer = layer; + mLastRelativeToLayer = relativeTo; } } void assignChildLayers(Transaction t) { int layer = 0; - boolean boosting = false; // We use two passes as a way to promote children which // need Z-boosting to the end of the list. - for (int i = 0; i < 2; i++ ) { - for (int j = 0; j < mChildren.size(); ++j) { - final WindowContainer wc = mChildren.get(j); - if (wc.needsZBoost() && !boosting) { - continue; - } - wc.assignLayer(t, layer); - wc.assignChildLayers(t); - - layer++; + for (int j = 0; j < mChildren.size(); ++j) { + final WindowContainer wc = mChildren.get(j); + wc.assignChildLayers(t); + if (!wc.needsZBoost()) { + wc.assignLayer(t, layer++); + } + } + for (int j = 0; j < mChildren.size(); ++j) { + final WindowContainer wc = mChildren.get(j); + if (wc.needsZBoost()) { + wc.assignLayer(t, layer++); } - boosting = true; } } void assignChildLayers() { assignChildLayers(getPendingTransaction()); + scheduleAnimation(); } boolean needsZBoost() { @@ -809,6 +829,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< final long token = proto.start(fieldId); super.writeToProto(proto, CONFIGURATION_CONTAINER, trim); proto.write(ORIENTATION, mOrientation); + proto.write(VISIBLE, isVisible()); proto.end(token); } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 8d8c26c0b1c1..e5982243f94f 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -191,6 +191,7 @@ import android.util.TypedValue; import android.util.proto.ProtoOutputStream; import android.view.AppTransitionAnimationSpec; import android.view.Display; +import android.view.DisplayCutout; import android.view.DisplayInfo; import android.view.Gravity; import android.view.IAppTransitionAnimationSpecsFuture; @@ -214,6 +215,7 @@ import android.view.MotionEvent; import android.view.PointerIcon; import android.view.Surface; import android.view.SurfaceControl; +import android.view.SurfaceControl.Builder; import android.view.SurfaceSession; import android.view.View; import android.view.WindowContentFrameStats; @@ -805,12 +807,8 @@ public class WindowManagerService extends IWindowManager.Stub static WindowManagerThreadPriorityBooster sThreadPriorityBooster = new WindowManagerThreadPriorityBooster(); - class DefaultSurfaceBuilderFactory implements SurfaceBuilderFactory { - public SurfaceControl.Builder make(SurfaceSession s) { - return new SurfaceControl.Builder(s); - } - }; - SurfaceBuilderFactory mSurfaceBuilderFactory = new DefaultSurfaceBuilderFactory(); + SurfaceBuilderFactory mSurfaceBuilderFactory = SurfaceControl.Builder::new; + TransactionFactory mTransactionFactory = SurfaceControl.Transaction::new; static void boostPriorityForLockedSection() { sThreadPriorityBooster.boost(); @@ -1136,9 +1134,9 @@ public class WindowManagerService extends IWindowManager.Stub } public int addWindow(Session session, IWindow client, int seq, - WindowManager.LayoutParams attrs, int viewVisibility, int displayId, + LayoutParams attrs, int viewVisibility, int displayId, Rect outContentInsets, Rect outStableInsets, Rect outOutsets, - InputChannel outInputChannel) { + DisplayCutout.ParcelableWrapper outDisplayCutout, InputChannel outInputChannel) { int[] appOp = new int[1]; int res = mPolicy.checkAddPermission(attrs, appOp); if (res != WindowManagerGlobal.ADD_OKAY) { @@ -1473,7 +1471,7 @@ public class WindowManagerService extends IWindowManager.Stub taskBounds = null; } if (mPolicy.getInsetHintLw(win.mAttrs, taskBounds, displayFrames, outContentInsets, - outStableInsets, outOutsets)) { + outStableInsets, outOutsets, outDisplayCutout)) { res |= WindowManagerGlobal.ADD_FLAG_ALWAYS_CONSUME_NAV_BAR; } @@ -1501,7 +1499,7 @@ public class WindowManagerService extends IWindowManager.Stub // Don't do layout here, the window must call // relayout to be displayed, so we'll do it there. - displayContent.assignWindowLayers(false /* setLayoutNeeded */); + win.getParent().assignChildLayers(); if (focusChanged) { mInputMonitor.setInputFocusLw(mCurrentFocus, false /*updateInputWindows*/); @@ -1853,11 +1851,12 @@ public class WindowManagerService extends IWindowManager.Stub } public int relayoutWindow(Session session, IWindow client, int seq, - WindowManager.LayoutParams attrs, int requestedWidth, + LayoutParams attrs, int requestedWidth, int requestedHeight, int viewVisibility, int flags, Rect outFrame, Rect outOverscanInsets, Rect outContentInsets, Rect outVisibleInsets, Rect outStableInsets, Rect outOutsets, Rect outBackdropFrame, - MergedConfiguration mergedConfiguration, Surface outSurface) { + DisplayCutout.ParcelableWrapper outCutout, MergedConfiguration mergedConfiguration, + Surface outSurface) { int result = 0; boolean configChanged; final boolean hasStatusBarPermission = @@ -1970,6 +1969,13 @@ public class WindowManagerService extends IWindowManager.Stub + " newVis=" + viewVisibility, stack); } + win.setDisplayLayoutNeeded(); + win.mGivenInsetsPending = (flags & WindowManagerGlobal.RELAYOUT_INSETS_PENDING) != 0; + + // We may be deferring layout passes at the moment, but since the client is interested + // in the new out values right now we need to force a layout. + mWindowPlacerLocked.performSurfacePlacement(true /* force */); + // We should only relayout if the view is visible, it is a starting window, or the // associated appToken is not hidden. final boolean shouldRelayout = viewVisibility == View.VISIBLE && @@ -1979,15 +1985,6 @@ public class WindowManagerService extends IWindowManager.Stub if (shouldRelayout) { Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: viewVisibility_1"); - // We are about to create a surface, but we didn't run a layout yet. So better run - // a layout now that we already know the right size, as a resize call will make the - // surface transaction blocking until next vsync and slow us down. - // TODO: Ideally we'd create the surface after running layout a bit further down, - // but moving this seems to be too risky at this point in the release. - if (win.mLayoutSeq == -1) { - win.setDisplayLayoutNeeded(); - mWindowPlacerLocked.performSurfacePlacement(true); - } result = win.relayoutVisibleWindow(result, attrChanges, oldVisibility); try { @@ -2089,16 +2086,11 @@ public class WindowManagerService extends IWindowManager.Stub mUnknownAppVisibilityController.notifyRelayouted(win.mAppToken); } - win.setDisplayLayoutNeeded(); - win.mGivenInsetsPending = (flags & WindowManagerGlobal.RELAYOUT_INSETS_PENDING) != 0; Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: updateOrientationFromAppTokens"); configChanged = updateOrientationFromAppTokensLocked(false, displayId); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); - // We may be deferring layout passes at the moment, but since the client is interested - // in the new out values right now we need to force a layout. - mWindowPlacerLocked.performSurfacePlacement(true /* force */); if (toBeDisplayed && win.mIsWallpaper) { DisplayInfo displayInfo = win.getDisplayContent().getDisplayInfo(); dc.mWallpaperController.updateWallpaperOffset( @@ -2142,6 +2134,7 @@ public class WindowManagerService extends IWindowManager.Stub win.mLastRelayoutContentInsets.set(win.mContentInsets); outVisibleInsets.set(win.mVisibleInsets); outStableInsets.set(win.mStableInsets); + outCutout.set(win.mDisplayCutout); outOutsets.set(win.mOutsets); outBackdropFrame.set(win.getBackdropFrame(win.mFrame)); if (localLOGV) Slog.v( diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 9eab61c40323..e38605d33f26 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -42,7 +42,6 @@ import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.MATCH_PARENT; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_COMPATIBLE_WINDOW; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; -import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_WILL_NOT_REPLACE_ON_RELAUNCH; @@ -145,6 +144,7 @@ import android.util.MergedConfiguration; import android.util.Slog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; +import android.view.DisplayCutout; import android.view.DisplayInfo; import android.view.Gravity; import android.view.IApplicationToken; @@ -186,7 +186,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // to capture touch events in that area. static final int RESIZE_HANDLE_WIDTH_IN_DP = 30; - final WindowManagerService mService; final WindowManagerPolicy mPolicy; final Context mContext; final Session mSession; @@ -321,6 +320,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP private final Rect mLastOutsets = new Rect(); private boolean mOutsetsChanged = false; + /** Part of the display that has been cut away. See {@link DisplayCutout}. */ + DisplayCutout mDisplayCutout = DisplayCutout.NO_CUTOUT; + private DisplayCutout mLastDisplayCutout = DisplayCutout.NO_CUTOUT; + private boolean mDisplayCutoutChanged; + /** * Set to true if we are waiting for this window to receive its * given internal insets before laying out other windows based on it. @@ -622,7 +626,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP WindowState(WindowManagerService service, Session s, IWindow c, WindowToken token, WindowState parentWindow, int appOp, int seq, WindowManager.LayoutParams a, int viewVisibility, int ownerId, boolean ownerCanAddInternalSystemWindow) { - mService = service; + super(service); mSession = s; mClient = c; mAppOp = appOp; @@ -773,7 +777,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP @Override public void computeFrameLw(Rect parentFrame, Rect displayFrame, Rect overscanFrame, Rect contentFrame, Rect visibleFrame, Rect decorFrame, Rect stableFrame, - Rect outsetFrame) { + Rect outsetFrame, DisplayCutout displayCutout) { if (mWillReplaceWindow && (mAnimatingExit || !mReplacingRemoveRequested)) { // This window is being replaced and either already got information that it's being // removed or we are still waiting for some information. Because of this we don't @@ -1010,6 +1014,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mVisibleFrame.offset(-layoutXDiff, -layoutYDiff); mStableFrame.offset(-layoutXDiff, -layoutYDiff); + // TODO(roosa): Figure out what frame exactly this needs to be calculated with. + mDisplayCutout = displayCutout.calculateRelativeTo(mFrame); + + mCompatFrame.set(mFrame); if (mEnforceSizeCompat) { // If there is a size compatibility scale being applied to the @@ -1150,8 +1158,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mOutsetsChanged |= !mLastOutsets.equals(mOutsets); mFrameSizeChanged |= (mLastFrame.width() != mFrame.width()) || (mLastFrame.height() != mFrame.height()); + mDisplayCutoutChanged |= !mLastDisplayCutout.equals(mDisplayCutout); return mOverscanInsetsChanged || mContentInsetsChanged || mVisibleInsetsChanged - || mOutsetsChanged || mFrameSizeChanged; + || mOutsetsChanged || mFrameSizeChanged || mDisplayCutoutChanged; } /** @@ -1196,6 +1205,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP || winAnimator.mSurfaceResized || mOutsetsChanged || mFrameSizeChanged + || mDisplayCutoutChanged || configChanged || dragResizingChanged || !isResizedWhileNotDragResizingReported() @@ -1215,7 +1225,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP + " dragResizingChanged=" + dragResizingChanged + " resizedWhileNotDragResizingReported=" + isResizedWhileNotDragResizingReported() - + " reportOrientationChanged=" + mReportOrientationChanged); + + " reportOrientationChanged=" + mReportOrientationChanged + + " displayCutoutChanged=" + mDisplayCutoutChanged); } // If it's a dead window left on screen, and the configuration changed, there is nothing @@ -2850,6 +2861,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP final boolean reportDraw = mWinAnimator.mDrawState == DRAW_PENDING; final boolean reportOrientation = mReportOrientationChanged; final int displayId = getDisplayId(); + final DisplayCutout displayCutout = mDisplayCutout; if (mAttrs.type != WindowManager.LayoutParams.TYPE_APPLICATION_STARTING && mClient instanceof IWindow.Stub) { // To prevent deadlock simulate one-way call if win.mClient is a local object. @@ -2859,7 +2871,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP try { dispatchResized(frame, overscanInsets, contentInsets, visibleInsets, stableInsets, outsets, reportDraw, mergedConfiguration, - reportOrientation, displayId); + reportOrientation, displayId, displayCutout); } catch (RemoteException e) { // Not a remote call, RemoteException won't be raised. } @@ -2867,7 +2879,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP }); } else { dispatchResized(frame, overscanInsets, contentInsets, visibleInsets, stableInsets, - outsets, reportDraw, mergedConfiguration, reportOrientation, displayId); + outsets, reportDraw, mergedConfiguration, reportOrientation, displayId, + displayCutout); } //TODO (multidisplay): Accessibility supported only for the default display. @@ -2881,6 +2894,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mStableInsetsChanged = false; mOutsetsChanged = false; mFrameSizeChanged = false; + mDisplayCutoutChanged = false; mResizedWhileNotDragResizingReported = true; mWinAnimator.mSurfaceResized = false; mReportOrientationChanged = false; @@ -2923,14 +2937,16 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP private void dispatchResized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw, - MergedConfiguration mergedConfiguration, boolean reportOrientation, int displayId) + MergedConfiguration mergedConfiguration, boolean reportOrientation, int displayId, + DisplayCutout displayCutout) throws RemoteException { final boolean forceRelayout = isDragResizeChanged() || mResizedWhileNotDragResizing || reportOrientation; mClient.resized(frame, overscanInsets, contentInsets, visibleInsets, stableInsets, outsets, reportDraw, mergedConfiguration, getBackdropFrame(frame), forceRelayout, - mPolicy.isNavBarForcedShownLw(this), displayId); + mPolicy.isNavBarForcedShownLw(this), displayId, + new DisplayCutout.ParcelableWrapper(displayCutout)); mDragResizingChangeReported = true; } @@ -3247,6 +3263,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP pw.print(" stable="); mStableInsets.printShortString(pw); pw.print(" surface="); mAttrs.surfaceInsets.printShortString(pw); pw.print(" outsets="); mOutsets.printShortString(pw); + pw.print(" cutout=" + mDisplayCutout); pw.println(); pw.print(prefix); pw.print("Lst insets: overscan="); mLastOverscanInsets.printShortString(pw); @@ -3255,6 +3272,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP pw.print(" stable="); mLastStableInsets.printShortString(pw); pw.print(" physical="); mLastOutsets.printShortString(pw); pw.print(" outset="); mLastOutsets.printShortString(pw); + pw.print(" cutout=" + mLastDisplayCutout); pw.println(); } pw.print(prefix); pw.print(mWinAnimator); pw.println(":"); @@ -4279,6 +4297,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mLastVisibleInsets.set(mVisibleInsets); mLastStableInsets.set(mStableInsets); mLastOutsets.set(mOutsets); + mLastDisplayCutout = mDisplayCutout; } // TODO: Hack to work around the number of states AppWindowToken needs to access without having diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index a3d4b71a68af..5bcf59cf1711 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -46,9 +46,6 @@ import java.io.PrintWriter; class WindowToken extends WindowContainer<WindowState> { private static final String TAG = TAG_WITH_CLASS_NAME ? "WindowToken" : TAG_WM; - // The window manager! - protected final WindowManagerService mService; - // The actual token. final IBinder token; @@ -107,7 +104,7 @@ class WindowToken extends WindowContainer<WindowState> { WindowToken(WindowManagerService service, IBinder _token, int type, boolean persistOnEmpty, DisplayContent dc, boolean ownerCanManageAppTokens) { - mService = service; + super(service); token = _token; windowType = type; mPersistOnEmpty = persistOnEmpty; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 14b9dfb932f3..b979ff46702d 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -151,6 +151,9 @@ import android.security.IKeyChainAliasCallback; import android.security.IKeyChainService; import android.security.KeyChain; import android.security.KeyChain.KeyChainConnection; +import android.security.keystore.KeyGenParameterSpec; +import android.security.keystore.ParcelableKeyGenParameterSpec; +import android.security.KeyStore; import android.service.persistentdata.PersistentDataBlockManager; import android.telephony.TelephonyManager; import android.text.TextUtils; @@ -5022,6 +5025,54 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override + public boolean generateKeyPair(ComponentName who, String callerPackage, String algorithm, + ParcelableKeyGenParameterSpec parcelableKeySpec) { + enforceCanManageScope(who, callerPackage, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER, + DELEGATION_CERT_INSTALL); + final KeyGenParameterSpec keySpec = parcelableKeySpec.getSpec(); + if (TextUtils.isEmpty(keySpec.getKeystoreAlias())) { + throw new IllegalArgumentException("Empty alias provided."); + } + // As the caller will be granted access to the key, ensure no UID was specified, as + // it will not have the desired effect. + if (keySpec.getUid() != KeyStore.UID_SELF) { + Log.e(LOG_TAG, "Only the caller can be granted access to the generated keypair."); + return false; + } + final int callingUid = mInjector.binderGetCallingUid(); + + final UserHandle userHandle = mInjector.binderGetCallingUserHandle(); + final long id = mInjector.binderClearCallingIdentity(); + try { + try (KeyChainConnection keyChainConnection = + KeyChain.bindAsUser(mContext, userHandle)) { + IKeyChainService keyChain = keyChainConnection.getService(); + final boolean generationResult = keyChain.generateKeyPair(algorithm, parcelableKeySpec); + if (!generationResult) { + Log.e(LOG_TAG, "KeyChain failed to generate a keypair."); + return false; + } + + // Set a grant for the caller here so that when the client calls + // requestPrivateKey, it will be able to get the key from Keystore. + // Note the use of the calling UID, since the request for the private + // key will come from the client's process, so the grant has to be for + // that UID. + keyChain.setGrant(callingUid, keySpec.getKeystoreAlias(), true); + return true; + } + } catch (RemoteException e) { + Log.e(LOG_TAG, "KeyChain error while generating a keypair", e); + } catch (InterruptedException e) { + Log.w(LOG_TAG, "Interrupted while generating keypair", e); + Thread.currentThread().interrupt(); + } finally { + mInjector.binderRestoreCallingIdentity(id); + } + return false; + } + + @Override public void choosePrivateKeyAlias(final int uid, final Uri uri, final String alias, final IBinder response) { // Caller UID needs to be trusted, so we restrict this method to SYSTEM_UID callers. diff --git a/services/net/java/android/net/ip/ConnectivityPacketTracker.java b/services/net/java/android/net/ip/ConnectivityPacketTracker.java index 1925c39e5211..6cf4fa9a3dfc 100644 --- a/services/net/java/android/net/ip/ConnectivityPacketTracker.java +++ b/services/net/java/android/net/ip/ConnectivityPacketTracker.java @@ -19,7 +19,7 @@ package android.net.ip; import static android.system.OsConstants.*; import android.net.NetworkUtils; -import android.net.util.BlockingSocketReader; +import android.net.util.PacketReader; import android.net.util.ConnectivityPacketSummary; import android.os.Handler; import android.system.ErrnoException; @@ -65,7 +65,7 @@ public class ConnectivityPacketTracker { private final String mTag; private final LocalLog mLog; - private final BlockingSocketReader mPacketListener; + private final PacketReader mPacketListener; private boolean mRunning; private String mDisplayName; @@ -101,7 +101,7 @@ public class ConnectivityPacketTracker { mDisplayName = null; } - private final class PacketListener extends BlockingSocketReader { + private final class PacketListener extends PacketReader { private final int mIfIndex; private final byte mHwAddr[]; diff --git a/services/net/java/android/net/ip/IpClient.java b/services/net/java/android/net/ip/IpClient.java index 70983c864ffc..b305b336d12f 100644 --- a/services/net/java/android/net/ip/IpClient.java +++ b/services/net/java/android/net/ip/IpClient.java @@ -163,10 +163,10 @@ public class IpClient extends StateMachine { // TODO: Find an lighter weight approach. private class LoggingCallbackWrapper extends Callback { private static final String PREFIX = "INVOKE "; - private Callback mCallback; + private final Callback mCallback; public LoggingCallbackWrapper(Callback callback) { - mCallback = callback; + mCallback = (callback != null) ? callback : new Callback(); } private void log(String msg) { @@ -815,6 +815,15 @@ public class IpClient extends StateMachine { pw.println(Objects.toString(provisioningConfig, "N/A")); pw.decreaseIndent(); + final IpReachabilityMonitor iprm = mIpReachabilityMonitor; + if (iprm != null) { + pw.println(); + pw.println(mTag + " current IpReachabilityMonitor state:"); + pw.increaseIndent(); + iprm.dump(pw); + pw.decreaseIndent(); + } + pw.println(); pw.println(mTag + " StateMachine dump:"); pw.increaseIndent(); @@ -1237,6 +1246,7 @@ public class IpClient extends StateMachine { mIpReachabilityMonitor = new IpReachabilityMonitor( mContext, mInterfaceName, + getHandler(), mLog, new IpReachabilityMonitor.Callback() { @Override @@ -1273,6 +1283,7 @@ public class IpClient extends StateMachine { stopAllIP(); resetLinkProperties(); + mCallback.onLinkPropertiesChange(new LinkProperties(mLinkProperties)); if (mStartTimeMillis > 0) { recordMetric(IpManagerEvent.COMPLETE_LIFECYCLE); mStartTimeMillis = 0; diff --git a/services/net/java/android/net/ip/IpNeighborMonitor.java b/services/net/java/android/net/ip/IpNeighborMonitor.java new file mode 100644 index 000000000000..680733478657 --- /dev/null +++ b/services/net/java/android/net/ip/IpNeighborMonitor.java @@ -0,0 +1,236 @@ +/* + * Copyright (C) 2017 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 android.net.ip; + +import android.net.netlink.NetlinkConstants; +import android.net.netlink.NetlinkErrorMessage; +import android.net.netlink.NetlinkMessage; +import android.net.netlink.NetlinkSocket; +import android.net.netlink.RtNetlinkNeighborMessage; +import android.net.netlink.StructNdMsg; +import android.net.netlink.StructNlMsgHdr; +import android.net.util.PacketReader; +import android.net.util.SharedLog; +import android.os.Handler; +import android.os.SystemClock; +import android.system.ErrnoException; +import android.system.NetlinkSocketAddress; +import android.system.Os; +import android.system.OsConstants; +import android.util.Log; + +import com.android.internal.util.BitUtils; + +import libcore.io.IoUtils; +import libcore.io.Libcore; + +import java.io.FileDescriptor; +import java.net.InetAddress; +import java.net.SocketAddress; +import java.net.SocketException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.StringJoiner; + + +/** + * IpNeighborMonitor. + * + * Monitors the kernel rtnetlink neighbor notifications and presents to callers + * NeighborEvents describing each event. Callers can provide a consumer instance + * to both filter (e.g. by interface index and IP address) and handle the + * generated NeighborEvents. + * + * @hide + */ +public class IpNeighborMonitor extends PacketReader { + private static final String TAG = IpNeighborMonitor.class.getSimpleName(); + private static final boolean DBG = false; + private static final boolean VDBG = false; + + /** + * Make the kernel perform neighbor reachability detection (IPv4 ARP or IPv6 ND) + * for the given IP address on the specified interface index. + * + * @return 0 if the request was successfully passed to the kernel; otherwise return + * a non-zero error code. + */ + public static int startKernelNeighborProbe(int ifIndex, InetAddress ip) { + final String msgSnippet = "probing ip=" + ip.getHostAddress() + "%" + ifIndex; + if (DBG) { Log.d(TAG, msgSnippet); } + + final byte[] msg = RtNetlinkNeighborMessage.newNewNeighborMessage( + 1, ip, StructNdMsg.NUD_PROBE, ifIndex, null); + + try { + NetlinkSocket.sendOneShotKernelMessage(OsConstants.NETLINK_ROUTE, msg); + } catch (ErrnoException e) { + Log.e(TAG, "Error " + msgSnippet + ": " + e); + return -e.errno; + } + + return 0; + } + + public static class NeighborEvent { + final long elapsedMs; + final short msgType; + final int ifindex; + final InetAddress ip; + final short nudState; + final byte[] linkLayerAddr; + + public NeighborEvent(long elapsedMs, short msgType, int ifindex, InetAddress ip, + short nudState, byte[] linkLayerAddr) { + this.elapsedMs = elapsedMs; + this.msgType = msgType; + this.ifindex = ifindex; + this.ip = ip; + this.nudState = nudState; + this.linkLayerAddr = linkLayerAddr; + } + + boolean isConnected() { + return (msgType != NetlinkConstants.RTM_DELNEIGH) && + StructNdMsg.isNudStateConnected(nudState); + } + + boolean isValid() { + return (msgType != NetlinkConstants.RTM_DELNEIGH) && + StructNdMsg.isNudStateValid(nudState); + } + + @Override + public String toString() { + final StringJoiner j = new StringJoiner(",", "NeighborEvent{", "}"); + return j.add("@" + elapsedMs) + .add(NetlinkConstants.stringForNlMsgType(msgType)) + .add("if=" + ifindex) + .add(ip.getHostAddress()) + .add(StructNdMsg.stringForNudState(nudState)) + .add("[" + NetlinkConstants.hexify(linkLayerAddr) + "]") + .toString(); + } + } + + public interface NeighborEventConsumer { + // Every neighbor event received on the netlink socket is passed in + // here. Subclasses should filter for events of interest. + public void accept(NeighborEvent event); + } + + private final SharedLog mLog; + private final NeighborEventConsumer mConsumer; + + public IpNeighborMonitor(Handler h, SharedLog log, NeighborEventConsumer cb) { + super(h, NetlinkSocket.DEFAULT_RECV_BUFSIZE); + mLog = log.forSubComponent(TAG); + mConsumer = (cb != null) ? cb : (event) -> { /* discard */ }; + } + + @Override + protected FileDescriptor createFd() { + FileDescriptor fd = null; + + try { + fd = NetlinkSocket.forProto(OsConstants.NETLINK_ROUTE); + Os.bind(fd, (SocketAddress)(new NetlinkSocketAddress(0, OsConstants.RTMGRP_NEIGH))); + Os.connect(fd, (SocketAddress)(new NetlinkSocketAddress(0, 0))); + + if (VDBG) { + final NetlinkSocketAddress nlAddr = (NetlinkSocketAddress) Os.getsockname(fd); + Log.d(TAG, "bound to sockaddr_nl{" + + BitUtils.uint32(nlAddr.getPortId()) + ", " + + nlAddr.getGroupsMask() + + "}"); + } + } catch (ErrnoException|SocketException e) { + logError("Failed to create rtnetlink socket", e); + IoUtils.closeQuietly(fd); + return null; + } + + return fd; + } + + @Override + protected void handlePacket(byte[] recvbuf, int length) { + final long whenMs = SystemClock.elapsedRealtime(); + + final ByteBuffer byteBuffer = ByteBuffer.wrap(recvbuf, 0, length); + byteBuffer.order(ByteOrder.nativeOrder()); + + parseNetlinkMessageBuffer(byteBuffer, whenMs); + } + + private void parseNetlinkMessageBuffer(ByteBuffer byteBuffer, long whenMs) { + while (byteBuffer.remaining() > 0) { + final int position = byteBuffer.position(); + final NetlinkMessage nlMsg = NetlinkMessage.parse(byteBuffer); + if (nlMsg == null || nlMsg.getHeader() == null) { + byteBuffer.position(position); + mLog.e("unparsable netlink msg: " + NetlinkConstants.hexify(byteBuffer)); + break; + } + + final int srcPortId = nlMsg.getHeader().nlmsg_pid; + if (srcPortId != 0) { + mLog.e("non-kernel source portId: " + BitUtils.uint32(srcPortId)); + break; + } + + if (nlMsg instanceof NetlinkErrorMessage) { + mLog.e("netlink error: " + nlMsg); + continue; + } else if (!(nlMsg instanceof RtNetlinkNeighborMessage)) { + mLog.i("non-rtnetlink neighbor msg: " + nlMsg); + continue; + } + + evaluateRtNetlinkNeighborMessage((RtNetlinkNeighborMessage) nlMsg, whenMs); + } + } + + private void evaluateRtNetlinkNeighborMessage( + RtNetlinkNeighborMessage neighMsg, long whenMs) { + final short msgType = neighMsg.getHeader().nlmsg_type; + final StructNdMsg ndMsg = neighMsg.getNdHeader(); + if (ndMsg == null) { + mLog.e("RtNetlinkNeighborMessage without ND message header!"); + return; + } + + final int ifindex = ndMsg.ndm_ifindex; + final InetAddress destination = neighMsg.getDestination(); + final short nudState = + (msgType == NetlinkConstants.RTM_DELNEIGH) + ? StructNdMsg.NUD_NONE + : ndMsg.ndm_state; + + final NeighborEvent event = new NeighborEvent( + whenMs, msgType, ifindex, destination, nudState, neighMsg.getLinkLayerAddress()); + + if (VDBG) { + Log.d(TAG, neighMsg.toString()); + } + if (DBG) { + Log.d(TAG, event.toString()); + } + + mConsumer.accept(event); + } +} diff --git a/services/net/java/android/net/ip/IpReachabilityMonitor.java b/services/net/java/android/net/ip/IpReachabilityMonitor.java index 714b35a03396..b31ffbba0279 100644 --- a/services/net/java/android/net/ip/IpReachabilityMonitor.java +++ b/services/net/java/android/net/ip/IpReachabilityMonitor.java @@ -22,30 +22,27 @@ import android.net.LinkProperties; import android.net.LinkProperties.ProvisioningChange; import android.net.ProxyInfo; import android.net.RouteInfo; +import android.net.ip.IpNeighborMonitor.NeighborEvent; import android.net.metrics.IpConnectivityLog; import android.net.metrics.IpReachabilityEvent; -import android.net.netlink.NetlinkConstants; -import android.net.netlink.NetlinkErrorMessage; -import android.net.netlink.NetlinkMessage; -import android.net.netlink.NetlinkSocket; -import android.net.netlink.RtNetlinkNeighborMessage; import android.net.netlink.StructNdMsg; -import android.net.netlink.StructNdaCacheInfo; -import android.net.netlink.StructNlMsgHdr; import android.net.util.MultinetworkPolicyTracker; import android.net.util.SharedLog; +import android.os.Handler; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.os.SystemClock; import android.system.ErrnoException; -import android.system.NetlinkSocketAddress; import android.system.OsConstants; import android.util.Log; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.DumpUtils; +import com.android.internal.util.DumpUtils.Dump; import java.io.InterruptedIOException; +import java.io.PrintWriter; import java.net.Inet6Address; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -134,6 +131,8 @@ import java.util.Set; * state it may be best for the link to disconnect completely and * reconnect afresh. * + * Accessing an instance of this class from multiple threads is NOT safe. + * * @hide */ public class IpReachabilityMonitor { @@ -169,64 +168,33 @@ public class IpReachabilityMonitor { } } - private final Object mLock = new Object(); private final String mInterfaceName; private final int mInterfaceIndex; + private final IpNeighborMonitor mIpNeighborMonitor; private final SharedLog mLog; private final Callback mCallback; private final Dependencies mDependencies; private final MultinetworkPolicyTracker mMultinetworkPolicyTracker; - private final NetlinkSocketObserver mNetlinkSocketObserver; - private final Thread mObserverThread; private final IpConnectivityLog mMetricsLog = new IpConnectivityLog(); - @GuardedBy("mLock") private LinkProperties mLinkProperties = new LinkProperties(); - // TODO: consider a map to a private NeighborState class holding more - // information than a single NUD state entry. - @GuardedBy("mLock") - private Map<InetAddress, Short> mIpWatchList = new HashMap<>(); - @GuardedBy("mLock") - private int mIpWatchListVersion; - private volatile boolean mRunning; + private Map<InetAddress, NeighborEvent> mNeighborWatchList = new HashMap<>(); // Time in milliseconds of the last forced probe request. private volatile long mLastProbeTimeMs; - /** - * Make the kernel perform neighbor reachability detection (IPv4 ARP or IPv6 ND) - * for the given IP address on the specified interface index. - * - * @return 0 if the request was successfully passed to the kernel; otherwise return - * a non-zero error code. - */ - private static int probeNeighbor(int ifIndex, InetAddress ip) { - final String msgSnippet = "probing ip=" + ip.getHostAddress() + "%" + ifIndex; - if (DBG) { Log.d(TAG, msgSnippet); } - - final byte[] msg = RtNetlinkNeighborMessage.newNewNeighborMessage( - 1, ip, StructNdMsg.NUD_PROBE, ifIndex, null); - - try { - NetlinkSocket.sendOneShotKernelMessage(OsConstants.NETLINK_ROUTE, msg); - } catch (ErrnoException e) { - Log.e(TAG, "Error " + msgSnippet + ": " + e); - return -e.errno; - } - - return 0; + public IpReachabilityMonitor( + Context context, String ifName, Handler h, SharedLog log, Callback callback) { + this(context, ifName, h, log, callback, null); } - public IpReachabilityMonitor(Context context, String ifName, SharedLog log, Callback callback) { - this(context, ifName, log, callback, null); - } - - public IpReachabilityMonitor(Context context, String ifName, SharedLog log, Callback callback, + public IpReachabilityMonitor( + Context context, String ifName, Handler h, SharedLog log, Callback callback, MultinetworkPolicyTracker tracker) { - this(ifName, getInterfaceIndex(ifName), log, callback, tracker, + this(ifName, getInterfaceIndex(ifName), h, log, callback, tracker, Dependencies.makeDefault(context, ifName)); } @VisibleForTesting - IpReachabilityMonitor(String ifName, int ifIndex, SharedLog log, Callback callback, + IpReachabilityMonitor(String ifName, int ifIndex, Handler h, SharedLog log, Callback callback, MultinetworkPolicyTracker tracker, Dependencies dependencies) { mInterfaceName = ifName; mLog = log.forSubComponent(TAG); @@ -234,45 +202,54 @@ public class IpReachabilityMonitor { mMultinetworkPolicyTracker = tracker; mInterfaceIndex = ifIndex; mDependencies = dependencies; - mNetlinkSocketObserver = new NetlinkSocketObserver(); - mObserverThread = new Thread(mNetlinkSocketObserver); - mObserverThread.start(); + + mIpNeighborMonitor = new IpNeighborMonitor(h, mLog, + (NeighborEvent event) -> { + if (mInterfaceIndex != event.ifindex) return; + if (!mNeighborWatchList.containsKey(event.ip)) return; + + final NeighborEvent prev = mNeighborWatchList.put(event.ip, event); + + // TODO: Consider what to do with other states that are not within + // NeighborEvent#isValid() (i.e. NUD_NONE, NUD_INCOMPLETE). + if (event.nudState == StructNdMsg.NUD_FAILED) { + mLog.w("ALERT neighbor went from: " + prev + " to: " + event); + handleNeighborLost(event); + } + }); + mIpNeighborMonitor.start(); } public void stop() { - mRunning = false; + mIpNeighborMonitor.stop(); clearLinkProperties(); - mNetlinkSocketObserver.clearNetlinkSocket(); } - // TODO: add a public dump() method that can be called during a bug report. - - private String describeWatchList() { - final String delimiter = ", "; - StringBuilder sb = new StringBuilder(); - synchronized (mLock) { - sb.append("iface{" + mInterfaceName + "/" + mInterfaceIndex + "}, "); - sb.append("v{" + mIpWatchListVersion + "}, "); - sb.append("ntable=["); - boolean firstTime = true; - for (Map.Entry<InetAddress, Short> entry : mIpWatchList.entrySet()) { - if (firstTime) { - firstTime = false; - } else { - sb.append(delimiter); - } - sb.append(entry.getKey().getHostAddress() + "/" + - StructNdMsg.stringForNudState(entry.getValue())); - } - sb.append("]"); - } - return sb.toString(); + public void dump(PrintWriter pw) { + DumpUtils.dumpAsync( + mIpNeighborMonitor.getHandler(), + new Dump() { + @Override + public void dump(PrintWriter pw, String prefix) { + pw.println(describeWatchList("\n")); + } + }, + pw, "", 1000); } - private boolean isWatching(InetAddress ip) { - synchronized (mLock) { - return mRunning && mIpWatchList.containsKey(ip); + private String describeWatchList() { return describeWatchList(" "); } + + private String describeWatchList(String sep) { + final StringBuilder sb = new StringBuilder(); + sb.append("iface{" + mInterfaceName + "/" + mInterfaceIndex + "}," + sep); + sb.append("ntable=[" + sep); + String delimiter = ""; + for (Map.Entry<InetAddress, NeighborEvent> entry : mNeighborWatchList.entrySet()) { + sb.append(delimiter).append(entry.getKey().getHostAddress() + "/" + entry.getValue()); + delimiter = "," + sep; } + sb.append("]"); + return sb.toString(); } private static boolean isOnLink(List<RouteInfo> routes, InetAddress ip) { @@ -284,13 +261,6 @@ public class IpReachabilityMonitor { return false; } - private short getNeighborStateLocked(InetAddress ip) { - if (mIpWatchList.containsKey(ip)) { - return mIpWatchList.get(ip); - } - return StructNdMsg.NUD_NONE; - } - public void updateLinkProperties(LinkProperties lp) { if (!mInterfaceName.equals(lp.getInterfaceName())) { // TODO: figure out whether / how to cope with interface changes. @@ -299,70 +269,63 @@ public class IpReachabilityMonitor { return; } - synchronized (mLock) { - mLinkProperties = new LinkProperties(lp); - Map<InetAddress, Short> newIpWatchList = new HashMap<>(); + mLinkProperties = new LinkProperties(lp); + Map<InetAddress, NeighborEvent> newNeighborWatchList = new HashMap<>(); - final List<RouteInfo> routes = mLinkProperties.getRoutes(); - for (RouteInfo route : routes) { - if (route.hasGateway()) { - InetAddress gw = route.getGateway(); - if (isOnLink(routes, gw)) { - newIpWatchList.put(gw, getNeighborStateLocked(gw)); - } + final List<RouteInfo> routes = mLinkProperties.getRoutes(); + for (RouteInfo route : routes) { + if (route.hasGateway()) { + InetAddress gw = route.getGateway(); + if (isOnLink(routes, gw)) { + newNeighborWatchList.put(gw, mNeighborWatchList.getOrDefault(gw, null)); } } + } - for (InetAddress nameserver : lp.getDnsServers()) { - if (isOnLink(routes, nameserver)) { - newIpWatchList.put(nameserver, getNeighborStateLocked(nameserver)); - } + for (InetAddress dns : lp.getDnsServers()) { + if (isOnLink(routes, dns)) { + newNeighborWatchList.put(dns, mNeighborWatchList.getOrDefault(dns, null)); } - - mIpWatchList = newIpWatchList; - mIpWatchListVersion++; } + + mNeighborWatchList = newNeighborWatchList; if (DBG) { Log.d(TAG, "watch: " + describeWatchList()); } } public void clearLinkProperties() { - synchronized (mLock) { - mLinkProperties.clear(); - mIpWatchList.clear(); - mIpWatchListVersion++; - } + mLinkProperties.clear(); + mNeighborWatchList.clear(); if (DBG) { Log.d(TAG, "clear: " + describeWatchList()); } } - private void handleNeighborLost(String msg) { - InetAddress ip = null; - final ProvisioningChange delta; - synchronized (mLock) { - LinkProperties whatIfLp = new LinkProperties(mLinkProperties); + private void handleNeighborLost(NeighborEvent event) { + final LinkProperties whatIfLp = new LinkProperties(mLinkProperties); - for (Map.Entry<InetAddress, Short> entry : mIpWatchList.entrySet()) { - if (entry.getValue() != StructNdMsg.NUD_FAILED) { - continue; - } - - ip = entry.getKey(); - for (RouteInfo route : mLinkProperties.getRoutes()) { - if (ip.equals(route.getGateway())) { - whatIfLp.removeRoute(route); - } - } - - if (avoidingBadLinks() || !(ip instanceof Inet6Address)) { - // We should do this unconditionally, but alas we cannot: b/31827713. - whatIfLp.removeDnsServer(ip); + InetAddress ip = null; + for (Map.Entry<InetAddress, NeighborEvent> entry : mNeighborWatchList.entrySet()) { + // TODO: Consider using NeighborEvent#isValid() here; it's more + // strict but may interact badly if other entries are somehow in + // NUD_INCOMPLETE (say, during network attach). + if (entry.getValue().nudState != StructNdMsg.NUD_FAILED) continue; + + ip = entry.getKey(); + for (RouteInfo route : mLinkProperties.getRoutes()) { + if (ip.equals(route.getGateway())) { + whatIfLp.removeRoute(route); } } - delta = LinkProperties.compareProvisioning(mLinkProperties, whatIfLp); + if (avoidingBadLinks() || !(ip instanceof Inet6Address)) { + // We should do this unconditionally, but alas we cannot: b/31827713. + whatIfLp.removeDnsServer(ip); + } } + final ProvisioningChange delta = LinkProperties.compareProvisioning( + mLinkProperties, whatIfLp); + if (delta == ProvisioningChange.LOST_PROVISIONING) { - final String logMsg = "FAILURE: LOST_PROVISIONING, " + msg; + final String logMsg = "FAILURE: LOST_PROVISIONING, " + event; Log.w(TAG, logMsg); if (mCallback != null) { // TODO: remove |ip| when the callback signature no longer has @@ -378,12 +341,9 @@ public class IpReachabilityMonitor { } public void probeAll() { - final List<InetAddress> ipProbeList; - synchronized (mLock) { - ipProbeList = new ArrayList<>(mIpWatchList.keySet()); - } + final List<InetAddress> ipProbeList = new ArrayList<>(mNeighborWatchList.keySet()); - if (!ipProbeList.isEmpty() && mRunning) { + if (!ipProbeList.isEmpty()) { // Keep the CPU awake long enough to allow all ARP/ND // probes a reasonable chance at success. See b/23197666. // @@ -394,13 +354,10 @@ public class IpReachabilityMonitor { } for (InetAddress target : ipProbeList) { - if (!mRunning) { - break; - } - final int returnValue = probeNeighbor(mInterfaceIndex, target); + final int rval = IpNeighborMonitor.startKernelNeighborProbe(mInterfaceIndex, target); mLog.log(String.format("put neighbor %s into NUD_PROBE state (rval=%d)", - target.getHostAddress(), returnValue)); - logEvent(IpReachabilityEvent.PROBE, returnValue); + target.getHostAddress(), rval)); + logEvent(IpReachabilityEvent.PROBE, rval); } mLastProbeTimeMs = SystemClock.elapsedRealtime(); } @@ -446,153 +403,4 @@ public class IpReachabilityMonitor { int eventType = IpReachabilityEvent.nudFailureEventType(isFromProbe, isProvisioningLost); mMetricsLog.log(mInterfaceName, new IpReachabilityEvent(eventType)); } - - // TODO: simplify the number of objects by making this extend Thread. - private final class NetlinkSocketObserver implements Runnable { - private NetlinkSocket mSocket; - - @Override - public void run() { - if (VDBG) { Log.d(TAG, "Starting observing thread."); } - mRunning = true; - - try { - setupNetlinkSocket(); - } catch (ErrnoException | SocketException e) { - Log.e(TAG, "Failed to suitably initialize a netlink socket", e); - mRunning = false; - } - - while (mRunning) { - final ByteBuffer byteBuffer; - try { - byteBuffer = recvKernelReply(); - } catch (ErrnoException e) { - if (mRunning) { Log.w(TAG, "ErrnoException: ", e); } - break; - } - final long whenMs = SystemClock.elapsedRealtime(); - if (byteBuffer == null) { - continue; - } - parseNetlinkMessageBuffer(byteBuffer, whenMs); - } - - clearNetlinkSocket(); - - mRunning = false; // Not a no-op when ErrnoException happened. - if (VDBG) { Log.d(TAG, "Finishing observing thread."); } - } - - private void clearNetlinkSocket() { - if (mSocket != null) { - mSocket.close(); - } - } - - // TODO: Refactor the main loop to recreate the socket upon recoverable errors. - private void setupNetlinkSocket() throws ErrnoException, SocketException { - clearNetlinkSocket(); - mSocket = new NetlinkSocket(OsConstants.NETLINK_ROUTE); - - final NetlinkSocketAddress listenAddr = new NetlinkSocketAddress( - 0, OsConstants.RTMGRP_NEIGH); - mSocket.bind(listenAddr); - - if (VDBG) { - final NetlinkSocketAddress nlAddr = mSocket.getLocalAddress(); - Log.d(TAG, "bound to sockaddr_nl{" - + ((long) (nlAddr.getPortId() & 0xffffffff)) + ", " - + nlAddr.getGroupsMask() - + "}"); - } - } - - private ByteBuffer recvKernelReply() throws ErrnoException { - try { - return mSocket.recvMessage(0); - } catch (InterruptedIOException e) { - // Interruption or other error, e.g. another thread closed our file descriptor. - } catch (ErrnoException e) { - if (e.errno != OsConstants.EAGAIN) { - throw e; - } - } - return null; - } - - private void parseNetlinkMessageBuffer(ByteBuffer byteBuffer, long whenMs) { - while (byteBuffer.remaining() > 0) { - final int position = byteBuffer.position(); - final NetlinkMessage nlMsg = NetlinkMessage.parse(byteBuffer); - if (nlMsg == null || nlMsg.getHeader() == null) { - byteBuffer.position(position); - Log.e(TAG, "unparsable netlink msg: " + NetlinkConstants.hexify(byteBuffer)); - break; - } - - final int srcPortId = nlMsg.getHeader().nlmsg_pid; - if (srcPortId != 0) { - Log.e(TAG, "non-kernel source portId: " + ((long) (srcPortId & 0xffffffff))); - break; - } - - if (nlMsg instanceof NetlinkErrorMessage) { - Log.e(TAG, "netlink error: " + nlMsg); - continue; - } else if (!(nlMsg instanceof RtNetlinkNeighborMessage)) { - if (DBG) { - Log.d(TAG, "non-rtnetlink neighbor msg: " + nlMsg); - } - continue; - } - - evaluateRtNetlinkNeighborMessage((RtNetlinkNeighborMessage) nlMsg, whenMs); - } - } - - private void evaluateRtNetlinkNeighborMessage( - RtNetlinkNeighborMessage neighMsg, long whenMs) { - final StructNdMsg ndMsg = neighMsg.getNdHeader(); - if (ndMsg == null || ndMsg.ndm_ifindex != mInterfaceIndex) { - return; - } - - final InetAddress destination = neighMsg.getDestination(); - if (!isWatching(destination)) { - return; - } - - final short msgType = neighMsg.getHeader().nlmsg_type; - final short nudState = ndMsg.ndm_state; - final String eventMsg = "NeighborEvent{" - + "elapsedMs=" + whenMs + ", " - + destination.getHostAddress() + ", " - + "[" + NetlinkConstants.hexify(neighMsg.getLinkLayerAddress()) + "], " - + NetlinkConstants.stringForNlMsgType(msgType) + ", " - + StructNdMsg.stringForNudState(nudState) - + "}"; - - if (VDBG) { - Log.d(TAG, neighMsg.toString()); - } else if (DBG) { - Log.d(TAG, eventMsg); - } - - synchronized (mLock) { - if (mIpWatchList.containsKey(destination)) { - final short value = - (msgType == NetlinkConstants.RTM_DELNEIGH) - ? StructNdMsg.NUD_NONE - : nudState; - mIpWatchList.put(destination, value); - } - } - - if (nudState == StructNdMsg.NUD_FAILED) { - Log.w(TAG, "ALERT: " + eventMsg); - handleNeighborLost(eventMsg); - } - } - } } diff --git a/services/net/java/android/net/netlink/NetlinkSocket.java b/services/net/java/android/net/netlink/NetlinkSocket.java index f5f211d8e631..5af3c299bfc1 100644 --- a/services/net/java/android/net/netlink/NetlinkSocket.java +++ b/services/net/java/android/net/netlink/NetlinkSocket.java @@ -16,16 +16,24 @@ package android.net.netlink; +import static android.system.OsConstants.AF_NETLINK; +import static android.system.OsConstants.EIO; +import static android.system.OsConstants.EPROTO; +import static android.system.OsConstants.ETIMEDOUT; +import static android.system.OsConstants.SO_RCVBUF; +import static android.system.OsConstants.SO_RCVTIMEO; +import static android.system.OsConstants.SO_SNDTIMEO; +import static android.system.OsConstants.SOCK_DGRAM; +import static android.system.OsConstants.SOL_SOCKET; + import android.system.ErrnoException; import android.system.NetlinkSocketAddress; import android.system.Os; -import android.system.OsConstants; import android.system.StructTimeval; import android.util.Log; import libcore.io.IoUtils; import libcore.io.Libcore; -import java.io.Closeable; import java.io.FileDescriptor; import java.io.InterruptedIOException; import java.net.SocketAddress; @@ -37,28 +45,27 @@ import java.nio.ByteOrder; /** * NetlinkSocket * - * A small wrapper class to assist with AF_NETLINK socket operations. + * A small static class to assist with AF_NETLINK socket operations. * * @hide */ -public class NetlinkSocket implements Closeable { +public class NetlinkSocket { private static final String TAG = "NetlinkSocket"; - private static final int SOCKET_RECV_BUFSIZE = 64 * 1024; - private static final int DEFAULT_RECV_BUFSIZE = 8 * 1024; - final private FileDescriptor mDescriptor; - private NetlinkSocketAddress mAddr; - private long mLastRecvTimeoutMs; - private long mLastSendTimeoutMs; + public static final int DEFAULT_RECV_BUFSIZE = 8 * 1024; + public static final int SOCKET_RECV_BUFSIZE = 64 * 1024; public static void sendOneShotKernelMessage(int nlProto, byte[] msg) throws ErrnoException { final String errPrefix = "Error in NetlinkSocket.sendOneShotKernelMessage"; + final long IO_TIMEOUT = 300L; + + FileDescriptor fd; - try (NetlinkSocket nlSocket = new NetlinkSocket(nlProto)) { - final long IO_TIMEOUT = 300L; - nlSocket.connectToKernel(); - nlSocket.sendMessage(msg, 0, msg.length, IO_TIMEOUT); - final ByteBuffer bytes = nlSocket.recvMessage(IO_TIMEOUT); + try { + fd = forProto(nlProto); + connectToKernel(fd); + sendMessage(fd, msg, 0, msg.length, IO_TIMEOUT); + final ByteBuffer bytes = recvMessage(fd, DEFAULT_RECV_BUFSIZE, IO_TIMEOUT); // recvMessage() guaranteed to not return null if it did not throw. final NetlinkMessage response = NetlinkMessage.parse(bytes); if (response != null && response instanceof NetlinkErrorMessage && @@ -81,61 +88,30 @@ public class NetlinkSocket implements Closeable { errmsg = response.toString(); } Log.e(TAG, errPrefix + ", errmsg=" + errmsg); - throw new ErrnoException(errmsg, OsConstants.EPROTO); + throw new ErrnoException(errmsg, EPROTO); } } catch (InterruptedIOException e) { Log.e(TAG, errPrefix, e); - throw new ErrnoException(errPrefix, OsConstants.ETIMEDOUT, e); + throw new ErrnoException(errPrefix, ETIMEDOUT, e); } catch (SocketException e) { Log.e(TAG, errPrefix, e); - throw new ErrnoException(errPrefix, OsConstants.EIO, e); + throw new ErrnoException(errPrefix, EIO, e); } - } - - public NetlinkSocket(int nlProto) throws ErrnoException { - mDescriptor = Os.socket( - OsConstants.AF_NETLINK, OsConstants.SOCK_DGRAM, nlProto); - - Os.setsockoptInt( - mDescriptor, OsConstants.SOL_SOCKET, - OsConstants.SO_RCVBUF, SOCKET_RECV_BUFSIZE); - } - - public NetlinkSocketAddress getLocalAddress() throws ErrnoException { - return (NetlinkSocketAddress) Os.getsockname(mDescriptor); - } - public void bind(NetlinkSocketAddress localAddr) throws ErrnoException, SocketException { - Os.bind(mDescriptor, (SocketAddress)localAddr); + IoUtils.closeQuietly(fd); } - public void connectTo(NetlinkSocketAddress peerAddr) - throws ErrnoException, SocketException { - Os.connect(mDescriptor, (SocketAddress) peerAddr); + public static FileDescriptor forProto(int nlProto) throws ErrnoException { + final FileDescriptor fd = Os.socket(AF_NETLINK, SOCK_DGRAM, nlProto); + Os.setsockoptInt(fd, SOL_SOCKET, SO_RCVBUF, SOCKET_RECV_BUFSIZE); + return fd; } - public void connectToKernel() throws ErrnoException, SocketException { - connectTo(new NetlinkSocketAddress(0, 0)); - } - - /** - * Wait indefinitely (or until underlying socket error) for a - * netlink message of at most DEFAULT_RECV_BUFSIZE size. - */ - public ByteBuffer recvMessage() - throws ErrnoException, InterruptedIOException { - return recvMessage(DEFAULT_RECV_BUFSIZE, 0); - } - - /** - * Wait up to |timeoutMs| (or until underlying socket error) for a - * netlink message of at most DEFAULT_RECV_BUFSIZE size. - */ - public ByteBuffer recvMessage(long timeoutMs) throws ErrnoException, InterruptedIOException { - return recvMessage(DEFAULT_RECV_BUFSIZE, timeoutMs); + public static void connectToKernel(FileDescriptor fd) throws ErrnoException, SocketException { + Os.connect(fd, (SocketAddress) (new NetlinkSocketAddress(0, 0))); } - private void checkTimeout(long timeoutMs) { + private static void checkTimeout(long timeoutMs) { if (timeoutMs < 0) { throw new IllegalArgumentException("Negative timeouts not permitted"); } @@ -147,21 +123,14 @@ public class NetlinkSocket implements Closeable { * * Multi-threaded calls with different timeouts will cause unexpected results. */ - public ByteBuffer recvMessage(int bufsize, long timeoutMs) + public static ByteBuffer recvMessage(FileDescriptor fd, int bufsize, long timeoutMs) throws ErrnoException, IllegalArgumentException, InterruptedIOException { checkTimeout(timeoutMs); - synchronized (mDescriptor) { - if (mLastRecvTimeoutMs != timeoutMs) { - Os.setsockoptTimeval(mDescriptor, - OsConstants.SOL_SOCKET, OsConstants.SO_RCVTIMEO, - StructTimeval.fromMillis(timeoutMs)); - mLastRecvTimeoutMs = timeoutMs; - } - } + Os.setsockoptTimeval(fd, SOL_SOCKET, SO_RCVTIMEO, StructTimeval.fromMillis(timeoutMs)); ByteBuffer byteBuffer = ByteBuffer.allocate(bufsize); - int length = Os.read(mDescriptor, byteBuffer); + int length = Os.read(fd, byteBuffer); if (length == bufsize) { Log.w(TAG, "maximum read"); } @@ -172,39 +141,16 @@ public class NetlinkSocket implements Closeable { } /** - * Send a message to a peer to which this socket has previously connected. - * - * This blocks until completion or an error occurs. - */ - public boolean sendMessage(byte[] bytes, int offset, int count) - throws ErrnoException, InterruptedIOException { - return sendMessage(bytes, offset, count, 0); - } - - /** * Send a message to a peer to which this socket has previously connected, * waiting at most |timeoutMs| milliseconds for the send to complete. * * Multi-threaded calls with different timeouts will cause unexpected results. */ - public boolean sendMessage(byte[] bytes, int offset, int count, long timeoutMs) + public static int sendMessage( + FileDescriptor fd, byte[] bytes, int offset, int count, long timeoutMs) throws ErrnoException, IllegalArgumentException, InterruptedIOException { checkTimeout(timeoutMs); - - synchronized (mDescriptor) { - if (mLastSendTimeoutMs != timeoutMs) { - Os.setsockoptTimeval(mDescriptor, - OsConstants.SOL_SOCKET, OsConstants.SO_SNDTIMEO, - StructTimeval.fromMillis(timeoutMs)); - mLastSendTimeoutMs = timeoutMs; - } - } - - return (count == Os.write(mDescriptor, bytes, offset, count)); - } - - @Override - public void close() { - IoUtils.closeQuietly(mDescriptor); + Os.setsockoptTimeval(fd, SOL_SOCKET, SO_SNDTIMEO, StructTimeval.fromMillis(timeoutMs)); + return Os.write(fd, bytes, offset, count); } } diff --git a/services/net/java/android/net/netlink/StructNdMsg.java b/services/net/java/android/net/netlink/StructNdMsg.java index b68ec0bc6226..e34ec39ab99b 100644 --- a/services/net/java/android/net/netlink/StructNdMsg.java +++ b/services/net/java/android/net/netlink/StructNdMsg.java @@ -63,6 +63,11 @@ public class StructNdMsg { return ((nudState & (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE)) != 0); } + public static boolean isNudStateValid(short nudState) { + return (isNudStateConnected(nudState) || + ((nudState & (NUD_PROBE|NUD_STALE|NUD_DELAY)) != 0)); + } + // Neighbor Cache Entry Flags public static byte NTF_USE = (byte) 0x01; public static byte NTF_SELF = (byte) 0x02; @@ -143,7 +148,7 @@ public class StructNdMsg { } public boolean nudValid() { - return (nudConnected() || ((ndm_state & (NUD_PROBE|NUD_STALE|NUD_DELAY)) != 0)); + return isNudStateValid(ndm_state); } @Override diff --git a/services/net/java/android/net/util/BlockingSocketReader.java b/services/net/java/android/net/util/PacketReader.java index 99bf46952b4e..10da2a551e21 100644 --- a/services/net/java/android/net/util/BlockingSocketReader.java +++ b/services/net/java/android/net/util/PacketReader.java @@ -67,7 +67,7 @@ import java.io.IOException; * * @hide */ -public abstract class BlockingSocketReader { +public abstract class PacketReader { private static final int FD_EVENTS = EVENT_INPUT | EVENT_ERROR; private static final int UNREGISTER_THIS_FD = 0; @@ -83,11 +83,11 @@ public abstract class BlockingSocketReader { IoUtils.closeQuietly(fd); } - protected BlockingSocketReader(Handler h) { + protected PacketReader(Handler h) { this(h, DEFAULT_RECV_BUF_SIZE); } - protected BlockingSocketReader(Handler h, int recvbufsize) { + protected PacketReader(Handler h, int recvbufsize) { mHandler = h; mQueue = mHandler.getLooper().getQueue(); mPacket = new byte[Math.max(recvbufsize, DEFAULT_RECV_BUF_SIZE)]; @@ -115,6 +115,8 @@ public abstract class BlockingSocketReader { } } + public Handler getHandler() { return mHandler; } + public final int recvBufSize() { return mPacket.length; } public final long numPacketsReceived() { return mPacketsReceived; } diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index e5ab44ffaf6b..218a2b89bbc1 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -38,7 +38,7 @@ LOCAL_SRC_FILES += $(call all-java-files-under, test-apps/JobTestApp/src) LOCAL_JAVA_LIBRARIES := \ android.hidl.manager-V1.0-java \ android.test.mock \ - legacy-android-test \ + android.test.base android.test.runner \ LOCAL_PACKAGE_NAME := FrameworksServicesTests LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java index 926a9112ad29..8cf575eec4d9 100644 --- a/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java @@ -2121,24 +2121,32 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { PACKAGE_FALLBACK_LAUNCHER_PRIORITY); } - protected void makeCallerForeground() { + protected void makeUidForeground(int uid) { try { mService.mUidObserver.onUidStateChanged( - mInjectedCallingUid, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0); + uid, ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, 0); } catch (RemoteException e) { e.rethrowAsRuntimeException(); } } - protected void makeCallerBackground() { + protected void makeCallerForeground() { + makeUidForeground(mInjectedCallingUid); + } + + protected void makeUidBackground(int uid) { try { mService.mUidObserver.onUidStateChanged( - mInjectedCallingUid, ActivityManager.PROCESS_STATE_TOP_SLEEPING, 0); + uid, ActivityManager.PROCESS_STATE_TOP_SLEEPING, 0); } catch (RemoteException e) { e.rethrowAsRuntimeException(); } } + protected void makeCallerBackground() { + makeUidBackground(mInjectedCallingUid); + } + protected void publishManifestShortcutsAsCaller(int resId) { addManifestShortcutResource( new ComponentName(getCallingPackage(), ShortcutActivity.class.getName()), diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java index f92b575bc976..ee33e797b0ab 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java @@ -7912,4 +7912,35 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest { .forAllShortcuts(si -> assertTrue(si.isReturnedByServer())); }); } + + public void testIsForegroundDefaultLauncher_true() { + final ComponentName defaultLauncher = new ComponentName("default", "launcher"); + final int uid = 1024; + + setDefaultLauncher(UserHandle.USER_SYSTEM, defaultLauncher); + makeUidForeground(uid); + + assertTrue(mInternal.isForegroundDefaultLauncher("default", uid)); + } + + + public void testIsForegroundDefaultLauncher_defaultButNotForeground() { + final ComponentName defaultLauncher = new ComponentName("default", "launcher"); + final int uid = 1024; + + setDefaultLauncher(UserHandle.USER_SYSTEM, defaultLauncher); + makeUidBackground(uid); + + assertFalse(mInternal.isForegroundDefaultLauncher("default", uid)); + } + + public void testIsForegroundDefaultLauncher_foregroundButNotDefault() { + final ComponentName defaultLauncher = new ComponentName("default", "launcher"); + final int uid = 1024; + + setDefaultLauncher(UserHandle.USER_SYSTEM, defaultLauncher); + makeUidForeground(uid); + + assertFalse(mInternal.isForegroundDefaultLauncher("another", uid)); + } } diff --git a/services/tests/servicestests/src/com/android/server/policy/FakeWindowState.java b/services/tests/servicestests/src/com/android/server/policy/FakeWindowState.java index a70441d5b84b..d1e0132ee248 100644 --- a/services/tests/servicestests/src/com/android/server/policy/FakeWindowState.java +++ b/services/tests/servicestests/src/com/android/server/policy/FakeWindowState.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.graphics.Point; import android.graphics.Rect; import android.view.Display; +import android.view.DisplayCutout; import android.view.IApplicationToken; import android.view.WindowManager; @@ -34,6 +35,8 @@ public class FakeWindowState implements WindowManagerPolicy.WindowState { public final Rect stableFrame = new Rect(); public Rect outsetFrame = new Rect(); + public DisplayCutout displayCutout; + public WindowManager.LayoutParams attrs; public int displayId; public boolean isVoiceInteraction; @@ -56,7 +59,7 @@ public class FakeWindowState implements WindowManagerPolicy.WindowState { @Override public void computeFrameLw(Rect parentFrame, Rect displayFrame, Rect overlayFrame, Rect contentFrame, Rect visibleFrame, Rect decorFrame, Rect stableFrame, - @Nullable Rect outsetFrame) { + @Nullable Rect outsetFrame, DisplayCutout displayCutout) { this.parentFrame.set(parentFrame); this.displayFrame.set(displayFrame); this.overscanFrame.set(overlayFrame); @@ -65,6 +68,7 @@ public class FakeWindowState implements WindowManagerPolicy.WindowState { this.decorFrame.set(decorFrame); this.stableFrame.set(stableFrame); this.outsetFrame = outsetFrame == null ? null : new Rect(outsetFrame); + this.displayCutout = displayCutout; } @Override diff --git a/services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerLayoutTest.java b/services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerLayoutTest.java index 0941d4fd4fc9..9a6da0e791b5 100644 --- a/services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerLayoutTest.java +++ b/services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerLayoutTest.java @@ -16,7 +16,12 @@ package com.android.server.policy; +import static android.view.Surface.ROTATION_180; +import static android.view.Surface.ROTATION_270; +import static android.view.Surface.ROTATION_90; +import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; +import static android.view.WindowManager.LayoutParams.FLAG2_LAYOUT_IN_DISPLAY_CUTOUT_AREA; import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; @@ -29,6 +34,7 @@ import android.graphics.PixelFormat; import android.platform.test.annotations.Presubmit; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import android.view.Surface; import android.view.WindowManager; import org.junit.Before; @@ -105,4 +111,123 @@ public class PhoneWindowManagerLayoutTest extends PhoneWindowManagerTestBase { assertEquals(0, mAppWindow.attrs.systemUiVisibility); assertEquals(0, mAppWindow.attrs.subtreeSystemUiVisibility); } + + @Test + public void layoutWindowLw_withDisplayCutout() { + addDisplayCutout(); + + mPolicy.addWindow(mAppWindow); + + mPolicy.beginLayoutLw(mFrames, 0 /* UI mode */); + mPolicy.layoutWindowLw(mAppWindow, null, mFrames); + + assertInsetByTopBottom(mAppWindow.parentFrame, 0, 0); + assertInsetByTopBottom(mAppWindow.stableFrame, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT); + assertInsetByTopBottom(mAppWindow.contentFrame, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT); + assertInsetByTopBottom(mAppWindow.decorFrame, 0, 0); + } + + @Test + public void layoutWindowLw_withDisplayCutout_fullscreen() { + addDisplayCutout(); + + mAppWindow.attrs.subtreeSystemUiVisibility |= SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; + mPolicy.addWindow(mAppWindow); + + mPolicy.beginLayoutLw(mFrames, 0 /* UI mode */); + mPolicy.layoutWindowLw(mAppWindow, null, mFrames); + + assertInsetByTopBottom(mAppWindow.parentFrame, STATUS_BAR_HEIGHT, 0); + assertInsetByTopBottom(mAppWindow.stableFrame, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT); + assertInsetByTopBottom(mAppWindow.contentFrame, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT); + assertInsetByTopBottom(mAppWindow.decorFrame, 0, 0); + } + + @Test + public void layoutWindowLw_withDisplayCutout_fullscreenInCutout() { + addDisplayCutout(); + + mAppWindow.attrs.subtreeSystemUiVisibility |= SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; + mAppWindow.attrs.flags2 |= FLAG2_LAYOUT_IN_DISPLAY_CUTOUT_AREA; + mPolicy.addWindow(mAppWindow); + + mPolicy.beginLayoutLw(mFrames, 0 /* UI mode */); + mPolicy.layoutWindowLw(mAppWindow, null, mFrames); + + assertInsetByTopBottom(mAppWindow.parentFrame, 0, 0); + assertInsetByTopBottom(mAppWindow.stableFrame, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT); + assertInsetByTopBottom(mAppWindow.contentFrame, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT); + assertInsetByTopBottom(mAppWindow.decorFrame, 0, 0); + } + + + @Test + public void layoutWindowLw_withDisplayCutout_landscape() { + addDisplayCutout(); + setRotation(ROTATION_90); + mPolicy.addWindow(mAppWindow); + + mPolicy.beginLayoutLw(mFrames, 0 /* UI mode */); + mPolicy.layoutWindowLw(mAppWindow, null, mFrames); + + assertInsetBy(mAppWindow.parentFrame, DISPLAY_CUTOUT_HEIGHT, 0, 0, 0); + assertInsetBy(mAppWindow.stableFrame, 0, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT, 0); + assertInsetBy(mAppWindow.contentFrame, + DISPLAY_CUTOUT_HEIGHT, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT, 0); + assertInsetBy(mAppWindow.decorFrame, 0, 0, 0, 0); + } + + @Test + public void layoutWindowLw_withDisplayCutout_seascape() { + addDisplayCutout(); + setRotation(ROTATION_270); + mPolicy.addWindow(mAppWindow); + + mPolicy.beginLayoutLw(mFrames, 0 /* UI mode */); + mPolicy.layoutWindowLw(mAppWindow, null, mFrames); + + assertInsetBy(mAppWindow.parentFrame, 0, 0, DISPLAY_CUTOUT_HEIGHT, 0); + assertInsetBy(mAppWindow.stableFrame, NAV_BAR_HEIGHT, STATUS_BAR_HEIGHT, 0, 0); + assertInsetBy(mAppWindow.contentFrame, + NAV_BAR_HEIGHT, STATUS_BAR_HEIGHT, DISPLAY_CUTOUT_HEIGHT, 0); + assertInsetBy(mAppWindow.decorFrame, 0, 0, 0, 0); + } + + @Test + public void layoutWindowLw_withDisplayCutout_fullscreen_landscape() { + addDisplayCutout(); + setRotation(ROTATION_90); + + mAppWindow.attrs.subtreeSystemUiVisibility |= SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; + mPolicy.addWindow(mAppWindow); + + mPolicy.beginLayoutLw(mFrames, 0 /* UI mode */); + mPolicy.layoutWindowLw(mAppWindow, null, mFrames); + + assertInsetBy(mAppWindow.parentFrame, DISPLAY_CUTOUT_HEIGHT, 0, 0, 0); + assertInsetBy(mAppWindow.stableFrame, 0, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT, 0); + assertInsetBy(mAppWindow.contentFrame, + DISPLAY_CUTOUT_HEIGHT, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT, 0); + assertInsetBy(mAppWindow.decorFrame, 0, 0, 0, 0); + } + + @Test + public void layoutWindowLw_withDisplayCutout_fullscreenInCutout_landscape() { + addDisplayCutout(); + setRotation(ROTATION_90); + + mAppWindow.attrs.subtreeSystemUiVisibility |= SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; + mAppWindow.attrs.flags2 |= FLAG2_LAYOUT_IN_DISPLAY_CUTOUT_AREA; + mPolicy.addWindow(mAppWindow); + + mPolicy.beginLayoutLw(mFrames, 0 /* UI mode */); + mPolicy.layoutWindowLw(mAppWindow, null, mFrames); + + assertInsetBy(mAppWindow.parentFrame, 0, 0, 0, 0); + assertInsetBy(mAppWindow.stableFrame, 0, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT, 0); + assertInsetBy(mAppWindow.contentFrame, + DISPLAY_CUTOUT_HEIGHT, STATUS_BAR_HEIGHT, NAV_BAR_HEIGHT, 0); + assertInsetBy(mAppWindow.decorFrame, 0, 0, 0, 0); + } + }
\ No newline at end of file diff --git a/services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerTestBase.java b/services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerTestBase.java index 9c5570725baa..e7e9abad5bbe 100644 --- a/services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerTestBase.java +++ b/services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerTestBase.java @@ -17,6 +17,9 @@ package com.android.server.policy; import static android.view.Surface.ROTATION_0; +import static android.view.Surface.ROTATION_180; +import static android.view.Surface.ROTATION_270; +import static android.view.Surface.ROTATION_90; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR; @@ -54,6 +57,7 @@ public class PhoneWindowManagerTestBase { static final int STATUS_BAR_HEIGHT = 10; static final int NAV_BAR_HEIGHT = 15; + static final int DISPLAY_CUTOUT_HEIGHT = 8; TestablePhoneWindowManager mPolicy; TestContextWrapper mContext; @@ -76,10 +80,17 @@ public class PhoneWindowManagerTestBase { mPolicy = TestablePhoneWindowManager.create(mContext); + setRotation(ROTATION_0); + } + + public void setRotation(int rotation) { DisplayInfo info = new DisplayInfo(); - info.logicalWidth = DISPLAY_WIDTH; - info.logicalHeight = DISPLAY_HEIGHT; - info.rotation = ROTATION_0; + + final boolean flippedDimensions = rotation == ROTATION_90 || rotation == ROTATION_270; + info.logicalWidth = flippedDimensions ? DISPLAY_HEIGHT : DISPLAY_WIDTH; + info.logicalHeight = flippedDimensions ? DISPLAY_WIDTH : DISPLAY_HEIGHT; + info.rotation = rotation; + mFrames = new DisplayFrames(Display.DEFAULT_DISPLAY, info); } @@ -95,7 +106,7 @@ public class PhoneWindowManagerTestBase { public void addNavigationBar() { mNavigationBar = new FakeWindowState(); - mNavigationBar.attrs = new WindowManager.LayoutParams(MATCH_PARENT, STATUS_BAR_HEIGHT, + mNavigationBar.attrs = new WindowManager.LayoutParams(MATCH_PARENT, NAV_BAR_HEIGHT, TYPE_NAVIGATION_BAR, 0 /* flags */, PixelFormat.TRANSLUCENT); mNavigationBar.attrs.gravity = Gravity.BOTTOM; @@ -104,11 +115,16 @@ public class PhoneWindowManagerTestBase { mPolicy.mLastSystemUiFlags |= View.NAVIGATION_BAR_TRANSPARENT; } + public void addDisplayCutout() { + mPolicy.mEmulateDisplayCutout = true; + } + /** Asserts that {@code actual} is inset by the given amounts from the full display rect. */ public void assertInsetBy(Rect actual, int expectedInsetLeft, int expectedInsetTop, int expectedInsetRight, int expectedInsetBottom) { assertEquals(new Rect(expectedInsetLeft, expectedInsetTop, - DISPLAY_WIDTH - expectedInsetRight, DISPLAY_HEIGHT - expectedInsetBottom), actual); + mFrames.mDisplayWidth - expectedInsetRight, + mFrames.mDisplayHeight - expectedInsetBottom), actual); } /** @@ -181,6 +197,11 @@ public class PhoneWindowManagerTestBase { policy[0].mAccessibilityManager = new AccessibilityManager(context, mock(IAccessibilityManager.class), UserHandle.USER_CURRENT); policy[0].mSystemGestures = mock(SystemGesturesPointerEventListener.class); + policy[0].mNavigationBarCanMove = true; + policy[0].mPortraitRotation = ROTATION_0; + policy[0].mLandscapeRotation = ROTATION_90; + policy[0].mUpsideDownRotation = ROTATION_180; + policy[0].mSeascapeRotation = ROTATION_270; policy[0].onConfigurationChanged(); }); return policy[0]; diff --git a/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java b/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java index f069d49a244b..4dd51ebd2d06 100644 --- a/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java @@ -48,6 +48,10 @@ public class DimmerTests extends WindowTestsBase { final SurfaceControl mControl = mock(SurfaceControl.class); final SurfaceControl.Transaction mTransaction = mock(SurfaceControl.Transaction.class); + TestWindowContainer() { + super(sWm); + } + @Override SurfaceControl getSurfaceControl() { return mControl; @@ -65,6 +69,10 @@ public class DimmerTests extends WindowTestsBase { final SurfaceControl mHostControl = mock(SurfaceControl.class); final SurfaceControl.Transaction mHostTransaction = mock(SurfaceControl.Transaction.class); + MockSurfaceBuildingContainer() { + super(sWm); + } + class MockSurfaceBuilder extends SurfaceControl.Builder { MockSurfaceBuilder(SurfaceSession ss) { super(ss); @@ -78,6 +86,7 @@ public class DimmerTests extends WindowTestsBase { } } + @Override SurfaceControl.Builder makeChildSurface(WindowContainer child) { return new MockSurfaceBuilder(mSession); diff --git a/services/tests/servicestests/src/com/android/server/wm/StackWindowControllerTests.java b/services/tests/servicestests/src/com/android/server/wm/StackWindowControllerTests.java index 5da322409f83..ab0a2bd86dd8 100644 --- a/services/tests/servicestests/src/com/android/server/wm/StackWindowControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/StackWindowControllerTests.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue; * Test class for {@link StackWindowController}. * * Build/Install/Run: - * bit FrameworksServicesTests:com.android.server.wm.StackWindowControllerTests + * atest FrameworksServicesTests:StackWindowControllerTests */ @SmallTest @Presubmit @@ -61,7 +61,6 @@ public class StackWindowControllerTests extends WindowTestsBase { } @Test - @Ignore("b/65379195") public void testRemoveContainer_deferRemoval() throws Exception { final StackWindowController stackController = createStackControllerOnDisplay(mDisplayContent); diff --git a/services/tests/servicestests/src/com/android/server/wm/TestIWindow.java b/services/tests/servicestests/src/com/android/server/wm/TestIWindow.java index 0a644b60d224..353aa7deb534 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TestIWindow.java +++ b/services/tests/servicestests/src/com/android/server/wm/TestIWindow.java @@ -23,6 +23,7 @@ import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.util.MergedConfiguration; +import android.view.DisplayCutout; import android.view.DragEvent; import android.view.IWindow; @@ -37,7 +38,8 @@ public class TestIWindow extends IWindow.Stub { @Override public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw, MergedConfiguration mergedConfig, - Rect backDropFrame, boolean forceLayout, boolean alwaysConsumeNavBar, int displayId) + Rect backDropFrame, boolean forceLayout, boolean alwaysConsumeNavBar, int displayId, + DisplayCutout.ParcelableWrapper displayCutout) throws RemoteException { } diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowContainerControllerTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowContainerControllerTests.java index 8df7568ebcd9..bab2170ad7bb 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowContainerControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowContainerControllerTests.java @@ -44,7 +44,7 @@ public class WindowContainerControllerTests extends WindowTestsBase { @Test public void testCreation() throws Exception { final WindowContainerController controller = new WindowContainerController(null, sWm); - final WindowContainer container = new WindowContainer(); + final WindowContainer container = new WindowContainer(sWm); container.setController(controller); assertEquals(controller, container.getController()); @@ -54,7 +54,7 @@ public class WindowContainerControllerTests extends WindowTestsBase { @Test public void testSetContainer() throws Exception { final WindowContainerController controller = new WindowContainerController(null, sWm); - final WindowContainer container = new WindowContainer(); + final WindowContainer container = new WindowContainer(sWm); controller.setContainer(container); assertEquals(controller.mContainer, container); @@ -62,7 +62,7 @@ public class WindowContainerControllerTests extends WindowTestsBase { // Assert we can't change the container to another one once set boolean gotException = false; try { - controller.setContainer(new WindowContainer()); + controller.setContainer(new WindowContainer(sWm)); } catch (IllegalArgumentException e) { gotException = true; } @@ -76,7 +76,7 @@ public class WindowContainerControllerTests extends WindowTestsBase { @Test public void testRemoveContainer() throws Exception { final WindowContainerController controller = new WindowContainerController(null, sWm); - final WindowContainer container = new WindowContainer(); + final WindowContainer container = new WindowContainer(sWm); controller.setContainer(container); assertEquals(controller.mContainer, container); @@ -88,7 +88,7 @@ public class WindowContainerControllerTests extends WindowTestsBase { @Test public void testOnOverrideConfigurationChanged() throws Exception { final WindowContainerController controller = new WindowContainerController(null, sWm); - final WindowContainer container = new WindowContainer(); + final WindowContainer container = new WindowContainer(sWm); controller.setContainer(container); assertEquals(controller.mContainer, container); diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java index 16b6ca684c78..5cb94678a58c 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java @@ -193,7 +193,7 @@ public class WindowContainerTests extends WindowTestsBase { @Test public void testRemoveImmediately_WithController() throws Exception { - final WindowContainer container = new WindowContainer(); + final WindowContainer container = new WindowContainer(sWm); final WindowContainerController controller = new WindowContainerController(null, sWm); container.setController(controller); @@ -208,7 +208,7 @@ public class WindowContainerTests extends WindowTestsBase { @Test public void testSetController() throws Exception { final WindowContainerController controller = new WindowContainerController(null, sWm); - final WindowContainer container = new WindowContainer(); + final WindowContainer container = new WindowContainer(sWm); container.setController(controller); assertEquals(controller, container.getController()); @@ -587,6 +587,7 @@ public class WindowContainerTests extends WindowTestsBase { TestWindowContainer(int layer, boolean isAnimating, boolean isVisible, Integer orientation) { + super(sWm); mLayer = layer; mIsAnimating = isAnimating; mIsVisible = isVisible; diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java index fdcf57b18241..337fd50a88d4 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java @@ -22,12 +22,12 @@ import org.junit.runner.RunWith; import android.app.ActivityManager.TaskDescription; import android.content.res.Configuration; +import android.graphics.Point; import android.graphics.Rect; -import android.os.Debug; import android.platform.test.annotations.Presubmit; -import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import android.view.DisplayCutout; import android.view.DisplayInfo; import android.view.Gravity; import android.view.IWindow; @@ -38,6 +38,8 @@ import static android.view.WindowManager.LayoutParams.FILL_PARENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.util.Arrays; + /** * Tests for the {@link WindowState#computeFrameLw} method and other window frame machinery. * @@ -158,7 +160,7 @@ public class WindowFrameTests extends WindowTestsBase { // When mFrame extends past cf, the content insets are // the difference between mFrame and ContentFrame. Visible // and stable frames work the same way. - w.computeFrameLw(pf, df, of, cf, vf, dcf, sf, null); + w.computeFrameLw(pf, df, of, cf, vf, dcf, sf, null, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame,0, 0, 1000, 1000); assertRect(w.mContentInsets, 0, topContentInset, 0, bottomContentInset); assertRect(w.mVisibleInsets, 0, topVisibleInset, 0, bottomVisibleInset); @@ -173,7 +175,7 @@ public class WindowFrameTests extends WindowTestsBase { w.mAttrs.width = 100; w.mAttrs.height = 100; //have to clear MATCH_PARENT w.mRequestedWidth = 100; w.mRequestedHeight = 100; - w.computeFrameLw(pf, df, of, cf, vf, dcf, sf, null); + w.computeFrameLw(pf, df, of, cf, vf, dcf, sf, null, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, 100, 100, 200, 200); assertRect(w.mContentInsets, 0, 0, 0, 0); // In this case the frames are shrunk to the window frame. @@ -194,7 +196,7 @@ public class WindowFrameTests extends WindowTestsBase { // Here the window has FILL_PARENT, FILL_PARENT // so we expect it to fill the entire available frame. - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, 0, 0, 1000, 1000); // It can select various widths and heights within the bounds. @@ -202,14 +204,14 @@ public class WindowFrameTests extends WindowTestsBase { // and we use mRequestedWidth/mRequestedHeight w.mAttrs.width = 300; w.mAttrs.height = 300; - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); // Explicit width and height without requested width/height // gets us nothing. assertRect(w.mFrame, 0, 0, 0, 0); w.mRequestedWidth = 300; w.mRequestedHeight = 300; - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); // With requestedWidth/Height we can freely choose our size within the // parent bounds. assertRect(w.mFrame, 0, 0, 300, 300); @@ -222,14 +224,14 @@ public class WindowFrameTests extends WindowTestsBase { w.mRequestedWidth = -1; w.mAttrs.width = 100; w.mAttrs.height = 100; - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, 0, 0, 100, 100); w.mAttrs.flags = 0; // But sizes too large will be clipped to the containing frame w.mRequestedWidth = 1200; w.mRequestedHeight = 1200; - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, 0, 0, 1000, 1000); // Before they are clipped though windows will be shifted @@ -237,7 +239,7 @@ public class WindowFrameTests extends WindowTestsBase { w.mAttrs.y = 300; w.mRequestedWidth = 1000; w.mRequestedHeight = 1000; - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, 0, 0, 1000, 1000); // If there is room to move around in the parent frame the window will be shifted according @@ -247,16 +249,16 @@ public class WindowFrameTests extends WindowTestsBase { w.mRequestedWidth = 300; w.mRequestedHeight = 300; w.mAttrs.gravity = Gravity.RIGHT | Gravity.TOP; - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, 700, 0, 1000, 300); w.mAttrs.gravity = Gravity.RIGHT | Gravity.BOTTOM; - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, 700, 700, 1000, 1000); // Window specified x and y are interpreted as offsets in the opposite // direction of gravity w.mAttrs.x = 100; w.mAttrs.y = 100; - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, 600, 600, 900, 900); } @@ -277,7 +279,7 @@ public class WindowFrameTests extends WindowTestsBase { w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; final Rect pf = new Rect(0, 0, logicalWidth, logicalHeight); - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, null); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, null, DisplayCutout.NO_CUTOUT); // For non fullscreen tasks the containing frame is based off the // task bounds not the parent frame. assertRect(w.mFrame, taskLeft, taskTop, taskRight, taskBottom); @@ -289,7 +291,7 @@ public class WindowFrameTests extends WindowTestsBase { final int cfRight = logicalWidth / 2; final int cfBottom = logicalHeight / 2; final Rect cf = new Rect(0, 0, cfRight, cfBottom); - w.computeFrameLw(pf, pf, pf, cf, cf, pf, cf, null); + w.computeFrameLw(pf, pf, pf, cf, cf, pf, cf, null, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, taskLeft, taskTop, taskRight, taskBottom); int contentInsetRight = taskRight - cfRight; int contentInsetBottom = taskBottom - cfBottom; @@ -306,7 +308,7 @@ public class WindowFrameTests extends WindowTestsBase { final int insetRight = insetLeft + (taskRight - taskLeft); final int insetBottom = insetTop + (taskBottom - taskTop); task.mInsetBounds.set(insetLeft, insetTop, insetRight, insetBottom); - w.computeFrameLw(pf, pf, pf, cf, cf, pf, cf, null); + w.computeFrameLw(pf, pf, pf, cf, cf, pf, cf, null, DisplayCutout.NO_CUTOUT); assertRect(w.mFrame, taskLeft, taskTop, taskRight, taskBottom); contentInsetRight = insetRight - cfRight; contentInsetBottom = insetBottom - cfBottom; @@ -338,13 +340,13 @@ public class WindowFrameTests extends WindowTestsBase { final Rect policyCrop = new Rect(); - w.computeFrameLw(pf, df, of, cf, vf, dcf, sf, null); + w.computeFrameLw(pf, df, of, cf, vf, dcf, sf, null, DisplayCutout.NO_CUTOUT); w.calculatePolicyCrop(policyCrop); assertRect(policyCrop, 0, cf.top, logicalWidth, cf.bottom); dcf.setEmpty(); // Likewise with no decor frame we would get no crop - w.computeFrameLw(pf, df, of, cf, vf, dcf, sf, null); + w.computeFrameLw(pf, df, of, cf, vf, dcf, sf, null, DisplayCutout.NO_CUTOUT); w.calculatePolicyCrop(policyCrop); assertRect(policyCrop, 0, 0, logicalWidth, logicalHeight); @@ -357,7 +359,7 @@ public class WindowFrameTests extends WindowTestsBase { w.mAttrs.height = logicalHeight / 2; w.mRequestedWidth = logicalWidth / 2; w.mRequestedHeight = logicalHeight / 2; - w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf); + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, DisplayCutout.NO_CUTOUT); w.calculatePolicyCrop(policyCrop); // Normally the crop is shrunk from the decor frame @@ -394,7 +396,7 @@ public class WindowFrameTests extends WindowTestsBase { final Rect pf = new Rect(0, 0, logicalWidth, logicalHeight); w.computeFrameLw(pf /* parentFrame */, pf /* displayFrame */, pf /* overscanFrame */, pf /* contentFrame */, pf /* visibleFrame */, pf /* decorFrame */, - pf /* stableFrame */, null /* outsetFrame */); + pf /* stableFrame */, null /* outsetFrame */, DisplayCutout.NO_CUTOUT); // For non fullscreen tasks the containing frame is based off the // task bounds not the parent frame. assertRect(w.mFrame, taskLeft, taskTop, taskRight, taskBottom); @@ -413,12 +415,31 @@ public class WindowFrameTests extends WindowTestsBase { w.computeFrameLw(pf /* parentFrame */, pf /* displayFrame */, pf /* overscanFrame */, cf /* contentFrame */, cf /* visibleFrame */, pf /* decorFrame */, - cf /* stableFrame */, null /* outsetFrame */); + cf /* stableFrame */, null /* outsetFrame */, DisplayCutout.NO_CUTOUT); assertEquals(cf, w.mFrame); assertEquals(cf, w.getContentFrameLw()); assertRect(w.mContentInsets, 0, 0, 0, 0); } + @Test + public void testDisplayCutout() { + // Regular fullscreen task and window + Task task = new TaskWithBounds(null); + WindowState w = createWindow(task, FILL_PARENT, FILL_PARENT); + w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; + + final Rect pf = new Rect(0, 0, 1000, 1000); + // Create a display cutout of size 50x50, aligned top-center + final DisplayCutout cutout = createDisplayCutoutFromRect(500, 0, 550, 50); + + w.computeFrameLw(pf, pf, pf, pf, pf, pf, pf, pf, cutout); + + assertEquals(w.mDisplayCutout.getSafeInsetTop(), 50); + assertEquals(w.mDisplayCutout.getSafeInsetBottom(), 0); + assertEquals(w.mDisplayCutout.getSafeInsetLeft(), 0); + assertEquals(w.mDisplayCutout.getSafeInsetRight(), 0); + } + private WindowStateWithTask createWindow(Task task, int width, int height) { final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(TYPE_APPLICATION); attrs.width = width; @@ -426,4 +447,13 @@ public class WindowFrameTests extends WindowTestsBase { return new WindowStateWithTask(attrs, task); } + + private DisplayCutout createDisplayCutoutFromRect(int left, int top, int right, int bottom) { + return DisplayCutout.fromBoundingPolygon(Arrays.asList( + new Point(left, top), + new Point (left, bottom), + new Point (right, bottom), + new Point (left, bottom) + )); + } } diff --git a/services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java b/services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java index e5cbdba7b507..6468763440a5 100644 --- a/services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/ZOrderingTests.java @@ -16,23 +16,6 @@ package com.android.server.wm; -import java.util.HashMap; -import java.util.LinkedList; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import android.view.SurfaceControl; -import android.view.SurfaceSession; -import android.util.Log; - -import android.platform.test.annotations.Presubmit; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; - import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; @@ -42,10 +25,23 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; -import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL; import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL; +import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY; + +import android.platform.test.annotations.Presubmit; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; +import android.view.SurfaceControl; +import android.view.SurfaceSession; + +import org.junit.After; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.HashMap; +import java.util.LinkedList; /** * Tests for the {@link WindowLayersController} class. @@ -79,7 +75,7 @@ public class ZOrderingTests extends WindowTestsBase { } int getLayer(SurfaceControl sc) { - return mLayersForControl.get(sc); + return mLayersForControl.getOrDefault(sc, 0); } SurfaceControl getRelativeLayer(SurfaceControl sc) { @@ -125,6 +121,7 @@ public class ZOrderingTests extends WindowTestsBase { // would miss construction of the top-level layers. mTransaction = new LayerRecordingTransaction(); sWm.mSurfaceBuilderFactory = new HierarchyRecordingBuilderFactory(); + sWm.mTransactionFactory = () -> mTransaction; } @After diff --git a/services/tests/shortcutmanagerutils/Android.mk b/services/tests/shortcutmanagerutils/Android.mk index c7657f65a2b4..0848fd51fa71 100644 --- a/services/tests/shortcutmanagerutils/Android.mk +++ b/services/tests/shortcutmanagerutils/Android.mk @@ -21,7 +21,8 @@ LOCAL_SRC_FILES := \ LOCAL_JAVA_LIBRARIES := \ mockito-target \ - legacy-android-test + legacy-android-test \ + android.test.runner.stubs LOCAL_MODULE_TAGS := optional diff --git a/services/tests/uiservicestests/Android.mk b/services/tests/uiservicestests/Android.mk index 16d0c81299d7..40e78785b9f5 100644 --- a/services/tests/uiservicestests/Android.mk +++ b/services/tests/uiservicestests/Android.mk @@ -25,7 +25,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ platform-test-annotations \ testables -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_JACK_FLAGS := --multi-dex native LOCAL_DX_FLAGS := --multi-dex diff --git a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java index e55e073cf063..970546976336 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java +++ b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java @@ -503,7 +503,7 @@ class UsageStatsDatabase { mCal.getTimeInMillis()); mCal.setTimeInMillis(currentTimeMillis); - mCal.addDays(-7); + mCal.addDays(-10); pruneFilesOlderThan(mIntervalDirs[UsageStatsManager.INTERVAL_DAILY], mCal.getTimeInMillis()); @@ -803,4 +803,4 @@ class UsageStatsDatabase { } directory.delete(); } -}
\ No newline at end of file +} diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java index 51c805da2cac..cd3fdeefee13 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java @@ -66,6 +66,7 @@ public class SoundTriggerService extends SystemService { private SoundTriggerDbHelper mDbHelper; private SoundTriggerHelper mSoundTriggerHelper; private final TreeMap<UUID, SoundModel> mLoadedModels; + private Object mCallbacksLock; private final TreeMap<UUID, LocalSoundTriggerRecognitionStatusCallback> mIntentCallbacks; private PowerManager.WakeLock mWakelock; @@ -75,6 +76,7 @@ public class SoundTriggerService extends SystemService { mServiceStub = new SoundTriggerServiceStub(); mLocalSoundTriggerService = new LocalSoundTriggerService(context); mLoadedModels = new TreeMap<UUID, SoundModel>(); + mCallbacksLock = new Object(); mIntentCallbacks = new TreeMap<UUID, LocalSoundTriggerRecognitionStatusCallback>(); mLock = new Object(); } @@ -211,7 +213,9 @@ public class SoundTriggerService extends SystemService { // don't know if the other model is loaded. if (oldModel != null && !oldModel.equals(soundModel)) { mSoundTriggerHelper.unloadGenericSoundModel(soundModel.uuid); - mIntentCallbacks.remove(soundModel.uuid); + synchronized (mCallbacksLock) { + mIntentCallbacks.remove(soundModel.uuid); + } } mLoadedModels.put(soundModel.uuid, soundModel); } @@ -240,7 +244,9 @@ public class SoundTriggerService extends SystemService { // don't know if the other model is loaded. if (oldModel != null && !oldModel.equals(soundModel)) { mSoundTriggerHelper.unloadKeyphraseSoundModel(soundModel.keyphrases[0].id); - mIntentCallbacks.remove(soundModel.uuid); + synchronized (mCallbacksLock) { + mIntentCallbacks.remove(soundModel.uuid); + } } mLoadedModels.put(soundModel.uuid, soundModel); } @@ -262,8 +268,10 @@ public class SoundTriggerService extends SystemService { Slog.e(TAG, soundModelId + " is not loaded"); return STATUS_ERROR; } - LocalSoundTriggerRecognitionStatusCallback callback = mIntentCallbacks.get( - soundModelId.getUuid()); + LocalSoundTriggerRecognitionStatusCallback callback = null; + synchronized (mCallbacksLock) { + callback = mIntentCallbacks.get(soundModelId.getUuid()); + } if (callback != null) { Slog.e(TAG, soundModelId + " is already running"); return STATUS_ERROR; @@ -291,7 +299,9 @@ public class SoundTriggerService extends SystemService { Slog.e(TAG, "Failed to start model: " + ret); return ret; } - mIntentCallbacks.put(soundModelId.getUuid(), callback); + synchronized (mCallbacksLock) { + mIntentCallbacks.put(soundModelId.getUuid(), callback); + } } return STATUS_OK; } @@ -310,8 +320,10 @@ public class SoundTriggerService extends SystemService { Slog.e(TAG, soundModelId + " is not loaded"); return STATUS_ERROR; } - LocalSoundTriggerRecognitionStatusCallback callback = mIntentCallbacks.get( - soundModelId.getUuid()); + LocalSoundTriggerRecognitionStatusCallback callback = null; + synchronized (mCallbacksLock) { + callback = mIntentCallbacks.get(soundModelId.getUuid()); + } if (callback == null) { Slog.e(TAG, soundModelId + " is not running"); return STATUS_ERROR; @@ -334,7 +346,9 @@ public class SoundTriggerService extends SystemService { Slog.e(TAG, "Failed to stop model: " + ret); return ret; } - mIntentCallbacks.remove(soundModelId.getUuid()); + synchronized (mCallbacksLock) { + mIntentCallbacks.remove(soundModelId.getUuid()); + } } return STATUS_OK; } @@ -379,14 +393,14 @@ public class SoundTriggerService extends SystemService { public boolean isRecognitionActive(ParcelUuid parcelUuid) { enforceCallingPermission(Manifest.permission.MANAGE_SOUND_TRIGGER); if (!isInitialized()) return false; - synchronized (mLock) { + synchronized (mCallbacksLock) { LocalSoundTriggerRecognitionStatusCallback callback = mIntentCallbacks.get(parcelUuid.getUuid()); if (callback == null) { return false; } - return mSoundTriggerHelper.isRecognitionRequested(parcelUuid.getUuid()); } + return mSoundTriggerHelper.isRecognitionRequested(parcelUuid.getUuid()); } } @@ -513,7 +527,7 @@ public class SoundTriggerService extends SystemService { private void removeCallback(boolean releaseWakeLock) { mCallbackIntent = null; - synchronized (mLock) { + synchronized (mCallbacksLock) { mIntentCallbacks.remove(mUuid); if (releaseWakeLock) { mWakelock.release(); @@ -523,7 +537,7 @@ public class SoundTriggerService extends SystemService { } private void grabWakeLock() { - synchronized (mLock) { + synchronized (mCallbacksLock) { if (mWakelock == null) { PowerManager pm = ((PowerManager) mContext.getSystemService(Context.POWER_SERVICE)); mWakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG); @@ -537,7 +551,7 @@ public class SoundTriggerService extends SystemService { public void onSendFinished(PendingIntent pendingIntent, Intent intent, int resultCode, String resultData, Bundle resultExtras) { // We're only ever invoked when the callback is done, so release the lock. - synchronized (mLock) { + synchronized (mCallbacksLock) { mWakelock.release(); } } diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 16150ba5251f..20911012e6ba 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -416,8 +416,15 @@ public final class Call { */ public static final int PROPERTY_SELF_MANAGED = 0x00000100; + /** + * Indicates the call used Assisted Dialing. + * See also {@link Connection#PROPERTY_ASSISTED_DIALING_USED} + * @hide + */ + public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200; + //****************************************************************************************** - // Next PROPERTY value: 0x00000200 + // Next PROPERTY value: 0x00000400 //****************************************************************************************** private final String mTelecomCallId; @@ -577,6 +584,9 @@ public final class Call { if(hasProperty(properties, PROPERTY_HAS_CDMA_VOICE_PRIVACY)) { builder.append(" PROPERTY_HAS_CDMA_VOICE_PRIVACY"); } + if(hasProperty(properties, PROPERTY_ASSISTED_DIALING_USED)) { + builder.append(" PROPERTY_ASSISTED_DIALING_USED"); + } builder.append("]"); return builder.toString(); } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 3c32614815cb..aaef8d3d3856 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -399,8 +399,14 @@ public abstract class Connection extends Conferenceable { */ public static final int PROPERTY_IS_RTT = 1 << 8; + /** + * Set by the framework to indicate that a connection is using assisted dialing. + * @hide + */ + public static final int PROPERTY_ASSISTED_DIALING_USED = 1 << 9; + //********************************************************************************************** - // Next PROPERTY value: 1<<9 + // Next PROPERTY value: 1<<10 //********************************************************************************************** /** diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 6dcc3da15882..15355ac745a4 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -590,6 +590,14 @@ public class TelecomManager { ComponentName.createRelative("com.android.phone", ".EmergencyDialer"); /** + * The boolean indicated by this extra controls whether or not a call is eligible to undergo + * assisted dialing. This extra is stored under {@link #EXTRA_OUTGOING_CALL_EXTRAS}. + * @hide + */ + public static final String EXTRA_USE_ASSISTED_DIALING = + "android.telecom.extra.USE_ASSISTED_DIALING"; + + /** * The following 4 constants define how properties such as phone numbers and names are * displayed to the user. */ diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java index c3a2ceb1a344..56e1e640373d 100644 --- a/telephony/java/android/telephony/DisconnectCause.java +++ b/telephony/java/android/telephony/DisconnectCause.java @@ -280,6 +280,36 @@ public class DisconnectCause { * {@hide} */ public static final int NORMAL_UNSPECIFIED = 65; + + /** + * Stk Call Control modified DIAL request to video DIAL request. + * {@hide} + */ + public static final int DIAL_MODIFIED_TO_DIAL_VIDEO = 66; + + /** + * Stk Call Control modified Video DIAL request to SS request. + * {@hide} + */ + public static final int DIAL_VIDEO_MODIFIED_TO_SS = 67; + + /** + * Stk Call Control modified Video DIAL request to USSD request. + * {@hide} + */ + public static final int DIAL_VIDEO_MODIFIED_TO_USSD = 68; + + /** + * Stk Call Control modified Video DIAL request to DIAL request. + * {@hide} + */ + public static final int DIAL_VIDEO_MODIFIED_TO_DIAL = 69; + + /** + * Stk Call Control modified Video DIAL request to Video DIAL request. + * {@hide} + */ + public static final int DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO = 70; //********************************************************************************************* // When adding a disconnect type: // 1) Update toString() with the newly added disconnect type. @@ -382,6 +412,16 @@ public class DisconnectCause { return "DIAL_MODIFIED_TO_SS"; case DIAL_MODIFIED_TO_DIAL: return "DIAL_MODIFIED_TO_DIAL"; + case DIAL_MODIFIED_TO_DIAL_VIDEO: + return "DIAL_MODIFIED_TO_DIAL_VIDEO"; + case DIAL_VIDEO_MODIFIED_TO_SS: + return "DIAL_VIDEO_MODIFIED_TO_SS"; + case DIAL_VIDEO_MODIFIED_TO_USSD: + return "DIAL_VIDEO_MODIFIED_TO_USSD"; + case DIAL_VIDEO_MODIFIED_TO_DIAL: + return "DIAL_VIDEO_MODIFIED_TO_DIAL"; + case DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO: + return "DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO"; case ERROR_UNSPECIFIED: return "ERROR_UNSPECIFIED"; case OUTGOING_FAILURE: diff --git a/telephony/java/android/telephony/data/DataCallResponse.aidl b/telephony/java/android/telephony/data/DataCallResponse.aidl new file mode 100644 index 000000000000..e4cfd69a9c67 --- /dev/null +++ b/telephony/java/android/telephony/data/DataCallResponse.aidl @@ -0,0 +1,20 @@ +/* + * Copyright 2017 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. + */ + +/** @hide */ +package android.telephony.data; + +parcelable DataCallResponse; diff --git a/telephony/java/android/telephony/data/DataCallResponse.java b/telephony/java/android/telephony/data/DataCallResponse.java new file mode 100644 index 000000000000..8cdad3f24ee5 --- /dev/null +++ b/telephony/java/android/telephony/data/DataCallResponse.java @@ -0,0 +1,227 @@ +/* + * Copyright (C) 2009 Qualcomm Innovation Center, Inc. All Rights Reserved. + * Copyright (C) 2009 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 android.telephony.data; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SystemApi; +import android.os.Parcel; +import android.os.Parcelable; + +import java.net.InetAddress; +import java.util.ArrayList; +import java.util.List; + +/** + * Description of the response of a setup data call connection request. + * + * @hide + */ +@SystemApi +public final class DataCallResponse implements Parcelable { + private final int mStatus; + private final int mSuggestedRetryTime; + private final int mCid; + private final int mActive; + private final String mType; + private final String mIfname; + private final List<InterfaceAddress> mAddresses; + private final List<InetAddress> mDnses; + private final List<InetAddress> mGateways; + private final List<String> mPcscfs; + private final int mMtu; + + /** + * @param status Data call fail cause. 0 indicates no error. + * @param suggestedRetryTime The suggested data retry time in milliseconds. + * @param cid The unique id of the data connection. + * @param active Data connection active status. 0 = inactive, 1 = active/physical link down, + * 2 = active/physical link up. + * @param type The connection protocol, should be one of the PDP_type values in TS 27.007 + * section 10.1.1. For example, "IP", "IPV6", "IPV4V6", or "PPP". + * @param ifname The network interface name. + * @param addresses A list of addresses with optional "/" prefix length, e.g., + * "192.0.1.3" or "192.0.1.11/16 2001:db8::1/64". Typically 1 IPv4 or 1 IPv6 or + * one of each. If the prefix length is absent the addresses are assumed to be + * point to point with IPv4 having a prefix length of 32 and IPv6 128. + * @param dnses A list of DNS server addresses, e.g., "192.0.1.3" or + * "192.0.1.11 2001:db8::1". Null if no dns server addresses returned. + * @param gateways A list of default gateway addresses, e.g., "192.0.1.3" or + * "192.0.1.11 2001:db8::1". When null, the addresses represent point to point + * connections. + * @param pcscfs A list of Proxy Call State Control Function address via PCO(Protocol + * Configuration Option) for IMS client. + * @param mtu MTU (Maximum transmission unit) received from network Value <= 0 means network has + * either not sent a value or sent an invalid value. + */ + public DataCallResponse(int status, int suggestedRetryTime, int cid, int active, + @Nullable String type, @Nullable String ifname, + @Nullable List<InterfaceAddress> addresses, + @Nullable List<InetAddress> dnses, + @Nullable List<InetAddress> gateways, + @Nullable List<String> pcscfs, int mtu) { + mStatus = status; + mSuggestedRetryTime = suggestedRetryTime; + mCid = cid; + mActive = active; + mType = (type == null) ? "" : type; + mIfname = (ifname == null) ? "" : ifname; + mAddresses = (addresses == null) ? new ArrayList<>() : addresses; + mDnses = (dnses == null) ? new ArrayList<>() : dnses; + mGateways = (gateways == null) ? new ArrayList<>() : gateways; + mPcscfs = (pcscfs == null) ? new ArrayList<>() : pcscfs; + mMtu = mtu; + } + + public DataCallResponse(Parcel source) { + mStatus = source.readInt(); + mSuggestedRetryTime = source.readInt(); + mCid = source.readInt(); + mActive = source.readInt(); + mType = source.readString(); + mIfname = source.readString(); + mAddresses = new ArrayList<>(); + source.readList(mAddresses, InterfaceAddress.class.getClassLoader()); + mDnses = new ArrayList<>(); + source.readList(mDnses, InetAddress.class.getClassLoader()); + mGateways = new ArrayList<>(); + source.readList(mGateways, InetAddress.class.getClassLoader()); + mPcscfs = new ArrayList<>(); + source.readList(mPcscfs, InetAddress.class.getClassLoader()); + mMtu = source.readInt(); + } + + /** + * @return Data call fail cause. 0 indicates no error. + */ + public int getStatus() { return mStatus; } + + /** + * @return The suggested data retry time in milliseconds. + */ + public int getSuggestedRetryTime() { return mSuggestedRetryTime; } + + + /** + * @return The unique id of the data connection. + */ + public int getCallId() { return mCid; } + + /** + * @return 0 = inactive, 1 = active/physical link down, 2 = active/physical link up. + */ + public int getActive() { return mActive; } + + /** + * @return The connection protocol, should be one of the PDP_type values in TS 27.007 section + * 10.1.1. For example, "IP", "IPV6", "IPV4V6", or "PPP". + */ + @NonNull + public String getType() { return mType; } + + /** + * @return The network interface name. + */ + @NonNull + public String getIfname() { return mIfname; } + + /** + * @return A list of {@link InterfaceAddress} + */ + @NonNull + public List<InterfaceAddress> getAddresses() { return mAddresses; } + + /** + * @return A list of DNS server addresses, e.g., "192.0.1.3" or + * "192.0.1.11 2001:db8::1". Empty list if no dns server addresses returned. + */ + @NonNull + public List<InetAddress> getDnses() { return mDnses; } + + /** + * @return A list of default gateway addresses, e.g., "192.0.1.3" or + * "192.0.1.11 2001:db8::1". Empty list if the addresses represent point to point connections. + */ + @NonNull + public List<InetAddress> getGateways() { return mGateways; } + + /** + * @return A list of Proxy Call State Control Function address via PCO(Protocol Configuration + * Option) for IMS client. + */ + @NonNull + public List<String> getPcscfs() { return mPcscfs; } + + /** + * @return MTU received from network Value <= 0 means network has either not sent a value or + * sent an invalid value + */ + public int getMtu() { return mMtu; } + + @Override + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("DataCallResponse: {") + .append(" status=").append(mStatus) + .append(" retry=").append(mSuggestedRetryTime) + .append(" cid=").append(mCid) + .append(" active=").append(mActive) + .append(" type=").append(mType) + .append(" ifname=").append(mIfname) + .append(" mtu=").append(mMtu) + .append(" addresses=").append(mAddresses) + .append(" dnses=").append(mDnses) + .append(" gateways=").append(mGateways) + .append(" pcscf=").append(mPcscfs) + .append("}"); + return sb.toString(); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mStatus); + dest.writeInt(mSuggestedRetryTime); + dest.writeInt(mCid); + dest.writeInt(mActive); + dest.writeString(mType); + dest.writeString(mIfname); + dest.writeList(mAddresses); + dest.writeList(mDnses); + dest.writeList(mGateways); + dest.writeList(mPcscfs); + dest.writeInt(mMtu); + } + + public static final Parcelable.Creator<DataCallResponse> CREATOR = + new Parcelable.Creator<DataCallResponse>() { + @Override + public DataCallResponse createFromParcel(Parcel source) { + return new DataCallResponse(source); + } + + @Override + public DataCallResponse[] newArray(int size) { + return new DataCallResponse[size]; + } + }; +}
\ No newline at end of file diff --git a/telephony/java/android/telephony/data/InterfaceAddress.aidl b/telephony/java/android/telephony/data/InterfaceAddress.aidl new file mode 100644 index 000000000000..d750363b9cd2 --- /dev/null +++ b/telephony/java/android/telephony/data/InterfaceAddress.aidl @@ -0,0 +1,20 @@ +/* + * Copyright 2017 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. + */ + +/** @hide */ +package android.telephony.data; + +parcelable InterfaceAddress; diff --git a/telephony/java/android/telephony/data/InterfaceAddress.java b/telephony/java/android/telephony/data/InterfaceAddress.java new file mode 100644 index 000000000000..947d0ff4693a --- /dev/null +++ b/telephony/java/android/telephony/data/InterfaceAddress.java @@ -0,0 +1,110 @@ +/* + * Copyright 2017 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 android.telephony.data; + +import android.annotation.SystemApi; +import android.net.NetworkUtils; +import android.os.Parcel; +import android.os.Parcelable; + +import java.net.InetAddress; +import java.net.UnknownHostException; + +/** + * This class represents a Network Interface address. In short it's an IP address, a subnet mask + * when the address is an IPv4 one. An IP address and a network prefix length in the case of IPv6 + * address. + * + * @hide + */ +@SystemApi +public final class InterfaceAddress implements Parcelable { + + private final InetAddress mInetAddress; + + private final int mPrefixLength; + + /** + * @param inetAddress A {@link InetAddress} of the address + * @param prefixLength The network prefix length for this address. + */ + public InterfaceAddress(InetAddress inetAddress, int prefixLength) { + mInetAddress = inetAddress; + mPrefixLength = prefixLength; + } + + /** + * @param address The address in string format + * @param prefixLength The network prefix length for this address. + * @throws UnknownHostException + */ + public InterfaceAddress(String address, int prefixLength) throws UnknownHostException { + InetAddress ia; + try { + ia = NetworkUtils.numericToInetAddress(address); + } catch (IllegalArgumentException e) { + throw new UnknownHostException("Non-numeric ip addr=" + address); + } + mInetAddress = ia; + mPrefixLength = prefixLength; + } + + public InterfaceAddress(Parcel source) { + mInetAddress = (InetAddress) source.readSerializable(); + mPrefixLength = source.readInt(); + } + + /** + * @return an InetAddress for this address. + */ + public InetAddress getAddress() { return mInetAddress; } + + /** + * @return The network prefix length for this address. + */ + public int getNetworkPrefixLength() { return mPrefixLength; } + + + @Override + public int describeContents() { + return 0; + } + + @Override + public String toString() { + return mInetAddress + "/" + mPrefixLength; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeSerializable(mInetAddress); + dest.writeInt(mPrefixLength); + } + + public static final Parcelable.Creator<InterfaceAddress> CREATOR = + new Parcelable.Creator<InterfaceAddress>() { + @Override + public InterfaceAddress createFromParcel(Parcel source) { + return new InterfaceAddress(source); + } + + @Override + public InterfaceAddress[] newArray(int size) { + return new InterfaceAddress[size]; + } + }; +} diff --git a/telephony/java/android/telephony/ims/stub/ImsUtListenerImplBase.java b/telephony/java/android/telephony/ims/stub/ImsUtListenerImplBase.java index b371efb68030..daa74c8f6f88 100644 --- a/telephony/java/android/telephony/ims/stub/ImsUtListenerImplBase.java +++ b/telephony/java/android/telephony/ims/stub/ImsUtListenerImplBase.java @@ -21,6 +21,7 @@ import android.os.RemoteException; import com.android.ims.ImsCallForwardInfo; import com.android.ims.ImsReasonInfo; +import com.android.ims.ImsSsData; import com.android.ims.ImsSsInfo; import com.android.ims.internal.IImsUt; import com.android.ims.internal.IImsUtListener; @@ -85,4 +86,10 @@ public class ImsUtListenerImplBase extends IImsUtListener.Stub { public void utConfigurationCallWaitingQueried(IImsUt ut, int id, ImsSsInfo[] cwInfo) throws RemoteException { } + + /** + * Notifies client when Supplementary Service indication is received + */ + @Override + public void onSupplementaryServiceIndication(ImsSsData ssData) {} } diff --git a/telephony/java/com/android/ims/ImsReasonInfo.java b/telephony/java/com/android/ims/ImsReasonInfo.java index cdfc1fd85aab..6ad54c1f7c0f 100644 --- a/telephony/java/com/android/ims/ImsReasonInfo.java +++ b/telephony/java/com/android/ims/ImsReasonInfo.java @@ -111,6 +111,16 @@ public class ImsReasonInfo implements Parcelable { // and this capability is not supported by the network. public static final int CODE_IMEI_NOT_ACCEPTED = 243; + //STK CC errors + public static final int CODE_DIAL_MODIFIED_TO_USSD = 244; + public static final int CODE_DIAL_MODIFIED_TO_SS = 245; + public static final int CODE_DIAL_MODIFIED_TO_DIAL = 246; + public static final int CODE_DIAL_MODIFIED_TO_DIAL_VIDEO = 247; + public static final int CODE_DIAL_VIDEO_MODIFIED_TO_DIAL = 248; + public static final int CODE_DIAL_VIDEO_MODIFIED_TO_DIAL_VIDEO = 249; + public static final int CODE_DIAL_VIDEO_MODIFIED_TO_SS = 250; + public static final int CODE_DIAL_VIDEO_MODIFIED_TO_USSD = 251; + /** * STATUSCODE (SIP response code) (IMS -> Telephony) */ @@ -217,6 +227,11 @@ public class ImsReasonInfo implements Parcelable { public static final int CODE_UT_OPERATION_NOT_ALLOWED = 803; public static final int CODE_UT_NETWORK_ERROR = 804; public static final int CODE_UT_CB_PASSWORD_MISMATCH = 821; + //STK CC errors + public static final int CODE_UT_SS_MODIFIED_TO_DIAL = 822; + public static final int CODE_UT_SS_MODIFIED_TO_USSD = 823; + public static final int CODE_UT_SS_MODIFIED_TO_SS = 824; + public static final int CODE_UT_SS_MODIFIED_TO_DIAL_VIDEO = 825; /** * ECBM diff --git a/telephony/java/com/android/ims/ImsSsData.aidl b/telephony/java/com/android/ims/ImsSsData.aidl new file mode 100644 index 000000000000..33f83067a4df --- /dev/null +++ b/telephony/java/com/android/ims/ImsSsData.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2017 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.ims; + +parcelable ImsSsData; diff --git a/telephony/java/com/android/ims/ImsSsData.java b/telephony/java/com/android/ims/ImsSsData.java new file mode 100644 index 000000000000..7336c133af96 --- /dev/null +++ b/telephony/java/com/android/ims/ImsSsData.java @@ -0,0 +1,189 @@ +/* + * Copyright (c) 2017 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.ims; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.ArrayList; + +/** + * Provided STK Call Control Suplementary Service information + * + * {@hide} + */ +public class ImsSsData implements Parcelable { + + //ServiceType + public static final int SS_CFU = 0; + public static final int SS_CF_BUSY = 1; + public static final int SS_CF_NO_REPLY = 2; + public static final int SS_CF_NOT_REACHABLE = 3; + public static final int SS_CF_ALL = 4; + public static final int SS_CF_ALL_CONDITIONAL = 5; + public static final int SS_CFUT = 6; + public static final int SS_CLIP = 7; + public static final int SS_CLIR = 8; + public static final int SS_COLP = 9; + public static final int SS_COLR = 10; + public static final int SS_CNAP = 11; + public static final int SS_WAIT = 12; + public static final int SS_BAOC = 13; + public static final int SS_BAOIC = 14; + public static final int SS_BAOIC_EXC_HOME = 15; + public static final int SS_BAIC = 16; + public static final int SS_BAIC_ROAMING = 17; + public static final int SS_ALL_BARRING = 18; + public static final int SS_OUTGOING_BARRING = 19; + public static final int SS_INCOMING_BARRING = 20; + public static final int SS_INCOMING_BARRING_DN = 21; + public static final int SS_INCOMING_BARRING_ANONYMOUS = 22; + + //SSRequestType + public static final int SS_ACTIVATION = 0; + public static final int SS_DEACTIVATION = 1; + public static final int SS_INTERROGATION = 2; + public static final int SS_REGISTRATION = 3; + public static final int SS_ERASURE = 4; + + //TeleserviceType + public static final int SS_ALL_TELE_AND_BEARER_SERVICES = 0; + public static final int SS_ALL_TELESEVICES = 1; + public static final int SS_TELEPHONY = 2; + public static final int SS_ALL_DATA_TELESERVICES = 3; + public static final int SS_SMS_SERVICES = 4; + public static final int SS_ALL_TELESERVICES_EXCEPT_SMS = 5; + + // Refer to ServiceType + public int serviceType; + // Refere to SSRequestType + public int requestType; + // Refer to TeleserviceType + public int teleserviceType; + // Service Class + public int serviceClass; + // Error information + public int result; + + public int[] ssInfo; /* Valid for all supplementary services. + This field will be empty for RequestType SS_INTERROGATION + and ServiceType SS_CF_*, SS_INCOMING_BARRING_DN, + SS_INCOMING_BARRING_ANONYMOUS.*/ + + public ImsCallForwardInfo[] cfInfo; /* Valid only for supplementary services + ServiceType SS_CF_* and RequestType SS_INTERROGATION */ + + public ImsSsInfo[] imsSsInfo; /* Valid only for ServiceType SS_INCOMING_BARRING_DN and + ServiceType SS_INCOMING_BARRING_ANONYMOUS */ + + public ImsSsData() {} + + public ImsSsData(Parcel in) { + readFromParcel(in); + } + + public static final Creator<ImsSsData> CREATOR = new Creator<ImsSsData>() { + @Override + public ImsSsData createFromParcel(Parcel in) { + return new ImsSsData(in); + } + + @Override + public ImsSsData[] newArray(int size) { + return new ImsSsData[size]; + } + }; + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeInt(serviceType); + out.writeInt(requestType); + out.writeInt(teleserviceType); + out.writeInt(serviceClass); + out.writeInt(result); + out.writeIntArray(ssInfo); + out.writeParcelableArray(cfInfo, 0); + } + + private void readFromParcel(Parcel in) { + serviceType = in.readInt(); + requestType = in.readInt(); + teleserviceType = in.readInt(); + serviceClass = in.readInt(); + result = in.readInt(); + ssInfo = in.createIntArray(); + cfInfo = (ImsCallForwardInfo[])in.readParcelableArray(this.getClass().getClassLoader()); + } + + @Override + public int describeContents() { + return 0; + } + + public boolean isTypeCF() { + return (serviceType == SS_CFU || serviceType == SS_CF_BUSY || + serviceType == SS_CF_NO_REPLY || serviceType == SS_CF_NOT_REACHABLE || + serviceType == SS_CF_ALL || serviceType == SS_CF_ALL_CONDITIONAL); + } + + public boolean isTypeUnConditional() { + return (serviceType == SS_CFU || serviceType == SS_CF_ALL); + } + + public boolean isTypeCW() { + return (serviceType == SS_WAIT); + } + + public boolean isTypeClip() { + return (serviceType == SS_CLIP); + } + + public boolean isTypeColr() { + return (serviceType == SS_COLR); + } + + public boolean isTypeColp() { + return (serviceType == SS_COLP); + } + + public boolean isTypeClir() { + return (serviceType == SS_CLIR); + } + + public boolean isTypeIcb() { + return (serviceType == SS_INCOMING_BARRING_DN || + serviceType == SS_INCOMING_BARRING_ANONYMOUS); + } + + public boolean isTypeBarring() { + return (serviceType == SS_BAOC || serviceType == SS_BAOIC || + serviceType == SS_BAOIC_EXC_HOME || serviceType == SS_BAIC || + serviceType == SS_BAIC_ROAMING || serviceType == SS_ALL_BARRING || + serviceType == SS_OUTGOING_BARRING || serviceType == SS_INCOMING_BARRING); + } + + public boolean isTypeInterrogation() { + return (requestType == SS_INTERROGATION); + } + + public String toString() { + return "[ImsSsData] " + "ServiceType: " + serviceType + + " RequestType: " + requestType + + " TeleserviceType: " + teleserviceType + + " ServiceClass: " + serviceClass + + " Result: " + result; + } +} diff --git a/telephony/java/com/android/ims/ImsUtInterface.java b/telephony/java/com/android/ims/ImsUtInterface.java index 250371f0f5c2..14c184a64061 100644 --- a/telephony/java/com/android/ims/ImsUtInterface.java +++ b/telephony/java/com/android/ims/ImsUtInterface.java @@ -16,6 +16,7 @@ package com.android.ims; +import android.os.Handler; import android.os.Message; /** @@ -188,4 +189,18 @@ public interface ImsUtInterface { * Updates the configuration of the COLP supplementary service. */ public void updateCOLP(boolean enable, Message result); + + /** + * Register for UNSOL_ON_SS indications. + * @param handler the {@link Handler} that is notified when there is an ss indication. + * @param event Supplimentary service indication event. + * @param Object user object. + */ + public void registerForSuppServiceIndication(Handler handler, int event, Object object); + + /** + * Deregister for UNSOL_ON_SS indications. + * @param handler the {@link Handler} that is notified when there is an ss indication. + */ + public void unregisterForSuppServiceIndication(Handler handler); } diff --git a/telephony/java/com/android/ims/internal/IImsUtListener.aidl b/telephony/java/com/android/ims/internal/IImsUtListener.aidl index 300273a7bd38..1bc036979356 100644 --- a/telephony/java/com/android/ims/internal/IImsUtListener.aidl +++ b/telephony/java/com/android/ims/internal/IImsUtListener.aidl @@ -19,6 +19,7 @@ package com.android.ims.internal; import android.os.Bundle; import com.android.ims.ImsCallForwardInfo; +import com.android.ims.ImsSsData; import com.android.ims.ImsSsInfo; import com.android.ims.internal.IImsUt; import com.android.ims.ImsReasonInfo; @@ -56,4 +57,11 @@ oneway interface IImsUtListener { */ void utConfigurationCallWaitingQueried(in IImsUt ut, int id, in ImsSsInfo[] cwInfo); + + /** + * Notifies client when Supplementary Service indication is received + * + * @param ssData Details of SS request and response information + */ + void onSupplementaryServiceIndication(in ImsSsData ssData); } diff --git a/tests/AppLaunch/Android.mk b/tests/AppLaunch/Android.mk index d01b1f96ee05..09739e5e074a 100644 --- a/tests/AppLaunch/Android.mk +++ b/tests/AppLaunch/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := AppLaunch LOCAL_CERTIFICATE := platform -LOCAL_JAVA_LIBRARIES := legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.base android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := android-support-test diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk index 527d1bbfd886..9e7f61892f93 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk @@ -24,7 +24,7 @@ LOCAL_PACKAGE_NAME := SmartCamera-tests LOCAL_SRC_FILES += $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.base LOCAL_STATIC_JAVA_LIBRARIES := guava junit LOCAL_PROGUARD_ENABLED := disabled diff --git a/tests/ServiceCrashTest/Android.mk b/tests/ServiceCrashTest/Android.mk index d1f845623be8..f7b34523c086 100644 --- a/tests/ServiceCrashTest/Android.mk +++ b/tests/ServiceCrashTest/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ServiceCrashTest LOCAL_CERTIFICATE := platform -LOCAL_JAVA_LIBRARIES := legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.base LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test diff --git a/tests/WindowManagerStressTest/src/test/windowmanagerstresstest/MainActivity.java b/tests/WindowManagerStressTest/src/test/windowmanagerstresstest/MainActivity.java index 6b9bb31a75c7..9174014dedf4 100644 --- a/tests/WindowManagerStressTest/src/test/windowmanagerstresstest/MainActivity.java +++ b/tests/WindowManagerStressTest/src/test/windowmanagerstresstest/MainActivity.java @@ -24,6 +24,7 @@ import android.os.SystemClock; import android.util.Log; import android.util.MergedConfiguration; import android.view.Display; +import android.view.DisplayCutout; import android.view.IWindowSession; import android.view.Surface; import android.view.View; @@ -103,7 +104,8 @@ public class MainActivity extends Activity { WindowManagerGlobal.getWindowSession().relayout(window, window.mSeq, mLayoutParams, -1, -1, View.VISIBLE, 0, mTmpRect, mTmpRect, mTmpRect, mTmpRect, mTmpRect, mTmpRect, mTmpRect, - new MergedConfiguration(), new Surface()); + new DisplayCutout.ParcelableWrapper(), new MergedConfiguration(), + new Surface()); } catch (RemoteException e) { e.printStackTrace(); } diff --git a/tests/net/Android.mk b/tests/net/Android.mk index 677585cc0c0f..1bd1af5e3c22 100644 --- a/tests/net/Android.mk +++ b/tests/net/Android.mk @@ -21,7 +21,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ services.net LOCAL_JAVA_LIBRARIES := \ - android.test.runner + android.test.runner \ + android.test.base \ + android.test.mock LOCAL_PACKAGE_NAME := FrameworksNetTests LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/tests/net/java/android/net/ip/IpManagerTest.java b/tests/net/java/android/net/ip/IpManagerTest.java index 22d88fb70697..ebf121ae304a 100644 --- a/tests/net/java/android/net/ip/IpManagerTest.java +++ b/tests/net/java/android/net/ip/IpManagerTest.java @@ -69,6 +69,8 @@ import java.util.Set; /** * Tests for IpManager. + * + * TODO: Rename to IpClientTest. */ @RunWith(AndroidJUnit4.class) @SmallTest @@ -111,6 +113,10 @@ public class IpManagerTest { verify(mNMService, times(1)).registerObserver(arg.capture()); mObserver = arg.getValue(); reset(mNMService); + final LinkProperties emptyLp = new LinkProperties(); + emptyLp.setInterfaceName(ifname); + verify(mCb, timeout(100)).onLinkPropertiesChange(eq(emptyLp)); + reset(mCb); return ipm; } diff --git a/tests/net/java/android/net/ip/IpReachabilityMonitorTest.java b/tests/net/java/android/net/ip/IpReachabilityMonitorTest.java index f849689abb23..54776dbd3c52 100644 --- a/tests/net/java/android/net/ip/IpReachabilityMonitorTest.java +++ b/tests/net/java/android/net/ip/IpReachabilityMonitorTest.java @@ -18,10 +18,12 @@ package android.net.ip; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.when; import android.net.util.SharedLog; +import android.os.Handler; +import android.os.Looper; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; @@ -42,14 +44,18 @@ public class IpReachabilityMonitorTest { @Mock IpReachabilityMonitor.Callback mCallback; @Mock IpReachabilityMonitor.Dependencies mDependencies; @Mock SharedLog mLog; + Handler mHandler; @Before public void setUp() { MockitoAnnotations.initMocks(this); + when(mLog.forSubComponent(anyString())).thenReturn(mLog); + mHandler = new Handler(Looper.getMainLooper()); } IpReachabilityMonitor makeMonitor() { - return new IpReachabilityMonitor("fake0", 1, mLog, mCallback, null, mDependencies); + return new IpReachabilityMonitor( + "fake0", 1, mHandler, mLog, mCallback, null, mDependencies); } @Test diff --git a/tests/net/java/android/net/netlink/NetlinkSocketTest.java b/tests/net/java/android/net/netlink/NetlinkSocketTest.java index bd36bac8d5e2..11be40b4ce33 100644 --- a/tests/net/java/android/net/netlink/NetlinkSocketTest.java +++ b/tests/net/java/android/net/netlink/NetlinkSocketTest.java @@ -16,6 +16,8 @@ package android.net.netlink; +import static android.net.netlink.NetlinkSocket.DEFAULT_RECV_BUFSIZE; +import static android.system.OsConstants.NETLINK_ROUTE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -28,10 +30,12 @@ import android.support.test.runner.AndroidJUnit4; import android.support.test.filters.SmallTest; import android.system.ErrnoException; import android.system.NetlinkSocketAddress; -import android.system.OsConstants; +import android.system.Os; import android.util.Log; +import libcore.io.IoUtils; import java.io.InterruptedIOException; +import java.io.FileDescriptor; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -46,29 +50,28 @@ public class NetlinkSocketTest { @Test public void testBasicWorkingGetNeighborsQuery() throws Exception { - NetlinkSocket s = new NetlinkSocket(OsConstants.NETLINK_ROUTE); - assertNotNull(s); + final FileDescriptor fd = NetlinkSocket.forProto(NETLINK_ROUTE); + assertNotNull(fd); - s.connectToKernel(); + NetlinkSocket.connectToKernel(fd); - NetlinkSocketAddress localAddr = s.getLocalAddress(); + final NetlinkSocketAddress localAddr = (NetlinkSocketAddress) Os.getsockname(fd); assertNotNull(localAddr); assertEquals(0, localAddr.getGroupsMask()); assertTrue(0 != localAddr.getPortId()); final int TEST_SEQNO = 5; - final byte[] request = RtNetlinkNeighborMessage.newGetNeighborsRequest(TEST_SEQNO); - assertNotNull(request); + final byte[] req = RtNetlinkNeighborMessage.newGetNeighborsRequest(TEST_SEQNO); + assertNotNull(req); final long TIMEOUT = 500; - assertTrue(s.sendMessage(request, 0, request.length, TIMEOUT)); + assertEquals(req.length, NetlinkSocket.sendMessage(fd, req, 0, req.length, TIMEOUT)); int neighMessageCount = 0; int doneMessageCount = 0; while (doneMessageCount == 0) { - ByteBuffer response = null; - response = s.recvMessage(TIMEOUT); + ByteBuffer response = NetlinkSocket.recvMessage(fd, DEFAULT_RECV_BUFSIZE, TIMEOUT); assertNotNull(response); assertTrue(StructNlMsgHdr.STRUCT_SIZE <= response.limit()); assertEquals(0, response.position()); @@ -100,30 +103,6 @@ public class NetlinkSocketTest { // TODO: make sure this test passes sanely in airplane mode. assertTrue(neighMessageCount > 0); - s.close(); - } - - @Test - public void testRepeatedCloseCallsAreQuiet() throws Exception { - // Create a working NetlinkSocket. - NetlinkSocket s = new NetlinkSocket(OsConstants.NETLINK_ROUTE); - assertNotNull(s); - s.connectToKernel(); - NetlinkSocketAddress localAddr = s.getLocalAddress(); - assertNotNull(localAddr); - assertEquals(0, localAddr.getGroupsMask()); - assertTrue(0 != localAddr.getPortId()); - // Close once. - s.close(); - // Test that it is closed. - boolean expectedErrorSeen = false; - try { - localAddr = s.getLocalAddress(); - } catch (ErrnoException e) { - expectedErrorSeen = true; - } - assertTrue(expectedErrorSeen); - // Close once more. - s.close(); + IoUtils.closeQuietly(fd); } } diff --git a/tests/net/java/android/net/util/BlockingSocketReaderTest.java b/tests/net/java/android/net/util/PacketReaderTest.java index 29dfa4c3d1e1..dced7435ee74 100644 --- a/tests/net/java/android/net/util/BlockingSocketReaderTest.java +++ b/tests/net/java/android/net/util/PacketReaderTest.java @@ -16,7 +16,7 @@ package android.net.util; -import static android.net.util.BlockingSocketReader.DEFAULT_RECV_BUF_SIZE; +import static android.net.util.PacketReader.DEFAULT_RECV_BUF_SIZE; import static android.system.OsConstants.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -53,13 +53,13 @@ import org.junit.Test; import libcore.io.IoBridge; /** - * Tests for BlockingSocketReader. + * Tests for PacketReader. * * @hide */ @RunWith(AndroidJUnit4.class) @SmallTest -public class BlockingSocketReaderTest { +public class PacketReaderTest { static final InetAddress LOOPBACK6 = Inet6Address.getLoopbackAddress(); static final StructTimeval TIMEO = StructTimeval.fromMillis(500); @@ -69,9 +69,9 @@ public class BlockingSocketReaderTest { protected byte[] mLastRecvBuf; protected boolean mStopped; protected HandlerThread mHandlerThread; - protected BlockingSocketReader mReceiver; + protected PacketReader mReceiver; - class UdpLoopbackReader extends BlockingSocketReader { + class UdpLoopbackReader extends PacketReader { public UdpLoopbackReader(Handler h) { super(h); } @@ -121,7 +121,7 @@ public class BlockingSocketReaderTest { mLastRecvBuf = null; mStopped = false; - mHandlerThread = new HandlerThread(BlockingSocketReaderTest.class.getSimpleName()); + mHandlerThread = new HandlerThread(PacketReaderTest.class.getSimpleName()); mHandlerThread.start(); } @@ -188,8 +188,8 @@ public class BlockingSocketReaderTest { mReceiver = null; } - class NullBlockingSocketReader extends BlockingSocketReader { - public NullBlockingSocketReader(Handler h, int recvbufsize) { + class NullPacketReader extends PacketReader { + public NullPacketReader(Handler h, int recvbufsize) { super(h, recvbufsize); } @@ -202,7 +202,7 @@ public class BlockingSocketReaderTest { final Handler h = mHandlerThread.getThreadHandler(); for (int i : new int[]{-1, 0, 1, DEFAULT_RECV_BUF_SIZE-1}) { - final BlockingSocketReader b = new NullBlockingSocketReader(h, i); + final PacketReader b = new NullPacketReader(h, i); assertEquals(DEFAULT_RECV_BUF_SIZE, b.recvBufSize()); } } diff --git a/tests/testables/Android.mk b/tests/testables/Android.mk index 0e36981e3716..7fcfc6eb82d3 100644 --- a/tests/testables/Android.mk +++ b/tests/testables/Android.mk @@ -25,10 +25,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ - mockito-target-minus-junit4 \ - legacy-android-test + mockito-target-minus-junit4 -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.mock include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/tests/utils/testutils/Android.mk b/tests/utils/testutils/Android.mk index 43d1e37cafa3..543c652dc24a 100644 --- a/tests/utils/testutils/Android.mk +++ b/tests/utils/testutils/Android.mk @@ -25,9 +25,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under,java) LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ - legacy-android-test \ mockito-target-minus-junit4 -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/wifi/java/android/net/wifi/rtt/RangingRequest.java b/wifi/java/android/net/wifi/rtt/RangingRequest.java index 7d74a720ab4c..b4e3097a56a7 100644 --- a/wifi/java/android/net/wifi/rtt/RangingRequest.java +++ b/wifi/java/android/net/wifi/rtt/RangingRequest.java @@ -17,6 +17,7 @@ package android.net.wifi.rtt; import android.annotation.NonNull; +import android.net.MacAddress; import android.net.wifi.ScanResult; import android.net.wifi.aware.AttachCallback; import android.net.wifi.aware.DiscoverySessionCallback; @@ -168,7 +169,7 @@ public final class RangingRequest implements Parcelable { * @param peerMacAddress The MAC address of the Wi-Fi Aware peer. * @return The builder, to facilitate chaining {@code builder.setXXX(..).setXXX(..)}. */ - public Builder addWifiAwarePeer(@NonNull byte[] peerMacAddress) { + public Builder addWifiAwarePeer(@NonNull MacAddress peerMacAddress) { if (peerMacAddress == null) { throw new IllegalArgumentException("Null peer MAC address"); } diff --git a/wifi/java/android/net/wifi/rtt/RangingResult.java b/wifi/java/android/net/wifi/rtt/RangingResult.java index 93e52aeb1273..a380fae7141a 100644 --- a/wifi/java/android/net/wifi/rtt/RangingResult.java +++ b/wifi/java/android/net/wifi/rtt/RangingResult.java @@ -17,16 +17,15 @@ package android.net.wifi.rtt; import android.annotation.IntDef; +import android.annotation.NonNull; +import android.net.MacAddress; import android.net.wifi.aware.PeerHandle; import android.os.Handler; import android.os.Parcel; import android.os.Parcelable; -import libcore.util.HexEncoding; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -62,7 +61,7 @@ public final class RangingResult implements Parcelable { public static final int STATUS_FAIL = 1; private final int mStatus; - private final byte[] mMac; + private final MacAddress mMac; private final PeerHandle mPeerHandle; private final int mDistanceMm; private final int mDistanceStdDevMm; @@ -70,7 +69,7 @@ public final class RangingResult implements Parcelable { private final long mTimestamp; /** @hide */ - public RangingResult(@RangeResultStatus int status, byte[] mac, int distanceMm, + public RangingResult(@RangeResultStatus int status, @NonNull MacAddress mac, int distanceMm, int distanceStdDevMm, int rssi, long timestamp) { mStatus = status; mMac = mac; @@ -109,7 +108,7 @@ public final class RangingResult implements Parcelable { * Will return a {@code null} for results corresponding to requests issued using a {@code * PeerHandle}, i.e. using the {@link RangingRequest.Builder#addWifiAwarePeer(PeerHandle)} API. */ - public byte[] getMacAddress() { + public MacAddress getMacAddress() { return mMac; } @@ -193,7 +192,12 @@ public final class RangingResult implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mStatus); - dest.writeByteArray(mMac); + if (mMac == null) { + dest.writeBoolean(false); + } else { + dest.writeBoolean(true); + mMac.writeToParcel(dest, flags); + } if (mPeerHandle == null) { dest.writeBoolean(false); } else { @@ -216,7 +220,11 @@ public final class RangingResult implements Parcelable { @Override public RangingResult createFromParcel(Parcel in) { int status = in.readInt(); - byte[] mac = in.createByteArray(); + boolean macAddressPresent = in.readBoolean(); + MacAddress mac = null; + if (macAddressPresent) { + mac = MacAddress.CREATOR.createFromParcel(in); + } boolean peerHandlePresent = in.readBoolean(); PeerHandle peerHandle = null; if (peerHandlePresent) { @@ -240,11 +248,11 @@ public final class RangingResult implements Parcelable { @Override public String toString() { return new StringBuilder("RangingResult: [status=").append(mStatus).append(", mac=").append( - mMac == null ? "<null>" : new String(HexEncoding.encodeToString(mMac))).append( - ", peerHandle=").append(mPeerHandle == null ? "<null>" : mPeerHandle.peerId).append( - ", distanceMm=").append(mDistanceMm).append(", distanceStdDevMm=").append( - mDistanceStdDevMm).append(", rssi=").append(mRssi).append(", timestamp=").append( - mTimestamp).append("]").toString(); + mMac).append(", peerHandle=").append( + mPeerHandle == null ? "<null>" : mPeerHandle.peerId).append(", distanceMm=").append( + mDistanceMm).append(", distanceStdDevMm=").append(mDistanceStdDevMm).append( + ", rssi=").append(mRssi).append(", timestamp=").append(mTimestamp).append( + "]").toString(); } @Override @@ -259,7 +267,7 @@ public final class RangingResult implements Parcelable { RangingResult lhs = (RangingResult) o; - return mStatus == lhs.mStatus && Arrays.equals(mMac, lhs.mMac) && Objects.equals( + return mStatus == lhs.mStatus && Objects.equals(mMac, lhs.mMac) && Objects.equals( mPeerHandle, lhs.mPeerHandle) && mDistanceMm == lhs.mDistanceMm && mDistanceStdDevMm == lhs.mDistanceStdDevMm && mRssi == lhs.mRssi && mTimestamp == lhs.mTimestamp; diff --git a/wifi/java/android/net/wifi/rtt/ResponderConfig.java b/wifi/java/android/net/wifi/rtt/ResponderConfig.java index 1090bfab82aa..8be7782d5664 100644 --- a/wifi/java/android/net/wifi/rtt/ResponderConfig.java +++ b/wifi/java/android/net/wifi/rtt/ResponderConfig.java @@ -24,11 +24,8 @@ import android.net.wifi.aware.PeerHandle; import android.os.Parcel; import android.os.Parcelable; -import libcore.util.HexEncoding; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.Arrays; import java.util.Objects; /** @@ -127,13 +124,13 @@ public class ResponderConfig implements Parcelable { * peerHandle field) ise used to identify the Responder. * TODO: convert to MacAddress */ - public byte[] macAddress; + public MacAddress macAddress; /** * The peer identifier of a Wi-Fi Aware Responder. Will be null if a MAC Address (the macAddress * field) is used to identify the Responder. */ - public final PeerHandle peerHandle; + public PeerHandle peerHandle; /** * The device type of the Responder. @@ -194,9 +191,13 @@ public class ResponderConfig implements Parcelable { * @param preamble The preamble used by the Responder, specified using * {@link PreambleType}. */ - public ResponderConfig(@NonNull byte[] macAddress, @ResponderType int responderType, + public ResponderConfig(@NonNull MacAddress macAddress, @ResponderType int responderType, boolean supports80211mc, @ChannelWidth int channelWidth, int frequency, int centerFreq0, int centerFreq1, @PreambleType int preamble) { + if (macAddress == null) { + throw new IllegalArgumentException( + "Invalid ResponderConfig - must specify a MAC address"); + } this.macAddress = macAddress; this.peerHandle = null; this.responderType = responderType; @@ -248,10 +249,7 @@ public class ResponderConfig implements Parcelable { * Point (AP), which can be obtained from {@link android.net.wifi.WifiManager#getScanResults()}. */ public static ResponderConfig fromScanResult(ScanResult scanResult) { - byte[] macAddress = null; - if (scanResult.BSSID != null) { - macAddress = MacAddress.byteAddrFromStringAddr(scanResult.BSSID); - } + MacAddress macAddress = MacAddress.fromString(scanResult.BSSID); int responderType = RESPONDER_AP; boolean supports80211mc = scanResult.is80211mcResponder(); int channelWidth = translcateScanResultChannelWidth(scanResult.channelWidth); @@ -275,7 +273,7 @@ public class ResponderConfig implements Parcelable { * Creates a Responder configuration from a MAC address corresponding to a Wi-Fi Aware * Responder. The Responder parameters are set to defaults. */ - public static ResponderConfig fromWifiAwarePeerMacAddressWithDefaults(byte[] macAddress) { + public static ResponderConfig fromWifiAwarePeerMacAddressWithDefaults(MacAddress macAddress) { /* Note: the parameters are those of the Aware discovery channel (channel 6). A Responder * is expected to be brought up and available to negotiate a maximum accuracy channel * (i.e. Band 5 @ 80MHz). A Responder is brought up on the peer by starting an Aware @@ -323,11 +321,16 @@ public class ResponderConfig implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeByteArray(macAddress); + if (macAddress == null) { + dest.writeBoolean(false); + } else { + dest.writeBoolean(true); + macAddress.writeToParcel(dest, flags); + } if (peerHandle == null) { - dest.writeInt(0); + dest.writeBoolean(false); } else { - dest.writeInt(1); + dest.writeBoolean(true); dest.writeInt(peerHandle.peerId); } dest.writeInt(responderType); @@ -347,10 +350,14 @@ public class ResponderConfig implements Parcelable { @Override public ResponderConfig createFromParcel(Parcel in) { - byte[] macAddress = in.createByteArray(); - int peerHandleFlag = in.readInt(); + boolean macAddressPresent = in.readBoolean(); + MacAddress macAddress = null; + if (macAddressPresent) { + macAddress = MacAddress.CREATOR.createFromParcel(in); + } + boolean peerHandlePresent = in.readBoolean(); PeerHandle peerHandle = null; - if (peerHandleFlag == 1) { + if (peerHandlePresent) { peerHandle = new PeerHandle(in.readInt()); } int responderType = in.readInt(); @@ -383,7 +390,7 @@ public class ResponderConfig implements Parcelable { ResponderConfig lhs = (ResponderConfig) o; - return Arrays.equals(macAddress, lhs.macAddress) && Objects.equals(peerHandle, + return Objects.equals(macAddress, lhs.macAddress) && Objects.equals(peerHandle, lhs.peerHandle) && responderType == lhs.responderType && supports80211mc == lhs.supports80211mc && channelWidth == lhs.channelWidth && frequency == lhs.frequency && centerFreq0 == lhs.centerFreq0 @@ -399,8 +406,7 @@ public class ResponderConfig implements Parcelable { /** @hide */ @Override public String toString() { - return new StringBuffer("ResponderConfig: macAddress=").append( - macAddress == null ? "<null>" : new String(HexEncoding.encode(macAddress))).append( + return new StringBuffer("ResponderConfig: macAddress=").append(macAddress).append( ", peerHandle=").append(peerHandle == null ? "<null>" : peerHandle.peerId).append( ", responderType=").append(responderType).append(", supports80211mc=").append( supports80211mc).append(", channelWidth=").append(channelWidth).append( diff --git a/wifi/tests/Android.mk b/wifi/tests/Android.mk index c98e40a2c2d9..d9f332f2f3bd 100644 --- a/wifi/tests/Android.mk +++ b/wifi/tests/Android.mk @@ -58,6 +58,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \ android.test.runner \ + android.test.base \ LOCAL_PACKAGE_NAME := FrameworksWifiApiTests LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java b/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java index 300d425e8062..72e95b93e741 100644 --- a/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java +++ b/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import android.content.Context; +import android.net.MacAddress; import android.net.wifi.ScanResult; import android.net.wifi.aware.PeerHandle; import android.os.Handler; @@ -33,8 +34,6 @@ import android.os.Parcel; import android.os.test.TestLooper; import android.test.suitebuilder.annotation.SmallTest; -import libcore.util.HexEncoding; - import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -73,13 +72,15 @@ public class WifiRttManagerTest { } /** - * Validate ranging call flow with succesful results. + * Validate ranging call flow with successful results. */ @Test public void testRangeSuccess() throws Exception { RangingRequest request = new RangingRequest.Builder().build(); List<RangingResult> results = new ArrayList<>(); - results.add(new RangingResult(RangingResult.STATUS_SUCCESS, (byte[]) null, 15, 5, 10, 666)); + results.add( + new RangingResult(RangingResult.STATUS_SUCCESS, MacAddress.BROADCAST_ADDRESS, 15, 5, + 10, 666)); RangingResultCallback callbackMock = mock(RangingResultCallback.class); ArgumentCaptor<IRttCallback> callbackCaptor = ArgumentCaptor.forClass(IRttCallback.class); @@ -135,7 +136,7 @@ public class WifiRttManagerTest { List<ScanResult> scanResults2and3 = new ArrayList<>(2); scanResults2and3.add(scanResult2); scanResults2and3.add(scanResult3); - final byte[] mac1 = HexEncoding.decode("000102030405".toCharArray(), false); + MacAddress mac1 = MacAddress.fromString("00:01:02:03:04:05"); PeerHandle peerHandle1 = new PeerHandle(12); RangingRequest.Builder builder = new RangingRequest.Builder(); @@ -169,7 +170,7 @@ public class WifiRttManagerTest { for (int i = 0; i < RangingRequest.getMaxPeers() - 3; ++i) { scanResultList.add(scanResult); } - final byte[] mac1 = HexEncoding.decode("000102030405".toCharArray(), false); + MacAddress mac1 = MacAddress.fromString("00:01:02:03:04:05"); // create request RangingRequest.Builder builder = new RangingRequest.Builder(); @@ -189,11 +190,12 @@ public class WifiRttManagerTest { @Test(expected = IllegalArgumentException.class) public void testRangingRequestPastLimit() { ScanResult scanResult = new ScanResult(); + scanResult.BSSID = "00:01:02:03:04:05"; List<ScanResult> scanResultList = new ArrayList<>(); for (int i = 0; i < RangingRequest.getMaxPeers() - 2; ++i) { scanResultList.add(scanResult); } - final byte[] mac1 = HexEncoding.decode("000102030405".toCharArray(), false); + MacAddress mac1 = MacAddress.fromString("00:01:02:03:04:05"); // create request RangingRequest.Builder builder = new RangingRequest.Builder(); @@ -228,7 +230,7 @@ public class WifiRttManagerTest { public void testRangingResultsParcel() { // Note: not validating parcel code of ScanResult (assumed to work) int status = RangingResult.STATUS_SUCCESS; - final byte[] mac = HexEncoding.decode("000102030405".toCharArray(), false); + final MacAddress mac = MacAddress.fromString("00:01:02:03:04:05"); PeerHandle peerHandle = new PeerHandle(10); int distanceCm = 105; int distanceStdDevCm = 10; |