Merge "Flip the cross profile apps animation" into pi-dev
diff --git a/cmds/statsd/Android.mk b/cmds/statsd/Android.mk
index b085a09..7198bad 100644
--- a/cmds/statsd/Android.mk
+++ b/cmds/statsd/Android.mk
@@ -19,6 +19,7 @@
../../core/java/android/os/IStatsManager.aidl \
src/statsd_config.proto \
src/FieldValue.cpp \
+ src/hash.cpp \
src/stats_log_util.cpp \
src/anomaly/AlarmMonitor.cpp \
src/anomaly/AlarmTracker.cpp \
diff --git a/cmds/statsd/src/FieldValue.cpp b/cmds/statsd/src/FieldValue.cpp
index dfd8705..f150f07 100644
--- a/cmds/statsd/src/FieldValue.cpp
+++ b/cmds/statsd/src/FieldValue.cpp
@@ -237,6 +237,18 @@
return false;
}
+bool HasPositionALL(const FieldMatcher& matcher) {
+ if (matcher.has_position() && matcher.position() == Position::ALL) {
+ return true;
+ }
+ for (const auto& child : matcher.child()) {
+ if (HasPositionALL(child)) {
+ return true;
+ }
+ }
+ return false;
+}
+
} // namespace statsd
} // namespace os
} // namespace android
\ No newline at end of file
diff --git a/cmds/statsd/src/FieldValue.h b/cmds/statsd/src/FieldValue.h
index f7ce23b..02c49b9 100644
--- a/cmds/statsd/src/FieldValue.h
+++ b/cmds/statsd/src/FieldValue.h
@@ -351,6 +351,7 @@
};
bool HasPositionANY(const FieldMatcher& matcher);
+bool HasPositionALL(const FieldMatcher& matcher);
bool isAttributionUidField(const FieldValue& value);
diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp
index d548c0a..5219885 100644
--- a/cmds/statsd/src/StatsLogProcessor.cpp
+++ b/cmds/statsd/src/StatsLogProcessor.cpp
@@ -65,6 +65,7 @@
const int FIELD_ID_LAST_REPORT_WALL_CLOCK_NANOS = 5;
const int FIELD_ID_CURRENT_REPORT_WALL_CLOCK_NANOS = 6;
const int FIELD_ID_DUMP_REPORT_REASON = 8;
+const int FIELD_ID_STRINGS = 9;
#define NS_PER_HOUR 3600 * NS_PER_SEC
@@ -293,6 +294,7 @@
*/
void StatsLogProcessor::onDumpReport(const ConfigKey& key, const int64_t dumpTimeStampNs,
const bool include_current_partial_bucket,
+ const bool include_string,
const DumpReportReason dumpReportReason,
vector<uint8_t>* outData) {
std::lock_guard<std::mutex> lock(mMetricsMutex);
@@ -320,7 +322,7 @@
uint64_t reportsToken =
proto.start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_REPORTS);
onConfigMetricsReportLocked(key, dumpTimeStampNs, include_current_partial_bucket,
- dumpReportReason, &proto);
+ include_string, dumpReportReason, &proto);
proto.end(reportsToken);
// End of ConfigMetricsReport (reports).
} else {
@@ -349,6 +351,7 @@
void StatsLogProcessor::onConfigMetricsReportLocked(const ConfigKey& key,
const int64_t dumpTimeStampNs,
const bool include_current_partial_bucket,
+ const bool include_string,
const DumpReportReason dumpReportReason,
ProtoOutputStream* proto) {
// We already checked whether key exists in mMetricsManagers in
@@ -360,13 +363,16 @@
int64_t lastReportTimeNs = it->second->getLastReportTimeNs();
int64_t lastReportWallClockNs = it->second->getLastReportWallClockNs();
+ std::set<string> str_set;
+
// First, fill in ConfigMetricsReport using current data on memory, which
// starts from filling in StatsLogReport's.
- it->second->onDumpReport(dumpTimeStampNs, include_current_partial_bucket, proto);
+ it->second->onDumpReport(dumpTimeStampNs, include_current_partial_bucket,
+ &str_set, proto);
// Fill in UidMap.
uint64_t uidMapToken = proto->start(FIELD_TYPE_MESSAGE | FIELD_ID_UID_MAP);
- mUidMap->appendUidMap(dumpTimeStampNs, key, proto);
+ mUidMap->appendUidMap(dumpTimeStampNs, key, &str_set, proto);
proto->end(uidMapToken);
// Fill in the timestamps.
@@ -380,6 +386,12 @@
(long long)getWallClockNs());
// Dump report reason
proto->write(FIELD_TYPE_INT32 | FIELD_ID_DUMP_REPORT_REASON, dumpReportReason);
+
+ if (include_string) {
+ for (const auto& str : str_set) {
+ proto->write(FIELD_TYPE_STRING | FIELD_COUNT_REPEATED | FIELD_ID_STRINGS, str);
+ }
+ }
}
void StatsLogProcessor::resetConfigsLocked(const int64_t timestampNs,
@@ -465,7 +477,8 @@
const DumpReportReason dumpReportReason) {
ProtoOutputStream proto;
onConfigMetricsReportLocked(key, getElapsedRealtimeNs(),
- true /* include_current_partial_bucket*/, dumpReportReason, &proto);
+ true /* include_current_partial_bucket*/,
+ false /* include strings */, dumpReportReason, &proto);
string file_name = StringPrintf("%s/%ld_%d_%lld", STATS_DATA_DIR,
(long)getWallClockSec(), key.GetUid(), (long long)key.GetId());
android::base::unique_fd fd(open(file_name.c_str(),
diff --git a/cmds/statsd/src/StatsLogProcessor.h b/cmds/statsd/src/StatsLogProcessor.h
index c2337c1..c3c4663 100644
--- a/cmds/statsd/src/StatsLogProcessor.h
+++ b/cmds/statsd/src/StatsLogProcessor.h
@@ -63,7 +63,7 @@
size_t GetMetricsSize(const ConfigKey& key) const;
void onDumpReport(const ConfigKey& key, const int64_t dumpTimeNs,
- const bool include_current_partial_bucket,
+ const bool include_current_partial_bucket, const bool include_string,
const DumpReportReason dumpReportReason, vector<uint8_t>* outData);
/* Tells MetricsManager that the alarms in alarmSet have fired. Modifies anomaly alarmSet. */
@@ -126,6 +126,7 @@
void onConfigMetricsReportLocked(const ConfigKey& key, const int64_t dumpTimeStampNs,
const bool include_current_partial_bucket,
+ const bool include_string,
const DumpReportReason dumpReportReason,
util::ProtoOutputStream* proto);
diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp
index 5229071..0e7b4f9 100644
--- a/cmds/statsd/src/StatsService.cpp
+++ b/cmds/statsd/src/StatsService.cpp
@@ -592,7 +592,8 @@
if (good) {
vector<uint8_t> data;
mProcessor->onDumpReport(ConfigKey(uid, StrToInt64(name)), getElapsedRealtimeNs(),
- false /* include_current_bucket*/, ADB_DUMP, &data);
+ false /* include_current_bucket*/,
+ true /* include strings */, ADB_DUMP, &data);
// TODO: print the returned StatsLogReport to file instead of printing to logcat.
if (proto) {
for (size_t i = 0; i < data.size(); i ++) {
@@ -865,8 +866,9 @@
IPCThreadState* ipc = IPCThreadState::self();
VLOG("StatsService::getData with Pid %i, Uid %i", ipc->getCallingPid(), ipc->getCallingUid());
ConfigKey configKey(ipc->getCallingUid(), key);
- mProcessor->onDumpReport(configKey, getElapsedRealtimeNs(), false /* include_current_bucket*/,
- GET_DATA_CALLED, output);
+ mProcessor->onDumpReport(configKey, getElapsedRealtimeNs(),
+ false /* include_current_bucket*/, true /* include strings */,
+ GET_DATA_CALLED, output);
return Status::ok();
}
diff --git a/cmds/statsd/src/guardrail/StatsdStats.h b/cmds/statsd/src/guardrail/StatsdStats.h
index 2cbcca3..65ba4f7 100644
--- a/cmds/statsd/src/guardrail/StatsdStats.h
+++ b/cmds/statsd/src/guardrail/StatsdStats.h
@@ -114,7 +114,7 @@
// Soft memory limit per configuration. Once this limit is exceeded, we begin notifying the
// data subscriber that it's time to call getData.
- static const size_t kBytesPerConfigTriggerGetData = 128 * 1024;
+ static const size_t kBytesPerConfigTriggerGetData = 192 * 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.
diff --git a/cmds/statsd/src/hash.cpp b/cmds/statsd/src/hash.cpp
new file mode 100644
index 0000000..c501c9f
--- /dev/null
+++ b/cmds/statsd/src/hash.cpp
@@ -0,0 +1,130 @@
+/*
+ * 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 "hash.h"
+
+namespace android {
+namespace os {
+namespace statsd {
+
+namespace {
+// Lower-level versions of Get... that read directly from a character buffer
+// without any bounds checking.
+inline uint32_t DecodeFixed32(const char *ptr) {
+ return ((static_cast<uint32_t>(static_cast<unsigned char>(ptr[0]))) |
+ (static_cast<uint32_t>(static_cast<unsigned char>(ptr[1])) << 8) |
+ (static_cast<uint32_t>(static_cast<unsigned char>(ptr[2])) << 16) |
+ (static_cast<uint32_t>(static_cast<unsigned char>(ptr[3])) << 24));
+}
+
+inline uint64_t DecodeFixed64(const char* ptr) {
+ uint64_t lo = DecodeFixed32(ptr);
+ uint64_t hi = DecodeFixed32(ptr + 4);
+ return (hi << 32) | lo;
+}
+
+// 0xff is in case char is signed.
+static inline uint32_t ByteAs32(char c) { return static_cast<uint32_t>(c) & 0xff; }
+static inline uint64_t ByteAs64(char c) { return static_cast<uint64_t>(c) & 0xff; }
+
+} // namespace
+
+uint32_t Hash32(const char *data, size_t n, uint32_t seed) {
+ // 'm' and 'r' are mixing constants generated offline.
+ // They're not really 'magic', they just happen to work well.
+ const uint32_t m = 0x5bd1e995;
+ const int r = 24;
+
+ // Initialize the hash to a 'random' value
+ uint32_t h = static_cast<uint32_t>(seed ^ n);
+
+ // Mix 4 bytes at a time into the hash
+ while (n >= 4) {
+ uint32_t k = DecodeFixed32(data);
+ k *= m;
+ k ^= k >> r;
+ k *= m;
+ h *= m;
+ h ^= k;
+ data += 4;
+ n -= 4;
+ }
+
+ // Handle the last few bytes of the input array
+ switch (n) {
+ case 3:
+ h ^= ByteAs32(data[2]) << 16;
+ case 2:
+ h ^= ByteAs32(data[1]) << 8;
+ case 1:
+ h ^= ByteAs32(data[0]);
+ h *= m;
+ }
+
+ // Do a few final mixes of the hash to ensure the last few
+ // bytes are well-incorporated.
+ h ^= h >> 13;
+ h *= m;
+ h ^= h >> 15;
+ return h;
+}
+
+uint64_t Hash64(const char* data, size_t n, uint64_t seed) {
+ const uint64_t m = 0xc6a4a7935bd1e995;
+ const int r = 47;
+
+ uint64_t h = seed ^ (n * m);
+
+ while (n >= 8) {
+ uint64_t k = DecodeFixed64(data);
+ data += 8;
+ n -= 8;
+
+ k *= m;
+ k ^= k >> r;
+ k *= m;
+
+ h ^= k;
+ h *= m;
+ }
+
+ switch (n) {
+ case 7:
+ h ^= ByteAs64(data[6]) << 48;
+ case 6:
+ h ^= ByteAs64(data[5]) << 40;
+ case 5:
+ h ^= ByteAs64(data[4]) << 32;
+ case 4:
+ h ^= ByteAs64(data[3]) << 24;
+ case 3:
+ h ^= ByteAs64(data[2]) << 16;
+ case 2:
+ h ^= ByteAs64(data[1]) << 8;
+ case 1:
+ h ^= ByteAs64(data[0]);
+ h *= m;
+ }
+
+ h ^= h >> r;
+ h *= m;
+ h ^= h >> r;
+
+ return h;
+}
+} // namespace statsd
+} // namespace os
+} // namespace android
diff --git a/cmds/statsd/src/hash.h b/cmds/statsd/src/hash.h
new file mode 100644
index 0000000..cfe869f
--- /dev/null
+++ b/cmds/statsd/src/hash.h
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <string>
+
+namespace android {
+namespace os {
+namespace statsd {
+
+extern uint32_t Hash32(const char *data, size_t n, uint32_t seed);
+extern uint64_t Hash64(const char* data, size_t n, uint64_t seed);
+
+inline uint32_t Hash32(const char *data, size_t n) {
+ return Hash32(data, n, 0xBEEF);
+}
+
+inline uint32_t Hash32(const std::string &input) {
+ return Hash32(input.data(), input.size());
+}
+
+inline uint64_t Hash64(const char* data, size_t n) {
+ return Hash64(data, n, 0xDECAFCAFFE);
+}
+
+inline uint64_t Hash64(const std::string& str) {
+ return Hash64(str.data(), str.size());
+}
+
+} // namespace statsd
+} // namespace os
+} // namespace android
diff --git a/cmds/statsd/src/metrics/CountMetricProducer.cpp b/cmds/statsd/src/metrics/CountMetricProducer.cpp
index 511aec3..43f53e0 100644
--- a/cmds/statsd/src/metrics/CountMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/CountMetricProducer.cpp
@@ -45,16 +45,23 @@
// for StatsLogReport
const int FIELD_ID_ID = 1;
const int FIELD_ID_COUNT_METRICS = 5;
+const int FIELD_ID_TIME_BASE = 9;
+const int FIELD_ID_BUCKET_SIZE = 10;
+const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;
+const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;
// for CountMetricDataWrapper
const int FIELD_ID_DATA = 1;
// for CountMetricData
const int FIELD_ID_DIMENSION_IN_WHAT = 1;
const int FIELD_ID_DIMENSION_IN_CONDITION = 2;
const int FIELD_ID_BUCKET_INFO = 3;
+const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;
+const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;
// for CountBucketInfo
-const int FIELD_ID_START_BUCKET_ELAPSED_NANOS = 1;
-const int FIELD_ID_END_BUCKET_ELAPSED_NANOS = 2;
const int FIELD_ID_COUNT = 3;
+const int FIELD_ID_BUCKET_NUM = 4;
+const int FIELD_ID_START_BUCKET_ELAPSED_MILLIS = 5;
+const int FIELD_ID_END_BUCKET_ELAPSED_MILLIS = 6;
CountMetricProducer::CountMetricProducer(const ConfigKey& key, const CountMetric& metric,
const int conditionIndex,
@@ -74,6 +81,9 @@
mContainANYPositionInDimensionsInWhat = HasPositionANY(metric.dimensions_in_what());
}
+ mSliceByPositionALL = HasPositionALL(metric.dimensions_in_what()) ||
+ HasPositionALL(metric.dimensions_in_condition());
+
if (metric.has_dimensions_in_condition()) {
translateFieldMatcher(metric.dimensions_in_condition(), &mDimensionsInCondition);
}
@@ -130,6 +140,7 @@
void CountMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
ProtoOutputStream* protoOutput) {
if (include_current_partial_bucket) {
flushLocked(dumpTimeNs);
@@ -140,6 +151,26 @@
return;
}
protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_ID, (long long)mMetricId);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_TIME_BASE, (long long)mTimeBaseNs);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_SIZE, (long long)mBucketSizeNs);
+
+ // Fills the dimension path if not slicing by ALL.
+ if (!mSliceByPositionALL) {
+ if (!mDimensionsInWhat.empty()) {
+ uint64_t dimenPathToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_PATH_IN_WHAT);
+ writeDimensionPathToProto(mDimensionsInWhat, protoOutput);
+ protoOutput->end(dimenPathToken);
+ }
+ if (!mDimensionsInCondition.empty()) {
+ uint64_t dimenPathToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_PATH_IN_CONDITION);
+ writeDimensionPathToProto(mDimensionsInCondition, protoOutput);
+ protoOutput->end(dimenPathToken);
+ }
+
+ }
+
uint64_t protoToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_COUNT_METRICS);
for (const auto& counter : mPastBuckets) {
@@ -150,27 +181,42 @@
protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA);
// First fill dimension.
- uint64_t dimensionInWhatToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
- writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), protoOutput);
- protoOutput->end(dimensionInWhatToken);
+ if (mSliceByPositionALL) {
+ uint64_t dimensionToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
+ writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), str_set, protoOutput);
+ protoOutput->end(dimensionToken);
- if (dimensionKey.hasDimensionKeyInCondition()) {
- uint64_t dimensionInConditionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
- writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(), protoOutput);
- protoOutput->end(dimensionInConditionToken);
+ if (dimensionKey.hasDimensionKeyInCondition()) {
+ uint64_t dimensionInConditionToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
+ writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(),
+ str_set, protoOutput);
+ protoOutput->end(dimensionInConditionToken);
+ }
+ } else {
+ writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInWhat(),
+ FIELD_ID_DIMENSION_LEAF_IN_WHAT, str_set, protoOutput);
+ if (dimensionKey.hasDimensionKeyInCondition()) {
+ writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInCondition(),
+ FIELD_ID_DIMENSION_LEAF_IN_CONDITION,
+ str_set, protoOutput);
+ }
}
-
// Then fill bucket_info (CountBucketInfo).
-
for (const auto& bucket : counter.second) {
uint64_t bucketInfoToken = protoOutput->start(
FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_ELAPSED_NANOS,
- (long long)bucket.mBucketStartNs);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_ELAPSED_NANOS,
- (long long)bucket.mBucketEndNs);
+ // Partial bucket.
+ if (bucket.mBucketEndNs - bucket.mBucketStartNs != mBucketSizeNs) {
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_ELAPSED_MILLIS,
+ (long long)NanoToMillis(bucket.mBucketStartNs));
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_ELAPSED_MILLIS,
+ (long long)NanoToMillis(bucket.mBucketEndNs));
+ } else {
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_NUM,
+ (long long)(getBucketNumFromEndTimeNs(bucket.mBucketEndNs)));
+ }
protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_COUNT, (long long)bucket.mCount);
protoOutput->end(bucketInfoToken);
VLOG("\t bucket [%lld - %lld] count: %lld", (long long)bucket.mBucketStartNs,
diff --git a/cmds/statsd/src/metrics/CountMetricProducer.h b/cmds/statsd/src/metrics/CountMetricProducer.h
index 8e94a75..139c083 100644
--- a/cmds/statsd/src/metrics/CountMetricProducer.h
+++ b/cmds/statsd/src/metrics/CountMetricProducer.h
@@ -57,6 +57,7 @@
void onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
android::util::ProtoOutputStream* protoOutput) override;
void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.cpp b/cmds/statsd/src/metrics/DurationMetricProducer.cpp
index 5610492..62237bc 100644
--- a/cmds/statsd/src/metrics/DurationMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/DurationMetricProducer.cpp
@@ -44,16 +44,23 @@
// for StatsLogReport
const int FIELD_ID_ID = 1;
const int FIELD_ID_DURATION_METRICS = 6;
+const int FIELD_ID_TIME_BASE = 9;
+const int FIELD_ID_BUCKET_SIZE = 10;
+const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;
+const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;
// for DurationMetricDataWrapper
const int FIELD_ID_DATA = 1;
// for DurationMetricData
const int FIELD_ID_DIMENSION_IN_WHAT = 1;
const int FIELD_ID_DIMENSION_IN_CONDITION = 2;
const int FIELD_ID_BUCKET_INFO = 3;
+const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;
+const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;
// for DurationBucketInfo
-const int FIELD_ID_START_BUCKET_ELAPSED_NANOS = 1;
-const int FIELD_ID_END_BUCKET_ELAPSED_NANOS = 2;
const int FIELD_ID_DURATION = 3;
+const int FIELD_ID_BUCKET_NUM = 4;
+const int FIELD_ID_START_BUCKET_ELAPSED_MILLIS = 5;
+const int FIELD_ID_END_BUCKET_ELAPSED_MILLIS = 6;
DurationMetricProducer::DurationMetricProducer(const ConfigKey& key, const DurationMetric& metric,
const int conditionIndex, const size_t startIndex,
@@ -99,6 +106,9 @@
translateFieldMatcher(metric.dimensions_in_condition(), &mDimensionsInCondition);
}
+ mSliceByPositionALL = HasPositionALL(metric.dimensions_in_what()) ||
+ HasPositionALL(metric.dimensions_in_condition());
+
if (metric.links().size() > 0) {
for (const auto& link : metric.links()) {
Metric2Condition mc;
@@ -445,6 +455,7 @@
void DurationMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
ProtoOutputStream* protoOutput) {
if (include_current_partial_bucket) {
flushLocked(dumpTimeNs);
@@ -457,6 +468,24 @@
}
protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_ID, (long long)mMetricId);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_TIME_BASE, (long long)mTimeBaseNs);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_SIZE, (long long)mBucketSizeNs);
+
+ if (!mSliceByPositionALL) {
+ if (!mDimensionsInWhat.empty()) {
+ uint64_t dimenPathToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_PATH_IN_WHAT);
+ writeDimensionPathToProto(mDimensionsInWhat, protoOutput);
+ protoOutput->end(dimenPathToken);
+ }
+ if (!mDimensionsInCondition.empty()) {
+ uint64_t dimenPathToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_PATH_IN_CONDITION);
+ writeDimensionPathToProto(mDimensionsInCondition, protoOutput);
+ protoOutput->end(dimenPathToken);
+ }
+ }
+
uint64_t protoToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_DURATION_METRICS);
VLOG("Duration metric %lld dump report now...", (long long)mMetricId);
@@ -469,26 +498,41 @@
protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA);
// First fill dimension.
- uint64_t dimensionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
- writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), protoOutput);
- protoOutput->end(dimensionToken);
+ if (mSliceByPositionALL) {
+ uint64_t dimensionToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
+ writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), str_set, protoOutput);
+ protoOutput->end(dimensionToken);
- if (dimensionKey.hasDimensionKeyInCondition()) {
- uint64_t dimensionInConditionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
- writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(), protoOutput);
- protoOutput->end(dimensionInConditionToken);
+ if (dimensionKey.hasDimensionKeyInCondition()) {
+ uint64_t dimensionInConditionToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
+ writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(),
+ str_set, protoOutput);
+ protoOutput->end(dimensionInConditionToken);
+ }
+ } else {
+ writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInWhat(),
+ FIELD_ID_DIMENSION_LEAF_IN_WHAT, str_set, protoOutput);
+ if (dimensionKey.hasDimensionKeyInCondition()) {
+ writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInCondition(),
+ FIELD_ID_DIMENSION_LEAF_IN_CONDITION,
+ str_set, protoOutput);
+ }
}
-
// Then fill bucket_info (DurationBucketInfo).
for (const auto& bucket : pair.second) {
uint64_t bucketInfoToken = protoOutput->start(
FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_ELAPSED_NANOS,
- (long long)bucket.mBucketStartNs);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_ELAPSED_NANOS,
- (long long)bucket.mBucketEndNs);
+ if (bucket.mBucketEndNs - bucket.mBucketStartNs != mBucketSizeNs) {
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_ELAPSED_MILLIS,
+ (long long)NanoToMillis(bucket.mBucketStartNs));
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_ELAPSED_MILLIS,
+ (long long)NanoToMillis(bucket.mBucketEndNs));
+ } else {
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_NUM,
+ (long long)(getBucketNumFromEndTimeNs(bucket.mBucketEndNs)));
+ }
protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_DURATION, (long long)bucket.mDuration);
protoOutput->end(bucketInfoToken);
VLOG("\t bucket [%lld - %lld] duration: %lld", (long long)bucket.mBucketStartNs,
diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.h b/cmds/statsd/src/metrics/DurationMetricProducer.h
index f755294..88e455a 100644
--- a/cmds/statsd/src/metrics/DurationMetricProducer.h
+++ b/cmds/statsd/src/metrics/DurationMetricProducer.h
@@ -63,6 +63,7 @@
void onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
android::util::ProtoOutputStream* protoOutput) override;
void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
diff --git a/cmds/statsd/src/metrics/EventMetricProducer.cpp b/cmds/statsd/src/metrics/EventMetricProducer.cpp
index 23f780a..eec90fc 100644
--- a/cmds/statsd/src/metrics/EventMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/EventMetricProducer.cpp
@@ -106,6 +106,7 @@
void EventMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
ProtoOutputStream* protoOutput) {
if (mProto->size() <= 0) {
return;
diff --git a/cmds/statsd/src/metrics/EventMetricProducer.h b/cmds/statsd/src/metrics/EventMetricProducer.h
index 23302c4..62d1105 100644
--- a/cmds/statsd/src/metrics/EventMetricProducer.h
+++ b/cmds/statsd/src/metrics/EventMetricProducer.h
@@ -48,6 +48,7 @@
void onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
android::util::ProtoOutputStream* protoOutput) override;
void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
index 005cb71..a940d58 100644
--- a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp
@@ -45,21 +45,28 @@
// for StatsLogReport
const int FIELD_ID_ID = 1;
const int FIELD_ID_GAUGE_METRICS = 8;
+const int FIELD_ID_TIME_BASE = 9;
+const int FIELD_ID_BUCKET_SIZE = 10;
+const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;
+const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;
// for GaugeMetricDataWrapper
const int FIELD_ID_DATA = 1;
const int FIELD_ID_SKIPPED = 2;
-const int FIELD_ID_SKIPPED_START = 1;
-const int FIELD_ID_SKIPPED_END = 2;
+const int FIELD_ID_SKIPPED_START_MILLIS = 3;
+const int FIELD_ID_SKIPPED_END_MILLIS = 4;
// for GaugeMetricData
const int FIELD_ID_DIMENSION_IN_WHAT = 1;
const int FIELD_ID_DIMENSION_IN_CONDITION = 2;
const int FIELD_ID_BUCKET_INFO = 3;
+const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;
+const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;
// for GaugeBucketInfo
-const int FIELD_ID_START_BUCKET_ELAPSED_NANOS = 1;
-const int FIELD_ID_END_BUCKET_ELAPSED_NANOS = 2;
const int FIELD_ID_ATOM = 3;
const int FIELD_ID_ELAPSED_ATOM_TIMESTAMP = 4;
const int FIELD_ID_WALL_CLOCK_ATOM_TIMESTAMP = 5;
+const int FIELD_ID_BUCKET_NUM = 6;
+const int FIELD_ID_START_BUCKET_ELAPSED_MILLIS = 7;
+const int FIELD_ID_END_BUCKET_ELAPSED_MILLIS = 8;
GaugeMetricProducer::GaugeMetricProducer(const ConfigKey& key, const GaugeMetric& metric,
const int conditionIndex,
@@ -113,6 +120,8 @@
}
}
mConditionSliced = (metric.links().size() > 0) || (mDimensionsInCondition.size() > 0);
+ mSliceByPositionALL = HasPositionALL(metric.dimensions_in_what()) ||
+ HasPositionALL(metric.dimensions_in_condition());
flushIfNeededLocked(startTimeNs);
// Kicks off the puller immediately.
@@ -168,6 +177,7 @@
void GaugeMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
ProtoOutputStream* protoOutput) {
VLOG("Gauge metric %lld report now...", (long long)mMetricId);
if (include_current_partial_bucket) {
@@ -182,13 +192,34 @@
}
protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_ID, (long long)mMetricId);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_TIME_BASE, (long long)mTimeBaseNs);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_SIZE, (long long)mBucketSizeNs);
+
+ // Fills the dimension path if not slicing by ALL.
+ if (!mSliceByPositionALL) {
+ if (!mDimensionsInWhat.empty()) {
+ uint64_t dimenPathToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_PATH_IN_WHAT);
+ writeDimensionPathToProto(mDimensionsInWhat, protoOutput);
+ protoOutput->end(dimenPathToken);
+ }
+ if (!mDimensionsInCondition.empty()) {
+ uint64_t dimenPathToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_PATH_IN_CONDITION);
+ writeDimensionPathToProto(mDimensionsInCondition, protoOutput);
+ protoOutput->end(dimenPathToken);
+ }
+ }
+
uint64_t protoToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_GAUGE_METRICS);
for (const auto& pair : mSkippedBuckets) {
uint64_t wrapperToken =
protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_SKIPPED);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_SKIPPED_START, (long long)pair.first);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_SKIPPED_END, (long long)pair.second);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_SKIPPED_START_MILLIS,
+ (long long)(NanoToMillis(pair.first)));
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_SKIPPED_END_MILLIS,
+ (long long)(NanoToMillis(pair.second)));
protoOutput->end(wrapperToken);
}
mSkippedBuckets.clear();
@@ -201,26 +232,43 @@
protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA);
// First fill dimension.
- uint64_t dimensionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
- writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), protoOutput);
- protoOutput->end(dimensionToken);
+ if (mSliceByPositionALL) {
+ uint64_t dimensionToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
+ writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), str_set, protoOutput);
+ protoOutput->end(dimensionToken);
- if (dimensionKey.hasDimensionKeyInCondition()) {
- uint64_t dimensionInConditionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
- writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(), protoOutput);
- protoOutput->end(dimensionInConditionToken);
+ if (dimensionKey.hasDimensionKeyInCondition()) {
+ uint64_t dimensionInConditionToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
+ writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(),
+ str_set, protoOutput);
+ protoOutput->end(dimensionInConditionToken);
+ }
+ } else {
+ writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInWhat(),
+ FIELD_ID_DIMENSION_LEAF_IN_WHAT, str_set, protoOutput);
+ if (dimensionKey.hasDimensionKeyInCondition()) {
+ writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInCondition(),
+ FIELD_ID_DIMENSION_LEAF_IN_CONDITION,
+ str_set, protoOutput);
+ }
}
// Then fill bucket_info (GaugeBucketInfo).
for (const auto& bucket : pair.second) {
uint64_t bucketInfoToken = protoOutput->start(
FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_ELAPSED_NANOS,
- (long long)bucket.mBucketStartNs);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_ELAPSED_NANOS,
- (long long)bucket.mBucketEndNs);
+
+ if (bucket.mBucketEndNs - bucket.mBucketStartNs != mBucketSizeNs) {
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_ELAPSED_MILLIS,
+ (long long)NanoToMillis(bucket.mBucketStartNs));
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_ELAPSED_MILLIS,
+ (long long)NanoToMillis(bucket.mBucketEndNs));
+ } else {
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_NUM,
+ (long long)(getBucketNumFromEndTimeNs(bucket.mBucketEndNs)));
+ }
if (!bucket.mGaugeAtoms.empty()) {
for (const auto& atom : bucket.mGaugeAtoms) {
diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.h b/cmds/statsd/src/metrics/GaugeMetricProducer.h
index 8af2f36..ac2bd77 100644
--- a/cmds/statsd/src/metrics/GaugeMetricProducer.h
+++ b/cmds/statsd/src/metrics/GaugeMetricProducer.h
@@ -90,6 +90,7 @@
private:
void onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
android::util::ProtoOutputStream* protoOutput) override;
void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
diff --git a/cmds/statsd/src/metrics/MetricProducer.h b/cmds/statsd/src/metrics/MetricProducer.h
index 4239649..6fe4bfb 100644
--- a/cmds/statsd/src/metrics/MetricProducer.h
+++ b/cmds/statsd/src/metrics/MetricProducer.h
@@ -52,6 +52,7 @@
mWizard(wizard),
mConditionTrackerIndex(conditionIndex),
mContainANYPositionInDimensionsInWhat(false),
+ mSliceByPositionALL(false),
mSameConditionDimensionsInTracker(false),
mHasLinksToAllConditionDimensionsInTracker(false) {
}
@@ -114,9 +115,10 @@
// This method clears all the past buckets.
void onDumpReport(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
android::util::ProtoOutputStream* protoOutput) {
std::lock_guard<std::mutex> lock(mMutex);
- return onDumpReportLocked(dumpTimeNs, include_current_partial_bucket, protoOutput);
+ return onDumpReportLocked(dumpTimeNs, include_current_partial_bucket, str_set, protoOutput);
}
void clearPastBuckets(const int64_t dumpTimeNs) {
@@ -181,6 +183,7 @@
const int64_t eventTime) = 0;
virtual void onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
android::util::ProtoOutputStream* protoOutput) = 0;
virtual void clearPastBucketsLocked(const int64_t dumpTimeNs) = 0;
virtual size_t byteSizeLocked() const = 0;
@@ -218,6 +221,10 @@
return mTimeBaseNs + (mCurrentBucketNum + 1) * mBucketSizeNs;
}
+ int64_t getBucketNumFromEndTimeNs(const int64_t endNs) {
+ return (endNs - mTimeBaseNs) / mBucketSizeNs - 1;
+ }
+
virtual void dropDataLocked(const int64_t dropTimeNs) = 0;
const int64_t mMetricId;
@@ -250,6 +257,7 @@
vector<Matcher> mDimensionsInCondition; // The dimensions_in_condition defined in statsd_config
bool mContainANYPositionInDimensionsInWhat;
+ bool mSliceByPositionALL;
// True iff the condition dimensions equal to the sliced dimensions in the simple condition
// tracker. This field is always false for combinational condition trackers.
diff --git a/cmds/statsd/src/metrics/MetricsManager.cpp b/cmds/statsd/src/metrics/MetricsManager.cpp
index 0d3aebf..9ca4daa 100644
--- a/cmds/statsd/src/metrics/MetricsManager.cpp
+++ b/cmds/statsd/src/metrics/MetricsManager.cpp
@@ -36,6 +36,7 @@
using android::util::FIELD_TYPE_INT32;
using android::util::FIELD_TYPE_INT64;
using android::util::FIELD_TYPE_MESSAGE;
+using android::util::FIELD_TYPE_STRING;
using android::util::ProtoOutputStream;
using std::make_unique;
@@ -192,14 +193,16 @@
void MetricsManager::onDumpReport(const int64_t dumpTimeStampNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
ProtoOutputStream* protoOutput) {
VLOG("=========================Metric Reports Start==========================");
// one StatsLogReport per MetricProduer
for (const auto& producer : mAllMetricProducers) {
if (mNoReportMetricIds.find(producer->getMetricId()) == mNoReportMetricIds.end()) {
- uint64_t token =
- protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_METRICS);
- producer->onDumpReport(dumpTimeStampNs, include_current_partial_bucket, protoOutput);
+ uint64_t token = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_METRICS);
+ producer->onDumpReport(dumpTimeStampNs, include_current_partial_bucket, str_set,
+ protoOutput);
protoOutput->end(token);
} else {
producer->clearPastBuckets(dumpTimeStampNs);
@@ -213,6 +216,7 @@
protoOutput->write(FIELD_TYPE_INT32 | FIELD_ID_ANNOTATIONS_INT32, annotation.second);
protoOutput->end(token);
}
+
mLastReportTimeNs = dumpTimeStampNs;
mLastReportWallClockNs = getWallClockNs();
VLOG("=========================Metric Reports End==========================");
diff --git a/cmds/statsd/src/metrics/MetricsManager.h b/cmds/statsd/src/metrics/MetricsManager.h
index 3d2c595..170d6a7 100644
--- a/cmds/statsd/src/metrics/MetricsManager.h
+++ b/cmds/statsd/src/metrics/MetricsManager.h
@@ -92,6 +92,7 @@
virtual void onDumpReport(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
android::util::ProtoOutputStream* protoOutput);
// Computes the total byte size of all metrics managed by a single config source.
diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.cpp b/cmds/statsd/src/metrics/ValueMetricProducer.cpp
index 506cf38..69330ba 100644
--- a/cmds/statsd/src/metrics/ValueMetricProducer.cpp
+++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp
@@ -48,19 +48,26 @@
// for StatsLogReport
const int FIELD_ID_ID = 1;
const int FIELD_ID_VALUE_METRICS = 7;
+const int FIELD_ID_TIME_BASE = 9;
+const int FIELD_ID_BUCKET_SIZE = 10;
+const int FIELD_ID_DIMENSION_PATH_IN_WHAT = 11;
+const int FIELD_ID_DIMENSION_PATH_IN_CONDITION = 12;
// for ValueMetricDataWrapper
const int FIELD_ID_DATA = 1;
const int FIELD_ID_SKIPPED = 2;
-const int FIELD_ID_SKIPPED_START = 1;
-const int FIELD_ID_SKIPPED_END = 2;
+const int FIELD_ID_SKIPPED_START_MILLIS = 3;
+const int FIELD_ID_SKIPPED_END_MILLIS = 4;
// for ValueMetricData
const int FIELD_ID_DIMENSION_IN_WHAT = 1;
const int FIELD_ID_DIMENSION_IN_CONDITION = 2;
const int FIELD_ID_BUCKET_INFO = 3;
+const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;
+const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;
// for ValueBucketInfo
-const int FIELD_ID_START_BUCKET_NANOS = 1;
-const int FIELD_ID_END_BUCKET_NANOS = 2;
const int FIELD_ID_VALUE = 3;
+const int FIELD_ID_BUCKET_NUM = 4;
+const int FIELD_ID_START_BUCKET_ELAPSED_MILLIS = 5;
+const int FIELD_ID_END_BUCKET_ELAPSED_MILLIS = 6;
// ValueMetric has a minimum bucket size of 10min so that we don't pull too frequently
ValueMetricProducer::ValueMetricProducer(const ConfigKey& key, const ValueMetric& metric,
@@ -113,6 +120,8 @@
mField = mValueField.child(0).field();
}
mConditionSliced = (metric.links().size() > 0) || (mDimensionsInCondition.size() > 0);
+ mSliceByPositionALL = HasPositionALL(metric.dimensions_in_what()) ||
+ HasPositionALL(metric.dimensions_in_condition());
// Kicks off the puller immediately.
flushIfNeededLocked(startTimestampNs);
@@ -159,6 +168,7 @@
void ValueMetricProducer::onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
ProtoOutputStream* protoOutput) {
VLOG("metric %lld dump report now...", (long long)mMetricId);
if (include_current_partial_bucket) {
@@ -170,13 +180,33 @@
return;
}
protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_ID, (long long)mMetricId);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_TIME_BASE, (long long)mTimeBaseNs);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_SIZE, (long long)mBucketSizeNs);
+ // Fills the dimension path if not slicing by ALL.
+ if (!mSliceByPositionALL) {
+ if (!mDimensionsInWhat.empty()) {
+ uint64_t dimenPathToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_PATH_IN_WHAT);
+ writeDimensionPathToProto(mDimensionsInWhat, protoOutput);
+ protoOutput->end(dimenPathToken);
+ }
+ if (!mDimensionsInCondition.empty()) {
+ uint64_t dimenPathToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_PATH_IN_CONDITION);
+ writeDimensionPathToProto(mDimensionsInCondition, protoOutput);
+ protoOutput->end(dimenPathToken);
+ }
+ }
+
uint64_t protoToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_VALUE_METRICS);
for (const auto& pair : mSkippedBuckets) {
uint64_t wrapperToken =
protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_SKIPPED);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_SKIPPED_START, (long long)pair.first);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_SKIPPED_END, (long long)pair.second);
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_SKIPPED_START_MILLIS,
+ (long long)(NanoToMillis(pair.first)));
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_SKIPPED_END_MILLIS,
+ (long long)(NanoToMillis(pair.second)));
protoOutput->end(wrapperToken);
}
mSkippedBuckets.clear();
@@ -188,25 +218,43 @@
protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA);
// First fill dimension.
- uint64_t dimensionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
- writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), protoOutput);
- protoOutput->end(dimensionToken);
- if (dimensionKey.hasDimensionKeyInCondition()) {
- uint64_t dimensionInConditionToken = protoOutput->start(
- FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
- writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(), protoOutput);
- protoOutput->end(dimensionInConditionToken);
+ if (mSliceByPositionALL) {
+ uint64_t dimensionToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_WHAT);
+ writeDimensionToProto(dimensionKey.getDimensionKeyInWhat(), str_set, protoOutput);
+ protoOutput->end(dimensionToken);
+ if (dimensionKey.hasDimensionKeyInCondition()) {
+ uint64_t dimensionInConditionToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_ID_DIMENSION_IN_CONDITION);
+ writeDimensionToProto(dimensionKey.getDimensionKeyInCondition(),
+ str_set, protoOutput);
+ protoOutput->end(dimensionInConditionToken);
+ }
+ } else {
+ writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInWhat(),
+ FIELD_ID_DIMENSION_LEAF_IN_WHAT, str_set, protoOutput);
+ if (dimensionKey.hasDimensionKeyInCondition()) {
+ writeDimensionLeafNodesToProto(dimensionKey.getDimensionKeyInCondition(),
+ FIELD_ID_DIMENSION_LEAF_IN_CONDITION,
+ str_set, protoOutput);
+ }
}
// Then fill bucket_info (ValueBucketInfo).
for (const auto& bucket : pair.second) {
uint64_t bucketInfoToken = protoOutput->start(
FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS,
- (long long)bucket.mBucketStartNs);
- protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS,
- (long long)bucket.mBucketEndNs);
+
+ if (bucket.mBucketEndNs - bucket.mBucketStartNs != mBucketSizeNs) {
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_ELAPSED_MILLIS,
+ (long long)NanoToMillis(bucket.mBucketStartNs));
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_ELAPSED_MILLIS,
+ (long long)NanoToMillis(bucket.mBucketEndNs));
+ } else {
+ protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_BUCKET_NUM,
+ (long long)(getBucketNumFromEndTimeNs(bucket.mBucketEndNs)));
+ }
+
protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE, (long long)bucket.mValue);
protoOutput->end(bucketInfoToken);
VLOG("\t bucket [%lld - %lld] count: %lld", (long long)bucket.mBucketStartNs,
diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.h b/cmds/statsd/src/metrics/ValueMetricProducer.h
index 64604c2..113be4b 100644
--- a/cmds/statsd/src/metrics/ValueMetricProducer.h
+++ b/cmds/statsd/src/metrics/ValueMetricProducer.h
@@ -88,6 +88,7 @@
private:
void onDumpReportLocked(const int64_t dumpTimeNs,
const bool include_current_partial_bucket,
+ std::set<string> *str_set,
android::util::ProtoOutputStream* protoOutput) override;
void clearPastBucketsLocked(const int64_t dumpTimeNs) override;
diff --git a/cmds/statsd/src/packages/UidMap.cpp b/cmds/statsd/src/packages/UidMap.cpp
index 2674171..fff909c 100644
--- a/cmds/statsd/src/packages/UidMap.cpp
+++ b/cmds/statsd/src/packages/UidMap.cpp
@@ -16,6 +16,7 @@
#define DEBUG false // STOPSHIP if true
#include "Log.h"
+#include "hash.h"
#include "stats_log_util.h"
#include "guardrail/StatsdStats.h"
#include "packages/UidMap.h"
@@ -34,6 +35,7 @@
using android::util::FIELD_TYPE_FLOAT;
using android::util::FIELD_TYPE_INT32;
using android::util::FIELD_TYPE_INT64;
+using android::util::FIELD_TYPE_UINT64;
using android::util::FIELD_TYPE_MESSAGE;
using android::util::FIELD_TYPE_STRING;
using android::util::ProtoOutputStream;
@@ -46,6 +48,7 @@
const int FIELD_ID_SNAPSHOT_PACKAGE_VERSION = 2;
const int FIELD_ID_SNAPSHOT_PACKAGE_UID = 3;
const int FIELD_ID_SNAPSHOT_PACKAGE_DELETED = 4;
+const int FIELD_ID_SNAPSHOT_PACKAGE_NAME_HASH = 5;
const int FIELD_ID_SNAPSHOT_TIMESTAMP = 1;
const int FIELD_ID_SNAPSHOT_PACKAGE_INFO = 2;
const int FIELD_ID_SNAPSHOTS = 1;
@@ -56,6 +59,7 @@
const int FIELD_ID_CHANGE_UID = 4;
const int FIELD_ID_CHANGE_NEW_VERSION = 5;
const int FIELD_ID_CHANGE_PREV_VERSION = 6;
+const int FIELD_ID_CHANGE_PACKAGE_HASH = 7;
UidMap::UidMap() : mBytesUsed(0) {}
@@ -312,7 +316,7 @@
}
void UidMap::appendUidMap(const int64_t& timestamp, const ConfigKey& key,
- ProtoOutputStream* proto) {
+ std::set<string> *str_set, ProtoOutputStream* proto) {
lock_guard<mutex> lock(mMutex); // Lock for updates
for (const ChangeRecord& record : mChanges) {
@@ -322,7 +326,14 @@
proto->write(FIELD_TYPE_BOOL | FIELD_ID_CHANGE_DELETION, (bool)record.deletion);
proto->write(FIELD_TYPE_INT64 | FIELD_ID_CHANGE_TIMESTAMP,
(long long)record.timestampNs);
- proto->write(FIELD_TYPE_STRING | FIELD_ID_CHANGE_PACKAGE, record.package);
+ if (str_set != nullptr) {
+ str_set->insert(record.package);
+ proto->write(FIELD_TYPE_UINT64 | FIELD_ID_CHANGE_PACKAGE_HASH,
+ (long long)Hash64(record.package));
+ } else {
+ proto->write(FIELD_TYPE_STRING | FIELD_ID_CHANGE_PACKAGE, record.package);
+ }
+
proto->write(FIELD_TYPE_INT32 | FIELD_ID_CHANGE_UID, (int)record.uid);
proto->write(FIELD_TYPE_INT64 | FIELD_ID_CHANGE_NEW_VERSION, (long long)record.version);
proto->write(FIELD_TYPE_INT64 | FIELD_ID_CHANGE_PREV_VERSION,
@@ -338,7 +349,15 @@
for (const auto& kv : mMap) {
uint64_t token = proto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED |
FIELD_ID_SNAPSHOT_PACKAGE_INFO);
- proto->write(FIELD_TYPE_STRING | FIELD_ID_SNAPSHOT_PACKAGE_NAME, kv.first.second);
+
+ if (str_set != nullptr) {
+ str_set->insert(kv.first.second);
+ proto->write(FIELD_TYPE_UINT64 | FIELD_ID_SNAPSHOT_PACKAGE_NAME_HASH,
+ (long long)Hash64(kv.first.second));
+ } else {
+ proto->write(FIELD_TYPE_STRING | FIELD_ID_SNAPSHOT_PACKAGE_NAME, kv.first.second);
+ }
+
proto->write(FIELD_TYPE_INT64 | FIELD_ID_SNAPSHOT_PACKAGE_VERSION,
(long long)kv.second.versionCode);
proto->write(FIELD_TYPE_INT32 | FIELD_ID_SNAPSHOT_PACKAGE_UID, kv.first.first);
diff --git a/cmds/statsd/src/packages/UidMap.h b/cmds/statsd/src/packages/UidMap.h
index 755b707..5e42cd1 100644
--- a/cmds/statsd/src/packages/UidMap.h
+++ b/cmds/statsd/src/packages/UidMap.h
@@ -128,7 +128,7 @@
// If every config key has received a change or snapshot record, then this
// record is deleted.
void appendUidMap(const int64_t& timestamp, const ConfigKey& key,
- util::ProtoOutputStream* proto);
+ std::set<string> *str_set, util::ProtoOutputStream* proto);
// Forces the output to be cleared. We still generate a snapshot based on the current state.
// This results in extra data uploaded but helps us reconstruct the uid mapping on the server
diff --git a/cmds/statsd/src/stats_log.proto b/cmds/statsd/src/stats_log.proto
index 447e4b7..9236864 100644
--- a/cmds/statsd/src/stats_log.proto
+++ b/cmds/statsd/src/stats_log.proto
@@ -33,6 +33,7 @@
bool value_bool = 5;
float value_float = 6;
DimensionsValueTuple value_tuple = 7;
+ uint64 value_str_hash = 8;
}
}
@@ -54,6 +55,12 @@
optional int64 end_bucket_elapsed_nanos = 2;
optional int64 count = 3;
+
+ optional int64 bucket_num = 4;
+
+ optional int64 start_bucket_elapsed_millis = 5;
+
+ optional int64 end_bucket_elapsed_millis = 6;
}
message CountMetricData {
@@ -62,6 +69,10 @@
optional DimensionsValue dimensions_in_condition = 2;
repeated CountBucketInfo bucket_info = 3;
+
+ repeated DimensionsValue dimension_leaf_values_in_what = 4;
+
+ repeated DimensionsValue dimension_leaf_values_in_condition = 5;
}
message DurationBucketInfo {
@@ -70,6 +81,12 @@
optional int64 end_bucket_elapsed_nanos = 2;
optional int64 duration_nanos = 3;
+
+ optional int64 bucket_num = 4;
+
+ optional int64 start_bucket_elapsed_millis = 5;
+
+ optional int64 end_bucket_elapsed_millis = 6;
}
message DurationMetricData {
@@ -78,6 +95,10 @@
optional DimensionsValue dimensions_in_condition = 2;
repeated DurationBucketInfo bucket_info = 3;
+
+ repeated DimensionsValue dimension_leaf_values_in_what = 4;
+
+ repeated DimensionsValue dimension_leaf_values_in_condition = 5;
}
message ValueBucketInfo {
@@ -86,6 +107,12 @@
optional int64 end_bucket_elapsed_nanos = 2;
optional int64 value = 3;
+
+ optional int64 bucket_num = 4;
+
+ optional int64 start_bucket_elapsed_millis = 5;
+
+ optional int64 end_bucket_elapsed_millis = 6;
}
message ValueMetricData {
@@ -94,6 +121,10 @@
optional DimensionsValue dimensions_in_condition = 2;
repeated ValueBucketInfo bucket_info = 3;
+
+ repeated DimensionsValue dimension_leaf_values_in_what = 4;
+
+ repeated DimensionsValue dimension_leaf_values_in_condition = 5;
}
message GaugeBucketInfo {
@@ -106,6 +137,12 @@
repeated int64 elapsed_timestamp_nanos = 4;
repeated int64 wall_clock_timestamp_nanos = 5;
+
+ optional int64 bucket_num = 6;
+
+ optional int64 start_bucket_elapsed_millis = 7;
+
+ optional int64 end_bucket_elapsed_millis = 8;
}
message GaugeMetricData {
@@ -114,6 +151,10 @@
optional DimensionsValue dimensions_in_condition = 2;
repeated GaugeBucketInfo bucket_info = 3;
+
+ repeated DimensionsValue dimension_leaf_values_in_what = 4;
+
+ repeated DimensionsValue dimension_leaf_values_in_condition = 5;
}
message StatsLogReport {
@@ -122,8 +163,10 @@
// Fields 2 and 3 are reserved.
message SkippedBuckets {
- optional int64 start_elapsed_nanos = 1;
- optional int64 end_elapsed_nanos = 2;
+ optional int64 start_bucket_elapsed_nanos = 1;
+ optional int64 end_bucket_elapsed_nanos = 2;
+ optional int64 start_bucket_elapsed_millis = 3;
+ optional int64 end_bucket_elapsed_millis = 4;
}
message EventMetricDataWrapper {
@@ -152,6 +195,14 @@
ValueMetricDataWrapper value_metrics = 7;
GaugeMetricDataWrapper gauge_metrics = 8;
}
+
+ optional int64 time_base_elapsed_nano_seconds = 9;
+
+ optional int64 bucket_size_nano_seconds = 10;
+
+ optional DimensionsValue dimensions_path_in_what = 11;
+
+ optional DimensionsValue dimensions_path_in_condition = 12;
}
message UidMapping {
@@ -164,6 +215,8 @@
optional int32 uid = 3;
optional bool deleted = 4;
+
+ optional uint64 name_hash = 5;
}
optional int64 elapsed_timestamp_nanos = 1;
@@ -180,6 +233,7 @@
optional int64 new_version = 5;
optional int64 prev_version = 6;
+ optional uint64 app_hash = 7;
}
repeated Change changes = 2;
}
@@ -197,6 +251,12 @@
optional int64 current_report_wall_clock_nanos = 6;
+ message Annotation {
+ optional int64 field_int64 = 1;
+ optional int32 field_int32 = 2;
+ }
+ repeated Annotation annotation = 7;
+
enum DumpReportReason {
DEVICE_SHUTDOWN = 1;
CONFIG_UPDATED = 2;
@@ -208,11 +268,7 @@
}
optional DumpReportReason dump_report_reason = 8;
- message Annotation {
- optional int64 field_int64 = 1;
- optional int32 field_int32 = 2;
- }
- repeated Annotation annotation = 7;
+ repeated string strings = 9;
}
message ConfigMetricsReportList {
diff --git a/cmds/statsd/src/stats_log_util.cpp b/cmds/statsd/src/stats_log_util.cpp
index efd810f..a0ab3e4 100644
--- a/cmds/statsd/src/stats_log_util.cpp
+++ b/cmds/statsd/src/stats_log_util.cpp
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include "hash.h"
#include "stats_log_util.h"
#include <logd/LogEvent.h>
@@ -29,6 +30,8 @@
using android::util::FIELD_TYPE_FLOAT;
using android::util::FIELD_TYPE_INT32;
using android::util::FIELD_TYPE_INT64;
+using android::util::FIELD_TYPE_UINT64;
+using android::util::FIELD_TYPE_FIXED64;
using android::util::FIELD_TYPE_MESSAGE;
using android::util::FIELD_TYPE_STRING;
using android::util::ProtoOutputStream;
@@ -45,6 +48,7 @@
// const int DIMENSIONS_VALUE_VALUE_BOOL = 5; // logd doesn't have bool data type.
const int DIMENSIONS_VALUE_VALUE_FLOAT = 6;
const int DIMENSIONS_VALUE_VALUE_TUPLE = 7;
+const int DIMENSIONS_VALUE_VALUE_STR_HASH = 8;
const int DIMENSIONS_VALUE_TUPLE_VALUE = 1;
@@ -54,10 +58,12 @@
const int FIELD_ID_TOTAL_PULL = 2;
const int FIELD_ID_TOTAL_PULL_FROM_CACHE = 3;
const int FIELD_ID_MIN_PULL_INTERVAL_SEC = 4;
+
namespace {
void writeDimensionToProtoHelper(const std::vector<FieldValue>& dims, size_t* index, int depth,
- int prefix, ProtoOutputStream* protoOutput) {
+ int prefix, std::set<string> *str_set,
+ ProtoOutputStream* protoOutput) {
size_t count = dims.size();
while (*index < count) {
const auto& dim = dims[*index];
@@ -87,8 +93,15 @@
dim.mValue.float_value);
break;
case STRING:
- protoOutput->write(FIELD_TYPE_STRING | DIMENSIONS_VALUE_VALUE_STR,
- dim.mValue.str_value);
+ if (str_set == nullptr) {
+ protoOutput->write(FIELD_TYPE_STRING | DIMENSIONS_VALUE_VALUE_STR,
+ dim.mValue.str_value);
+ } else {
+ str_set->insert(dim.mValue.str_value);
+ protoOutput->write(
+ FIELD_TYPE_UINT64 | DIMENSIONS_VALUE_VALUE_STR_HASH,
+ (long long)Hash64(dim.mValue.str_value));
+ }
break;
default:
break;
@@ -105,7 +118,107 @@
uint64_t tupleToken =
protoOutput->start(FIELD_TYPE_MESSAGE | DIMENSIONS_VALUE_VALUE_TUPLE);
writeDimensionToProtoHelper(dims, index, valueDepth, dim.mField.getPrefix(valueDepth),
- protoOutput);
+ str_set, protoOutput);
+ protoOutput->end(tupleToken);
+ protoOutput->end(dimensionToken);
+ } else {
+ // Done with the prev sub tree
+ return;
+ }
+ }
+}
+
+void writeDimensionLeafToProtoHelper(const std::vector<FieldValue>& dims,
+ const int dimensionLeafField,
+ size_t* index, int depth,
+ int prefix, std::set<string> *str_set,
+ ProtoOutputStream* protoOutput) {
+ size_t count = dims.size();
+ while (*index < count) {
+ const auto& dim = dims[*index];
+ const int valueDepth = dim.mField.getDepth();
+ const int valuePrefix = dim.mField.getPrefix(depth);
+ if (valueDepth > 2) {
+ ALOGE("Depth > 2 not supported");
+ return;
+ }
+
+ if (depth == valueDepth && valuePrefix == prefix) {
+ uint64_t token = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED |
+ dimensionLeafField);
+ switch (dim.mValue.getType()) {
+ case INT:
+ protoOutput->write(FIELD_TYPE_INT32 | DIMENSIONS_VALUE_VALUE_INT,
+ dim.mValue.int_value);
+ break;
+ case LONG:
+ protoOutput->write(FIELD_TYPE_INT64 | DIMENSIONS_VALUE_VALUE_LONG,
+ (long long)dim.mValue.long_value);
+ break;
+ case FLOAT:
+ protoOutput->write(FIELD_TYPE_FLOAT | DIMENSIONS_VALUE_VALUE_FLOAT,
+ dim.mValue.float_value);
+ break;
+ case STRING:
+ if (str_set == nullptr) {
+ protoOutput->write(FIELD_TYPE_STRING | DIMENSIONS_VALUE_VALUE_STR,
+ dim.mValue.str_value);
+ } else {
+ str_set->insert(dim.mValue.str_value);
+ protoOutput->write(
+ FIELD_TYPE_UINT64 | DIMENSIONS_VALUE_VALUE_STR_HASH,
+ (long long)Hash64(dim.mValue.str_value));
+ }
+ break;
+ default:
+ break;
+ }
+ if (token != 0) {
+ protoOutput->end(token);
+ }
+ (*index)++;
+ } else if (valueDepth > depth && valuePrefix == prefix) {
+ writeDimensionLeafToProtoHelper(dims, dimensionLeafField,
+ index, valueDepth, dim.mField.getPrefix(valueDepth),
+ str_set, protoOutput);
+ } else {
+ // Done with the prev sub tree
+ return;
+ }
+ }
+}
+
+void writeDimensionPathToProtoHelper(const std::vector<Matcher>& fieldMatchers,
+ size_t* index, int depth, int prefix,
+ ProtoOutputStream* protoOutput) {
+ size_t count = fieldMatchers.size();
+ while (*index < count) {
+ const Field& field = fieldMatchers[*index].mMatcher;
+ const int valueDepth = field.getDepth();
+ const int valuePrefix = field.getPrefix(depth);
+ const int fieldNum = field.getPosAtDepth(depth);
+ if (valueDepth > 2) {
+ ALOGE("Depth > 2 not supported");
+ return;
+ }
+
+ if (depth == valueDepth && valuePrefix == prefix) {
+ uint64_t token = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED |
+ DIMENSIONS_VALUE_TUPLE_VALUE);
+ protoOutput->write(FIELD_TYPE_INT32 | DIMENSIONS_VALUE_FIELD, fieldNum);
+ if (token != 0) {
+ protoOutput->end(token);
+ }
+ (*index)++;
+ } else if (valueDepth > depth && valuePrefix == prefix) {
+ // Writing the sub tree
+ uint64_t dimensionToken = protoOutput->start(
+ FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | DIMENSIONS_VALUE_TUPLE_VALUE);
+ protoOutput->write(FIELD_TYPE_INT32 | DIMENSIONS_VALUE_FIELD, fieldNum);
+ uint64_t tupleToken =
+ protoOutput->start(FIELD_TYPE_MESSAGE | DIMENSIONS_VALUE_VALUE_TUPLE);
+ writeDimensionPathToProtoHelper(fieldMatchers, index, valueDepth,
+ field.getPrefix(valueDepth), protoOutput);
protoOutput->end(tupleToken);
protoOutput->end(dimensionToken);
} else {
@@ -117,7 +230,8 @@
} // namespace
-void writeDimensionToProto(const HashableDimensionKey& dimension, ProtoOutputStream* protoOutput) {
+void writeDimensionToProto(const HashableDimensionKey& dimension, std::set<string> *str_set,
+ ProtoOutputStream* protoOutput) {
if (dimension.getValues().size() == 0) {
return;
}
@@ -125,7 +239,32 @@
dimension.getValues()[0].mField.getTag());
uint64_t topToken = protoOutput->start(FIELD_TYPE_MESSAGE | DIMENSIONS_VALUE_VALUE_TUPLE);
size_t index = 0;
- writeDimensionToProtoHelper(dimension.getValues(), &index, 0, 0, protoOutput);
+ writeDimensionToProtoHelper(dimension.getValues(), &index, 0, 0, str_set, protoOutput);
+ protoOutput->end(topToken);
+}
+
+void writeDimensionLeafNodesToProto(const HashableDimensionKey& dimension,
+ const int dimensionLeafFieldId,
+ std::set<string> *str_set,
+ ProtoOutputStream* protoOutput) {
+ if (dimension.getValues().size() == 0) {
+ return;
+ }
+ size_t index = 0;
+ writeDimensionLeafToProtoHelper(dimension.getValues(), dimensionLeafFieldId,
+ &index, 0, 0, str_set, protoOutput);
+}
+
+void writeDimensionPathToProto(const std::vector<Matcher>& fieldMatchers,
+ ProtoOutputStream* protoOutput) {
+ if (fieldMatchers.size() == 0) {
+ return;
+ }
+ protoOutput->write(FIELD_TYPE_INT32 | DIMENSIONS_VALUE_FIELD,
+ fieldMatchers[0].mMatcher.getTag());
+ uint64_t topToken = protoOutput->start(FIELD_TYPE_MESSAGE | DIMENSIONS_VALUE_VALUE_TUPLE);
+ size_t index = 0;
+ writeDimensionPathToProtoHelper(fieldMatchers, &index, 0, 0, protoOutput);
protoOutput->end(topToken);
}
@@ -297,6 +436,14 @@
return timestampNs / NS_PER_SEC / (5 * 60) * NS_PER_SEC * (5 * 60);
}
+int64_t NanoToMillis(const int64_t nano) {
+ return nano / 1000000;
+}
+
+int64_t MillisToNano(const int64_t millis) {
+ return millis * 1000000;
+}
+
} // namespace statsd
} // namespace os
} // namespace android
diff --git a/cmds/statsd/src/stats_log_util.h b/cmds/statsd/src/stats_log_util.h
index 9722050..b8f6850 100644
--- a/cmds/statsd/src/stats_log_util.h
+++ b/cmds/statsd/src/stats_log_util.h
@@ -28,9 +28,17 @@
void writeFieldValueTreeToStream(int tagId, const std::vector<FieldValue>& values,
util::ProtoOutputStream* protoOutput);
-void writeDimensionToProto(const HashableDimensionKey& dimension,
+void writeDimensionToProto(const HashableDimensionKey& dimension, std::set<string> *str_set,
util::ProtoOutputStream* protoOutput);
+void writeDimensionLeafNodesToProto(const HashableDimensionKey& dimension,
+ const int dimensionLeafFieldId,
+ std::set<string> *str_set,
+ util::ProtoOutputStream* protoOutput);
+
+void writeDimensionPathToProto(const std::vector<Matcher>& fieldMatchers,
+ util::ProtoOutputStream* protoOutput);
+
// Convert the TimeUnit enum to the bucket size in millis with a guardrail on
// bucket size.
int64_t TimeUnitToBucketSizeInMillisGuardrailed(int uid, TimeUnit unit);
@@ -56,6 +64,10 @@
// Gets the wall clock timestamp in seconds.
int64_t getWallClockSec();
+int64_t NanoToMillis(const int64_t nano);
+
+int64_t MillisToNano(const int64_t millis);
+
// Helper function to write PulledAtomStats to ProtoOutputStream
void writePullerStatsToStream(const std::pair<int, StatsdStats::PulledAtomStats>& pair,
util::ProtoOutputStream* protoOutput);
diff --git a/cmds/statsd/tests/FieldValue_test.cpp b/cmds/statsd/tests/FieldValue_test.cpp
index 5a6aba6..c253bc1 100644
--- a/cmds/statsd/tests/FieldValue_test.cpp
+++ b/cmds/statsd/tests/FieldValue_test.cpp
@@ -226,6 +226,68 @@
EXPECT_EQ((int32_t)27, link.conditionFields[0].mMatcher.getTag());
}
+TEST(AtomMatcherTest, TestWriteDimensionPath) {
+ for (auto position : {Position::ANY, Position::ALL, Position::FIRST, Position::LAST}) {
+ FieldMatcher matcher1;
+ matcher1.set_field(10);
+ FieldMatcher* child = matcher1.add_child();
+ child->set_field(2);
+ child->set_position(position);
+ child->add_child()->set_field(1);
+ child->add_child()->set_field(3);
+
+ child = matcher1.add_child();
+ child->set_field(4);
+
+ child = matcher1.add_child();
+ child->set_field(6);
+ child->add_child()->set_field(2);
+
+ vector<Matcher> matchers;
+ translateFieldMatcher(matcher1, &matchers);
+
+ android::util::ProtoOutputStream protoOut;
+ writeDimensionPathToProto(matchers, &protoOut);
+
+ vector<uint8_t> outData;
+ outData.resize(protoOut.size());
+ size_t pos = 0;
+ auto iter = protoOut.data();
+ while (iter.readBuffer() != NULL) {
+ size_t toRead = iter.currentToRead();
+ std::memcpy(&(outData[pos]), iter.readBuffer(), toRead);
+ pos += toRead;
+ iter.rp()->move(toRead);
+ }
+
+ DimensionsValue result;
+ EXPECT_EQ(true, result.ParseFromArray(&outData[0], outData.size()));
+
+ EXPECT_EQ(10, result.field());
+ EXPECT_EQ(DimensionsValue::ValueCase::kValueTuple, result.value_case());
+ EXPECT_EQ(3, result.value_tuple().dimensions_value_size());
+
+ const auto& dim1 = result.value_tuple().dimensions_value(0);
+ EXPECT_EQ(2, dim1.field());
+ EXPECT_EQ(2, dim1.value_tuple().dimensions_value_size());
+
+ const auto& dim11 = dim1.value_tuple().dimensions_value(0);
+ EXPECT_EQ(1, dim11.field());
+
+ const auto& dim12 = dim1.value_tuple().dimensions_value(1);
+ EXPECT_EQ(3, dim12.field());
+
+ const auto& dim2 = result.value_tuple().dimensions_value(1);
+ EXPECT_EQ(4, dim2.field());
+
+ const auto& dim3 = result.value_tuple().dimensions_value(2);
+ EXPECT_EQ(6, dim3.field());
+ EXPECT_EQ(1, dim3.value_tuple().dimensions_value_size());
+ const auto& dim31 = dim3.value_tuple().dimensions_value(0);
+ EXPECT_EQ(2, dim31.field());
+ }
+}
+
TEST(AtomMatcherTest, TestSubscriberDimensionWrite) {
HashableDimensionKey dim;
@@ -275,7 +337,7 @@
dim.addValue(FieldValue(field4, value4));
android::util::ProtoOutputStream protoOut;
- writeDimensionToProto(dim, &protoOut);
+ writeDimensionToProto(dim, nullptr /* include strings */, &protoOut);
vector<uint8_t> outData;
outData.resize(protoOut.size());
@@ -315,6 +377,62 @@
EXPECT_EQ(99999, dim2.value_int());
}
+TEST(AtomMatcherTest, TestWriteDimensionLeafNodesToProto) {
+ HashableDimensionKey dim;
+ int pos1[] = {1, 1, 1};
+ int pos2[] = {1, 1, 2};
+ int pos3[] = {1, 1, 3};
+ int pos4[] = {2, 0, 0};
+ Field field1(10, pos1, 2);
+ Field field2(10, pos2, 2);
+ Field field3(10, pos3, 2);
+ Field field4(10, pos4, 0);
+
+ Value value1((int32_t)10025);
+ Value value2("tag");
+ Value value3((int32_t)987654);
+ Value value4((int64_t)99999);
+
+ dim.addValue(FieldValue(field1, value1));
+ dim.addValue(FieldValue(field2, value2));
+ dim.addValue(FieldValue(field3, value3));
+ dim.addValue(FieldValue(field4, value4));
+
+ android::util::ProtoOutputStream protoOut;
+ writeDimensionLeafNodesToProto(dim, 1, nullptr /* include strings */, &protoOut);
+
+ vector<uint8_t> outData;
+ outData.resize(protoOut.size());
+ size_t pos = 0;
+ auto iter = protoOut.data();
+ while (iter.readBuffer() != NULL) {
+ size_t toRead = iter.currentToRead();
+ std::memcpy(&(outData[pos]), iter.readBuffer(), toRead);
+ pos += toRead;
+ iter.rp()->move(toRead);
+ }
+
+ DimensionsValueTuple result;
+ EXPECT_EQ(true, result.ParseFromArray(&outData[0], outData.size()));
+ EXPECT_EQ(4, result.dimensions_value_size());
+
+ const auto& dim1 = result.dimensions_value(0);
+ EXPECT_EQ(DimensionsValue::ValueCase::kValueInt, dim1.value_case());
+ EXPECT_EQ(10025, dim1.value_int());
+
+ const auto& dim2 = result.dimensions_value(1);
+ EXPECT_EQ(DimensionsValue::ValueCase::kValueStr, dim2.value_case());
+ EXPECT_EQ("tag", dim2.value_str());
+
+ const auto& dim3 = result.dimensions_value(2);
+ EXPECT_EQ(DimensionsValue::ValueCase::kValueInt, dim3.value_case());
+ EXPECT_EQ(987654, dim3.value_int());
+
+ const auto& dim4 = result.dimensions_value(3);
+ EXPECT_EQ(DimensionsValue::ValueCase::kValueLong, dim4.value_case());
+ EXPECT_EQ(99999, dim4.value_long());
+}
+
TEST(AtomMatcherTest, TestWriteAtomToProto) {
AttributionNodeInternal attribution_node1;
attribution_node1.set_uid(1111);
diff --git a/cmds/statsd/tests/StatsLogProcessor_test.cpp b/cmds/statsd/tests/StatsLogProcessor_test.cpp
index 004b235..9fdf7a3 100644
--- a/cmds/statsd/tests/StatsLogProcessor_test.cpp
+++ b/cmds/statsd/tests/StatsLogProcessor_test.cpp
@@ -139,7 +139,7 @@
// Expect to get no metrics, but snapshot specified above in uidmap.
vector<uint8_t> bytes;
- p.onDumpReport(key, 1, false, ADB_DUMP, &bytes);
+ p.onDumpReport(key, 1, false, true, ADB_DUMP, &bytes);
ConfigMetricsReportList output;
output.ParseFromArray(bytes.data(), bytes.size());
@@ -167,7 +167,7 @@
// Expect to get no metrics, but snapshot specified above in uidmap.
vector<uint8_t> bytes;
- p.onDumpReport(key, 1, false, ADB_DUMP, &bytes);
+ p.onDumpReport(key, 1, false, true, ADB_DUMP, &bytes);
ConfigMetricsReportList output;
output.ParseFromArray(bytes.data(), bytes.size());
diff --git a/cmds/statsd/tests/UidMap_test.cpp b/cmds/statsd/tests/UidMap_test.cpp
index 2fab975..dde50c2 100644
--- a/cmds/statsd/tests/UidMap_test.cpp
+++ b/cmds/statsd/tests/UidMap_test.cpp
@@ -17,6 +17,7 @@
#include "config/ConfigKey.h"
#include "guardrail/StatsdStats.h"
#include "logd/LogEvent.h"
+#include "hash.h"
#include "statslog.h"
#include "statsd_test_util.h"
@@ -192,7 +193,7 @@
m.mLastUpdatePerConfigKey[config1] = 2;
ProtoOutputStream proto;
- m.appendUidMap(3, config1, &proto);
+ m.appendUidMap(3, config1, nullptr, &proto);
// Check there's still a uidmap attached this one.
UidMapping results;
@@ -215,7 +216,7 @@
m.removeApp(2, String16(kApp2.c_str()), 1000);
ProtoOutputStream proto;
- m.appendUidMap(3, config1, &proto);
+ m.appendUidMap(3, config1, nullptr, &proto);
// Snapshot should still contain this item as deleted.
UidMapping results;
@@ -243,7 +244,7 @@
// First, verify that we have the expected number of items.
UidMapping results;
ProtoOutputStream proto;
- m.appendUidMap(3, config1, &proto);
+ m.appendUidMap(3, config1, nullptr, &proto);
protoOutputStreamToUidMapping(&proto, &results);
EXPECT_EQ(maxDeletedApps + 10, results.snapshots(0).package_info_size());
@@ -254,7 +255,7 @@
}
proto.clear();
- m.appendUidMap(5, config1, &proto);
+ m.appendUidMap(5, config1, nullptr, &proto);
// Snapshot drops the first nine items.
protoOutputStreamToUidMapping(&proto, &results);
EXPECT_EQ(maxDeletedApps, results.snapshots(0).package_info_size());
@@ -280,14 +281,14 @@
m.updateMap(1, uids, versions, apps);
ProtoOutputStream proto;
- m.appendUidMap(2, config1, &proto);
+ m.appendUidMap(2, config1, nullptr, &proto);
UidMapping results;
protoOutputStreamToUidMapping(&proto, &results);
EXPECT_EQ(1, results.snapshots_size());
// We have to keep at least one snapshot in memory at all times.
proto.clear();
- m.appendUidMap(2, config1, &proto);
+ m.appendUidMap(2, config1, nullptr, &proto);
protoOutputStreamToUidMapping(&proto, &results);
EXPECT_EQ(1, results.snapshots_size());
@@ -296,7 +297,7 @@
m.updateApp(5, String16(kApp1.c_str()), 1000, 40);
EXPECT_EQ(1U, m.mChanges.size());
proto.clear();
- m.appendUidMap(6, config1, &proto);
+ m.appendUidMap(6, config1, nullptr, &proto);
protoOutputStreamToUidMapping(&proto, &results);
EXPECT_EQ(1, results.snapshots_size());
EXPECT_EQ(1, results.changes_size());
@@ -308,14 +309,14 @@
// We still can't remove anything.
proto.clear();
- m.appendUidMap(8, config1, &proto);
+ m.appendUidMap(8, config1, nullptr, &proto);
protoOutputStreamToUidMapping(&proto, &results);
EXPECT_EQ(1, results.snapshots_size());
EXPECT_EQ(1, results.changes_size());
EXPECT_EQ(2U, m.mChanges.size());
proto.clear();
- m.appendUidMap(9, config2, &proto);
+ m.appendUidMap(9, config2, nullptr, &proto);
protoOutputStreamToUidMapping(&proto, &results);
EXPECT_EQ(1, results.snapshots_size());
EXPECT_EQ(2, results.changes_size());
@@ -342,10 +343,10 @@
ProtoOutputStream proto;
vector<uint8_t> bytes;
- m.appendUidMap(2, config1, &proto);
+ m.appendUidMap(2, config1, nullptr, &proto);
size_t prevBytes = m.mBytesUsed;
- m.appendUidMap(4, config1, &proto);
+ m.appendUidMap(4, config1, nullptr, &proto);
EXPECT_TRUE(m.mBytesUsed < prevBytes);
}
@@ -376,6 +377,7 @@
m.updateApp(5, String16("EXTREMELY_LONG_STRING_FOR_APP_TO_WASTE_MEMORY.0"), 1000, 4);
EXPECT_EQ(1U, m.mChanges.size());
}
+
#else
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif
diff --git a/cmds/statsd/tests/e2e/Attribution_e2e_test.cpp b/cmds/statsd/tests/e2e/Attribution_e2e_test.cpp
index 3b24341..5c47af7 100644
--- a/cmds/statsd/tests/e2e/Attribution_e2e_test.cpp
+++ b/cmds/statsd/tests/e2e/Attribution_e2e_test.cpp
@@ -144,10 +144,13 @@
}
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 4 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 4 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
@@ -287,10 +290,13 @@
}
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 4 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 4 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
diff --git a/cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_AND_cond_test.cpp b/cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_AND_cond_test.cpp
index 934b951..8a74f2d 100644
--- a/cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_AND_cond_test.cpp
+++ b/cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_AND_cond_test.cpp
@@ -172,10 +172,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false,
- ADB_DUMP, &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1,
+ false, true, ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
@@ -489,10 +492,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false,
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
@@ -733,10 +739,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
diff --git a/cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_OR_cond_test.cpp b/cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_OR_cond_test.cpp
index 9f20754..d4fe712 100644
--- a/cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_OR_cond_test.cpp
+++ b/cmds/statsd/tests/e2e/DimensionInCondition_e2e_combination_OR_cond_test.cpp
@@ -130,10 +130,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
@@ -343,10 +346,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
@@ -524,10 +530,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
@@ -723,10 +732,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
diff --git a/cmds/statsd/tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp b/cmds/statsd/tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp
index 3f193ac..97089ca 100644
--- a/cmds/statsd/tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp
+++ b/cmds/statsd/tests/e2e/DimensionInCondition_e2e_simple_cond_test.cpp
@@ -142,10 +142,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false,
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
@@ -434,10 +437,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false,
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
@@ -652,10 +658,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
diff --git a/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp b/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp
index f4ad0ce..6a69100 100644
--- a/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp
+++ b/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp
@@ -122,10 +122,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, configAddedTimeNs + 7 * bucketSizeNs + 10, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, configAddedTimeNs + 7 * bucketSizeNs + 10, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(1, reports.reports_size());
EXPECT_EQ(1, reports.reports(0).metrics_size());
StatsLogReport::GaugeMetricDataWrapper gaugeMetrics;
@@ -241,10 +244,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, configAddedTimeNs + 8 * bucketSizeNs + 10, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, configAddedTimeNs + 8 * bucketSizeNs + 10, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(1, reports.reports_size());
EXPECT_EQ(1, reports.reports(0).metrics_size());
StatsLogReport::GaugeMetricDataWrapper gaugeMetrics;
@@ -342,10 +348,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, configAddedTimeNs + 7 * bucketSizeNs + 10, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, configAddedTimeNs + 7 * bucketSizeNs + 10, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(1, reports.reports_size());
EXPECT_EQ(1, reports.reports(0).metrics_size());
StatsLogReport::GaugeMetricDataWrapper gaugeMetrics;
diff --git a/cmds/statsd/tests/e2e/GaugeMetric_e2e_push_test.cpp b/cmds/statsd/tests/e2e/GaugeMetric_e2e_push_test.cpp
index 98372ff..f1052f6 100644
--- a/cmds/statsd/tests/e2e/GaugeMetric_e2e_push_test.cpp
+++ b/cmds/statsd/tests/e2e/GaugeMetric_e2e_push_test.cpp
@@ -149,10 +149,13 @@
}
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 3 * bucketSizeNs, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 3 * bucketSizeNs, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(1, reports.reports_size());
EXPECT_EQ(1, reports.reports(0).metrics_size());
StatsLogReport::GaugeMetricDataWrapper gaugeMetrics;
diff --git a/cmds/statsd/tests/e2e/MetricConditionLink_e2e_test.cpp b/cmds/statsd/tests/e2e/MetricConditionLink_e2e_test.cpp
index 8020787..eca35c5 100644
--- a/cmds/statsd/tests/e2e/MetricConditionLink_e2e_test.cpp
+++ b/cmds/statsd/tests/e2e/MetricConditionLink_e2e_test.cpp
@@ -200,10 +200,13 @@
}
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs - 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs - 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
EXPECT_EQ(reports.reports(0).metrics(0).count_metrics().data_size(), 1);
@@ -316,10 +319,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
EXPECT_EQ(reports.reports(0).metrics(0).count_metrics().data_size(), 1);
diff --git a/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp b/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp
index d646f73..545fa01 100644
--- a/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp
+++ b/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp
@@ -46,7 +46,7 @@
IPCThreadState* ipc = IPCThreadState::self();
ConfigKey configKey(ipc->getCallingUid(), kConfigKey);
processor->onDumpReport(configKey, timestamp, include_current /* include_current_bucket*/,
- ADB_DUMP, &output);
+ true/* include strings*/, ADB_DUMP, &output);
ConfigMetricsReportList reports;
reports.ParseFromArray(output.data(), output.size());
EXPECT_EQ(1, reports.reports_size());
@@ -153,7 +153,12 @@
service.mProcessor->OnLogEvent(CreateAppCrashEvent(100, start + 3).get());
ConfigMetricsReport report = GetReports(service.mProcessor, start + 4);
+ backfillStartEndTimestamp(&report);
EXPECT_EQ(1, report.metrics_size());
+ EXPECT_TRUE(report.metrics(0).count_metrics().data(0).bucket_info(0).
+ has_start_bucket_elapsed_nanos());
+ EXPECT_TRUE(report.metrics(0).count_metrics().data(0).bucket_info(0).
+ has_end_bucket_elapsed_nanos());
EXPECT_EQ(1, report.metrics(0).count_metrics().data(0).bucket_info(0).count());
}
@@ -171,7 +176,12 @@
service.mProcessor->OnLogEvent(CreateAppCrashEvent(100, start + 3).get());
ConfigMetricsReport report = GetReports(service.mProcessor, start + 4);
+ backfillStartEndTimestamp(&report);
EXPECT_EQ(1, report.metrics_size());
+ EXPECT_TRUE(report.metrics(0).count_metrics().data(0).bucket_info(0).
+ has_start_bucket_elapsed_nanos());
+ EXPECT_TRUE(report.metrics(0).count_metrics().data(0).bucket_info(0).
+ has_end_bucket_elapsed_nanos());
EXPECT_EQ(1, report.metrics(0).count_metrics().data(0).bucket_info(0).count());
}
@@ -206,10 +216,13 @@
ConfigMetricsReport report =
GetReports(service.mProcessor, 5 * 60 * NS_PER_SEC + start + 100 * NS_PER_SEC, true);
+ backfillStartEndTimestamp(&report);
EXPECT_EQ(1, report.metrics_size());
EXPECT_EQ(1, report.metrics(0).value_metrics().skipped_size());
+ EXPECT_TRUE(report.metrics(0).value_metrics().skipped(0).has_start_bucket_elapsed_nanos());
// Can't test the start time since it will be based on the actual time when the pulling occurs.
- EXPECT_EQ(endSkipped, report.metrics(0).value_metrics().skipped(0).end_elapsed_nanos());
+ EXPECT_EQ(MillisToNano(NanoToMillis(endSkipped)),
+ report.metrics(0).value_metrics().skipped(0).end_bucket_elapsed_nanos());
}
TEST(PartialBucketE2eTest, TestGaugeMetricWithoutMinPartialBucket) {
@@ -243,10 +256,13 @@
ConfigMetricsReport report =
GetReports(service.mProcessor, 5 * 60 * NS_PER_SEC + start + 100 * NS_PER_SEC, true);
+ backfillStartEndTimestamp(&report);
EXPECT_EQ(1, report.metrics_size());
EXPECT_EQ(1, report.metrics(0).gauge_metrics().skipped_size());
// Can't test the start time since it will be based on the actual time when the pulling occurs.
- EXPECT_EQ(endSkipped, report.metrics(0).gauge_metrics().skipped(0).end_elapsed_nanos());
+ EXPECT_TRUE(report.metrics(0).gauge_metrics().skipped(0).has_start_bucket_elapsed_nanos());
+ EXPECT_EQ(MillisToNano(NanoToMillis(endSkipped)),
+ report.metrics(0).gauge_metrics().skipped(0).end_bucket_elapsed_nanos());
}
#else
diff --git a/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp b/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp
index a01e91f..98a312f 100644
--- a/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp
+++ b/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp
@@ -117,10 +117,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, configAddedTimeNs + 7 * bucketSizeNs + 10, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, configAddedTimeNs + 7 * bucketSizeNs + 10, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(1, reports.reports_size());
EXPECT_EQ(1, reports.reports(0).metrics_size());
StatsLogReport::ValueMetricDataWrapper valueMetrics;
@@ -221,10 +224,13 @@
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, configAddedTimeNs + 9 * bucketSizeNs + 10, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, configAddedTimeNs + 9 * bucketSizeNs + 10, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(1, reports.reports_size());
EXPECT_EQ(1, reports.reports(0).metrics_size());
StatsLogReport::ValueMetricDataWrapper valueMetrics;
diff --git a/cmds/statsd/tests/e2e/WakelockDuration_e2e_test.cpp b/cmds/statsd/tests/e2e/WakelockDuration_e2e_test.cpp
index 974e442..6d1317c 100644
--- a/cmds/statsd/tests/e2e/WakelockDuration_e2e_test.cpp
+++ b/cmds/statsd/tests/e2e/WakelockDuration_e2e_test.cpp
@@ -127,10 +127,13 @@
FeedEvents(config, processor);
vector<uint8_t> buffer;
ConfigMetricsReportList reports;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs - 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs - 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
@@ -161,11 +164,13 @@
FeedEvents(config, processor);
vector<uint8_t> buffer;
ConfigMetricsReportList reports;
-
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
EXPECT_EQ(reports.reports(0).metrics(0).duration_metrics().data_size(), 1);
@@ -210,10 +215,13 @@
processor->OnLogEvent(event.get());
}
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 6 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 6 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
EXPECT_EQ(reports.reports(0).metrics(0).duration_metrics().data_size(), 1);
@@ -240,11 +248,14 @@
FeedEvents(config, processor);
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs - 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs - 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
@@ -266,10 +277,13 @@
FeedEvents(config, processor);
ConfigMetricsReportList reports;
vector<uint8_t> buffer;
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 2 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
EXPECT_EQ(reports.reports(0).metrics(0).duration_metrics().data_size(), 1);
@@ -309,10 +323,13 @@
processor->OnLogEvent(event.get());
}
- processor->onDumpReport(cfgKey, bucketStartTimeNs + 6 * bucketSizeNs + 1, false, ADB_DUMP,
- &buffer);
+ processor->onDumpReport(cfgKey, bucketStartTimeNs + 6 * bucketSizeNs + 1, false, true,
+ ADB_DUMP, &buffer);
EXPECT_TRUE(buffer.size() > 0);
EXPECT_TRUE(reports.ParseFromArray(&buffer[0], buffer.size()));
+ backfillDimensionPath(&reports);
+ backfillStringInReport(&reports);
+ backfillStartEndTimestamp(&reports);
EXPECT_EQ(reports.reports_size(), 1);
EXPECT_EQ(reports.reports(0).metrics_size(), 1);
EXPECT_EQ(reports.reports(0).metrics(0).duration_metrics().data_size(), 1);
diff --git a/cmds/statsd/tests/statsd_test_util.cpp b/cmds/statsd/tests/statsd_test_util.cpp
index 1264909..5903993 100644
--- a/cmds/statsd/tests/statsd_test_util.cpp
+++ b/cmds/statsd/tests/statsd_test_util.cpp
@@ -645,6 +645,183 @@
return LessThan(s1.dimInCondition, s2.dimInCondition);
}
+void backfillStringInDimension(const std::map<uint64_t, string>& str_map,
+ DimensionsValue* dimension) {
+ if (dimension->has_value_str_hash()) {
+ auto it = str_map.find((uint64_t)(dimension->value_str_hash()));
+ if (it != str_map.end()) {
+ dimension->clear_value_str_hash();
+ dimension->set_value_str(it->second);
+ } else {
+ ALOGE("Can not find the string hash: %llu",
+ (unsigned long long)dimension->value_str_hash());
+ }
+ } else if (dimension->has_value_tuple()) {
+ auto value_tuple = dimension->mutable_value_tuple();
+ for (int i = 0; i < value_tuple->dimensions_value_size(); ++i) {
+ backfillStringInDimension(str_map, value_tuple->mutable_dimensions_value(i));
+ }
+ }
+}
+
+void backfillStringInReport(ConfigMetricsReport *config_report) {
+ std::map<uint64_t, string> str_map;
+ for (const auto& str : config_report->strings()) {
+ uint64_t hash = Hash64(str);
+ if (str_map.find(hash) != str_map.end()) {
+ ALOGE("String hash conflicts: %s %s", str.c_str(), str_map[hash].c_str());
+ }
+ str_map[hash] = str;
+ }
+ for (int i = 0; i < config_report->metrics_size(); ++i) {
+ auto metric_report = config_report->mutable_metrics(i);
+ if (metric_report->has_count_metrics()) {
+ backfillStringInDimension(str_map, metric_report->mutable_count_metrics());
+ } else if (metric_report->has_duration_metrics()) {
+ backfillStringInDimension(str_map, metric_report->mutable_duration_metrics());
+ } else if (metric_report->has_gauge_metrics()) {
+ backfillStringInDimension(str_map, metric_report->mutable_gauge_metrics());
+ } else if (metric_report->has_value_metrics()) {
+ backfillStringInDimension(str_map, metric_report->mutable_value_metrics());
+ }
+ }
+ // Backfill the package names.
+ for (int i = 0 ; i < config_report->uid_map().snapshots_size(); ++i) {
+ auto snapshot = config_report->mutable_uid_map()->mutable_snapshots(i);
+ for (int j = 0 ; j < snapshot->package_info_size(); ++j) {
+ auto package_info = snapshot->mutable_package_info(j);
+ if (package_info->has_name_hash()) {
+ auto it = str_map.find((uint64_t)(package_info->name_hash()));
+ if (it != str_map.end()) {
+ package_info->clear_name_hash();
+ package_info->set_name(it->second);
+ } else {
+ ALOGE("Can not find the string package name hash: %llu",
+ (unsigned long long)package_info->name_hash());
+ }
+
+ }
+ }
+ }
+ // Backfill the app name in app changes.
+ for (int i = 0 ; i < config_report->uid_map().changes_size(); ++i) {
+ auto change = config_report->mutable_uid_map()->mutable_changes(i);
+ if (change->has_app_hash()) {
+ auto it = str_map.find((uint64_t)(change->app_hash()));
+ if (it != str_map.end()) {
+ change->clear_app_hash();
+ change->set_app(it->second);
+ } else {
+ ALOGE("Can not find the string change app name hash: %llu",
+ (unsigned long long)change->app_hash());
+ }
+ }
+ }
+}
+
+void backfillStringInReport(ConfigMetricsReportList *config_report_list) {
+ for (int i = 0; i < config_report_list->reports_size(); ++i) {
+ backfillStringInReport(config_report_list->mutable_reports(i));
+ }
+}
+
+bool backfillDimensionPath(const DimensionsValue& path,
+ const google::protobuf::RepeatedPtrField<DimensionsValue>& leafValues,
+ int* leafIndex,
+ DimensionsValue* dimension) {
+ dimension->set_field(path.field());
+ if (path.has_value_tuple()) {
+ for (int i = 0; i < path.value_tuple().dimensions_value_size(); ++i) {
+ if (!backfillDimensionPath(
+ path.value_tuple().dimensions_value(i), leafValues, leafIndex,
+ dimension->mutable_value_tuple()->add_dimensions_value())) {
+ return false;
+ }
+ }
+ } else {
+ if (*leafIndex < 0 || *leafIndex >= leafValues.size()) {
+ return false;
+ }
+ dimension->MergeFrom(leafValues.Get(*leafIndex));
+ (*leafIndex)++;
+ }
+ return true;
+}
+
+bool backfillDimensionPath(const DimensionsValue& path,
+ const google::protobuf::RepeatedPtrField<DimensionsValue>& leafValues,
+ DimensionsValue* dimension) {
+ int leafIndex = 0;
+ return backfillDimensionPath(path, leafValues, &leafIndex, dimension);
+}
+
+void backfillDimensionPath(ConfigMetricsReportList *config_report_list) {
+ for (int i = 0; i < config_report_list->reports_size(); ++i) {
+ auto report = config_report_list->mutable_reports(i);
+ for (int j = 0; j < report->metrics_size(); ++j) {
+ auto metric_report = report->mutable_metrics(j);
+ if (metric_report->has_dimensions_path_in_what() ||
+ metric_report->has_dimensions_path_in_condition()) {
+ auto whatPath = metric_report->dimensions_path_in_what();
+ auto conditionPath = metric_report->dimensions_path_in_condition();
+ if (metric_report->has_count_metrics()) {
+ backfillDimensionPath(whatPath, conditionPath,
+ metric_report->mutable_count_metrics());
+ } else if (metric_report->has_duration_metrics()) {
+ backfillDimensionPath(whatPath, conditionPath,
+ metric_report->mutable_duration_metrics());
+ } else if (metric_report->has_gauge_metrics()) {
+ backfillDimensionPath(whatPath, conditionPath,
+ metric_report->mutable_gauge_metrics());
+ } else if (metric_report->has_value_metrics()) {
+ backfillDimensionPath(whatPath, conditionPath,
+ metric_report->mutable_value_metrics());
+ }
+ metric_report->clear_dimensions_path_in_what();
+ metric_report->clear_dimensions_path_in_condition();
+ }
+ }
+ }
+}
+
+void backfillStartEndTimestamp(StatsLogReport *report) {
+ const int64_t timeBaseNs = report->time_base_elapsed_nano_seconds();
+ const int64_t bucketSizeNs = report->bucket_size_nano_seconds();
+ if (report->has_count_metrics()) {
+ backfillStartEndTimestampForMetrics(
+ timeBaseNs, bucketSizeNs, report->mutable_count_metrics());
+ } else if (report->has_duration_metrics()) {
+ backfillStartEndTimestampForMetrics(
+ timeBaseNs, bucketSizeNs, report->mutable_duration_metrics());
+ } else if (report->has_gauge_metrics()) {
+ backfillStartEndTimestampForMetrics(
+ timeBaseNs, bucketSizeNs, report->mutable_gauge_metrics());
+ if (report->gauge_metrics().skipped_size() > 0) {
+ backfillStartEndTimestampForSkippedBuckets(
+ timeBaseNs, report->mutable_gauge_metrics());
+ }
+ } else if (report->has_value_metrics()) {
+ backfillStartEndTimestampForMetrics(
+ timeBaseNs, bucketSizeNs, report->mutable_value_metrics());
+ if (report->value_metrics().skipped_size() > 0) {
+ backfillStartEndTimestampForSkippedBuckets(
+ timeBaseNs, report->mutable_value_metrics());
+ }
+ }
+}
+
+void backfillStartEndTimestamp(ConfigMetricsReport *config_report) {
+ for (int j = 0; j < config_report->metrics_size(); ++j) {
+ backfillStartEndTimestamp(config_report->mutable_metrics(j));
+ }
+}
+
+void backfillStartEndTimestamp(ConfigMetricsReportList *config_report_list) {
+ for (int i = 0; i < config_report_list->reports_size(); ++i) {
+ backfillStartEndTimestamp(config_report_list->mutable_reports(i));
+ }
+}
+
} // namespace statsd
} // namespace os
} // namespace android
\ No newline at end of file
diff --git a/cmds/statsd/tests/statsd_test_util.h b/cmds/statsd/tests/statsd_test_util.h
index 6ecca46..635c583 100644
--- a/cmds/statsd/tests/statsd_test_util.h
+++ b/cmds/statsd/tests/statsd_test_util.h
@@ -19,12 +19,16 @@
#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
#include "src/StatsLogProcessor.h"
#include "src/logd/LogEvent.h"
+#include "src/hash.h"
+#include "src/stats_log_util.h"
#include "statslog.h"
namespace android {
namespace os {
namespace statsd {
+using google::protobuf::RepeatedPtrField;
+
// Create AtomMatcher proto to simply match a specific atom type.
AtomMatcher CreateSimpleAtomMatcher(const string& name, int atomId);
@@ -201,6 +205,53 @@
bool LessThan(const DimensionsValue& s1, const DimensionsValue& s2);
bool LessThan(const DimensionsPair& s1, const DimensionsPair& s2);
+
+void backfillStartEndTimestamp(ConfigMetricsReport *config_report);
+void backfillStartEndTimestamp(ConfigMetricsReportList *config_report_list);
+
+void backfillStringInReport(ConfigMetricsReportList *config_report_list);
+void backfillStringInDimension(const std::map<uint64_t, string>& str_map,
+ DimensionsValue* dimension);
+
+template <typename T>
+void backfillStringInDimension(const std::map<uint64_t, string>& str_map,
+ T* metrics) {
+ for (int i = 0; i < metrics->data_size(); ++i) {
+ auto data = metrics->mutable_data(i);
+ if (data->has_dimensions_in_what()) {
+ backfillStringInDimension(str_map, data->mutable_dimensions_in_what());
+ }
+ if (data->has_dimensions_in_condition()) {
+ backfillStringInDimension(str_map, data->mutable_dimensions_in_condition());
+ }
+ }
+}
+
+void backfillDimensionPath(ConfigMetricsReportList* config_report_list);
+
+bool backfillDimensionPath(const DimensionsValue& path,
+ const google::protobuf::RepeatedPtrField<DimensionsValue>& leafValues,
+ DimensionsValue* dimension);
+
+template <typename T>
+void backfillDimensionPath(const DimensionsValue& whatPath,
+ const DimensionsValue& conditionPath,
+ T* metricData) {
+ for (int i = 0; i < metricData->data_size(); ++i) {
+ auto data = metricData->mutable_data(i);
+ if (data->dimension_leaf_values_in_what_size() > 0) {
+ backfillDimensionPath(whatPath, data->dimension_leaf_values_in_what(),
+ data->mutable_dimensions_in_what());
+ data->clear_dimension_leaf_values_in_what();
+ }
+ if (data->dimension_leaf_values_in_condition_size() > 0) {
+ backfillDimensionPath(conditionPath, data->dimension_leaf_values_in_condition(),
+ data->mutable_dimensions_in_condition());
+ data->clear_dimension_leaf_values_in_condition();
+ }
+ }
+}
+
struct DimensionCompare {
bool operator()(const DimensionsPair& s1, const DimensionsPair& s2) const {
return LessThan(s1, s2);
@@ -221,6 +272,51 @@
}
}
+template <typename T>
+void backfillStartEndTimestampForFullBucket(
+ const int64_t timeBaseNs, const int64_t bucketSizeNs, T* bucket) {
+ bucket->set_start_bucket_elapsed_nanos(timeBaseNs + bucketSizeNs * bucket->bucket_num());
+ bucket->set_end_bucket_elapsed_nanos(
+ timeBaseNs + bucketSizeNs * bucket->bucket_num() + bucketSizeNs);
+ bucket->clear_bucket_num();
+}
+
+template <typename T>
+void backfillStartEndTimestampForPartialBucket(const int64_t timeBaseNs, T* bucket) {
+ if (bucket->has_start_bucket_elapsed_millis()) {
+ bucket->set_start_bucket_elapsed_nanos(
+ MillisToNano(bucket->start_bucket_elapsed_millis()));
+ bucket->clear_start_bucket_elapsed_millis();
+ }
+ if (bucket->has_end_bucket_elapsed_millis()) {
+ bucket->set_end_bucket_elapsed_nanos(
+ MillisToNano(bucket->end_bucket_elapsed_millis()));
+ bucket->clear_end_bucket_elapsed_millis();
+ }
+}
+
+template <typename T>
+void backfillStartEndTimestampForMetrics(const int64_t timeBaseNs, const int64_t bucketSizeNs,
+ T* metrics) {
+ for (int i = 0; i < metrics->data_size(); ++i) {
+ auto data = metrics->mutable_data(i);
+ for (int j = 0; j < data->bucket_info_size(); ++j) {
+ auto bucket = data->mutable_bucket_info(j);
+ if (bucket->has_bucket_num()) {
+ backfillStartEndTimestampForFullBucket(timeBaseNs, bucketSizeNs, bucket);
+ } else {
+ backfillStartEndTimestampForPartialBucket(timeBaseNs, bucket);
+ }
+ }
+ }
+}
+
+template <typename T>
+void backfillStartEndTimestampForSkippedBuckets(const int64_t timeBaseNs, T* metrics) {
+ for (int i = 0; i < metrics->skipped_size(); ++i) {
+ backfillStartEndTimestampForPartialBucket(timeBaseNs, metrics->mutable_skipped(i));
+ }
+}
} // namespace statsd
} // namespace os
} // namespace android
\ No newline at end of file
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt
index 1789d1d..fa5d913 100644
--- a/config/hiddenapi-light-greylist.txt
+++ b/config/hiddenapi-light-greylist.txt
@@ -31,7 +31,10 @@
Landroid/app/Activity;->getActivityToken()Landroid/os/IBinder;
Landroid/app/Activity;->mActivityInfo:Landroid/content/pm/ActivityInfo;
Landroid/app/Activity;->mApplication:Landroid/app/Application;
+Landroid/app/Activity;->mCalled:Z
Landroid/app/Activity;->mComponent:Landroid/content/ComponentName;
+Landroid/app/Activity;->mConfigChangeFlags:I
+Landroid/app/Activity;->mCurrentConfig:Landroid/content/res/Configuration;
Landroid/app/Activity;->mFinished:Z
Landroid/app/Activity;->mFragments:Landroid/app/FragmentController;
Landroid/app/Activity;->mHandler:Landroid/os/Handler;
@@ -41,6 +44,7 @@
Landroid/app/Activity;->mResultCode:I
Landroid/app/Activity;->mResultData:Landroid/content/Intent;
Landroid/app/Activity;->mResumed:Z
+Landroid/app/Activity;->mTitle:Ljava/lang/CharSequence;
Landroid/app/Activity;->mToken:Landroid/os/IBinder;
Landroid/app/Activity;->mWindow:Landroid/view/Window;
Landroid/app/Activity;->mWindowManager:Landroid/view/WindowManager;
@@ -3053,7 +3057,9 @@
Landroid/widget/DatePicker;->mDelegate:Landroid/widget/DatePicker$DatePickerDelegate;
Landroid/widget/EdgeEffect;->mPaint:Landroid/graphics/Paint;
Landroid/widget/Editor;->invalidateTextDisplayList()V
+Landroid/widget/Editor;->mInsertionControllerEnabled:Z
Landroid/widget/Editor;->mSelectHandleLeft:Landroid/graphics/drawable/Drawable;
+Landroid/widget/Editor;->mSelectionControllerEnabled:Z
Landroid/widget/Editor;->mShowCursor:J
Landroid/widget/Editor;->mShowSoftInputOnFocus:Z
Landroid/widget/ExpandableListView;->mChildDivider:Landroid/graphics/drawable/Drawable;
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java
index dcf4eec..796e406 100644
--- a/core/java/android/app/AppOpsManager.java
+++ b/core/java/android/app/AppOpsManager.java
@@ -110,6 +110,27 @@
public static final int MODE_DEFAULT = 3;
/**
+ * Special mode that means "allow only when app is in foreground." This is <b>not</b>
+ * returned from {@link #checkOp}, {@link #noteOp}, {@link #startOp}; rather, when this
+ * mode is set, these functions will return {@link #MODE_ALLOWED} when the app being
+ * checked is currently in the foreground, otherwise {@link #MODE_IGNORED}.
+ * @hide
+ */
+ public static final int MODE_FOREGROUND = 4;
+
+
+ /**
+ * @hide
+ */
+ public static final String[] MODE_NAMES = new String[] {
+ "allow", // MODE_ALLOWED
+ "ignore", // MODE_IGNORED
+ "deny", // MODE_ERRORED
+ "default", // MODE_DEFAULT
+ "foreground", // MODE_FOREGROUND
+ };
+
+ /**
* Metrics about an op when its uid is persistent.
* @hide
*/
@@ -619,83 +640,83 @@
* make them all controlled by the same single operation.
*/
private static int[] sOpToSwitch = new int[] {
- OP_COARSE_LOCATION,
- OP_COARSE_LOCATION,
- OP_COARSE_LOCATION,
- OP_VIBRATE,
- OP_READ_CONTACTS,
- OP_WRITE_CONTACTS,
- OP_READ_CALL_LOG,
- OP_WRITE_CALL_LOG,
- OP_READ_CALENDAR,
- OP_WRITE_CALENDAR,
- OP_COARSE_LOCATION,
- OP_POST_NOTIFICATION,
- OP_COARSE_LOCATION,
- OP_CALL_PHONE,
- OP_READ_SMS,
- OP_WRITE_SMS,
- OP_RECEIVE_SMS,
- OP_RECEIVE_SMS,
- OP_RECEIVE_MMS,
- OP_RECEIVE_WAP_PUSH,
- OP_SEND_SMS,
- OP_READ_SMS,
- OP_WRITE_SMS,
- OP_WRITE_SETTINGS,
- OP_SYSTEM_ALERT_WINDOW,
- OP_ACCESS_NOTIFICATIONS,
- OP_CAMERA,
- OP_RECORD_AUDIO,
- OP_PLAY_AUDIO,
- OP_READ_CLIPBOARD,
- OP_WRITE_CLIPBOARD,
- OP_TAKE_MEDIA_BUTTONS,
- OP_TAKE_AUDIO_FOCUS,
- OP_AUDIO_MASTER_VOLUME,
- OP_AUDIO_VOICE_VOLUME,
- OP_AUDIO_RING_VOLUME,
- OP_AUDIO_MEDIA_VOLUME,
- OP_AUDIO_ALARM_VOLUME,
- OP_AUDIO_NOTIFICATION_VOLUME,
- OP_AUDIO_BLUETOOTH_VOLUME,
- OP_WAKE_LOCK,
- OP_COARSE_LOCATION,
- OP_COARSE_LOCATION,
- OP_GET_USAGE_STATS,
- OP_MUTE_MICROPHONE,
- OP_TOAST_WINDOW,
- OP_PROJECT_MEDIA,
- OP_ACTIVATE_VPN,
- OP_WRITE_WALLPAPER,
- OP_ASSIST_STRUCTURE,
- OP_ASSIST_SCREENSHOT,
- OP_READ_PHONE_STATE,
- OP_ADD_VOICEMAIL,
- OP_USE_SIP,
- OP_PROCESS_OUTGOING_CALLS,
- OP_USE_FINGERPRINT,
- OP_BODY_SENSORS,
- OP_READ_CELL_BROADCASTS,
- OP_MOCK_LOCATION,
- OP_READ_EXTERNAL_STORAGE,
- OP_WRITE_EXTERNAL_STORAGE,
- OP_TURN_SCREEN_ON,
- OP_GET_ACCOUNTS,
- OP_RUN_IN_BACKGROUND,
- OP_AUDIO_ACCESSIBILITY_VOLUME,
- OP_READ_PHONE_NUMBERS,
- OP_REQUEST_INSTALL_PACKAGES,
- OP_PICTURE_IN_PICTURE,
- OP_INSTANT_APP_START_FOREGROUND,
- OP_ANSWER_PHONE_CALLS,
- OP_RUN_ANY_IN_BACKGROUND,
- OP_CHANGE_WIFI_STATE,
- OP_REQUEST_DELETE_PACKAGES,
- OP_BIND_ACCESSIBILITY_SERVICE,
- OP_ACCEPT_HANDOVER,
- OP_MANAGE_IPSEC_TUNNELS,
- OP_START_FOREGROUND,
+ OP_COARSE_LOCATION, // COARSE_LOCATION
+ OP_COARSE_LOCATION, // FINE_LOCATION
+ OP_COARSE_LOCATION, // GPS
+ OP_VIBRATE, // VIBRATE
+ OP_READ_CONTACTS, // READ_CONTACTS
+ OP_WRITE_CONTACTS, // WRITE_CONTACTS
+ OP_READ_CALL_LOG, // READ_CALL_LOG
+ OP_WRITE_CALL_LOG, // WRITE_CALL_LOG
+ OP_READ_CALENDAR, // READ_CALENDAR
+ OP_WRITE_CALENDAR, // WRITE_CALENDAR
+ OP_COARSE_LOCATION, // WIFI_SCAN
+ OP_POST_NOTIFICATION, // POST_NOTIFICATION
+ OP_COARSE_LOCATION, // NEIGHBORING_CELLS
+ OP_CALL_PHONE, // CALL_PHONE
+ OP_READ_SMS, // READ_SMS
+ OP_WRITE_SMS, // WRITE_SMS
+ OP_RECEIVE_SMS, // RECEIVE_SMS
+ OP_RECEIVE_SMS, // RECEIVE_EMERGECY_SMS
+ OP_RECEIVE_MMS, // RECEIVE_MMS
+ OP_RECEIVE_WAP_PUSH, // RECEIVE_WAP_PUSH
+ OP_SEND_SMS, // SEND_SMS
+ OP_READ_SMS, // READ_ICC_SMS
+ OP_WRITE_SMS, // WRITE_ICC_SMS
+ OP_WRITE_SETTINGS, // WRITE_SETTINGS
+ OP_SYSTEM_ALERT_WINDOW, // SYSTEM_ALERT_WINDOW
+ OP_ACCESS_NOTIFICATIONS, // ACCESS_NOTIFICATIONS
+ OP_CAMERA, // CAMERA
+ OP_RECORD_AUDIO, // RECORD_AUDIO
+ OP_PLAY_AUDIO, // PLAY_AUDIO
+ OP_READ_CLIPBOARD, // READ_CLIPBOARD
+ OP_WRITE_CLIPBOARD, // WRITE_CLIPBOARD
+ OP_TAKE_MEDIA_BUTTONS, // TAKE_MEDIA_BUTTONS
+ OP_TAKE_AUDIO_FOCUS, // TAKE_AUDIO_FOCUS
+ OP_AUDIO_MASTER_VOLUME, // AUDIO_MASTER_VOLUME
+ OP_AUDIO_VOICE_VOLUME, // AUDIO_VOICE_VOLUME
+ OP_AUDIO_RING_VOLUME, // AUDIO_RING_VOLUME
+ OP_AUDIO_MEDIA_VOLUME, // AUDIO_MEDIA_VOLUME
+ OP_AUDIO_ALARM_VOLUME, // AUDIO_ALARM_VOLUME
+ OP_AUDIO_NOTIFICATION_VOLUME, // AUDIO_NOTIFICATION_VOLUME
+ OP_AUDIO_BLUETOOTH_VOLUME, // AUDIO_BLUETOOTH_VOLUME
+ OP_WAKE_LOCK, // WAKE_LOCK
+ OP_COARSE_LOCATION, // MONITOR_LOCATION
+ OP_COARSE_LOCATION, // MONITOR_HIGH_POWER_LOCATION
+ OP_GET_USAGE_STATS, // GET_USAGE_STATS
+ OP_MUTE_MICROPHONE, // MUTE_MICROPHONE
+ OP_TOAST_WINDOW, // TOAST_WINDOW
+ OP_PROJECT_MEDIA, // PROJECT_MEDIA
+ OP_ACTIVATE_VPN, // ACTIVATE_VPN
+ OP_WRITE_WALLPAPER, // WRITE_WALLPAPER
+ OP_ASSIST_STRUCTURE, // ASSIST_STRUCTURE
+ OP_ASSIST_SCREENSHOT, // ASSIST_SCREENSHOT
+ OP_READ_PHONE_STATE, // READ_PHONE_STATE
+ OP_ADD_VOICEMAIL, // ADD_VOICEMAIL
+ OP_USE_SIP, // USE_SIP
+ OP_PROCESS_OUTGOING_CALLS, // PROCESS_OUTGOING_CALLS
+ OP_USE_FINGERPRINT, // USE_FINGERPRINT
+ OP_BODY_SENSORS, // BODY_SENSORS
+ OP_READ_CELL_BROADCASTS, // READ_CELL_BROADCASTS
+ OP_MOCK_LOCATION, // MOCK_LOCATION
+ OP_READ_EXTERNAL_STORAGE, // READ_EXTERNAL_STORAGE
+ OP_WRITE_EXTERNAL_STORAGE, // WRITE_EXTERNAL_STORAGE
+ OP_TURN_SCREEN_ON, // TURN_SCREEN_ON
+ OP_GET_ACCOUNTS, // GET_ACCOUNTS
+ OP_RUN_IN_BACKGROUND, // RUN_IN_BACKGROUND
+ OP_AUDIO_ACCESSIBILITY_VOLUME, // AUDIO_ACCESSIBILITY_VOLUME
+ OP_READ_PHONE_NUMBERS, // READ_PHONE_NUMBERS
+ OP_REQUEST_INSTALL_PACKAGES, // REQUEST_INSTALL_PACKAGES
+ OP_PICTURE_IN_PICTURE, // ENTER_PICTURE_IN_PICTURE_ON_HIDE
+ OP_INSTANT_APP_START_FOREGROUND, // INSTANT_APP_START_FOREGROUND
+ OP_ANSWER_PHONE_CALLS, // ANSWER_PHONE_CALLS
+ OP_RUN_ANY_IN_BACKGROUND, // OP_RUN_ANY_IN_BACKGROUND
+ OP_CHANGE_WIFI_STATE, // OP_CHANGE_WIFI_STATE
+ OP_REQUEST_DELETE_PACKAGES, // OP_REQUEST_DELETE_PACKAGES
+ OP_BIND_ACCESSIBILITY_SERVICE, // OP_BIND_ACCESSIBILITY_SERVICE
+ OP_ACCEPT_HANDOVER, // ACCEPT_HANDOVER
+ OP_MANAGE_IPSEC_TUNNELS, // MANAGE_IPSEC_HANDOVERS
+ OP_START_FOREGROUND, // START_FOREGROUND
};
/**
@@ -1420,19 +1441,11 @@
* Retrieve the human readable mode.
* @hide
*/
- public static String modeToString(int mode) {
- switch (mode) {
- case MODE_ALLOWED:
- return "allow";
- case MODE_IGNORED:
- return "ignore";
- case MODE_ERRORED:
- return "deny";
- case MODE_DEFAULT:
- return "default";
- default:
- return "mode=" + mode;
+ public static String modeToName(int mode) {
+ if (mode >= 0 && mode < MODE_NAMES.length) {
+ return MODE_NAMES[mode];
}
+ return "mode=" + mode;
}
/**
@@ -1554,30 +1567,42 @@
}
public long getTime() {
- long time = 0;
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- if (mTimes[i] > time) {
- time = mTimes[i];
- }
- }
- return time;
+ return maxTime(mTimes, 0, _NUM_UID_STATE);
}
- public long getTimeFor(int uidState) {
+ public long getLastAccessTime() {
+ return maxTime(mTimes, 0, _NUM_UID_STATE);
+ }
+
+ public long getLastAccessForegroundTime() {
+ return maxTime(mTimes, UID_STATE_PERSISTENT, UID_STATE_FOREGROUND_SERVICE + 1);
+ }
+
+ public long getLastAccessBackgroundTime() {
+ return maxTime(mTimes, UID_STATE_FOREGROUND_SERVICE + 1, _NUM_UID_STATE);
+ }
+
+ public long getLastTimeFor(int uidState) {
return mTimes[uidState];
}
public long getRejectTime() {
- long time = 0;
- for (int i = 0; i < _NUM_UID_STATE; i++) {
- if (mRejectTimes[i] > time) {
- time = mRejectTimes[i];
- }
- }
- return time;
+ return maxTime(mRejectTimes, 0, _NUM_UID_STATE);
}
- public long getRejectTimeFor(int uidState) {
+ public long getLastRejectTime() {
+ return maxTime(mRejectTimes, 0, _NUM_UID_STATE);
+ }
+
+ public long getLastRejectForegroundTime() {
+ return maxTime(mRejectTimes, UID_STATE_PERSISTENT, UID_STATE_FOREGROUND_SERVICE + 1);
+ }
+
+ public long getLastRejectBackgroundTime() {
+ return maxTime(mRejectTimes, UID_STATE_FOREGROUND_SERVICE + 1, _NUM_UID_STATE);
+ }
+
+ public long getLastRejectTimeFor(int uidState) {
return mRejectTimes[uidState];
}
@@ -1680,6 +1705,7 @@
* @param ops The set of operations you are interested in, or null if you want all of them.
* @hide
*/
+ @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS)
public List<AppOpsManager.PackageOps> getPackagesForOps(int[] ops) {
try {
return mService.getPackagesForOps(ops);
@@ -1696,6 +1722,7 @@
* @param ops The set of operations you are interested in, or null if you want all of them.
* @hide
*/
+ @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS)
public List<AppOpsManager.PackageOps> getOpsForPackage(int uid, String packageName, int[] ops) {
try {
return mService.getOpsForPackage(uid, packageName, ops);
@@ -2009,6 +2036,17 @@
* used for a quick check to see if an operation has been disabled for the application,
* as an early reject of some work. This does not modify the time stamp or other data
* about the operation.
+ *
+ * <p>Important things this will not do (which you need to ultimate use
+ * {@link #noteOp(String, int, String)} or {@link #startOp(String, int, String)} to cover):</p>
+ * <ul>
+ * <li>Verifying the uid and package are consistent, so callers can't spoof
+ * their identity.</li>
+ * <li>Taking into account the current foreground/background state of the
+ * app; apps whose mode varies by this state will always be reported
+ * as {@link #MODE_ALLOWED}.</li>
+ * </ul>
+ *
* @param op The operation to check. One of the OPSTR_* constants.
* @param uid The user id of the application attempting to perform the operation.
* @param packageName The name of the application attempting to perform the operation.
@@ -2128,6 +2166,17 @@
* used for a quick check to see if an operation has been disabled for the application,
* as an early reject of some work. This does not modify the time stamp or other data
* about the operation.
+ *
+ * <p>Important things this will not do (which you need to ultimate use
+ * {@link #noteOp(int, int, String)} or {@link #startOp(int, int, String)} to cover):</p>
+ * <ul>
+ * <li>Verifying the uid and package are consistent, so callers can't spoof
+ * their identity.</li>
+ * <li>Taking into account the current foreground/background state of the
+ * app; apps whose mode varies by this state will always be reported
+ * as {@link #MODE_ALLOWED}.</li>
+ * </ul>
+ *
* @param op The operation to check. One of the OP_* constants.
* @param uid The user id of the application attempting to perform the operation.
* @param packageName The name of the application attempting to perform the operation.
@@ -2445,4 +2494,17 @@
public static String[] getOpStrs() {
return Arrays.copyOf(sOpToString, sOpToString.length);
}
+
+ /**
+ * @hide
+ */
+ public static long maxTime(long[] times, int start, int end) {
+ long time = 0;
+ for (int i = start; i < end; i++) {
+ if (times[i] > time) {
+ time = times[i];
+ }
+ }
+ return time;
+ }
}
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 9a491bc..9511786 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1048,6 +1048,22 @@
}
@Override
+ public void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,
+ String[] receiverPermissions) {
+ warnIfCallingFromSystemProcess();
+ String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
+ try {
+ intent.prepareToLeaveProcess(this);
+ ActivityManager.getService().broadcastIntent(
+ mMainThread.getApplicationThread(), intent, resolvedType, null,
+ Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE,
+ null, false, false, user.getIdentifier());
+ } catch (RemoteException e) {
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ @Override
public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) {
warnIfCallingFromSystemProcess();
String resolvedType = intent.resolveTypeIfNeeded(getContentResolver());
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index ede7ee4..90a94ee 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1976,6 +1976,33 @@
/**
* Broadcast the given intent to all interested BroadcastReceivers, allowing
+ * an array of required permissions to be enforced. This call is asynchronous; it returns
+ * immediately, and you will continue executing while the receivers are run. No results are
+ * propagated from receivers and receivers can not abort the broadcast. If you want to allow
+ * receivers to propagate results or abort the broadcast, you must send an ordered broadcast
+ * using {@link #sendOrderedBroadcast(Intent, String)}.
+ *
+ * <p>See {@link BroadcastReceiver} for more information on Intent broadcasts.
+ *
+ * @param intent The Intent to broadcast; all receivers matching this
+ * Intent will receive the broadcast.
+ * @param user The user to send the broadcast to.
+ * @param receiverPermissions Array of names of permissions that a receiver must hold
+ * in order to receive your broadcast.
+ * If null or empty, no permissions are required.
+ *
+ * @see android.content.BroadcastReceiver
+ * @see #registerReceiver
+ * @see #sendBroadcast(Intent)
+ * @see #sendOrderedBroadcast(Intent, String)
+ * @see #sendOrderedBroadcast(Intent, String, BroadcastReceiver, Handler, int, String, Bundle)
+ * @hide
+ */
+ public abstract void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,
+ String[] receiverPermissions);
+
+ /**
+ * Broadcast the given intent to all interested BroadcastReceivers, allowing
* an optional required permission to be enforced. This
* call is asynchronous; it returns immediately, and you will continue
* executing while the receivers are run. No results are propagated from
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index 1867a6d..bae99b8 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -456,6 +456,13 @@
}
/** @hide */
+ @Override
+ public void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,
+ String[] receiverPermissions) {
+ mBase.sendBroadcastAsUserMultiplePermissions(intent, user, receiverPermissions);
+ }
+
+ /** @hide */
@SystemApi
@Override
public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) {
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 9a276fb..1b80d3d5 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -18,19 +18,23 @@
import static android.system.OsConstants.*;
+import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
import android.app.ActivityThread;
+import android.app.AppOpsManager;
import android.content.Context;
import android.graphics.ImageFormat;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
+import android.media.AudioAttributes;
import android.media.IAudioService;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
+import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.renderscript.Allocation;
@@ -43,6 +47,10 @@
import android.view.Surface;
import android.view.SurfaceHolder;
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.app.IAppOpsCallback;
+import com.android.internal.app.IAppOpsService;
+
import java.io.IOException;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -174,6 +182,15 @@
private boolean mFaceDetectionRunning = false;
private final Object mAutoFocusCallbackLock = new Object();
+ private final Object mShutterSoundLock = new Object();
+ // for AppOps
+ private @Nullable IAppOpsService mAppOps;
+ private IAppOpsCallback mAppOpsCallback;
+ @GuardedBy("mShutterSoundLock")
+ private boolean mHasAppOpsPlayAudio = true;
+ @GuardedBy("mShutterSoundLock")
+ private boolean mShutterSoundEnabledFromApp = true;
+
private static final int NO_ERROR = 0;
/**
@@ -526,6 +543,7 @@
// Should never hit this.
throw new RuntimeException("Unknown camera error");
}
+ initAppOps();
}
@@ -547,6 +565,33 @@
* An empty Camera for testing purpose.
*/
Camera() {
+ initAppOps();
+ }
+
+ private void initAppOps() {
+ IBinder b = ServiceManager.getService(Context.APP_OPS_SERVICE);
+ mAppOps = IAppOpsService.Stub.asInterface(b);
+ // initialize mHasAppOpsPlayAudio
+ updateAppOpsPlayAudio();
+ // register a callback to monitor whether the OP_PLAY_AUDIO is still allowed
+ mAppOpsCallback = new IAppOpsCallbackWrapper(this);
+ try {
+ mAppOps.startWatchingMode(AppOpsManager.OP_PLAY_AUDIO,
+ ActivityThread.currentPackageName(), mAppOpsCallback);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error registering appOps callback", e);
+ mHasAppOpsPlayAudio = false;
+ }
+ }
+
+ private void releaseAppOps() {
+ try {
+ if (mAppOps != null) {
+ mAppOps.stopWatchingMode(mAppOpsCallback);
+ }
+ } catch (Exception e) {
+ // nothing to do here, the object is supposed to be released anyway
+ }
}
@Override
@@ -568,6 +613,7 @@
public final void release() {
native_release();
mFaceDetectionRunning = false;
+ releaseAppOps();
}
/**
@@ -1623,7 +1669,17 @@
Log.e(TAG, "Audio service is unavailable for queries");
}
}
- return _enableShutterSound(enabled);
+ synchronized (mShutterSoundLock) {
+ if (enabled && mHasAppOpsPlayAudio) {
+ Log.i(TAG, "Shutter sound is not allowed by AppOpsManager");
+ return false;
+ }
+ boolean ret = _enableShutterSound(enabled);
+ if (ret) {
+ mShutterSoundEnabledFromApp = enabled;
+ }
+ return ret;
+ }
}
/**
@@ -1648,6 +1704,49 @@
private native final boolean _enableShutterSound(boolean enabled);
+ private static class IAppOpsCallbackWrapper extends IAppOpsCallback.Stub {
+ private final WeakReference<Camera> mWeakCamera;
+
+ IAppOpsCallbackWrapper(Camera camera) {
+ mWeakCamera = new WeakReference<Camera>(camera);
+ }
+
+ @Override
+ public void opChanged(int op, int uid, String packageName) {
+ if (op == AppOpsManager.OP_PLAY_AUDIO) {
+ final Camera camera = mWeakCamera.get();
+ if (camera != null) {
+ camera.updateAppOpsPlayAudio();
+ }
+ }
+ }
+ }
+
+ private void updateAppOpsPlayAudio() {
+ synchronized (mShutterSoundLock) {
+ boolean oldHasAppOpsPlayAudio = mHasAppOpsPlayAudio;
+ try {
+ int mode = AppOpsManager.MODE_IGNORED;
+ if (mAppOps != null) {
+ mode = mAppOps.checkAudioOperation(AppOpsManager.OP_PLAY_AUDIO,
+ AudioAttributes.USAGE_ASSISTANCE_SONIFICATION,
+ Process.myUid(), ActivityThread.currentPackageName());
+ }
+ mHasAppOpsPlayAudio = mode == AppOpsManager.MODE_ALLOWED;
+ } catch (RemoteException e) {
+ Log.e(TAG, "AppOpsService check audio operation failed");
+ mHasAppOpsPlayAudio = false;
+ }
+ if (oldHasAppOpsPlayAudio != mHasAppOpsPlayAudio) {
+ if (!mHasAppOpsPlayAudio) {
+ _enableShutterSound(false);
+ } else {
+ _enableShutterSound(mShutterSoundEnabledFromApp);
+ }
+ }
+ }
+ }
+
/**
* Callback interface for zoom changes during a smooth zoom operation.
*
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 03221d4..ebbfe1c 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -45,7 +45,6 @@
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.UserHandle;
-import android.util.Log;
import android.util.Slog;
import java.security.Signature;
@@ -417,7 +416,7 @@
if (cancel != null) {
if (cancel.isCanceled()) {
- Log.w(TAG, "authentication already canceled");
+ Slog.w(TAG, "authentication already canceled");
return;
} else {
cancel.setOnCancelListener(new OnAuthenticationCancelListener(crypto));
@@ -432,7 +431,7 @@
mService.authenticate(mToken, sessionId, userId, mServiceReceiver, flags,
mContext.getOpPackageName(), null /* bundle */, null /* receiver */);
} catch (RemoteException e) {
- Log.w(TAG, "Remote exception while authenticating: ", e);
+ Slog.w(TAG, "Remote exception while authenticating: ", e);
if (callback != null) {
// Though this may not be a hardware issue, it will cause apps to give up or try
// again later.
@@ -456,7 +455,7 @@
@NonNull BiometricAuthenticator.AuthenticationCallback callback) {
mCryptoObject = crypto;
if (cancel.isCanceled()) {
- Log.w(TAG, "authentication already canceled");
+ Slog.w(TAG, "authentication already canceled");
return;
} else {
cancel.setOnCancelListener(new OnAuthenticationCancelListener(crypto));
@@ -470,7 +469,7 @@
mService.authenticate(mToken, sessionId, userId, mServiceReceiver,
0 /* flags */, mContext.getOpPackageName(), bundle, receiver);
} catch (RemoteException e) {
- Log.w(TAG, "Remote exception while authenticating", e);
+ Slog.w(TAG, "Remote exception while authenticating", e);
mExecutor.execute(() -> {
callback.onAuthenticationError(FINGERPRINT_ERROR_HW_UNAVAILABLE,
getErrorString(FINGERPRINT_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */));
@@ -576,7 +575,7 @@
if (cancel != null) {
if (cancel.isCanceled()) {
- Log.w(TAG, "enrollment already canceled");
+ Slog.w(TAG, "enrollment already canceled");
return;
} else {
cancel.setOnCancelListener(new OnEnrollCancelListener());
@@ -588,7 +587,7 @@
mService.enroll(mToken, token, userId, mServiceReceiver, flags,
mContext.getOpPackageName());
} catch (RemoteException e) {
- Log.w(TAG, "Remote exception in enroll: ", e);
+ Slog.w(TAG, "Remote exception in enroll: ", e);
if (callback != null) {
// Though this may not be a hardware issue, it will cause apps to give up or try
// again later.
@@ -660,7 +659,7 @@
mRemovalFingerprint = fp;
mService.remove(mToken, fp.getFingerId(), fp.getGroupId(), userId, mServiceReceiver);
} catch (RemoteException e) {
- Log.w(TAG, "Remote exception in remove: ", e);
+ Slog.w(TAG, "Remote exception in remove: ", e);
if (callback != null) {
callback.onRemovalError(fp, FINGERPRINT_ERROR_HW_UNAVAILABLE,
getErrorString(FINGERPRINT_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */));
@@ -682,7 +681,7 @@
mEnumerateCallback = callback;
mService.enumerate(mToken, userId, mServiceReceiver);
} catch (RemoteException e) {
- Log.w(TAG, "Remote exception in enumerate: ", e);
+ Slog.w(TAG, "Remote exception in enumerate: ", e);
if (callback != null) {
callback.onEnumerateError(FINGERPRINT_ERROR_HW_UNAVAILABLE,
getErrorString(FINGERPRINT_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */));
@@ -708,7 +707,7 @@
throw e.rethrowFromSystemServer();
}
} else {
- Log.w(TAG, "rename(): Service not connected!");
+ Slog.w(TAG, "rename(): Service not connected!");
}
}
@@ -791,7 +790,7 @@
throw e.rethrowFromSystemServer();
}
} else {
- Log.w(TAG, "isFingerprintHardwareDetected(): Service not connected!");
+ Slog.w(TAG, "isFingerprintHardwareDetected(): Service not connected!");
}
return false;
}
@@ -810,7 +809,7 @@
throw e.rethrowFromSystemServer();
}
} else {
- Log.w(TAG, "getAuthenticatorId(): Service not connected!");
+ Slog.w(TAG, "getAuthenticatorId(): Service not connected!");
}
return 0;
}
@@ -830,7 +829,7 @@
throw e.rethrowFromSystemServer();
}
} else {
- Log.w(TAG, "resetTimeout(): Service not connected!");
+ Slog.w(TAG, "resetTimeout(): Service not connected!");
}
}
@@ -867,7 +866,7 @@
throw e.rethrowFromSystemServer();
}
} else {
- Log.w(TAG, "addLockoutResetCallback(): Service not connected!");
+ Slog.w(TAG, "addLockoutResetCallback(): Service not connected!");
}
}
@@ -915,20 +914,20 @@
return;
}
if (fingerprint == null) {
- Log.e(TAG, "Received MSG_REMOVED, but fingerprint is null");
+ Slog.e(TAG, "Received MSG_REMOVED, but fingerprint is null");
return;
}
int fingerId = fingerprint.getFingerId();
int reqFingerId = mRemovalFingerprint.getFingerId();
if (reqFingerId != 0 && fingerId != 0 && fingerId != reqFingerId) {
- Log.w(TAG, "Finger id didn't match: " + fingerId + " != " + reqFingerId);
+ Slog.w(TAG, "Finger id didn't match: " + fingerId + " != " + reqFingerId);
return;
}
int groupId = fingerprint.getGroupId();
int reqGroupId = mRemovalFingerprint.getGroupId();
if (groupId != reqGroupId) {
- Log.w(TAG, "Group id didn't match: " + groupId + " != " + reqGroupId);
+ Slog.w(TAG, "Group id didn't match: " + groupId + " != " + reqGroupId);
return;
}
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index fdae191..f2d4542 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1785,6 +1785,12 @@
public static final int USER_SETUP_PERSONALIZATION_STARTED = 1;
/**
+ * User has snoozed personalization and will complete it later.
+ * @hide
+ */
+ public static final int USER_SETUP_PERSONALIZATION_PAUSED = 2;
+
+ /**
* User has completed setup personalization.
* @hide
*/
@@ -1795,6 +1801,7 @@
@IntDef({
USER_SETUP_PERSONALIZATION_NOT_STARTED,
USER_SETUP_PERSONALIZATION_STARTED,
+ USER_SETUP_PERSONALIZATION_PAUSED,
USER_SETUP_PERSONALIZATION_COMPLETE
})
public @interface UserSetupPersonalization {}
@@ -10604,18 +10611,30 @@
* App standby (app idle) specific settings.
* This is encoded as a key=value list, separated by commas. Ex:
* <p>
- * "idle_duration=5000,parole_interval=4500"
+ * "idle_duration=5000,parole_interval=4500,screen_thresholds=0/0/60000/120000"
* <p>
* All durations are in millis.
+ * Array values are separated by forward slashes
* The following keys are supported:
*
* <pre>
- * idle_duration2 (long)
- * wallclock_threshold (long)
- * parole_interval (long)
- * parole_duration (long)
+ * parole_interval (long)
+ * parole_window (long)
+ * parole_duration (long)
+ * screen_thresholds (long[4])
+ * elapsed_thresholds (long[4])
+ * strong_usage_duration (long)
+ * notification_seen_duration (long)
+ * system_update_usage_duration (long)
+ * prediction_timeout (long)
+ * sync_adapter_duration (long)
+ * exempted_sync_duration (long)
+ * system_interaction_duration (long)
+ * stable_charging_threshold (long)
*
* idle_duration (long) // This is deprecated and used to circumvent b/26355386.
+ * idle_duration2 (long) // deprecated
+ * wallclock_threshold (long) // deprecated
* </pre>
*
* <p>
diff --git a/core/java/android/transition/ChangeBounds.java b/core/java/android/transition/ChangeBounds.java
index 546f93a..56af3ac 100644
--- a/core/java/android/transition/ChangeBounds.java
+++ b/core/java/android/transition/ChangeBounds.java
@@ -311,6 +311,38 @@
++numChanges;
}
if (numChanges > 0) {
+ if (view.getParent() instanceof ViewGroup) {
+ final ViewGroup parent = (ViewGroup) view.getParent();
+ parent.suppressLayout(true);
+ TransitionListener transitionListener = new TransitionListenerAdapter() {
+ boolean mCanceled = false;
+
+ @Override
+ public void onTransitionCancel(Transition transition) {
+ parent.suppressLayout(false);
+ mCanceled = true;
+ }
+
+ @Override
+ public void onTransitionEnd(Transition transition) {
+ if (!mCanceled) {
+ parent.suppressLayout(false);
+ }
+ transition.removeListener(this);
+ }
+
+ @Override
+ public void onTransitionPause(Transition transition) {
+ parent.suppressLayout(false);
+ }
+
+ @Override
+ public void onTransitionResume(Transition transition) {
+ parent.suppressLayout(true);
+ }
+ };
+ addListener(transitionListener);
+ }
Animator anim;
if (!mResizeClip) {
view.setLeftTopRightBottom(startLeft, startTop, startRight, startBottom);
@@ -398,38 +430,6 @@
anim = TransitionUtils.mergeAnimators(positionAnimator,
clipAnimator);
}
- if (view.getParent() instanceof ViewGroup) {
- final ViewGroup parent = (ViewGroup) view.getParent();
- parent.suppressLayout(true);
- TransitionListener transitionListener = new TransitionListenerAdapter() {
- boolean mCanceled = false;
-
- @Override
- public void onTransitionCancel(Transition transition) {
- parent.suppressLayout(false);
- mCanceled = true;
- }
-
- @Override
- public void onTransitionEnd(Transition transition) {
- if (!mCanceled) {
- parent.suppressLayout(false);
- }
- transition.removeListener(this);
- }
-
- @Override
- public void onTransitionPause(Transition transition) {
- parent.suppressLayout(false);
- }
-
- @Override
- public void onTransitionResume(Transition transition) {
- parent.suppressLayout(true);
- }
- };
- addListener(transitionListener);
- }
return anim;
}
} else {
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 6b16d42..3807079 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -20850,7 +20850,9 @@
}
// If this isn't laid out yet, focus assignment will be handled during the "deferment/
// backtracking" of requestFocus during layout, so don't touch focus here.
- if (!sCanFocusZeroSized && isLayoutValid()) {
+ if (!sCanFocusZeroSized && isLayoutValid()
+ // Don't touch focus if animating
+ && !(mParent instanceof ViewGroup && ((ViewGroup) mParent).isLayoutSuppressed())) {
if (newWidth <= 0 || newHeight <= 0) {
if (hasFocus()) {
clearFocus();
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 4bd6fc8..239185e 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -245,7 +245,7 @@
final WindowLeaked mLocation;
- final WindowManager.LayoutParams mWindowAttributes = new WindowManager.LayoutParams();
+ public final WindowManager.LayoutParams mWindowAttributes = new WindowManager.LayoutParams();
final W mWindow;
diff --git a/core/java/android/widget/Magnifier.java b/core/java/android/widget/Magnifier.java
index f1a1457..08c4dc9 100644
--- a/core/java/android/widget/Magnifier.java
+++ b/core/java/android/widget/Magnifier.java
@@ -161,6 +161,15 @@
// to the magnified view. This will not take into account overlapping views.
final Rect viewVisibleRegion = new Rect();
mView.getGlobalVisibleRect(viewVisibleRegion);
+ if (mView.getViewRootImpl() != null) {
+ // Clamping coordinates relative to the surface, not to the window.
+ final Rect surfaceInsets = mView.getViewRootImpl().mWindowAttributes.surfaceInsets;
+ viewVisibleRegion.offset(surfaceInsets.left, surfaceInsets.top);
+ }
+ if (mView instanceof SurfaceView) {
+ // If we copy content from a SurfaceView, clamp coordinates relative to it.
+ viewVisibleRegion.offset(-mViewCoordinatesInSurface[0], -mViewCoordinatesInSurface[1]);
+ }
final int startX = Math.max(viewVisibleRegion.left, Math.min(
mCenterZoomCoords.x - mBitmapWidth / 2,
viewVisibleRegion.right - mBitmapWidth));
@@ -235,13 +244,17 @@
/**
* @hide
+ *
+ * @return The top left coordinates of the magnifier, relative to the parent window.
*/
@Nullable
public Point getWindowCoords() {
if (mWindow == null) {
return null;
}
- return new Point(mWindow.mLastDrawContentPositionX, mWindow.mLastDrawContentPositionY);
+ final Rect surfaceInsets = mView.getViewRootImpl().mWindowAttributes.surfaceInsets;
+ return new Point(mWindow.mLastDrawContentPositionX - surfaceInsets.left,
+ mWindow.mLastDrawContentPositionY - surfaceInsets.top);
}
@Nullable
@@ -308,8 +321,9 @@
} else if (mView.getViewRootImpl() != null) {
final ViewRootImpl viewRootImpl = mView.getViewRootImpl();
surface = viewRootImpl.mSurface;
- surfaceWidth = viewRootImpl.getWidth();
- surfaceHeight = viewRootImpl.getHeight();
+ final Rect surfaceInsets = viewRootImpl.mWindowAttributes.surfaceInsets;
+ surfaceWidth = viewRootImpl.getWidth() + surfaceInsets.left + surfaceInsets.right;
+ surfaceHeight = viewRootImpl.getHeight() + surfaceInsets.top + surfaceInsets.bottom;
} else {
surface = null;
surfaceWidth = NONEXISTENT_PREVIOUS_CONFIG_VALUE;
@@ -328,11 +342,31 @@
// Clamp window coordinates inside the parent surface, to avoid displaying
// the magnifier out of screen or overlapping with system insets.
- final Rect insets = mView.getRootWindowInsets().getSystemWindowInsets();
- final int windowCoordsX = Math.max(insets.left,
- Math.min(surfaceWidth - mWindowWidth - insets.right, mWindowCoords.x));
- final int windowCoordsY = Math.max(insets.top,
- Math.min(surfaceHeight - mWindowHeight - insets.bottom, mWindowCoords.y));
+ Rect windowBounds = null;
+ if (mView.getViewRootImpl() != null) {
+ // TODO: deduplicate against the first part of #getValidParentSurfaceForMagnifier()
+ // TODO: deduplicate against the first part of the current method
+ final ViewRootImpl viewRootImpl = mView.getViewRootImpl();
+ final Surface parentSurface = viewRootImpl.mSurface;
+ final Rect surfaceInsets = viewRootImpl.mWindowAttributes.surfaceInsets;
+ final int parentWidth =
+ viewRootImpl.getWidth() + surfaceInsets.left + surfaceInsets.right;
+ final int parentHeight =
+ viewRootImpl.getHeight() + surfaceInsets.top + surfaceInsets.bottom;
+ if (parentSurface != null && parentSurface.isValid()) {
+ final Rect systemInsets = mView.getRootWindowInsets().getSystemWindowInsets();
+ windowBounds = new Rect(systemInsets.left, systemInsets.top,
+ parentWidth - systemInsets.right, parentHeight - systemInsets.bottom);
+ }
+ }
+ if (windowBounds == null && mView instanceof SurfaceView) {
+ windowBounds = ((SurfaceView) mView).getHolder().getSurfaceFrame();
+ }
+
+ final int windowCoordsX = Math.max(windowBounds.left,
+ Math.min(windowBounds.right - mWindowWidth, mWindowCoords.x));
+ final int windowCoordsY = Math.max(windowBounds.top,
+ Math.min(windowBounds.bottom - mWindowHeight, mWindowCoords.y));
// Perform the pixel copy.
mPixelCopyRequestRect.set(clampedStartXInSurface,
diff --git a/core/java/com/android/internal/content/PackageHelper.java b/core/java/com/android/internal/content/PackageHelper.java
index 8a456d1..e2b8f7d 100644
--- a/core/java/com/android/internal/content/PackageHelper.java
+++ b/core/java/com/android/internal/content/PackageHelper.java
@@ -94,14 +94,6 @@
abstract public boolean getAllow3rdPartyOnInternalConfig(Context context);
abstract public ApplicationInfo getExistingAppInfo(Context context, String packageName);
abstract public File getDataDirectory();
-
- public boolean fitsOnInternalStorage(Context context, SessionParams params)
- throws IOException {
- StorageManager storage = getStorageManager(context);
- final UUID target = storage.getUuidForPath(getDataDirectory());
- return (params.sizeBytes <= storage.getAllocatableBytes(target,
- translateAllocateFlags(params.installFlags)));
- }
}
private synchronized static TestableInterface getDefaultTestableInterface() {
@@ -175,6 +167,7 @@
@VisibleForTesting
public static String resolveInstallVolume(Context context, SessionParams params,
TestableInterface testInterface) throws IOException {
+ final StorageManager storageManager = testInterface.getStorageManager(context);
final boolean forceAllowOnExternal = testInterface.getForceAllowOnExternalSetting(context);
final boolean allow3rdPartyOnInternal =
testInterface.getAllow3rdPartyOnInternalConfig(context);
@@ -183,9 +176,31 @@
ApplicationInfo existingInfo = testInterface.getExistingAppInfo(context,
params.appPackageName);
- final boolean fitsOnInternal = testInterface.fitsOnInternalStorage(context, params);
- final StorageManager storageManager =
- testInterface.getStorageManager(context);
+ // Figure out best candidate volume, and also if we fit on internal
+ final ArraySet<String> allCandidates = new ArraySet<>();
+ boolean fitsOnInternal = false;
+ VolumeInfo bestCandidate = null;
+ long bestCandidateAvailBytes = Long.MIN_VALUE;
+ for (VolumeInfo vol : storageManager.getVolumes()) {
+ if (vol.type == VolumeInfo.TYPE_PRIVATE && vol.isMountedWritable()) {
+ final boolean isInternalStorage = ID_PRIVATE_INTERNAL.equals(vol.id);
+ final UUID target = storageManager.getUuidForPath(new File(vol.path));
+ final long availBytes = storageManager.getAllocatableBytes(target,
+ translateAllocateFlags(params.installFlags));
+ if (isInternalStorage) {
+ fitsOnInternal = (params.sizeBytes <= availBytes);
+ }
+ if (!isInternalStorage || allow3rdPartyOnInternal) {
+ if (availBytes >= params.sizeBytes) {
+ allCandidates.add(vol.fsUuid);
+ }
+ if (availBytes >= bestCandidateAvailBytes) {
+ bestCandidate = vol;
+ bestCandidateAvailBytes = availBytes;
+ }
+ }
+ }
+ }
// System apps always forced to internal storage
if (existingInfo != null && existingInfo.isSystemApp()) {
@@ -198,27 +213,6 @@
}
}
- // Now deal with non-system apps.
- final ArraySet<String> allCandidates = new ArraySet<>();
- VolumeInfo bestCandidate = null;
- long bestCandidateAvailBytes = Long.MIN_VALUE;
- for (VolumeInfo vol : storageManager.getVolumes()) {
- boolean isInternalStorage = ID_PRIVATE_INTERNAL.equals(vol.id);
- if (vol.type == VolumeInfo.TYPE_PRIVATE && vol.isMountedWritable()
- && (!isInternalStorage || allow3rdPartyOnInternal)) {
- final UUID target = storageManager.getUuidForPath(new File(vol.path));
- final long availBytes = storageManager.getAllocatableBytes(target,
- translateAllocateFlags(params.installFlags));
- if (availBytes >= params.sizeBytes) {
- allCandidates.add(vol.fsUuid);
- }
- if (availBytes >= bestCandidateAvailBytes) {
- bestCandidate = vol;
- bestCandidateAvailBytes = availBytes;
- }
- }
- }
-
// If app expresses strong desire for internal storage, honor it
if (!forceAllowOnExternal
&& params.installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
diff --git a/core/java/com/android/internal/widget/MessagingGroup.java b/core/java/com/android/internal/widget/MessagingGroup.java
index 3f73237..4104b6ca9d 100644
--- a/core/java/com/android/internal/widget/MessagingGroup.java
+++ b/core/java/com/android/internal/widget/MessagingGroup.java
@@ -118,7 +118,8 @@
ViewGroup parent = (ViewGroup) mSenderName.getParent();
int top = getDistanceFromParent(mSenderName, parent) - getDistanceFromParent(
mMessageContainer, parent) + mSenderName.getHeight();
- clipRect = new Rect(0, top, mDisplaySize.x, mDisplaySize.y);
+ int size = Math.max(mDisplaySize.x, mDisplaySize.y);
+ clipRect = new Rect(0, top, size, size);
} else {
clipRect = null;
}
diff --git a/core/java/com/android/internal/widget/MessagingLayout.java b/core/java/com/android/internal/widget/MessagingLayout.java
index df20e63..af9aae3 100644
--- a/core/java/com/android/internal/widget/MessagingLayout.java
+++ b/core/java/com/android/internal/widget/MessagingLayout.java
@@ -110,7 +110,8 @@
// We still want to clip, but only on the top, since views can temporarily out of bounds
// during transitions.
DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
- Rect rect = new Rect(0, 0, displayMetrics.widthPixels, displayMetrics.heightPixels);
+ int size = Math.max(displayMetrics.widthPixels, displayMetrics.heightPixels);
+ Rect rect = new Rect(0, 0, size, size);
mMessagingLinearLayout.setClipBounds(rect);
mTitleView = findViewById(R.id.title);
mAvatarSize = getResources().getDimensionPixelSize(R.dimen.messaging_avatar_size);
diff --git a/core/java/com/android/internal/widget/MessagingTextMessage.java b/core/java/com/android/internal/widget/MessagingTextMessage.java
index 794cc1d..219116e 100644
--- a/core/java/com/android/internal/widget/MessagingTextMessage.java
+++ b/core/java/com/android/internal/widget/MessagingTextMessage.java
@@ -105,7 +105,7 @@
public int getMeasuredType() {
boolean measuredTooSmall = getMeasuredHeight()
< getLayoutHeight() + getPaddingTop() + getPaddingBottom();
- if (measuredTooSmall) {
+ if (measuredTooSmall && getLineCount() <= 1) {
return MEASURED_TOO_SMALL;
} else {
Layout layout = getLayout();
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 8235507..92560f3 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1458,6 +1458,12 @@
<permission android:name="android.permission.MANAGE_WIFI_WHEN_PERMISSION_REVIEW_REQUIRED"
android:protectionLevel="signature" />
+ <!-- #SystemApi @hide Allows an app to bypass Private DNS.
+ <p>Not for use by third-party applications.
+ TODO: publish as system API in next API release. -->
+ <permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS"
+ android:protectionLevel="signature" />
+
<!-- ======================================= -->
<!-- Permissions for short range, peripheral networks -->
<!-- ======================================= -->
diff --git a/core/res/res/layout/notification_material_reply_text.xml b/core/res/res/layout/notification_material_reply_text.xml
index dbf2dd0..71632a2 100644
--- a/core/res/res/layout/notification_material_reply_text.xml
+++ b/core/res/res/layout/notification_material_reply_text.xml
@@ -56,7 +56,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginStart="@dimen/notification_content_margin_start"
android:layout_marginEnd="@dimen/notification_content_margin_end">
<TextView
android:id="@+id/notification_material_reply_text_1"
@@ -72,7 +71,6 @@
android:layout_height="@dimen/messaging_group_sending_progress_size"
android:layout_width="@dimen/messaging_group_sending_progress_size"
android:layout_marginStart="@dimen/notification_content_margin_start"
- android:layout_marginEnd="@dimen/notification_content_margin_end"
android:layout_gravity="center"
android:indeterminate="true"
style="?android:attr/progressBarStyleSmall" />
diff --git a/core/res/res/layout/notification_template_messaging_group.xml b/core/res/res/layout/notification_template_messaging_group.xml
index 9bdc495..08f8f57 100644
--- a/core/res/res/layout/notification_template_messaging_group.xml
+++ b/core/res/res/layout/notification_template_messaging_group.xml
@@ -42,8 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/notification_text_margin_top"
- android:spacing="2dp"
- android:layout_weight="1"/>
+ android:spacing="2dp"/>
</com.android.internal.widget.RemeasuringLinearLayout>
<FrameLayout
android:id="@+id/messaging_group_icon_container"
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 5c80d4d2..780cda2 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1836,12 +1836,16 @@
<string name="db_default_sync_mode" translatable="false">FULL</string>
<!-- The database synchronization mode when using Write-Ahead Logging.
- FULL is safest and preserves durability at the cost of extra fsyncs.
- NORMAL sacrifices durability in WAL mode because syncs are only performed before
- and after checkpoint operations. If checkpoints are infrequent and power loss
- occurs, then committed transactions could be lost and applications might break.
+ From https://www.sqlite.org/pragma.html#pragma_synchronous:
+ WAL mode is safe from corruption with synchronous=NORMAL, and probably DELETE mode is safe
+ too on modern filesystems. WAL mode is always consistent with synchronous=NORMAL, but WAL
+ mode does lose durability. A transaction committed in WAL mode with
+ synchronous=NORMAL might roll back following a power loss or system crash.
+ Transactions are durable across application crashes regardless of the synchronous setting
+ or journal mode. The synchronous=NORMAL setting is a good choice for most applications
+ running in WAL mode.
Choices are: FULL, NORMAL, OFF. -->
- <string name="db_wal_sync_mode" translatable="false">FULL</string>
+ <string name="db_wal_sync_mode" translatable="false">NORMAL</string>
<!-- The Write-Ahead Log auto-checkpoint interval in database pages (typically 1 to 4KB).
The log is checkpointed automatically whenever it exceeds this many pages.
diff --git a/packages/CaptivePortalLogin/AndroidManifest.xml b/packages/CaptivePortalLogin/AndroidManifest.xml
index 5fc9627..72e37ed 100644
--- a/packages/CaptivePortalLogin/AndroidManifest.xml
+++ b/packages/CaptivePortalLogin/AndroidManifest.xml
@@ -23,6 +23,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
<uses-permission android:name="android.permission.NETWORK_SETTINGS" />
+ <uses-permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS" />
<application android:label="@string/app_name"
android:usesCleartextTraffic="true">
diff --git a/packages/CarrierDefaultApp/AndroidManifest.xml b/packages/CarrierDefaultApp/AndroidManifest.xml
index 824d9f4..4d9aaec 100644
--- a/packages/CarrierDefaultApp/AndroidManifest.xml
+++ b/packages/CarrierDefaultApp/AndroidManifest.xml
@@ -25,6 +25,7 @@
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
<uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" />
+ <uses-permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS" />
<uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME" />
<application
diff --git a/packages/Osu/Android.mk b/packages/Osu/Android.mk
deleted file mode 100644
index 63c7578..0000000
--- a/packages/Osu/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES += \
- src/com/android/hotspot2/app/IOSUAccessor.aidl \
- src/com/android/hotspot2/flow/IFlowService.aidl
-
-LOCAL_JAVA_LIBRARIES := telephony-common ims-common bouncycastle conscrypt
-
-LOCAL_PACKAGE_NAME := Osu
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-
-include $(BUILD_PACKAGE)
-
-########################
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/Osu/AndroidManifest.xml b/packages/Osu/AndroidManifest.xml
deleted file mode 100644
index b804739..0000000
--- a/packages/Osu/AndroidManifest.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2014 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="com.android.hotspot2">
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.READ_WIFI_CREDENTIAL" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
- <uses-permission android:name="android.permission.INTERNET" />
-
- <application
- android:enabled="true"
- android:allowBackup="true"
- android:icon="@mipmap/ic_launcher"
- android:label="@string/app_name"
- android:supportsRtl="true">
- <activity android:name="com.android.hotspot2.app.MainActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- <intent-filter>
- <action android:name="com.android.hotspot2.OSU_NOTIFICATION" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- </activity>
- <activity android:name="com.android.hotspot2.osu.OSUWebView">
- </activity>
- <service android:name=".app.OSUService" android:directBootAware="true">
- </service>
- <service android:name=".flow.FlowService" android:process=":osuflow">
- </service>
- </application>
-
-</manifest>
diff --git a/packages/Osu/res/layout/activity_main.xml b/packages/Osu/res/layout/activity_main.xml
deleted file mode 100644
index 7e33537..0000000
--- a/packages/Osu/res/layout/activity_main.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <TextView
- android:id="@+id/no_osu"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/no_osu"/>
- <ListView
- android:id="@+id/profile_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:divider="#1F000000"
- android:dividerHeight="1dp"
- android:padding="16dp" />
-
-</LinearLayout>
diff --git a/packages/Osu/res/layout/list_item.xml b/packages/Osu/res/layout/list_item.xml
deleted file mode 100644
index eb431d3..0000000
--- a/packages/Osu/res/layout/list_item.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:gravity="top"
- android:layout_marginTop="10sp"
- android:layout_marginBottom="10sp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
- <ImageView
- android:id="@+id/profile_logo"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
- <LinearLayout
- android:orientation="vertical"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="wrap_content">
-
- <TextView
- android:id="@+id/profile_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="20sp"/>
-
- <TextView
- android:id="@+id/profile_detail"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10sp"
- android:textSize="12sp"/>
-
- </LinearLayout>
-
-</LinearLayout>
diff --git a/packages/Osu/res/layout/osu_web_view.xml b/packages/Osu/res/layout/osu_web_view.xml
deleted file mode 100644
index 4eafb39..0000000
--- a/packages/Osu/res/layout/osu_web_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/container"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <WebView
- android:id="@+id/webview"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true" />
-
-</FrameLayout>
diff --git a/packages/Osu/res/mipmap-hdpi/ic_launcher.png b/packages/Osu/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bc..0000000
--- a/packages/Osu/res/mipmap-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu/res/mipmap-mdpi/ic_launcher.png b/packages/Osu/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0c..0000000
--- a/packages/Osu/res/mipmap-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu/res/mipmap-xhdpi/ic_launcher.png b/packages/Osu/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0..0000000
--- a/packages/Osu/res/mipmap-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu/res/mipmap-xxhdpi/ic_launcher.png b/packages/Osu/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72c..0000000
--- a/packages/Osu/res/mipmap-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu/res/mipmap-xxxhdpi/ic_launcher.png b/packages/Osu/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e1..0000000
--- a/packages/Osu/res/mipmap-xxxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu/res/values-w820dp/dimens.xml b/packages/Osu/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc816..0000000
--- a/packages/Osu/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
- <!-- Example customization of dimensions originally defined in res/values/dimens.xml
- (such as screen margins) for screens with more than 820dp of available width. This
- would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
- <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/packages/Osu/res/values/colors.xml b/packages/Osu/res/values/colors.xml
deleted file mode 100644
index 3ab3e9c..0000000
--- a/packages/Osu/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <color name="colorPrimary">#3F51B5</color>
- <color name="colorPrimaryDark">#303F9F</color>
- <color name="colorAccent">#FF4081</color>
-</resources>
diff --git a/packages/Osu/res/values/dimens.xml b/packages/Osu/res/values/dimens.xml
deleted file mode 100644
index 47c8224..0000000
--- a/packages/Osu/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
- <!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">16dp</dimen>
- <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/packages/Osu/res/values/strings.xml b/packages/Osu/res/values/strings.xml
deleted file mode 100644
index 93593dc..0000000
--- a/packages/Osu/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
- <string name="app_name">OSU</string>
- <string name="no_osu">No OSU available</string>
-</resources>
diff --git a/packages/Osu/src/com/android/anqp/ANQPElement.java b/packages/Osu/src/com/android/anqp/ANQPElement.java
deleted file mode 100644
index 58aee29..0000000
--- a/packages/Osu/src/com/android/anqp/ANQPElement.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.android.anqp;
-
-/**
- * Base class for an IEEE802.11u ANQP element.
- */
-public abstract class ANQPElement {
- private final Constants.ANQPElementType mID;
-
- protected ANQPElement(Constants.ANQPElementType id) {
- mID = id;
- }
-
- public Constants.ANQPElementType getID() {
- return mID;
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/Constants.java b/packages/Osu/src/com/android/anqp/Constants.java
deleted file mode 100644
index 214bb93..0000000
--- a/packages/Osu/src/com/android/anqp/Constants.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package com.android.anqp;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * ANQP related constants (802.11-2012)
- */
-public class Constants {
-
- public static final int NIBBLE_MASK = 0x0f;
- public static final int BYTE_MASK = 0xff;
- public static final int SHORT_MASK = 0xffff;
- public static final long INT_MASK = 0xffffffffL;
- public static final int BYTES_IN_SHORT = 2;
- public static final int BYTES_IN_INT = 4;
- public static final int BYTES_IN_EUI48 = 6;
- public static final long MILLIS_IN_A_SEC = 1000L;
-
- public static final int HS20_PREFIX = 0x119a6f50; // Note that this is represented as a LE int
- public static final int HS20_FRAME_PREFIX = 0x109a6f50;
- public static final int UTF8_INDICATOR = 1;
-
- public static final int LANG_CODE_LENGTH = 3;
-
- public static final int ANQP_QUERY_LIST = 256;
- public static final int ANQP_CAPABILITY_LIST = 257;
- public static final int ANQP_VENUE_NAME = 258;
- public static final int ANQP_EMERGENCY_NUMBER = 259;
- public static final int ANQP_NWK_AUTH_TYPE = 260;
- public static final int ANQP_ROAMING_CONSORTIUM = 261;
- public static final int ANQP_IP_ADDR_AVAILABILITY = 262;
- public static final int ANQP_NAI_REALM = 263;
- public static final int ANQP_3GPP_NETWORK = 264;
- public static final int ANQP_GEO_LOC = 265;
- public static final int ANQP_CIVIC_LOC = 266;
- public static final int ANQP_LOC_URI = 267;
- public static final int ANQP_DOM_NAME = 268;
- public static final int ANQP_EMERGENCY_ALERT = 269;
- public static final int ANQP_TDLS_CAP = 270;
- public static final int ANQP_EMERGENCY_NAI = 271;
- public static final int ANQP_NEIGHBOR_REPORT = 272;
- public static final int ANQP_VENDOR_SPEC = 56797;
-
- public static final int HS_QUERY_LIST = 1;
- public static final int HS_CAPABILITY_LIST = 2;
- public static final int HS_FRIENDLY_NAME = 3;
- public static final int HS_WAN_METRICS = 4;
- public static final int HS_CONN_CAPABILITY = 5;
- public static final int HS_NAI_HOME_REALM_QUERY = 6;
- public static final int HS_OPERATING_CLASS = 7;
- public static final int HS_OSU_PROVIDERS = 8;
- public static final int HS_ICON_REQUEST = 10;
- public static final int HS_ICON_FILE = 11;
-
- public enum ANQPElementType {
- ANQPQueryList,
- ANQPCapabilityList,
- ANQPVenueName,
- ANQPEmergencyNumber,
- ANQPNwkAuthType,
- ANQPRoamingConsortium,
- ANQPIPAddrAvailability,
- ANQPNAIRealm,
- ANQP3GPPNetwork,
- ANQPGeoLoc,
- ANQPCivicLoc,
- ANQPLocURI,
- ANQPDomName,
- ANQPEmergencyAlert,
- ANQPTDLSCap,
- ANQPEmergencyNAI,
- ANQPNeighborReport,
- ANQPVendorSpec,
- HSQueryList,
- HSCapabilityList,
- HSFriendlyName,
- HSWANMetrics,
- HSConnCapability,
- HSNAIHomeRealmQuery,
- HSOperatingclass,
- HSOSUProviders,
- HSIconRequest,
- HSIconFile
- }
-
- private static final Map<Integer, ANQPElementType> sAnqpMap = new HashMap<>();
- private static final Map<Integer, ANQPElementType> sHs20Map = new HashMap<>();
- private static final Map<ANQPElementType, Integer> sRevAnqpmap =
- new EnumMap<>(ANQPElementType.class);
- private static final Map<ANQPElementType, Integer> sRevHs20map =
- new EnumMap<>(ANQPElementType.class);
-
- static {
- sAnqpMap.put(ANQP_QUERY_LIST, ANQPElementType.ANQPQueryList);
- sAnqpMap.put(ANQP_CAPABILITY_LIST, ANQPElementType.ANQPCapabilityList);
- sAnqpMap.put(ANQP_VENUE_NAME, ANQPElementType.ANQPVenueName);
- sAnqpMap.put(ANQP_EMERGENCY_NUMBER, ANQPElementType.ANQPEmergencyNumber);
- sAnqpMap.put(ANQP_NWK_AUTH_TYPE, ANQPElementType.ANQPNwkAuthType);
- sAnqpMap.put(ANQP_ROAMING_CONSORTIUM, ANQPElementType.ANQPRoamingConsortium);
- sAnqpMap.put(ANQP_IP_ADDR_AVAILABILITY, ANQPElementType.ANQPIPAddrAvailability);
- sAnqpMap.put(ANQP_NAI_REALM, ANQPElementType.ANQPNAIRealm);
- sAnqpMap.put(ANQP_3GPP_NETWORK, ANQPElementType.ANQP3GPPNetwork);
- sAnqpMap.put(ANQP_GEO_LOC, ANQPElementType.ANQPGeoLoc);
- sAnqpMap.put(ANQP_CIVIC_LOC, ANQPElementType.ANQPCivicLoc);
- sAnqpMap.put(ANQP_LOC_URI, ANQPElementType.ANQPLocURI);
- sAnqpMap.put(ANQP_DOM_NAME, ANQPElementType.ANQPDomName);
- sAnqpMap.put(ANQP_EMERGENCY_ALERT, ANQPElementType.ANQPEmergencyAlert);
- sAnqpMap.put(ANQP_TDLS_CAP, ANQPElementType.ANQPTDLSCap);
- sAnqpMap.put(ANQP_EMERGENCY_NAI, ANQPElementType.ANQPEmergencyNAI);
- sAnqpMap.put(ANQP_NEIGHBOR_REPORT, ANQPElementType.ANQPNeighborReport);
- sAnqpMap.put(ANQP_VENDOR_SPEC, ANQPElementType.ANQPVendorSpec);
-
- sHs20Map.put(HS_QUERY_LIST, ANQPElementType.HSQueryList);
- sHs20Map.put(HS_CAPABILITY_LIST, ANQPElementType.HSCapabilityList);
- sHs20Map.put(HS_FRIENDLY_NAME, ANQPElementType.HSFriendlyName);
- sHs20Map.put(HS_WAN_METRICS, ANQPElementType.HSWANMetrics);
- sHs20Map.put(HS_CONN_CAPABILITY, ANQPElementType.HSConnCapability);
- sHs20Map.put(HS_NAI_HOME_REALM_QUERY, ANQPElementType.HSNAIHomeRealmQuery);
- sHs20Map.put(HS_OPERATING_CLASS, ANQPElementType.HSOperatingclass);
- sHs20Map.put(HS_OSU_PROVIDERS, ANQPElementType.HSOSUProviders);
- sHs20Map.put(HS_ICON_REQUEST, ANQPElementType.HSIconRequest);
- sHs20Map.put(HS_ICON_FILE, ANQPElementType.HSIconFile);
-
- for (Map.Entry<Integer, ANQPElementType> entry : sAnqpMap.entrySet()) {
- sRevAnqpmap.put(entry.getValue(), entry.getKey());
- }
- for (Map.Entry<Integer, ANQPElementType> entry : sHs20Map.entrySet()) {
- sRevHs20map.put(entry.getValue(), entry.getKey());
- }
- }
-
- public static ANQPElementType mapANQPElement(int id) {
- return sAnqpMap.get(id);
- }
-
- public static ANQPElementType mapHS20Element(int id) {
- return sHs20Map.get(id);
- }
-
- public static Integer getANQPElementID(ANQPElementType elementType) {
- return sRevAnqpmap.get(elementType);
- }
-
- public static Integer getHS20ElementID(ANQPElementType elementType) {
- return sRevHs20map.get(elementType);
- }
-
- public static boolean hasBaseANQPElements(Collection<ANQPElementType> elements) {
- if (elements == null) {
- return false;
- }
- for (ANQPElementType element : elements) {
- if (sRevAnqpmap.containsKey(element)) {
- return true;
- }
- }
- return false;
- }
-
- public static boolean hasR2Elements(List<ANQPElementType> elements) {
- return elements.contains(ANQPElementType.HSOSUProviders);
- }
-
- public static long getInteger(ByteBuffer payload, ByteOrder bo, int size) {
- byte[] octets = new byte[size];
- payload.get(octets);
- long value = 0;
- if (bo == ByteOrder.LITTLE_ENDIAN) {
- for (int n = octets.length - 1; n >= 0; n--) {
- value = (value << Byte.SIZE) | (octets[n] & BYTE_MASK);
- }
- }
- else {
- for (byte octet : octets) {
- value = (value << Byte.SIZE) | (octet & BYTE_MASK);
- }
- }
- return value;
- }
-
- public static String getPrefixedString(ByteBuffer payload, int lengthLength, Charset charset)
- throws ProtocolException {
- return getPrefixedString(payload, lengthLength, charset, false);
- }
-
- public static String getPrefixedString(ByteBuffer payload, int lengthLength, Charset charset,
- boolean useNull) throws ProtocolException {
- if (payload.remaining() < lengthLength) {
- throw new ProtocolException("Runt string: " + payload.remaining());
- }
- return getString(payload, (int) getInteger(payload, ByteOrder.LITTLE_ENDIAN,
- lengthLength), charset, useNull);
- }
-
- public static String getTrimmedString(ByteBuffer payload, int length, Charset charset)
- throws ProtocolException {
- String s = getString(payload, length, charset, false);
- int zero = length - 1;
- while (zero >= 0) {
- if (s.charAt(zero) != 0) {
- break;
- }
- zero--;
- }
- return zero < length - 1 ? s.substring(0, zero + 1) : s;
- }
-
- public static String getString(ByteBuffer payload, int length, Charset charset)
- throws ProtocolException {
- return getString(payload, length, charset, false);
- }
-
- public static String getString(ByteBuffer payload, int length, Charset charset, boolean useNull)
- throws ProtocolException {
- if (length > payload.remaining()) {
- throw new ProtocolException("Bad string length: " + length);
- }
- if (useNull && length == 0) {
- return null;
- }
- byte[] octets = new byte[length];
- payload.get(octets);
- return new String(octets, charset);
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/HSIconFileElement.java b/packages/Osu/src/com/android/anqp/HSIconFileElement.java
deleted file mode 100644
index 28c597a..0000000
--- a/packages/Osu/src/com/android/anqp/HSIconFileElement.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.android.anqp;
-
-import android.os.Parcel;
-
-import com.android.hotspot2.Utils;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-
-import static com.android.anqp.Constants.BYTE_MASK;
-import static com.android.anqp.Constants.SHORT_MASK;
-
-/**
- * The Icon Binary File vendor specific ANQP Element,
- * Wi-Fi Alliance Hotspot 2.0 (Release 2) Technical Specification - Version 5.00,
- * section 4.11
- */
-public class HSIconFileElement extends ANQPElement {
-
- public enum StatusCode {Success, FileNotFound, Unspecified}
-
- private final StatusCode mStatusCode;
- private final String mType;
- private final byte[] mIconData;
-
- public HSIconFileElement(Constants.ANQPElementType infoID, ByteBuffer payload)
- throws ProtocolException {
- super(infoID);
-
- if (payload.remaining() < 4) {
- throw new ProtocolException("Truncated icon file: " + payload.remaining());
- }
-
- int statusID = payload.get() & BYTE_MASK;
- mStatusCode = statusID < StatusCode.values().length ? StatusCode.values()[statusID] : null;
- mType = Constants.getPrefixedString(payload, 1, StandardCharsets.US_ASCII);
-
- int dataLength = payload.getShort() & SHORT_MASK;
- mIconData = new byte[dataLength];
- payload.get(mIconData);
- }
-
- public StatusCode getStatusCode() {
- return mStatusCode;
- }
-
- public String getType() {
- return mType;
- }
-
- public byte[] getIconData() {
- return mIconData;
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (thatObject == this) {
- return true;
- } else if (thatObject.getClass() != HSIconFileElement.class) {
- return false;
- }
- HSIconFileElement that = (HSIconFileElement) thatObject;
- if (getStatusCode() != that.getStatusCode() || getStatusCode() != StatusCode.Success) {
- return false;
- }
- return getType().equals(that.getType()) && Arrays.equals(getIconData(), that.getIconData());
- }
-
- @Override
- public String toString() {
- return "HSIconFile{" +
- "statusCode=" + mStatusCode +
- ", type='" + mType + '\'' +
- ", iconData=" + mIconData.length + " bytes }";
- }
-
- public HSIconFileElement(Parcel in) {
- super(Constants.ANQPElementType.HSIconFile);
- mStatusCode = Utils.mapEnum(in.readInt(), StatusCode.class);
- mType = in.readString();
- mIconData = in.readBlob();
- }
-
- public void writeParcel(Parcel out) {
- out.writeInt(mStatusCode.ordinal());
- out.writeString(mType);
- out.writeBlob(mIconData);
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/HSOsuProvidersElement.java b/packages/Osu/src/com/android/anqp/HSOsuProvidersElement.java
deleted file mode 100644
index 646e003..0000000
--- a/packages/Osu/src/com/android/anqp/HSOsuProvidersElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.android.anqp;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * The OSU Providers List vendor specific ANQP Element,
- * Wi-Fi Alliance Hotspot 2.0 (Release 2) Technical Specification - Version 5.00,
- * section 4.8
- */
-public class HSOsuProvidersElement extends ANQPElement {
- private final String mSSID;
- private final List<OSUProvider> mProviders;
-
- public HSOsuProvidersElement(Constants.ANQPElementType infoID, ByteBuffer payload)
- throws ProtocolException {
- super(infoID);
-
- mSSID = Constants.getPrefixedString(payload, 1, StandardCharsets.UTF_8);
- int providerCount = payload.get() & Constants.BYTE_MASK;
-
- mProviders = new ArrayList<>(providerCount);
-
- while (providerCount > 0) {
- mProviders.add(new OSUProvider(mSSID, payload));
- providerCount--;
- }
- }
-
- public String getSSID() {
- return mSSID;
- }
-
- public List<OSUProvider> getProviders() {
- return Collections.unmodifiableList(mProviders);
- }
-
- @Override
- public String toString() {
- return "HSOsuProviders{" +
- "SSID='" + mSSID + '\'' +
- ", providers=" + mProviders +
- '}';
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/I18Name.java b/packages/Osu/src/com/android/anqp/I18Name.java
deleted file mode 100644
index b048228..0000000
--- a/packages/Osu/src/com/android/anqp/I18Name.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.android.anqp;
-
-import android.os.Parcel;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.Locale;
-
-import static com.android.anqp.Constants.BYTE_MASK;
-
-/**
- * A generic Internationalized name used in ANQP elements as specified in 802.11-2012 and
- * "Wi-Fi Alliance Hotspot 2.0 (Release 2) Technical Specification - Version 5.00"
- */
-public class I18Name {
- private final String mLanguage;
- private final Locale mLocale;
- private final String mText;
-
- public I18Name(ByteBuffer payload) throws ProtocolException {
- if (payload.remaining() < Constants.LANG_CODE_LENGTH + 1) {
- throw new ProtocolException("Truncated I18Name: " + payload.remaining());
- }
- int nameLength = payload.get() & BYTE_MASK;
- if (nameLength < Constants.LANG_CODE_LENGTH) {
- throw new ProtocolException("Runt I18Name: " + nameLength);
- }
- mLanguage = Constants.getTrimmedString(payload,
- Constants.LANG_CODE_LENGTH, StandardCharsets.US_ASCII);
- mLocale = Locale.forLanguageTag(mLanguage);
- mText = Constants.getString(payload, nameLength -
- Constants.LANG_CODE_LENGTH, StandardCharsets.UTF_8);
- }
-
- public I18Name(String compoundString) throws IOException {
- if (compoundString.length() < Constants.LANG_CODE_LENGTH) {
- throw new IOException("I18String too short: '" + compoundString + "'");
- }
- mLanguage = compoundString.substring(0, Constants.LANG_CODE_LENGTH);
- mText = compoundString.substring(Constants.LANG_CODE_LENGTH);
- mLocale = Locale.forLanguageTag(mLanguage);
- }
-
- public String getLanguage() {
- return mLanguage;
- }
-
- public Locale getLocale() {
- return mLocale;
- }
-
- public String getText() {
- return mText;
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (this == thatObject) {
- return true;
- }
- if (thatObject == null || getClass() != thatObject.getClass()) {
- return false;
- }
-
- I18Name that = (I18Name) thatObject;
- return mLanguage.equals(that.mLanguage) && mText.equals(that.mText);
- }
-
- @Override
- public int hashCode() {
- int result = mLanguage.hashCode();
- result = 31 * result + mText.hashCode();
- return result;
- }
-
- @Override
- public String toString() {
- return mText + ':' + mLocale.getLanguage();
- }
-
- public I18Name(Parcel in) throws IOException {
- mLanguage = in.readString();
- mText = in.readString();
- mLocale = Locale.forLanguageTag(mLanguage);
- }
-
- public void writeParcel(Parcel out) {
- out.writeString(mLanguage);
- out.writeString(mText);
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/IconInfo.java b/packages/Osu/src/com/android/anqp/IconInfo.java
deleted file mode 100644
index ac507c7..0000000
--- a/packages/Osu/src/com/android/anqp/IconInfo.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.android.anqp;
-
-import android.os.Parcel;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-
-import static com.android.anqp.Constants.SHORT_MASK;
-
-/**
- * The Icons available OSU Providers sub field, as specified in
- * Wi-Fi Alliance Hotspot 2.0 (Release 2) Technical Specification - Version 5.00,
- * section 4.8.1.4
- */
-public class IconInfo {
- private final int mWidth;
- private final int mHeight;
- private final String mLanguage;
- private final String mIconType;
- private final String mFileName;
-
- public IconInfo(ByteBuffer payload) throws ProtocolException {
- if (payload.remaining() < 9) {
- throw new ProtocolException("Truncated icon meta data");
- }
-
- mWidth = payload.getShort() & SHORT_MASK;
- mHeight = payload.getShort() & SHORT_MASK;
- mLanguage = Constants.getTrimmedString(payload,
- Constants.LANG_CODE_LENGTH, StandardCharsets.US_ASCII);
- mIconType = Constants.getPrefixedString(payload, 1, StandardCharsets.US_ASCII);
- mFileName = Constants.getPrefixedString(payload, 1, StandardCharsets.UTF_8);
- }
-
- public int getWidth() {
- return mWidth;
- }
-
- public int getHeight() {
- return mHeight;
- }
-
- public String getLanguage() {
- return mLanguage;
- }
-
- public String getIconType() {
- return mIconType;
- }
-
- public String getFileName() {
- return mFileName;
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (this == thatObject) {
- return true;
- }
- if (thatObject == null || getClass() != thatObject.getClass()) {
- return false;
- }
-
- IconInfo that = (IconInfo) thatObject;
- return mHeight == that.mHeight &&
- mWidth == that.mWidth &&
- mFileName.equals(that.mFileName) &&
- mIconType.equals(that.mIconType) &&
- mLanguage.equals(that.mLanguage);
- }
-
- @Override
- public int hashCode() {
- int result = mWidth;
- result = 31 * result + mHeight;
- result = 31 * result + mLanguage.hashCode();
- result = 31 * result + mIconType.hashCode();
- result = 31 * result + mFileName.hashCode();
- return result;
- }
-
- @Override
- public String toString() {
- return "IconInfo{" +
- "Width=" + mWidth +
- ", Height=" + mHeight +
- ", Language=" + mLanguage +
- ", IconType='" + mIconType + '\'' +
- ", FileName='" + mFileName + '\'' +
- '}';
- }
-
- public IconInfo(Parcel in) {
- mWidth = in.readInt();
- mHeight = in.readInt();
- mLanguage = in.readString();
- mIconType = in.readString();
- mFileName = in.readString();
- }
-
- public void writeParcel(Parcel out) {
- out.writeInt(mWidth);
- out.writeInt(mHeight);
- out.writeString(mLanguage);
- out.writeString(mIconType);
- out.writeString(mFileName);
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/OSUProvider.java b/packages/Osu/src/com/android/anqp/OSUProvider.java
deleted file mode 100644
index 3724cf0..0000000
--- a/packages/Osu/src/com/android/anqp/OSUProvider.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.android.anqp;
-
-import android.os.Parcel;
-
-import com.android.hotspot2.Utils;
-
-import java.io.IOException;
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.android.anqp.Constants.BYTE_MASK;
-import static com.android.anqp.Constants.SHORT_MASK;
-
-/**
- * An OSU Provider, as specified in
- * Wi-Fi Alliance Hotspot 2.0 (Release 2) Technical Specification - Version 5.00,
- * section 4.8.1
- */
-public class OSUProvider {
-
- public enum OSUMethod {OmaDm, SoapXml}
-
- private final String mSSID;
- private final List<I18Name> mNames;
- private final String mOSUServer;
- private final List<OSUMethod> mOSUMethods;
- private final List<IconInfo> mIcons;
- private final String mOsuNai;
- private final List<I18Name> mServiceDescriptions;
- private final int mHashCode;
-
- public OSUProvider(String ssid, ByteBuffer payload) throws ProtocolException {
- if (payload.remaining() < 11) {
- throw new ProtocolException("Truncated OSU provider: " + payload.remaining());
- }
-
- mSSID = ssid;
-
- int length = payload.getShort() & SHORT_MASK;
- int namesLength = payload.getShort() & SHORT_MASK;
-
- ByteBuffer namesBuffer = payload.duplicate().order(ByteOrder.LITTLE_ENDIAN);
- namesBuffer.limit(namesBuffer.position() + namesLength);
- payload.position(payload.position() + namesLength);
-
- mNames = new ArrayList<>();
-
- while (namesBuffer.hasRemaining()) {
- mNames.add(new I18Name(namesBuffer));
- }
-
- mOSUServer = Constants.getPrefixedString(payload, 1, StandardCharsets.UTF_8);
- int methodLength = payload.get() & BYTE_MASK;
- mOSUMethods = new ArrayList<>(methodLength);
- while (methodLength > 0) {
- int methodID = payload.get() & BYTE_MASK;
- mOSUMethods.add(methodID < OSUMethod.values().length ?
- OSUMethod.values()[methodID] :
- null);
- methodLength--;
- }
-
- int iconsLength = payload.getShort() & SHORT_MASK;
- ByteBuffer iconsBuffer = payload.duplicate().order(ByteOrder.LITTLE_ENDIAN);
- iconsBuffer.limit(iconsBuffer.position() + iconsLength);
- payload.position(payload.position() + iconsLength);
-
- mIcons = new ArrayList<>();
-
- while (iconsBuffer.hasRemaining()) {
- mIcons.add(new IconInfo(iconsBuffer));
- }
-
- mOsuNai = Constants.getPrefixedString(payload, 1, StandardCharsets.UTF_8, true);
-
- int descriptionsLength = payload.getShort() & SHORT_MASK;
- ByteBuffer descriptionsBuffer = payload.duplicate().order(ByteOrder.LITTLE_ENDIAN);
- descriptionsBuffer.limit(descriptionsBuffer.position() + descriptionsLength);
- payload.position(payload.position() + descriptionsLength);
-
- mServiceDescriptions = new ArrayList<>();
-
- while (descriptionsBuffer.hasRemaining()) {
- mServiceDescriptions.add(new I18Name(descriptionsBuffer));
- }
-
- int result = mNames.hashCode();
- result = 31 * result + mSSID.hashCode();
- result = 31 * result + mOSUServer.hashCode();
- result = 31 * result + mOSUMethods.hashCode();
- result = 31 * result + mIcons.hashCode();
- result = 31 * result + (mOsuNai != null ? mOsuNai.hashCode() : 0);
- result = 31 * result + mServiceDescriptions.hashCode();
- mHashCode = result;
- }
-
- public String getSSID() {
- return mSSID;
- }
-
- public List<I18Name> getNames() {
- return mNames;
- }
-
- public String getOSUServer() {
- return mOSUServer;
- }
-
- public List<OSUMethod> getOSUMethods() {
- return mOSUMethods;
- }
-
- public List<IconInfo> getIcons() {
- return mIcons;
- }
-
- public String getOsuNai() {
- return mOsuNai;
- }
-
- public List<I18Name> getServiceDescriptions() {
- return mServiceDescriptions;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- OSUProvider that = (OSUProvider) o;
-
- if (!mSSID.equals(that.mSSID)) return false;
- if (!mOSUServer.equals(that.mOSUServer)) return false;
- if (!mNames.equals(that.mNames)) return false;
- if (!mServiceDescriptions.equals(that.mServiceDescriptions)) return false;
- if (!mIcons.equals(that.mIcons)) return false;
- if (!mOSUMethods.equals(that.mOSUMethods)) return false;
- if (mOsuNai != null ? !mOsuNai.equals(that.mOsuNai) : that.mOsuNai != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return mHashCode;
- }
-
- @Override
- public String toString() {
- return "OSUProvider{" +
- "names=" + mNames +
- ", OSUServer='" + mOSUServer + '\'' +
- ", OSUMethods=" + mOSUMethods +
- ", icons=" + mIcons +
- ", NAI='" + mOsuNai + '\'' +
- ", serviceDescriptions=" + mServiceDescriptions +
- '}';
- }
-
- public OSUProvider(Parcel in) throws IOException {
- mSSID = in.readString();
- int nameCount = in.readInt();
- mNames = new ArrayList<>(nameCount);
- for (int n = 0; n < nameCount; n++) {
- mNames.add(new I18Name(in));
- }
- mOSUServer = in.readString();
- int methodCount = in.readInt();
- mOSUMethods = new ArrayList<>(methodCount);
- for (int n = 0; n < methodCount; n++) {
- mOSUMethods.add(Utils.mapEnum(in.readInt(), OSUMethod.class));
- }
- int iconCount = in.readInt();
- mIcons = new ArrayList<>(iconCount);
- for (int n = 0; n < iconCount; n++) {
- mIcons.add(new IconInfo(in));
- }
- mOsuNai = in.readString();
- int serviceCount = in.readInt();
- mServiceDescriptions = new ArrayList<>(serviceCount);
- for (int n = 0; n < serviceCount; n++) {
- mServiceDescriptions.add(new I18Name(in));
- }
- mHashCode = in.readInt();
- }
-
- public void writeParcel(Parcel out) {
- out.writeString(mSSID);
- out.writeInt(mNames.size());
- for (I18Name name : mNames) {
- name.writeParcel(out);
- }
- out.writeString(mOSUServer);
- out.writeInt(mOSUMethods.size());
- for (OSUMethod method : mOSUMethods) {
- out.writeInt(method.ordinal());
- }
- out.writeInt(mIcons.size());
- for (IconInfo iconInfo : mIcons) {
- iconInfo.writeParcel(out);
- }
- out.writeString(mOsuNai);
- out.writeInt(mServiceDescriptions.size());
- for (I18Name serviceDescription : mServiceDescriptions) {
- serviceDescription.writeParcel(out);
- }
- out.writeInt(mHashCode);
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/eap/AuthParam.java b/packages/Osu/src/com/android/anqp/eap/AuthParam.java
deleted file mode 100644
index 4243954..0000000
--- a/packages/Osu/src/com/android/anqp/eap/AuthParam.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.android.anqp.eap;
-
-/**
- * An Authentication parameter, part of the NAI Realm ANQP element, specified in
- * IEEE802.11-2012 section 8.4.4.10, table 8-188
- */
-public interface AuthParam {
- public EAP.AuthInfoID getAuthInfoID();
-}
diff --git a/packages/Osu/src/com/android/anqp/eap/Credential.java b/packages/Osu/src/com/android/anqp/eap/Credential.java
deleted file mode 100644
index 0a89f4f..0000000
--- a/packages/Osu/src/com/android/anqp/eap/Credential.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.android.anqp.eap;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-
-import static com.android.anqp.Constants.BYTE_MASK;
-
-/**
- * An EAP authentication parameter, IEEE802.11-2012, table 8-188
- */
-public class Credential implements AuthParam {
-
- public enum CredType {
- Reserved,
- SIM,
- USIM,
- NFC,
- HWToken,
- Softoken,
- Certificate,
- Username,
- None,
- Anonymous,
- VendorSpecific}
-
- private final EAP.AuthInfoID mAuthInfoID;
- private final CredType mCredType;
-
- public Credential(EAP.AuthInfoID infoID, int length, ByteBuffer payload)
- throws ProtocolException {
- if (length != 1) {
- throw new ProtocolException("Bad length: " + length);
- }
-
- mAuthInfoID = infoID;
- int typeID = payload.get() & BYTE_MASK;
-
- mCredType = typeID < CredType.values().length ?
- CredType.values()[typeID] :
- CredType.Reserved;
- }
-
- @Override
- public EAP.AuthInfoID getAuthInfoID() {
- return mAuthInfoID;
- }
-
- @Override
- public int hashCode() {
- return mAuthInfoID.hashCode() * 31 + mCredType.hashCode();
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (thatObject == this) {
- return true;
- } else if (thatObject == null || thatObject.getClass() != Credential.class) {
- return false;
- } else {
- return ((Credential) thatObject).getCredType() == getCredType();
- }
- }
-
- public CredType getCredType() {
- return mCredType;
- }
-
- @Override
- public String toString() {
- return "Auth method " + mAuthInfoID + " = " + mCredType + "\n";
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/eap/EAP.java b/packages/Osu/src/com/android/anqp/eap/EAP.java
deleted file mode 100644
index 4b968b6..0000000
--- a/packages/Osu/src/com/android/anqp/eap/EAP.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.android.anqp.eap;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * EAP Related constants for the ANQP NAIRealm element, IEEE802.11-2012 section 8.4.4.10
- */
-public abstract class EAP {
-
- private static final Map<Integer, EAPMethodID> sEapIds = new HashMap<>();
- private static final Map<EAPMethodID, Integer> sRevEapIds = new HashMap<>();
- private static final Map<Integer, AuthInfoID> sAuthIds = new HashMap<>();
-
- public static final int EAP_MD5 = 4;
- public static final int EAP_OTP = 5;
- public static final int EAP_RSA = 9;
- public static final int EAP_KEA = 11;
- public static final int EAP_KEA_VALIDATE = 12;
- public static final int EAP_TLS = 13;
- public static final int EAP_LEAP = 17;
- public static final int EAP_SIM = 18;
- public static final int EAP_TTLS = 21;
- public static final int EAP_AKA = 23;
- public static final int EAP_3Com = 24;
- public static final int EAP_MSCHAPv2 = 26;
- public static final int EAP_PEAP = 29;
- public static final int EAP_POTP = 32;
- public static final int EAP_ActiontecWireless = 35;
- public static final int EAP_HTTPDigest = 38;
- public static final int EAP_SPEKE = 41;
- public static final int EAP_MOBAC = 42;
- public static final int EAP_FAST = 43;
- public static final int EAP_ZLXEAP = 44;
- public static final int EAP_Link = 45;
- public static final int EAP_PAX = 46;
- public static final int EAP_PSK = 47;
- public static final int EAP_SAKE = 48;
- public static final int EAP_IKEv2 = 49;
- public static final int EAP_AKAPrim = 50;
- public static final int EAP_GPSK = 51;
- public static final int EAP_PWD = 52;
- public static final int EAP_EKE = 53;
- public static final int EAP_TEAP = 55;
-
- public enum EAPMethodID {
- EAP_MD5,
- EAP_OTP,
- EAP_RSA,
- EAP_KEA,
- EAP_KEA_VALIDATE,
- EAP_TLS,
- EAP_LEAP,
- EAP_SIM,
- EAP_TTLS,
- EAP_AKA,
- EAP_3Com,
- EAP_MSCHAPv2,
- EAP_PEAP,
- EAP_POTP,
- EAP_ActiontecWireless,
- EAP_HTTPDigest,
- EAP_SPEKE,
- EAP_MOBAC,
- EAP_FAST,
- EAP_ZLXEAP,
- EAP_Link,
- EAP_PAX,
- EAP_PSK,
- EAP_SAKE,
- EAP_IKEv2,
- EAP_AKAPrim,
- EAP_GPSK,
- EAP_PWD,
- EAP_EKE,
- EAP_TEAP
- }
-
- public static final int ExpandedEAPMethod = 1;
- public static final int NonEAPInnerAuthType = 2;
- public static final int InnerAuthEAPMethodType = 3;
- public static final int ExpandedInnerEAPMethod = 4;
- public static final int CredentialType = 5;
- public static final int TunneledEAPMethodCredType = 6;
- public static final int VendorSpecific = 221;
-
- public enum AuthInfoID {
- Undefined,
- ExpandedEAPMethod,
- NonEAPInnerAuthType,
- InnerAuthEAPMethodType,
- ExpandedInnerEAPMethod,
- CredentialType,
- TunneledEAPMethodCredType,
- VendorSpecific
- }
-
- static {
- sEapIds.put(EAP_MD5, EAPMethodID.EAP_MD5);
- sEapIds.put(EAP_OTP, EAPMethodID.EAP_OTP);
- sEapIds.put(EAP_RSA, EAPMethodID.EAP_RSA);
- sEapIds.put(EAP_KEA, EAPMethodID.EAP_KEA);
- sEapIds.put(EAP_KEA_VALIDATE, EAPMethodID.EAP_KEA_VALIDATE);
- sEapIds.put(EAP_TLS, EAPMethodID.EAP_TLS);
- sEapIds.put(EAP_LEAP, EAPMethodID.EAP_LEAP);
- sEapIds.put(EAP_SIM, EAPMethodID.EAP_SIM);
- sEapIds.put(EAP_TTLS, EAPMethodID.EAP_TTLS);
- sEapIds.put(EAP_AKA, EAPMethodID.EAP_AKA);
- sEapIds.put(EAP_3Com, EAPMethodID.EAP_3Com);
- sEapIds.put(EAP_MSCHAPv2, EAPMethodID.EAP_MSCHAPv2);
- sEapIds.put(EAP_PEAP, EAPMethodID.EAP_PEAP);
- sEapIds.put(EAP_POTP, EAPMethodID.EAP_POTP);
- sEapIds.put(EAP_ActiontecWireless, EAPMethodID.EAP_ActiontecWireless);
- sEapIds.put(EAP_HTTPDigest, EAPMethodID.EAP_HTTPDigest);
- sEapIds.put(EAP_SPEKE, EAPMethodID.EAP_SPEKE);
- sEapIds.put(EAP_MOBAC, EAPMethodID.EAP_MOBAC);
- sEapIds.put(EAP_FAST, EAPMethodID.EAP_FAST);
- sEapIds.put(EAP_ZLXEAP, EAPMethodID.EAP_ZLXEAP);
- sEapIds.put(EAP_Link, EAPMethodID.EAP_Link);
- sEapIds.put(EAP_PAX, EAPMethodID.EAP_PAX);
- sEapIds.put(EAP_PSK, EAPMethodID.EAP_PSK);
- sEapIds.put(EAP_SAKE, EAPMethodID.EAP_SAKE);
- sEapIds.put(EAP_IKEv2, EAPMethodID.EAP_IKEv2);
- sEapIds.put(EAP_AKAPrim, EAPMethodID.EAP_AKAPrim);
- sEapIds.put(EAP_GPSK, EAPMethodID.EAP_GPSK);
- sEapIds.put(EAP_PWD, EAPMethodID.EAP_PWD);
- sEapIds.put(EAP_EKE, EAPMethodID.EAP_EKE);
- sEapIds.put(EAP_TEAP, EAPMethodID.EAP_TEAP);
-
- for (Map.Entry<Integer, EAPMethodID> entry : sEapIds.entrySet()) {
- sRevEapIds.put(entry.getValue(), entry.getKey());
- }
-
- sAuthIds.put(ExpandedEAPMethod, AuthInfoID.ExpandedEAPMethod);
- sAuthIds.put(NonEAPInnerAuthType, AuthInfoID.NonEAPInnerAuthType);
- sAuthIds.put(InnerAuthEAPMethodType, AuthInfoID.InnerAuthEAPMethodType);
- sAuthIds.put(ExpandedInnerEAPMethod, AuthInfoID.ExpandedInnerEAPMethod);
- sAuthIds.put(CredentialType, AuthInfoID.CredentialType);
- sAuthIds.put(TunneledEAPMethodCredType, AuthInfoID.TunneledEAPMethodCredType);
- sAuthIds.put(VendorSpecific, AuthInfoID.VendorSpecific);
- }
-
- public static EAPMethodID mapEAPMethod(int methodID) {
- return sEapIds.get(methodID);
- }
-
- public static Integer mapEAPMethod(EAPMethodID methodID) {
- return sRevEapIds.get(methodID);
- }
-
- public static AuthInfoID mapAuthMethod(int methodID) {
- return sAuthIds.get(methodID);
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/eap/EAPMethod.java b/packages/Osu/src/com/android/anqp/eap/EAPMethod.java
deleted file mode 100644
index fa6c2f9..0000000
--- a/packages/Osu/src/com/android/anqp/eap/EAPMethod.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.android.anqp.eap;
-
-import com.android.anqp.Constants;
-import com.android.hotspot2.AuthMatch;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * An EAP Method, part of the NAI Realm ANQP element, specified in
- * IEEE802.11-2012 section 8.4.4.10, figure 8-420
- */
-public class EAPMethod {
- private final EAP.EAPMethodID mEAPMethodID;
- private final Map<EAP.AuthInfoID, Set<AuthParam>> mAuthParams;
-
- public EAPMethod(ByteBuffer payload) throws ProtocolException {
- if (payload.remaining() < 3) {
- throw new ProtocolException("Runt EAP Method: " + payload.remaining());
- }
-
- int length = payload.get() & Constants.BYTE_MASK;
- int methodID = payload.get() & Constants.BYTE_MASK;
- int count = payload.get() & Constants.BYTE_MASK;
-
- mEAPMethodID = EAP.mapEAPMethod(methodID);
- mAuthParams = new EnumMap<>(EAP.AuthInfoID.class);
-
- int realCount = 0;
-
- ByteBuffer paramPayload = payload.duplicate().order(ByteOrder.LITTLE_ENDIAN);
- paramPayload.limit(paramPayload.position() + length - 2);
- payload.position(payload.position() + length - 2);
- while (paramPayload.hasRemaining()) {
- int id = paramPayload.get() & Constants.BYTE_MASK;
-
- EAP.AuthInfoID authInfoID = EAP.mapAuthMethod(id);
- if (authInfoID == null) {
- throw new ProtocolException("Unknown auth parameter ID: " + id);
- }
-
- int len = paramPayload.get() & Constants.BYTE_MASK;
- if (len == 0 || len > paramPayload.remaining()) {
- throw new ProtocolException("Bad auth method length: " + len);
- }
-
- switch (authInfoID) {
- case ExpandedEAPMethod:
- addAuthParam(new ExpandedEAPMethod(authInfoID, len, paramPayload));
- break;
- case NonEAPInnerAuthType:
- addAuthParam(new NonEAPInnerAuth(len, paramPayload));
- break;
- case InnerAuthEAPMethodType:
- addAuthParam(new InnerAuthEAP(len, paramPayload));
- break;
- case ExpandedInnerEAPMethod:
- addAuthParam(new ExpandedEAPMethod(authInfoID, len, paramPayload));
- break;
- case CredentialType:
- addAuthParam(new Credential(authInfoID, len, paramPayload));
- break;
- case TunneledEAPMethodCredType:
- addAuthParam(new Credential(authInfoID, len, paramPayload));
- break;
- case VendorSpecific:
- addAuthParam(new VendorSpecificAuth(len, paramPayload));
- break;
- }
-
- realCount++;
- }
- if (realCount != count)
- throw new ProtocolException("Invalid parameter count: " + realCount +
- ", expected " + count);
- }
-
- public EAPMethod(EAP.EAPMethodID eapMethodID, AuthParam authParam) {
- mEAPMethodID = eapMethodID;
- mAuthParams = new HashMap<>(1);
- if (authParam != null) {
- Set<AuthParam> authParams = new HashSet<>();
- authParams.add(authParam);
- mAuthParams.put(authParam.getAuthInfoID(), authParams);
- }
- }
-
- private void addAuthParam(AuthParam param) {
- Set<AuthParam> authParams = mAuthParams.get(param.getAuthInfoID());
- if (authParams == null) {
- authParams = new HashSet<>();
- mAuthParams.put(param.getAuthInfoID(), authParams);
- }
- authParams.add(param);
- }
-
- public Map<EAP.AuthInfoID, Set<AuthParam>> getAuthParams() {
- return Collections.unmodifiableMap(mAuthParams);
- }
-
- public EAP.EAPMethodID getEAPMethodID() {
- return mEAPMethodID;
- }
-
- public int match(com.android.hotspot2.pps.Credential credential) {
-
- EAPMethod credMethod = credential.getEAPMethod();
- if (mEAPMethodID != credMethod.getEAPMethodID()) {
- return AuthMatch.None;
- }
-
- switch (mEAPMethodID) {
- case EAP_TTLS:
- if (mAuthParams.isEmpty()) {
- return AuthMatch.Method;
- }
- int paramCount = 0;
- for (Map.Entry<EAP.AuthInfoID, Set<AuthParam>> entry :
- credMethod.getAuthParams().entrySet()) {
- Set<AuthParam> params = mAuthParams.get(entry.getKey());
- if (params == null) {
- continue;
- }
-
- if (!Collections.disjoint(params, entry.getValue())) {
- return AuthMatch.MethodParam;
- }
- paramCount += params.size();
- }
- return paramCount > 0 ? AuthMatch.None : AuthMatch.Method;
- case EAP_TLS:
- return AuthMatch.MethodParam;
- case EAP_SIM:
- case EAP_AKA:
- case EAP_AKAPrim:
- return AuthMatch.Method;
- default:
- return AuthMatch.Method;
- }
- }
-
- public AuthParam getAuthParam() {
- if (mAuthParams.isEmpty()) {
- return null;
- }
- Set<AuthParam> params = mAuthParams.values().iterator().next();
- if (params.isEmpty()) {
- return null;
- }
- return params.iterator().next();
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (this == thatObject) {
- return true;
- }
- else if (thatObject == null || getClass() != thatObject.getClass()) {
- return false;
- }
-
- EAPMethod that = (EAPMethod) thatObject;
- return mEAPMethodID == that.mEAPMethodID && mAuthParams.equals(that.mAuthParams);
- }
-
- @Override
- public int hashCode() {
- int result = mEAPMethodID.hashCode();
- result = 31 * result + mAuthParams.hashCode();
- return result;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("EAP Method ").append(mEAPMethodID).append('\n');
- for (Set<AuthParam> paramSet : mAuthParams.values()) {
- for (AuthParam param : paramSet) {
- sb.append(" ").append(param.toString());
- }
- }
- return sb.toString();
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/eap/ExpandedEAPMethod.java b/packages/Osu/src/com/android/anqp/eap/ExpandedEAPMethod.java
deleted file mode 100644
index 1358c09..0000000
--- a/packages/Osu/src/com/android/anqp/eap/ExpandedEAPMethod.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.android.anqp.eap;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-import static com.android.anqp.Constants.BYTE_MASK;
-import static com.android.anqp.Constants.INT_MASK;
-import static com.android.anqp.Constants.SHORT_MASK;
-
-/**
- * An EAP authentication parameter, IEEE802.11-2012, table 8-188
- */
-public class ExpandedEAPMethod implements AuthParam {
-
- private final EAP.AuthInfoID mAuthInfoID;
- private final int mVendorID;
- private final long mVendorType;
-
- public ExpandedEAPMethod(EAP.AuthInfoID authInfoID, int length, ByteBuffer payload)
- throws ProtocolException {
- if (length != 7) {
- throw new ProtocolException("Bad length: " + payload.remaining());
- }
-
- mAuthInfoID = authInfoID;
-
- ByteBuffer vndBuffer = payload.duplicate().order(ByteOrder.BIG_ENDIAN);
-
- int id = vndBuffer.getShort() & SHORT_MASK;
- id = (id << Byte.SIZE) | (vndBuffer.get() & BYTE_MASK);
- mVendorID = id;
- mVendorType = vndBuffer.getInt() & INT_MASK;
-
- payload.position(payload.position()+7);
- }
-
- public ExpandedEAPMethod(EAP.AuthInfoID authInfoID, int vendorID, long vendorType) {
- mAuthInfoID = authInfoID;
- mVendorID = vendorID;
- mVendorType = vendorType;
- }
-
- @Override
- public EAP.AuthInfoID getAuthInfoID() {
- return mAuthInfoID;
- }
-
- @Override
- public int hashCode() {
- return (mAuthInfoID.hashCode() * 31 + mVendorID) * 31 + (int) mVendorType;
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (thatObject == this) {
- return true;
- } else if (thatObject == null || thatObject.getClass() != ExpandedEAPMethod.class) {
- return false;
- } else {
- ExpandedEAPMethod that = (ExpandedEAPMethod) thatObject;
- return that.getVendorID() == getVendorID() && that.getVendorType() == getVendorType();
- }
- }
-
- public int getVendorID() {
- return mVendorID;
- }
-
- public long getVendorType() {
- return mVendorType;
- }
-
- @Override
- public String toString() {
- return "Auth method " + mAuthInfoID + ", id " + mVendorID + ", type " + mVendorType + "\n";
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/eap/InnerAuthEAP.java b/packages/Osu/src/com/android/anqp/eap/InnerAuthEAP.java
deleted file mode 100644
index 571cf26..0000000
--- a/packages/Osu/src/com/android/anqp/eap/InnerAuthEAP.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.android.anqp.eap;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-
-import static com.android.anqp.Constants.BYTE_MASK;
-
-/**
- * An EAP authentication parameter, IEEE802.11-2012, table 8-188
- */
-public class InnerAuthEAP implements AuthParam {
-
- private final EAP.EAPMethodID mEapMethodID;
-
- public InnerAuthEAP(int length, ByteBuffer payload) throws ProtocolException {
- if (length != 1) {
- throw new ProtocolException("Bad length: " + length);
- }
- int typeID = payload.get() & BYTE_MASK;
- mEapMethodID = EAP.mapEAPMethod(typeID);
- }
-
- public InnerAuthEAP(EAP.EAPMethodID eapMethodID) {
- mEapMethodID = eapMethodID;
- }
-
- @Override
- public EAP.AuthInfoID getAuthInfoID() {
- return EAP.AuthInfoID.InnerAuthEAPMethodType;
- }
-
- public EAP.EAPMethodID getEAPMethodID() {
- return mEapMethodID;
- }
-
- @Override
- public int hashCode() {
- return mEapMethodID != null ? mEapMethodID.hashCode() : 0;
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (thatObject == this) {
- return true;
- } else if (thatObject == null || thatObject.getClass() != InnerAuthEAP.class) {
- return false;
- } else {
- return ((InnerAuthEAP) thatObject).getEAPMethodID() == getEAPMethodID();
- }
- }
-
- @Override
- public String toString() {
- return "Auth method InnerAuthEAP, inner = " + mEapMethodID + '\n';
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/eap/NonEAPInnerAuth.java b/packages/Osu/src/com/android/anqp/eap/NonEAPInnerAuth.java
deleted file mode 100644
index 9d37b4d..0000000
--- a/packages/Osu/src/com/android/anqp/eap/NonEAPInnerAuth.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.android.anqp.eap;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.android.anqp.Constants.BYTE_MASK;
-
-/**
- * An EAP authentication parameter, IEEE802.11-2012, table 8-188
- */
-public class NonEAPInnerAuth implements AuthParam {
-
- public enum NonEAPType {Reserved, PAP, CHAP, MSCHAP, MSCHAPv2}
- private static final Map<NonEAPType, String> sOmaMap = new EnumMap<>(NonEAPType.class);
- private static final Map<String, NonEAPType> sRevOmaMap = new HashMap<>();
-
- private final NonEAPType mType;
-
- static {
- sOmaMap.put(NonEAPType.PAP, "PAP");
- sOmaMap.put(NonEAPType.CHAP, "CHAP");
- sOmaMap.put(NonEAPType.MSCHAP, "MS-CHAP");
- sOmaMap.put(NonEAPType.MSCHAPv2, "MS-CHAP-V2");
-
- for (Map.Entry<NonEAPType, String> entry : sOmaMap.entrySet()) {
- sRevOmaMap.put(entry.getValue(), entry.getKey());
- }
- }
-
- public NonEAPInnerAuth(int length, ByteBuffer payload) throws ProtocolException {
- if (length != 1) {
- throw new ProtocolException("Bad length: " + payload.remaining());
- }
-
- int typeID = payload.get() & BYTE_MASK;
- mType = typeID < NonEAPType.values().length ?
- NonEAPType.values()[typeID] :
- NonEAPType.Reserved;
- }
-
- public NonEAPInnerAuth(NonEAPType type) {
- mType = type;
- }
-
- /**
- * Construct from the OMA-DM PPS data
- * @param eapType as defined in the HS2.0 spec.
- */
- public NonEAPInnerAuth(String eapType) {
- mType = sRevOmaMap.get(eapType);
- }
-
- @Override
- public EAP.AuthInfoID getAuthInfoID() {
- return EAP.AuthInfoID.NonEAPInnerAuthType;
- }
-
- public NonEAPType getType() {
- return mType;
- }
-
- public String getOMAtype() {
- return sOmaMap.get(mType);
- }
-
- public static String mapInnerType(NonEAPType type) {
- return sOmaMap.get(type);
- }
-
- @Override
- public int hashCode() {
- return mType.hashCode();
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (thatObject == this) {
- return true;
- } else if (thatObject == null || thatObject.getClass() != NonEAPInnerAuth.class) {
- return false;
- } else {
- return ((NonEAPInnerAuth) thatObject).getType() == getType();
- }
- }
-
- @Override
- public String toString() {
- return "Auth method NonEAPInnerAuthEAP, inner = " + mType + '\n';
- }
-}
diff --git a/packages/Osu/src/com/android/anqp/eap/VendorSpecificAuth.java b/packages/Osu/src/com/android/anqp/eap/VendorSpecificAuth.java
deleted file mode 100644
index 04a315d..0000000
--- a/packages/Osu/src/com/android/anqp/eap/VendorSpecificAuth.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.android.anqp.eap;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-/**
- * An EAP authentication parameter, IEEE802.11-2012, table 8-188
- */
-public class VendorSpecificAuth implements AuthParam {
-
- private final byte[] mData;
-
- public VendorSpecificAuth(int length, ByteBuffer payload) throws ProtocolException {
- mData = new byte[length];
- payload.get(mData);
- }
-
- @Override
- public EAP.AuthInfoID getAuthInfoID() {
- return EAP.AuthInfoID.VendorSpecific;
- }
-
- public int hashCode() {
- return Arrays.hashCode(mData);
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (thatObject == this) {
- return true;
- } else if (thatObject == null || thatObject.getClass() != VendorSpecificAuth.class) {
- return false;
- } else {
- return Arrays.equals(((VendorSpecificAuth) thatObject).getData(), getData());
- }
- }
-
- public byte[] getData() {
- return mData;
- }
-
- @Override
- public String toString() {
- return "Auth method VendorSpecificAuth, data = " + Arrays.toString(mData) + '\n';
- }
-}
diff --git a/packages/Osu/src/com/android/configparse/ConfigBuilder.java b/packages/Osu/src/com/android/configparse/ConfigBuilder.java
deleted file mode 100644
index b760ade..0000000
--- a/packages/Osu/src/com/android/configparse/ConfigBuilder.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package com.android.configparse;
-
-import android.content.Context;
-import android.net.Uri;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiEnterpriseConfig;
-import android.util.Base64;
-import android.util.Log;
-
-import com.android.anqp.eap.AuthParam;
-import com.android.anqp.eap.EAP;
-import com.android.anqp.eap.EAPMethod;
-import com.android.anqp.eap.NonEAPInnerAuth;
-import com.android.hotspot2.IMSIParameter;
-import com.android.hotspot2.pps.Credential;
-import com.android.hotspot2.pps.HomeSP;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-public class ConfigBuilder {
- private static final String TAG = "WCFG";
-
- private static void dropFile(Uri uri, Context context) {
- context.getContentResolver().delete(uri, null, null);
- }
-
- public static WifiConfiguration buildConfig(HomeSP homeSP, X509Certificate caCert,
- List<X509Certificate> clientChain, PrivateKey key)
- throws IOException, GeneralSecurityException {
-
- Credential credential = homeSP.getCredential();
-
- WifiConfiguration config;
-
- EAP.EAPMethodID eapMethodID = credential.getEAPMethod().getEAPMethodID();
- switch (eapMethodID) {
- case EAP_TTLS:
- if (key != null || clientChain != null) {
- Log.w(TAG, "Client cert and/or key included with EAP-TTLS profile");
- }
- config = buildTTLSConfig(homeSP);
- break;
- case EAP_TLS:
- config = buildTLSConfig(homeSP, clientChain, key);
- break;
- case EAP_AKA:
- case EAP_AKAPrim:
- case EAP_SIM:
- if (key != null || clientChain != null || caCert != null) {
- Log.i(TAG, "Client/CA cert and/or key included with " +
- eapMethodID + " profile");
- }
- config = buildSIMConfig(homeSP);
- break;
- default:
- throw new IOException("Unsupported EAP Method: " + eapMethodID);
- }
-
- WifiEnterpriseConfig enterpriseConfig = config.enterpriseConfig;
-
- enterpriseConfig.setCaCertificate(caCert);
- enterpriseConfig.setAnonymousIdentity("anonymous@" + credential.getRealm());
-
- return config;
- }
-
- // Retain for debugging purposes
- /*
- private static void xIterateCerts(KeyStore ks, X509Certificate caCert)
- throws GeneralSecurityException {
- Enumeration<String> aliases = ks.aliases();
- while (aliases.hasMoreElements()) {
- String alias = aliases.nextElement();
- Certificate cert = ks.getCertificate(alias);
- Log.d("HS2J", "Checking " + alias);
- if (cert instanceof X509Certificate) {
- X509Certificate x509Certificate = (X509Certificate) cert;
- boolean sm = x509Certificate.getSubjectX500Principal().equals(
- caCert.getSubjectX500Principal());
- boolean eq = false;
- if (sm) {
- eq = Arrays.equals(x509Certificate.getEncoded(), caCert.getEncoded());
- }
- Log.d("HS2J", "Subject: " + x509Certificate.getSubjectX500Principal() +
- ": " + sm + "/" + eq);
- }
- }
- }
- */
-
- private static WifiConfiguration buildTTLSConfig(HomeSP homeSP)
- throws IOException {
- Credential credential = homeSP.getCredential();
-
- if (credential.getUserName() == null || credential.getPassword() == null) {
- throw new IOException("EAP-TTLS provisioned without user name or password");
- }
-
- EAPMethod eapMethod = credential.getEAPMethod();
-
- AuthParam authParam = eapMethod.getAuthParam();
- if (authParam == null ||
- authParam.getAuthInfoID() != EAP.AuthInfoID.NonEAPInnerAuthType) {
- throw new IOException("Bad auth parameter for EAP-TTLS: " + authParam);
- }
-
- WifiConfiguration config = buildBaseConfiguration(homeSP);
- NonEAPInnerAuth ttlsParam = (NonEAPInnerAuth) authParam;
- WifiEnterpriseConfig enterpriseConfig = config.enterpriseConfig;
- enterpriseConfig.setPhase2Method(remapInnerMethod(ttlsParam.getType()));
- enterpriseConfig.setIdentity(credential.getUserName());
- enterpriseConfig.setPassword(credential.getPassword());
-
- return config;
- }
-
- private static WifiConfiguration buildTLSConfig(HomeSP homeSP,
- List<X509Certificate> clientChain,
- PrivateKey clientKey)
- throws IOException, GeneralSecurityException {
-
- Credential credential = homeSP.getCredential();
-
- X509Certificate clientCertificate = null;
-
- if (clientKey == null || clientChain == null) {
- throw new IOException("No key and/or cert passed for EAP-TLS");
- }
- if (credential.getCertType() != Credential.CertType.x509v3) {
- throw new IOException("Invalid certificate type for TLS: " +
- credential.getCertType());
- }
-
- byte[] reference = credential.getFingerPrint();
- MessageDigest digester = MessageDigest.getInstance("SHA-256");
- for (X509Certificate certificate : clientChain) {
- digester.reset();
- byte[] fingerprint = digester.digest(certificate.getEncoded());
- if (Arrays.equals(reference, fingerprint)) {
- clientCertificate = certificate;
- break;
- }
- }
- if (clientCertificate == null) {
- throw new IOException("No certificate in chain matches supplied fingerprint");
- }
-
- String alias = Base64.encodeToString(reference, Base64.DEFAULT);
-
- WifiConfiguration config = buildBaseConfiguration(homeSP);
- WifiEnterpriseConfig enterpriseConfig = config.enterpriseConfig;
- enterpriseConfig.setClientCertificateAlias(alias);
- enterpriseConfig.setClientKeyEntry(clientKey, clientCertificate);
-
- return config;
- }
-
- private static WifiConfiguration buildSIMConfig(HomeSP homeSP)
- throws IOException {
-
- Credential credential = homeSP.getCredential();
- IMSIParameter credImsi = credential.getImsi();
-
- /*
- * Uncomment to enforce strict IMSI matching with currently installed SIM cards.
- *
- TelephonyManager tm = TelephonyManager.from(context);
- SubscriptionManager sub = SubscriptionManager.from(context);
- boolean match = false;
-
- for (int subId : sub.getActiveSubscriptionIdList()) {
- String imsi = tm.getSubscriberId(subId);
- if (credImsi.matches(imsi)) {
- match = true;
- break;
- }
- }
- if (!match) {
- throw new IOException("Supplied IMSI does not match any SIM card");
- }
- */
-
- WifiConfiguration config = buildBaseConfiguration(homeSP);
- config.enterpriseConfig.setPlmn(credImsi.toString());
- return config;
- }
-
- private static WifiConfiguration buildBaseConfiguration(HomeSP homeSP) throws IOException {
- EAP.EAPMethodID eapMethodID = homeSP.getCredential().getEAPMethod().getEAPMethodID();
-
- WifiConfiguration config = new WifiConfiguration();
-
- config.FQDN = homeSP.getFQDN();
-
- HashSet<Long> roamingConsortiumIds = homeSP.getRoamingConsortiums();
- config.roamingConsortiumIds = new long[roamingConsortiumIds.size()];
- int i = 0;
- for (long id : roamingConsortiumIds) {
- config.roamingConsortiumIds[i] = id;
- i++;
- }
- config.providerFriendlyName = homeSP.getFriendlyName();
-
- config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP);
- config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.IEEE8021X);
-
- WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();
- enterpriseConfig.setEapMethod(remapEAPMethod(eapMethodID));
- enterpriseConfig.setRealm(homeSP.getCredential().getRealm());
- if (homeSP.getUpdateIdentifier() >= 0) {
- config.updateIdentifier = Integer.toString(homeSP.getUpdateIdentifier());
- }
- config.enterpriseConfig = enterpriseConfig;
- if (homeSP.getUpdateIdentifier() >= 0) {
- config.updateIdentifier = Integer.toString(homeSP.getUpdateIdentifier());
- }
-
- return config;
- }
-
- private static int remapEAPMethod(EAP.EAPMethodID eapMethodID) throws IOException {
- switch (eapMethodID) {
- case EAP_TTLS:
- return WifiEnterpriseConfig.Eap.TTLS;
- case EAP_TLS:
- return WifiEnterpriseConfig.Eap.TLS;
- case EAP_SIM:
- return WifiEnterpriseConfig.Eap.SIM;
- case EAP_AKA:
- return WifiEnterpriseConfig.Eap.AKA;
- case EAP_AKAPrim:
- return WifiEnterpriseConfig.Eap.AKA_PRIME;
- default:
- throw new IOException("Bad EAP method: " + eapMethodID);
- }
- }
-
- private static int remapInnerMethod(NonEAPInnerAuth.NonEAPType type) throws IOException {
- switch (type) {
- case PAP:
- return WifiEnterpriseConfig.Phase2.PAP;
- case MSCHAP:
- return WifiEnterpriseConfig.Phase2.MSCHAP;
- case MSCHAPv2:
- return WifiEnterpriseConfig.Phase2.MSCHAPV2;
- case CHAP:
- default:
- throw new IOException("Inner method " + type + " not supported");
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/AppBridge.java b/packages/Osu/src/com/android/hotspot2/AppBridge.java
deleted file mode 100644
index 81542f7..0000000
--- a/packages/Osu/src/com/android/hotspot2/AppBridge.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.android.hotspot2;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.android.hotspot2.osu.OSUOperationStatus;
-
-public class AppBridge {
- public static final String ACTION_OSU_NOTIFICATION = "com.android.hotspot2.OSU_NOTIFICATION";
- public static final String OSU_COUNT = "osu-count";
- public static final String SP_NAME = "sp-name";
- public static final String PROV_SUCCESS = "prov-success";
- public static final String DEAUTH = "deauth";
- public static final String DEAUTH_DELAY = "deauth-delay";
- public static final String DEAUTH_URL = "deauth-url";
- public static final String PROV_MESSAGE = "prov-message";
- public static final String OSU_INFO = "osu-info";
-
- public static final String GET_OSUS_ACTION = "com.android.hotspot2.GET_OSUS";
-
- private final Context mContext;
-
- public AppBridge(Context context) {
- mContext = context;
- }
-
- public void showOsuCount(int osuCount) {
- Intent intent = new Intent(ACTION_OSU_NOTIFICATION);
- intent.putExtra(OSU_COUNT, osuCount);
- intent.setFlags(
- Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK);
-
- mContext.startActivity(intent);
- }
-
- public void showStatus(OSUOperationStatus status, String spName, String message,
- String remoteStatus) {
- Intent intent = new Intent(ACTION_OSU_NOTIFICATION);
- intent.putExtra(SP_NAME, spName);
- intent.putExtra(PROV_SUCCESS, status == OSUOperationStatus.ProvisioningSuccess);
- if (message != null) {
- intent.putExtra(PROV_MESSAGE, message);
- }
- intent.setFlags(
- Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK);
- mContext.startActivity(intent);
- }
-
- public void showDeauth(String spName, boolean ess, int delay, String url) {
- Intent intent = new Intent(ACTION_OSU_NOTIFICATION);
- intent.putExtra(SP_NAME, spName);
- intent.putExtra(DEAUTH, ess);
- intent.putExtra(DEAUTH_DELAY, delay);
- intent.putExtra(DEAUTH_URL, url);
- intent.setFlags(
- Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK);
- mContext.startActivity(intent);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/AuthMatch.java b/packages/Osu/src/com/android/hotspot2/AuthMatch.java
deleted file mode 100644
index f9c1f42..0000000
--- a/packages/Osu/src/com/android/hotspot2/AuthMatch.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.android.hotspot2;
-
-/**
- * Match score for EAP credentials:
- * None means that there is a distinct mismatch, i.e. realm, method or parameter is defined
- * and mismatches that of the credential.
- * Indeterminate means that there is no ANQP information to match against.
- * Note: The numeric values given to the constants are used for preference comparison and
- * must be maintained accordingly.
- */
-public abstract class AuthMatch {
- public static final int None = -1;
- public static final int Indeterminate = 0;
- public static final int Realm = 0x04;
- public static final int Method = 0x02;
- public static final int Param = 0x01;
- public static final int MethodParam = Method | Param;
- public static final int Exact = Realm | Method | Param;
-
- public static String toString(int match) {
- if (match < 0) {
- return "None";
- } else if (match == 0) {
- return "Indeterminate";
- }
-
- StringBuilder sb = new StringBuilder();
- if ((match & Realm) != 0) {
- sb.append("Realm");
- }
- if ((match & Method) != 0) {
- sb.append("Method");
- }
- if ((match & Param) != 0) {
- sb.append("Param");
- }
- return sb.toString();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/IMSIParameter.java b/packages/Osu/src/com/android/hotspot2/IMSIParameter.java
deleted file mode 100644
index 1d5d95d..0000000
--- a/packages/Osu/src/com/android/hotspot2/IMSIParameter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.android.hotspot2;
-
-import java.io.IOException;
-
-public class IMSIParameter {
- private final String mImsi;
- private final boolean mPrefix;
-
- public IMSIParameter(String imsi, boolean prefix) {
- mImsi = imsi;
- mPrefix = prefix;
- }
-
- public IMSIParameter(String imsi) throws IOException {
- if (imsi == null || imsi.length() == 0) {
- throw new IOException("Bad IMSI: '" + imsi + "'");
- }
-
- int nonDigit;
- char stopChar = '\0';
- for (nonDigit = 0; nonDigit < imsi.length(); nonDigit++) {
- stopChar = imsi.charAt(nonDigit);
- if (stopChar < '0' || stopChar > '9') {
- break;
- }
- }
-
- if (nonDigit == imsi.length()) {
- mImsi = imsi;
- mPrefix = false;
- } else if (nonDigit == imsi.length() - 1 && stopChar == '*') {
- mImsi = imsi.substring(0, nonDigit);
- mPrefix = true;
- } else {
- throw new IOException("Bad IMSI: '" + imsi + "'");
- }
- }
-
- public boolean matches(String fullIMSI) {
- if (mPrefix) {
- return mImsi.regionMatches(false, 0, fullIMSI, 0, mImsi.length());
- } else {
- return mImsi.equals(fullIMSI);
- }
- }
-
- public boolean matchesMccMnc(String mccMnc) {
- if (mPrefix) {
- // For a prefix match, the entire prefix must match the mcc+mnc
- return mImsi.regionMatches(false, 0, mccMnc, 0, mImsi.length());
- } else {
- // For regular match, the entire length of mcc+mnc must match this IMSI
- return mImsi.regionMatches(false, 0, mccMnc, 0, mccMnc.length());
- }
- }
-
- public boolean isPrefix() {
- return mPrefix;
- }
-
- public String getImsi() {
- return mImsi;
- }
-
- public int prefixLength() {
- return mImsi.length();
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (this == thatObject) {
- return true;
- } else if (thatObject == null || getClass() != thatObject.getClass()) {
- return false;
- }
-
- IMSIParameter that = (IMSIParameter) thatObject;
- return mPrefix == that.mPrefix && mImsi.equals(that.mImsi);
- }
-
- @Override
- public int hashCode() {
- int result = mImsi != null ? mImsi.hashCode() : 0;
- result = 31 * result + (mPrefix ? 1 : 0);
- return result;
- }
-
- @Override
- public String toString() {
- if (mPrefix) {
- return mImsi + '*';
- } else {
- return mImsi;
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/OMADMAdapter.java b/packages/Osu/src/com/android/hotspot2/OMADMAdapter.java
deleted file mode 100644
index 1429b0b..0000000
--- a/packages/Osu/src/com/android/hotspot2/OMADMAdapter.java
+++ /dev/null
@@ -1,601 +0,0 @@
-package com.android.hotspot2;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.net.wifi.WifiManager;
-import android.os.SystemProperties;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.anqp.eap.EAP;
-import com.android.hotspot2.omadm.MOTree;
-import com.android.hotspot2.omadm.OMAConstants;
-import com.android.hotspot2.omadm.OMAConstructed;
-import com.android.hotspot2.osu.OSUManager;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static com.android.anqp.eap.NonEAPInnerAuth.NonEAPType;
-import static com.android.anqp.eap.NonEAPInnerAuth.mapInnerType;
-
-public class OMADMAdapter {
- private final Context mContext;
- private final String mImei;
- private final String mImsi;
- private final String mDevID;
- private final List<PathAccessor> mDevInfo;
- private final List<PathAccessor> mDevDetail;
-
- private static final int IMEI_Length = 14;
-
- private static final String[] ExtWiFiPath = {"DevDetail", "Ext", "org.wi-fi", "Wi-Fi"};
-
- private static final Map<String, String> RTProps = new HashMap<>();
-
- private MOTree mDevInfoTree;
- private MOTree mDevDetailTree;
-
- private static OMADMAdapter sInstance;
-
- static {
- RTProps.put(ExtWiFiPath[2], "urn:wfa:mo-ext:hotspot2dot0-devdetail-ext:1.0");
- }
-
- private static abstract class PathAccessor {
- private final String[] mPath;
- private final int mHashCode;
-
- protected PathAccessor(Object... path) {
- int length = 0;
- for (Object o : path) {
- if (o.getClass() == String[].class) {
- length += ((String[]) o).length;
- } else {
- length++;
- }
- }
- mPath = new String[length];
- int n = 0;
- for (Object o : path) {
- if (o.getClass() == String[].class) {
- for (String element : (String[]) o) {
- mPath[n++] = element;
- }
- } else if (o.getClass() == Integer.class) {
- mPath[n++] = "x" + o.toString();
- } else {
- mPath[n++] = o.toString();
- }
- }
- mHashCode = Arrays.hashCode(mPath);
- }
-
- @Override
- public int hashCode() {
- return mHashCode;
- }
-
- @Override
- public boolean equals(Object thatObject) {
- return thatObject == this || (thatObject instanceof ConstPathAccessor &&
- Arrays.equals(mPath, ((PathAccessor) thatObject).mPath));
- }
-
- private String[] getPath() {
- return mPath;
- }
-
- protected abstract Object getValue();
- }
-
- private static class ConstPathAccessor<T> extends PathAccessor {
- private final T mValue;
-
- protected ConstPathAccessor(T value, Object... path) {
- super(path);
- mValue = value;
- }
-
- protected Object getValue() {
- return mValue;
- }
- }
-
- public static OMADMAdapter getInstance(Context context) {
- synchronized (OMADMAdapter.class) {
- if (sInstance == null) {
- sInstance = new OMADMAdapter(context);
- }
- return sInstance;
- }
- }
-
- private OMADMAdapter(Context context) {
- mContext = context;
-
- TelephonyManager tm = (TelephonyManager) context
- .getSystemService(Context.TELEPHONY_SERVICE);
- String simOperator = tm.getSimOperator();
- mImsi = tm.getSubscriberId();
- mImei = tm.getImei();
- String strDevId;
-
- /* Use MEID for sprint */
- if ("310120".equals(simOperator) || (mImsi != null && mImsi.startsWith("310120"))) {
- /* MEID is 14 digits. If IMEI is returned as DevId, MEID can be extracted by taking
- * first 14 characters. This is not always true but should be the case for sprint */
- strDevId = tm.getDeviceId().toUpperCase(Locale.US);
- if (strDevId != null && strDevId.length() >= IMEI_Length) {
- strDevId = strDevId.substring(0, IMEI_Length);
- } else {
- Log.w(OSUManager.TAG, "MEID cannot be extracted from DeviceId " + strDevId);
- }
- } else {
- if (isPhoneTypeLTE()) {
- strDevId = mImei;
- } else {
- strDevId = tm.getDeviceId();
- }
- if (strDevId == null) {
- strDevId = "unknown";
- }
- strDevId = strDevId.toUpperCase(Locale.US);
-
- if (!isPhoneTypeLTE()) {
- strDevId = strDevId.substring(0, IMEI_Length);
- }
- }
- mDevID = strDevId;
-
- mDevInfo = new ArrayList<>();
- mDevInfo.add(new ConstPathAccessor<>(strDevId, "DevInfo", "DevID"));
- mDevInfo.add(new ConstPathAccessor<>(getProperty(context,
- "Man", "ro.product.manufacturer", "unknown"), "DevInfo", "Man"));
- mDevInfo.add(new ConstPathAccessor<>(getProperty(context,
- "Mod", "ro.product.model", "generic"), "DevInfo", "Mod"));
- mDevInfo.add(new ConstPathAccessor<>(getLocale(context), "DevInfo", "Lang"));
- mDevInfo.add(new ConstPathAccessor<>("1.2", "DevInfo", "DmV"));
-
- mDevDetail = new ArrayList<>();
- mDevDetail.add(new ConstPathAccessor<>(getDeviceType(), "DevDetail", "DevType"));
- mDevDetail.add(new ConstPathAccessor<>(SystemProperties.get("ro.product.brand"),
- "DevDetail", "OEM"));
- mDevDetail.add(new ConstPathAccessor<>(getVersion(context, false), "DevDetail", "FwV"));
- mDevDetail.add(new ConstPathAccessor<>(getVersion(context, true), "DevDetail", "SwV"));
- mDevDetail.add(new ConstPathAccessor<>(getHwV(), "DevDetail", "HwV"));
- mDevDetail.add(new ConstPathAccessor<>("TRUE", "DevDetail", "LrgObj"));
-
- mDevDetail.add(new ConstPathAccessor<>(32, "DevDetail", "URI", "MaxDepth"));
- mDevDetail.add(new ConstPathAccessor<>(2048, "DevDetail", "URI", "MaxTotLen"));
- mDevDetail.add(new ConstPathAccessor<>(64, "DevDetail", "URI", "MaxSegLen"));
-
- AtomicInteger index = new AtomicInteger(1);
- mDevDetail.add(new ConstPathAccessor<>(EAP.EAP_TTLS, ExtWiFiPath,
- "EAPMethodList", index, "EAPType"));
- mDevDetail.add(new ConstPathAccessor<>(mapInnerType(NonEAPType.MSCHAPv2), ExtWiFiPath,
- "EAPMethodList", index, "InnerMethod"));
-
- index.incrementAndGet();
- mDevDetail.add(new ConstPathAccessor<>(EAP.EAP_TTLS, ExtWiFiPath,
- "EAPMethodList", index, "EAPType"));
- mDevDetail.add(new ConstPathAccessor<>(mapInnerType(NonEAPType.PAP), ExtWiFiPath,
- "EAPMethodList", index, "InnerMethod"));
-
- index.incrementAndGet();
- mDevDetail.add(new ConstPathAccessor<>(EAP.EAP_TTLS, ExtWiFiPath,
- "EAPMethodList", index, "EAPType"));
- mDevDetail.add(new ConstPathAccessor<>(mapInnerType(NonEAPType.MSCHAP), ExtWiFiPath,
- "EAPMethodList", index, "InnerMethod"));
-
- index.incrementAndGet();
- mDevDetail.add(new ConstPathAccessor<>(EAP.EAP_TLS, ExtWiFiPath,
- "EAPMethodList", index, "EAPType"));
- index.incrementAndGet();
- mDevDetail.add(new ConstPathAccessor<>(EAP.EAP_AKA, ExtWiFiPath,
- "EAPMethodList", index, "EAPType"));
- index.incrementAndGet();
- mDevDetail.add(new ConstPathAccessor<>(EAP.EAP_AKAPrim, ExtWiFiPath,
- "EAPMethodList", index, "EAPType"));
- index.incrementAndGet();
- mDevDetail.add(new ConstPathAccessor<>(EAP.EAP_SIM, ExtWiFiPath,
- "EAPMethodList", index, "EAPType"));
-
- mDevDetail.add(new ConstPathAccessor<>("FALSE", ExtWiFiPath, "ManufacturingCertificate"));
- mDevDetail.add(new ConstPathAccessor<>(mImsi, ExtWiFiPath, "IMSI"));
- mDevDetail.add(new ConstPathAccessor<>(mImei, ExtWiFiPath, "IMEI_MEID"));
- mDevDetail.add(new PathAccessor(ExtWiFiPath, "Wi-FiMACAddress") {
- @Override
- protected String getValue() {
- return getMAC();
- }
- });
- }
-
- private static void buildNode(PathAccessor pathAccessor, int depth, OMAConstructed parent)
- throws IOException {
- String[] path = pathAccessor.getPath();
- String name = path[depth];
- if (depth < path.length - 1) {
- OMAConstructed node = (OMAConstructed) parent.getChild(name);
- if (node == null) {
- node = (OMAConstructed) parent.addChild(name, RTProps.get(name),
- null, null);
- }
- buildNode(pathAccessor, depth + 1, node);
- } else if (pathAccessor.getValue() != null) {
- parent.addChild(name, null, pathAccessor.getValue().toString(), null);
- }
- }
-
- public String getMAC() {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- return wifiManager != null ?
- String.format("%012x",
- Utils.parseMac(wifiManager.getConnectionInfo().getMacAddress())) :
- null;
- }
-
- public String getImei() {
- return mImei;
- }
-
- public byte[] getMeid() {
- return Arrays.copyOf(mImei.getBytes(StandardCharsets.ISO_8859_1), IMEI_Length);
- }
-
- public String getDevID() {
- return mDevID;
- }
-
- public MOTree getMO(String urn) {
- try {
- switch (urn) {
- case OMAConstants.DevInfoURN:
- if (mDevInfoTree == null) {
- OMAConstructed root = new OMAConstructed(null, "DevInfo", urn);
- for (PathAccessor pathAccessor : mDevInfo) {
- buildNode(pathAccessor, 1, root);
- }
- mDevInfoTree = MOTree.buildMgmtTree(OMAConstants.DevInfoURN,
- OMAConstants.OMAVersion, root);
- }
- return mDevInfoTree;
- case OMAConstants.DevDetailURN:
- if (mDevDetailTree == null) {
- OMAConstructed root = new OMAConstructed(null, "DevDetail", urn);
- for (PathAccessor pathAccessor : mDevDetail) {
- buildNode(pathAccessor, 1, root);
- }
- mDevDetailTree = MOTree.buildMgmtTree(OMAConstants.DevDetailURN,
- OMAConstants.OMAVersion, root);
- }
- return mDevDetailTree;
- default:
- throw new IllegalArgumentException(urn);
- }
- } catch (IOException ioe) {
- Log.e(OSUManager.TAG, "Caught exception building OMA Tree: " + ioe, ioe);
- return null;
- }
-
- /*
- switch (urn) {
- case DevInfoURN: return DevInfo;
- case DevDetailURN: return DevDetail;
- default: throw new IllegalArgumentException(urn);
- }
- */
- }
-
- // TODO: For now, assume the device supports LTE.
- private static boolean isPhoneTypeLTE() {
- return true;
- }
-
- private static String getHwV() {
- try {
- return SystemProperties.get("ro.hardware", "Unknown")
- + "." + SystemProperties.get("ro.revision", "Unknown");
- } catch (RuntimeException e) {
- return "Unknown";
- }
- }
-
- private static String getDeviceType() {
- String devicetype = SystemProperties.get("ro.build.characteristics");
- if ((((TextUtils.isEmpty(devicetype)) || (!devicetype.equals("tablet"))))) {
- devicetype = "phone";
- }
- return devicetype;
- }
-
- private static String getVersion(Context context, boolean swv) {
- String version;
- try {
- if (!isSprint(context) && swv) {
- return "Android " + SystemProperties.get("ro.build.version.release");
- } else {
- version = SystemProperties.get("ro.build.version.full");
- if (null == version || version.equals("")) {
- return SystemProperties.get("ro.build.id", null) + "~"
- + SystemProperties.get("ro.build.config.version", null) + "~"
- + SystemProperties.get("gsm.version.baseband", null) + "~"
- + SystemProperties.get("ro.gsm.flexversion", null);
- }
- }
- } catch (RuntimeException e) {
- return "Unknown";
- }
- return version;
- }
-
- private static boolean isSprint(Context context) {
- TelephonyManager tm = (TelephonyManager) context
- .getSystemService(Context.TELEPHONY_SERVICE);
- String simOperator = tm.getSimOperator();
- String imsi = tm.getSubscriberId();
- /* Use MEID for sprint */
- if ("310120".equals(simOperator) || (imsi != null && imsi.startsWith("310120"))) {
- return true;
- } else {
- return false;
- }
- }
-
- private static String getLocale(Context context) {
- String strLang = readValueFromFile(context, "Lang");
- if (strLang == null) {
- strLang = Locale.getDefault().toString();
- }
- return strLang;
- }
-
- private static String getProperty(Context context, String key, String propKey, String dflt) {
- String strMan = readValueFromFile(context, key);
- if (strMan == null) {
- strMan = SystemProperties.get(propKey, dflt);
- }
- return strMan;
- }
-
- private static String readValueFromFile(Context context, String propName) {
- String ret = null;
- // use preference instead of the system property
- SharedPreferences prefs = context.getSharedPreferences("dmconfig", 0);
- if (prefs.contains(propName)) {
- ret = prefs.getString(propName, "");
- if (ret.length() == 0) {
- ret = null;
- }
- }
- return ret;
- }
-
- private static final String DevDetail =
- "<MgmtTree>" +
- "<VerDTD>1.2</VerDTD>" +
- "<Node>" +
- "<NodeName>DevDetail</NodeName>" +
- "<RTProperties>" +
- "<Type>" +
- "<DDFName>urn:oma:mo:oma-dm-devdetail:1.0</DDFName>" +
- "</Type>" +
- "</RTProperties>" +
- "<Node>" +
- "<NodeName>Ext</NodeName>" +
- "<Node>" +
- "<NodeName>org.wi-fi</NodeName>" +
- "<RTProperties>" +
- "<Type>" +
- "<DDFName>" +
- "urn:wfa:mo-ext:hotspot2dot0-devdetail-ext :1.0" +
- "</DDFName>" +
- "</Type>" +
- "</RTProperties>" +
- "<Node>" +
- "<NodeName>Wi-Fi</NodeName>" +
- "<Node>" +
- "<NodeName>EAPMethodList</NodeName>" +
- "<Node>" +
- "<NodeName>Method01</NodeName>" +
- "<!-- EAP-TTLS/MS-CHAPv2 -->" +
- "<Node>" +
- "<NodeName>EAPType</NodeName>" +
- "<Value>21</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>InnerMethod</NodeName>" +
- "<Value>MS-CHAP-V2</Value>" +
- "</Node>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Method02</NodeName>" +
- "<!-- EAP-TLS -->" +
- "<Node>" +
- "<NodeName>EAPType</NodeName>" +
- "<Value>13</Value>" +
- "</Node>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Method03</NodeName>" +
- "<!-- EAP-SIM -->" +
- "<Node>" +
- "<NodeName>EAPType</NodeName>" +
- "<Value>18</Value>" +
- "</Node>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Method04</NodeName>" +
- "<!-- EAP-AKA -->" +
- "<Node>" +
- "<NodeName>EAPType</NodeName>" +
- "<Value>23</Value>" +
- "</Node>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Method05</NodeName>" +
- "<!-- EAP-AKA' -->" +
- "<Node>" +
- "<NodeName>EAPType</NodeName>" +
- "<Value>50</Value>" +
- "</Node>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Method06</NodeName>" +
- "<!-- Supported method (EAP-TTLS/PAP) not mandated by Hotspot2.0-->" +
- "<Node>" +
- "<NodeName>EAPType</NodeName>" +
- "<Value>21</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>InnerMethod</NodeName>" +
- "<Value>PAP</Value>" +
- "</Node>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Method07</NodeName>" +
- "<!-- Supported method (PEAP/EAP-GTC) not mandated by Hotspot 2.0-->" +
- "<Node>" +
- "<NodeName>EAPType</NodeName>" +
- "<Value>25</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>InnerEAPType</NodeName>" +
- "<Value>6</Value>" +
- "</Node>" +
- "</Node>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>SPCertificate</NodeName>" +
- "<Node>" +
- "<NodeName>Cert01</NodeName>" +
- "<Node>" +
- "<NodeName>CertificateIssuerName</NodeName>" +
- "<Value>CN=RuckusCA</Value>" +
- "</Node>" +
- "</Node>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>ManufacturingCertificate</NodeName>" +
- "<Value>FALSE</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Wi-FiMACAddress</NodeName>" +
- "<Value>001d2e112233</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>ClientTriggerRedirectURI</NodeName>" +
- "<Value>http://127.0.0.1:12345/index.htm</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Ops</NodeName>" +
- "<Node>" +
- "<NodeName>launchBrowserToURI</NodeName>" +
- "<Value></Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>negotiateClientCertTLS</NodeName>" +
- "<Value></Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>getCertificate</NodeName>" +
- "<Value></Value>" +
- "</Node>" +
- "</Node>" +
- "</Node>" +
- "<!-- End of Wi-Fi node -->" +
- "</Node>" +
- "<!-- End of org.wi-fi node -->" +
- "</Node>" +
- "<!-- End of Ext node -->" +
- "<Node>" +
- "<NodeName>URI</NodeName>" +
- "<Node>" +
- "<NodeName>MaxDepth</NodeName>" +
- "<Value>32</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>MaxTotLen</NodeName>" +
- "<Value>2048</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>MaxSegLen</NodeName>" +
- "<Value>64</Value>" +
- "</Node>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>DevType</NodeName>" +
- "<Value>Smartphone</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>OEM</NodeName>" +
- "<Value>ACME</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>FwV</NodeName>" +
- "<Value>1.2.100.5</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>SwV</NodeName>" +
- "<Value>9.11.130</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>HwV</NodeName>" +
- "<Value>1.0</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>LrgObj</NodeName>" +
- "<Value>TRUE</Value>" +
- "</Node>" +
- "</Node>" +
- "</MgmtTree>";
-
-
- private static final String DevInfo =
- "<MgmtTree>" +
- "<VerDTD>1.2</VerDTD>" +
- "<Node>" +
- "<NodeName>DevInfo</NodeName>" +
- "<RTProperties>" +
- "<Type>" +
- "<DDFName>urn:oma:mo:oma-dm-devinfo:1.0" +
- "</DDFName>" +
- "</Type>" +
- "</RTProperties>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>DevID</NodeName>" +
- "<Path>DevInfo</Path>" +
- "<Value>urn:acme:00-11-22-33-44-55</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Man</NodeName>" +
- "<Path>DevInfo</Path>" +
- "<Value>ACME</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Mod</NodeName>" +
- "<Path>DevInfo</Path>" +
- "<Value>HS2.0-01</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>DmV</NodeName>" +
- "<Path>DevInfo</Path>" +
- "<Value>1.2</Value>" +
- "</Node>" +
- "<Node>" +
- "<NodeName>Lang</NodeName>" +
- "<Path>DevInfo</Path>" +
- "<Value>en-US</Value>" +
- "</Node>" +
- "</MgmtTree>";
-}
diff --git a/packages/Osu/src/com/android/hotspot2/PasspointMatch.java b/packages/Osu/src/com/android/hotspot2/PasspointMatch.java
deleted file mode 100644
index 8330283..0000000
--- a/packages/Osu/src/com/android/hotspot2/PasspointMatch.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.android.hotspot2;
-
-public enum PasspointMatch {
- HomeProvider,
- RoamingProvider,
- Incomplete,
- None,
- Declined
-}
diff --git a/packages/Osu/src/com/android/hotspot2/Utils.java b/packages/Osu/src/com/android/hotspot2/Utils.java
deleted file mode 100644
index 880007f..0000000
--- a/packages/Osu/src/com/android/hotspot2/Utils.java
+++ /dev/null
@@ -1,407 +0,0 @@
-package com.android.hotspot2;
-
-import com.android.anqp.Constants;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.TimeZone;
-
-import static com.android.anqp.Constants.BYTE_MASK;
-import static com.android.anqp.Constants.NIBBLE_MASK;
-
-public abstract class Utils {
-
- public static final long UNSET_TIME = -1;
-
- private static final int EUI48Length = 6;
- private static final int EUI64Length = 8;
- private static final long EUI48Mask = 0xffffffffffffL;
- private static final String[] PLMNText = {"org", "3gppnetwork", "mcc*", "mnc*", "wlan"};
-
- public static List<String> splitDomain(String domain) {
-
- if (domain.endsWith("."))
- domain = domain.substring(0, domain.length() - 1);
- int at = domain.indexOf('@');
- if (at >= 0)
- domain = domain.substring(at + 1);
-
- String[] labels = domain.toLowerCase().split("\\.");
- LinkedList<String> labelList = new LinkedList<String>();
- for (String label : labels) {
- labelList.addFirst(label);
- }
-
- return labelList;
- }
-
- public static long parseMac(String s) {
-
- long mac = 0;
- int count = 0;
- for (int n = 0; n < s.length(); n++) {
- int nibble = Utils.fromHex(s.charAt(n), true); // Set lenient to not blow up on ':'
- if (nibble >= 0) { // ... and use only legit hex.
- mac = (mac << 4) | nibble;
- count++;
- }
- }
- if (count < 12 || (count & 1) == 1) {
- throw new IllegalArgumentException("Bad MAC address: '" + s + "'");
- }
- return mac;
- }
-
- public static String macToString(long mac) {
- int len = (mac & ~EUI48Mask) != 0 ? EUI64Length : EUI48Length;
- StringBuilder sb = new StringBuilder();
- boolean first = true;
- for (int n = (len - 1) * Byte.SIZE; n >= 0; n -= Byte.SIZE) {
- if (first) {
- first = false;
- } else {
- sb.append(':');
- }
- sb.append(String.format("%02x", (mac >>> n) & Constants.BYTE_MASK));
- }
- return sb.toString();
- }
-
- public static String getMccMnc(List<String> domain) {
- if (domain.size() != PLMNText.length) {
- return null;
- }
-
- for (int n = 0; n < PLMNText.length; n++) {
- String expect = PLMNText[n];
- int len = expect.endsWith("*") ? expect.length() - 1 : expect.length();
- if (!domain.get(n).regionMatches(0, expect, 0, len)) {
- return null;
- }
- }
-
- String prefix = domain.get(2).substring(3) + domain.get(3).substring(3);
- for (int n = 0; n < prefix.length(); n++) {
- char ch = prefix.charAt(n);
- if (ch < '0' || ch > '9') {
- return null;
- }
- }
- return prefix;
- }
-
- public static String toIpString(int leIp) {
- return String.format("%d.%d.%d.%d",
- leIp & BYTE_MASK,
- (leIp >> 8) & BYTE_MASK,
- (leIp >> 16) & BYTE_MASK,
- (leIp >> 24) & BYTE_MASK);
- }
-
- public static String bssidsToString(Collection<Long> bssids) {
- StringBuilder sb = new StringBuilder();
- for (Long bssid : bssids) {
- sb.append(String.format(" %012x", bssid));
- }
- return sb.toString();
- }
-
- public static String roamingConsortiumsToString(long[] ois) {
- if (ois == null) {
- return "null";
- }
- List<Long> list = new ArrayList<Long>(ois.length);
- for (long oi : ois) {
- list.add(oi);
- }
- return roamingConsortiumsToString(list);
- }
-
- public static String roamingConsortiumsToString(Collection<Long> ois) {
- StringBuilder sb = new StringBuilder();
- boolean first = true;
- for (long oi : ois) {
- if (first) {
- first = false;
- } else {
- sb.append(", ");
- }
- if (Long.numberOfLeadingZeros(oi) > 40) {
- sb.append(String.format("%06x", oi));
- } else {
- sb.append(String.format("%010x", oi));
- }
- }
- return sb.toString();
- }
-
- public static String toUnicodeEscapedString(String s) {
- StringBuilder sb = new StringBuilder(s.length());
- for (int n = 0; n < s.length(); n++) {
- char ch = s.charAt(n);
- if (ch >= ' ' && ch < 127) {
- sb.append(ch);
- } else {
- sb.append("\\u").append(String.format("%04x", (int) ch));
- }
- }
- return sb.toString();
- }
-
- public static String toHexString(byte[] data) {
- if (data == null) {
- return "null";
- }
- StringBuilder sb = new StringBuilder(data.length * 3);
-
- boolean first = true;
- for (byte b : data) {
- if (first) {
- first = false;
- } else {
- sb.append(' ');
- }
- sb.append(String.format("%02x", b & BYTE_MASK));
- }
- return sb.toString();
- }
-
- public static String toHex(byte[] octets) {
- StringBuilder sb = new StringBuilder(octets.length * 2);
- for (byte o : octets) {
- sb.append(String.format("%02x", o & BYTE_MASK));
- }
- return sb.toString();
- }
-
- public static byte[] hexToBytes(String text) {
- if ((text.length() & 1) == 1) {
- throw new NumberFormatException("Odd length hex string: " + text.length());
- }
- byte[] data = new byte[text.length() >> 1];
- int position = 0;
- for (int n = 0; n < text.length(); n += 2) {
- data[position] =
- (byte) (((fromHex(text.charAt(n), false) & NIBBLE_MASK) << 4) |
- (fromHex(text.charAt(n + 1), false) & NIBBLE_MASK));
- position++;
- }
- return data;
- }
-
- public static int fromHex(char ch, boolean lenient) throws NumberFormatException {
- if (ch <= '9' && ch >= '0') {
- return ch - '0';
- } else if (ch >= 'a' && ch <= 'f') {
- return ch + 10 - 'a';
- } else if (ch <= 'F' && ch >= 'A') {
- return ch + 10 - 'A';
- } else if (lenient) {
- return -1;
- } else {
- throw new NumberFormatException("Bad hex-character: " + ch);
- }
- }
-
- private static char toAscii(int b) {
- return b >= ' ' && b < 0x7f ? (char) b : '.';
- }
-
- static boolean isDecimal(String s) {
- for (int n = 0; n < s.length(); n++) {
- char ch = s.charAt(n);
- if (ch < '0' || ch > '9') {
- return false;
- }
- }
- return true;
- }
-
- public static <T extends Comparable> int compare(Comparable<T> c1, T c2) {
- if (c1 == null) {
- return c2 == null ? 0 : -1;
- } else if (c2 == null) {
- return 1;
- } else {
- return c1.compareTo(c2);
- }
- }
-
- public static String bytesToBingoCard(ByteBuffer data, int len) {
- ByteBuffer dup = data.duplicate();
- dup.limit(dup.position() + len);
- return bytesToBingoCard(dup);
- }
-
- public static String bytesToBingoCard(ByteBuffer data) {
- ByteBuffer dup = data.duplicate();
- StringBuilder sbx = new StringBuilder();
- while (dup.hasRemaining()) {
- sbx.append(String.format("%02x ", dup.get() & BYTE_MASK));
- }
- dup = data.duplicate();
- sbx.append(' ');
- while (dup.hasRemaining()) {
- sbx.append(String.format("%c", toAscii(dup.get() & BYTE_MASK)));
- }
- return sbx.toString();
- }
-
- public static String toHMS(long millis) {
- long time = millis >= 0 ? millis : -millis;
- long tmp = time / 1000L;
- long ms = time - tmp * 1000L;
-
- time = tmp;
- tmp /= 60L;
- long s = time - tmp * 60L;
-
- time = tmp;
- tmp /= 60L;
- long m = time - tmp * 60L;
-
- return String.format("%s%d:%02d:%02d.%03d", millis < 0 ? "-" : "", tmp, m, s, ms);
- }
-
- public static String toUTCString(long ms) {
- if (ms < 0) {
- return "unset";
- }
- Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- c.setTimeInMillis(ms);
- return String.format("%4d/%02d/%02d %2d:%02d:%02dZ",
- c.get(Calendar.YEAR),
- c.get(Calendar.MONTH) + 1,
- c.get(Calendar.DAY_OF_MONTH),
- c.get(Calendar.HOUR_OF_DAY),
- c.get(Calendar.MINUTE),
- c.get(Calendar.SECOND));
- }
-
- /**
- * Decode a wpa_supplicant SSID. wpa_supplicant uses double quotes around plain strings, or
- * expects a hex-string if no quotes appear.
- * For Ascii encoded string, any octet < 32 or > 127 is encoded as
- * a "\x" followed by the hex representation of the octet.
- * Exception chars are ", \, \e, \n, \r, \t which are escaped by a \
- * See src/utils/common.c for the implementation in the supplicant.
- *
- * @param ssid The SSID from the config.
- * @return The actual string content of the SSID
- */
- public static String decodeSsid(String ssid) {
- if (ssid.length() <= 1) {
- return ssid;
- } else if (ssid.startsWith("\"") && ssid.endsWith("\"")) {
- return unescapeSsid(ssid.substring(1, ssid.length() - 1));
- } else if ((ssid.length() & 1) == 1) {
- return ssid;
- }
-
- byte[] codepoints;
- try {
- codepoints = new byte[ssid.length() / 2];
- for (int n = 0; n < ssid.length(); n += 2) {
- codepoints[n / 2] = (byte) decodeHexPair(ssid, n);
- }
- } catch (NumberFormatException nfe) {
- return ssid;
- }
-
- try {
- CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
- return decoder.decode(ByteBuffer.wrap(codepoints)).toString();
- } catch (CharacterCodingException cce) {
- /* Do nothing, try LATIN-1 */
- }
- try {
- CharsetDecoder decoder = StandardCharsets.ISO_8859_1.newDecoder();
- return decoder.decode(ByteBuffer.wrap(codepoints)).toString();
- } catch (CharacterCodingException cce) { // Should not be possible.
- return ssid;
- }
- }
-
- private static String unescapeSsid(String s) {
- StringBuilder sb = new StringBuilder();
- for (int n = 0; n < s.length(); n++) {
- char ch = s.charAt(n);
- if (ch != '\\' || n >= s.length() - 1) {
- sb.append(ch);
- } else {
- n++;
- ch = s.charAt(n);
- switch (ch) {
- case '"':
- case '\\':
- default:
- sb.append(ch);
- break;
- case 'e':
- sb.append((char) 27); // Escape char
- break;
- case 'n':
- sb.append('\n');
- break;
- case 'r':
- sb.append('\r');
- break;
- case 't':
- sb.append('\t');
- break;
- case 'x':
- if (s.length() - n < 3) {
- sb.append('\\').append(ch);
- } else {
- n++;
- sb.append((char) decodeHexPair(s, n));
- n++;
- }
- break;
- }
- }
- }
- return sb.toString();
- }
-
- private static int decodeHexPair(String s, int position) {
- return fromHex(s.charAt(position)) << 4 | fromHex(s.charAt(position + 1));
- }
-
- private static int fromHex(char ch) {
- if (ch >= '0' && ch <= '9') {
- return ch - '0';
- } else if (ch >= 'A' && ch <= 'F') {
- return ch - 'A' + 10;
- } else if (ch >= 'a' && ch <= 'f') {
- return ch - 'a' + 10;
- } else {
- throw new NumberFormatException(String.format("Not hex: '%c'", ch));
- }
- }
-
- public static void delay(long ms) {
- long until = System.currentTimeMillis() + ms;
- for (; ; ) {
- long remainder = until - System.currentTimeMillis();
- if (remainder <= 0) {
- break;
- }
- try {
- Thread.sleep(remainder);
- } catch (InterruptedException ie) { /**/ }
- }
- }
-
- public static <T extends Enum<T>> T mapEnum(int ordinal, Class<T> enumClass) {
- T[] constants = enumClass.getEnumConstants();
- return ordinal >= 0 && ordinal < constants.length ? constants[ordinal]: null;
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/app/IOSUAccessor.aidl b/packages/Osu/src/com/android/hotspot2/app/IOSUAccessor.aidl
deleted file mode 100644
index 500dd2e..0000000
--- a/packages/Osu/src/com/android/hotspot2/app/IOSUAccessor.aidl
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.android.hotspot2.app;
-
-import com.android.hotspot2.app.OSUData;
-
-interface IOSUAccessor {
- List<OSUData> getOsuData();
- void selectOsu(int id);
-}
diff --git a/packages/Osu/src/com/android/hotspot2/app/LocalServiceBinder.java b/packages/Osu/src/com/android/hotspot2/app/LocalServiceBinder.java
deleted file mode 100644
index 8801839..0000000
--- a/packages/Osu/src/com/android/hotspot2/app/LocalServiceBinder.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.android.hotspot2.app;
-
-import android.os.Binder;
-
-public class LocalServiceBinder extends Binder {
- private final OSUService mDelegate;
-
- public LocalServiceBinder(OSUService delegate) {
- mDelegate = delegate;
- }
-
- public OSUService getService() {
- return mDelegate;
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/app/MainActivity.java b/packages/Osu/src/com/android/hotspot2/app/MainActivity.java
deleted file mode 100644
index 7fd2238..0000000
--- a/packages/Osu/src/com/android/hotspot2/app/MainActivity.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package com.android.hotspot2.app;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.TaskStackBuilder;
-import android.content.ComponentName;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.android.hotspot2.AppBridge;
-import com.android.hotspot2.R;
-import com.android.hotspot2.osu.OSUManager;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Main activity.
- */
-public class MainActivity extends Activity {
- private static final int NOTIFICATION_ID = 0; // Used for OSU count
- private static final int NOTIFICATION_MESSAGE_ID = 1; // Used for other messages
- private static final String ACTION_SVC_BOUND = "SVC_BOUND";
-
- private volatile OSUService mLocalService;
-
- private final ServiceConnection mConnection = new ServiceConnection() {
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- LocalServiceBinder binder = (LocalServiceBinder) service;
- mLocalService = binder.getService();
- showOsuSelection(mLocalService);
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name) {
- mLocalService = null;
- }
- };
-
- private ListView osuListView;
- private OsuListAdapter osuListAdapter;
- private String message;
-
- public MainActivity() {
-
- }
-
- @Override
- protected void onStop() {
- super.onStop();
- if (mLocalService != null) {
- unbindService(mConnection);
- mLocalService = null;
- }
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- if (message != null) {
- showDialog(message);
- message = null;
- }
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- final Intent intent = getIntent();
- Bundle bundle = intent.getExtras();
-
- if (intent.getAction() == null) {
- if (mLocalService == null) {
- bindService(new Intent(this, OSUService.class), mConnection, 0);
- }
- } else if (intent.getAction().equals(AppBridge.ACTION_OSU_NOTIFICATION)) {
- if (bundle == null) {
- Log.d(OSUManager.TAG, "No parameters for OSU notification");
- return;
- }
- if (bundle.containsKey(AppBridge.OSU_COUNT)) {
- showOsuCount(bundle.getInt("osu-count", 0), Collections.<OSUData>emptyList());
- } else if (bundle.containsKey(AppBridge.PROV_SUCCESS)) {
- showStatus(bundle.getBoolean(AppBridge.PROV_SUCCESS),
- bundle.getString(AppBridge.SP_NAME),
- bundle.getString(AppBridge.PROV_MESSAGE),
- null);
- } else if (bundle.containsKey(AppBridge.DEAUTH)) {
- showDeauth(bundle.getString(AppBridge.SP_NAME),
- bundle.getBoolean(AppBridge.DEAUTH),
- bundle.getInt(AppBridge.DEAUTH_DELAY),
- bundle.getString(AppBridge.DEAUTH_URL));
- }
- }
- }
-
- private void showOsuSelection(final OSUService osuService) {
- List<OSUData> osuData = osuService.getOsuData();
-
- setContentView(R.layout.activity_main);
- Log.d("osu", "osu count:" + osuData.size());
- View noOsuView = findViewById(R.id.no_osu);
- if (osuData.size() > 0) {
- noOsuView.setVisibility(View.GONE);
- osuListAdapter = new OsuListAdapter(this, osuData);
- osuListView = findViewById(R.id.profile_list);
- osuListView.setAdapter(osuListAdapter);
- osuListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
- OSUData osuData = (OSUData) adapterView.getAdapter().getItem(position);
- Log.d("osu", "launch osu:" + osuData.getName()
- + " id:" + osuData.getId());
- osuService.selectOsu(osuData.getId());
- finish();
- }
- });
- } else {
- noOsuView.setVisibility(View.VISIBLE);
- }
- }
-
- private void showOsuCount(int osuCount, List<OSUData> osus) {
- if (osuCount > 0) {
- printOsuDataList(osus);
- sendNotification(osuCount);
- } else {
- cancelNotification();
- }
- finish();
- }
-
- private void showStatus(boolean provSuccess, String spName, String provMessage,
- String remoteStatus) {
- if (provSuccess) {
- sendDialogMessage(
- String.format("Credentials for %s was successfully installed", spName));
- } else {
- if (spName != null) {
- if (remoteStatus != null) {
- sendDialogMessage(
- String.format("Failed to install credentials for %s: %s: %s",
- spName, provMessage, remoteStatus));
- } else {
- sendDialogMessage(
- String.format("Failed to install credentials for %s: %s",
- spName, provMessage));
- }
- } else {
- sendDialogMessage(
- String.format("Failed to contact OSU: %s", provMessage));
- }
- }
- }
-
- private void showDeauth(String spName, boolean ess, int delay, String url) {
- String delayReadable = getReadableTimeInSeconds(delay);
- if (ess) {
- if (delay > 60) {
- sendDialogMessage(
- String.format("There is an issue connecting to %s [for the next %s]. " +
- "Please visit %s for details", spName, delayReadable, url));
- } else {
- sendDialogMessage(
- String.format("There is an issue connecting to %s. " +
- "Please visit %s for details", spName, url));
- }
- } else {
- sendDialogMessage(
- String.format("There is an issue with the closest Access Point for %s. " +
- "You may wait %s or move to another Access Point to " +
- "regain access. Please visit %s for details.",
- spName, delayReadable, url));
- }
- }
-
- private String getReadableTimeInSeconds(int timeSeconds) {
- long hours = TimeUnit.SECONDS.toHours(timeSeconds);
- long minutes = TimeUnit.SECONDS.toMinutes(timeSeconds) - TimeUnit.HOURS.toMinutes(hours);
- long seconds =
- timeSeconds - TimeUnit.HOURS.toSeconds(hours) - TimeUnit.MINUTES.toSeconds(minutes);
- if (hours > 0) {
- return String.format("%02d:%02d:%02d", hours, minutes, seconds);
- } else {
- return String.format("%ds", seconds);
- }
- }
-
- private void sendNotification(int count) {
- Notification.Builder builder =
- new Notification.Builder(this)
- .setContentTitle(String.format("%s OSU available", count))
- .setContentText("Choose one to connect")
- .setSmallIcon(android.R.drawable.ic_dialog_info)
- .setAutoCancel(false);
- Intent resultIntent = new Intent(this, MainActivity.class);
-
- TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
- stackBuilder.addParentStack(MainActivity.class);
- stackBuilder.addNextIntent(resultIntent);
- PendingIntent resultPendingIntent =
- stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
- builder.setContentIntent(resultPendingIntent);
- NotificationManager notificationManager =
- (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
- notificationManager.notify(NOTIFICATION_ID, builder.build());
- }
-
- private void cancelNotification() {
- NotificationManager notificationManager =
- (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
- notificationManager.cancel(NOTIFICATION_ID);
- }
-
- private void sendDialogMessage(String message) {
-// sendNotificationMessage(message);
- this.message = message;
- }
-
- private void showDialog(String message) {
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setMessage(message)
- .setTitle("OSU");
- builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialogInterface) {
- dialogInterface.cancel();
- finish();
- }
- });
- AlertDialog dialog = builder.create();
- dialog.show();
- }
-
- private void sendNotificationMessage(String title) {
- Notification.Builder builder =
- new Notification.Builder(this)
- .setContentTitle(title)
- .setContentText("Click to dismiss.")
- .setSmallIcon(android.R.drawable.ic_dialog_info)
- .setAutoCancel(true);
- NotificationManager notificationManager =
- (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
- notificationManager.notify(NOTIFICATION_MESSAGE_ID, builder.build());
- }
-
- private static class OsuListAdapter extends ArrayAdapter<OSUData> {
- private Activity activity;
-
- public OsuListAdapter(Activity activity, List<OSUData> osuDataList) {
- super(activity, R.layout.list_item, osuDataList);
- this.activity = activity;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- View view = convertView;
- if (view == null) {
- view = LayoutInflater.from(getContext()).inflate(R.layout.list_item, parent, false);
- }
- OSUData osuData = getItem(position);
- TextView osuName = (TextView) view.findViewById(R.id.profile_name);
- osuName.setText(osuData.getName());
- TextView osuDetail = (TextView) view.findViewById(R.id.profile_detail);
- osuDetail.setText(osuData.getServiceDescription());
- ImageView osuIcon = (ImageView) view.findViewById(R.id.profile_logo);
- byte[] iconData = osuData.getIconData();
- osuIcon.setImageDrawable(
- new BitmapDrawable(activity.getResources(),
- BitmapFactory.decodeByteArray(iconData, 0, iconData.length)));
- return view;
- }
- }
-
- private void printOsuDataList(List<OSUData> osuDataList) {
- for (OSUData osuData : osuDataList) {
- Log.d("osu", String.format("OSUData:[%s][%s][%d]",
- osuData.getName(), osuData.getServiceDescription(),
- osuData.getId()));
- }
- }
-
-}
diff --git a/packages/Osu/src/com/android/hotspot2/app/OSUData.aidl b/packages/Osu/src/com/android/hotspot2/app/OSUData.aidl
deleted file mode 100644
index 3407f47..0000000
--- a/packages/Osu/src/com/android/hotspot2/app/OSUData.aidl
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.android.hotspot2.app;
-
-parcelable OSUData;
-
diff --git a/packages/Osu/src/com/android/hotspot2/app/OSUData.java b/packages/Osu/src/com/android/hotspot2/app/OSUData.java
deleted file mode 100644
index 17cc49b..0000000
--- a/packages/Osu/src/com/android/hotspot2/app/OSUData.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.android.hotspot2.app;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.android.hotspot2.flow.OSUInfo;
-import com.android.hotspot2.osu.OSUManager;
-
-public class OSUData implements Parcelable {
- private final String mName;
- private final String mServiceDescription;
- private final byte[] mIconData;
- private final int mId;
-
- public OSUData(OSUInfo osuInfo) {
- mName = osuInfo.getName(OSUManager.LOCALE);
- mServiceDescription = osuInfo.getServiceDescription(OSUManager.LOCALE);
- mIconData = osuInfo.getIconFileElement().getIconData();
- mId = osuInfo.getOsuID();
- }
-
- public String getName() {
- return mName;
- }
-
- public String getServiceDescription() {
- return mServiceDescription;
- }
-
- public byte[] getIconData() {
- return mIconData;
- }
-
- public int getId() {
- return mId;
- }
-
- private OSUData(Parcel in) {
- mName = in.readString();
- mServiceDescription = in.readString();
- int iconSize = in.readInt();
- mIconData = new byte[iconSize];
- in.readByteArray(mIconData);
- mId = in.readInt();
- }
-
- public static final Parcelable.Creator<OSUData> CREATOR = new Parcelable.Creator<OSUData>() {
- public OSUData createFromParcel(Parcel in) {
- return new OSUData(in);
- }
-
- public OSUData[] newArray(int size) {
- return new OSUData[size];
- }
- };
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(mName);
- dest.writeString(mServiceDescription);
- dest.writeByteArray(mIconData);
- dest.writeInt(mId);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/app/OSUService.java b/packages/Osu/src/com/android/hotspot2/app/OSUService.java
deleted file mode 100644
index e9da113..0000000
--- a/packages/Osu/src/com/android/hotspot2/app/OSUService.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package com.android.hotspot2.app;
-
-import android.app.IntentService;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.util.Log;
-
-import com.android.anqp.OSUProvider;
-import com.android.hotspot2.PasspointMatch;
-import com.android.hotspot2.osu.OSUManager;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * This is the Hotspot 2.0 release 2 OSU background service that is continuously running and caches
- * OSU information.
- *
- * The OSU App is made up of two services; FlowService and OSUService.
- *
- * OSUService is a long running light weight service, kept alive throughout the lifetime of the
- * operating system by being bound from the framework (in WifiManager in stage
- * PHASE_THIRD_PARTY_APPS_CAN_START), and is responsible for continuously caching OSU information
- * and notifying the UI when OSUs are available.
- *
- * FlowService is only started on demand from OSUService and is responsible for handling actual
- * provisioning and remediation flows, and requires a fairly significant memory footprint.
- *
- * FlowService is defined to run in its own process through the definition
- * <service android:name=".flow.FlowService" android:process=":osuflow">
- * in the AndroidManifest.
- * This is done as a means to keep total app memory footprint low (pss < 10M) and only start the
- * FlowService on demand and make it available for "garbage collection" by the OS when not in use.
- */
-public class OSUService extends IntentService {
- public static final String REMEDIATION_DONE_ACTION = "com.android.hotspot2.REMEDIATION_DONE";
- public static final String REMEDIATION_FQDN_EXTRA = "com.android.hotspot2.REMEDIATION_FQDN";
- public static final String REMEDIATION_POLICY_EXTRA = "com.android.hotspot2.REMEDIATION_POLICY";
-
- private static final String[] INTENTS = {
- WifiManager.SCAN_RESULTS_AVAILABLE_ACTION,
- // TODO(b/32883320): use updated intent definitions.
- //WifiManager.PASSPOINT_WNM_FRAME_RECEIVED_ACTION,
- //WifiManager.PASSPOINT_ICON_RECEIVED_ACTION,
- WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION,
- WifiManager.WIFI_STATE_CHANGED_ACTION,
- WifiManager.NETWORK_STATE_CHANGED_ACTION,
- REMEDIATION_DONE_ACTION
- };
-
- private OSUManager mOsuManager;
- private final LocalServiceBinder mLocalServiceBinder;
-
- public OSUService() {
- super("OSUService");
- mLocalServiceBinder = new LocalServiceBinder(this);
- }
-
- /*
- public final class OSUAccessorImpl extends IOSUAccessor.Stub {
- public List<OSUData> getOsuData() {
- List<OSUInfo> infos = getOsuInfos();
- List<OSUData> data = new ArrayList<>(infos.size());
- for (OSUInfo osuInfo : infos) {
- data.add(new OSUData(osuInfo));
- }
- return data;
- }
-
- public void selectOsu(int id) {
- OSUService.this.selectOsu(id);
- }
- }
- */
-
- @Override
- public int onStartCommand(Intent intent, int flags, int startId) {
- onHandleIntent(intent);
- return START_STICKY;
- }
-
- @Override
- public IBinder onBind(Intent intent) {
- BroadcastReceiver receiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- handleIntent(intent.getAction(), intent);
- }
- };
- for (String intentString : INTENTS) {
- registerReceiver(receiver, new IntentFilter(intentString));
- }
- return mLocalServiceBinder;
- }
-
- @Override
- protected void onHandleIntent(Intent intent) {
- if (intent == null) {
- Log.d(OSUManager.TAG, "Null intent!");
- return;
- }
- //handleIntent(intent.getStringExtra(MainActivity.ACTION_KEY), intent);
- }
-
- private void handleIntent(String action, Intent intent) {
- WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
- Bundle bundle = intent.getExtras();
- if (mOsuManager == null) {
- mOsuManager = new OSUManager(this);
- }
- Log.d(OSUManager.TAG, "Got intent " + intent.getAction());
-
- switch (action) {
- case WifiManager.SCAN_RESULTS_AVAILABLE_ACTION:
- mOsuManager.pushScanResults(wifiManager.getScanResults());
- break;
- // TODO(b/32883320): use updated intent definitions.
- /*
- case WifiManager.PASSPOINT_WNM_FRAME_RECEIVED_ACTION:
- long bssid = bundle.getLong(WifiManager.EXTRA_PASSPOINT_WNM_BSSID);
- String url = bundle.getString(WifiManager.EXTRA_PASSPOINT_WNM_URL);
-
- try {
- if (bundle.containsKey(WifiManager.EXTRA_PASSPOINT_WNM_METHOD)) {
- int method = bundle.getInt(WifiManager.EXTRA_PASSPOINT_WNM_METHOD);
- if (method != OSUProvider.OSUMethod.SoapXml.ordinal()) {
- Log.w(OSUManager.TAG, "Unsupported remediation method: " + method);
- return;
- }
- PasspointMatch match = null;
- if (bundle.containsKey(WifiManager.EXTRA_PASSPOINT_WNM_PPOINT_MATCH)) {
- int ordinal =
- bundle.getInt(WifiManager.EXTRA_PASSPOINT_WNM_PPOINT_MATCH);
- if (ordinal >= 0 && ordinal < PasspointMatch.values().length) {
- match = PasspointMatch.values()[ordinal];
- }
- }
- mOsuManager.wnmRemediate(bssid, url, match);
- } else if (bundle.containsKey(WifiManager.EXTRA_PASSPOINT_WNM_ESS)) {
- boolean ess = bundle.getBoolean(WifiManager.EXTRA_PASSPOINT_WNM_ESS);
- int delay = bundle.getInt(WifiManager.EXTRA_PASSPOINT_WNM_DELAY);
- mOsuManager.deauth(bssid, ess, delay, url);
- } else {
- Log.w(OSUManager.TAG, "Unknown WNM event");
- }
- } catch (IOException e) {
- Log.w(OSUManager.TAG, "Remediation event failed to parse: " + e);
- }
- break;
- case WifiManager.PASSPOINT_ICON_RECEIVED_ACTION:
- mOsuManager.notifyIconReceived(
- bundle.getLong(WifiManager.EXTRA_PASSPOINT_ICON_BSSID),
- bundle.getString(WifiManager.EXTRA_PASSPOINT_ICON_FILE),
- bundle.getByteArray(WifiManager.EXTRA_PASSPOINT_ICON_DATA));
- break;
- */
- case WifiManager.NETWORK_STATE_CHANGED_ACTION:
- mOsuManager.networkConnectChange(
- (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO));
- break;
- case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION:
- boolean multiNetwork =
- bundle.getBoolean(WifiManager.EXTRA_MULTIPLE_NETWORKS_CHANGED, false);
- if (multiNetwork) {
- mOsuManager.networkConfigChanged();
- } else if (bundle.getInt(WifiManager.EXTRA_CHANGE_REASON,
- WifiManager.CHANGE_REASON_CONFIG_CHANGE)
- == WifiManager.CHANGE_REASON_REMOVED) {
- WifiConfiguration configuration =
- intent.getParcelableExtra(WifiManager.EXTRA_WIFI_CONFIGURATION);
- mOsuManager.networkDeleted(configuration);
- } else {
- mOsuManager.networkConfigChanged();
- }
- break;
- case WifiManager.WIFI_STATE_CHANGED_ACTION:
- int state = bundle.getInt(WifiManager.EXTRA_WIFI_STATE);
- if (state == WifiManager.WIFI_STATE_DISABLED) {
- mOsuManager.wifiStateChange(false);
- } else if (state == WifiManager.WIFI_STATE_ENABLED) {
- mOsuManager.wifiStateChange(true);
- }
- break;
- case REMEDIATION_DONE_ACTION:
- String fqdn = bundle.getString(REMEDIATION_FQDN_EXTRA);
- boolean policy = bundle.getBoolean(REMEDIATION_POLICY_EXTRA);
- mOsuManager.remediationDone(fqdn, policy);
- break;
- }
- }
-
- public List<OSUData> getOsuData() {
- return mOsuManager.getAvailableOSUs();
- }
-
- public void selectOsu(int id) {
- mOsuManager.setOSUSelection(id);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Boolean.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1Boolean.java
deleted file mode 100644
index 18af3b8..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Boolean.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.nio.ByteBuffer;
-import java.util.Collection;
-
-public class Asn1Boolean extends Asn1Object {
- private final boolean mBoolean;
-
- public Asn1Boolean(int tag, Asn1Class asn1Class, int length, ByteBuffer data)
- throws DecodeException {
- super(tag, asn1Class, false, length);
- if (length != 1) {
- throw new DecodeException("Boolean length != 1: " + length, data.position());
- }
- mBoolean = data.get() != 0;
- }
-
- public boolean getValue() {
- return mBoolean;
- }
-
- @Override
- public Collection<Asn1Object> getChildren() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String toString() {
- return super.toString() + "=" + Boolean.toString(mBoolean);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Class.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1Class.java
deleted file mode 100644
index 8a4d8a8..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Class.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.android.hotspot2.asn1;
-
-public enum Asn1Class {
- Universal, Application, Context, Private
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Constructed.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1Constructed.java
deleted file mode 100644
index 69b65dc..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Constructed.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.nio.ByteBuffer;
-import java.util.*;
-
-public class Asn1Constructed extends Asn1Object {
- private final int mTagPosition;
- private final List<Asn1Object> mChildren;
-
- public Asn1Constructed(int tag, Asn1Class asn1Class, int length,
- ByteBuffer payload, int tagPosition) {
- super(tag, asn1Class, true, length, payload);
- mTagPosition = tagPosition;
- mChildren = new ArrayList<>();
- }
-
- public void addChild(Asn1Object object) {
- mChildren.add(object);
- }
-
- @Override
- public Collection<Asn1Object> getChildren() {
- return Collections.unmodifiableCollection(mChildren);
- }
-
- public ByteBuffer getEncoding() {
- return getPayload(mTagPosition);
- }
-
- private void toString(int level, StringBuilder sb) {
- sb.append(indent(level)).append(super.toString()).append(":\n");
- for (Asn1Object child : mChildren) {
- if (child.isConstructed()) {
- ((Asn1Constructed) child).toString(level + 1, sb);
- } else {
- sb.append(indent(level + 1)).append(child.toString()).append('\n');
- }
- }
- }
-
- public static String indent(int level) {
- char[] indent = new char[level * 2];
- Arrays.fill(indent, ' ');
- return new String(indent);
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- toString(0, sb);
- return sb.toString();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Decoder.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1Decoder.java
deleted file mode 100644
index 53452e7..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Decoder.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.nio.ByteBuffer;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Asn1Decoder {
- public static final int TAG_UNIVZERO = 0x00;
- public static final int TAG_BOOLEAN = 0x01;
- public static final int TAG_INTEGER = 0x02;
- public static final int TAG_BITSTRING = 0x03;
- public static final int TAG_OCTET_STRING = 0x04;
- public static final int TAG_NULL = 0x05;
- public static final int TAG_OID = 0x06;
- public static final int TAG_ObjectDescriptor = 0x07;
- public static final int TAG_EXTERNAL = 0x08;
- public static final int TAG_REAL = 0x09;
- public static final int TAG_ENUMERATED = 0x0a;
- public static final int TAG_UTF8String = 0x0c; // * (*) are X.509 DirectoryString's
- public static final int TAG_RelativeOID = 0x0d;
- public static final int TAG_SEQ = 0x10; // 30 if constructed
- public static final int TAG_SET = 0x11;
- public static final int TAG_NumericString = 0x12; // [UNIVERSAL 18]
- public static final int TAG_PrintableString = 0x13; // * [UNIVERSAL 19]
- public static final int TAG_T61String = 0x14; // * TeletexString [UNIVERSAL 20]
- public static final int TAG_VideotexString = 0x15; // [UNIVERSAL 21]
- public static final int TAG_IA5String = 0x16; // [UNIVERSAL 22]
- public static final int TAG_UTCTime = 0x17;
- public static final int TAG_GeneralizedTime = 0x18;
- public static final int TAG_GraphicString = 0x19; // [UNIVERSAL 25]
- public static final int TAG_VisibleString = 0x1a; // ISO64String [UNIVERSAL 26]
- public static final int TAG_GeneralString = 0x1b; // [UNIVERSAL 27]
- public static final int TAG_UniversalString = 0x1c; // * [UNIVERSAL 28]
- public static final int TAG_BMPString = 0x1e; // * [UNIVERSAL 30]
-
- public static final int IntOverflow = 0xffff0000;
- public static final int MoreBit = 0x80;
- public static final int MoreData = 0x7f;
- public static final int ConstructedBit = 0x20;
- public static final int ClassShift = 6;
- public static final int ClassMask = 0x3;
- public static final int MoreWidth = 7;
- public static final int ByteWidth = 8;
- public static final int ByteMask = 0xff;
- public static final int ContinuationTag = 31;
-
- public static final int IndefiniteLength = -1;
-
- private static final Map<Integer, Asn1Tag> sTagMap = new HashMap<>();
-
- static {
- sTagMap.put(TAG_UNIVZERO, Asn1Tag.UNIVZERO);
- sTagMap.put(TAG_BOOLEAN, Asn1Tag.BOOLEAN);
- sTagMap.put(TAG_INTEGER, Asn1Tag.INTEGER);
- sTagMap.put(TAG_BITSTRING, Asn1Tag.BITSTRING);
- sTagMap.put(TAG_OCTET_STRING, Asn1Tag.OCTET_STRING);
- sTagMap.put(TAG_NULL, Asn1Tag.NULL);
- sTagMap.put(TAG_OID, Asn1Tag.OID);
- sTagMap.put(TAG_ObjectDescriptor, Asn1Tag.ObjectDescriptor);
- sTagMap.put(TAG_EXTERNAL, Asn1Tag.EXTERNAL);
- sTagMap.put(TAG_REAL, Asn1Tag.REAL);
- sTagMap.put(TAG_ENUMERATED, Asn1Tag.ENUMERATED);
- sTagMap.put(TAG_UTF8String, Asn1Tag.UTF8String);
- sTagMap.put(TAG_RelativeOID, Asn1Tag.RelativeOID);
- sTagMap.put(TAG_SEQ, Asn1Tag.SEQUENCE);
- sTagMap.put(TAG_SET, Asn1Tag.SET);
- sTagMap.put(TAG_NumericString, Asn1Tag.NumericString);
- sTagMap.put(TAG_PrintableString, Asn1Tag.PrintableString);
- sTagMap.put(TAG_T61String, Asn1Tag.T61String);
- sTagMap.put(TAG_VideotexString, Asn1Tag.VideotexString);
- sTagMap.put(TAG_IA5String, Asn1Tag.IA5String);
- sTagMap.put(TAG_UTCTime, Asn1Tag.UTCTime);
- sTagMap.put(TAG_GeneralizedTime, Asn1Tag.GeneralizedTime);
- sTagMap.put(TAG_GraphicString, Asn1Tag.GraphicString);
- sTagMap.put(TAG_VisibleString, Asn1Tag.VisibleString);
- sTagMap.put(TAG_GeneralString, Asn1Tag.GeneralString);
- sTagMap.put(TAG_UniversalString, Asn1Tag.UniversalString);
- sTagMap.put(TAG_BMPString, Asn1Tag.BMPString);
- }
-
- public static Asn1Tag mapTag(int tag) {
- return sTagMap.get(tag);
- }
-
- public static Collection<Asn1Object> decode(ByteBuffer data) throws DecodeException {
- Asn1Constructed root =
- new Asn1Constructed(0, null, data.remaining(), data, data.position());
- decode(0, root);
- return root.getChildren();
- }
-
- private static void decode(int level, Asn1Constructed parent) throws DecodeException {
- ByteBuffer data = parent.getPayload();
- while (data.hasRemaining()) {
- int tagPosition = data.position();
- int propMask = data.get(tagPosition) & ByteMask;
- if (propMask == 0 && parent.isIndefiniteLength() && data.get(tagPosition + 1) == 0) {
- parent.setEndOfData(tagPosition);
- return;
- }
- Asn1Class asn1Class = Asn1Class.values()[(propMask >> ClassShift) & ClassMask];
- boolean constructed = (propMask & ConstructedBit) != 0;
-
- int tag = decodeTag(data);
- int length = decodeLength(data);
-
- if (constructed) {
- ByteBuffer payload = peelOff(data, length);
- Asn1Constructed root =
- new Asn1Constructed(tag, asn1Class, length, payload, tagPosition);
- decode(level + 1, root);
- if (length == IndefiniteLength) {
- data.position(root.getEndOfData() + 2); // advance past '00'
- }
- parent.addChild(root);
- } else {
- if (asn1Class != Asn1Class.Universal) {
- parent.addChild(new Asn1Octets(tag, asn1Class, length, data));
- } else {
- parent.addChild(buildScalar(tag, asn1Class, length, data));
- }
- }
- }
- }
-
- private static ByteBuffer peelOff(ByteBuffer base, int length) {
- ByteBuffer copy = base.duplicate();
- if (length == IndefiniteLength) {
- return copy;
- }
- copy.limit(copy.position() + length);
- base.position(base.position() + length);
- return copy;
- }
-
- private static Asn1Object buildScalar(int tag, Asn1Class asn1Class, int length, ByteBuffer data)
- throws DecodeException {
- switch (tag) {
- case TAG_BOOLEAN:
- return new Asn1Boolean(tag, asn1Class, length, data);
- case TAG_INTEGER:
- case TAG_ENUMERATED:
- return new Asn1Integer(tag, asn1Class, length, data);
- case TAG_BITSTRING:
- int bitResidual = data.get() & ByteMask;
- return new Asn1Octets(tag, asn1Class, length, data, bitResidual);
- case TAG_OCTET_STRING:
- return new Asn1Octets(tag, asn1Class, length, data);
- case TAG_OID:
- return new Asn1Oid(tag, asn1Class, length, data);
- case TAG_UTF8String:
- case TAG_NumericString:
- case TAG_PrintableString:
- case TAG_T61String:
- case TAG_VideotexString:
- case TAG_IA5String:
- case TAG_GraphicString:
- case TAG_VisibleString:
- case TAG_GeneralString:
- case TAG_UniversalString:
- case TAG_BMPString:
- return new Asn1String(tag, asn1Class, length, data);
- case TAG_GeneralizedTime:
- case TAG_UTCTime:
- // Should really be a dedicated time object
- return new Asn1String(tag, asn1Class, length, data);
- default:
- return new Asn1Octets(tag, asn1Class, length, data);
- }
- }
-
- private static int decodeTag(ByteBuffer data) throws DecodeException {
- int tag;
- byte tag0 = data.get();
-
- if ((tag = (tag0 & ContinuationTag)) == ContinuationTag) {
- int tagByte;
- tag = 0;
- while (((tagByte = data.get() & ByteMask) & MoreBit) != 0) {
- tag = (tag << MoreWidth) | (tagByte & MoreData);
- if ((tag & IntOverflow) != 0)
- throw new DecodeException("Tag overflow", data.position());
- }
- tag = (tag << MoreWidth) | tagByte;
- }
- return tag;
- }
-
- private static int decodeLength(ByteBuffer data) throws DecodeException {
- int length;
- int lenlen = data.get() & ByteMask;
-
- if ((lenlen & MoreBit) == 0) // One byte encoding
- length = lenlen;
- else {
- lenlen &= MoreData;
- if (lenlen == 0) {
- return IndefiniteLength;
- }
- length = 0;
- while (lenlen-- > 0) {
- length = (length << ByteWidth) | (data.get() & ByteMask);
- if ((length & IntOverflow) != 0 && lenlen > 0)
- throw new DecodeException("Length overflow", data.position());
- }
- }
- return length;
- }
-
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1ID.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1ID.java
deleted file mode 100644
index 452d85c..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1ID.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.android.hotspot2.asn1;
-
-public class Asn1ID {
- private final int mTag;
- private final Asn1Class mClass;
-
- public Asn1ID(int tag, Asn1Class asn1Class) {
- mTag = tag;
- mClass = asn1Class;
- }
-
- public int getTag() {
- return mTag;
- }
-
- public Asn1Class getAsn1Class() {
- return mClass;
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Integer.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1Integer.java
deleted file mode 100644
index 5180a4d..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Integer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-
-public class Asn1Integer extends Asn1Object {
- private static final int SignBit = 0x80;
-
- private final long mValue;
- private final BigInteger mBigValue;
-
- public Asn1Integer(int tag, Asn1Class asn1Class, int length, ByteBuffer data) {
- super(tag, asn1Class, false, length);
-
- if (length <= 8) {
- long value = (data.get(data.position()) & SignBit) != 0 ? -1 : 0;
- for (int n = 0; n < length; n++) {
- value = (value << Byte.SIZE) | data.get();
- }
- mValue = value;
- mBigValue = null;
- } else {
- byte[] payload = new byte[length];
- data.get(payload);
- mValue = 0;
- mBigValue = new BigInteger(payload);
- }
- }
-
- public boolean isBigValue() {
- return mBigValue != null;
- }
-
- public long getValue() {
- return mValue;
- }
-
- public BigInteger getBigValue() {
- return mBigValue;
- }
-
- @Override
- public Collection<Asn1Object> getChildren() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String toString() {
- if (isBigValue()) {
- return super.toString() + '=' + mBigValue.toString(16);
- } else {
- return super.toString() + '=' + mValue;
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Object.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1Object.java
deleted file mode 100644
index 8137583..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Object.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.nio.ByteBuffer;
-import java.util.Collection;
-
-public abstract class Asn1Object {
- private final int mTag;
- private final Asn1Class mClass;
- private final boolean mConstructed;
- private final int mLength;
- private final ByteBuffer mPayload;
-
- protected Asn1Object(int tag, Asn1Class asn1Class, boolean constructed, int length) {
- this(tag, asn1Class, constructed, length, null);
- }
-
- protected Asn1Object(int tag, Asn1Class asn1Class, boolean constructed,
- int length, ByteBuffer payload) {
- mTag = tag;
- mClass = asn1Class;
- mConstructed = constructed;
- mLength = length;
- mPayload = payload != null ? payload.duplicate() : null;
- }
-
- public int getTag() {
- return mTag;
- }
-
- public Asn1Class getAsn1Class() {
- return mClass;
- }
-
- public boolean isConstructed() {
- return mConstructed;
- }
-
- public boolean isIndefiniteLength() {
- return mLength == Asn1Decoder.IndefiniteLength;
- }
-
- public int getLength() {
- return mLength;
- }
-
- public ByteBuffer getPayload() {
- return mPayload != null ? mPayload.duplicate() : null;
- }
-
- protected ByteBuffer getPayload(int position) {
- if (mPayload == null) {
- return null;
- }
- ByteBuffer encoding = mPayload.duplicate();
- encoding.position(position);
- return encoding;
- }
-
- protected void setEndOfData(int position) {
- mPayload.limit(position);
- }
-
- protected int getEndOfData() {
- return mPayload.limit();
- }
-
- public boolean matches(Asn1ID id) {
- return mTag == id.getTag() && mClass == id.getAsn1Class();
- }
-
- public String toSimpleString() {
- Asn1Tag tag = mClass == Asn1Class.Universal ? Asn1Decoder.mapTag(mTag) : null;
- if (tag != null) {
- return tag.name();
- } else if (mClass == Asn1Class.Universal) {
- return String.format("[%d]", mTag);
- } else {
- return String.format("[%s %d]", mClass, mTag);
- }
- }
-
- public abstract Collection<Asn1Object> getChildren();
-
- @Override
- public String toString() {
- return toSimpleString();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Octets.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1Octets.java
deleted file mode 100644
index 1e19953..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Octets.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.nio.ByteBuffer;
-import java.util.Collection;
-
-public class Asn1Octets extends Asn1Object {
- private final byte[] mOctets;
- private final int mBitResidual;
-
- public Asn1Octets(int tag, Asn1Class asn1Class, int length, ByteBuffer data) {
- super(tag, asn1Class, false, length);
- mOctets = new byte[length];
- data.get(mOctets);
- mBitResidual = -1;
- }
-
- public Asn1Octets(int tag, Asn1Class asn1Class, int length, ByteBuffer data, int bitResidual) {
- super(tag, asn1Class, false, length);
- mOctets = new byte[length - 1];
- data.get(mOctets);
- mBitResidual = bitResidual;
- }
-
- public byte[] getOctets() {
- return mOctets;
- }
-
- @Override
- public Collection<Asn1Object> getChildren() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- for (byte b : mOctets) {
- sb.append(String.format(" %02x", b & Asn1Decoder.ByteMask));
- }
- if (mBitResidual >= 0) {
- return super.toString() + '=' + sb + '/' + mBitResidual;
- } else if (getTag() == Asn1Decoder.TAG_NULL && getLength() == 0) {
- return super.toString();
- } else {
- return super.toString() + '=' + sb;
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Oid.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1Oid.java
deleted file mode 100644
index 50f0553..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Oid.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class Asn1Oid extends Asn1Object {
- public static final int OidMaxOctet1 = 2;
- public static final int OidOctet1Modulus = 40;
-
- private final List<Long> mArcs;
- private final int mHashcode;
-
- private static final Map<Asn1Oid, String> sOidMap = new HashMap<>();
-
- public Asn1Oid(int tag, Asn1Class asn1Class, int length, ByteBuffer data)
- throws DecodeException {
- super(tag, asn1Class, false, length);
-
- if (length == 0)
- throw new DecodeException("oid-encoding length is zero", data.position());
-
- mArcs = new ArrayList<>();
-
- ByteBuffer payload = data.duplicate();
- payload.limit(payload.position() + length);
- data.position(data.position() + length);
-
- byte current = payload.get();
- long seg01 = current & Asn1Decoder.ByteMask;
- long segValue = seg01 / OidOctet1Modulus;
- int hashcode = (int) segValue;
- mArcs.add(segValue);
- segValue = seg01 - segValue * OidOctet1Modulus;
- hashcode = hashcode * 31 + (int) segValue;
- mArcs.add(segValue);
-
- current = 0;
- segValue = 0L;
-
- while (payload.hasRemaining()) {
- current = payload.get();
- segValue |= current & Asn1Decoder.MoreData;
- if ((current & Asn1Decoder.MoreBit) == 0) {
- hashcode = hashcode * 31 + (int) segValue;
- mArcs.add(segValue);
- segValue = 0L;
- } else
- segValue <<= Asn1Decoder.MoreWidth;
- }
- if ((current & Asn1Decoder.MoreBit) != 0)
- throw new DecodeException("Illegal (end of) oid-encoding", payload.position());
- mHashcode = hashcode;
- }
-
- public Asn1Oid(Long... arcs) {
- super(Asn1Decoder.TAG_OID, Asn1Class.Universal, false, -1);
- mArcs = Arrays.asList(arcs);
- int hashcode = 0;
- for (long arc : arcs) {
- hashcode = hashcode * 31 + (int) arc;
- }
- mHashcode = hashcode;
- }
-
- @Override
- public int hashCode() {
- return mHashcode;
- }
-
- @Override
- public boolean equals(Object thatObject) {
- return !(thatObject == null || thatObject.getClass() != Asn1Oid.class) &&
- mArcs.equals(((Asn1Oid) thatObject).mArcs);
- }
-
- public String toOIDString() {
- StringBuilder sb = new StringBuilder();
- boolean first = true;
- for (long arc : mArcs) {
- if (first) {
- first = false;
- } else {
- sb.append('.');
- }
- sb.append(arc);
- }
- return sb.toString();
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(toOIDString());
- String name = sOidMap.get(this);
- if (name != null) {
- sb.append(" (").append(name).append(')');
- }
- return super.toString() + '=' + sb.toString();
- }
-
- @Override
- public Collection<Asn1Object> getChildren() {
- throw new UnsupportedOperationException();
- }
-
- public static final Asn1Oid PKCS7Data = new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 7L, 1L);
- public static final Asn1Oid PKCS7SignedData = new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 7L, 2L);
- // encoded as an IA5STRING type
- public static final Asn1Oid OidMacAddress = new Asn1Oid(1L, 3L, 6L, 1L, 1L, 1L, 1L, 22L);
- // encoded as an IA5STRING type
- public static final Asn1Oid OidImei = new Asn1Oid(1L, 3L, 6L, 1L, 4L, 1L, 40808L, 1L, 1L, 3L);
- // encoded as a BITSTRING type
- public static final Asn1Oid OidMeid = new Asn1Oid(1L, 3L, 6L, 1L, 4L, 1L, 40808L, 1L, 1L, 4L);
- // encoded as a PRINTABLESTRING type
- public static final Asn1Oid OidDevId = new Asn1Oid(1L, 3L, 6L, 1L, 4L, 1L, 40808L, 1L, 1L, 5L);
-
- //sOidMap.put(new Asn1Oid(1L, 2L, 840L, 10040L, 4L, 1L), "algo_id_dsa");
- //sOidMap.put(new Asn1Oid(1L, 2L, 840L, 10040L, 4L, 3L), "algo_id_dsawithsha1");
- //sOidMap.put(new Asn1Oid(1L, 2L, 840L, 10045L, 2L, 1L), "algo_id_ecPublicKey");
- //sOidMap.put(new Asn1Oid(1L, 2L, 840L, 10045L, 4L, 3L, 3L), "eccdaWithSHA384");
- //sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 1L), "algo_id_rsaEncryption");
- //sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 2L), "algo_id_md2WithRSAEncryption");
- //sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 4L), "algo_id_md5WithRSAEncryption");
- //sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 5L), "algo_id_sha1WithRSAEncryption");
- //sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 11L),
- // "algo_id_sha256WithRSAEncryption");
-
- static {
- sOidMap.put(new Asn1Oid(0L, 0L), "NullOid");
- sOidMap.put(new Asn1Oid(0L, 9L, 2342L, 19200300L, 100L, 1L, 25L), "domComp");
-
- sOidMap.put(OidMacAddress, "mac-address");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 10040L, 4L, 1L), "algo_id_dsa");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 10040L, 4L, 3L), "algo_id_dsawithsha1");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 10045L, 2L, 1L), "algo_id_ecPublicKey");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 10045L, 4L, 3L, 3L), "eccdaWithSHA384");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 10046L, 2L, 1L), "algo_id_dhpublicnumber");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 1L), "algo_id_rsaEncryption");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 2L), "algo_id_md2WithRSAEncryption");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 4L), "algo_id_md5WithRSAEncryption");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 5L),
- "algo_id_sha1WithRSAEncryption");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 11L),
- "algo_id_sha256WithRSAEncryption");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 7L), "pkcs7");
- sOidMap.put(PKCS7Data, "pkcs7-data");
- sOidMap.put(PKCS7SignedData, "pkcs7-signedData");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 9L, 1L), "emailAddress");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 9L, 7L), "challengePassword");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 9L, 14L), "extensionRequest");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 3L, 2L), "algo_id_RC2_CBC");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 3L, 4L), "algo_id_RC4_ENC");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 3L, 7L), "algo_id_DES_EDE3_CBC");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 3L, 9L), "algo_id_RC5_CBC_PAD");
- sOidMap.put(new Asn1Oid(1L, 2L, 840L, 113549L, 3L, 10L), "algo_id_desCDMF");
- sOidMap.put(new Asn1Oid(1L, 3L, 6L, 1L, 4L, 1L, 40808L, 1L, 1L, 2L), "id-kp-HS2.0Auth");
- sOidMap.put(OidImei, "imei");
- sOidMap.put(OidMeid, "meid");
- sOidMap.put(OidDevId, "DevId");
- sOidMap.put(new Asn1Oid(1L, 3L, 6L, 1L, 5L, 5L, 7L, 1L, 1L),
- "certAuthorityInfoAccessSyntax");
- sOidMap.put(new Asn1Oid(1L, 3L, 6L, 1L, 5L, 5L, 7L, 1L, 11L),
- "certSubjectInfoAccessSyntax");
- sOidMap.put(new Asn1Oid(1L, 3L, 14L, 3L, 2L, 26L), "algo_id_SHA1");
- sOidMap.put(new Asn1Oid(1L, 3L, 132L, 0L, 34L), "secp384r1");
-
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 3L), "x500_CN");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 4L), "x500_SN");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 5L), "x500_serialNum");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 6L), "x500_C");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 7L), "x500_L");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 8L), "x500_ST");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 9L), "x500_STREET");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 10L), "x500_O");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 11L), "x500_OU");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 12L), "x500_title");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 13L), "x500_description");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 17L), "x500_postalCode");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 18L), "x500_poBox");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 20L), "x500_phone");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 41L), "x500_name");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 42L), "x500_givenName");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 44L), "x500_genQual");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 43L), "x500_initials");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 46L), "x500_dnQualifier");
- sOidMap.put(new Asn1Oid(2L, 5L, 4L, 65L), "x500_pseudonym");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 9L), "certSubjectDirectoryAttributes");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 14L), "certSubjectKeyIdentifier ");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 15L), "certKeyUsage");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 16L), "certPrivateKeyUsagePeriod");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 17L), "certSubjectAltName");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 18L), "certIssuerAltName");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 19L), "certBasicConstraints");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 30L), "certNameConstraints");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 31L), "certCRLDistributionPoints");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 32L), "certificatePolicies");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 33L), "certPolicyMappings");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 35L), "certAuthorityKeyIdentifier ");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 36L), "certPolicyConstraints");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 37L), "certExtKeyUsageSyntax");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 46L), "certFreshestCRL");
- sOidMap.put(new Asn1Oid(2L, 5L, 29L, 54L), "certInhibitAnyPolicy");
- sOidMap.put(new Asn1Oid(2L, 16L, 840L, 1L, 101L, 3L, 4L, 1L, 2L), "algo_id_aes128");
- sOidMap.put(new Asn1Oid(2L, 16L, 840L, 1L, 101L, 3L, 4L, 1L, 22L), "algo_id_aes192");
- sOidMap.put(new Asn1Oid(2L, 16L, 840L, 1L, 101L, 3L, 4L, 1L, 42L), "algo_id_aes256");
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1String.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1String.java
deleted file mode 100644
index 37ed2b2..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1String.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-
-public class Asn1String extends Asn1Object {
- private final String mString;
-
- public Asn1String(int tag, Asn1Class asn1Class, int length, ByteBuffer data) {
- super(tag, asn1Class, false, length);
-
- byte[] octets = new byte[length];
- data.get(octets);
- Charset charset = tag == Asn1Decoder.TAG_UTF8String
- ? StandardCharsets.UTF_8 : StandardCharsets.ISO_8859_1;
- mString = new String(octets, charset);
- }
-
- public String getString() {
- return mString;
- }
-
- @Override
- public Collection<Asn1Object> getChildren() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String toString() {
- return super.toString() + "='" + mString + '\'';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Tag.java b/packages/Osu/src/com/android/hotspot2/asn1/Asn1Tag.java
deleted file mode 100644
index 8129481..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/Asn1Tag.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.android.hotspot2.asn1;
-
-public enum Asn1Tag {
- UNIVZERO,
- BOOLEAN,
- INTEGER,
- BITSTRING,
- OCTET_STRING,
- NULL,
- OID,
- ObjectDescriptor,
- EXTERNAL,
- REAL,
- ENUMERATED,
- UTF8String,
- RelativeOID,
- SEQUENCE,
- SET,
- NumericString,
- PrintableString,
- T61String,
- VideotexString,
- IA5String,
- UTCTime,
- GeneralizedTime,
- GraphicString,
- VisibleString,
- GeneralString,
- UniversalString,
- BMPString
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/DecodeException.java b/packages/Osu/src/com/android/hotspot2/asn1/DecodeException.java
deleted file mode 100644
index 1f10ee4..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/DecodeException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.io.IOException;
-
-public class DecodeException extends IOException {
- private final int mOffset;
-
- public DecodeException(String message, int offset) {
- super(message);
- mOffset = offset;
- }
-
- @Override
- public String toString() {
- return super.toString() + " at " + mOffset;
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/asn1/OidMappings.java b/packages/Osu/src/com/android/hotspot2/asn1/OidMappings.java
deleted file mode 100644
index 01a6fd6..0000000
--- a/packages/Osu/src/com/android/hotspot2/asn1/OidMappings.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.android.hotspot2.asn1;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class OidMappings {
- public static class SigEntry {
- private final String mSigAlgo;
- private final Asn1Oid mKeyAlgo;
-
- private SigEntry(String sigAlgo, Asn1Oid keyAlgo) {
- mSigAlgo = sigAlgo;
- mKeyAlgo = keyAlgo;
- }
-
- public String getSigAlgo() {
- return mSigAlgo;
- }
-
- public Asn1Oid getKeyAlgo() {
- return mKeyAlgo;
- }
- }
-
- public static final String IdPeLogotype = "1.3.6.1.5.5.7.1.12";
- public static final String IdCeSubjectAltName = "2.5.29.17";
-
- private static final Map<Asn1Oid, String> sCryptoMapping = new HashMap<>();
- private static final Map<Asn1Oid, String> sNameMapping = new HashMap<>();
- private static final Set<Asn1Oid> sIDMapping = new HashSet<>();
- private static final Map<Asn1Oid, SigEntry> sSigAlgos = new HashMap<>();
-
- // DSA
- private static final Asn1Oid sAlgo_DSA = new Asn1Oid(1L, 2L, 840L, 10040L, 4L, 1L);
- private static final Asn1Oid sAlgo_SHA1withDSA = new Asn1Oid(1L, 2L, 840L, 10040L, 4L, 3L);
-
- // RSA
- public static final Asn1Oid sAlgo_RSA = new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 1L);
- private static final Asn1Oid sAlgo_MD2withRSA = new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 2L);
- private static final Asn1Oid sAlgo_MD5withRSA = new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 4L);
- private static final Asn1Oid sAlgo_SHA1withRSA = new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 5L);
- private static final Asn1Oid sAlgo_SHA224withRSA =
- new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 14L); // n/a
- private static final Asn1Oid sAlgo_SHA256withRSA =
- new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 11L);
- private static final Asn1Oid sAlgo_SHA384withRSA =
- new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 12L);
- private static final Asn1Oid sAlgo_SHA512withRSA =
- new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 1L, 13L);
-
- // ECC
- public static final Asn1Oid sAlgo_EC = new Asn1Oid(1L, 2L, 840L, 10045L, 2L, 1L);
- private static final Asn1Oid sAlgo_SHA1withECDSA = new Asn1Oid(1L, 2L, 840L, 10045L, 4L, 1L);
- private static final Asn1Oid sAlgo_SHA224withECDSA =
- new Asn1Oid(1L, 2L, 840L, 10045L, 4L, 3L, 1L); // n/a
- private static final Asn1Oid sAlgo_SHA256withECDSA =
- new Asn1Oid(1L, 2L, 840L, 10045L, 4L, 3L, 2L);
- private static final Asn1Oid sAlgo_SHA384withECDSA =
- new Asn1Oid(1L, 2L, 840L, 10045L, 4L, 3L, 3L);
- private static final Asn1Oid sAlgo_SHA512withECDSA =
- new Asn1Oid(1L, 2L, 840L, 10045L, 4L, 3L, 4L);
-
- private static final Asn1Oid sAlgo_MD2 = new Asn1Oid(1L, 2L, 840L, 113549L, 2L, 2L);
- private static final Asn1Oid sAlgo_MD5 = new Asn1Oid(1L, 2L, 840L, 113549L, 2L, 5L);
- private static final Asn1Oid sAlgo_SHA1 = new Asn1Oid(1L, 3L, 14L, 3L, 2L, 26L);
- private static final Asn1Oid sAlgo_SHA256 =
- new Asn1Oid(2L, 16L, 840L, 1L, 101L, 3L, 4L, 2L, 1L);
- private static final Asn1Oid sAlgo_SHA384 =
- new Asn1Oid(2L, 16L, 840L, 1L, 101L, 3L, 4L, 2L, 2L);
- private static final Asn1Oid sAlgo_SHA512 =
- new Asn1Oid(2L, 16L, 840L, 1L, 101L, 3L, 4L, 2L, 3L);
-
- // HS2.0 stuff:
- public static final Asn1Oid sPkcs9AtChallengePassword =
- new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 9L, 7L);
- public static final Asn1Oid sExtensionRequest = new Asn1Oid(1L, 2L, 840L, 113549L, 1L, 9L, 14L);
-
- public static final Asn1Oid sMAC = new Asn1Oid(1L, 3L, 6L, 1L, 1L, 1L, 1L, 22L);
- public static final Asn1Oid sIMEI = new Asn1Oid(1L, 3L, 6L, 1L, 4L, 1L, 40808L, 1L, 1L, 3L);
- public static final Asn1Oid sMEID = new Asn1Oid(1L, 3L, 6L, 1L, 4L, 1L, 40808L, 1L, 1L, 4L);
- public static final Asn1Oid sDevID = new Asn1Oid(1L, 3L, 6L, 1L, 4L, 1L, 40808L, 1L, 1L, 5L);
-
- public static final Asn1Oid sIdWfaHotspotFriendlyName =
- new Asn1Oid(1L, 3L, 6L, 1L, 4L, 1L, 40808L, 1L, 1L, 1L);
-
- static {
- sCryptoMapping.put(sAlgo_DSA, "DSA");
- sCryptoMapping.put(sAlgo_RSA, "RSA");
- sCryptoMapping.put(sAlgo_EC, "EC");
-
- sSigAlgos.put(sAlgo_SHA1withDSA, new SigEntry("SHA1withDSA", sAlgo_DSA));
-
- sSigAlgos.put(sAlgo_MD2withRSA, new SigEntry("MD2withRSA", sAlgo_RSA));
- sSigAlgos.put(sAlgo_MD5withRSA, new SigEntry("MD5withRSA", sAlgo_RSA));
- sSigAlgos.put(sAlgo_SHA1withRSA, new SigEntry("SHA1withRSA", sAlgo_RSA));
- sSigAlgos.put(sAlgo_SHA224withRSA, new SigEntry(null, sAlgo_RSA));
- sSigAlgos.put(sAlgo_SHA256withRSA, new SigEntry("SHA256withRSA", sAlgo_RSA));
- sSigAlgos.put(sAlgo_SHA384withRSA, new SigEntry("SHA384withRSA", sAlgo_RSA));
- sSigAlgos.put(sAlgo_SHA512withRSA, new SigEntry("SHA512withRSA", sAlgo_RSA));
-
- sSigAlgos.put(sAlgo_SHA1withECDSA, new SigEntry("SHA1withECDSA", sAlgo_EC));
- sSigAlgos.put(sAlgo_SHA224withECDSA, new SigEntry(null, sAlgo_EC));
- sSigAlgos.put(sAlgo_SHA256withECDSA, new SigEntry("SHA256withECDSA", sAlgo_EC));
- sSigAlgos.put(sAlgo_SHA384withECDSA, new SigEntry("SHA384withECDSA", sAlgo_EC));
- sSigAlgos.put(sAlgo_SHA512withECDSA, new SigEntry("SHA512withECDSA", sAlgo_EC));
-
- sIDMapping.add(sMAC);
- sIDMapping.add(sIMEI);
- sIDMapping.add(sMEID);
- sIDMapping.add(sDevID);
-
- for (Map.Entry<Asn1Oid, String> entry : sCryptoMapping.entrySet()) {
- sNameMapping.put(entry.getKey(), entry.getValue());
- }
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 1L), "sect163k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 2L), "sect163r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 3L), "sect239k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 4L), "sect113r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 5L), "sect113r2");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 6L), "secp112r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 7L), "secp112r2");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 8L), "secp160r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 9L), "secp160k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 10L), "secp256k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 15L), "sect163r2");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 16L), "sect283k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 17L), "sect283r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 22L), "sect131r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 23L), "sect131r2");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 24L), "sect193r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 25L), "sect193r2");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 26L), "sect233k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 27L), "sect233r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 28L), "secp128r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 29L), "secp128r2");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 30L), "secp160r2");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 31L), "secp192k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 32L), "secp224k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 33L), "secp224r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 34L), "secp384r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 35L), "secp521r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 36L), "sect409k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 37L), "sect409r1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 38L), "sect571k1");
- sNameMapping.put(new Asn1Oid(1L, 3L, 132L, 0L, 39L), "sect571r1");
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 1L, 1L), "secp192r1");
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 1L, 7L), "secp256r1");
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 1L, 2L), "prime192v2"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 1L, 3L), "prime192v3"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 1L, 4L), "prime239v1"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 1L, 5L), "prime239v2"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 1L, 6L), "prime239v3"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 0L, 5L), "c2tnb191v1"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 0L, 6L), "c2tnb191v2"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 0L, 7L), "c2tnb191v3"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 0L, 11L), "c2tnb239v1"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 0L, 12L), "c2tnb239v2"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 0L, 13L), "c2tnb239v3"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 0L, 18L), "c2tnb359v1"); // X9.62
- sNameMapping.put(new Asn1Oid(1L, 2L, 840L, 10045L, 3L, 0L, 20L), "c2tnb431r1"); // X9.62
-
- sNameMapping.put(sAlgo_MD2, "MD2");
- sNameMapping.put(sAlgo_MD5, "MD5");
- sNameMapping.put(sAlgo_SHA1, "SHA-1");
- sNameMapping.put(sAlgo_SHA256, "SHA-256");
- sNameMapping.put(sAlgo_SHA384, "SHA-384");
- sNameMapping.put(sAlgo_SHA512, "SHA-512");
- }
-
- public static SigEntry getSigEntry(Asn1Oid oid) {
- return sSigAlgos.get(oid);
- }
-
- public static String getCryptoID(Asn1Oid oid) {
- return sCryptoMapping.get(oid);
- }
-
- public static String getJCEName(Asn1Oid oid) {
- return sNameMapping.get(oid);
- }
-
- public static String getSigAlgoName(Asn1Oid oid) {
- SigEntry sigEntry = sSigAlgos.get(oid);
- return sigEntry != null ? sigEntry.getSigAlgo() : null;
- }
-
- public static String getKeyAlgoName(Asn1Oid oid) {
- SigEntry sigEntry = sSigAlgos.get(oid);
- return sigEntry != null ? sNameMapping.get(sigEntry.getKeyAlgo()) : null;
- }
-
- public static boolean isIDAttribute(Asn1Oid oid) {
- return sIDMapping.contains(oid);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/est/ESTHandler.java b/packages/Osu/src/com/android/hotspot2/est/ESTHandler.java
deleted file mode 100644
index cdcff80..0000000
--- a/packages/Osu/src/com/android/hotspot2/est/ESTHandler.java
+++ /dev/null
@@ -1,501 +0,0 @@
-package com.android.hotspot2.est;
-
-import android.net.Network;
-import android.util.Base64;
-import android.util.Log;
-
-import com.android.hotspot2.OMADMAdapter;
-import com.android.hotspot2.asn1.Asn1Class;
-import com.android.hotspot2.asn1.Asn1Constructed;
-import com.android.hotspot2.asn1.Asn1Decoder;
-import com.android.hotspot2.asn1.Asn1ID;
-import com.android.hotspot2.asn1.Asn1Integer;
-import com.android.hotspot2.asn1.Asn1Object;
-import com.android.hotspot2.asn1.Asn1Oid;
-import com.android.hotspot2.asn1.OidMappings;
-import com.android.hotspot2.osu.HTTPHandler;
-import com.android.hotspot2.osu.OSUFlowManager;
-import com.android.hotspot2.osu.OSUSocketFactory;
-import com.android.hotspot2.osu.commands.GetCertData;
-import com.android.hotspot2.pps.HomeSP;
-import com.android.hotspot2.utils.HTTPMessage;
-import com.android.hotspot2.utils.HTTPResponse;
-import com.android.org.bouncycastle.asn1.ASN1Encodable;
-import com.android.org.bouncycastle.asn1.ASN1EncodableVector;
-import com.android.org.bouncycastle.asn1.ASN1Set;
-import com.android.org.bouncycastle.asn1.DERBitString;
-import com.android.org.bouncycastle.asn1.DEREncodableVector;
-import com.android.org.bouncycastle.asn1.DERIA5String;
-import com.android.org.bouncycastle.asn1.DERObjectIdentifier;
-import com.android.org.bouncycastle.asn1.DERPrintableString;
-import com.android.org.bouncycastle.asn1.DERSet;
-import com.android.org.bouncycastle.asn1.x509.Attribute;
-import com.android.org.bouncycastle.jce.PKCS10CertificationRequest;
-import com.android.org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.net.ssl.KeyManager;
-import javax.security.auth.x500.X500Principal;
-
-//import com.android.org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-public class ESTHandler implements AutoCloseable {
- private static final String TAG = "HS2EST";
- private static final int MinRSAKeySize = 2048;
-
- private static final String CACERT_PATH = "/cacerts";
- private static final String CSR_PATH = "/csrattrs";
- private static final String SIMPLE_ENROLL_PATH = "/simpleenroll";
- private static final String SIMPLE_REENROLL_PATH = "/simplereenroll";
-
- private final URL mURL;
- private final String mUser;
- private final byte[] mPassword;
- private final OSUSocketFactory mSocketFactory;
- private final OMADMAdapter mOMADMAdapter;
-
- private final List<X509Certificate> mCACerts = new ArrayList<>();
- private final List<X509Certificate> mClientCerts = new ArrayList<>();
- private PrivateKey mClientKey;
-
- public ESTHandler(GetCertData certData, Network network, OMADMAdapter omadmAdapter,
- KeyManager km, KeyStore ks, HomeSP homeSP, OSUFlowManager.FlowType flowType)
- throws IOException, GeneralSecurityException {
- mURL = new URL(certData.getServer());
- mUser = certData.getUserName();
- mPassword = certData.getPassword();
- mSocketFactory = OSUSocketFactory.getSocketFactory(ks, homeSP, flowType,
- network, mURL, km, true);
- mOMADMAdapter = omadmAdapter;
- }
-
- @Override
- public void close() throws IOException {
- }
-
- public List<X509Certificate> getCACerts() {
- return mCACerts;
- }
-
- public List<X509Certificate> getClientCerts() {
- return mClientCerts;
- }
-
- public PrivateKey getClientKey() {
- return mClientKey;
- }
-
- private static String indent(int amount) {
- char[] indent = new char[amount * 2];
- Arrays.fill(indent, ' ');
- return new String(indent);
- }
-
- public void execute(boolean reenroll) throws IOException, GeneralSecurityException {
- URL caURL = new URL(mURL.getProtocol(), mURL.getHost(), mURL.getPort(),
- mURL.getFile() + CACERT_PATH);
-
- HTTPResponse response;
- try (HTTPHandler httpHandler = new HTTPHandler(StandardCharsets.ISO_8859_1, mSocketFactory,
- mUser, mPassword)) {
- response = httpHandler.doGetHTTP(caURL);
-
- if (!"application/pkcs7-mime".equals(response.getHeaders().
- get(HTTPMessage.ContentTypeHeader))) {
- throw new IOException("Unexpected Content-Type: " +
- response.getHeaders().get(HTTPMessage.ContentTypeHeader));
- }
- ByteBuffer octetBuffer = response.getBinaryPayload();
- Collection<Asn1Object> pkcs7Content1 = Asn1Decoder.decode(octetBuffer);
- for (Asn1Object asn1Object : pkcs7Content1) {
- Log.d(TAG, "---");
- Log.d(TAG, asn1Object.toString());
- }
- Log.d(TAG, CACERT_PATH);
-
- mCACerts.addAll(unpackPkcs7(octetBuffer));
- for (X509Certificate certificate : mCACerts) {
- Log.d(TAG, "CA-Cert: " + certificate.getSubjectX500Principal());
- }
-
- /*
- byte[] octets = new byte[octetBuffer.remaining()];
- octetBuffer.duplicate().get(octets);
- for (byte b : octets) {
- System.out.printf("%02x ", b & 0xff);
- }
- Log.d(TAG, );
- */
-
- /* + BC
- try {
- byte[] octets = new byte[octetBuffer.remaining()];
- octetBuffer.duplicate().get(octets);
- ASN1InputStream asnin = new ASN1InputStream(octets);
- for (int n = 0; n < 100; n++) {
- ASN1Primitive object = asnin.readObject();
- if (object == null) {
- break;
- }
- parseObject(object, 0);
- }
- }
- catch (Throwable t) {
- t.printStackTrace();
- }
-
- Collection<Asn1Object> pkcs7Content = Asn1Decoder.decode(octetBuffer);
- for (Asn1Object asn1Object : pkcs7Content) {
- Log.d(TAG, asn1Object);
- }
-
- if (pkcs7Content.size() != 1) {
- throw new IOException("Unexpected pkcs 7 container: " + pkcs7Content.size());
- }
-
- Asn1Constructed pkcs7Root = (Asn1Constructed) pkcs7Content.iterator().next();
- Iterator<Asn1ID> certPath = Arrays.asList(Pkcs7CertPath).iterator();
- Asn1Object certObject = pkcs7Root.findObject(certPath);
- if (certObject == null || certPath.hasNext()) {
- throw new IOException("Failed to find cert; returned object " + certObject +
- ", path " + (certPath.hasNext() ? "short" : "exhausted"));
- }
-
- ByteBuffer certOctets = certObject.getPayload();
- if (certOctets == null) {
- throw new IOException("No cert payload in: " + certObject);
- }
-
- byte[] certBytes = new byte[certOctets.remaining()];
- certOctets.get(certBytes);
-
- CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
- Certificate cert = certFactory.generateCertificate(new ByteArrayInputStream(certBytes));
- Log.d(TAG, "EST Cert: " + cert);
- */
-
- URL csrURL = new URL(mURL.getProtocol(), mURL.getHost(), mURL.getPort(),
- mURL.getFile() + CSR_PATH);
- response = httpHandler.doGetHTTP(csrURL);
-
- octetBuffer = response.getBinaryPayload();
- byte[] csrData = buildCSR(octetBuffer, mOMADMAdapter, httpHandler);
-
- /**/
- Collection<Asn1Object> o = Asn1Decoder.decode(ByteBuffer.wrap(csrData));
- Log.d(TAG, "CSR:");
- Log.d(TAG, o.iterator().next().toString());
- Log.d(TAG, "End CSR.");
- /**/
-
- URL enrollURL = new URL(mURL.getProtocol(), mURL.getHost(), mURL.getPort(),
- mURL.getFile() + (reenroll ? SIMPLE_REENROLL_PATH : SIMPLE_ENROLL_PATH));
- String data = Base64.encodeToString(csrData, Base64.DEFAULT);
- octetBuffer = httpHandler.exchangeBinary(enrollURL, data, "application/pkcs10");
-
- Collection<Asn1Object> pkcs7Content2 = Asn1Decoder.decode(octetBuffer);
- for (Asn1Object asn1Object : pkcs7Content2) {
- Log.d(TAG, "---");
- Log.d(TAG, asn1Object.toString());
- }
- mClientCerts.addAll(unpackPkcs7(octetBuffer));
- for (X509Certificate cert : mClientCerts) {
- Log.d(TAG, cert.toString());
- }
- }
- }
-
- private static final Asn1ID sSEQUENCE = new Asn1ID(Asn1Decoder.TAG_SEQ, Asn1Class.Universal);
- private static final Asn1ID sCTXT0 = new Asn1ID(0, Asn1Class.Context);
- private static final int PKCS7DataVersion = 1;
- private static final int PKCS7SignedDataVersion = 3;
-
- private static List<X509Certificate> unpackPkcs7(ByteBuffer pkcs7)
- throws IOException, GeneralSecurityException {
- Collection<Asn1Object> pkcs7Content = Asn1Decoder.decode(pkcs7);
-
- if (pkcs7Content.size() != 1) {
- throw new IOException("Unexpected pkcs 7 container: " + pkcs7Content.size());
- }
-
- Asn1Object data = pkcs7Content.iterator().next();
- if (!data.isConstructed() || !data.matches(sSEQUENCE)) {
- throw new IOException("Expected SEQ OF, got " + data.toSimpleString());
- } else if (data.getChildren().size() != 2) {
- throw new IOException("Expected content info to have two children, got " +
- data.getChildren().size());
- }
-
- Iterator<Asn1Object> children = data.getChildren().iterator();
- Asn1Object contentType = children.next();
- if (!contentType.equals(Asn1Oid.PKCS7SignedData)) {
- throw new IOException("Content not PKCS7 signed data");
- }
- Asn1Object content = children.next();
- if (!content.isConstructed() || !content.matches(sCTXT0)) {
- throw new IOException("Expected [CONTEXT 0] with one child, got " +
- content.toSimpleString() + ", " + content.getChildren().size());
- }
-
- Asn1Object signedData = content.getChildren().iterator().next();
- Map<Integer, Asn1Object> itemMap = new HashMap<>();
- for (Asn1Object item : signedData.getChildren()) {
- if (itemMap.put(item.getTag(), item) != null && item.getTag() != Asn1Decoder.TAG_SET) {
- throw new IOException("Duplicate item in SignedData: " + item.toSimpleString());
- }
- }
-
- Asn1Object versionObject = itemMap.get(Asn1Decoder.TAG_INTEGER);
- if (versionObject == null || !(versionObject instanceof Asn1Integer)) {
- throw new IOException("Bad or missing PKCS7 version: " + versionObject);
- }
- int pkcs7version = (int) ((Asn1Integer) versionObject).getValue();
- Asn1Object innerContentInfo = itemMap.get(Asn1Decoder.TAG_SEQ);
- if (innerContentInfo == null ||
- !innerContentInfo.isConstructed() ||
- !innerContentInfo.matches(sSEQUENCE) ||
- innerContentInfo.getChildren().size() != 1) {
- throw new IOException("Bad or missing PKCS7 contentInfo");
- }
- Asn1Object contentID = innerContentInfo.getChildren().iterator().next();
- if (pkcs7version == PKCS7DataVersion && !contentID.equals(Asn1Oid.PKCS7Data) ||
- pkcs7version == PKCS7SignedDataVersion && !contentID.equals(Asn1Oid.PKCS7SignedData)) {
- throw new IOException("Inner PKCS7 content (" + contentID +
- ") not expected for version " + pkcs7version);
- }
- Asn1Object certWrapper = itemMap.get(0);
- if (certWrapper == null || !certWrapper.isConstructed() || !certWrapper.matches(sCTXT0)) {
- throw new IOException("Expected [CONTEXT 0], got: " + certWrapper);
- }
-
- List<X509Certificate> certList = new ArrayList<>(certWrapper.getChildren().size());
- CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
- for (Asn1Object certObject : certWrapper.getChildren()) {
- ByteBuffer certOctets = ((Asn1Constructed) certObject).getEncoding();
- if (certOctets == null) {
- throw new IOException("No cert payload in: " + certObject);
- }
- byte[] certBytes = new byte[certOctets.remaining()];
- certOctets.get(certBytes);
-
- certList.add((X509Certificate) certFactory.
- generateCertificate(new ByteArrayInputStream(certBytes)));
- }
- return certList;
- }
-
- private byte[] buildCSR(ByteBuffer octetBuffer, OMADMAdapter omadmAdapter,
- HTTPHandler httpHandler) throws IOException, GeneralSecurityException {
-
- //Security.addProvider(new BouncyCastleProvider());
-
- Log.d(TAG, "/csrattrs:");
- /*
- byte[] octets = new byte[octetBuffer.remaining()];
- octetBuffer.duplicate().get(octets);
- for (byte b : octets) {
- System.out.printf("%02x ", b & 0xff);
- }
- */
- Collection<Asn1Object> csrs = Asn1Decoder.decode(octetBuffer);
- for (Asn1Object asn1Object : csrs) {
- Log.d(TAG, asn1Object.toString());
- }
-
- if (csrs.size() != 1) {
- throw new IOException("Unexpected object count in CSR attributes response: " +
- csrs.size());
- }
- Asn1Object sequence = csrs.iterator().next();
- if (sequence.getClass() != Asn1Constructed.class) {
- throw new IOException("Unexpected CSR attribute container: " + sequence);
- }
-
- String keyAlgo = null;
- Asn1Oid keyAlgoOID = null;
- String sigAlgo = null;
- String curveName = null;
- Asn1Oid pubCrypto = null;
- int keySize = -1;
- Map<Asn1Oid, ASN1Encodable> idAttributes = new HashMap<>();
-
- for (Asn1Object child : sequence.getChildren()) {
- if (child.getTag() == Asn1Decoder.TAG_OID) {
- Asn1Oid oid = (Asn1Oid) child;
- OidMappings.SigEntry sigEntry = OidMappings.getSigEntry(oid);
- if (sigEntry != null) {
- sigAlgo = sigEntry.getSigAlgo();
- keyAlgoOID = sigEntry.getKeyAlgo();
- keyAlgo = OidMappings.getJCEName(keyAlgoOID);
- } else if (oid.equals(OidMappings.sPkcs9AtChallengePassword)) {
- byte[] tlsUnique = httpHandler.getTLSUnique();
- if (tlsUnique != null) {
- idAttributes.put(oid, new DERPrintableString(
- Base64.encodeToString(tlsUnique, Base64.DEFAULT)));
- } else {
- Log.w(TAG, "Cannot retrieve TLS unique channel binding");
- }
- }
- } else if (child.getTag() == Asn1Decoder.TAG_SEQ) {
- Asn1Oid oid = null;
- Set<Asn1Oid> oidValues = new HashSet<>();
- List<Asn1Object> values = new ArrayList<>();
-
- for (Asn1Object attributeSeq : child.getChildren()) {
- if (attributeSeq.getTag() == Asn1Decoder.TAG_OID) {
- oid = (Asn1Oid) attributeSeq;
- } else if (attributeSeq.getTag() == Asn1Decoder.TAG_SET) {
- for (Asn1Object value : attributeSeq.getChildren()) {
- if (value.getTag() == Asn1Decoder.TAG_OID) {
- oidValues.add((Asn1Oid) value);
- } else {
- values.add(value);
- }
- }
- }
- }
- if (oid == null) {
- throw new IOException("Invalid attribute, no OID");
- }
- if (oid.equals(OidMappings.sExtensionRequest)) {
- for (Asn1Oid subOid : oidValues) {
- if (OidMappings.isIDAttribute(subOid)) {
- if (subOid.equals(OidMappings.sMAC)) {
- idAttributes.put(subOid, new DERIA5String(omadmAdapter.getMAC()));
- } else if (subOid.equals(OidMappings.sIMEI)) {
- idAttributes.put(subOid, new DERIA5String(omadmAdapter.getImei()));
- } else if (subOid.equals(OidMappings.sMEID)) {
- idAttributes.put(subOid, new DERBitString(omadmAdapter.getMeid()));
- } else if (subOid.equals(OidMappings.sDevID)) {
- idAttributes.put(subOid,
- new DERPrintableString(omadmAdapter.getDevID()));
- }
- }
- }
- } else if (OidMappings.getCryptoID(oid) != null) {
- pubCrypto = oid;
- if (!values.isEmpty()) {
- for (Asn1Object value : values) {
- if (value.getTag() == Asn1Decoder.TAG_INTEGER) {
- keySize = (int) ((Asn1Integer) value).getValue();
- }
- }
- }
- if (oid.equals(OidMappings.sAlgo_EC)) {
- if (oidValues.isEmpty()) {
- throw new IOException("No ECC curve name provided");
- }
- for (Asn1Oid value : oidValues) {
- curveName = OidMappings.getJCEName(value);
- if (curveName != null) {
- break;
- }
- }
- if (curveName == null) {
- throw new IOException("Found no ECC curve for " + oidValues);
- }
- }
- }
- }
- }
-
- if (keyAlgoOID == null) {
- throw new IOException("No public key algorithm specified");
- }
- if (pubCrypto != null && !pubCrypto.equals(keyAlgoOID)) {
- throw new IOException("Mismatching key algorithms");
- }
-
- if (keyAlgoOID.equals(OidMappings.sAlgo_RSA)) {
- if (keySize < MinRSAKeySize) {
- if (keySize >= 0) {
- Log.i(TAG, "Upgrading suggested RSA key size from " +
- keySize + " to " + MinRSAKeySize);
- }
- keySize = MinRSAKeySize;
- }
- }
-
- Log.d(TAG, String.format("pub key '%s', signature '%s', ECC curve '%s', id-atts %s",
- keyAlgo, sigAlgo, curveName, idAttributes));
-
- /*
- Ruckus:
- SEQUENCE:
- OID=1.2.840.113549.1.1.11 (algo_id_sha256WithRSAEncryption)
-
- RFC-7030:
- SEQUENCE:
- OID=1.2.840.113549.1.9.7 (challengePassword)
- SEQUENCE:
- OID=1.2.840.10045.2.1 (algo_id_ecPublicKey)
- SET:
- OID=1.3.132.0.34 (secp384r1)
- SEQUENCE:
- OID=1.2.840.113549.1.9.14 (extensionRequest)
- SET:
- OID=1.3.6.1.1.1.1.22 (mac-address)
- OID=1.2.840.10045.4.3.3 (eccdaWithSHA384)
-
- 1L, 3L, 6L, 1L, 1L, 1L, 1L, 22
- */
-
- // ECC Does not appear to be supported currently
- KeyPairGenerator kpg = KeyPairGenerator.getInstance(keyAlgo);
- if (curveName != null) {
- AlgorithmParameters algorithmParameters = AlgorithmParameters.getInstance(keyAlgo);
- algorithmParameters.init(new ECNamedCurveGenParameterSpec(curveName));
- kpg.initialize(algorithmParameters
- .getParameterSpec(ECNamedCurveGenParameterSpec.class));
- } else {
- kpg.initialize(keySize);
- }
- KeyPair kp = kpg.generateKeyPair();
-
- X500Principal subject = new X500Principal("CN=Android, O=Google, C=US");
-
- mClientKey = kp.getPrivate();
-
- // !!! Map the idAttributes into an ASN1Set of values to pass to
- // the PKCS10CertificationRequest - this code is using outdated BC classes and
- // has *not* been tested.
- ASN1Set attributes;
- if (!idAttributes.isEmpty()) {
- ASN1EncodableVector payload = new DEREncodableVector();
- for (Map.Entry<Asn1Oid, ASN1Encodable> entry : idAttributes.entrySet()) {
- DERObjectIdentifier type = new DERObjectIdentifier(entry.getKey().toOIDString());
- ASN1Set values = new DERSet(entry.getValue());
- Attribute attribute = new Attribute(type, values);
- payload.add(attribute);
- }
- attributes = new DERSet(payload);
- } else {
- attributes = null;
- }
-
- return new PKCS10CertificationRequest(sigAlgo, subject, kp.getPublic(),
- attributes, mClientKey).getEncoded();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/flow/FlowService.java b/packages/Osu/src/com/android/hotspot2/flow/FlowService.java
deleted file mode 100644
index 8bbbf06..0000000
--- a/packages/Osu/src/com/android/hotspot2/flow/FlowService.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.android.hotspot2.flow;
-
-import android.annotation.Nullable;
-import android.app.IntentService;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Network;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.IBinder;
-import android.util.Log;
-
-import com.android.hotspot2.osu.OSUFlowManager;
-import com.android.hotspot2.osu.OSUManager;
-import com.android.hotspot2.osu.OSUOperationStatus;
-import com.android.hotspot2.pps.HomeSP;
-
-import java.io.IOException;
-
-/**
- * This is the Hotspot 2.0 release 2 service that handles actual provisioning and remediation flows.
- *
- * The OSU App is made up of two services; FlowService and OSUService.
- *
- * OSUService is a long running light weight service, kept alive throughout the lifetime of the
- * operating system by being bound from the framework (in WifiManager in stage
- * PHASE_THIRD_PARTY_APPS_CAN_START), and is responsible for continuously caching OSU information
- * and notifying the UI when OSUs are available.
- *
- * FlowService is only started on demand from OSUService and is responsible for handling actual
- * provisioning and remediation flows, and requires a fairly significant memory footprint.
- *
- * FlowService is defined to run in its own process through the definition
- * <service android:name=".flow.FlowService" android:process=":osuflow">
- * in the AndroidManifest.
- * This is done as a means to keep total app memory footprint low (pss < 10M) and only start the
- * FlowService on demand and make it available for "garbage collection" by the OS when not in use.
- */
-public class FlowService extends IntentService {
- private static final String[] INTENTS = {
- WifiManager.NETWORK_STATE_CHANGED_ACTION
- };
-
- private OSUFlowManager mOSUFlowManager;
- private PlatformAdapter mPlatformAdapter;
- private final FlowServiceImpl mOSUAccessor = new FlowServiceImpl();
-
- /*
- public FlowService(Context context) {
- super("FlowService");
- mOSUFlowManager = new OSUFlowManager();
- mPlatformAdapter = new PlatformAdapter(context);
- BroadcastReceiver receiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- handleIntent(intent.getAction(), intent);
- }
- };
- for (String intentString : INTENTS) {
- context.registerReceiver(receiver, new IntentFilter(intentString));
- }
- }
- */
-
- public FlowService() {
- super("FlowService");
- }
-
- public final class FlowServiceImpl extends IFlowService.Stub {
- public void provision(OSUInfo osuInfo) {
- FlowService.this.provision(osuInfo);
- }
-
- public void remediate(String spFqdn, String url, boolean policy, Network network) {
- FlowService.this.remediate(spFqdn, url, policy, network);
- }
-
- public void spDeleted(String fqdn) {
- FlowService.this.serviceProviderDeleted(fqdn);
- }
- }
-
- public void provision(OSUInfo osuInfo) {
- try {
- mOSUFlowManager.appendFlow(new OSUFlowManager.OSUFlow(osuInfo, mPlatformAdapter,
- mPlatformAdapter.getKeyManager(null)));
- } catch (IOException ioe) {
- mPlatformAdapter.notifyUser(OSUOperationStatus.ProvisioningFailure, ioe.getMessage(),
- osuInfo.getName(PlatformAdapter.LOCALE));
- }
- }
-
- /**
- * Initiate remediation
- * @param spFqdn The FQDN of the current SP, not set for WNM based remediation
- * @param url The URL of the remediation server
- * @param policy Set if this is a policy update rather than a subscription update
- * @param network The network to use for remediation
- */
- public void remediate(String spFqdn, String url, boolean policy, Network network) {
- Log.d(OSUManager.TAG, "Starting remediation for " + spFqdn + " to " + url);
- if (spFqdn != null) {
- HomeSP homeSP = mPlatformAdapter.getHomeSP(spFqdn);
- if (homeSP == null) {
- Log.e(OSUManager.TAG, "No HomeSP object matches '" + spFqdn + "'");
- return;
- }
-
- try {
- mOSUFlowManager.appendFlow(new OSUFlowManager.OSUFlow(network, url,
- mPlatformAdapter, mPlatformAdapter.getKeyManager(homeSP),
- homeSP, policy
- ? OSUFlowManager.FlowType.Policy : OSUFlowManager.FlowType.Remediation));
- } catch (IOException ioe) {
- Log.e(OSUManager.TAG, "Failed to remediate: " + ioe, ioe);
- }
- } else {
- HomeSP homeSP = mPlatformAdapter.getCurrentSP();
- if (homeSP == null) {
- Log.e(OSUManager.TAG, "Remediation request on unidentified Passpoint network ");
- return;
- }
-
- try {
- mOSUFlowManager.appendFlow(new OSUFlowManager.OSUFlow(network, url,
- mPlatformAdapter, mPlatformAdapter.getKeyManager(homeSP), homeSP,
- OSUFlowManager.FlowType.Remediation));
- } catch (IOException ioe) {
- Log.e(OSUManager.TAG, "Failed to start remediation: " + ioe, ioe);
- }
- }
- }
-
- public void serviceProviderDeleted(String fqdn) {
- mPlatformAdapter.serviceProviderDeleted(fqdn);
- }
-
- @Override
- public IBinder onBind(Intent intent) {
- mOSUFlowManager = new OSUFlowManager(this);
- mPlatformAdapter = new PlatformAdapter(this);
- BroadcastReceiver receiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- handleIntent(intent.getAction(), intent);
- }
- };
- for (String intentString : INTENTS) {
- registerReceiver(receiver, new IntentFilter(intentString));
- }
- return mOSUAccessor;
- }
-
- @Override
- protected void onHandleIntent(@Nullable Intent intent) {
- }
-
- private void handleIntent(String action, Intent intent) {
- if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
- WifiInfo wifiInfo = intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO);
- if (wifiInfo != null) {
- mOSUFlowManager.networkChange();
- }
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/flow/IFlowService.aidl b/packages/Osu/src/com/android/hotspot2/flow/IFlowService.aidl
deleted file mode 100644
index a61274f..0000000
--- a/packages/Osu/src/com/android/hotspot2/flow/IFlowService.aidl
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.android.hotspot2.flow;
-
-import com.android.hotspot2.flow.OSUInfo;
-import android.net.Network;
-
-interface IFlowService {
- void provision(in OSUInfo osuInfo);
- void remediate(String spFqdn, String url, boolean policy, in Network network);
- void spDeleted(String fqdn);
-}
diff --git a/packages/Osu/src/com/android/hotspot2/flow/OSUInfo.aidl b/packages/Osu/src/com/android/hotspot2/flow/OSUInfo.aidl
deleted file mode 100644
index 172486e..0000000
--- a/packages/Osu/src/com/android/hotspot2/flow/OSUInfo.aidl
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.android.hotspot2.flow;
-
-parcelable OSUInfo;
diff --git a/packages/Osu/src/com/android/hotspot2/flow/OSUInfo.java b/packages/Osu/src/com/android/hotspot2/flow/OSUInfo.java
deleted file mode 100644
index 401eccb..0000000
--- a/packages/Osu/src/com/android/hotspot2/flow/OSUInfo.java
+++ /dev/null
@@ -1,321 +0,0 @@
-package com.android.hotspot2.flow;
-
-import android.net.wifi.ScanResult;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.Log;
-
-import com.android.anqp.HSIconFileElement;
-import com.android.anqp.I18Name;
-import com.android.anqp.IconInfo;
-import com.android.anqp.OSUProvider;
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.osu.OSUManager;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Locale;
-import java.util.Set;
-
-public class OSUInfo implements Parcelable {
- public static final String GenericLocale = "zxx";
-
- public enum IconStatus {
- NotQueried, //
- InProgress, // Query pending
- NotAvailable, // Deterministically unavailable
- Available // Icon data retrieved
- }
-
- private final long mBSSID;
- private final long mHESSID;
- private final int mAnqpDomID;
- private final String mAdvertisingSSID;
- private final OSUProvider mOSUProvider;
- private final int mOsuID;
- private long mOSUBssid;
- private IconStatus mIconStatus = IconStatus.NotQueried;
- private HSIconFileElement mIconFileElement;
- private String mIconFileName;
- private IconInfo mIconInfo;
-
- public OSUInfo(ScanResult scanResult, OSUProvider osuProvider, int osuID) {
- mOsuID = osuID;
- mBSSID = Utils.parseMac(scanResult.BSSID);
- mHESSID = scanResult.hessid;
- mAnqpDomID = scanResult.anqpDomainId;
- mAdvertisingSSID = scanResult.SSID;
- mOSUProvider = osuProvider;
- }
-
- public long getOSUBssid() {
- return mOSUBssid;
- }
-
- public void setOSUBssid(long OSUBssid) {
- mOSUBssid = OSUBssid;
- }
-
- public long getHESSID() {
- return mHESSID;
- }
-
- public int getAnqpDomID() {
- return mAnqpDomID;
- }
-
- public String getAdvertisingSsid() {
- return mAdvertisingSSID;
- }
-
- public Set<Locale> getNameLocales() {
- Set<Locale> locales = new HashSet<>(mOSUProvider.getNames().size());
- for (I18Name name : mOSUProvider.getNames()) {
- locales.add(name.getLocale());
- }
- return locales;
- }
-
- public Set<Locale> getServiceLocales() {
- Set<Locale> locales = new HashSet<>(mOSUProvider.getServiceDescriptions().size());
- for (I18Name name : mOSUProvider.getServiceDescriptions()) {
- locales.add(name.getLocale());
- }
- return locales;
- }
-
- public Set<String> getIconLanguages() {
- Set<String> locales = new HashSet<>(mOSUProvider.getIcons().size());
- for (IconInfo iconInfo : mOSUProvider.getIcons()) {
- locales.add(iconInfo.getLanguage());
- }
- return locales;
- }
-
- public String getName(Locale locale) {
- List<ScoreEntry<String>> scoreList = new ArrayList<>();
- for (I18Name name : mOSUProvider.getNames()) {
- if (locale == null || name.getLocale().equals(locale)) {
- return name.getText();
- }
- scoreList.add(new ScoreEntry<>(name.getText(),
- languageScore(name.getLanguage(), locale)));
- }
- Collections.sort(scoreList);
- return scoreList.isEmpty() ? null : scoreList.get(scoreList.size() - 1).getData();
- }
-
- public String getServiceDescription(Locale locale) {
- List<ScoreEntry<String>> scoreList = new ArrayList<>();
- for (I18Name service : mOSUProvider.getServiceDescriptions()) {
- if (locale == null || service.getLocale().equals(locale)) {
- return service.getText();
- }
- scoreList.add(new ScoreEntry<>(service.getText(),
- languageScore(service.getLanguage(), locale)));
- }
- Collections.sort(scoreList);
- return scoreList.isEmpty() ? null : scoreList.get(scoreList.size() - 1).getData();
- }
-
- public int getOsuID() {
- return mOsuID;
- }
-
- public void setIconStatus(IconStatus iconStatus) {
- synchronized (mOSUProvider) {
- mIconStatus = iconStatus;
- }
- }
-
- public IconStatus getIconStatus() {
- synchronized (mOSUProvider) {
- return mIconStatus;
- }
- }
-
- public HSIconFileElement getIconFileElement() {
- synchronized (mOSUProvider) {
- return mIconFileElement;
- }
- }
-
- public IconInfo getIconInfo() {
- synchronized (mOSUProvider) {
- return mIconInfo;
- }
- }
-
- public String getIconFileName() {
- return mIconFileName;
- }
-
- public void setIconFileElement(HSIconFileElement iconFileElement, String fileName) {
- synchronized (mOSUProvider) {
- mIconFileElement = iconFileElement;
- for (IconInfo iconInfo : mOSUProvider.getIcons()) {
- if (iconInfo.getFileName().equals(fileName)) {
- mIconInfo = iconInfo;
- mIconFileName = fileName;
- break;
- }
- }
- mIconStatus = IconStatus.Available;
- }
- }
-
- private static class ScoreEntry<T> implements Comparable<ScoreEntry> {
- private final T mData;
- private final int mScore;
-
- private ScoreEntry(T data, int score) {
- mData = data;
- mScore = score;
- }
-
- public T getData() {
- return mData;
- }
-
- @Override
- public int compareTo(ScoreEntry other) {
- return Integer.compare(mScore, other.mScore);
- }
-
- @Override
- public String toString() {
- return String.format("%d for '%s'", mScore, mData);
- }
- }
-
- public List<IconInfo> getIconInfo(Locale locale, Set<String> types, int width, int height) {
- if (mOSUProvider.getIcons().isEmpty()) {
- return null;
- }
- Log.d(OSUManager.TAG, "Matching icons against " + locale
- + ", types " + types + ", " + width + "*" + height);
-
- List<ScoreEntry<IconInfo>> matches = new ArrayList<>();
- for (IconInfo iconInfo : mOSUProvider.getIcons()) {
- Log.d(OSUManager.TAG, "Checking icon " + iconInfo.toString());
- if (!types.contains(iconInfo.getIconType())) {
- continue;
- }
-
- int score = languageScore(iconInfo.getLanguage(), locale);
- int delta = iconInfo.getWidth() - width;
- // Best size score is 1024 for a exact match, i.e. 2048 if both sides match
- if (delta >= 0) {
- score += (256 - delta) * 4; // Prefer down-scaling
- } else {
- score += 256 + delta; // Before up-scaling
- }
- delta = iconInfo.getHeight() - height;
- if (delta >= 0) {
- score += (256 - delta) * 4;
- } else {
- score += 256 + delta;
- }
- matches.add(new ScoreEntry<>(iconInfo, score));
- }
- if (matches.isEmpty()) {
- return Collections.emptyList();
- }
- Collections.sort(matches);
- List<IconInfo> icons = new ArrayList<>(matches.size());
- ListIterator<ScoreEntry<IconInfo>> matchIterator = matches.listIterator(matches.size());
- while (matchIterator.hasPrevious()) {
- icons.add(matchIterator.previous().getData());
- }
- return icons;
- }
-
- private static int languageScore(String language, Locale locale) {
- if (language.length() == 3 && language.equalsIgnoreCase(locale.getISO3Language()) ||
- language.length() == 2 && language.equalsIgnoreCase(locale.getLanguage())) {
- return 4096;
- } else if (language.equalsIgnoreCase(GenericLocale)) {
- return 3072;
- } else if (language.equalsIgnoreCase("eng")) {
- return 2048;
- } else {
- return 1024;
- }
- }
-
- public long getBSSID() {
- return mBSSID;
- }
-
- public String getOsuSsid() {
- return mOSUProvider.getSSID();
- }
-
- public OSUProvider getOSUProvider() {
- return mOSUProvider;
- }
-
- @Override
- public String toString() {
- return String.format("OSU Info '%s' %012x -> %s, icon %s",
- getOsuSsid(), mBSSID, getServiceDescription(null), mIconStatus);
- }
-
- private OSUInfo(Parcel in) {
- mBSSID = in.readLong();
- mHESSID = in.readLong();
- mAnqpDomID = in.readInt();
- mAdvertisingSSID = in.readString();
- mOsuID = in.readInt();
- mOSUBssid = in.readLong();
- mIconFileName = in.readString();
- mIconStatus = Utils.mapEnum(in.readInt(), IconStatus.class);
- OSUProvider osuProvider;
- try {
- osuProvider = new OSUProvider(in);
- } catch (IOException ioe) {
- osuProvider = null;
- }
- mOSUProvider = osuProvider;
- if (osuProvider == null) {
- return;
- }
- mIconFileElement = new HSIconFileElement(in);
- int iconIndex = in.readInt();
- mIconInfo = iconIndex >= 0 && iconIndex < mOSUProvider.getIcons().size()
- ? mOSUProvider.getIcons().get(iconIndex) : null;
- }
-
- public static final Parcelable.Creator<OSUInfo> CREATOR = new Parcelable.Creator<OSUInfo>() {
- public OSUInfo createFromParcel(Parcel in) {
- return new OSUInfo(in);
- }
-
- public OSUInfo[] newArray(int size) {
- return new OSUInfo[size];
- }
- };
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeLong(mBSSID);
- dest.writeLong(mHESSID);
- dest.writeInt(mAnqpDomID);
- dest.writeString(mAdvertisingSSID);
- dest.writeInt(mOsuID);
- dest.writeLong(mOSUBssid);
- dest.writeString(mIconFileName);
- dest.writeInt(mIconStatus.ordinal());
- mOSUProvider.writeParcel(dest);
- mIconFileElement.writeParcel(dest);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/flow/PlatformAdapter.java b/packages/Osu/src/com/android/hotspot2/flow/PlatformAdapter.java
deleted file mode 100644
index d95af61..0000000
--- a/packages/Osu/src/com/android/hotspot2/flow/PlatformAdapter.java
+++ /dev/null
@@ -1,620 +0,0 @@
-package com.android.hotspot2.flow;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Network;
-import android.net.wifi.PasspointManagementObjectDefinition;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiEnterpriseConfig;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.util.Log;
-
-import com.android.configparse.ConfigBuilder;
-import com.android.hotspot2.AppBridge;
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.app.OSUService;
-import com.android.hotspot2.omadm.MOManager;
-import com.android.hotspot2.omadm.MOTree;
-import com.android.hotspot2.omadm.OMAConstants;
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.OMAParser;
-import com.android.hotspot2.osu.ClientKeyManager;
-import com.android.hotspot2.osu.OSUCertType;
-import com.android.hotspot2.osu.OSUManager;
-import com.android.hotspot2.osu.OSUOperationStatus;
-import com.android.hotspot2.osu.OSUSocketFactory;
-import com.android.hotspot2.osu.WiFiKeyManager;
-import com.android.hotspot2.osu.commands.MOData;
-import com.android.hotspot2.pps.HomeSP;
-
-import org.xml.sax.SAXException;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import javax.net.ssl.KeyManager;
-
-public class PlatformAdapter {
- private static final String TAG = "OSUFLOW";
-
- public static final Locale LOCALE = Locale.getDefault();
-
- public static final String CERT_WFA_ALIAS = "wfa-root-";
- public static final String CERT_REM_ALIAS = "rem-";
- public static final String CERT_POLICY_ALIAS = "pol-";
- public static final String CERT_SHARED_ALIAS = "shr-";
- public static final String CERT_CLT_CERT_ALIAS = "clt-";
- public static final String CERT_CLT_KEY_ALIAS = "prv-";
- public static final String CERT_CLT_CA_ALIAS = "aaa-";
-
- private static final String KEYSTORE_FILE = "passpoint.ks";
-
- private final Context mContext;
- private final File mKeyStoreFile;
- private final KeyStore mKeyStore;
- private final AppBridge mAppBridge;
- private final Map<String, PasspointConfig> mPasspointConfigs;
-
- public PlatformAdapter(Context context) {
- mContext = context;
- mAppBridge = new AppBridge(context);
-
- File appFolder = context.getFilesDir();
- mKeyStoreFile = new File(appFolder, KEYSTORE_FILE);
- Log.d(TAG, "KS file: " + mKeyStoreFile.getPath());
- KeyStore ks = null;
- try {
- //ks = loadKeyStore(KEYSTORE_FILE, readCertsFromDisk(WFA_CA_LOC));
- ks = loadKeyStore(mKeyStoreFile, OSUSocketFactory.buildCertSet());
- } catch (IOException e) {
- Log.e(TAG, "Failed to initialize Passpoint keystore, OSU disabled", e);
- }
- mKeyStore = ks;
-
- mPasspointConfigs = loadAllSps(context);
- }
-
- private static KeyStore loadKeyStore(File ksFile, Set<X509Certificate> diskCerts)
- throws IOException {
- try {
- KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
- if (ksFile.exists()) {
- try (FileInputStream in = new FileInputStream(ksFile)) {
- keyStore.load(in, null);
- }
-
- // Note: comparing two sets of certs does not work.
- boolean mismatch = false;
- int loadCount = 0;
- for (int n = 0; n < 1000; n++) {
- String alias = String.format("%s%d", CERT_WFA_ALIAS, n);
- Certificate cert = keyStore.getCertificate(alias);
- if (cert == null) {
- break;
- }
-
- loadCount++;
- boolean matched = false;
- Iterator<X509Certificate> iter = diskCerts.iterator();
- while (iter.hasNext()) {
- X509Certificate diskCert = iter.next();
- if (cert.equals(diskCert)) {
- iter.remove();
- matched = true;
- break;
- }
- }
- if (!matched) {
- mismatch = true;
- break;
- }
- }
- if (mismatch || !diskCerts.isEmpty()) {
- Log.d(TAG, "Re-seeding Passpoint key store with " +
- diskCerts.size() + " WFA certs");
- for (int n = 0; n < 1000; n++) {
- String alias = String.format("%s%d", CERT_WFA_ALIAS, n);
- Certificate cert = keyStore.getCertificate(alias);
- if (cert == null) {
- break;
- } else {
- keyStore.deleteEntry(alias);
- }
- }
- int index = 0;
- for (X509Certificate caCert : diskCerts) {
- keyStore.setCertificateEntry(
- String.format("%s%d", CERT_WFA_ALIAS, index), caCert);
- index++;
- }
-
- try (FileOutputStream out = new FileOutputStream(ksFile)) {
- keyStore.store(out, null);
- }
- } else {
- Log.d(TAG, "Loaded Passpoint key store with " + loadCount + " CA certs");
- Enumeration<String> aliases = keyStore.aliases();
- while (aliases.hasMoreElements()) {
- Log.d("ZXC", "KS Alias '" + aliases.nextElement() + "'");
- }
- }
- } else {
- keyStore.load(null, null);
- int index = 0;
- for (X509Certificate caCert : diskCerts) {
- keyStore.setCertificateEntry(
- String.format("%s%d", CERT_WFA_ALIAS, index), caCert);
- index++;
- }
-
- try (FileOutputStream out = new FileOutputStream(ksFile)) {
- keyStore.store(out, null);
- }
- Log.d(TAG, "Initialized Passpoint key store with " +
- diskCerts.size() + " CA certs");
- }
- return keyStore;
- } catch (GeneralSecurityException gse) {
- throw new IOException(gse);
- }
- }
-
- private static Map<String, PasspointConfig> loadAllSps(Context context) {
- Map<String, PasspointConfig> passpointConfigs = new HashMap<>();
-
- WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- List<WifiConfiguration> configs = wifiManager.getPrivilegedConfiguredNetworks();
- if (configs == null) {
- return passpointConfigs;
- }
- int count = 0;
- for (WifiConfiguration config : configs) {
- String moTree = config.getMoTree();
- if (moTree != null) {
- try {
- passpointConfigs.put(config.FQDN, new PasspointConfig(config));
- count++;
- } catch (IOException | SAXException e) {
- Log.w(OSUManager.TAG, "Failed to parse MO: " + e);
- }
- }
- }
- Log.d(OSUManager.TAG, "Loaded " + count + " SPs");
- return passpointConfigs;
- }
-
- public KeyStore getKeyStore() {
- return mKeyStore;
- }
-
- public Context getContext() {
- return mContext;
- }
-
- /**
- * Connect to an OSU provisioning network. The connection should not bring down other existing
- * connection and the network should not be made the default network since the connection
- * is solely for sign up and is neither intended for nor likely provides access to any
- * generic resources.
- *
- * @param osuInfo The OSU info object that defines the parameters for the network. An OSU
- * network is either an open network, or, if the OSU NAI is set, an "OSEN"
- * network, which is an anonymous EAP-TLS network with special keys.
- * @return an Integer holding the network-id of the just added network configuration, or null
- * if the network existed prior to this call (was not added by the OSU infrastructure).
- * The value will be used at the end of the OSU flow to delete the network as applicable.
- * @throws IOException Issues:
- * 1. The network id is not returned. addNetwork cannot be called from here since the method
- * runs in the context of the app and doesn't have the appropriate permission.
- * 2. The connection is not immediately usable if the network was not previously selected
- * manually.
- */
- public Integer connect(OSUInfo osuInfo) throws IOException {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
-
- WifiConfiguration config = new WifiConfiguration();
- config.SSID = '"' + osuInfo.getOsuSsid() + '"';
- if (osuInfo.getOSUBssid() != 0) {
- config.BSSID = Utils.macToString(osuInfo.getOSUBssid());
- Log.d(OSUManager.TAG, String.format("Setting BSSID of '%s' to %012x",
- osuInfo.getOsuSsid(), osuInfo.getOSUBssid()));
- }
-
- if (osuInfo.getOSUProvider().getOsuNai() == null) {
- config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
- } else {
- config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OSEN);
- config.allowedProtocols.set(WifiConfiguration.Protocol.OSEN);
- config.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
- config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.GTK_NOT_USED);
- config.enterpriseConfig = new WifiEnterpriseConfig();
- config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.UNAUTH_TLS);
- config.enterpriseConfig.setIdentity(osuInfo.getOSUProvider().getOsuNai());
- Set<X509Certificate> cas = OSUSocketFactory.buildCertSet();
- config.enterpriseConfig.setCaCertificates(cas.toArray(new X509Certificate[cas.size()]));
- }
-
- int networkId = wifiManager.addNetwork(config);
- if (networkId < 0) {
- throw new IOException("Failed to add OSU network");
- }
- if (wifiManager.enableNetwork(networkId, true)) {
- return networkId;
- } else {
- throw new IOException("Failed to enable OSU network");
- }
- }
-
- /**
- * @param homeSP The Home SP associated with the keying material in question. Passing
- * null returns a "system wide" KeyManager to support pre-provisioned certs based
- * on names retrieved from the ClientCertInfo request.
- * @return A key manager suitable for the given configuration (or pre-provisioned keys).
- */
- public KeyManager getKeyManager(HomeSP homeSP) throws IOException {
- return homeSP != null
- ? new ClientKeyManager(homeSP, mKeyStore) : new WiFiKeyManager(mKeyStore);
- }
-
- public void provisioningComplete(OSUInfo osuInfo,
- MOData moData, Map<OSUCertType, List<X509Certificate>> certs,
- PrivateKey privateKey, Network osuNetwork) {
- try {
- String xml = moData.getMOTree().toXml();
- HomeSP homeSP = MOManager.buildSP(xml);
-
- Integer spNwk = addNetwork(homeSP, certs, privateKey, osuNetwork);
- if (spNwk == null) {
- notifyUser(OSUOperationStatus.ProvisioningFailure,
- "Failed to save network configuration", osuInfo.getName(LOCALE));
- } else {
- if (addSP(xml) < 0) {
- deleteNetwork(spNwk);
- Log.e(TAG, "Failed to provision: " + homeSP.getFQDN());
- notifyUser(OSUOperationStatus.ProvisioningFailure, "Failed to add MO",
- osuInfo.getName(LOCALE));
- return;
- }
- Set<X509Certificate> rootCerts = OSUSocketFactory.getRootCerts(mKeyStore);
- X509Certificate remCert = getCert(certs, OSUCertType.Remediation);
- X509Certificate polCert = getCert(certs, OSUCertType.Policy);
- int newCerts = 0;
- if (privateKey != null) {
- X509Certificate cltCert = getCert(certs, OSUCertType.Client);
- mKeyStore.setKeyEntry(CERT_CLT_KEY_ALIAS + homeSP.getFQDN(),
- privateKey, null, new X509Certificate[]{cltCert});
- mKeyStore.setCertificateEntry(CERT_CLT_CERT_ALIAS + homeSP.getFQDN(), cltCert);
- newCerts++;
- }
- boolean usingShared = false;
- if (remCert != null) {
- if (!rootCerts.contains(remCert)) {
- if (remCert.equals(polCert)) {
- mKeyStore.setCertificateEntry(CERT_SHARED_ALIAS + homeSP.getFQDN(),
- remCert);
- usingShared = true;
- newCerts++;
- } else {
- mKeyStore.setCertificateEntry(CERT_REM_ALIAS + homeSP.getFQDN(),
- remCert);
- newCerts++;
- }
- }
- }
- if (!usingShared && polCert != null) {
- if (!rootCerts.contains(polCert)) {
- mKeyStore.setCertificateEntry(CERT_POLICY_ALIAS + homeSP.getFQDN(),
- remCert);
- newCerts++;
- }
- }
-
-
- if (newCerts > 0) {
- try (FileOutputStream out = new FileOutputStream(mKeyStoreFile)) {
- mKeyStore.store(out, null);
- }
- }
- notifyUser(OSUOperationStatus.ProvisioningSuccess, null, osuInfo.getName(LOCALE));
- Log.d(TAG, "Provisioning complete.");
- }
- } catch (IOException | GeneralSecurityException | SAXException e) {
- Log.e(TAG, "Failed to provision: " + e, e);
- notifyUser(OSUOperationStatus.ProvisioningFailure, e.toString(),
- osuInfo.getName(LOCALE));
- }
- }
-
- public void remediationComplete(HomeSP homeSP, Collection<MOData> mods,
- Map<OSUCertType, List<X509Certificate>> certs,
- PrivateKey privateKey, boolean policy)
- throws IOException, GeneralSecurityException {
-
- HomeSP altSP = null;
- if (modifySP(homeSP, mods) > 0) {
- altSP = MOManager.modifySP(homeSP, getMOTree(homeSP), mods);
- }
-
- X509Certificate caCert = null;
- List<X509Certificate> clientCerts = null;
- if (certs != null) {
- List<X509Certificate> certList = certs.get(OSUCertType.AAA);
- caCert = certList != null && !certList.isEmpty() ? certList.iterator().next() : null;
- clientCerts = certs.get(OSUCertType.Client);
- }
- if (altSP != null || certs != null) {
- if (altSP == null) {
- altSP = homeSP;
- }
- updateNetwork(altSP, caCert, clientCerts, privateKey);
-
- if (privateKey != null) {
- X509Certificate cltCert = getCert(certs, OSUCertType.Client);
- mKeyStore.setKeyEntry(CERT_CLT_KEY_ALIAS + homeSP.getFQDN(),
- privateKey, null, new X509Certificate[]{cltCert});
- mKeyStore.setCertificateEntry(CERT_CLT_CERT_ALIAS + homeSP.getFQDN(), cltCert);
- }
- }
-
- Intent intent = new Intent(OSUService.REMEDIATION_DONE_ACTION);
- intent.putExtra(OSUService.REMEDIATION_FQDN_EXTRA, homeSP.getFQDN());
- intent.putExtra(OSUService.REMEDIATION_POLICY_EXTRA, policy);
- mContext.sendBroadcast(intent);
-
- notifyUser(OSUOperationStatus.ProvisioningSuccess, null, homeSP.getFriendlyName());
- }
-
- public void serviceProviderDeleted(String fqdn) {
- int count = deleteCerts(mKeyStore, fqdn,
- CERT_REM_ALIAS, CERT_POLICY_ALIAS, CERT_SHARED_ALIAS, CERT_CLT_CERT_ALIAS);
-
- Log.d(TAG, "Passpoint network deleted, removing " + count + " key store entries");
-
- try {
- if (mKeyStore.getKey(CERT_CLT_KEY_ALIAS + fqdn, null) != null) {
- mKeyStore.deleteEntry(CERT_CLT_KEY_ALIAS + fqdn);
- }
- } catch (GeneralSecurityException e) {
- /**/
- }
-
- if (count > 0) {
- try (FileOutputStream out = new FileOutputStream(mKeyStoreFile)) {
- mKeyStore.store(out, null);
- } catch (IOException | GeneralSecurityException e) {
- Log.w(TAG, "Failed to remove certs from key store: " + e);
- }
- }
- }
-
- private static int deleteCerts(KeyStore keyStore, String fqdn, String... prefixes) {
- int count = 0;
- for (String prefix : prefixes) {
- try {
- String alias = prefix + fqdn;
- Certificate cert = keyStore.getCertificate(alias);
- if (cert != null) {
- keyStore.deleteEntry(alias);
- count++;
- }
- } catch (KeyStoreException kse) {
- /**/
- }
- }
- return count;
- }
-
- private static X509Certificate getCert(Map<OSUCertType, List<X509Certificate>> certMap,
- OSUCertType certType) {
- List<X509Certificate> certs = certMap.get(certType);
- if (certs == null || certs.isEmpty()) {
- return null;
- }
- return certs.iterator().next();
- }
-
- public String notifyUser(OSUOperationStatus status, String message, String spName) {
- if (status == OSUOperationStatus.UserInputComplete) {
- return null;
- }
- mAppBridge.showStatus(status, spName, message, null);
- return null;
- }
-
- public void provisioningFailed(String spName, String message) {
- notifyUser(OSUOperationStatus.ProvisioningFailure, message, spName);
- }
-
- private Integer addNetwork(HomeSP homeSP, Map<OSUCertType, List<X509Certificate>> certs,
- PrivateKey privateKey, Network osuNetwork)
- throws IOException, GeneralSecurityException {
-
- List<X509Certificate> aaaTrust = certs.get(OSUCertType.AAA);
- if (aaaTrust.isEmpty()) {
- aaaTrust = certs.get(OSUCertType.CA); // Get the CAs from the EST flow.
- }
-
- WifiConfiguration config = ConfigBuilder.buildConfig(homeSP,
- aaaTrust.iterator().next(),
- certs.get(OSUCertType.Client), privateKey);
-
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- int nwkId = wifiManager.addNetwork(config);
- boolean saved = false;
- if (nwkId >= 0) {
- saved = wifiManager.saveConfiguration();
- }
- Log.d(OSUManager.TAG, "Wifi configuration " + nwkId +
- " " + (saved ? "saved" : "not saved"));
-
- if (saved) {
- reconnect(osuNetwork, nwkId);
- return nwkId;
- } else {
- return null;
- }
- }
-
- private void updateNetwork(HomeSP homeSP, X509Certificate caCert,
- List<X509Certificate> clientCerts, PrivateKey privateKey)
- throws IOException, GeneralSecurityException {
-
- WifiConfiguration config = getWifiConfig(homeSP);
- if (config == null) {
- throw new IOException("Failed to find matching network config");
- }
- Log.d(OSUManager.TAG, "Found matching config " + config.networkId + ", updating");
-
- WifiEnterpriseConfig enterpriseConfig = config.enterpriseConfig;
- WifiConfiguration newConfig = ConfigBuilder.buildConfig(homeSP,
- caCert != null ? caCert : enterpriseConfig.getCaCertificate(),
- clientCerts, privateKey);
- newConfig.networkId = config.networkId;
-
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- wifiManager.save(newConfig, null);
- wifiManager.saveConfiguration();
- }
-
- private WifiConfiguration getWifiConfig(HomeSP homeSP) {
- PasspointConfig passpointConfig = mPasspointConfigs.get(homeSP.getFQDN());
- return passpointConfig != null ? passpointConfig.getWifiConfiguration() : null;
- }
-
- public MOTree getMOTree(HomeSP homeSP) {
- PasspointConfig config = mPasspointConfigs.get(homeSP.getFQDN());
- return config != null ? config.getmMOTree() : null;
- }
-
- public HomeSP getHomeSP(String fqdn) {
- PasspointConfig passpointConfig = mPasspointConfigs.get(fqdn);
- return passpointConfig != null ? passpointConfig.getHomeSP() : null;
- }
-
- public HomeSP getCurrentSP() {
- PasspointConfig passpointConfig = getActivePasspointConfig();
- return passpointConfig != null ? passpointConfig.getHomeSP() : null;
- }
-
- private PasspointConfig getActivePasspointConfig() {
- WifiInfo wifiInfo = getConnectionInfo();
- if (wifiInfo == null) {
- return null;
- }
-
- for (PasspointConfig passpointConfig : mPasspointConfigs.values()) {
- if (passpointConfig.getWifiConfiguration().networkId == wifiInfo.getNetworkId()) {
- return passpointConfig;
- }
- }
- return null;
- }
-
- private int addSP(String xml) throws IOException, SAXException {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- // TODO(b/32883320): use the new API for adding Passpoint configuration.
- return 0;
- }
-
- private int modifySP(HomeSP homeSP, Collection<MOData> mods) throws IOException {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- List<PasspointManagementObjectDefinition> defMods = new ArrayList<>(mods.size());
- for (MOData mod : mods) {
- defMods.add(new PasspointManagementObjectDefinition(mod.getBaseURI(),
- mod.getURN(), mod.getMOTree().toXml()));
- }
- // TODO(b/32883320): use the new API to update Passpoint configuration.
- return 0;
- }
-
- private void reconnect(Network osuNetwork, int newNwkId) {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- if (osuNetwork != null) {
- wifiManager.disableNetwork(osuNetwork.netId);
- }
- if (newNwkId != WifiConfiguration.INVALID_NETWORK_ID) {
- wifiManager.enableNetwork(newNwkId, true);
- }
- }
-
- public void deleteNetwork(int id) {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- wifiManager.disableNetwork(id);
- wifiManager.forget(id, null);
- }
-
- public WifiInfo getConnectionInfo() {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- return wifiManager.getConnectionInfo();
- }
-
- public Network getCurrentNetwork() {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- return wifiManager.getCurrentNetwork();
- }
-
- public WifiConfiguration getActiveWifiConfig() {
- WifiInfo wifiInfo = getConnectionInfo();
- if (wifiInfo == null) {
- return null;
- }
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- List<WifiConfiguration> configs = wifiManager.getConfiguredNetworks();
- if (configs == null) {
- return null;
- }
- for (WifiConfiguration config : configs) {
- if (config.networkId == wifiInfo.getNetworkId()) {
- return config;
- }
- }
- return null;
- }
-
- private static class PasspointConfig {
- private final WifiConfiguration mWifiConfiguration;
- private final MOTree mMOTree;
- private final HomeSP mHomeSP;
-
- private PasspointConfig(WifiConfiguration config) throws IOException, SAXException {
- mWifiConfiguration = config;
- OMAParser omaParser = new OMAParser();
- mMOTree = omaParser.parse(config.getMoTree(), OMAConstants.PPS_URN);
- List<HomeSP> spList = MOManager.buildSPs(mMOTree);
- if (spList.size() != 1) {
- throw new OMAException("Expected exactly one HomeSP, got " + spList.size());
- }
- mHomeSP = spList.iterator().next();
- }
-
- public WifiConfiguration getWifiConfiguration() {
- return mWifiConfiguration;
- }
-
- public HomeSP getHomeSP() {
- return mHomeSP;
- }
-
- public MOTree getmMOTree() {
- return mMOTree;
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/MOManager.java b/packages/Osu/src/com/android/hotspot2/omadm/MOManager.java
deleted file mode 100644
index 8a1eef4..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/MOManager.java
+++ /dev/null
@@ -1,1037 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import android.util.Base64;
-import android.util.Log;
-
-import com.android.anqp.eap.EAP;
-import com.android.anqp.eap.EAPMethod;
-import com.android.anqp.eap.ExpandedEAPMethod;
-import com.android.anqp.eap.InnerAuthEAP;
-import com.android.anqp.eap.NonEAPInnerAuth;
-import com.android.hotspot2.IMSIParameter;
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.osu.OSUManager;
-import com.android.hotspot2.osu.commands.MOData;
-import com.android.hotspot2.pps.Credential;
-import com.android.hotspot2.pps.HomeSP;
-import com.android.hotspot2.pps.Policy;
-import com.android.hotspot2.pps.SubscriptionParameters;
-import com.android.hotspot2.pps.UpdateInfo;
-
-import org.xml.sax.SAXException;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-
-/**
- * Handles provisioning of PerProviderSubscription data.
- */
-public class MOManager {
-
- public static final String TAG_AAAServerTrustRoot = "AAAServerTrustRoot";
- public static final String TAG_AbleToShare = "AbleToShare";
- public static final String TAG_CertificateType = "CertificateType";
- public static final String TAG_CertSHA256Fingerprint = "CertSHA256Fingerprint";
- public static final String TAG_CertURL = "CertURL";
- public static final String TAG_CheckAAAServerCertStatus = "CheckAAAServerCertStatus";
- public static final String TAG_Country = "Country";
- public static final String TAG_CreationDate = "CreationDate";
- public static final String TAG_Credential = "Credential";
- public static final String TAG_CredentialPriority = "CredentialPriority";
- public static final String TAG_DataLimit = "DataLimit";
- public static final String TAG_DigitalCertificate = "DigitalCertificate";
- public static final String TAG_DLBandwidth = "DLBandwidth";
- public static final String TAG_EAPMethod = "EAPMethod";
- public static final String TAG_EAPType = "EAPType";
- public static final String TAG_ExpirationDate = "ExpirationDate";
- public static final String TAG_Extension = "Extension";
- public static final String TAG_FQDN = "FQDN";
- public static final String TAG_FQDN_Match = "FQDN_Match";
- public static final String TAG_FriendlyName = "FriendlyName";
- public static final String TAG_HESSID = "HESSID";
- public static final String TAG_HomeOI = "HomeOI";
- public static final String TAG_HomeOIList = "HomeOIList";
- public static final String TAG_HomeOIRequired = "HomeOIRequired";
- public static final String TAG_HomeSP = "HomeSP";
- public static final String TAG_IconURL = "IconURL";
- public static final String TAG_IMSI = "IMSI";
- public static final String TAG_InnerEAPType = "InnerEAPType";
- public static final String TAG_InnerMethod = "InnerMethod";
- public static final String TAG_InnerVendorID = "InnerVendorID";
- public static final String TAG_InnerVendorType = "InnerVendorType";
- public static final String TAG_IPProtocol = "IPProtocol";
- public static final String TAG_MachineManaged = "MachineManaged";
- public static final String TAG_MaximumBSSLoadValue = "MaximumBSSLoadValue";
- public static final String TAG_MinBackhaulThreshold = "MinBackhaulThreshold";
- public static final String TAG_NetworkID = "NetworkID";
- public static final String TAG_NetworkType = "NetworkType";
- public static final String TAG_Other = "Other";
- public static final String TAG_OtherHomePartners = "OtherHomePartners";
- public static final String TAG_Password = "Password";
- public static final String TAG_PerProviderSubscription = "PerProviderSubscription";
- public static final String TAG_Policy = "Policy";
- public static final String TAG_PolicyUpdate = "PolicyUpdate";
- public static final String TAG_PortNumber = "PortNumber";
- public static final String TAG_PreferredRoamingPartnerList = "PreferredRoamingPartnerList";
- public static final String TAG_Priority = "Priority";
- public static final String TAG_Realm = "Realm";
- public static final String TAG_RequiredProtoPortTuple = "RequiredProtoPortTuple";
- public static final String TAG_Restriction = "Restriction";
- public static final String TAG_RoamingConsortiumOI = "RoamingConsortiumOI";
- public static final String TAG_SIM = "SIM";
- public static final String TAG_SoftTokenApp = "SoftTokenApp";
- public static final String TAG_SPExclusionList = "SPExclusionList";
- public static final String TAG_SSID = "SSID";
- public static final String TAG_StartDate = "StartDate";
- public static final String TAG_SubscriptionParameters = "SubscriptionParameters";
- public static final String TAG_SubscriptionUpdate = "SubscriptionUpdate";
- public static final String TAG_TimeLimit = "TimeLimit";
- public static final String TAG_TrustRoot = "TrustRoot";
- public static final String TAG_TypeOfSubscription = "TypeOfSubscription";
- public static final String TAG_ULBandwidth = "ULBandwidth";
- public static final String TAG_UpdateIdentifier = "UpdateIdentifier";
- public static final String TAG_UpdateInterval = "UpdateInterval";
- public static final String TAG_UpdateMethod = "UpdateMethod";
- public static final String TAG_URI = "URI";
- public static final String TAG_UsageLimits = "UsageLimits";
- public static final String TAG_UsageTimePeriod = "UsageTimePeriod";
- public static final String TAG_Username = "Username";
- public static final String TAG_UsernamePassword = "UsernamePassword";
- public static final String TAG_VendorId = "VendorId";
- public static final String TAG_VendorType = "VendorType";
-
- public static final long IntervalFactor = 60000L; // All MO intervals are in minutes
-
- private static final DateFormat DTFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-
- private static final Map<String, Map<String, Object>> sSelectionMap;
-
- static {
- DTFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-
- sSelectionMap = new HashMap<>();
-
- setSelections(TAG_FQDN_Match,
- "exactmatch", Boolean.FALSE,
- "includesubdomains", Boolean.TRUE);
- setSelections(TAG_UpdateMethod,
- "oma-dm-clientinitiated", Boolean.FALSE,
- "spp-clientinitiated", Boolean.TRUE);
- setSelections(TAG_Restriction,
- "homesp", UpdateInfo.UpdateRestriction.HomeSP,
- "roamingpartner", UpdateInfo.UpdateRestriction.RoamingPartner,
- "unrestricted", UpdateInfo.UpdateRestriction.Unrestricted);
- }
-
- private static void setSelections(String key, Object... pairs) {
- Map<String, Object> kvp = new HashMap<>();
- sSelectionMap.put(key, kvp);
- for (int n = 0; n < pairs.length; n += 2) {
- kvp.put(pairs[n].toString(), pairs[n + 1]);
- }
- }
-
- private final File mPpsFile;
- private final boolean mEnabled;
- private final Map<String, HomeSP> mSPs;
-
- public MOManager(File ppsFile, boolean hs2enabled) {
- mPpsFile = ppsFile;
- mEnabled = hs2enabled;
- mSPs = new HashMap<>();
- }
-
- public File getPpsFile() {
- return mPpsFile;
- }
-
- public boolean isEnabled() {
- return mEnabled;
- }
-
- public boolean isConfigured() {
- return mEnabled && !mSPs.isEmpty();
- }
-
- public Map<String, HomeSP> getLoadedSPs() {
- return Collections.unmodifiableMap(mSPs);
- }
-
- public List<HomeSP> loadAllSPs() throws IOException {
-
- if (!mEnabled || !mPpsFile.exists()) {
- return Collections.emptyList();
- }
-
- try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(mPpsFile))) {
- MOTree moTree = MOTree.unmarshal(in);
- mSPs.clear();
- if (moTree == null) {
- return Collections.emptyList(); // Empty file
- }
-
- List<HomeSP> sps = buildSPs(moTree);
- if (sps != null) {
- for (HomeSP sp : sps) {
- if (mSPs.put(sp.getFQDN(), sp) != null) {
- throw new OMAException("Multiple SPs for FQDN '" + sp.getFQDN() + "'");
- } else {
- Log.d(OSUManager.TAG, "retrieved " + sp.getFQDN() + " from PPS");
- }
- }
- return sps;
-
- } else {
- throw new OMAException("Failed to build HomeSP");
- }
- }
- }
-
- public static HomeSP buildSP(String xml) throws IOException, SAXException {
- OMAParser omaParser = new OMAParser();
- MOTree tree = omaParser.parse(xml, OMAConstants.PPS_URN);
- List<HomeSP> spList = buildSPs(tree);
- if (spList.size() != 1) {
- throw new OMAException("Expected exactly one HomeSP, got " + spList.size());
- }
- return spList.iterator().next();
- }
-
- public HomeSP addSP(String xml, OSUManager osuManager) throws IOException, SAXException {
- OMAParser omaParser = new OMAParser();
- return addSP(omaParser.parse(xml, OMAConstants.PPS_URN));
- }
-
- private static final List<String> FQDNPath = Arrays.asList(TAG_HomeSP, TAG_FQDN);
-
- /**
- * R1 *only* addSP method.
- *
- * @param homeSP
- * @throws IOException
- */
- public void addSP(HomeSP homeSP) throws IOException {
- if (!mEnabled) {
- throw new IOException("HS2.0 not enabled on this device");
- }
- if (mSPs.containsKey(homeSP.getFQDN())) {
- Log.d(OSUManager.TAG, "HS20 profile for " +
- homeSP.getFQDN() + " already exists");
- return;
- }
- Log.d(OSUManager.TAG, "Adding new HS20 profile for " + homeSP.getFQDN());
-
- OMAConstructed dummyRoot = new OMAConstructed(null, TAG_PerProviderSubscription, null);
- buildHomeSPTree(homeSP, dummyRoot, mSPs.size() + 1);
- try {
- addSP(dummyRoot);
- } catch (FileNotFoundException fnfe) {
- MOTree tree =
- MOTree.buildMgmtTree(OMAConstants.PPS_URN, OMAConstants.OMAVersion, dummyRoot);
- // No file to load a pre-build MO tree from, create a new one and save it.
- //MOTree tree = new MOTree(OMAConstants.PPS_URN, OMAConstants.OMAVersion, dummyRoot);
- writeMO(tree, mPpsFile);
- }
- mSPs.put(homeSP.getFQDN(), homeSP);
- }
-
- public HomeSP addSP(MOTree instanceTree) throws IOException {
- List<HomeSP> spList = buildSPs(instanceTree);
- if (spList.size() != 1) {
- throw new OMAException("Expected exactly one HomeSP, got " + spList.size());
- }
-
- HomeSP sp = spList.iterator().next();
- String fqdn = sp.getFQDN();
- if (mSPs.put(fqdn, sp) != null) {
- throw new OMAException("SP " + fqdn + " already exists");
- }
-
- OMAConstructed pps = (OMAConstructed) instanceTree.getRoot().
- getChild(TAG_PerProviderSubscription);
-
- try {
- addSP(pps);
- } catch (FileNotFoundException fnfe) {
- MOTree tree = new MOTree(instanceTree.getUrn(), instanceTree.getDtdRev(),
- instanceTree.getRoot());
- writeMO(tree, mPpsFile);
- }
-
- return sp;
- }
-
- /**
- * Add an SP sub-tree. mo must be PPS with an immediate instance child (e.g. Cred01) and an
- * optional UpdateIdentifier,
- *
- * @param mo The new MO
- * @throws IOException
- */
- private void addSP(OMANode mo) throws IOException {
- MOTree moTree;
- try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(mPpsFile))) {
- moTree = MOTree.unmarshal(in);
- moTree.getRoot().addChild(mo);
-
- /*
- OMAConstructed ppsRoot = (OMAConstructed)
- moTree.getRoot().addChild(TAG_PerProviderSubscription, "", null, null);
- for (OMANode child : mo.getChildren()) {
- ppsRoot.addChild(child);
- if (!child.isLeaf()) {
- moTree.getRoot().addChild(child);
- }
- else if (child.getName().equals(TAG_UpdateIdentifier)) {
- OMANode currentUD = moTree.getRoot().getChild(TAG_UpdateIdentifier);
- if (currentUD != null) {
- moTree.getRoot().replaceNode(currentUD, child);
- }
- else {
- moTree.getRoot().addChild(child);
- }
- }
- }
- */
- }
- writeMO(moTree, mPpsFile);
- }
-
- private static OMAConstructed findTargetTree(MOTree moTree, String fqdn) throws OMAException {
- OMANode pps = moTree.getRoot();
- for (OMANode node : pps.getChildren()) {
- OMANode instance = null;
- if (node.getName().equals(TAG_PerProviderSubscription)) {
- instance = getInstanceNode((OMAConstructed) node);
- } else if (!node.isLeaf()) {
- instance = node;
- }
- if (instance != null) {
- String nodeFqdn = getString(instance.getListValue(FQDNPath.iterator()));
- if (fqdn.equalsIgnoreCase(nodeFqdn)) {
- return (OMAConstructed) node;
- // targetTree is rooted at the PPS
- }
- }
- }
- return null;
- }
-
- private static OMAConstructed getInstanceNode(OMAConstructed root) throws OMAException {
- for (OMANode child : root.getChildren()) {
- if (!child.isLeaf()) {
- return (OMAConstructed) child;
- }
- }
- throw new OMAException("Cannot find instance node");
- }
-
- public static HomeSP modifySP(HomeSP homeSP, MOTree moTree, Collection<MOData> mods)
- throws OMAException {
-
- OMAConstructed ppsTree =
- (OMAConstructed) moTree.getRoot().getChildren().iterator().next();
- OMAConstructed instance = getInstanceNode(ppsTree);
-
- int ppsMods = 0;
- int updateIdentifier = homeSP.getUpdateIdentifier();
- for (MOData mod : mods) {
- LinkedList<String> tailPath =
- getTailPath(mod.getBaseURI(), TAG_PerProviderSubscription);
- OMAConstructed modRoot = mod.getMOTree().getRoot();
- // modRoot is the MgmtTree with the actual object as a direct child
- // (e.g. Credential)
-
- if (tailPath.getFirst().equals(TAG_UpdateIdentifier)) {
- updateIdentifier = getInteger(modRoot.getChildren().iterator().next());
- OMANode oldUdi = ppsTree.getChild(TAG_UpdateIdentifier);
- if (getInteger(oldUdi) != updateIdentifier) {
- ppsMods++;
- }
- if (oldUdi != null) {
- ppsTree.replaceNode(oldUdi, modRoot.getChild(TAG_UpdateIdentifier));
- } else {
- ppsTree.addChild(modRoot.getChild(TAG_UpdateIdentifier));
- }
- } else {
- tailPath.removeFirst(); // Drop the instance
- OMANode current = instance.getListValue(tailPath.iterator());
- if (current == null) {
- throw new OMAException("No previous node for " + tailPath + " in "
- + homeSP.getFQDN());
- }
- for (OMANode newNode : modRoot.getChildren()) {
- // newNode is something like Credential
- // current is the same existing node
- OMANode old = current.getParent().replaceNode(current, newNode);
- ppsMods++;
- }
- }
- }
-
- return ppsMods > 0 ? buildHomeSP(instance, updateIdentifier) : null;
- }
-
- public HomeSP modifySP(HomeSP homeSP, Collection<MOData> mods)
- throws IOException {
-
- Log.d(OSUManager.TAG, "modifying SP: " + mods);
- MOTree moTree;
- int ppsMods = 0;
- int updateIdentifier = 0;
- try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(mPpsFile))) {
- moTree = MOTree.unmarshal(in);
- // moTree is PPS/?/provider-data
-
- OMAConstructed targetTree = findTargetTree(moTree, homeSP.getFQDN());
- if (targetTree == null) {
- throw new IOException("Failed to find PPS tree for " + homeSP.getFQDN());
- }
- OMAConstructed instance = getInstanceNode(targetTree);
-
- for (MOData mod : mods) {
- LinkedList<String> tailPath =
- getTailPath(mod.getBaseURI(), TAG_PerProviderSubscription);
- OMAConstructed modRoot = mod.getMOTree().getRoot();
- // modRoot is the MgmtTree with the actual object as a direct child
- // (e.g. Credential)
-
- if (tailPath.getFirst().equals(TAG_UpdateIdentifier)) {
- updateIdentifier = getInteger(modRoot.getChildren().iterator().next());
- OMANode oldUdi = targetTree.getChild(TAG_UpdateIdentifier);
- if (getInteger(oldUdi) != updateIdentifier) {
- ppsMods++;
- }
- if (oldUdi != null) {
- targetTree.replaceNode(oldUdi, modRoot.getChild(TAG_UpdateIdentifier));
- } else {
- targetTree.addChild(modRoot.getChild(TAG_UpdateIdentifier));
- }
- } else {
- tailPath.removeFirst(); // Drop the instance
- OMANode current = instance.getListValue(tailPath.iterator());
- if (current == null) {
- throw new IOException("No previous node for " + tailPath + " in " +
- homeSP.getFQDN());
- }
- for (OMANode newNode : modRoot.getChildren()) {
- // newNode is something like Credential
- // current is the same existing node
- OMANode old = current.getParent().replaceNode(current, newNode);
- ppsMods++;
- }
- }
- }
- }
- writeMO(moTree, mPpsFile);
-
- if (ppsMods == 0) {
- return null; // HomeSP not modified.
- }
-
- // Return a new rebuilt HomeSP
- List<HomeSP> sps = buildSPs(moTree);
- if (sps != null) {
- for (HomeSP sp : sps) {
- if (sp.getFQDN().equals(homeSP.getFQDN())) {
- return sp;
- }
- }
- } else {
- throw new OMAException("Failed to build HomeSP");
- }
- return null;
- }
-
- private static LinkedList<String> getTailPath(String pathString, String rootName)
- throws OMAException {
- String[] path = pathString.split("/");
- int pathIndex;
- for (pathIndex = 0; pathIndex < path.length; pathIndex++) {
- if (path[pathIndex].equalsIgnoreCase(rootName)) {
- pathIndex++;
- break;
- }
- }
- if (pathIndex >= path.length) {
- throw new OMAException("Bad node-path: " + pathString);
- }
- LinkedList<String> tailPath = new LinkedList<>();
- while (pathIndex < path.length) {
- tailPath.add(path[pathIndex]);
- pathIndex++;
- }
- return tailPath;
- }
-
- public HomeSP getHomeSP(String fqdn) {
- return mSPs.get(fqdn);
- }
-
- public void removeSP(String fqdn) throws IOException {
- if (mSPs.remove(fqdn) == null) {
- Log.d(OSUManager.TAG, "No HS20 profile to delete for " + fqdn);
- return;
- }
-
- Log.d(OSUManager.TAG, "Deleting HS20 profile for " + fqdn);
-
- MOTree moTree;
- try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(mPpsFile))) {
- moTree = MOTree.unmarshal(in);
- OMAConstructed tbd = findTargetTree(moTree, fqdn);
- if (tbd == null) {
- throw new IOException("Node " + fqdn + " doesn't exist in MO tree");
- }
- OMAConstructed pps = moTree.getRoot();
- OMANode removed = pps.removeNode("?", tbd);
- if (removed == null) {
- throw new IOException("Failed to remove " + fqdn + " out of MO tree");
- }
- }
- writeMO(moTree, mPpsFile);
- }
-
- public MOTree getMOTree(HomeSP homeSP) throws IOException {
- try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(mPpsFile))) {
- MOTree moTree = MOTree.unmarshal(in);
- OMAConstructed target = findTargetTree(moTree, homeSP.getFQDN());
- if (target == null) {
- throw new IOException("Can't find " + homeSP.getFQDN() + " in MO tree");
- }
- return MOTree.buildMgmtTree(OMAConstants.PPS_URN, OMAConstants.OMAVersion, target);
- }
- }
-
- private static void writeMO(MOTree moTree, File f) throws IOException {
- try (BufferedOutputStream out =
- new BufferedOutputStream(new FileOutputStream(f, false))) {
- moTree.marshal(out);
- out.flush();
- }
- }
-
- private static String fqdnList(Collection<HomeSP> sps) {
- StringBuilder sb = new StringBuilder();
- boolean first = true;
- for (HomeSP sp : sps) {
- if (first) {
- first = false;
- } else {
- sb.append(", ");
- }
- sb.append(sp.getFQDN());
- }
- return sb.toString();
- }
-
- private static OMANode buildHomeSPTree(HomeSP homeSP, OMAConstructed root, int instanceID)
- throws IOException {
- OMANode providerSubNode = root.addChild(getInstanceString(instanceID),
- null, null, null);
-
- // The HomeSP:
- OMANode homeSpNode = providerSubNode.addChild(TAG_HomeSP, null, null, null);
- if (!homeSP.getSSIDs().isEmpty()) {
- OMAConstructed nwkIDNode =
- (OMAConstructed) homeSpNode.addChild(TAG_NetworkID, null, null, null);
- int instance = 0;
- for (Map.Entry<String, Long> entry : homeSP.getSSIDs().entrySet()) {
- OMAConstructed inode =
- (OMAConstructed) nwkIDNode
- .addChild(getInstanceString(instance++), null, null, null);
- inode.addChild(TAG_SSID, null, entry.getKey(), null);
- if (entry.getValue() != null) {
- inode.addChild(TAG_HESSID, null,
- String.format("%012x", entry.getValue()), null);
- }
- }
- }
-
- homeSpNode.addChild(TAG_FriendlyName, null, homeSP.getFriendlyName(), null);
-
- if (homeSP.getIconURL() != null) {
- homeSpNode.addChild(TAG_IconURL, null, homeSP.getIconURL(), null);
- }
-
- homeSpNode.addChild(TAG_FQDN, null, homeSP.getFQDN(), null);
-
- if (!homeSP.getMatchAllOIs().isEmpty() || !homeSP.getMatchAnyOIs().isEmpty()) {
- OMAConstructed homeOIList =
- (OMAConstructed) homeSpNode.addChild(TAG_HomeOIList, null, null, null);
-
- int instance = 0;
- for (Long oi : homeSP.getMatchAllOIs()) {
- OMAConstructed inode =
- (OMAConstructed) homeOIList.addChild(getInstanceString(instance++),
- null, null, null);
- inode.addChild(TAG_HomeOI, null, String.format("%x", oi), null);
- inode.addChild(TAG_HomeOIRequired, null, "TRUE", null);
- }
- for (Long oi : homeSP.getMatchAnyOIs()) {
- OMAConstructed inode =
- (OMAConstructed) homeOIList.addChild(getInstanceString(instance++),
- null, null, null);
- inode.addChild(TAG_HomeOI, null, String.format("%x", oi), null);
- inode.addChild(TAG_HomeOIRequired, null, "FALSE", null);
- }
- }
-
- if (!homeSP.getOtherHomePartners().isEmpty()) {
- OMAConstructed otherPartners =
- (OMAConstructed) homeSpNode.addChild(TAG_OtherHomePartners, null, null, null);
- int instance = 0;
- for (String fqdn : homeSP.getOtherHomePartners()) {
- OMAConstructed inode =
- (OMAConstructed) otherPartners.addChild(getInstanceString(instance++),
- null, null, null);
- inode.addChild(TAG_FQDN, null, fqdn, null);
- }
- }
-
- if (!homeSP.getRoamingConsortiums().isEmpty()) {
- homeSpNode.addChild(TAG_RoamingConsortiumOI, null,
- getRCList(homeSP.getRoamingConsortiums()), null);
- }
-
- // The Credential:
- OMANode credentialNode = providerSubNode.addChild(TAG_Credential, null, null, null);
- Credential cred = homeSP.getCredential();
- EAPMethod method = cred.getEAPMethod();
-
- if (cred.getCtime() > 0) {
- credentialNode.addChild(TAG_CreationDate,
- null, DTFormat.format(new Date(cred.getCtime())), null);
- }
- if (cred.getExpTime() > 0) {
- credentialNode.addChild(TAG_ExpirationDate,
- null, DTFormat.format(new Date(cred.getExpTime())), null);
- }
-
- if (method.getEAPMethodID() == EAP.EAPMethodID.EAP_SIM
- || method.getEAPMethodID() == EAP.EAPMethodID.EAP_AKA
- || method.getEAPMethodID() == EAP.EAPMethodID.EAP_AKAPrim) {
-
- OMANode simNode = credentialNode.addChild(TAG_SIM, null, null, null);
- simNode.addChild(TAG_IMSI, null, cred.getImsi().toString(), null);
- simNode.addChild(TAG_EAPType, null,
- Integer.toString(EAP.mapEAPMethod(method.getEAPMethodID())), null);
-
- } else if (method.getEAPMethodID() == EAP.EAPMethodID.EAP_TTLS) {
-
- OMANode unpNode = credentialNode.addChild(TAG_UsernamePassword, null, null, null);
- unpNode.addChild(TAG_Username, null, cred.getUserName(), null);
- unpNode.addChild(TAG_Password, null,
- Base64.encodeToString(cred.getPassword().getBytes(StandardCharsets.UTF_8),
- Base64.DEFAULT), null);
- OMANode eapNode = unpNode.addChild(TAG_EAPMethod, null, null, null);
- eapNode.addChild(TAG_EAPType, null,
- Integer.toString(EAP.mapEAPMethod(method.getEAPMethodID())), null);
- eapNode.addChild(TAG_InnerMethod, null,
- ((NonEAPInnerAuth) method.getAuthParam()).getOMAtype(), null);
-
- } else if (method.getEAPMethodID() == EAP.EAPMethodID.EAP_TLS) {
-
- OMANode certNode = credentialNode.addChild(TAG_DigitalCertificate, null, null, null);
- certNode.addChild(TAG_CertificateType, null, Credential.CertTypeX509, null);
- certNode.addChild(TAG_CertSHA256Fingerprint, null,
- Utils.toHex(cred.getFingerPrint()), null);
-
- } else {
- throw new OMAException("Invalid credential on " + homeSP.getFQDN());
- }
-
- credentialNode.addChild(TAG_Realm, null, cred.getRealm(), null);
-
- // !!! Note: This node defines CRL checking through OSCP, I suspect we won't be able
- // to do that so it is commented out:
- //credentialNode.addChild(TAG_CheckAAAServerCertStatus, null, "TRUE", null);
- return providerSubNode;
- }
-
- private static String getInstanceString(int instance) {
- return "r1i" + instance;
- }
-
- private static String getRCList(Collection<Long> rcs) {
- StringBuilder builder = new StringBuilder();
- boolean first = true;
- for (Long roamingConsortium : rcs) {
- if (first) {
- first = false;
- } else {
- builder.append(',');
- }
- builder.append(String.format("%x", roamingConsortium));
- }
- return builder.toString();
- }
-
- public static List<HomeSP> buildSPs(MOTree moTree) throws OMAException {
- OMAConstructed spList;
- List<HomeSP> homeSPs = new ArrayList<>();
- if (moTree.getRoot().getName().equals(TAG_PerProviderSubscription)) {
- // The old PPS file was rooted at PPS instead of MgmtTree to conserve space
- spList = moTree.getRoot();
-
- if (spList == null) {
- return homeSPs;
- }
-
- for (OMANode node : spList.getChildren()) {
- if (!node.isLeaf()) {
- homeSPs.add(buildHomeSP(node, 0));
- }
- }
- } else {
- for (OMANode ppsRoot : moTree.getRoot().getChildren()) {
- if (ppsRoot.getName().equals(TAG_PerProviderSubscription)) {
- Integer updateIdentifier = null;
- OMANode instance = null;
- for (OMANode child : ppsRoot.getChildren()) {
- if (child.getName().equals(TAG_UpdateIdentifier)) {
- updateIdentifier = getInteger(child);
- } else if (!child.isLeaf()) {
- instance = child;
- }
- }
- if (instance == null) {
- throw new OMAException("PPS node missing instance node");
- }
- homeSPs.add(buildHomeSP(instance,
- updateIdentifier != null ? updateIdentifier : 0));
- }
- }
- }
-
- return homeSPs;
- }
-
- private static HomeSP buildHomeSP(OMANode ppsRoot, int updateIdentifier) throws OMAException {
- OMANode spRoot = ppsRoot.getChild(TAG_HomeSP);
-
- String fqdn = spRoot.getScalarValue(Arrays.asList(TAG_FQDN).iterator());
- String friendlyName = spRoot.getScalarValue(Arrays.asList(TAG_FriendlyName).iterator());
- String iconURL = spRoot.getScalarValue(Arrays.asList(TAG_IconURL).iterator());
-
- HashSet<Long> roamingConsortiums = new HashSet<>();
- String oiString = spRoot.getScalarValue(Arrays.asList(TAG_RoamingConsortiumOI).iterator());
- if (oiString != null) {
- for (String oi : oiString.split(",")) {
- roamingConsortiums.add(Long.parseLong(oi.trim(), 16));
- }
- }
-
- Map<String, Long> ssids = new HashMap<>();
-
- OMANode ssidListNode = spRoot.getListValue(Arrays.asList(TAG_NetworkID).iterator());
- if (ssidListNode != null) {
- for (OMANode ssidRoot : ssidListNode.getChildren()) {
- OMANode hessidNode = ssidRoot.getChild(TAG_HESSID);
- ssids.put(ssidRoot.getChild(TAG_SSID).getValue(), getMac(hessidNode));
- }
- }
-
- Set<Long> matchAnyOIs = new HashSet<>();
- List<Long> matchAllOIs = new ArrayList<>();
- OMANode homeOIListNode = spRoot.getListValue(Arrays.asList(TAG_HomeOIList).iterator());
- if (homeOIListNode != null) {
- for (OMANode homeOIRoot : homeOIListNode.getChildren()) {
- String homeOI = homeOIRoot.getChild(TAG_HomeOI).getValue();
- if (Boolean.parseBoolean(homeOIRoot.getChild(TAG_HomeOIRequired).getValue())) {
- matchAllOIs.add(Long.parseLong(homeOI, 16));
- } else {
- matchAnyOIs.add(Long.parseLong(homeOI, 16));
- }
- }
- }
-
- Set<String> otherHomePartners = new HashSet<>();
- OMANode otherListNode =
- spRoot.getListValue(Arrays.asList(TAG_OtherHomePartners).iterator());
- if (otherListNode != null) {
- for (OMANode fqdnNode : otherListNode.getChildren()) {
- otherHomePartners.add(fqdnNode.getChild(TAG_FQDN).getValue());
- }
- }
-
- Credential credential = buildCredential(ppsRoot.getChild(TAG_Credential));
-
- OMANode policyNode = ppsRoot.getChild(TAG_Policy);
- Policy policy = policyNode != null ? new Policy(policyNode) : null;
-
- Map<String, String> aaaTrustRoots;
- OMANode aaaRootNode = ppsRoot.getChild(TAG_AAAServerTrustRoot);
- if (aaaRootNode == null) {
- aaaTrustRoots = null;
- } else {
- aaaTrustRoots = new HashMap<>(aaaRootNode.getChildren().size());
- for (OMANode child : aaaRootNode.getChildren()) {
- aaaTrustRoots.put(getString(child, TAG_CertURL),
- getString(child, TAG_CertSHA256Fingerprint));
- }
- }
-
- OMANode updateNode = ppsRoot.getChild(TAG_SubscriptionUpdate);
- UpdateInfo subscriptionUpdate = updateNode != null ? new UpdateInfo(updateNode) : null;
- OMANode subNode = ppsRoot.getChild(TAG_SubscriptionParameters);
- SubscriptionParameters subscriptionParameters = subNode != null ?
- new SubscriptionParameters(subNode) : null;
-
- return new HomeSP(ssids, fqdn, roamingConsortiums, otherHomePartners,
- matchAnyOIs, matchAllOIs, friendlyName, iconURL, credential,
- policy, getInteger(ppsRoot.getChild(TAG_CredentialPriority), 0),
- aaaTrustRoots, subscriptionUpdate, subscriptionParameters, updateIdentifier);
- }
-
- private static Credential buildCredential(OMANode credNode) throws OMAException {
- long ctime = getTime(credNode.getChild(TAG_CreationDate));
- long expTime = getTime(credNode.getChild(TAG_ExpirationDate));
- String realm = getString(credNode.getChild(TAG_Realm));
- boolean checkAAACert = getBoolean(credNode.getChild(TAG_CheckAAAServerCertStatus));
-
- OMANode unNode = credNode.getChild(TAG_UsernamePassword);
- OMANode certNode = credNode.getChild(TAG_DigitalCertificate);
- OMANode simNode = credNode.getChild(TAG_SIM);
-
- int alternatives = 0;
- alternatives += unNode != null ? 1 : 0;
- alternatives += certNode != null ? 1 : 0;
- alternatives += simNode != null ? 1 : 0;
- if (alternatives != 1) {
- throw new OMAException("Expected exactly one credential type, got " + alternatives);
- }
-
- if (unNode != null) {
- String userName = getString(unNode.getChild(TAG_Username));
- String password = getString(unNode.getChild(TAG_Password));
- boolean machineManaged = getBoolean(unNode.getChild(TAG_MachineManaged));
- String softTokenApp = getString(unNode.getChild(TAG_SoftTokenApp));
- boolean ableToShare = getBoolean(unNode.getChild(TAG_AbleToShare));
-
- OMANode eapMethodNode = unNode.getChild(TAG_EAPMethod);
- int eapID = getInteger(eapMethodNode.getChild(TAG_EAPType));
-
- EAP.EAPMethodID eapMethodID = EAP.mapEAPMethod(eapID);
- if (eapMethodID == null) {
- throw new OMAException("Unknown EAP method: " + eapID);
- }
-
- Long vid = getOptionalInteger(eapMethodNode.getChild(TAG_VendorId));
- Long vtype = getOptionalInteger(eapMethodNode.getChild(TAG_VendorType));
- Long innerEAPType = getOptionalInteger(eapMethodNode.getChild(TAG_InnerEAPType));
- EAP.EAPMethodID innerEAPMethod = null;
- if (innerEAPType != null) {
- innerEAPMethod = EAP.mapEAPMethod(innerEAPType.intValue());
- if (innerEAPMethod == null) {
- throw new OMAException("Bad inner EAP method: " + innerEAPType);
- }
- }
-
- Long innerVid = getOptionalInteger(eapMethodNode.getChild(TAG_InnerVendorID));
- Long innerVtype = getOptionalInteger(eapMethodNode.getChild(TAG_InnerVendorType));
- String innerNonEAPMethod = getString(eapMethodNode.getChild(TAG_InnerMethod));
-
- EAPMethod eapMethod;
- if (innerEAPMethod != null) {
- eapMethod = new EAPMethod(eapMethodID, new InnerAuthEAP(innerEAPMethod));
- } else if (vid != null) {
- eapMethod = new EAPMethod(eapMethodID,
- new ExpandedEAPMethod(EAP.AuthInfoID.ExpandedEAPMethod,
- vid.intValue(), vtype));
- } else if (innerVid != null) {
- eapMethod =
- new EAPMethod(eapMethodID, new ExpandedEAPMethod(EAP.AuthInfoID
- .ExpandedInnerEAPMethod, innerVid.intValue(), innerVtype));
- } else if (innerNonEAPMethod != null) {
- eapMethod = new EAPMethod(eapMethodID, new NonEAPInnerAuth(innerNonEAPMethod));
- } else {
- throw new OMAException("Incomplete set of EAP parameters");
- }
-
- return new Credential(ctime, expTime, realm, checkAAACert, eapMethod, userName,
- password, machineManaged, softTokenApp, ableToShare);
- }
- if (certNode != null) {
- try {
- String certTypeString = getString(certNode.getChild(TAG_CertificateType));
- byte[] fingerPrint = getOctets(certNode.getChild(TAG_CertSHA256Fingerprint));
-
- EAPMethod eapMethod = new EAPMethod(EAP.EAPMethodID.EAP_TLS, null);
-
- return new Credential(ctime, expTime, realm, checkAAACert, eapMethod,
- Credential.mapCertType(certTypeString), fingerPrint);
- } catch (NumberFormatException nfe) {
- throw new OMAException("Bad hex string: " + nfe.toString());
- }
- }
- if (simNode != null) {
- try {
- IMSIParameter imsi = new IMSIParameter(getString(simNode.getChild(TAG_IMSI)));
-
- EAPMethod eapMethod =
- new EAPMethod(EAP.mapEAPMethod(getInteger(simNode.getChild(TAG_EAPType))),
- null);
-
- return new Credential(ctime, expTime, realm, checkAAACert, eapMethod, imsi);
- } catch (IOException ioe) {
- throw new OMAException("Failed to parse IMSI: " + ioe);
- }
- }
- throw new OMAException("Missing credential parameters");
- }
-
- public static OMANode getChild(OMANode node, String key) throws OMAException {
- OMANode child = node.getChild(key);
- if (child == null) {
- throw new OMAException("No such node: " + key);
- }
- return child;
- }
-
- public static String getString(OMANode node, String key) throws OMAException {
- OMANode child = node.getChild(key);
- if (child == null) {
- throw new OMAException("Missing value for " + key);
- } else if (!child.isLeaf()) {
- throw new OMAException(key + " is not a leaf node");
- }
- return child.getValue();
- }
-
- public static long getLong(OMANode node, String key, Long dflt) throws OMAException {
- OMANode child = node.getChild(key);
- if (child == null) {
- if (dflt != null) {
- return dflt;
- } else {
- throw new OMAException("Missing value for " + key);
- }
- } else {
- if (!child.isLeaf()) {
- throw new OMAException(key + " is not a leaf node");
- }
- String value = child.getValue();
- try {
- long result = Long.parseLong(value);
- if (result < 0) {
- throw new OMAException("Negative value for " + key);
- }
- return result;
- } catch (NumberFormatException nfe) {
- throw new OMAException("Value for " + key + " is non-numeric: " + value);
- }
- }
- }
-
- public static <T> T getSelection(OMANode node, String key) throws OMAException {
- OMANode child = node.getChild(key);
- if (child == null) {
- throw new OMAException("Missing value for " + key);
- } else if (!child.isLeaf()) {
- throw new OMAException(key + " is not a leaf node");
- }
- return getSelection(key, child.getValue());
- }
-
- public static <T> T getSelection(String key, String value) throws OMAException {
- if (value == null) {
- throw new OMAException("No value for " + key);
- }
- Map<String, Object> kvp = sSelectionMap.get(key);
- T result = (T) kvp.get(value.toLowerCase());
- if (result == null) {
- throw new OMAException("Invalid value '" + value + "' for " + key);
- }
- return result;
- }
-
- private static boolean getBoolean(OMANode boolNode) {
- return boolNode != null && Boolean.parseBoolean(boolNode.getValue());
- }
-
- public static String getString(OMANode stringNode) {
- return stringNode != null ? stringNode.getValue() : null;
- }
-
- private static int getInteger(OMANode intNode, int dflt) throws OMAException {
- if (intNode == null) {
- return dflt;
- }
- return getInteger(intNode);
- }
-
- private static int getInteger(OMANode intNode) throws OMAException {
- if (intNode == null) {
- throw new OMAException("Missing integer value");
- }
- try {
- return Integer.parseInt(intNode.getValue());
- } catch (NumberFormatException nfe) {
- throw new OMAException("Invalid integer: " + intNode.getValue());
- }
- }
-
- private static Long getMac(OMANode macNode) throws OMAException {
- if (macNode == null) {
- return null;
- }
- try {
- return Long.parseLong(macNode.getValue(), 16);
- } catch (NumberFormatException nfe) {
- throw new OMAException("Invalid MAC: " + macNode.getValue());
- }
- }
-
- private static Long getOptionalInteger(OMANode intNode) throws OMAException {
- if (intNode == null) {
- return null;
- }
- try {
- return Long.parseLong(intNode.getValue());
- } catch (NumberFormatException nfe) {
- throw new OMAException("Invalid integer: " + intNode.getValue());
- }
- }
-
- public static long getTime(OMANode timeNode) throws OMAException {
- if (timeNode == null) {
- return Utils.UNSET_TIME;
- }
- String timeText = timeNode.getValue();
- try {
- Date date = DTFormat.parse(timeText);
- return date.getTime();
- } catch (ParseException pe) {
- throw new OMAException("Badly formatted time: " + timeText);
- }
- }
-
- private static byte[] getOctets(OMANode octetNode) throws OMAException {
- if (octetNode == null) {
- throw new OMAException("Missing byte value");
- }
- return Utils.hexToBytes(octetNode.getValue());
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/MOTree.java b/packages/Osu/src/com/android/hotspot2/omadm/MOTree.java
deleted file mode 100644
index 0c5ce40..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/MOTree.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-public class MOTree {
- public static final String MgmtTreeTag = "MgmtTree";
-
- public static final String NodeTag = "Node";
- public static final String NodeNameTag = "NodeName";
- public static final String PathTag = "Path";
- public static final String ValueTag = "Value";
- public static final String RTPropTag = "RTProperties";
- public static final String TypeTag = "Type";
- public static final String DDFNameTag = "DDFName";
-
- private final String mUrn;
- private final String mDtdRev;
- private final OMAConstructed mRoot;
-
- public MOTree(XMLNode node, String urn) throws IOException, SAXException {
- Iterator<XMLNode> children = node.getChildren().iterator();
-
- String dtdRev = null;
-
- while (children.hasNext()) {
- XMLNode child = children.next();
- if (child.getTag().equals(OMAConstants.SyncMLVersionTag)) {
- dtdRev = child.getText();
- children.remove();
- break;
- }
- }
-
- mUrn = urn;
- mDtdRev = dtdRev;
-
- mRoot = new MgmtTreeRoot(node, dtdRev);
-
- for (XMLNode child : node.getChildren()) {
- buildNode(mRoot, child);
- }
- }
-
- public MOTree(String urn, String rev, OMAConstructed root) throws IOException {
- mUrn = urn;
- mDtdRev = rev;
- mRoot = root;
- }
-
- public static MOTree buildMgmtTree(String urn, String rev, OMAConstructed root)
- throws IOException {
- OMAConstructed realRoot;
- switch (urn) {
- case OMAConstants.PPS_URN:
- case OMAConstants.DevInfoURN:
- case OMAConstants.DevDetailURN:
- case OMAConstants.DevDetailXURN:
- realRoot = new MgmtTreeRoot(OMAConstants.OMAVersion);
- realRoot.addChild(root);
- return new MOTree(urn, rev, realRoot);
- default:
- return new MOTree(urn, rev, root);
- }
- }
-
- public static boolean hasMgmtTreeTag(String text) {
- for (int n = 0; n < text.length(); n++) {
- char ch = text.charAt(n);
- if (ch > ' ') {
- return text.regionMatches(true, n, '<' + MgmtTreeTag + '>',
- 0, MgmtTreeTag.length() + 2);
- }
- }
- return false;
- }
-
- private static class NodeData {
- private final String mName;
- private String mPath;
- private String mValue;
-
- private NodeData(String name) {
- mName = name;
- }
-
- private void setPath(String path) {
- mPath = path;
- }
-
- private void setValue(String value) {
- mValue = value;
- }
-
- public String getName() {
- return mName;
- }
-
- public String getPath() {
- return mPath;
- }
-
- public String getValue() {
- return mValue;
- }
- }
-
- private static void buildNode(OMANode parent, XMLNode node) throws IOException {
- if (!node.getTag().equals(NodeTag))
- throw new IOException("Node is a '" + node.getTag() + "' instead of a 'Node'");
-
- Map<String, XMLNode> checkMap = new HashMap<>(3);
- String context = null;
- List<NodeData> values = new ArrayList<>();
- List<XMLNode> children = new ArrayList<>();
-
- NodeData curValue = null;
-
- for (XMLNode child : node.getChildren()) {
- XMLNode old = checkMap.put(child.getTag(), child);
-
- switch (child.getTag()) {
- case NodeNameTag:
- if (curValue != null)
- throw new IOException(NodeNameTag + " not expected");
- curValue = new NodeData(child.getText());
-
- break;
- case PathTag:
- if (curValue == null || curValue.getPath() != null)
- throw new IOException(PathTag + " not expected");
- curValue.setPath(child.getText());
-
- break;
- case ValueTag:
- if (!children.isEmpty())
- throw new IOException(ValueTag + " in constructed node");
- if (curValue == null || curValue.getValue() != null)
- throw new IOException(ValueTag + " not expected");
- curValue.setValue(child.getText());
- values.add(curValue);
- curValue = null;
-
- break;
- case RTPropTag:
- if (old != null)
- throw new IOException("Duplicate " + RTPropTag);
- XMLNode typeNode = getNextNode(child, TypeTag);
- XMLNode ddfName = getNextNode(typeNode, DDFNameTag);
- context = ddfName.getText();
- if (context == null)
- throw new IOException("No text in " + DDFNameTag);
-
- break;
- case NodeTag:
- if (!values.isEmpty())
- throw new IOException("Scalar node " + node.getText() + " has Node child");
- children.add(child);
-
- break;
- }
- }
-
- if (values.isEmpty()) {
- if (curValue == null)
- throw new IOException("Missing name");
-
- OMANode subNode = parent.addChild(curValue.getName(),
- context, null, curValue.getPath());
-
- for (XMLNode child : children) {
- buildNode(subNode, child);
- }
- } else {
- if (!children.isEmpty())
- throw new IOException("Got both sub nodes and value(s)");
-
- for (NodeData nodeData : values) {
- parent.addChild(nodeData.getName(), context,
- nodeData.getValue(), nodeData.getPath());
- }
- }
- }
-
- private static XMLNode getNextNode(XMLNode node, String tag) throws IOException {
- if (node == null)
- throw new IOException("No node for " + tag);
- if (node.getChildren().size() != 1)
- throw new IOException("Expected " + node.getTag() + " to have exactly one child");
- XMLNode child = node.getChildren().iterator().next();
- if (!child.getTag().equals(tag))
- throw new IOException("Expected " + node.getTag() + " to have child '" + tag +
- "' instead of '" + child.getTag() + "'");
- return child;
- }
-
- public String getUrn() {
- return mUrn;
- }
-
- public String getDtdRev() {
- return mDtdRev;
- }
-
- public OMAConstructed getRoot() {
- return mRoot;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("MO Tree v").append(mDtdRev).append(", urn ").append(mUrn).append(")\n");
- sb.append(mRoot);
-
- return sb.toString();
- }
-
- public void marshal(OutputStream out) throws IOException {
- out.write("tree ".getBytes(StandardCharsets.UTF_8));
- OMAConstants.serializeString(mDtdRev, out);
- out.write(String.format("(%s)\n", mUrn).getBytes(StandardCharsets.UTF_8));
- mRoot.marshal(out, 0);
- }
-
- public static MOTree unmarshal(InputStream in) throws IOException {
- boolean strip = true;
- StringBuilder tree = new StringBuilder();
- for (; ; ) {
- int octet = in.read();
- if (octet < 0) {
- return null;
- } else if (octet > ' ') {
- tree.append((char) octet);
- strip = false;
- } else if (!strip) {
- break;
- }
- }
- if (!tree.toString().equals("tree")) {
- throw new IOException("Not a tree: " + tree);
- }
-
- String version = OMAConstants.deserializeString(in);
- int next = in.read();
- if (next != '(') {
- throw new IOException("Expected URN in tree definition");
- }
- String urn = OMAConstants.readURN(in);
-
- OMAConstructed root = OMANode.unmarshal(in);
-
- return new MOTree(urn, version, root);
- }
-
- public String toXml() {
- StringBuilder sb = new StringBuilder();
- mRoot.toXml(sb);
- return sb.toString();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/MgmtTreeRoot.java b/packages/Osu/src/com/android/hotspot2/omadm/MgmtTreeRoot.java
deleted file mode 100644
index 9416140..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/MgmtTreeRoot.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import java.util.Map;
-
-public class MgmtTreeRoot extends OMAConstructed {
- private final String mDtdRev;
-
- public MgmtTreeRoot(XMLNode node, String dtdRev) {
- super(null, MOTree.MgmtTreeTag, null, new MultiValueMap<OMANode>(),
- node.getTextualAttributes());
- mDtdRev = dtdRev;
- }
-
- public MgmtTreeRoot(String dtdRev) {
- super(null, MOTree.MgmtTreeTag, null, "xmlns", OMAConstants.SyncML);
- mDtdRev = dtdRev;
- }
-
- @Override
- public void toXml(StringBuilder sb) {
- sb.append('<').append(MOTree.MgmtTreeTag);
- if (getAttributes() != null && !getAttributes().isEmpty()) {
- for (Map.Entry<String, String> avp : getAttributes().entrySet()) {
- sb.append(' ').append(avp.getKey()).append("=\"")
- .append(avp.getValue()).append('"');
- }
- }
- sb.append(">\n");
-
- sb.append('<').append(OMAConstants.SyncMLVersionTag).append('>').append(mDtdRev)
- .append("</").append(OMAConstants.SyncMLVersionTag).append(">\n");
- for (OMANode child : getChildren()) {
- child.toXml(sb);
- }
- sb.append("</").append(MOTree.MgmtTreeTag).append(">\n");
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/MultiValueMap.java b/packages/Osu/src/com/android/hotspot2/omadm/MultiValueMap.java
deleted file mode 100644
index ead0dbc..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/MultiValueMap.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public class MultiValueMap<T> {
- private final Map<String, ArrayList<T>> mMap = new LinkedHashMap<>();
-
- public void put(String key, T value) {
- key = key.toLowerCase();
- ArrayList<T> values = mMap.get(key);
- if (values == null) {
- values = new ArrayList<>();
- mMap.put(key, values);
- }
- values.add(value);
- }
-
- public T get(String key) {
- key = key.toLowerCase();
- List<T> values = mMap.get(key);
- if (values == null) {
- return null;
- } else if (values.size() == 1) {
- return values.get(0);
- } else {
- throw new IllegalArgumentException("Cannot do get on multi-value");
- }
- }
-
- public T replace(String key, T oldValue, T newValue) {
- key = key.toLowerCase();
- List<T> values = mMap.get(key);
- if (values == null) {
- return null;
- }
-
- for (int n = 0; n < values.size(); n++) {
- T value = values.get(n);
- if (value == oldValue) {
- values.set(n, newValue);
- return value;
- }
- }
- return null;
- }
-
- public T remove(String key, T value) {
- key = key.toLowerCase();
- List<T> values = mMap.get(key);
- if (values == null) {
- return null;
- }
-
- T result = null;
- Iterator<T> valueIterator = values.iterator();
- while (valueIterator.hasNext()) {
- if (valueIterator.next() == value) {
- valueIterator.remove();
- result = value;
- break;
- }
- }
- if (values.isEmpty()) {
- mMap.remove(key);
- }
- return result;
- }
-
- public T remove(T value) {
- T result = null;
- Iterator<Map.Entry<String, ArrayList<T>>> iterator = mMap.entrySet().iterator();
- while (iterator.hasNext()) {
- ArrayList<T> values = iterator.next().getValue();
- Iterator<T> valueIterator = values.iterator();
- while (valueIterator.hasNext()) {
- if (valueIterator.next() == value) {
- valueIterator.remove();
- result = value;
- break;
- }
- }
- if (result != null) {
- if (values.isEmpty()) {
- iterator.remove();
- }
- break;
- }
- }
- return result;
- }
-
- public Collection<T> values() {
- List<T> allValues = new ArrayList<>(mMap.size());
- for (List<T> values : mMap.values()) {
- for (T value : values) {
- allValues.add(value);
- }
- }
- return allValues;
- }
-
- public T getSingletonValue() {
- if (mMap.size() != 1) {
- throw new IllegalArgumentException("Map is not a single entry map");
- }
- List<T> values = mMap.values().iterator().next();
- if (values.size() != 1) {
- throw new IllegalArgumentException("Map is not a single entry map");
- }
- return values.iterator().next();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/NodeAttribute.java b/packages/Osu/src/com/android/hotspot2/omadm/NodeAttribute.java
deleted file mode 100644
index e4a08b3..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/NodeAttribute.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.android.hotspot2.omadm;
-
-public class NodeAttribute {
- private final String mName;
- private final String mType;
- private final String mValue;
-
- public NodeAttribute(String name, String type, String value) {
- mName = name;
- mType = type;
- mValue = value;
- }
-
- public String getName() {
- return mName;
- }
-
- public String getValue() {
- return mValue;
- }
-
- public String getType() {
- return mType;
- }
-
- @Override
- public String toString() {
- return String.format("%s (%s) = '%s'", mName, mType, mValue);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/OMAConstants.java b/packages/Osu/src/com/android/hotspot2/omadm/OMAConstants.java
deleted file mode 100644
index 92d8ed7..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/OMAConstants.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import com.android.hotspot2.osu.OSUError;
-import com.android.hotspot2.osu.OSUStatus;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-
-public class OMAConstants {
- private OMAConstants() {
- }
-
- public static final String MOVersion = "1.0";
- public static final String PPS_URN = "urn:wfa:mo:hotspot2dot0-perprovidersubscription:1.0";
- public static final String DevInfoURN = "urn:oma:mo:oma-dm-devinfo:1.0";
- public static final String DevDetailURN = "urn:oma:mo:oma-dm-devdetail:1.0";
- public static final String DevDetailXURN = "urn:wfa:mo-ext:hotspot2dot0-devdetail-ext:1.0";
-
- public static final String[] SupportedMO_URNs = {
- PPS_URN, DevInfoURN, DevDetailURN, DevDetailXURN
- };
-
- public static final String SppMOAttribute = "spp:moURN";
- public static final String TAG_PostDevData = "spp:sppPostDevData";
- public static final String TAG_SupportedVersions = "spp:supportedSPPVersions";
- public static final String TAG_SupportedMOs = "spp:supportedMOList";
- public static final String TAG_UpdateResponse = "spp:sppUpdateResponse";
- public static final String TAG_MOContainer = "spp:moContainer";
- public static final String TAG_Version = "spp:sppVersion";
-
- public static final String TAG_SessionID = "spp:sessionID";
- public static final String TAG_Status = "spp:sppStatus";
- public static final String TAG_Error = "spp:sppError";
-
- public static final String SyncMLVersionTag = "VerDTD";
- public static final String OMAVersion = "1.2";
- public static final String SyncML = "syncml:dmddf1.2";
-
- private static final byte[] INDENT = new byte[1024];
-
- private static final Map<OSUStatus, String> sStatusStrings = new EnumMap<>(OSUStatus.class);
- private static final Map<String, OSUStatus> sStatusEnums = new HashMap<>();
- private static final Map<OSUError, String> sErrorStrings = new EnumMap<>(OSUError.class);
- private static final Map<String, OSUError> sErrorEnums = new HashMap<>();
-
- static {
- sStatusStrings.put(OSUStatus.OK, "OK");
- sStatusStrings.put(OSUStatus.ProvComplete,
- "Provisioning complete, request sppUpdateResponse");
- sStatusStrings.put(OSUStatus.RemediationComplete,
- "Remediation complete, request sppUpdateResponse");
- sStatusStrings.put(OSUStatus.UpdateComplete, "Update complete, request sppUpdateResponse");
- sStatusStrings.put(OSUStatus.ExchangeComplete, "Exchange complete, release TLS connection");
- sStatusStrings.put(OSUStatus.Unknown, "No update available at this time");
- sStatusStrings.put(OSUStatus.Error, "Error occurred");
-
- for (Map.Entry<OSUStatus, String> entry : sStatusStrings.entrySet()) {
- sStatusEnums.put(entry.getValue().toLowerCase(), entry.getKey());
- }
-
- sErrorStrings.put(OSUError.SPPversionNotSupported, "SPP version not supported");
- sErrorStrings.put(OSUError.MOsNotSupported, "One or more mandatory MOs not supported");
- sErrorStrings.put(OSUError.CredentialsFailure,
- "Credentials cannot be provisioned at this time");
- sErrorStrings.put(OSUError.RemediationFailure,
- "Remediation cannot be completed at this time");
- sErrorStrings.put(OSUError.ProvisioningFailed,
- "Provisioning cannot be completed at this time");
- sErrorStrings.put(OSUError.ExistingCertificate, "Continue to use existing certificate");
- sErrorStrings.put(OSUError.CookieInvalid, "Cookie invalid");
- sErrorStrings.put(OSUError.WebSessionID,
- "No corresponding web-browser-connection Session ID");
- sErrorStrings.put(OSUError.PermissionDenied, "Permission denied");
- sErrorStrings.put(OSUError.CommandFailed, "Command failed");
- sErrorStrings.put(OSUError.MOaddOrUpdateFailed, "MO addition or update failed");
- sErrorStrings.put(OSUError.DeviceFull, "Device full");
- sErrorStrings.put(OSUError.BadTreeURI, "Bad management tree URI");
- sErrorStrings.put(OSUError.TooLarge, "Requested entity too large");
- sErrorStrings.put(OSUError.CommandNotAllowed, "Command not allowed");
- sErrorStrings.put(OSUError.UserAborted, "Command not executed due to user");
- sErrorStrings.put(OSUError.NotFound, "Not found");
- sErrorStrings.put(OSUError.Other, "Other");
-
- for (Map.Entry<OSUError, String> entry : sErrorStrings.entrySet()) {
- sErrorEnums.put(entry.getValue().toLowerCase(), entry.getKey());
- }
- Arrays.fill(INDENT, (byte) ' ');
- }
-
- public static String mapStatus(OSUStatus status) {
- return sStatusStrings.get(status);
- }
-
- public static OSUStatus mapStatus(String status) {
- return sStatusEnums.get(status.toLowerCase());
- }
-
- public static String mapError(OSUError error) {
- return sErrorStrings.get(error);
- }
-
- public static OSUError mapError(String error) {
- return sErrorEnums.get(error.toLowerCase());
- }
-
- public static void serializeString(String s, OutputStream out) throws IOException {
- byte[] octets = s.getBytes(StandardCharsets.UTF_8);
- byte[] prefix = String.format("%x:", octets.length).getBytes(StandardCharsets.UTF_8);
- out.write(prefix);
- out.write(octets);
- }
-
- public static void indent(int level, OutputStream out) throws IOException {
- out.write(INDENT, 0, level);
- }
-
- public static String deserializeString(InputStream in) throws IOException {
- StringBuilder prefix = new StringBuilder();
- for (; ; ) {
- byte b = (byte) in.read();
- if (b == '.')
- return null;
- else if (b == ':')
- break;
- else if (b > ' ')
- prefix.append((char) b);
- }
- int length = Integer.parseInt(prefix.toString(), 16);
- byte[] octets = new byte[length];
- int offset = 0;
- while (offset < octets.length) {
- int amount = in.read(octets, offset, octets.length - offset);
- if (amount <= 0)
- throw new EOFException();
- offset += amount;
- }
- return new String(octets, StandardCharsets.UTF_8);
- }
-
- public static String readURN(InputStream in) throws IOException {
- StringBuilder urn = new StringBuilder();
-
- for (; ; ) {
- byte b = (byte) in.read();
- if (b == ')')
- break;
- urn.append((char) b);
- }
- return urn.toString();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/OMAConstructed.java b/packages/Osu/src/com/android/hotspot2/omadm/OMAConstructed.java
deleted file mode 100644
index e5285f2..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/OMAConstructed.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-
-public class OMAConstructed extends OMANode {
- private final MultiValueMap<OMANode> mChildren;
-
- public OMAConstructed(OMAConstructed parent, String name, String context, String... avps) {
- this(parent, name, context, new MultiValueMap<OMANode>(), buildAttributes(avps));
- }
-
- protected OMAConstructed(OMAConstructed parent, String name, String context,
- MultiValueMap<OMANode> children, Map<String, String> avps) {
- super(parent, name, context, avps);
- mChildren = children;
- }
-
- @Override
- public OMANode addChild(String name, String context, String value, String pathString)
- throws IOException {
- if (pathString == null) {
- OMANode child = value != null ?
- new OMAScalar(this, name, context, value) :
- new OMAConstructed(this, name, context);
- mChildren.put(name, child);
- return child;
- } else {
- OMANode target = this;
- while (target.getParent() != null)
- target = target.getParent();
-
- for (String element : pathString.split("/")) {
- target = target.getChild(element);
- if (target == null)
- throw new IOException("No child node '" + element + "' in " + getPathString());
- else if (target.isLeaf())
- throw new IOException("Cannot add child to leaf node: " + getPathString());
- }
- return target.addChild(name, context, value, null);
- }
- }
-
- @Override
- public OMAConstructed reparent(OMAConstructed parent) {
- return new OMAConstructed(parent, getName(), getContext(), mChildren, getAttributes());
- }
-
- public void addChild(OMANode child) {
- mChildren.put(child.getName(), child.reparent(this));
- }
-
- public String getScalarValue(Iterator<String> path) throws OMAException {
- if (!path.hasNext()) {
- throw new OMAException("Path too short for " + getPathString());
- }
- String tag = path.next();
- OMANode child = mChildren.get(tag);
- if (child != null) {
- return child.getScalarValue(path);
- } else {
- return null;
- }
- }
-
- @Override
- public OMANode getListValue(Iterator<String> path) throws OMAException {
- if (!path.hasNext()) {
- return null;
- }
- String tag = path.next();
- OMANode child;
- if (tag.equals("?")) {
- child = mChildren.getSingletonValue();
- } else {
- child = mChildren.get(tag);
- }
-
- if (child == null) {
- return null;
- } else if (path.hasNext()) {
- return child.getListValue(path);
- } else {
- return child;
- }
- }
-
- @Override
- public boolean isLeaf() {
- return false;
- }
-
- @Override
- public Collection<OMANode> getChildren() {
- return Collections.unmodifiableCollection(mChildren.values());
- }
-
- public OMANode getChild(String name) {
- return mChildren.get(name);
- }
-
- public OMANode replaceNode(OMANode oldNode, OMANode newNode) {
- return mChildren.replace(oldNode.getName(), oldNode, newNode);
- }
-
- public OMANode removeNode(String key, OMANode node) {
- if (key.equals("?")) {
- return mChildren.remove(node);
- } else {
- return mChildren.remove(key, node);
- }
- }
-
- @Override
- public String getValue() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void toString(StringBuilder sb, int level) {
- sb.append(getPathString());
- if (getContext() != null) {
- sb.append(" (").append(getContext()).append(')');
- }
- sb.append('\n');
-
- for (OMANode node : mChildren.values()) {
- node.toString(sb, level + 1);
- }
- }
-
- @Override
- public void marshal(OutputStream out, int level) throws IOException {
- OMAConstants.indent(level, out);
- OMAConstants.serializeString(getName(), out);
- if (getContext() != null) {
- out.write(String.format("(%s)", getContext()).getBytes(StandardCharsets.UTF_8));
- }
- out.write(new byte[]{'+', '\n'});
-
- for (OMANode child : mChildren.values()) {
- child.marshal(out, level + 1);
- }
- OMAConstants.indent(level, out);
- out.write(".\n".getBytes(StandardCharsets.UTF_8));
- }
-
- @Override
- public void fillPayload(StringBuilder sb) {
- if (getContext() != null) {
- sb.append('<').append(MOTree.RTPropTag).append(">\n");
- sb.append('<').append(MOTree.TypeTag).append(">\n");
- sb.append('<').append(MOTree.DDFNameTag).append(">");
- sb.append(getContext());
- sb.append("</").append(MOTree.DDFNameTag).append(">\n");
- sb.append("</").append(MOTree.TypeTag).append(">\n");
- sb.append("</").append(MOTree.RTPropTag).append(">\n");
- }
-
- for (OMANode child : getChildren()) {
- child.toXml(sb);
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/OMAException.java b/packages/Osu/src/com/android/hotspot2/omadm/OMAException.java
deleted file mode 100644
index 33a6e37..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/OMAException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import java.io.IOException;
-
-public class OMAException extends IOException {
- public OMAException(String message) {
- super(message);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/OMANode.java b/packages/Osu/src/com/android/hotspot2/omadm/OMANode.java
deleted file mode 100644
index a00f433..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/OMANode.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-public abstract class OMANode {
- private final OMAConstructed mParent;
- private final String mName;
- private final String mContext;
- private final Map<String, String> mAttributes;
-
- protected OMANode(OMAConstructed parent, String name, String context, Map<String, String> avps) {
- mParent = parent;
- mName = name;
- mContext = context;
- mAttributes = avps;
- }
-
- protected static Map<String, String> buildAttributes(String[] avps) {
- if (avps == null) {
- return null;
- }
- Map<String, String> attributes = new HashMap<>();
- for (int n = 0; n < avps.length; n += 2) {
- attributes.put(avps[n], avps[n + 1]);
- }
- return attributes;
- }
-
- protected Map<String, String> getAttributes() {
- return mAttributes;
- }
-
- public OMAConstructed getParent() {
- return mParent;
- }
-
- public String getName() {
- return mName;
- }
-
- public String getContext() {
- return mContext;
- }
-
- public List<String> getPath() {
- LinkedList<String> path = new LinkedList<>();
- for (OMANode node = this; node != null; node = node.getParent()) {
- path.addFirst(node.getName());
- }
- return path;
- }
-
- public String getPathString() {
- StringBuilder sb = new StringBuilder();
- for (String element : getPath()) {
- sb.append('/').append(element);
- }
- return sb.toString();
- }
-
- public abstract OMANode reparent(OMAConstructed parent);
-
- public abstract String getScalarValue(Iterator<String> path) throws OMAException;
-
- public abstract OMANode getListValue(Iterator<String> path) throws OMAException;
-
- public abstract boolean isLeaf();
-
- public abstract Collection<OMANode> getChildren();
-
- public abstract OMANode getChild(String name) throws OMAException;
-
- public abstract String getValue();
-
- public abstract OMANode addChild(String name, String context, String value, String path)
- throws IOException;
-
- public abstract void marshal(OutputStream out, int level) throws IOException;
-
- public abstract void toString(StringBuilder sb, int level);
-
- public abstract void fillPayload(StringBuilder sb);
-
- public void toXml(StringBuilder sb) {
- sb.append('<').append(MOTree.NodeTag);
- if (mAttributes != null && !mAttributes.isEmpty()) {
- for (Map.Entry<String, String> avp : mAttributes.entrySet()) {
- sb.append(' ').append(avp.getKey()).append("=\"").append(avp.getValue()).append('"');
- }
- }
- sb.append(">\n");
-
- sb.append('<').append(MOTree.NodeNameTag).append('>');
- sb.append(getName());
- sb.append("</").append(MOTree.NodeNameTag).append(">\n");
-
- fillPayload(sb);
-
- sb.append("</").append(MOTree.NodeTag).append(">\n");
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- toString(sb, 0);
- return sb.toString();
- }
-
- public static OMAConstructed unmarshal(InputStream in) throws IOException {
- OMANode node = buildNode(in, null);
- if (node == null || node.isLeaf()) {
- throw new IOException("Bad OMA tree");
- }
- unmarshal(in, (OMAConstructed) node);
- return (OMAConstructed) node;
- }
-
- private static void unmarshal(InputStream in, OMAConstructed parent) throws IOException {
- for (; ; ) {
- OMANode node = buildNode(in, parent);
- if (node == null) {
- return;
- } else if (!node.isLeaf()) {
- unmarshal(in, (OMAConstructed) node);
- }
- }
- }
-
- private static OMANode buildNode(InputStream in, OMAConstructed parent) throws IOException {
- String name = OMAConstants.deserializeString(in);
- if (name == null) {
- return null;
- }
-
- String urn = null;
- int next = in.read();
- if (next == '(') {
- urn = OMAConstants.readURN(in);
- next = in.read();
- }
-
- if (next == '=') {
- String value = OMAConstants.deserializeString(in);
- return parent.addChild(name, urn, value, null);
- } else if (next == '+') {
- if (parent != null) {
- return parent.addChild(name, urn, null, null);
- } else {
- return new OMAConstructed(null, name, urn);
- }
- } else {
- throw new IOException("Parse error: expected = or + after node name");
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/OMAParser.java b/packages/Osu/src/com/android/hotspot2/omadm/OMAParser.java
deleted file mode 100644
index 21cc19a..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/OMAParser.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-/**
- * Parses an OMA-DM XML tree.
- */
-public class OMAParser extends DefaultHandler {
- private XMLNode mRoot;
- private XMLNode mCurrent;
-
- public OMAParser() {
- mRoot = null;
- mCurrent = null;
- }
-
- public MOTree parse(String text, String urn) throws IOException, SAXException {
- try {
- SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
- parser.parse(new InputSource(new StringReader(text)), this);
- return new MOTree(mRoot, urn);
- } catch (ParserConfigurationException pce) {
- throw new SAXException(pce);
- }
- }
-
- @Override
- public void startElement(String uri, String localName, String qName, Attributes attributes)
- throws SAXException {
- XMLNode parent = mCurrent;
-
- mCurrent = new XMLNode(mCurrent, qName, attributes);
-
- if (mRoot == null)
- mRoot = mCurrent;
- else
- parent.addChild(mCurrent);
- }
-
- @Override
- public void endElement(String uri, String localName, String qName) throws SAXException {
- if (!qName.equals(mCurrent.getTag()))
- throw new SAXException("End tag '" + qName + "' doesn't match current node: " +
- mCurrent);
-
- try {
- mCurrent.close();
- } catch (IOException ioe) {
- throw new SAXException("Failed to close element", ioe);
- }
-
- mCurrent = mCurrent.getParent();
- }
-
- @Override
- public void characters(char[] ch, int start, int length) throws SAXException {
- mCurrent.addText(ch, start, length);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/OMAScalar.java b/packages/Osu/src/com/android/hotspot2/omadm/OMAScalar.java
deleted file mode 100644
index a971ac4..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/OMAScalar.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-public class OMAScalar extends OMANode {
- private final String mValue;
-
- public OMAScalar(OMAConstructed parent, String name, String context, String value,
- String ... avps) {
- this(parent, name, context, value, buildAttributes(avps));
- }
-
- public OMAScalar(OMAConstructed parent, String name, String context, String value,
- Map<String, String> avps) {
- super(parent, name, context, avps);
- mValue = value;
- }
-
- @Override
- public OMAScalar reparent(OMAConstructed parent) {
- return new OMAScalar(parent, getName(), getContext(), mValue, getAttributes());
- }
-
- public String getScalarValue(Iterator<String> path) throws OMAException {
- return mValue;
- }
-
- @Override
- public OMANode getListValue(Iterator<String> path) throws OMAException {
- throw new OMAException("Scalar encountered in list path: " + getPathString());
- }
-
- @Override
- public boolean isLeaf() {
- return true;
- }
-
- @Override
- public Collection<OMANode> getChildren() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getValue() {
- return mValue;
- }
-
- @Override
- public OMANode getChild(String name) throws OMAException {
- throw new OMAException("'" + getName() + "' is a scalar node");
- }
-
- @Override
- public OMANode addChild(String name, String context, String value, String path)
- throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void toString(StringBuilder sb, int level) {
- sb.append(getPathString()).append('=').append(mValue);
- if (getContext() != null) {
- sb.append(" (").append(getContext()).append(')');
- }
- sb.append('\n');
- }
-
- @Override
- public void marshal(OutputStream out, int level) throws IOException {
- OMAConstants.indent(level, out);
- OMAConstants.serializeString(getName(), out);
- out.write((byte) '=');
- OMAConstants.serializeString(getValue(), out);
- out.write((byte) '\n');
- }
-
- @Override
- public void fillPayload(StringBuilder sb) {
- sb.append('<').append(MOTree.ValueTag).append('>');
- sb.append(mValue);
- sb.append("</").append(MOTree.ValueTag).append(">\n");
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/omadm/XMLNode.java b/packages/Osu/src/com/android/hotspot2/omadm/XMLNode.java
deleted file mode 100644
index b77c820..0000000
--- a/packages/Osu/src/com/android/hotspot2/omadm/XMLNode.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package com.android.hotspot2.omadm;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class XMLNode {
- private final String mTag;
- private final Map<String, NodeAttribute> mAttributes;
- private final List<XMLNode> mChildren;
- private final XMLNode mParent;
- private MOTree mMO;
- private StringBuilder mTextBuilder;
- private String mText;
-
- private static final String XML_SPECIAL_CHARS = "\"'<>&";
- private static final Set<Character> XML_SPECIAL = new HashSet<>();
- private static final String CDATA_OPEN = "<![CDATA[";
- private static final String CDATA_CLOSE = "]]>";
-
- static {
- for (int n = 0; n < XML_SPECIAL_CHARS.length(); n++) {
- XML_SPECIAL.add(XML_SPECIAL_CHARS.charAt(n));
- }
- }
-
- public XMLNode(XMLNode parent, String tag, Attributes attributes) throws SAXException {
- mTag = tag;
-
- mAttributes = new HashMap<>();
-
- if (attributes.getLength() > 0) {
- for (int n = 0; n < attributes.getLength(); n++)
- mAttributes.put(attributes.getQName(n), new NodeAttribute(attributes.getQName(n),
- attributes.getType(n), attributes.getValue(n)));
- }
-
- mParent = parent;
- mChildren = new ArrayList<>();
-
- mTextBuilder = new StringBuilder();
- }
-
- public XMLNode(XMLNode parent, String tag, Map<String, String> attributes) {
- mTag = tag;
-
- mAttributes = new HashMap<>(attributes == null ? 0 : attributes.size());
-
- if (attributes != null) {
- for (Map.Entry<String, String> entry : attributes.entrySet()) {
- mAttributes.put(entry.getKey(),
- new NodeAttribute(entry.getKey(), "", entry.getValue()));
- }
- }
-
- mParent = parent;
- mChildren = new ArrayList<>();
-
- mTextBuilder = new StringBuilder();
- }
-
- public void setText(String text) {
- mText = text;
- mTextBuilder = null;
- }
-
- public void addText(char[] chs, int start, int length) {
- String s = new String(chs, start, length);
- String trimmed = s.trim();
- if (trimmed.isEmpty())
- return;
-
- if (s.charAt(0) != trimmed.charAt(0))
- mTextBuilder.append(' ');
- mTextBuilder.append(trimmed);
- if (s.charAt(s.length() - 1) != trimmed.charAt(trimmed.length() - 1))
- mTextBuilder.append(' ');
- }
-
- public void addChild(XMLNode child) {
- mChildren.add(child);
- }
-
- public void close() throws IOException, SAXException {
- String text = mTextBuilder.toString().trim();
- StringBuilder filtered = new StringBuilder(text.length());
- for (int n = 0; n < text.length(); n++) {
- char ch = text.charAt(n);
- if (ch >= ' ')
- filtered.append(ch);
- }
-
- mText = filtered.toString();
- mTextBuilder = null;
-
- if (MOTree.hasMgmtTreeTag(mText)) {
- try {
- NodeAttribute urn = mAttributes.get(OMAConstants.SppMOAttribute);
- OMAParser omaParser = new OMAParser();
- mMO = omaParser.parse(mText, urn != null ? urn.getValue() : null);
- } catch (SAXException | IOException e) {
- mMO = null;
- }
- }
- }
-
- public String getTag() {
- return mTag;
- }
-
- public String getNameSpace() throws OMAException {
- String[] nsn = mTag.split(":");
- if (nsn.length != 2) {
- throw new OMAException("Non-namespaced tag: '" + mTag + "'");
- }
- return nsn[0];
- }
-
- public String getStrippedTag() throws OMAException {
- String[] nsn = mTag.split(":");
- if (nsn.length != 2) {
- throw new OMAException("Non-namespaced tag: '" + mTag + "'");
- }
- return nsn[1].toLowerCase();
- }
-
- public XMLNode getSoleChild() throws OMAException {
- if (mChildren.size() != 1) {
- throw new OMAException("Expected exactly one child to " + mTag);
- }
- return mChildren.get(0);
- }
-
- public XMLNode getParent() {
- return mParent;
- }
-
- public String getText() {
- return mText;
- }
-
- public Map<String, NodeAttribute> getAttributes() {
- return Collections.unmodifiableMap(mAttributes);
- }
-
- public Map<String, String> getTextualAttributes() {
- Map<String, String> map = new HashMap<>(mAttributes.size());
- for (Map.Entry<String, NodeAttribute> entry : mAttributes.entrySet()) {
- map.put(entry.getKey(), entry.getValue().getValue());
- }
- return map;
- }
-
- public String getAttributeValue(String name) {
- NodeAttribute nodeAttribute = mAttributes.get(name);
- return nodeAttribute != null ? nodeAttribute.getValue() : null;
- }
-
- public List<XMLNode> getChildren() {
- return mChildren;
- }
-
- public MOTree getMOTree() {
- return mMO;
- }
-
- private void toString(char[] indent, StringBuilder sb) {
- Arrays.fill(indent, ' ');
-
- sb.append(indent).append('<').append(mTag);
- for (Map.Entry<String, NodeAttribute> entry : mAttributes.entrySet()) {
- sb.append(' ').append(entry.getKey()).append("='")
- .append(entry.getValue().getValue()).append('\'');
- }
-
- if (mText != null && !mText.isEmpty()) {
- sb.append('>').append(escapeCdata(mText)).append("</").append(mTag).append(">\n");
- } else if (mChildren.isEmpty()) {
- sb.append("/>\n");
- } else {
- sb.append(">\n");
- char[] subIndent = Arrays.copyOf(indent, indent.length + 2);
- for (XMLNode child : mChildren) {
- child.toString(subIndent, sb);
- }
- sb.append(indent).append("</").append(mTag).append(">\n");
- }
- }
-
- private static String escapeCdata(String text) {
- if (!escapable(text)) {
- return text;
- }
-
- // Any appearance of ]]> in the text must be split into "]]" | "]]>" | <![CDATA[ | ">"
- // i.e. "split the sequence by putting a close CDATA and a new open CDATA before the '>'
- StringBuilder sb = new StringBuilder();
- sb.append(CDATA_OPEN);
- int start = 0;
- for (; ; ) {
- int etoken = text.indexOf(CDATA_CLOSE);
- if (etoken >= 0) {
- sb.append(text.substring(start, etoken + 2)).append(CDATA_CLOSE).append(CDATA_OPEN);
- start = etoken + 2;
- } else {
- if (start < text.length() - 1) {
- sb.append(text.substring(start));
- }
- break;
- }
- }
- sb.append(CDATA_CLOSE);
- return sb.toString();
- }
-
- private static boolean escapable(String s) {
- for (int n = 0; n < s.length(); n++) {
- if (XML_SPECIAL.contains(s.charAt(n))) {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- toString(new char[0], sb);
- return sb.toString();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/ClientKeyManager.java b/packages/Osu/src/com/android/hotspot2/osu/ClientKeyManager.java
deleted file mode 100644
index cfc84bbc..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/ClientKeyManager.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.util.Log;
-
-import com.android.hotspot2.flow.PlatformAdapter;
-import com.android.hotspot2.pps.HomeSP;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.net.ssl.X509KeyManager;
-
-public class ClientKeyManager implements X509KeyManager {
- private final KeyStore mKeyStore;
- private final Map<OSUCertType, String> mAliasMap;
- private final Map<OSUCertType, Object> mTempKeys;
-
- private static final String sTempAlias = "client-alias";
-
- public ClientKeyManager(HomeSP homeSP, KeyStore keyStore) throws IOException {
- mKeyStore = keyStore;
- mAliasMap = new HashMap<>();
- mAliasMap.put(OSUCertType.AAA, PlatformAdapter.CERT_CLT_CA_ALIAS + homeSP.getFQDN());
- mAliasMap.put(OSUCertType.Client, PlatformAdapter.CERT_CLT_CERT_ALIAS + homeSP.getFQDN());
- mAliasMap.put(OSUCertType.PrivateKey, PlatformAdapter.CERT_CLT_KEY_ALIAS + homeSP.getFQDN());
- mTempKeys = new HashMap<>();
- }
-
- public void reloadKeys(Map<OSUCertType, List<X509Certificate>> certs, PrivateKey key)
- throws IOException {
- List<X509Certificate> clientCerts = certs.get(OSUCertType.Client);
- X509Certificate[] certArray = new X509Certificate[clientCerts.size()];
- int n = 0;
- for (X509Certificate cert : clientCerts) {
- certArray[n++] = cert;
- }
- mTempKeys.put(OSUCertType.Client, certArray);
- mTempKeys.put(OSUCertType.PrivateKey, key);
- }
-
- @Override
- public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket) {
- if (mTempKeys.isEmpty()) {
- return mAliasMap.get(OSUCertType.Client);
- } else {
- return sTempAlias;
- }
- }
-
- @Override
- public String[] getClientAliases(String keyType, Principal[] issuers) {
- if (mTempKeys.isEmpty()) {
- String alias = mAliasMap.get(OSUCertType.Client);
- return alias != null ? new String[]{alias} : null;
- } else {
- return new String[]{sTempAlias};
- }
- }
-
- @Override
- public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String[] getServerAliases(String keyType, Principal[] issuers) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public X509Certificate[] getCertificateChain(String alias) {
- if (mTempKeys.isEmpty()) {
- if (!mAliasMap.get(OSUCertType.Client).equals(alias)) {
- Log.w(OSUManager.TAG, "Bad cert alias requested: '" + alias + "'");
- return null;
- }
- try {
- Certificate cert = mKeyStore.getCertificate(alias);
- return new X509Certificate[] {(X509Certificate) cert};
- } catch (KeyStoreException kse) {
- Log.w(OSUManager.TAG, "Failed to retrieve certificates: " + kse);
- return null;
- }
- } else if (sTempAlias.equals(alias)) {
- return (X509Certificate[]) mTempKeys.get(OSUCertType.Client);
- } else {
- Log.w(OSUManager.TAG, "Bad cert alias requested: '" + alias + "'");
- return null;
- }
- }
-
- @Override
- public PrivateKey getPrivateKey(String alias) {
- if (mTempKeys.isEmpty()) {
- if (!mAliasMap.get(OSUCertType.Client).equals(alias)) {
- Log.w(OSUManager.TAG, "Bad key alias requested: '" + alias + "'");
- }
- try {
- return (PrivateKey) mKeyStore.getKey(mAliasMap.get(OSUCertType.PrivateKey), null);
- } catch (GeneralSecurityException gse) {
- Log.w(OSUManager.TAG, "Failed to retrieve private key: " + gse);
- return null;
- }
- } else if (sTempAlias.equals(alias)) {
- return (PrivateKey) mTempKeys.get(OSUCertType.PrivateKey);
- } else {
- Log.w(OSUManager.TAG, "Bad cert alias requested: '" + alias + "'");
- return null;
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/ExchangeCompleteResponse.java b/packages/Osu/src/com/android/hotspot2/osu/ExchangeCompleteResponse.java
deleted file mode 100644
index fe23b5c..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/ExchangeCompleteResponse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.android.hotspot2.osu;
-
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.XMLNode;
-
- /*
- <xsd:element name="sppExchangeComplete">
- <xsd:annotation>
- <xsd:documentation>SOAP method used by SPP server to end session.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="sppError" minOccurs="0"/>
- <xsd:any namespace="##other" maxOccurs="unbounded" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute ref="sppVersion" use="required"/>
- <xsd:attribute ref="sppStatus" use="required"/>
- <xsd:attribute ref="sessionID" use="required"/>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
- */
-
-public class ExchangeCompleteResponse extends OSUResponse {
- public ExchangeCompleteResponse(XMLNode root) throws OMAException {
- super(root, OSUMessageType.ExchangeComplete);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/ExecCommand.java b/packages/Osu/src/com/android/hotspot2/osu/ExecCommand.java
deleted file mode 100644
index 38a3947..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/ExecCommand.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.android.hotspot2.osu;
-
-public enum ExecCommand {Browser, GetCert, UseClientCertTLS, UploadMO}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/HTTPHandler.java b/packages/Osu/src/com/android/hotspot2/osu/HTTPHandler.java
deleted file mode 100644
index 4b583df..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/HTTPHandler.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.util.Log;
-
-import com.android.hotspot2.utils.HTTPMessage;
-import com.android.hotspot2.utils.HTTPRequest;
-import com.android.hotspot2.utils.HTTPResponse;
-
-import com.android.org.conscrypt.OpenSSLSocketImpl;
-
-import org.xml.sax.SAXException;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.Socket;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocket;
-import javax.xml.parsers.ParserConfigurationException;
-
-public class HTTPHandler implements AutoCloseable {
- private final Charset mCharset;
- private final OSUSocketFactory mSocketFactory;
- private Socket mSocket;
- private BufferedOutputStream mOut;
- private BufferedInputStream mIn;
- private final String mUser;
- private final byte[] mPassword;
- private boolean mHTTPAuthPerformed;
- private static final AtomicInteger sSequence = new AtomicInteger();
-
- public HTTPHandler(Charset charset, OSUSocketFactory socketFactory) throws IOException {
- this(charset, socketFactory, null, null);
- }
-
- public HTTPHandler(Charset charset, OSUSocketFactory socketFactory,
- String user, byte[] password) throws IOException {
- mCharset = charset;
- mSocketFactory = socketFactory;
- mSocket = mSocketFactory.createSocket();
- mOut = new BufferedOutputStream(mSocket.getOutputStream());
- mIn = new BufferedInputStream(mSocket.getInputStream());
- mUser = user;
- mPassword = password;
- }
-
- public boolean isHTTPAuthPerformed() {
- return mHTTPAuthPerformed;
- }
-
- public X509Certificate getOSUCertificate(URL osu) throws GeneralSecurityException {
- return mSocketFactory.getOSUCertificate(osu);
- }
-
- public void renegotiate(Map<OSUCertType, List<X509Certificate>> certs, PrivateKey key)
- throws IOException {
- if (!(mSocket instanceof SSLSocket)) {
- throw new IOException("Not a TLS connection");
- }
- if (certs != null) {
- mSocketFactory.reloadKeys(certs, key);
- }
- ((SSLSocket) mSocket).startHandshake();
- }
-
- public byte[] getTLSUnique() throws SSLException {
- if (mSocket instanceof OpenSSLSocketImpl) {
- return ((OpenSSLSocketImpl) mSocket).getChannelId();
- }
- return null;
- }
-
- public OSUResponse exchangeSOAP(URL url, String message) throws IOException {
- HTTPResponse response = exchangeWithRetry(url, message, HTTPMessage.Method.POST,
- HTTPMessage.ContentTypeSOAP);
- if (response.getStatusCode() >= 300) {
- throw new IOException("Bad HTTP status code " + response.getStatusCode());
- }
- try {
- SOAPParser parser = new SOAPParser(response.getPayloadStream());
- return parser.getResponse();
- } catch (ParserConfigurationException | SAXException e) {
- ByteBuffer x = response.getPayload();
- byte[] b = new byte[x.remaining()];
- x.get(b);
- Log.w("XML", "Bad: '" + new String(b, StandardCharsets.ISO_8859_1));
- throw new IOException(e);
- }
- }
-
- public ByteBuffer exchangeBinary(URL url, String message, String contentType)
- throws IOException {
- HTTPResponse response =
- exchangeWithRetry(url, message, HTTPMessage.Method.POST, contentType);
- return response.getBinaryPayload();
- }
-
- public InputStream doGet(URL url) throws IOException {
- HTTPResponse response = exchangeWithRetry(url, null, HTTPMessage.Method.GET, null);
- return response.getPayloadStream();
- }
-
- public HTTPResponse doGetHTTP(URL url) throws IOException {
- return exchangeWithRetry(url, null, HTTPMessage.Method.GET, null);
- }
-
- private HTTPResponse exchangeWithRetry(URL url, String message, HTTPMessage.Method method,
- String contentType) throws IOException {
- HTTPResponse response = null;
- int retry = 0;
- for (; ; ) {
- try {
- response = httpExchange(url, message, method, contentType);
- break;
- } catch (IOException ioe) {
- close();
- retry++;
- if (retry > 3) {
- break;
- }
- Log.d(OSUManager.TAG, "Failed HTTP exchange, retry " + retry);
- mSocket = mSocketFactory.createSocket();
- mOut = new BufferedOutputStream(mSocket.getOutputStream());
- mIn = new BufferedInputStream(mSocket.getInputStream());
- }
- }
- if (response == null) {
- throw new IOException("Failed to establish connection to peer");
- }
- return response;
- }
-
- private HTTPResponse httpExchange(URL url, String message, HTTPMessage.Method method,
- String contentType)
- throws IOException {
- HTTPRequest request = new HTTPRequest(message, mCharset, method, url, contentType, false);
- request.send(mOut);
- HTTPResponse response = new HTTPResponse(mIn);
- Log.d(OSUManager.TAG, "HTTP code " + response.getStatusCode() + ", user " + mUser +
- ", pw " + (mPassword != null ? '\'' + new String(mPassword) + '\'' : "-"));
- if (response.getStatusCode() == 401) {
- if (mUser == null) {
- throw new IOException("Missing user name for HTTP authentication");
- }
- try {
- request = new HTTPRequest(message, StandardCharsets.ISO_8859_1, method, url,
- contentType, true);
- request.doAuthenticate(response, mUser, mPassword, url,
- sSequence.incrementAndGet());
- request.send(mOut);
- mHTTPAuthPerformed = true;
- } catch (GeneralSecurityException gse) {
- throw new IOException(gse);
- }
-
- response = new HTTPResponse(mIn);
- }
- return response;
- }
-
- public void close() throws IOException {
- mSocket.shutdownInput();
- mSocket.shutdownOutput();
- mSocket.close();
- mIn.close();
- mOut.close();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/IconCache.java b/packages/Osu/src/com/android/hotspot2/osu/IconCache.java
deleted file mode 100644
index bd8a018..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/IconCache.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.util.Log;
-
-import com.android.anqp.HSIconFileElement;
-import com.android.anqp.IconInfo;
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.flow.OSUInfo;
-
-import java.net.ProtocolException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import static com.android.anqp.Constants.ANQPElementType.HSIconFile;
-
-public class IconCache extends Thread {
- // Preferred icon parameters
- private static final Set<String> ICON_TYPES =
- new HashSet<>(Arrays.asList("image/png", "image/jpeg"));
- private static final int ICON_WIDTH = 64;
- private static final int ICON_HEIGHT = 64;
- public static final Locale LOCALE = java.util.Locale.getDefault();
-
- private static final int MAX_RETRY = 3;
- private static final long REQUERY_TIME = 5000L;
- private static final long REQUERY_TIMEOUT = 120000L;
-
- private final OSUManager mOsuManager;
- private final Map<EssKey, Map<String, FileEntry>> mPending;
- private final Map<EssKey, Map<String, HSIconFileElement>> mCache;
-
- private static class EssKey {
- private final int mAnqpDomainId;
- private final long mBssid;
- private final long mHessid;
- private final String mSsid;
-
- private EssKey(OSUInfo osuInfo) {
- mAnqpDomainId = osuInfo.getAnqpDomID();
- mBssid = osuInfo.getBSSID();
- mHessid = osuInfo.getHESSID();
- mSsid = osuInfo.getAdvertisingSsid();
- }
-
- /*
- * ANQP ID 1 ANQP ID 2
- * 0 0 BSSID equality
- * 0 X BSSID equality
- * Y X BSSID equality
- * X X Then:
- *
- * HESSID1 HESSID2
- * 0 0 compare SSIDs
- * 0 X not equal
- * Y X not equal
- * X X equal
- */
-
- @Override
- public boolean equals(Object thatObject) {
- if (this == thatObject) {
- return true;
- }
- if (thatObject == null || getClass() != thatObject.getClass()) {
- return false;
- }
-
- EssKey that = (EssKey) thatObject;
- if (mAnqpDomainId != 0 && mAnqpDomainId == that.mAnqpDomainId) {
- return mHessid == that.mHessid
- && (mHessid != 0 || mSsid.equals(that.mSsid));
- } else {
- return mBssid == that.mBssid;
- }
- }
-
- @Override
- public int hashCode() {
- if (mAnqpDomainId == 0) {
- return (int) (mBssid ^ (mBssid >>> 32));
- } else if (mHessid != 0) {
- return mAnqpDomainId * 31 + (int) (mHessid ^ (mHessid >>> 32));
- } else {
- return mAnqpDomainId * 31 + mSsid.hashCode();
- }
- }
-
- @Override
- public String toString() {
- if (mAnqpDomainId == 0) {
- return String.format("BSS %012x", mBssid);
- } else if (mHessid != 0) {
- return String.format("ESS %012x [%d]", mBssid, mAnqpDomainId);
- } else {
- return String.format("ESS '%s' [%d]", mSsid, mAnqpDomainId);
- }
- }
- }
-
- private static class FileEntry {
- private final String mFileName;
- private int mRetry = 0;
- private final long mTimestamp;
- private final LinkedList<OSUInfo> mQueued;
- private final Set<Long> mBssids;
-
- private FileEntry(OSUInfo osuInfo, String fileName) {
- mFileName = fileName;
- mQueued = new LinkedList<>();
- mBssids = new HashSet<>();
- mQueued.addLast(osuInfo);
- mBssids.add(osuInfo.getBSSID());
- mTimestamp = System.currentTimeMillis();
- }
-
- private void enqueu(OSUInfo osuInfo) {
- mQueued.addLast(osuInfo);
- mBssids.add(osuInfo.getBSSID());
- }
-
- private int update(long bssid, HSIconFileElement iconFileElement) {
- if (!mBssids.contains(bssid)) {
- return 0;
- }
- Log.d(OSUManager.TAG, "Updating icon on " + mQueued.size() + " osus");
- for (OSUInfo osuInfo : mQueued) {
- osuInfo.setIconFileElement(iconFileElement, mFileName);
- }
- return mQueued.size();
- }
-
- private int getAndIncrementRetry() {
- return mRetry++;
- }
-
- private long getTimestamp() {
- return mTimestamp;
- }
-
- public String getFileName() {
- return mFileName;
- }
-
- private long getLastBssid() {
- return mQueued.getLast().getBSSID();
- }
-
- @Override
- public String toString() {
- return String.format("'%s', retry %d, age %d, BSSIDs: %s",
- mFileName, mRetry,
- System.currentTimeMillis() - mTimestamp, Utils.bssidsToString(mBssids));
- }
- }
-
- public IconCache(OSUManager osuManager) {
- mOsuManager = osuManager;
- mPending = new HashMap<>();
- mCache = new HashMap<>();
- }
-
- public int resolveIcons(Collection<OSUInfo> osuInfos) {
- Set<EssKey> current = new HashSet<>();
- int modCount = 0;
- for (OSUInfo osuInfo : osuInfos) {
- EssKey key = new EssKey(osuInfo);
- current.add(key);
-
- if (osuInfo.getIconStatus() == OSUInfo.IconStatus.NotQueried) {
- List<IconInfo> iconInfo =
- osuInfo.getIconInfo(LOCALE, ICON_TYPES, ICON_WIDTH, ICON_HEIGHT);
- if (iconInfo.isEmpty()) {
- osuInfo.setIconStatus(OSUInfo.IconStatus.NotAvailable);
- continue;
- }
-
- String fileName = iconInfo.get(0).getFileName();
- HSIconFileElement iconFileElement = get(key, fileName);
- if (iconFileElement != null) {
- osuInfo.setIconFileElement(iconFileElement, fileName);
- Log.d(OSUManager.TAG, "Icon cache hit for " + osuInfo + "/" + fileName);
- modCount++;
- } else {
- FileEntry fileEntry = enqueue(key, fileName, osuInfo);
- if (fileEntry != null) {
- Log.d(OSUManager.TAG, "Initiating icon query for "
- + osuInfo + "/" + fileName);
- mOsuManager.doIconQuery(osuInfo.getBSSID(), fileName);
- } else {
- Log.d(OSUManager.TAG, "Piggybacking icon query for "
- + osuInfo + "/" + fileName);
- }
- }
- }
- }
-
- // Drop all non-current ESS's
- Iterator<EssKey> pendingKeys = mPending.keySet().iterator();
- while (pendingKeys.hasNext()) {
- EssKey key = pendingKeys.next();
- if (!current.contains(key)) {
- pendingKeys.remove();
- }
- }
- Iterator<EssKey> cacheKeys = mCache.keySet().iterator();
- while (cacheKeys.hasNext()) {
- EssKey key = cacheKeys.next();
- if (!current.contains(key)) {
- cacheKeys.remove();
- }
- }
- return modCount;
- }
-
- public HSIconFileElement getIcon(OSUInfo osuInfo) {
- List<IconInfo> iconInfos = osuInfo.getIconInfo(LOCALE, ICON_TYPES, ICON_WIDTH, ICON_HEIGHT);
- if (iconInfos == null || iconInfos.isEmpty()) {
- return null;
- }
- EssKey key = new EssKey(osuInfo);
- Map<String, HSIconFileElement> fileMap = mCache.get(key);
- return fileMap != null ? fileMap.get(iconInfos.get(0).getFileName()) : null;
- }
-
- public int notifyIconReceived(long bssid, String fileName, byte[] iconData) {
- Log.d(OSUManager.TAG, String.format("Icon '%s':%d received from %012x",
- fileName, iconData != null ? iconData.length : -1, bssid));
- if (fileName == null || iconData == null) {
- return 0;
- }
-
- HSIconFileElement iconFileElement;
- try {
- iconFileElement = new HSIconFileElement(HSIconFile,
- ByteBuffer.wrap(iconData).order(ByteOrder.LITTLE_ENDIAN));
- } catch (ProtocolException | BufferUnderflowException e) {
- Log.e(OSUManager.TAG, "Failed to parse ANQP icon file: " + e);
- return 0;
- }
-
- int updates = 0;
- Iterator<Map.Entry<EssKey, Map<String, FileEntry>>> entries =
- mPending.entrySet().iterator();
-
- while (entries.hasNext()) {
- Map.Entry<EssKey, Map<String, FileEntry>> entry = entries.next();
-
- Map<String, FileEntry> fileMap = entry.getValue();
- FileEntry fileEntry = fileMap.get(fileName);
- updates = fileEntry.update(bssid, iconFileElement);
- if (updates > 0) {
- put(entry.getKey(), fileName, iconFileElement);
- fileMap.remove(fileName);
- if (fileMap.isEmpty()) {
- entries.remove();
- }
- break;
- }
- }
- return updates;
- }
-
- public void tick(boolean wifiOff) {
- if (wifiOff) {
- mPending.clear();
- mCache.clear();
- return;
- }
-
- Iterator<Map.Entry<EssKey, Map<String, FileEntry>>> entries =
- mPending.entrySet().iterator();
-
- long now = System.currentTimeMillis();
- while (entries.hasNext()) {
- Map<String, FileEntry> fileMap = entries.next().getValue();
- Iterator<Map.Entry<String, FileEntry>> fileEntries = fileMap.entrySet().iterator();
- while (fileEntries.hasNext()) {
- FileEntry fileEntry = fileEntries.next().getValue();
- long age = now - fileEntry.getTimestamp();
- if (age > REQUERY_TIMEOUT || fileEntry.getAndIncrementRetry() > MAX_RETRY) {
- fileEntries.remove();
- } else if (age > REQUERY_TIME) {
- mOsuManager.doIconQuery(fileEntry.getLastBssid(), fileEntry.getFileName());
- }
- }
- if (fileMap.isEmpty()) {
- entries.remove();
- }
- }
- }
-
- private HSIconFileElement get(EssKey key, String fileName) {
- Map<String, HSIconFileElement> fileMap = mCache.get(key);
- if (fileMap == null) {
- return null;
- }
- return fileMap.get(fileName);
- }
-
- private void put(EssKey key, String fileName, HSIconFileElement icon) {
- Map<String, HSIconFileElement> fileMap = mCache.get(key);
- if (fileMap == null) {
- fileMap = new HashMap<>();
- mCache.put(key, fileMap);
- }
- fileMap.put(fileName, icon);
- }
-
- private FileEntry enqueue(EssKey key, String fileName, OSUInfo osuInfo) {
- Map<String, FileEntry> entryMap = mPending.get(key);
- if (entryMap == null) {
- entryMap = new HashMap<>();
- mPending.put(key, entryMap);
- }
-
- FileEntry fileEntry = entryMap.get(fileName);
- osuInfo.setIconStatus(OSUInfo.IconStatus.InProgress);
- if (fileEntry == null) {
- fileEntry = new FileEntry(osuInfo, fileName);
- entryMap.put(fileName, fileEntry);
- return fileEntry;
- }
- fileEntry.enqueu(osuInfo);
- return null;
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUCache.java b/packages/Osu/src/com/android/hotspot2/osu/OSUCache.java
deleted file mode 100644
index 260fb72..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUCache.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.net.wifi.AnqpInformationElement;
-import android.net.wifi.ScanResult;
-import android.util.Log;
-
-import com.android.anqp.Constants;
-import com.android.anqp.HSOsuProvidersElement;
-import com.android.anqp.OSUProvider;
-
-import java.net.ProtocolException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * This class holds a stable set of OSU information as well as scan results based on a trail of
- * scan results.
- * The purpose of this class is to provide a stable set of information over a a limited span of
- * time (SCAN_BATCH_HISTORY_SIZE scan batches) so that OSU entries in the selection list does not
- * come and go with temporarily lost scan results.
- * The stable set of scan results are used by the remediation flow to retrieve ANQP information
- * for the current network to determine whether the currently associated network is a roaming
- * network for the Home SP whose timer has currently fired.
- */
-public class OSUCache {
- private static final int SCAN_BATCH_HISTORY_SIZE = 8;
-
- private int mInstant;
- private final Map<OSUProvider, ScanResult> mBatchedOSUs = new HashMap<>();
- private final Map<OSUProvider, ScanInstance> mCache = new HashMap<>();
-
- private static class ScanInstance {
- private final ScanResult mScanResult;
- private int mInstant;
-
- private ScanInstance(ScanResult scanResult, int instant) {
- mScanResult = scanResult;
- mInstant = instant;
- }
-
- public ScanResult getScanResult() {
- return mScanResult;
- }
-
- public int getInstant() {
- return mInstant;
- }
-
- private boolean bssidEqual(ScanResult scanResult) {
- return mScanResult.BSSID.equals(scanResult.BSSID);
- }
-
- private void updateInstant(int newInstant) {
- mInstant = newInstant;
- }
-
- @Override
- public String toString() {
- return mScanResult.SSID + " @ " + mInstant;
- }
- }
-
- public OSUCache() {
- mInstant = 0;
- }
-
- private void clear() {
- mBatchedOSUs.clear();
- }
-
- public void clearAll() {
- clear();
- mCache.clear();
- }
-
- public Map<OSUProvider, ScanResult> pushScanResults(Collection<ScanResult> scanResults) {
- for (ScanResult scanResult : scanResults) {
- AnqpInformationElement[] osuInfo = scanResult.anqpElements;
- if (osuInfo != null && osuInfo.length > 0) {
- Log.d(OSUManager.TAG, scanResult.SSID +
- " has " + osuInfo.length + " ANQP elements");
- putResult(scanResult, osuInfo);
- }
- }
- return scanEnd();
- }
-
- private void putResult(ScanResult scanResult, AnqpInformationElement[] elements) {
- for (AnqpInformationElement ie : elements) {
- Log.d(OSUManager.TAG, String.format("ANQP IE %d vid %x size %d", ie.getElementId(),
- ie.getVendorId(), ie.getPayload().length));
- if (ie.getElementId() == AnqpInformationElement.HS_OSU_PROVIDERS
- && ie.getVendorId() == AnqpInformationElement.HOTSPOT20_VENDOR_ID) {
- try {
- HSOsuProvidersElement providers = new HSOsuProvidersElement(
- Constants.ANQPElementType.HSOSUProviders,
- ByteBuffer.wrap(ie.getPayload()).order(ByteOrder.LITTLE_ENDIAN));
-
- putProviders(scanResult, providers);
- } catch (ProtocolException pe) {
- Log.w(OSUManager.TAG,
- "Failed to parse OSU element: " + pe);
- }
- }
- }
- }
-
- private void putProviders(ScanResult scanResult, HSOsuProvidersElement osuProviders) {
- Log.d(OSUManager.TAG, osuProviders.getProviders().size() + " OSU providers in element");
- for (OSUProvider provider : osuProviders.getProviders()) {
- // Make a predictive put
- ScanResult existing = mBatchedOSUs.put(provider, scanResult);
- if (existing != null && existing.level > scanResult.level) {
- // But undo it if the entry already held a better RSSI
- mBatchedOSUs.put(provider, existing);
- }
- }
- }
-
- private Map<OSUProvider, ScanResult> scanEnd() {
- // Update the trail of OSU Providers:
- int changes = 0;
- Map<OSUProvider, ScanInstance> aged = new HashMap<>(mCache);
- for (Map.Entry<OSUProvider, ScanResult> entry : mBatchedOSUs.entrySet()) {
- ScanInstance current = aged.remove(entry.getKey());
- if (current == null || !current.bssidEqual(entry.getValue())) {
- mCache.put(entry.getKey(), new ScanInstance(entry.getValue(), mInstant));
- changes++;
- if (current == null) {
- Log.d(OSUManager.TAG,
- "Add OSU " + entry.getKey() + " from " + entry.getValue().SSID);
- } else {
- Log.d(OSUManager.TAG, "Update OSU " + entry.getKey() + " with " +
- entry.getValue().SSID + " to " + current);
- }
- } else {
- Log.d(OSUManager.TAG, "Existing OSU " + entry.getKey() + ", "
- + current.getInstant() + " -> " + mInstant);
- current.updateInstant(mInstant);
- }
- }
-
- for (Map.Entry<OSUProvider, ScanInstance> entry : aged.entrySet()) {
- if (mInstant - entry.getValue().getInstant() > SCAN_BATCH_HISTORY_SIZE) {
- Log.d(OSUManager.TAG, "Remove OSU " + entry.getKey() + ", "
- + entry.getValue().getInstant() + " @ " + mInstant);
- mCache.remove(entry.getKey());
- changes++;
- }
- }
-
- mInstant++;
- clear();
-
- // Return the latest results if there were any changes from last batch
- if (changes > 0) {
- Map<OSUProvider, ScanResult> results = new HashMap<>(mCache.size());
- for (Map.Entry<OSUProvider, ScanInstance> entry : mCache.entrySet()) {
- results.put(entry.getKey(), entry.getValue().getScanResult());
- }
- return results;
- } else {
- return null;
- }
- }
-
- private static String toBSSIDStrings(Set<Long> bssids) {
- StringBuilder sb = new StringBuilder();
- for (Long bssid : bssids) {
- sb.append(String.format(" %012x", bssid));
- }
- return sb.toString();
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUCertType.java b/packages/Osu/src/com/android/hotspot2/osu/OSUCertType.java
deleted file mode 100644
index 91d7f72..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUCertType.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.android.hotspot2.osu;
-
-public enum OSUCertType {
- CA,
- Client,
- AAA,
- Remediation,
- Policy,
- PrivateKey
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUClient.java b/packages/Osu/src/com/android/hotspot2/osu/OSUClient.java
deleted file mode 100644
index 8179a63..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUClient.java
+++ /dev/null
@@ -1,540 +0,0 @@
-package com.android.hotspot2.osu;
-
-/*
- * policy-server.r2-testbed IN A 10.123.107.107
- * remediation-server.r2-testbed IN A 10.123.107.107
- * subscription-server.r2-testbed IN A 10.123.107.107
- * www.r2-testbed IN A 10.123.107.107
- * osu-server.r2-testbed-rks IN A 10.123.107.107
- * policy-server.r2-testbed-rks IN A 10.123.107.107
- * remediation-server.r2-testbed-rks IN A 10.123.107.107
- * subscription-server.r2-testbed-rks IN A 10.123.107.107
- */
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Network;
-import android.util.Log;
-
-import com.android.hotspot2.OMADMAdapter;
-import com.android.hotspot2.est.ESTHandler;
-import com.android.hotspot2.flow.OSUInfo;
-import com.android.hotspot2.flow.PlatformAdapter;
-import com.android.hotspot2.omadm.OMAConstants;
-import com.android.hotspot2.omadm.OMANode;
-import com.android.hotspot2.osu.commands.BrowserURI;
-import com.android.hotspot2.osu.commands.ClientCertInfo;
-import com.android.hotspot2.osu.commands.GetCertData;
-import com.android.hotspot2.osu.commands.MOData;
-import com.android.hotspot2.osu.service.RedirectListener;
-import com.android.hotspot2.pps.Credential;
-import com.android.hotspot2.pps.HomeSP;
-import com.android.hotspot2.pps.UpdateInfo;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.net.ssl.KeyManager;
-
-public class OSUClient {
- private static final String TAG = "OSUCLT";
-
- private final OSUInfo mOSUInfo;
- private final URL mURL;
- private final KeyStore mKeyStore;
- private final Context mContext;
- private volatile HTTPHandler mHTTPHandler;
- private volatile RedirectListener mRedirectListener;
-
- public OSUClient(OSUInfo osuInfo, KeyStore ks, Context context) throws MalformedURLException {
- mOSUInfo = osuInfo;
- mURL = new URL(osuInfo.getOSUProvider().getOSUServer());
- mKeyStore = ks;
- mContext = context;
- }
-
- public OSUClient(String osu, KeyStore ks, Context context) throws MalformedURLException {
- mOSUInfo = null;
- mURL = new URL(osu);
- mKeyStore = ks;
- mContext = context;
- }
-
- public OSUInfo getOSUInfo() {
- return mOSUInfo;
- }
-
- public void provision(PlatformAdapter platformAdapter, Network network, KeyManager km)
- throws IOException, GeneralSecurityException {
- try (HTTPHandler httpHandler = new HTTPHandler(StandardCharsets.UTF_8,
- OSUSocketFactory.getSocketFactory(mKeyStore, null,
- OSUFlowManager.FlowType.Provisioning, network, mURL, km, true))) {
-
- mHTTPHandler = httpHandler;
-
- SPVerifier spVerifier = new SPVerifier(mOSUInfo);
- spVerifier.verify(httpHandler.getOSUCertificate(mURL));
-
- URL redirectURL = prepareUserInput(platformAdapter,
- mOSUInfo.getName(Locale.getDefault()));
- OMADMAdapter omadmAdapter = getOMADMAdapter();
-
- String regRequest = SOAPBuilder.buildPostDevDataResponse(RequestReason.SubRegistration,
- null,
- redirectURL.toString(),
- omadmAdapter.getMO(OMAConstants.DevInfoURN),
- omadmAdapter.getMO(OMAConstants.DevDetailURN));
- Log.d(TAG, "Registration request: " + regRequest);
- OSUResponse osuResponse = httpHandler.exchangeSOAP(mURL, regRequest);
-
- Log.d(TAG, "Response: " + osuResponse);
- if (osuResponse.getMessageType() != OSUMessageType.PostDevData) {
- throw new IOException("Expected a PostDevDataResponse");
- }
- PostDevDataResponse regResponse = (PostDevDataResponse) osuResponse;
- String sessionID = regResponse.getSessionID();
- if (regResponse.getExecCommand() == ExecCommand.UseClientCertTLS) {
- ClientCertInfo ccInfo = (ClientCertInfo) regResponse.getCommandData();
- if (ccInfo.doesAcceptMfgCerts()) {
- throw new IOException("Mfg certs are not supported in Android");
- } else if (ccInfo.doesAcceptProviderCerts()) {
- ((WiFiKeyManager) km).enableClientAuth(ccInfo.getIssuerNames());
- httpHandler.renegotiate(null, null);
- } else {
- throw new IOException("Neither manufacturer nor provider cert specified");
- }
- regRequest = SOAPBuilder.buildPostDevDataResponse(RequestReason.SubRegistration,
- sessionID,
- redirectURL.toString(),
- omadmAdapter.getMO(OMAConstants.DevInfoURN),
- omadmAdapter.getMO(OMAConstants.DevDetailURN));
-
- osuResponse = httpHandler.exchangeSOAP(mURL, regRequest);
- if (osuResponse.getMessageType() != OSUMessageType.PostDevData) {
- throw new IOException("Expected a PostDevDataResponse");
- }
- regResponse = (PostDevDataResponse) osuResponse;
- }
-
- if (regResponse.getExecCommand() != ExecCommand.Browser) {
- throw new IOException("Expected a launchBrowser command");
- }
- Log.d(TAG, "Exec: " + regResponse.getExecCommand() + ", for '" +
- regResponse.getCommandData() + "'");
-
- if (!osuResponse.getSessionID().equals(sessionID)) {
- throw new IOException("Mismatching session IDs");
- }
- String webURL = ((BrowserURI) regResponse.getCommandData()).getURI();
-
- if (webURL == null) {
- throw new IOException("No web-url");
- } else if (!webURL.contains(sessionID)) {
- throw new IOException("Bad or missing session ID in webURL");
- }
-
- if (!startUserInput(new URL(webURL), network)) {
- throw new IOException("User session failed");
- }
-
- Log.d(TAG, " -- Sending user input complete:");
- String userComplete = SOAPBuilder.buildPostDevDataResponse(RequestReason.InputComplete,
- sessionID, null,
- omadmAdapter.getMO(OMAConstants.DevInfoURN),
- omadmAdapter.getMO(OMAConstants.DevDetailURN));
- OSUResponse moResponse1 = httpHandler.exchangeSOAP(mURL, userComplete);
- if (moResponse1.getMessageType() != OSUMessageType.PostDevData) {
- throw new IOException("Bad user input complete response: " + moResponse1);
- }
- PostDevDataResponse provResponse = (PostDevDataResponse) moResponse1;
- GetCertData estData = checkResponse(provResponse);
-
- Map<OSUCertType, List<X509Certificate>> certs = new HashMap<>();
- PrivateKey clientKey = null;
-
- MOData moData;
- if (estData == null) {
- moData = (MOData) provResponse.getCommandData();
- } else {
- try (ESTHandler estHandler = new ESTHandler((GetCertData) provResponse.
- getCommandData(), network, getOMADMAdapter(),
- km, mKeyStore, null, OSUFlowManager.FlowType.Provisioning)) {
- estHandler.execute(false);
- certs.put(OSUCertType.CA, estHandler.getCACerts());
- certs.put(OSUCertType.Client, estHandler.getClientCerts());
- clientKey = estHandler.getClientKey();
- }
-
- Log.d(TAG, " -- Sending provisioning cert enrollment complete:");
- String certComplete =
- SOAPBuilder.buildPostDevDataResponse(RequestReason.CertEnrollmentComplete,
- sessionID, null,
- omadmAdapter.getMO(OMAConstants.DevInfoURN),
- omadmAdapter.getMO(OMAConstants.DevDetailURN));
- OSUResponse moResponse2 = httpHandler.exchangeSOAP(mURL, certComplete);
- if (moResponse2.getMessageType() != OSUMessageType.PostDevData) {
- throw new IOException("Bad cert enrollment complete response: " + moResponse2);
- }
- PostDevDataResponse provComplete = (PostDevDataResponse) moResponse2;
- if (provComplete.getStatus() != OSUStatus.ProvComplete ||
- provComplete.getOSUCommand() != OSUCommandID.AddMO) {
- throw new IOException("Expected addMO: " + provComplete);
- }
- moData = (MOData) provComplete.getCommandData();
- }
-
- // !!! How can an ExchangeComplete be sent w/o knowing the fate of the certs???
- String updateResponse = SOAPBuilder.buildUpdateResponse(sessionID, null);
- Log.d(TAG, " -- Sending updateResponse:");
- OSUResponse exComplete = httpHandler.exchangeSOAP(mURL, updateResponse);
- Log.d(TAG, "exComplete response: " + exComplete);
- if (exComplete.getMessageType() != OSUMessageType.ExchangeComplete) {
- throw new IOException("Expected ExchangeComplete: " + exComplete);
- } else if (exComplete.getStatus() != OSUStatus.ExchangeComplete) {
- throw new IOException("Bad ExchangeComplete status: " + exComplete);
- }
-
- retrieveCerts(moData.getMOTree().getRoot(), certs, network, km, mKeyStore);
- platformAdapter.provisioningComplete(mOSUInfo, moData, certs, clientKey, network);
- }
- }
-
- public void remediate(PlatformAdapter platformAdapter, Network network, KeyManager km,
- HomeSP homeSP, OSUFlowManager.FlowType flowType)
- throws IOException, GeneralSecurityException {
- try (HTTPHandler httpHandler = createHandler(network, homeSP, km, flowType)) {
-
- mHTTPHandler = httpHandler;
-
- URL redirectURL = prepareUserInput(platformAdapter, homeSP.getFriendlyName());
- OMADMAdapter omadmAdapter = getOMADMAdapter();
-
- String regRequest = SOAPBuilder.buildPostDevDataResponse(RequestReason.SubRemediation,
- null,
- redirectURL.toString(),
- omadmAdapter.getMO(OMAConstants.DevInfoURN),
- omadmAdapter.getMO(OMAConstants.DevDetailURN));
-
- OSUResponse serverResponse = httpHandler.exchangeSOAP(mURL, regRequest);
- if (serverResponse.getMessageType() != OSUMessageType.PostDevData) {
- throw new IOException("Expected a PostDevDataResponse");
- }
- String sessionID = serverResponse.getSessionID();
-
- PostDevDataResponse pddResponse = (PostDevDataResponse) serverResponse;
- Log.d(TAG, "Remediation response: " + pddResponse);
-
- Map<OSUCertType, List<X509Certificate>> certs = null;
- PrivateKey clientKey = null;
-
- if (pddResponse.getStatus() != OSUStatus.RemediationComplete) {
- if (pddResponse.getExecCommand() == ExecCommand.UploadMO) {
- String ulMessage = SOAPBuilder.buildPostDevDataResponse(RequestReason.MOUpload,
- null,
- redirectURL.toString(),
- omadmAdapter.getMO(OMAConstants.DevInfoURN),
- omadmAdapter.getMO(OMAConstants.DevDetailURN),
- platformAdapter.getMOTree(homeSP));
-
- Log.d(TAG, "Upload MO: " + ulMessage);
-
- OSUResponse ulResponse = httpHandler.exchangeSOAP(mURL, ulMessage);
- if (ulResponse.getMessageType() != OSUMessageType.PostDevData) {
- throw new IOException("Expected a PostDevDataResponse to MOUpload");
- }
- pddResponse = (PostDevDataResponse) ulResponse;
- }
-
- if (pddResponse.getExecCommand() == ExecCommand.Browser) {
- if (flowType == OSUFlowManager.FlowType.Policy) {
- throw new IOException("Browser launch requested in policy flow");
- }
- String webURL = ((BrowserURI) pddResponse.getCommandData()).getURI();
-
- if (webURL == null) {
- throw new IOException("No web-url");
- } else if (!webURL.contains(sessionID)) {
- throw new IOException("Bad or missing session ID in webURL");
- }
-
- if (!startUserInput(new URL(webURL), network)) {
- throw new IOException("User session failed");
- }
-
- Log.d(TAG, " -- Sending user input complete:");
- String userComplete =
- SOAPBuilder.buildPostDevDataResponse(RequestReason.InputComplete,
- sessionID, null,
- omadmAdapter.getMO(OMAConstants.DevInfoURN),
- omadmAdapter.getMO(OMAConstants.DevDetailURN));
-
- OSUResponse udResponse = httpHandler.exchangeSOAP(mURL, userComplete);
- if (udResponse.getMessageType() != OSUMessageType.PostDevData) {
- throw new IOException("Bad user input complete response: " + udResponse);
- }
- pddResponse = (PostDevDataResponse) udResponse;
- } else if (pddResponse.getExecCommand() == ExecCommand.GetCert) {
- certs = new HashMap<>();
- try (ESTHandler estHandler = new ESTHandler((GetCertData) pddResponse.
- getCommandData(), network, getOMADMAdapter(),
- km, mKeyStore, homeSP, flowType)) {
- estHandler.execute(true);
- certs.put(OSUCertType.CA, estHandler.getCACerts());
- certs.put(OSUCertType.Client, estHandler.getClientCerts());
- clientKey = estHandler.getClientKey();
- }
-
- if (httpHandler.isHTTPAuthPerformed()) { // 8.4.3.6
- httpHandler.renegotiate(certs, clientKey);
- }
-
- Log.d(TAG, " -- Sending remediation cert enrollment complete:");
- // 8.4.3.5 in the spec actually prescribes that an update URI is sent here,
- // but there is no remediation flow that defines user interaction after EST
- // so for now a null is passed.
- String certComplete =
- SOAPBuilder
- .buildPostDevDataResponse(RequestReason.CertEnrollmentComplete,
- sessionID, null,
- omadmAdapter.getMO(OMAConstants.DevInfoURN),
- omadmAdapter.getMO(OMAConstants.DevDetailURN));
- OSUResponse ceResponse = httpHandler.exchangeSOAP(mURL, certComplete);
- if (ceResponse.getMessageType() != OSUMessageType.PostDevData) {
- throw new IOException("Bad cert enrollment complete response: "
- + ceResponse);
- }
- pddResponse = (PostDevDataResponse) ceResponse;
- } else {
- throw new IOException("Unexpected command: " + pddResponse.getExecCommand());
- }
- }
-
- if (pddResponse.getStatus() != OSUStatus.RemediationComplete) {
- throw new IOException("Expected a PostDevDataResponse to MOUpload");
- }
-
- Log.d(TAG, "Remediation response: " + pddResponse);
-
- List<MOData> mods = new ArrayList<>();
- for (OSUCommand command : pddResponse.getCommands()) {
- if (command.getOSUCommand() == OSUCommandID.UpdateNode) {
- mods.add((MOData) command.getCommandData());
- } else if (command.getOSUCommand() != OSUCommandID.NoMOUpdate) {
- throw new IOException("Unexpected OSU response: " + command);
- }
- }
-
- // 1. Machine remediation: Remediation complete + replace node
- // 2a. User remediation with upload: ExecCommand.UploadMO
- // 2b. User remediation without upload: ExecCommand.Browser
- // 3. User remediation only: -> sppPostDevData user input complete
- //
- // 4. Update node
- // 5. -> Update response
- // 6. Exchange complete
-
- OSUError error = null;
-
- String updateResponse = SOAPBuilder.buildUpdateResponse(sessionID, error);
- Log.d(TAG, " -- Sending updateResponse:");
- OSUResponse exComplete = httpHandler.exchangeSOAP(mURL, updateResponse);
- Log.d(TAG, "exComplete response: " + exComplete);
- if (exComplete.getMessageType() != OSUMessageType.ExchangeComplete) {
- throw new IOException("Expected ExchangeComplete: " + exComplete);
- } else if (exComplete.getStatus() != OSUStatus.ExchangeComplete) {
- throw new IOException("Bad ExchangeComplete status: " + exComplete);
- }
-
- // There's a chicken and egg here: If the config is saved before sending update complete
- // the network is lost and the remediation flow fails.
- try {
- platformAdapter.remediationComplete(homeSP, mods, certs, clientKey,
- flowType == OSUFlowManager.FlowType.Policy);
- } catch (IOException | GeneralSecurityException e) {
- platformAdapter.provisioningFailed(homeSP.getFriendlyName(), e.getMessage());
- error = OSUError.CommandFailed;
- }
- }
- }
-
- private OMADMAdapter getOMADMAdapter() {
- return OMADMAdapter.getInstance(mContext);
- }
-
- private URL prepareUserInput(PlatformAdapter platformAdapter, String spName)
- throws IOException {
- mRedirectListener = new RedirectListener(platformAdapter, spName);
- return mRedirectListener.getURL();
- }
-
- private boolean startUserInput(URL target, Network network)
- throws IOException {
- mRedirectListener.startService();
-
- Intent intent = new Intent(mContext, OSUWebView.class);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.putExtra(OSUWebView.OSU_NETWORK, network);
- intent.putExtra(OSUWebView.OSU_URL, target.toString());
- mContext.startActivity(intent);
-
- return mRedirectListener.waitForUser();
- }
-
- public void close(boolean abort) {
- if (mRedirectListener != null) {
- mRedirectListener.abort();
- mRedirectListener = null;
- }
- if (abort) {
- try {
- mHTTPHandler.close();
- } catch (IOException ioe) {
- /**/
- }
- }
- }
-
- private HTTPHandler createHandler(Network network, HomeSP homeSP, KeyManager km,
- OSUFlowManager.FlowType flowType)
- throws GeneralSecurityException, IOException {
- Credential credential = homeSP.getCredential();
-
- Log.d(TAG, "Credential method " + credential.getEAPMethod().getEAPMethodID());
- switch (credential.getEAPMethod().getEAPMethodID()) {
- case EAP_TTLS:
- String user;
- byte[] password;
- UpdateInfo subscriptionUpdate;
- if (flowType == OSUFlowManager.FlowType.Policy) {
- subscriptionUpdate = homeSP.getPolicy() != null ?
- homeSP.getPolicy().getPolicyUpdate() : null;
- } else {
- subscriptionUpdate = homeSP.getSubscriptionUpdate();
- }
- if (subscriptionUpdate != null && subscriptionUpdate.getUsername() != null) {
- user = subscriptionUpdate.getUsername();
- password = subscriptionUpdate.getPassword() != null ?
- subscriptionUpdate.getPassword().getBytes(StandardCharsets.UTF_8) :
- new byte[0];
- } else {
- user = credential.getUserName();
- password = credential.getPassword().getBytes(StandardCharsets.UTF_8);
- }
- return new HTTPHandler(StandardCharsets.UTF_8,
- OSUSocketFactory.getSocketFactory(mKeyStore, homeSP, flowType, network,
- mURL, km, true), user, password);
- case EAP_TLS:
- return new HTTPHandler(StandardCharsets.UTF_8,
- OSUSocketFactory.getSocketFactory(mKeyStore, homeSP, flowType, network,
- mURL, km, true));
- default:
- throw new IOException("Cannot remediate account with " +
- credential.getEAPMethod().getEAPMethodID());
- }
- }
-
- private static GetCertData checkResponse(PostDevDataResponse response) throws IOException {
- if (response.getStatus() == OSUStatus.ProvComplete &&
- response.getOSUCommand() == OSUCommandID.AddMO) {
- return null;
- }
-
- if (response.getOSUCommand() == OSUCommandID.Exec &&
- response.getExecCommand() == ExecCommand.GetCert) {
- return (GetCertData) response.getCommandData();
- } else {
- throw new IOException("Unexpected command: " + response);
- }
- }
-
- private static final String[] AAACertPath =
- {"PerProviderSubscription", "?", "AAAServerTrustRoot", "*", "CertURL"};
- private static final String[] RemdCertPath =
- {"PerProviderSubscription", "?", "SubscriptionUpdate", "TrustRoot", "CertURL"};
- private static final String[] PolicyCertPath =
- {"PerProviderSubscription", "?", "Policy", "PolicyUpdate", "TrustRoot", "CertURL"};
-
- private static void retrieveCerts(OMANode ppsRoot,
- Map<OSUCertType, List<X509Certificate>> certs,
- Network network, KeyManager km, KeyStore ks)
- throws GeneralSecurityException, IOException {
-
- List<X509Certificate> aaaCerts = getCerts(ppsRoot, AAACertPath, network, km, ks);
- certs.put(OSUCertType.AAA, aaaCerts);
- certs.put(OSUCertType.Remediation, getCerts(ppsRoot, RemdCertPath, network, km, ks));
- certs.put(OSUCertType.Policy, getCerts(ppsRoot, PolicyCertPath, network, km, ks));
- }
-
- private static List<X509Certificate> getCerts(OMANode ppsRoot, String[] path, Network network,
- KeyManager km, KeyStore ks)
- throws GeneralSecurityException, IOException {
- List<String> urls = new ArrayList<>();
- getCertURLs(ppsRoot, Arrays.asList(path).iterator(), urls);
- Log.d(TAG, Arrays.toString(path) + ": " + urls);
-
- List<X509Certificate> certs = new ArrayList<>(urls.size());
- CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
- for (String urlString : urls) {
- URL url = new URL(urlString);
- HTTPHandler httpHandler = new HTTPHandler(StandardCharsets.UTF_8,
- OSUSocketFactory.getSocketFactory(ks, null,
- OSUFlowManager.FlowType.Provisioning, network, url, km, false));
-
- certs.add((X509Certificate) certFactory.generateCertificate(httpHandler.doGet(url)));
- }
- return certs;
- }
-
- private static void getCertURLs(OMANode root, Iterator<String> path, List<String> urls)
- throws IOException {
-
- String name = path.next();
- // Log.d(TAG, "Pulling '" + name + "' out of '" + root.getName() + "'");
- Collection<OMANode> nodes = null;
- switch (name) {
- case "?":
- for (OMANode node : root.getChildren()) {
- if (!node.isLeaf()) {
- nodes = Collections.singletonList(node);
- break;
- }
- }
- break;
- case "*":
- nodes = root.getChildren();
- break;
- default:
- nodes = Collections.singletonList(root.getChild(name));
- break;
- }
-
- if (nodes == null) {
- throw new IllegalArgumentException("No matching node in " + root.getName()
- + " for " + name);
- }
-
- for (OMANode node : nodes) {
- if (path.hasNext()) {
- getCertURLs(node, path, urls);
- } else {
- urls.add(node.getValue());
- }
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUCommand.java b/packages/Osu/src/com/android/hotspot2/osu/OSUCommand.java
deleted file mode 100644
index 4730377..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUCommand.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.android.hotspot2.osu;
-
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.XMLNode;
-import com.android.hotspot2.osu.commands.BrowserURI;
-import com.android.hotspot2.osu.commands.ClientCertInfo;
-import com.android.hotspot2.osu.commands.GetCertData;
-import com.android.hotspot2.osu.commands.MOData;
-import com.android.hotspot2.osu.commands.MOURN;
-import com.android.hotspot2.osu.commands.OSUCommandData;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class OSUCommand {
- private final OSUCommandID mOSUCommand;
- private final ExecCommand mExecCommand;
- private final OSUCommandData mCommandData;
-
- private static final Map<String, OSUCommandID> sCommands = new HashMap<>();
- private static final Map<String, ExecCommand> sExecs = new HashMap<>();
-
- static {
- sCommands.put("exec", OSUCommandID.Exec);
- sCommands.put("addmo", OSUCommandID.AddMO);
- sCommands.put("updatenode", OSUCommandID.UpdateNode); // Multi
- sCommands.put("nomoupdate", OSUCommandID.NoMOUpdate);
-
- sExecs.put("launchbrowsertouri", ExecCommand.Browser);
- sExecs.put("getcertificate", ExecCommand.GetCert);
- sExecs.put("useclientcerttls", ExecCommand.UseClientCertTLS);
- sExecs.put("uploadmo", ExecCommand.UploadMO);
- }
-
- public OSUCommand(XMLNode child) throws OMAException {
- mOSUCommand = sCommands.get(child.getStrippedTag());
-
- switch (mOSUCommand) {
- case Exec:
- /*
- * Receipt of this element by a mobile device causes the following command
- * to be executed.
- */
- child = child.getSoleChild();
- mExecCommand = sExecs.get(child.getStrippedTag());
- if (mExecCommand == null) {
- throw new OMAException("Unrecognized exec command: " + child.getStrippedTag());
- }
- switch (mExecCommand) {
- case Browser:
- /*
- * When the mobile device receives this command, it launches its default
- * browser to the URI contained in this element. The URI must use HTTPS as
- * the protocol and must contain an FQDN.
- */
- mCommandData = new BrowserURI(child);
- break;
- case GetCert:
- mCommandData = new GetCertData(child);
- break;
- case UploadMO:
- mCommandData = new MOURN(child);
- break;
- case UseClientCertTLS:
- /*
- * Command to mobile to re-negotiate the TLS connection using a client
- * certificate of the accepted type or Issuer to authenticate with the
- * Subscription server.
- */
- mCommandData = new ClientCertInfo(child);
- break;
- default:
- mCommandData = null;
- break;
- }
- break;
- case AddMO:
- /*
- * This command causes an management object in the mobile devices management tree
- * at the specified location to be added.
- * If there is already a management object at that location, the object is replaced.
- */
- mExecCommand = null;
- mCommandData = new MOData(child);
- break;
- case UpdateNode:
- /*
- * This command causes the update of an interior node and its child nodes (if any)
- * at the location specified in the management tree URI attribute. The content of
- * this element is the MO node XML.
- */
- mExecCommand = null;
- mCommandData = new MOData(child);
- break;
- case NoMOUpdate:
- /*
- * This response is used when there is no command to be executed nor update of
- * any MO required.
- */
- mExecCommand = null;
- mCommandData = null;
- break;
- default:
- mExecCommand = null;
- mCommandData = null;
- break;
- }
- }
-
- public OSUCommandID getOSUCommand() {
- return mOSUCommand;
- }
-
- public ExecCommand getExecCommand() {
- return mExecCommand;
- }
-
- public OSUCommandData getCommandData() {
- return mCommandData;
- }
-
- @Override
- public String toString() {
- return "OSUCommand{" +
- "OSUCommand=" + mOSUCommand +
- ", execCommand=" + mExecCommand +
- ", commandData=" + mCommandData +
- '}';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUCommandID.java b/packages/Osu/src/com/android/hotspot2/osu/OSUCommandID.java
deleted file mode 100644
index eca953f..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUCommandID.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.android.hotspot2.osu;
-
-public enum OSUCommandID {
- Exec, AddMO, UpdateNode, NoMOUpdate
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUError.java b/packages/Osu/src/com/android/hotspot2/osu/OSUError.java
deleted file mode 100644
index 2fa7de0..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUError.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.android.hotspot2.osu;
-
-public enum OSUError {
- SPPversionNotSupported,
- MOsNotSupported,
- CredentialsFailure,
- RemediationFailure,
- ProvisioningFailed,
- ExistingCertificate,
- CookieInvalid,
- WebSessionID,
- PermissionDenied,
- CommandFailed,
- MOaddOrUpdateFailed,
- DeviceFull,
- BadTreeURI,
- TooLarge,
- CommandNotAllowed,
- UserAborted,
- NotFound,
- Other
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUFlowManager.java b/packages/Osu/src/com/android/hotspot2/osu/OSUFlowManager.java
deleted file mode 100644
index 0123d69..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUFlowManager.java
+++ /dev/null
@@ -1,392 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Network;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.os.SystemClock;
-import android.util.Log;
-
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.flow.FlowService;
-import com.android.hotspot2.flow.OSUInfo;
-import com.android.hotspot2.flow.PlatformAdapter;
-import com.android.hotspot2.pps.HomeSP;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import javax.net.ssl.KeyManager;
-
-public class OSUFlowManager {
- private static final boolean MATCH_BSSID = false;
- private static final long WAIT_QUANTA = 10000L;
- private static final long WAIT_TIMEOUT = 1800000L;
-
- private final Context mContext;
- private final LinkedList<OSUFlow> mQueue;
- private FlowWorker mWorker;
- private OSUFlow mCurrent;
-
- public OSUFlowManager(Context context) {
- mContext = context;
- mQueue = new LinkedList<>();
- }
-
- public enum FlowType {Provisioning, Remediation, Policy}
-
- public static class OSUFlow implements Runnable {
- private final OSUClient mOSUClient;
- private final PlatformAdapter mPlatformAdapter;
- private final HomeSP mHomeSP;
- private final String mSpName;
- private final FlowType mFlowType;
- private final KeyManager mKeyManager;
- private final Object mNetworkLock = new Object();
- private final Network mNetwork;
- private Network mResultNetwork;
- private boolean mNetworkCreated;
- private int mWifiNetworkId;
- private volatile long mLaunchTime;
- private volatile boolean mAborted;
-
- /**
- * A policy flow.
- * @param osuInfo The OSU information for the flow (SSID, BSSID, URL)
- * @param platformAdapter the platform adapter
- * @param km A key manager for TLS
- * @throws MalformedURLException
- */
- public OSUFlow(OSUInfo osuInfo, PlatformAdapter platformAdapter, KeyManager km)
- throws MalformedURLException {
-
- mWifiNetworkId = -1;
- mNetwork = null;
- mOSUClient = new OSUClient(osuInfo,
- platformAdapter.getKeyStore(), platformAdapter.getContext());
- mPlatformAdapter = platformAdapter;
- mHomeSP = null;
- mSpName = osuInfo.getName(OSUManager.LOCALE);
- mFlowType = FlowType.Provisioning;
- mKeyManager = km;
- }
-
- /**
- * A Remediation flow for credential or policy provisioning.
- * @param network The network to use, only set for timed provisioning
- * @param osuURL The URL to connect to.
- * @param platformAdapter the platform adapter
- * @param km A key manager for TLS
- * @param homeSP The Home SP to which this remediation flow pertains.
- * @param flowType Remediation or Policy
- * @throws MalformedURLException
- */
- public OSUFlow(Network network, String osuURL,
- PlatformAdapter platformAdapter, KeyManager km, HomeSP homeSP,
- FlowType flowType) throws MalformedURLException {
-
- mNetwork = network;
- mWifiNetworkId = network.netId;
- mOSUClient = new OSUClient(osuURL,
- platformAdapter.getKeyStore(), platformAdapter.getContext());
- mPlatformAdapter = platformAdapter;
- mHomeSP = homeSP;
- mSpName = homeSP.getFriendlyName();
- mFlowType = flowType;
- mKeyManager = km;
- }
-
- private boolean deleteNetwork(OSUFlow next) {
- synchronized (mNetworkLock) {
- if (!mNetworkCreated) {
- return false;
- } else if (next.getFlowType() != FlowType.Provisioning) {
- return true;
- }
- OSUInfo thisInfo = mOSUClient.getOSUInfo();
- OSUInfo thatInfo = next.mOSUClient.getOSUInfo();
- if (thisInfo.getOsuSsid().equals(thatInfo.getOsuSsid())
- && thisInfo.getOSUBssid() == thatInfo.getOSUBssid()) {
- // Reuse the OSU network from previous and carry forward the creation fact.
- mNetworkCreated = true;
- return false;
- } else {
- return true;
- }
- }
- }
-
- private Network connect() throws IOException {
- Network network = networkMatch();
-
- synchronized (mNetworkLock) {
- mResultNetwork = network;
- if (mResultNetwork != null) {
- return mResultNetwork;
- }
- }
-
- Log.d(OSUManager.TAG, "No network match for " + toString());
-
- int osuNetworkId = -1;
- boolean created = false;
-
- if (mFlowType == FlowType.Provisioning) {
- osuNetworkId = mPlatformAdapter.connect(mOSUClient.getOSUInfo());
- created = true;
- }
-
- synchronized (mNetworkLock) {
- mNetworkCreated = created;
- if (created) {
- mWifiNetworkId = osuNetworkId;
- }
- Log.d(OSUManager.TAG, String.format("%s waiting for %snet ID %d",
- toString(), created ? "created " : "existing ", osuNetworkId));
-
- while (mResultNetwork == null && !mAborted) {
- try {
- mNetworkLock.wait();
- } catch (InterruptedException ie) {
- throw new IOException("Interrupted");
- }
- }
- if (mAborted) {
- throw new IOException("Aborted");
- }
- Utils.delay(500L);
- }
- return mResultNetwork;
- }
-
- private Network networkMatch() {
- if (mFlowType == FlowType.Provisioning) {
- OSUInfo match = mOSUClient.getOSUInfo();
- WifiConfiguration config = mPlatformAdapter.getActiveWifiConfig();
- if (config != null && bssidMatch(match, mPlatformAdapter)
- && Utils.decodeSsid(config.SSID).equals(match.getOsuSsid())) {
- synchronized (mNetworkLock) {
- mWifiNetworkId = config.networkId;
- }
- return mPlatformAdapter.getCurrentNetwork();
- }
- } else {
- WifiConfiguration config = mPlatformAdapter.getActiveWifiConfig();
- synchronized (mNetworkLock) {
- mWifiNetworkId = config != null ? config.networkId : -1;
- }
- return mNetwork;
- }
- return null;
- }
-
- private void networkChange() {
- WifiInfo connectionInfo = mPlatformAdapter.getConnectionInfo();
- if (connectionInfo == null) {
- return;
- }
- Network network = mPlatformAdapter.getCurrentNetwork();
- Log.d(OSUManager.TAG, "New network " + network
- + ", current OSU " + mOSUClient.getOSUInfo() +
- ", addr " + Utils.toIpString(connectionInfo.getIpAddress()));
-
- synchronized (mNetworkLock) {
- if (mResultNetwork == null && network != null && connectionInfo.getIpAddress() != 0
- && connectionInfo.getNetworkId() == mWifiNetworkId) {
- mResultNetwork = network;
- mNetworkLock.notifyAll();
- }
- }
- }
-
- public boolean createdNetwork() {
- synchronized (mNetworkLock) {
- return mNetworkCreated;
- }
- }
-
- public FlowType getFlowType() {
- return mFlowType;
- }
-
- public PlatformAdapter getPlatformAdapter() {
- return mPlatformAdapter;
- }
-
- private void setLaunchTime() {
- mLaunchTime = SystemClock.currentThreadTimeMillis();
- }
-
- public long getLaunchTime() {
- return mLaunchTime;
- }
-
- private int getWifiNetworkId() {
- synchronized (mNetworkLock) {
- return mWifiNetworkId;
- }
- }
-
- @Override
- public void run() {
- try {
- Network network = connect();
- Log.d(OSUManager.TAG, "OSU SSID Associated at " + network);
-
- if (mFlowType == FlowType.Provisioning) {
- mOSUClient.provision(mPlatformAdapter, network, mKeyManager);
- } else {
- mOSUClient.remediate(mPlatformAdapter, network,
- mKeyManager, mHomeSP, mFlowType);
- }
- } catch (Throwable t) {
- if (mAborted) {
- Log.d(OSUManager.TAG, "OSU flow aborted: " + t, t);
- } else {
- Log.w(OSUManager.TAG, "OSU flow failed: " + t, t);
- mPlatformAdapter.provisioningFailed(mSpName, t.getMessage());
- }
- } finally {
- if (!mAborted) {
- mOSUClient.close(false);
- }
- }
- }
-
- public void abort() {
- synchronized (mNetworkLock) {
- mAborted = true;
- mNetworkLock.notifyAll();
- }
- // Sockets cannot be closed on the main thread...
- // TODO: Might want to change this to a handler.
- new Thread() {
- @Override
- public void run() {
- try {
- mOSUClient.close(true);
- } catch (Throwable t) {
- Log.d(OSUManager.TAG, "Exception aborting " + toString());
- }
- }
- }.start();
- }
-
- @Override
- public String toString() {
- return mFlowType + " for " + mSpName;
- }
- }
-
- private class FlowWorker extends Thread {
- private final PlatformAdapter mPlatformAdapter;
-
- private FlowWorker(PlatformAdapter platformAdapter) {
- mPlatformAdapter = platformAdapter;
- }
-
- @Override
- public void run() {
- for (; ; ) {
- synchronized (mQueue) {
- if (mCurrent != null && mCurrent.createdNetwork()
- && (mQueue.isEmpty() || mCurrent.deleteNetwork(mQueue.getLast()))) {
- mPlatformAdapter.deleteNetwork(mCurrent.getWifiNetworkId());
- }
-
- mCurrent = null;
- while (mQueue.isEmpty()) {
- try {
- mQueue.wait(WAIT_QUANTA);
- } catch (InterruptedException ie) {
- return;
- }
- if (mQueue.isEmpty()) {
- // Bail out on time out
- Log.d(OSUManager.TAG, "Flow worker terminating.");
- mWorker = null;
- mContext.stopService(new Intent(mContext, FlowService.class));
- return;
- }
- }
- mCurrent = mQueue.removeLast();
- mCurrent.setLaunchTime();
- }
- Log.d(OSUManager.TAG, "Starting " + mCurrent);
- mCurrent.run();
- Log.d(OSUManager.TAG, "Exiting " + mCurrent);
- }
- }
- }
-
- /*
- * Provisioning: Wait until there is an active WiFi info and the active WiFi config
- * matches SSID and optionally BSSID.
- * WNM Remediation: Wait until the active WiFi info matches BSSID.
- * Timed remediation: The network is given (may be cellular).
- */
-
- public void appendFlow(OSUFlow flow) {
- synchronized (mQueue) {
- if (mCurrent != null &&
- SystemClock.currentThreadTimeMillis()
- - mCurrent.getLaunchTime() >= WAIT_TIMEOUT) {
- Log.d(OSUManager.TAG, "Aborting stale OSU flow " + mCurrent);
- mCurrent.abort();
- mCurrent = null;
- }
-
- if (flow.getFlowType() == FlowType.Provisioning) {
- // Kill any outstanding provisioning flows.
- Iterator<OSUFlow> flows = mQueue.iterator();
- while (flows.hasNext()) {
- if (flows.next().getFlowType() == FlowType.Provisioning) {
- flows.remove();
- }
- }
-
- if (mCurrent != null
- && mCurrent.getFlowType() == FlowType.Provisioning) {
- Log.d(OSUManager.TAG, "Aborting current provisioning flow " + mCurrent);
- mCurrent.abort();
- mCurrent = null;
- }
-
- mQueue.addLast(flow);
- } else {
- mQueue.addFirst(flow);
- }
-
- if (mWorker == null) {
- // TODO: Might want to change this to a handler.
- mWorker = new FlowWorker(flow.getPlatformAdapter());
- mWorker.start();
- }
-
- mQueue.notifyAll();
- }
- }
-
- public void networkChange() {
- OSUFlow pending;
- synchronized (mQueue) {
- pending = mCurrent;
- }
- Log.d(OSUManager.TAG, "Network change, current flow: " + pending);
- if (pending != null) {
- pending.networkChange();
- }
- }
-
- private static boolean bssidMatch(OSUInfo osuInfo, PlatformAdapter platformAdapter) {
- if (MATCH_BSSID) {
- WifiInfo wifiInfo = platformAdapter.getConnectionInfo();
- return wifiInfo != null && Utils.parseMac(wifiInfo.getBSSID()) == osuInfo.getOSUBssid();
- } else {
- return true;
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUListener.java b/packages/Osu/src/com/android/hotspot2/osu/OSUListener.java
deleted file mode 100644
index 9197620..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.android.hotspot2.osu;
-
-public interface OSUListener {
- public void osuNotification(int count);
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUManager.java b/packages/Osu/src/com/android/hotspot2/osu/OSUManager.java
deleted file mode 100644
index 24cd10f..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUManager.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.net.wifi.ScanResult;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.android.anqp.HSIconFileElement;
-import com.android.anqp.OSUProvider;
-import com.android.hotspot2.AppBridge;
-import com.android.hotspot2.PasspointMatch;
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.app.OSUData;
-import com.android.hotspot2.flow.FlowService;
-import com.android.hotspot2.flow.OSUInfo;
-import com.android.hotspot2.osu.service.RemediationHandler;
-import com.android.hotspot2.flow.IFlowService;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class OSUManager {
- public static final String TAG = "OSUMGR";
- public static final boolean R2_MOCK = true;
- private static final String REMEDIATION_FILE = "remediation.state";
-
- // Preferred icon parameters
- public static final Locale LOCALE = java.util.Locale.getDefault();
-
- private final AppBridge mAppBridge;
- private final Context mContext;
- private final IconCache mIconCache;
- private final RemediationHandler mRemediationHandler;
- private final Set<String> mOSUSSIDs = new HashSet<>();
- private final Map<OSUProvider, OSUInfo> mOSUMap = new HashMap<>();
- private final AtomicInteger mOSUSequence = new AtomicInteger();
-
- private final OSUCache mOSUCache;
-
- public OSUManager(Context context) {
- mContext = context;
- mAppBridge = new AppBridge(context);
- mIconCache = new IconCache(this);
- File appFolder = context.getFilesDir();
- mRemediationHandler =
- new RemediationHandler(context, new File(appFolder, REMEDIATION_FILE));
- mOSUCache = new OSUCache();
- }
-
- public Context getContext() {
- return mContext;
- }
-
- public List<OSUData> getAvailableOSUs() {
- synchronized (mOSUMap) {
- List<OSUData> completeOSUs = new ArrayList<>();
- for (OSUInfo osuInfo : mOSUMap.values()) {
- if (osuInfo.getIconStatus() == OSUInfo.IconStatus.Available) {
- completeOSUs.add(new OSUData(osuInfo));
- }
- }
- return completeOSUs;
- }
- }
-
- public void setOSUSelection(int osuID) {
- OSUInfo selection = null;
- for (OSUInfo osuInfo : mOSUMap.values()) {
- if (osuInfo.getOsuID() == osuID &&
- osuInfo.getIconStatus() == OSUInfo.IconStatus.Available) {
- selection = osuInfo;
- break;
- }
- }
-
- Log.d(TAG, "Selected OSU ID " + osuID + ": " + selection);
-
- if (selection == null) {
- return;
- }
-
- final OSUInfo osu = selection;
-
- mContext.bindService(new Intent(mContext, FlowService.class), new ServiceConnection() {
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- try {
- IFlowService fs = IFlowService.Stub.asInterface(service);
- fs.provision(osu);
- } catch (RemoteException re) {
- Log.e(OSUManager.TAG, "Caught re: " + re);
- }
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name) {
- Log.d(OSUManager.TAG, "Service disconnect: " + name);
- }
- }, Context.BIND_AUTO_CREATE);
- }
-
- public void networkDeleted(final WifiConfiguration configuration) {
- if (configuration.FQDN == null) {
- return;
- }
-
- mRemediationHandler.networkConfigChange();
- mContext.bindService(new Intent(mContext, FlowService.class), new ServiceConnection() {
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- try {
- IFlowService fs = IFlowService.Stub.asInterface(service);
- fs.spDeleted(configuration.FQDN);
- } catch (RemoteException re) {
- Log.e(OSUManager.TAG, "Caught re: " + re);
- }
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name) {
-
- }
- }, Context.BIND_AUTO_CREATE);
- }
-
- public void networkConnectChange(WifiInfo newNetwork) {
- mRemediationHandler.newConnection(newNetwork);
- }
-
- public void networkConfigChanged() {
- mRemediationHandler.networkConfigChange();
- }
-
- public void wifiStateChange(boolean on) {
- if (on) {
- return;
- }
-
- // Notify the remediation handler that there are no WiFi networks available.
- // Do NOT turn it off though as remediation, per at least this implementation, can take
- // place over cellular. The subject of remediation over cellular (when restriction is
- // "unrestricted") is not addresses by the WFA spec and direct ask to authors gives no
- // distinct answer one way or the other.
- mRemediationHandler.newConnection(null);
- int current = mOSUMap.size();
- mOSUMap.clear();
- mOSUCache.clearAll();
- mIconCache.tick(true);
- if (current > 0) {
- notifyOSUCount();
- }
- }
-
- public boolean isOSU(String ssid) {
- synchronized (mOSUMap) {
- return mOSUSSIDs.contains(ssid);
- }
- }
-
- public void pushScanResults(Collection<ScanResult> scanResults) {
- Map<OSUProvider, ScanResult> results = mOSUCache.pushScanResults(scanResults);
- if (results != null) {
- updateOSUInfoCache(results);
- }
- mIconCache.tick(false);
- }
-
- private void updateOSUInfoCache(Map<OSUProvider, ScanResult> results) {
- Map<OSUProvider, OSUInfo> osus = new HashMap<>();
- for (Map.Entry<OSUProvider, ScanResult> entry : results.entrySet()) {
- OSUInfo existing = mOSUMap.get(entry.getKey());
- long bssid = Utils.parseMac(entry.getValue().BSSID);
-
- if (existing == null) {
- osus.put(entry.getKey(), new OSUInfo(entry.getValue(), entry.getKey(),
- mOSUSequence.getAndIncrement()));
- } else if (existing.getBSSID() != bssid) {
- HSIconFileElement icon = mIconCache.getIcon(existing);
- if (icon != null && icon.equals(existing.getIconFileElement())) {
- OSUInfo osuInfo = new OSUInfo(entry.getValue(), entry.getKey(),
- existing.getOsuID());
- osuInfo.setIconFileElement(icon, existing.getIconFileName());
- osus.put(entry.getKey(), osuInfo);
- } else {
- osus.put(entry.getKey(), new OSUInfo(entry.getValue(),
- entry.getKey(), mOSUSequence.getAndIncrement()));
- }
- } else {
- // Maintain existing entries.
- osus.put(entry.getKey(), existing);
- }
- }
-
- mOSUMap.clear();
- mOSUMap.putAll(osus);
-
- mOSUSSIDs.clear();
- for (OSUInfo osuInfo : mOSUMap.values()) {
- mOSUSSIDs.add(osuInfo.getOsuSsid());
- }
-
- int mods = mIconCache.resolveIcons(mOSUMap.values());
-
- if (mOSUMap.isEmpty() || mods > 0) {
- notifyOSUCount();
- }
- }
-
- public void notifyIconReceived(long bssid, String fileName, byte[] data) {
- if (mIconCache.notifyIconReceived(bssid, fileName, data) > 0) {
- notifyOSUCount();
- }
- }
-
- public void doIconQuery(long bssid, String fileName) {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- wifiManager.queryPasspointIcon(bssid, fileName);
- }
-
- private void notifyOSUCount() {
- int count = 0;
- for (OSUInfo existing : mOSUMap.values()) {
- if (existing.getIconStatus() == OSUInfo.IconStatus.Available) {
- count++;
- }
- }
- Log.d(TAG, "Latest OSU info: " + count + " with icons, map " + mOSUMap);
- mAppBridge.showOsuCount(count);
- }
-
- public void deauth(long bssid, boolean ess, int delay, String url)
- throws MalformedURLException {
- Log.d(TAG, String.format("De-auth imminent on %s, delay %ss to '%s'",
- ess ? "ess" : "bss", delay, url));
- // TODO: Missing framework functionality:
- // mWifiNetworkAdapter.setHoldoffTime(delay * Constants.MILLIS_IN_A_SEC, ess);
- String spName = mRemediationHandler.getCurrentSpName();
- mAppBridge.showDeauth(spName, ess, delay, url);
- }
-
- public void wnmRemediate(final long bssid, final String url, PasspointMatch match) {
- mRemediationHandler.wnmReceived(bssid, url);
- }
-
- public void remediationDone(String fqdn, boolean policy) {
- mRemediationHandler.remediationDone(fqdn, policy);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUMessageType.java b/packages/Osu/src/com/android/hotspot2/osu/OSUMessageType.java
deleted file mode 100644
index 8c1b50a..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUMessageType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.android.hotspot2.osu;
-
-public enum OSUMessageType {
- PostDevData, ExchangeComplete, GetCertificate, Error
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUOperationStatus.java b/packages/Osu/src/com/android/hotspot2/osu/OSUOperationStatus.java
deleted file mode 100644
index ddda89c..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUOperationStatus.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.android.hotspot2.osu;
-
-public enum OSUOperationStatus {
- UserInputComplete,
- UserInputAborted,
- ProvisioningSuccess,
- ProvisioningFailure
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUResponse.java b/packages/Osu/src/com/android/hotspot2/osu/OSUResponse.java
deleted file mode 100644
index 1e4398d..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUResponse.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.android.hotspot2.osu;
-
-import com.android.hotspot2.omadm.OMAConstants;
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.XMLNode;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class OSUResponse {
- private static final String SPPVersionAttribute = "sppVersion";
- private static final String SPPStatusAttribute = "sppStatus";
- private static final String SPPSessionIDAttribute = "sessionID";
-
- private final OSUMessageType mMessageType;
- private final String mVersion;
- private final String mSessionID;
- private final OSUStatus mStatus;
- private final OSUError mError;
- private final Map<String, String> mAttributes;
-
- protected OSUResponse(XMLNode root, OSUMessageType messageType, String... attributes)
- throws OMAException {
- mMessageType = messageType;
- String ns = root.getNameSpace() + ":";
- mVersion = root.getAttributeValue(ns + SPPVersionAttribute);
- mSessionID = root.getAttributeValue(ns + SPPSessionIDAttribute);
-
- String status = root.getAttributeValue(ns + SPPStatusAttribute);
- if (status == null) {
- throw new OMAException("Missing status");
- }
- mStatus = OMAConstants.mapStatus(status);
-
- if (mVersion == null || mSessionID == null || mStatus == null) {
- throw new OMAException("Incomplete request: " + root.getAttributes());
- }
-
- if (attributes != null) {
- mAttributes = new HashMap<>();
- for (String attribute : attributes) {
- String value = root.getAttributeValue(ns + attribute);
- if (value == null) {
- throw new OMAException("Missing attribute: " + attribute);
- }
- mAttributes.put(attribute, value);
- }
- } else {
- mAttributes = null;
- }
-
- if (mStatus == OSUStatus.Error) {
- OSUError error = null;
- String errorTag = ns + "sppError";
- for (XMLNode child : root.getChildren()) {
- if (child.getTag().equals(errorTag)) {
- error = OMAConstants.mapError(child.getAttributeValue("errorCode"));
- break;
- }
- }
- mError = error;
- } else {
- mError = null;
- }
- }
-
- public OSUMessageType getMessageType() {
- return mMessageType;
- }
-
- public String getVersion() {
- return mVersion;
- }
-
- public String getSessionID() {
- return mSessionID;
- }
-
- public OSUStatus getStatus() {
- return mStatus;
- }
-
- public OSUError getError() {
- return mError;
- }
-
- protected Map<String, String> getAttributes() {
- return mAttributes;
- }
-
- @Override
- public String toString() {
- return String.format("%s version '%s', status %s, session-id '%s'%s",
- mMessageType, mVersion, mStatus, mSessionID, mError != null
- ? (" (" + mError + ")") : "");
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUSocketFactory.java b/packages/Osu/src/com/android/hotspot2/osu/OSUSocketFactory.java
deleted file mode 100644
index 1f5547b..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUSocketFactory.java
+++ /dev/null
@@ -1,451 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.net.Network;
-import android.util.Base64;
-import android.util.Log;
-
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.flow.PlatformAdapter;
-import com.android.hotspot2.pps.HomeSP;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.PrivateKey;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathValidator;
-import java.security.cert.CertPathValidatorException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.PKIXCertPathChecker;
-import java.security.cert.PKIXParameters;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-public class OSUSocketFactory {
- private static final long ConnectionTimeout = 10000L;
- private static final long ReconnectWait = 2000L;
-
- private static final String SecureHTTP = "https";
- private static final String UnsecureHTTP = "http";
- private static final String EKU_ID = "2.5.29.37";
- private static final Set<String> EKU_ID_SET = new HashSet<>(Arrays.asList(EKU_ID));
- private static final EKUChecker sEKUChecker = new EKUChecker();
-
- private final Network mNetwork;
- private final SocketFactory mSocketFactory;
- private final KeyManager mKeyManager;
- private final WFATrustManager mTrustManager;
- private final List<InetSocketAddress> mRemotes;
-
- public static Set<X509Certificate> buildCertSet() {
- try {
- CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
- Set<X509Certificate> set = new HashSet<>();
- for (String b64 : WFACerts) {
- ByteArrayInputStream bis = new ByteArrayInputStream(
- Base64.decode(b64, Base64.DEFAULT));
- X509Certificate cert = (X509Certificate) certFactory.generateCertificate(bis);
- set.add(cert);
- }
- return set;
- } catch (CertificateException ce) {
- Log.e(OSUManager.TAG, "Cannot build CA cert set");
- return null;
- }
- }
-
- public static OSUSocketFactory getSocketFactory(KeyStore ks, HomeSP homeSP,
- OSUFlowManager.FlowType flowType,
- Network network, URL url, KeyManager km,
- boolean enforceSecurity)
- throws GeneralSecurityException, IOException {
-
- if (enforceSecurity && !url.getProtocol().equalsIgnoreCase(SecureHTTP)) {
- throw new IOException("Protocol '" + url.getProtocol() + "' is not secure");
- }
- return new OSUSocketFactory(ks, homeSP, flowType, network, url, km);
- }
-
- private OSUSocketFactory(KeyStore ks, HomeSP homeSP, OSUFlowManager.FlowType flowType,
- Network network,
- URL url, KeyManager km) throws GeneralSecurityException, IOException {
- mNetwork = network;
- mKeyManager = km;
- mTrustManager = new WFATrustManager(ks, homeSP, flowType);
- int port;
- switch (url.getProtocol()) {
- case UnsecureHTTP:
- mSocketFactory = new DefaultSocketFactory();
- port = url.getPort() > 0 ? url.getPort() : 80;
- break;
- case SecureHTTP:
- SSLContext tlsContext = SSLContext.getInstance("TLSv1");
- tlsContext.init(km != null ? new KeyManager[]{km} : null,
- new TrustManager[]{mTrustManager}, null);
- mSocketFactory = tlsContext.getSocketFactory();
- port = url.getPort() > 0 ? url.getPort() : 443;
- break;
- default:
- throw new IOException("Bad URL: " + url);
- }
- if (OSUManager.R2_MOCK && url.getHost().endsWith(".wi-fi.org")) {
- // !!! Warning: Ruckus hack!
- mRemotes = new ArrayList<>(1);
- mRemotes.add(new InetSocketAddress(InetAddress.getByName("10.123.107.107"), port));
- } else {
- InetAddress[] remotes = mNetwork.getAllByName(url.getHost());
- android.util.Log.d(OSUManager.TAG, "'" + url.getHost() + "' resolves to " +
- Arrays.toString(remotes));
- if (remotes == null || remotes.length == 0) {
- throw new IOException("Failed to look up host from " + url);
- }
- mRemotes = new ArrayList<>(remotes.length);
- for (InetAddress remote : remotes) {
- mRemotes.add(new InetSocketAddress(remote, port));
- }
- }
- Collections.shuffle(mRemotes);
- }
-
- public void reloadKeys(Map<OSUCertType, List<X509Certificate>> certs, PrivateKey key)
- throws IOException {
- if (mKeyManager instanceof ClientKeyManager) {
- ((ClientKeyManager) mKeyManager).reloadKeys(certs, key);
- }
- }
-
- public Socket createSocket() throws IOException {
- Socket socket = mSocketFactory.createSocket();
- mNetwork.bindSocket(socket);
-
- long bail = System.currentTimeMillis() + ConnectionTimeout;
- boolean success = false;
-
- while (System.currentTimeMillis() < bail) {
- for (InetSocketAddress remote : mRemotes) {
- try {
- socket.connect(remote);
- Log.d(OSUManager.TAG, "Connection " + socket.getLocalSocketAddress() +
- " to " + socket.getRemoteSocketAddress());
- success = true;
- break;
- } catch (IOException ioe) {
- Log.d(OSUManager.TAG, "Failed to connect to " + remote + ": " + ioe);
- socket = mSocketFactory.createSocket();
- mNetwork.bindSocket(socket);
- }
- }
- if (success) {
- break;
- }
- Utils.delay(ReconnectWait);
- }
- if (!success) {
- throw new IOException("No available network");
- }
- return socket;
- }
-
- public X509Certificate getOSUCertificate(URL url) throws GeneralSecurityException {
- String fqdn = url.getHost();
- for (X509Certificate certificate : mTrustManager.getTrustChain()) {
- for (List<?> name : certificate.getSubjectAlternativeNames()) {
- if (name.size() >= SPVerifier.DNSName &&
- name.get(0).getClass() == Integer.class &&
- name.get(1).toString().equals(fqdn)) {
- return certificate;
- }
- }
- }
- return null;
- }
-
- final class DefaultSocketFactory extends SocketFactory {
-
- DefaultSocketFactory() {
- }
-
- @Override
- public Socket createSocket() throws IOException {
- return new Socket();
- }
-
- @Override
- public Socket createSocket(String host, int port) throws IOException {
- return new Socket(host, port);
- }
-
- @Override
- public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
- throws IOException {
- return new Socket(host, port, localHost, localPort);
- }
-
- @Override
- public Socket createSocket(InetAddress host, int port) throws IOException {
- return new Socket(host, port);
- }
-
- @Override
- public Socket createSocket(InetAddress address, int port, InetAddress localAddress,
- int localPort) throws IOException {
- return new Socket(address, port, localAddress, localPort);
- }
- }
-
- private static class WFATrustManager implements X509TrustManager {
- private final KeyStore mKeyStore;
- private final HomeSP mHomeSP;
- private final OSUFlowManager.FlowType mFlowType;
- private X509Certificate[] mTrustChain;
-
- private WFATrustManager(KeyStore ks, HomeSP homeSP, OSUFlowManager.FlowType flowType)
- throws CertificateException {
- mKeyStore = ks;
- mHomeSP = homeSP;
- mFlowType = flowType;
- }
-
- @Override
- public void checkClientTrusted(X509Certificate[] chain, String authType)
- throws CertificateException {
- // N/A
- }
-
- @Override
- public void checkServerTrusted(X509Certificate[] chain, String authType)
- throws CertificateException {
- Log.d("TLSOSU", "Checking " + chain.length + " certs.");
-
- try {
- CertPathValidator validator =
- CertPathValidator.getInstance(CertPathValidator.getDefaultType());
- CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
- CertPath path = certFactory.generateCertPath(
- Arrays.asList(chain));
- Set<TrustAnchor> trustAnchors = new HashSet<>();
- if (mHomeSP == null) {
- for (X509Certificate cert : getRootCerts(mKeyStore)) {
- trustAnchors.add(new TrustAnchor(cert, null));
- }
- } else {
- String prefix = mFlowType == OSUFlowManager.FlowType.Remediation ?
- PlatformAdapter.CERT_REM_ALIAS : PlatformAdapter.CERT_POLICY_ALIAS;
-
- X509Certificate cert = getCert(mKeyStore, prefix + mHomeSP.getFQDN());
- if (cert == null) {
- cert = getCert(mKeyStore,
- PlatformAdapter.CERT_SHARED_ALIAS + mHomeSP.getFQDN());
- }
- if (cert == null) {
- for (X509Certificate root : getRootCerts(mKeyStore)) {
- trustAnchors.add(new TrustAnchor(root, null));
- }
- } else {
- trustAnchors.add(new TrustAnchor(cert, null));
- }
- }
- PKIXParameters params = new PKIXParameters(trustAnchors);
- params.setRevocationEnabled(false);
- params.addCertPathChecker(sEKUChecker);
- validator.validate(path, params);
- mTrustChain = chain;
- } catch (GeneralSecurityException gse) {
- throw new SecurityException(gse);
- }
- mTrustChain = chain;
- }
-
- @Override
- public X509Certificate[] getAcceptedIssuers() {
- return null;
- }
-
- public X509Certificate[] getTrustChain() {
- return mTrustChain != null ? mTrustChain : new X509Certificate[0];
- }
- }
-
- private static X509Certificate getCert(KeyStore keyStore, String alias)
- throws KeyStoreException {
- Certificate cert = keyStore.getCertificate(alias);
- if (cert != null && cert instanceof X509Certificate) {
- return (X509Certificate) cert;
- }
- return null;
- }
-
- public static Set<X509Certificate> getRootCerts(KeyStore keyStore) throws KeyStoreException {
- Set<X509Certificate> certSet = new HashSet<>();
- int index = 0;
- for (int n = 0; n < 1000; n++) {
- Certificate cert = keyStore.getCertificate(
- String.format("%s%d", PlatformAdapter.CERT_WFA_ALIAS, index));
- if (cert == null) {
- break;
- } else if (cert instanceof X509Certificate) {
- certSet.add((X509Certificate) cert);
- }
- index++;
- }
- return certSet;
- }
-
- private static class EKUChecker extends PKIXCertPathChecker {
- @Override
- public void init(boolean forward) throws CertPathValidatorException {
-
- }
-
- @Override
- public boolean isForwardCheckingSupported() {
- return true;
- }
-
- @Override
- public Set<String> getSupportedExtensions() {
- return EKU_ID_SET;
- }
-
- @Override
- public void check(Certificate cert, Collection<String> unresolvedCritExts)
- throws CertPathValidatorException {
- Log.d(OSUManager.TAG, "Checking EKU " + unresolvedCritExts);
- unresolvedCritExts.remove(EKU_ID);
- }
- }
-
- /*
- *
- Subject: CN=osu-server.r2-testbed-rks.wi-fi.org, O=Intel Corporation CCG DRD, C=US
- Signature Algorithm: SHA256withRSA, OID = 1.2.840.113549.1.1.11
- Validity: [From: Wed Jan 28 16:00:00 PST 2015,
- To: Sat Jan 28 15:59:59 PST 2017]
- Issuer: CN="NetworkFX, Inc. Hotspot 2.0 Intermediate CA", OU=OSU CA - 01, O="NetworkFX, Inc.", C=US
- SerialNumber: [ 312af3db 138eae19 1defbce2 e2b88b55]
- *
- *
- Subject: CN="NetworkFX, Inc. Hotspot 2.0 Intermediate CA", OU=OSU CA - 01, O="NetworkFX, Inc.", C=US
- Signature Algorithm: SHA256withRSA, OID = 1.2.840.113549.1.1.11
- Validity: [From: Tue Nov 19 16:00:00 PST 2013,
- To: Sun Nov 19 15:59:59 PST 2023]
- Issuer: CN=Hotspot 2.0 Trust Root CA - 01, O=WFA Hotspot 2.0, C=US
- SerialNumber: [ 4152b1b0 301495f3 8fa76428 2ef41046]
- */
-
- public static final String[] WFACerts = {
- "MIIFbDCCA1SgAwIBAgIQDLMPcPKGpDPguQmJ3gHttzANBgkqhkiG9w0BAQsFADBQ" +
- "MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPV0ZBIEhvdHNwb3QgMi4wMScwJQYDVQQD" +
- "Ex5Ib3RzcG90IDIuMCBUcnVzdCBSb290IENBIC0gMDMwHhcNMTMxMjA4MTIwMDAw" +
- "WhcNNDMxMjA4MTIwMDAwWjBQMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPV0ZBIEhv" +
- "dHNwb3QgMi4wMScwJQYDVQQDEx5Ib3RzcG90IDIuMCBUcnVzdCBSb290IENBIC0g" +
- "MDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCsdEtReIUbMlO+hR6b" +
- "yQk4nGVITv3meYTaDeVwZnQVal8EjHuu4Kd89g8yRYVTv3J1kq9ukE7CDrDehrXK" +
- "ym+8VlR7ro0lB/lwRyNk3W7yNccg3AknQ0x5fKVwcFznwD/FYg37owGmhGFtpMTB" +
- "cxzreQaLXvLta8YNlJU10ZkfputBpzi9bLPWsLOkIrQw7KH1Wc+Oiy4hUMUbTlSi" +
- "cjqacKPR188mVIoxxUoICHyVV1KvMmYZrVdc/b5dbmd0haMHxC0VSqbydXxxS7vv" +
- "/lCrC2d5qbKE66PiuBPkhzyU7SI9C8GU/S7akYm1MMSTn5W7lSp2AWRDnf9LQg51" +
- "dLvDxJ7t2fruXtSkkqG/cwY1yQI8O+WZYPDThKPcDmNbaxVE9lOizAHXFVsfYrXA" +
- "PbbMOkzKehYwaIikmNgcpxtQNw+wikJiZb9N8VwwtwHK71XEFi+n5DGlPa9VDYgB" +
- "YkBcxvVo2rbE3i3teQgHm+pWZNP08aFNWwMk9yQkm/SOGdLq1jLbQA9yd7fyR1Ct" +
- "W1GLzKi1Ojr/6XiB9/noL3oxP/+gb8OSgcqVfkZp4QLvrGdlKiOI2fE7Bslmzn6l" +
- "B3UTpApjab7BQ99rCXzDwt3Xd7IrCtAJNkxi302J7k6hnGlW8S4oPQBElkOtoH9y" +
- "XEhp9rNS0lZiuwtFmWW2q50fkQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G" +
- "A1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUZw5JLGEXnuvt4FTnhNmbrWRgc2UwDQYJ" +
- "KoZIhvcNAQELBQADggIBAFPoGFDyzFg9B9+jJUPGW32omftBhChVcgjllI07RCie" +
- "KTMBi47+auuLgiMox3xRyP7/dX7YaUeMXEQ1BMv6nlrsXWv1lH4yu+RNuehPlqRs" +
- "fY351mAfPtQ654SBUi0Wg++9iyTOfgF5a9IWEDt4lnSZMvA4vlw8pUCz6zpKXHnA" +
- "RXKrpY3bU+2dnrFDKR0XQhmAQdo7UvdsT1elVoFIxHhLpwfzx+kpEhtrXw3nGgt+" +
- "M4jNp684XoWpxVGaQ4Vvv00Sm2DQ8jq2sf9F+kRWszZpQOTiMGKZr0lX2CI5cww1" +
- "dfmd1BkAjI9cIWLkD8YSeaggZzvYe1o9d7e7lKfdJmjDlSQ0uBiG77keUK4tF2fi" +
- "xFTxibtPux56p3GYQ2GdRsBaKjH3A3HMJSKXwIGR+wb1sgz/bBdlyJSylG8hYD//" +
- "0Hyo+UrMUszAdszoPhMY+4Ol3QE3QRWzXi+W/NtKeYD2K8xUzjZM10wMdxCfoFOa" +
- "8bzzWnxZQlnu880ULUSHIxDPeE+DDZYYOaN1hV2Rh/hrFKvvV+gJj2eXHF5G7y9u" +
- "Yg7nHYCCf7Hy8UTIXDtAAeDCQNon1ReN8G+XOqhLQ9TalmnJ5U5ARtC0MdQDht7T" +
- "DZpWeEVv+pQHARX9GDV/T85MV2RPJWKqfZ6kK0gvQDkunADdg8IhZAjwMMx3k6B/",
-
- "MIIFbDCCA1SgAwIBAgIQaAV8NQv/Xdusi4IU+tpUfjANBgkqhkiG9w0BAQsFADBQ" +
- "MQswCQYDVQQGEwJVUzEYMBYGA1UEChMPV0ZBIEhvdHNwb3QgMi4wMScwJQYDVQQD" +
- "Ex5Ib3RzcG90IDIuMCBUcnVzdCBSb290IENBIC0gMDEwHhcNMTMxMTIwMDAwMDAw" +
- "WhcNNDMxMTE5MjM1OTU5WjBQMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPV0ZBIEhv" +
- "dHNwb3QgMi4wMScwJQYDVQQDEx5Ib3RzcG90IDIuMCBUcnVzdCBSb290IENBIC0g" +
- "MDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/gf4CHxWjr2EcktAZ" +
- "pHT4z1yFYZILD3ZVqvzzXBK+YKjWhjsgZ28Z1VwXqu51JvVzwTGDalPf5m7zMcJW" +
- "CpPtPBdxxwQ/cBDPK4w+/sCuYYSddlMLzwZ/IgwFike12tKTR7Kk7Nk6ghrYaxCG" +
- "R+QEZDVrxITj79vGpgk2otVnMI4d3H9mWt1o6Lx+hVioyBgOvmo2OWHR2uKkbg5h" +
- "tktXqmBEtzK+qDqIIUY4WRRZHxlOaF2/EdIIGhXlf+Vlr13aPqOPiDiE08o+GARz" +
- "TIp8BrW2boo0+2kpEFUKiqc427vOYEkUdSMfwu4aGOcuOewc8sk6ztquL/JcPROL" +
- "VSFSSFR3HKhUto8EJcHEEG9wzcOi1OO/OOSVxjNwiaV/hB9Ed1wvoBhiJ+C+Q8/K" +
- "HXmoH/ankXDaB06yjt2Ojemt0nO45qlarRj8tO7zbpghJuJxztur47U7PJta7Zcg" +
- "z7kOPJPTAbzmOU2TXt1pXO1hVnSlV+M1rRwe7qivnSMMrTnkX15YWmyK27/tgJeu" +
- "muR2YzvPwPtF/m1N0bRKI7FW05NYg3smItFq0E/eyf/orgolcXTZ7zNRyRGnjWNs" +
- "/w9SDbdby0uVUfdN4V/5uC4HBmA1rikoBbGZ+nzCtesY4yW8eEwMfguVpNT3ueaU" +
- "q30nufeY2VnA3Rv1WH8TaeZU+wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G" +
- "A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU+RjGVZbebjpzEPfthaTLqbvXMiEwDQYJ" +
- "KoZIhvcNAQELBQADggIBABj3LP1UXVa16HYeXC1+GU1dX/cla1n1bwpIlxRnCZ5/" +
- "3I3zGw/nRnsLUTkGf8q3XCgin+jX22kyzzQNrgepn0zqBsmAj+pjUUwWzYQUzphc" +
- "Uzmg4PJRWaEaGG3kvD+wJEC0pWvIhe48qcq8FZCCmjbvecEVn5mM0smPzPyUjf/o" +
- "fjUMQvVWqug/Ff5HT6kbyDWhC3nD+8IZ5PjyO85OnoBnQkr8WYwr24XJgO2HS2rs" +
- "W40CzQe3Kdg7HHyef+/iyLYTBJH7EUJPCHGVQtZ3q0aNqURkutXJ/CxKJYMcNTEB" +
- "x+a09EhZ6DOHQDqsdTuAqGh3VyrxhFk+3suNsxoh6XaRK10VslvdNB/1YKfU8DWe" +
- "V6XfDH/TR0NIL04exUp3rER8sERulpJGBOnaG6OQKh4bFYDB406+QfusQnvO0aYR" +
- "UXJzf01B15HRJgpZsggpIuex0UDcJhTTpkRfTj8L4ayUce2ZRsGn3dBaT9ZMx4o9" +
- "E/YsQyOpfw28gM5u+zZt4BJz4gAaRGbp4r4sk5Vm/P1/0EXJ70Du6K9d0HAHtpEv" +
- "Y94Ww5W6fpMDdyAKYTXZBgTX3cqtikNkLX/kHH8l4o/XW2sXqU3X7vOYqgeVYoD9" +
- "NnhZXYCerH4Se5Lgj8/KhXxRWtcn3XduMdkC6UTApMooA64Vs508173Z3lJn2SeQ",
-
- "MIIFXTCCA0WgAwIBAgIBATANBgkqhkiG9w0BAQsFADBQMQswCQYDVQQGEwJVUzEY" +
- "MBYGA1UECgwPV0ZBIEhvdHNwb3QgMi4wMScwJQYDVQQDDB5Ib3RzcG90IDIuMCBU" +
- "cnVzdCBSb290IENBIC0gMDIwHhcNMTMxMjAyMjA1NzU3WhcNNDMxMjAyMjA1NTAz" +
- "WjBQMQswCQYDVQQGEwJVUzEYMBYGA1UECgwPV0ZBIEhvdHNwb3QgMi4wMScwJQYD" +
- "VQQDDB5Ib3RzcG90IDIuMCBUcnVzdCBSb290IENBIC0gMDIwggIiMA0GCSqGSIb3" +
- "DQEBAQUAA4ICDwAwggIKAoICAQDCSoMqNhtTwbnIsINp6nUhx5UFuq9ZQoTv+KDk" +
- "vAajT0di6+cQG3sAVvZLySmJoiBAv3PizYYLOD4eGMrFQRqi7PmSJ83WqNv23ZYF" +
- "ryFFJiy/URXc/ALDuB3dgElPt24Mx7n2xDPAh9t82HTmuskpQRrsyg9QPoi5rRRS" +
- "Djm5mjFJjKChq99RWcweNV/KGH1sTwcmlDmNMScK16A+BBNiSvmZlsGJgAlP369k" +
- "lnNqt6UiDhepcktuKpHmSvNel+c/xqzR0gURfUnXcZhzjzS94Rx5O+CNWL4EGiJq" +
- "qKAfk99j/lbD0MWYo7Rh0UKQlXSdohWDiV93hxvvfugej8KUOIb+1wmd1Fi+lwDZ" +
- "bR2yg2f0qyxbC/tAV4JJNnuDLFb19leD78x+68eAnlbMi+xMH5lINs15+26s2H5d" +
- "lx9kwRDBJq02LuHnen6FLafWjejnnBQ/PuGD0ACvBegSsDKDaCuTAnTNS6MDmQr4" +
- "wza08iX360ZN+BbSAnCK1YGa/7J7fhyydwxLJ7s5Eo0b6SUMY87FMc5XmkAk4xxL" +
- "MLqS2HMtqsGBI5JQT0SgH0ghE6DjMWArBTZcD+swuzTi1/Cz5+Z9Es8xJ3MPvSZW" +
- "pJi6VVB2eVMAqfHOj4ozHoVpvJypIVGRwWBzVRWom76R47utuRK6uKzoLiB1jwE5" +
- "vwHpUQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBxjAd" +
- "BgNVHQ4EFgQU5C9c1OMsB+/MOwl9OKG2D/XSwrUwDQYJKoZIhvcNAQELBQADggIB" +
- "AGULYE/VrnA3K0ptgHrWlQoPfp5wGvScgsmy0wp9qE3b6n/4bLehBKb5w4Y3JVA9" +
- "gjxoQ5xE2ssDtULZ3nKnGWmMN3qOBoRZCA6KjKs1860p09tm1ScUsajDJ15Tp1nI" +
- "zfR0oP63+2bJx+JXM8fPKOJe245hj2rs1c3JXsGCe+UVrlGsotG+wR0PdrejaXJ8" +
- "HbhBQHcbhgjsD1Gb6Egm4YxRKAtcVY3q9EKKWAGhbC1qvCh1iLNKo3FeGgm2r3EG" +
- "L4cYJBb2fhSKltjISqCDhYq4tplOIeQSJJyJC8gfW/BnMU39lTjNgnSjjGPLQXGV" +
- "+Ulb/CgNMJ3RhRJdBoLcpIm/EeLx6JLq/2Erxy7CxjaSOcD0UKa14+dzLSHVsXft" +
- "HZuOy548X8m18KruSZsf5uAT3c7NqlXtr9YgOVUqSJykNAHTGi/BHB1dC2clKvxN" +
- "ElfLWWrG9yaAd5TFW0+3wsaDIwRZL584AsFwwAD3KMo1oU/2zRvtm0E+VghsuD/Z" +
- "IE1xaVGTPaL7ph/YgC9+0rGHieauT8SXz6Ryp3h0RtYMLFZOMTKM7xjmcbMZDwrO" +
- "c+J/XjK9dbiCqlx5/B8P0xWaYYHzvE5/fafiPYzoGyFVUXquu0dFCCQrvjF/y0tC" +
- "TPm4hQim3k1F+5NChcbeNggN+kq+VdlSqPhQEuOY+kNv"
- };
-
- //private static final Set<TrustAnchor> sTrustAnchors = buildCertSet();
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUStatus.java b/packages/Osu/src/com/android/hotspot2/osu/OSUStatus.java
deleted file mode 100644
index 00f0634..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUStatus.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.android.hotspot2.osu;
-
-public enum OSUStatus {
- OK, ProvComplete, RemediationComplete, UpdateComplete, ExchangeComplete, Unknown, Error
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/OSUWebView.java b/packages/Osu/src/com/android/hotspot2/osu/OSUWebView.java
deleted file mode 100644
index a6778c8..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/OSUWebView.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.annotation.Nullable;
-import android.app.Activity;
-import android.graphics.Bitmap;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.http.SslError;
-import android.os.Bundle;
-import android.util.Log;
-import android.util.TypedValue;
-import android.webkit.SslErrorHandler;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import com.android.hotspot2.R;
-
-public class OSUWebView extends Activity {
- public static final String OSU_URL = "com.android.hotspot2.osu.URL";
- public static final String OSU_NETWORK = "com.android.hotspot2.osu.NETWORK";
-
- private String mUrl;
-
- @Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- Log.d(OSUManager.TAG, "Opening OSU Web View");
-
- ConnectivityManager connectivityManager = ConnectivityManager.from(this);
-
- mUrl = getIntent().getStringExtra(OSU_URL);
- Network network = getIntent().getParcelableExtra(OSU_NETWORK);
- connectivityManager.bindProcessToNetwork(network);
-
- getActionBar().setDisplayShowHomeEnabled(false);
- setContentView(R.layout.osu_web_view);
- getActionBar().setDisplayShowHomeEnabled(false);
-
- final WebView myWebView = findViewById(R.id.webview);
- myWebView.clearCache(true);
- WebSettings webSettings = myWebView.getSettings();
- webSettings.setJavaScriptEnabled(true);
- MyWebViewClient mWebViewClient = new MyWebViewClient();
- myWebView.setWebViewClient(mWebViewClient);
- Log.d(OSUManager.TAG, "OSU Web View to " + mUrl);
- myWebView.loadUrl(mUrl);
- Log.d(OSUManager.TAG, "OSU Web View loading");
- //myWebView.setWebChromeClient(new MyWebChromeClient());
- // Start initial page load so WebView finishes loading proxy settings.
- // Actual load of mUrl is initiated by MyWebViewClient.
- //myWebView.loadData("", "text/html", null);
- }
-
- private class MyWebViewClient extends WebViewClient {
- private static final String INTERNAL_ASSETS = "file:///android_asset/";
- // How many Android device-independent-pixels per scaled-pixel
- // dp/sp = (px/sp) / (px/dp) = (1/sp) / (1/dp)
- private final float mDpPerSp = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 1,
- getResources().getDisplayMetrics()) /
- TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1,
- getResources().getDisplayMetrics());
- private int mPagesLoaded;
-
- // If we haven't finished cleaning up the history, don't allow going back.
- public boolean allowBack() {
- return mPagesLoaded > 1;
- }
-
- // Convert Android device-independent-pixels (dp) to HTML size.
- private String dp(int dp) {
- // HTML px's are scaled just like dp's, so just add "px" suffix.
- return Integer.toString(dp) + "px";
- }
-
- // Convert Android scaled-pixels (sp) to HTML size.
- private String sp(int sp) {
- // Convert sp to dp's.
- float dp = sp * mDpPerSp;
- // Apply a scale factor to make things look right.
- dp *= 1.3;
- // Convert dp's to HTML size.
- return dp((int)dp);
- }
-
- @Override
- public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
- Log.d(OSUManager.TAG, "TLS error in Web View: " + error);
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/PostDevDataResponse.java b/packages/Osu/src/com/android/hotspot2/osu/PostDevDataResponse.java
deleted file mode 100644
index 12b9997..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/PostDevDataResponse.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.android.hotspot2.osu;
-
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.XMLNode;
-import com.android.hotspot2.osu.commands.OSUCommandData;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-public class PostDevDataResponse extends OSUResponse {
- private final List<OSUCommand> mOSUCommands;
-
- public PostDevDataResponse(XMLNode root) throws OMAException {
- super(root, OSUMessageType.PostDevData);
-
- if (getStatus() == OSUStatus.Error) {
- mOSUCommands = null;
- return;
- }
-
- mOSUCommands = new ArrayList<>();
- for (XMLNode child : root.getChildren()) {
- mOSUCommands.add(new OSUCommand(child));
- }
- }
-
- public OSUCommandID getOSUCommand() {
- return mOSUCommands.size() == 1 ? mOSUCommands.get(0).getOSUCommand() : null;
- }
-
- public ExecCommand getExecCommand() {
- return mOSUCommands.size() == 1 ? mOSUCommands.get(0).getExecCommand() : null;
- }
-
- public OSUCommandData getCommandData() {
- return mOSUCommands.size() == 1 ? mOSUCommands.get(0).getCommandData() : null;
- }
-
- public Collection<OSUCommand> getCommands() {
- return Collections.unmodifiableCollection(mOSUCommands);
- }
-
- @Override
- public String toString() {
- return super.toString() + ", commands " + mOSUCommands;
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/RequestReason.java b/packages/Osu/src/com/android/hotspot2/osu/RequestReason.java
deleted file mode 100644
index db222b4..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/RequestReason.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.android.hotspot2.osu;
-
-public enum RequestReason {
- SubRegistration,
- SubProvisioning,
- SubRemediation,
- InputComplete,
- NoClientCert,
- CertEnrollmentComplete,
- CertEnrollmentFailed,
- SubMetaDataUpdate,
- PolicyUpdate,
- NextCommand,
- MOUpload,
- Unspecified
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/ResponseFactory.java b/packages/Osu/src/com/android/hotspot2/osu/ResponseFactory.java
deleted file mode 100644
index 3e236a7..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/ResponseFactory.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.android.hotspot2.osu;
-
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.XMLNode;
-
-public interface ResponseFactory {
- public OSUResponse buildResponse(XMLNode root) throws OMAException;
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/SOAPBuilder.java b/packages/Osu/src/com/android/hotspot2/osu/SOAPBuilder.java
deleted file mode 100644
index e2f91ea..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/SOAPBuilder.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.android.hotspot2.osu;
-
-import com.android.hotspot2.omadm.MOTree;
-import com.android.hotspot2.omadm.OMAConstants;
-import com.android.hotspot2.omadm.XMLNode;
-
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-
-public class SOAPBuilder {
- private static final String EnvelopeTag = "s12:Envelope";
- private static final String BodyTag = "s12:Body";
-
- private static final Map<String, String> sEnvelopeAttributes = new HashMap<>(2);
- private static final Map<RequestReason, String> sRequestReasons =
- new EnumMap<>(RequestReason.class);
-
- static {
- sEnvelopeAttributes.put("xmlns:s12", "http://www.w3.org/2003/05/soap-envelope");
- sEnvelopeAttributes.put("xmlns:spp",
- "http://www.wi-fi.org/specifications/hotspot2dot0/v1.0/spp");
-
- sRequestReasons.put(RequestReason.SubRegistration, "Subscription registration");
- sRequestReasons.put(RequestReason.SubProvisioning, "Subscription provisioning");
- sRequestReasons.put(RequestReason.SubRemediation, "Subscription remediation");
- sRequestReasons.put(RequestReason.InputComplete, "User input completed");
- sRequestReasons.put(RequestReason.NoClientCert, "No acceptable client certificate");
- sRequestReasons.put(RequestReason.CertEnrollmentComplete,
- "Certificate enrollment completed");
- sRequestReasons.put(RequestReason.CertEnrollmentFailed, "Certificate enrollment failed");
- sRequestReasons.put(RequestReason.SubMetaDataUpdate, "Subscription metadata update");
- sRequestReasons.put(RequestReason.PolicyUpdate, "Policy update");
- sRequestReasons.put(RequestReason.NextCommand, "Retrieve next command");
- sRequestReasons.put(RequestReason.MOUpload, "MO upload");
- sRequestReasons.put(RequestReason.Unspecified, "Unspecified");
- }
-
- public static String buildPostDevDataResponse(RequestReason reason, String sessionID,
- String redirURI, MOTree... mos) {
- XMLNode envelope = buildEnvelope();
- buildSppPostDevData(envelope.getChildren().get(0), sessionID, reason, redirURI, mos);
- return envelope.toString();
- }
-
- public static String buildUpdateResponse(String sessionID, OSUError error) {
- XMLNode envelope = buildEnvelope();
- buildSppUpdateResponse(envelope.getChildren().get(0), sessionID, error);
- return envelope.toString();
- }
-
- private static XMLNode buildEnvelope() {
- XMLNode envelope = new XMLNode(null, EnvelopeTag, sEnvelopeAttributes);
- envelope.addChild(new XMLNode(envelope, BodyTag, (Map<String, String>) null));
- return envelope;
- }
-
- private static XMLNode buildSppPostDevData(XMLNode parent, String sessionID,
- RequestReason reason, String redirURI,
- MOTree... mos) {
- Map<String, String> pddAttributes = new HashMap<>();
- pddAttributes.put(OMAConstants.TAG_Version, OMAConstants.MOVersion);
- pddAttributes.put("requestReason", sRequestReasons.get(reason));
- if (sessionID != null) {
- pddAttributes.put(OMAConstants.TAG_SessionID, sessionID);
- }
- if (redirURI != null) {
- pddAttributes.put("redirectURI", redirURI);
- }
-
- XMLNode pddNode = new XMLNode(parent, OMAConstants.TAG_PostDevData, pddAttributes);
-
- XMLNode vNode = new XMLNode(pddNode, OMAConstants.TAG_SupportedVersions,
- (HashMap<String, String>) null);
- vNode.setText("1.0");
- pddNode.addChild(vNode);
-
- XMLNode moNode = new XMLNode(pddNode, OMAConstants.TAG_SupportedMOs,
- (HashMap<String, String>) null);
- StringBuilder sb = new StringBuilder();
- boolean first = true;
- for (String urn : OMAConstants.SupportedMO_URNs) {
- if (first) {
- first = false;
- } else {
- sb.append(' ');
- }
- sb.append(urn);
- }
- moNode.setText(sb.toString());
- pddNode.addChild(moNode);
-
- if (mos != null) {
- for (MOTree moTree : mos) {
- Map<String, String> map = null;
- if (moTree.getUrn() != null) {
- map = new HashMap<>(1);
- map.put(OMAConstants.SppMOAttribute, moTree.getUrn());
- }
- moNode = new XMLNode(pddNode, OMAConstants.TAG_MOContainer, map);
- moNode.setText(moTree.toXml());
- pddNode.addChild(moNode);
- }
- }
-
- parent.addChild(pddNode);
- return pddNode;
- }
-
- private static XMLNode buildSppUpdateResponse(XMLNode parent, String sessionID,
- OSUError error) {
- Map<String, String> urAttributes = new HashMap<>();
- urAttributes.put(OMAConstants.TAG_Version, OMAConstants.MOVersion);
- if (sessionID != null) {
- urAttributes.put(OMAConstants.TAG_SessionID, sessionID);
- }
- if (error == null) {
- urAttributes.put(OMAConstants.TAG_Status, OMAConstants.mapStatus(OSUStatus.OK));
- } else {
- urAttributes.put(OMAConstants.TAG_Status, OMAConstants.mapStatus(OSUStatus.Error));
- }
-
- XMLNode urNode = new XMLNode(parent, OMAConstants.TAG_UpdateResponse, urAttributes);
-
- if (error != null) {
- Map<String, String> errorAttributes = new HashMap<>();
- errorAttributes.put("errorCode", OMAConstants.mapError(error));
- XMLNode errorNode = new XMLNode(urNode, OMAConstants.TAG_Error, errorAttributes);
- urNode.addChild(errorNode);
- }
-
- parent.addChild(urNode);
- return urNode;
- }
-
- /*
- <xsd:element name="sppUpdateResponse">
- <xsd:annotation>
- <xsd:documentation>SOAP method used by SPP client to confirm installation of MO addition or update.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="sppError" minOccurs="0"/>
- <xsd:any namespace="##other" maxOccurs="unbounded" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute ref="sppVersion" use="required"/>
- <xsd:attribute ref="sppStatus" use="required"/>
- <xsd:attribute ref="sessionID" use="required"/>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="sppError">
- <xsd:annotation>
- <xsd:documentation>Error response.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:attribute name="errorCode" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="SPP version not supported"/>
- <xsd:enumeration value="One or more mandatory MOs not supported"/>
- <xsd:enumeration value="Credentials cannot be provisioned at this time"/>
- <xsd:enumeration value="Remediation cannot be completed at this time"/>
- <xsd:enumeration value="Provisioning cannot be completed at this time"/>
- <xsd:enumeration value="Continue to use existing certificate"/>
- <xsd:enumeration value="Cookie invalid"/>
- <xsd:enumeration value="No corresponding web-browser-connection Session ID"/>
- <xsd:enumeration value="Permission denied"/>
- <xsd:enumeration value="Command failed"/>
- <xsd:enumeration value="MO addition or update failed"/>
- <xsd:enumeration value="Device full"/>
- <xsd:enumeration value="Bad management tree URI"/>
- <xsd:enumeration value="Requested entity too large"/>
- <xsd:enumeration value="Command not allowed"/>
- <xsd:enumeration value="Command not executed due to user"/>
- <xsd:enumeration value="Not found"/>
- <xsd:enumeration value="Other"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
-
-
- */
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/SOAPParser.java b/packages/Osu/src/com/android/hotspot2/osu/SOAPParser.java
deleted file mode 100644
index b848ba9..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/SOAPParser.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package com.android.hotspot2.osu;
-
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.XMLNode;
-
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-public class SOAPParser {
-
- private static final String EnvelopeTag = "envelope";
- private static final String BodyTag = "body";
-
- private static final Map<String, ResponseFactory> sResponseMap = new HashMap<>();
-
- static {
- sResponseMap.put("spppostdevdataresponse", new ResponseFactory() {
- @Override
- public OSUResponse buildResponse(XMLNode root) throws OMAException {
- return new PostDevDataResponse(root);
- }
- });
- sResponseMap.put("sppexchangecomplete", new ResponseFactory() {
- @Override
- public OSUResponse buildResponse(XMLNode root) throws OMAException {
- return new ExchangeCompleteResponse(root);
- }
- });
- sResponseMap.put("getcertificate", new ResponseFactory() {
- @Override
- public OSUResponse buildResponse(XMLNode root) {
- return null;
- }
- });
- sResponseMap.put("spperror", new ResponseFactory() {
- @Override
- public OSUResponse buildResponse(XMLNode root) {
- return null;
- }
- });
- }
-
- private final XMLNode mResponseNode;
-
- public SOAPParser(InputStream in)
- throws ParserConfigurationException, SAXException, IOException {
- XMLNode root;
-
- try {
- XMLParser parser = new XMLParser(in);
- root = parser.getRoot();
- } finally {
- in.close();
- }
-
- String[] nsn = root.getTag().split(":");
- if (nsn.length > 2) {
- throw new OMAException("Bad root tag syntax: '" + root.getTag() + "'");
- } else if (!EnvelopeTag.equalsIgnoreCase(nsn[nsn.length - 1])) {
- throw new OMAException("Expected envelope: '" + root.getTag() + "'");
- }
-
- String bodyTag = nsn.length > 1 ? (nsn[0] + ":" + BodyTag) : BodyTag;
- XMLNode body = null;
-
- for (XMLNode child : root.getChildren()) {
- if (bodyTag.equalsIgnoreCase(child.getTag())) {
- body = child;
- break;
- }
- }
-
- if (body == null || body.getChildren().isEmpty()) {
- throw new OMAException("Missing SOAP body");
- }
-
- mResponseNode = body.getSoleChild();
- }
-
- public OSUResponse getResponse() throws OMAException {
- ResponseFactory responseFactory = sResponseMap.get(mResponseNode.getStrippedTag());
- if (responseFactory == null) {
- throw new OMAException("Unknown response type: '"
- + mResponseNode.getStrippedTag() + "'");
- }
- return responseFactory.buildResponse(mResponseNode);
- }
-
- public XMLNode getResponseNode() {
- return mResponseNode;
- }
-
-
- /*
- <xsd:element name="sppPostDevDataResponse">
- <xsd:annotation>
- <xsd:documentation>SOAP method response from SPP server.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:choice>
- <xsd:element ref="sppError"/>
- <xsd:element name="exec">
- <xsd:annotation>
- <xsd:documentation>Receipt of this element by a mobile device causes the following command to be executed.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:choice>
- <xsd:element name="launchBrowserToURI" type="httpsURIType">
- <xsd:annotation>
- <xsd:documentation>When the mobile device receives this command, it launches its default browser to the URI contained in this element. The URI must use HTTPS as the protocol and must contain an FQDN.</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element ref="getCertificate"/>
- <xsd:element name="useClientCertTLS">
- <xsd:annotation>
- <xsd:documentation>Command to mobile to re-negotiate the TLS connection using a client certificate of the accepted type or Issuer to authenticate with the Subscription server.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="providerIssuerName" minOccurs="0"
- maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:attribute name="name" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>The issuer name of an acceptable provider-issued certificate. The text of this element is formatted in accordance with the Issuer Name field in RFC-3280. This element is present only when acceptProviderCerts is true.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:any namespace="##other" minOccurs="0"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="acceptMfgCerts" type="xsd:boolean"
- use="optional" default="false">
- <xsd:annotation>
- <xsd:documentation>When this boolean is true, IEEE 802.1ar manufacturing certificates are acceptable for mobile device authentication.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="acceptProviderCerts" type="xsd:boolean"
- use="optional" default="true">
- <xsd:annotation>
- <xsd:documentation>When this boolean is true, X509v3 certificates issued by providers identified in the providerIssuerName child element(s) are acceptable for mobile device authentication.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="uploadMO" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Command to mobile to upload the MO named in the moURN attribute to the SPP server.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:attribute ref="moURN"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:any namespace="##other" maxOccurs="unbounded" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>Element to allow the addition of new commands in the future.</xsd:documentation>
- </xsd:annotation>
- </xsd:any>
- </xsd:choice>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="addMO">
- <xsd:annotation>
- <xsd:documentation>This command causes an management object in the mobile devices management tree at the specified location to be added. If there is already a management object at that location, the object is replaced.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute ref="managementTreeURI"/>
- <xsd:attribute ref="moURN"/>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:element maxOccurs="unbounded" name="updateNode">
- <xsd:annotation>
- <xsd:documentation>This command causes the update of an interior node and its child nodes (if any) at the location specified in the management tree URI attribute. The content of this element is the MO node XML.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute ref="managementTreeURI"/>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="noMOUpdate">
- <xsd:annotation>
- <xsd:documentation>This response is used when there is no command to be executed nor update of any MO required.</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>For vendor-specific extensions or future needs.</xsd:documentation>
- </xsd:annotation>
- </xsd:any>
- </xsd:choice>
- <xsd:attribute ref="sppVersion" use="required"/>
- <xsd:attribute ref="sppStatus" use="required"/>
- <xsd:attribute ref="moreCommands" use="optional"/>
- <xsd:attribute ref="sessionID" use="required"/>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="sppUpdateResponse">
- <xsd:annotation>
- <xsd:documentation>SOAP method used by SPP client to confirm installation of MO addition or update.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="sppError" minOccurs="0"/>
- <xsd:any namespace="##other" maxOccurs="unbounded" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute ref="sppVersion" use="required"/>
- <xsd:attribute ref="sppStatus" use="required"/>
- <xsd:attribute ref="sessionID" use="required"/>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="sppExchangeComplete">
- <xsd:annotation>
- <xsd:documentation>SOAP method used by SPP server to end session.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="sppError" minOccurs="0"/>
- <xsd:any namespace="##other" maxOccurs="unbounded" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute ref="sppVersion" use="required"/>
- <xsd:attribute ref="sppStatus" use="required"/>
- <xsd:attribute ref="sessionID" use="required"/>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="getCertificate">
- <xsd:annotation>
- <xsd:documentation>Command to mobile to initiate certificate enrollment or re-enrollment and is a container for metadata to enable enrollment.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="enrollmentServerURI" type="httpsURIType">
- <xsd:annotation>
- <xsd:documentation>HTTPS URI of the server to be contacted to initiate certificate enrollment. The URI must contain an FQDN.</xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="estUserID" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>Temporary userid used by an EST client to authenticate to the EST server using HTTP Digest authentication. This element must be used for initial certificate enrollment; its use is optional for certificate re-enrollment.</xsd:documentation>
- </xsd:annotation>
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:maxLength value="255"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- <xsd:element name="estPassword" minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>Temporary password used by an EST client to authenticate to the EST server using HTTP Digest authentication. This element must be used for initial certificate enrollment; its use is optional for certificate re-enrollment.</xsd:documentation>
- </xsd:annotation>
- <xsd:simpleType>
- <xsd:restriction base="xsd:base64Binary">
- <xsd:maxLength value="340"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>For vendor-specific extensions or future needs.</xsd:documentation>
- </xsd:annotation>
- </xsd:any>
- </xsd:sequence>
- <xsd:attribute name="enrollmentProtocol" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="EST"/>
- <xsd:enumeration value="Other"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="sppError">
- <xsd:annotation>
- <xsd:documentation>Error response.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:attribute name="errorCode" use="required">
- <xsd:simpleType>
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="SPP version not supported"/>
- <xsd:enumeration value="One or more mandatory MOs not supported"/>
- <xsd:enumeration value="Credentials cannot be provisioned at this time"/>
- <xsd:enumeration value="Remediation cannot be completed at this time"/>
- <xsd:enumeration value="Provisioning cannot be completed at this time"/>
- <xsd:enumeration value="Continue to use existing certificate"/>
- <xsd:enumeration value="Cookie invalid"/>
- <xsd:enumeration value="No corresponding web-browser-connection Session ID"/>
- <xsd:enumeration value="Permission denied"/>
- <xsd:enumeration value="Command failed"/>
- <xsd:enumeration value="MO addition or update failed"/>
- <xsd:enumeration value="Device full"/>
- <xsd:enumeration value="Bad management tree URI"/>
- <xsd:enumeration value="Requested entity too large"/>
- <xsd:enumeration value="Command not allowed"/>
- <xsd:enumeration value="Command not executed due to user"/>
- <xsd:enumeration value="Not found"/>
- <xsd:enumeration value="Other"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:attribute>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
-
- */
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/SPVerifier.java b/packages/Osu/src/com/android/hotspot2/osu/SPVerifier.java
deleted file mode 100644
index f193b6a..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/SPVerifier.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.util.Log;
-
-import com.android.anqp.HSIconFileElement;
-import com.android.anqp.I18Name;
-import com.android.anqp.IconInfo;
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.asn1.Asn1Class;
-import com.android.hotspot2.asn1.Asn1Constructed;
-import com.android.hotspot2.asn1.Asn1Decoder;
-import com.android.hotspot2.asn1.Asn1Integer;
-import com.android.hotspot2.asn1.Asn1Object;
-import com.android.hotspot2.asn1.Asn1Octets;
-import com.android.hotspot2.asn1.Asn1Oid;
-import com.android.hotspot2.asn1.Asn1String;
-import com.android.hotspot2.asn1.OidMappings;
-import com.android.hotspot2.flow.OSUInfo;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-public class SPVerifier {
- public static final int OtherName = 0;
- public static final int DNSName = 2;
-
- private final OSUInfo mOSUInfo;
-
- public SPVerifier(OSUInfo osuInfo) {
- mOSUInfo = osuInfo;
- }
-
- /*
- SEQUENCE:
- [Context 0]:
- SEQUENCE:
- [Context 0]: -- LogotypeData
- SEQUENCE:
- SEQUENCE:
- SEQUENCE:
- IA5String='image/png'
- SEQUENCE:
- SEQUENCE:
- SEQUENCE:
- OID=2.16.840.1.101.3.4.2.1
- NULL
- OCTET_STRING= cf aa 74 a8 ad af 85 82 06 c8 f5 b5 bf ee 45 72 8a ee ea bd 47 ab 50 d3 62 0c 92 c1 53 c3 4c 6b
- SEQUENCE:
- IA5String='http://www.r2-testbed.wi-fi.org/icon_orange_zxx.png'
- SEQUENCE:
- INTEGER=4184
- INTEGER=-128
- INTEGER=61
- [Context 4]= 7a 78 78
- [Context 0]: -- LogotypeData
- SEQUENCE:
- SEQUENCE: -- LogotypeImage
- SEQUENCE: -- LogoTypeDetails
- IA5String='image/png'
- SEQUENCE:
- SEQUENCE: -- HashAlgAndValue
- SEQUENCE:
- OID=2.16.840.1.101.3.4.2.1
- NULL
- OCTET_STRING= cb 35 5c ba 7a 21 59 df 8e 0a e1 d8 9f a4 81 9e 41 8f af 58 0c 08 d6 28 7f 66 22 98 13 57 95 8d
- SEQUENCE:
- IA5String='http://www.r2-testbed.wi-fi.org/icon_orange_eng.png'
- SEQUENCE: -- LogotypeImageInfo
- INTEGER=11635
- INTEGER=-96
- INTEGER=76
- [Context 4]= 65 6e 67
- */
-
- private static class LogoTypeImage {
- private final String mMimeType;
- private final List<HashAlgAndValue> mHashes = new ArrayList<>();
- private final List<String> mURIs = new ArrayList<>();
- private final int mFileSize;
- private final int mXsize;
- private final int mYsize;
- private final String mLanguage;
-
- private LogoTypeImage(Asn1Constructed sequence) throws IOException {
- Iterator<Asn1Object> children = sequence.getChildren().iterator();
-
- Iterator<Asn1Object> logoTypeDetails =
- castObject(children.next(), Asn1Constructed.class).getChildren().iterator();
- mMimeType = castObject(logoTypeDetails.next(), Asn1String.class).getString();
-
- Asn1Constructed hashes = castObject(logoTypeDetails.next(), Asn1Constructed.class);
- for (Asn1Object hash : hashes.getChildren()) {
- mHashes.add(new HashAlgAndValue(castObject(hash, Asn1Constructed.class)));
- }
- Asn1Constructed urls = castObject(logoTypeDetails.next(), Asn1Constructed.class);
- for (Asn1Object url : urls.getChildren()) {
- mURIs.add(castObject(url, Asn1String.class).getString());
- }
-
- boolean imageInfoSet = false;
- int fileSize = -1;
- int xSize = -1;
- int ySize = -1;
- String language = null;
-
- if (children.hasNext()) {
- Iterator<Asn1Object> imageInfo =
- castObject(children.next(), Asn1Constructed.class).getChildren().iterator();
-
- Asn1Object first = imageInfo.next();
- if (first.getTag() == 0) {
- first = imageInfo.next(); // Ignore optional LogotypeImageType
- }
-
- fileSize = (int) castObject(first, Asn1Integer.class).getValue();
- xSize = (int) castObject(imageInfo.next(), Asn1Integer.class).getValue();
- ySize = (int) castObject(imageInfo.next(), Asn1Integer.class).getValue();
- imageInfoSet = true;
-
- if (imageInfo.hasNext()) {
- Asn1Object next = imageInfo.next();
- if (next.getTag() != 4) {
- next = imageInfo.hasNext() ? imageInfo.next() : null; // Skip resolution
- }
- if (next != null && next.getTag() == 4) {
- language = new String(castObject(next, Asn1Octets.class).getOctets(),
- StandardCharsets.US_ASCII);
- }
- }
- }
-
- if (imageInfoSet) {
- mFileSize = complement(fileSize);
- mXsize = complement(xSize);
- mYsize = complement(ySize);
- } else {
- mFileSize = mXsize = mYsize = -1;
- }
- mLanguage = language;
- }
-
- private boolean verify(OSUInfo osuInfo) throws GeneralSecurityException, IOException {
- IconInfo iconInfo = osuInfo.getIconInfo();
- HSIconFileElement iconData = osuInfo.getIconFileElement();
- if (!iconInfo.getIconType().equals(mMimeType) ||
- !iconInfo.getLanguage().equals(mLanguage) ||
- iconData.getIconData().length != mFileSize) {
- return false;
- }
- for (HashAlgAndValue hash : mHashes) {
- if (hash.getJCEName() != null) {
- MessageDigest digest = MessageDigest.getInstance(hash.getJCEName());
- byte[] computed = digest.digest(iconData.getIconData());
- if (!Arrays.equals(computed, hash.getHash())) {
- throw new IOException("Icon hash mismatch");
- } else {
- Log.d(OSUManager.TAG, "Icon verified with " + hash.getJCEName());
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public String toString() {
- return "LogoTypeImage{" +
- "MimeType='" + mMimeType + '\'' +
- ", hashes=" + mHashes +
- ", URIs=" + mURIs +
- ", fileSize=" + mFileSize +
- ", xSize=" + mXsize +
- ", ySize=" + mYsize +
- ", language='" + mLanguage + '\'' +
- '}';
- }
- }
-
- private static class HashAlgAndValue {
- private final String mJCEName;
- private final byte[] mHash;
-
- private HashAlgAndValue(Asn1Constructed sequence) throws IOException {
- if (sequence.getChildren().size() != 2) {
- throw new IOException("Bad HashAlgAndValue");
- }
- Iterator<Asn1Object> children = sequence.getChildren().iterator();
- mJCEName = OidMappings.getJCEName(getFirstInner(children.next(), Asn1Oid.class));
- mHash = castObject(children.next(), Asn1Octets.class).getOctets();
- }
-
- public String getJCEName() {
- return mJCEName;
- }
-
- public byte[] getHash() {
- return mHash;
- }
-
- @Override
- public String toString() {
- return "HashAlgAndValue{" +
- "JCEName='" + mJCEName + '\'' +
- ", hash=" + Utils.toHex(mHash) +
- '}';
- }
- }
-
- private static int complement(int value) {
- return value >= 0 ? value : (~value) + 1;
- }
-
- private static <T extends Asn1Object> T castObject(Asn1Object object, Class<T> klass)
- throws IOException {
- if (object.getClass() != klass) {
- throw new IOException("Object is an " + object.getClass().getSimpleName() +
- " expected an " + klass.getSimpleName());
- }
- return klass.cast(object);
- }
-
- private static <T extends Asn1Object> T getFirstInner(Asn1Object container, Class<T> klass)
- throws IOException {
- if (container.getClass() != Asn1Constructed.class) {
- throw new IOException("Not a container");
- }
- Iterator<Asn1Object> children = container.getChildren().iterator();
- if (!children.hasNext()) {
- throw new IOException("No content");
- }
- return castObject(children.next(), klass);
- }
-
- public void verify(X509Certificate osuCert) throws IOException, GeneralSecurityException {
- if (osuCert == null) {
- throw new IOException("No OSU cert found");
- }
-
- checkName(castObject(getExtension(osuCert, OidMappings.IdCeSubjectAltName),
- Asn1Constructed.class));
-
- List<LogoTypeImage> logos = getImageData(getExtension(osuCert, OidMappings.IdPeLogotype));
- Log.d(OSUManager.TAG, "Logos: " + logos);
- for (LogoTypeImage logoTypeImage : logos) {
- if (logoTypeImage.verify(mOSUInfo)) {
- return;
- }
- }
- throw new IOException("Failed to match icon against any cert logo");
- }
-
- private static List<LogoTypeImage> getImageData(Asn1Object logoExtension) throws IOException {
- Asn1Constructed logo = castObject(logoExtension, Asn1Constructed.class);
- Asn1Constructed communityLogo = castObject(logo.getChildren().iterator().next(),
- Asn1Constructed.class);
- if (communityLogo.getTag() != 0) {
- throw new IOException("Expected tag [0] for communityLogos");
- }
-
- List<LogoTypeImage> images = new ArrayList<>();
- Asn1Constructed communityLogoSeq = castObject(communityLogo.getChildren().iterator().next(),
- Asn1Constructed.class);
- for (Asn1Object logoTypeData : communityLogoSeq.getChildren()) {
- if (logoTypeData.getTag() != 0) {
- throw new IOException("Expected tag [0] for LogotypeData");
- }
- for (Asn1Object logoTypeImage : castObject(logoTypeData.getChildren().iterator().next(),
- Asn1Constructed.class).getChildren()) {
- // only read the image SEQUENCE and skip any audio [1] tags
- if (logoTypeImage.getAsn1Class() == Asn1Class.Universal) {
- images.add(new LogoTypeImage(castObject(logoTypeImage, Asn1Constructed.class)));
- }
- }
- }
- return images;
- }
-
- private void checkName(Asn1Constructed altName) throws IOException {
- Map<String, I18Name> friendlyNames = new HashMap<>();
- for (Asn1Object name : altName.getChildren()) {
- if (name.getAsn1Class() == Asn1Class.Context && name.getTag() == OtherName) {
- Asn1Constructed otherName = (Asn1Constructed) name;
- Iterator<Asn1Object> children = otherName.getChildren().iterator();
- if (children.hasNext()) {
- Asn1Object oidObject = children.next();
- if (OidMappings.sIdWfaHotspotFriendlyName.equals(oidObject) &&
- children.hasNext()) {
- Asn1Constructed value = castObject(children.next(), Asn1Constructed.class);
- String text = castObject(value.getChildren().iterator().next(),
- Asn1String.class).getString();
- I18Name friendlyName = new I18Name(text);
- friendlyNames.put(friendlyName.getLanguage(), friendlyName);
- }
- }
- }
- }
- Log.d(OSUManager.TAG, "Friendly names: " + friendlyNames.values());
- for (I18Name osuName : mOSUInfo.getOSUProvider().getNames()) {
- I18Name friendlyName = friendlyNames.get(osuName.getLanguage());
- if (!osuName.equals(friendlyName)) {
- throw new IOException("Friendly name '" + osuName + " not in certificate");
- }
- }
- }
-
- private static Asn1Object getExtension(X509Certificate certificate, String extension)
- throws GeneralSecurityException, IOException {
- byte[] data = certificate.getExtensionValue(extension);
- if (data == null) {
- return null;
- }
- Asn1Octets octetString = (Asn1Octets) Asn1Decoder.decode(ByteBuffer.wrap(data)).
- iterator().next();
- Asn1Constructed sequence = castObject(Asn1Decoder.decode(
- ByteBuffer.wrap(octetString.getOctets())).iterator().next(),
- Asn1Constructed.class);
- Log.d(OSUManager.TAG, "Extension " + extension + ": " + sequence);
- return sequence;
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/UserInputListener.java b/packages/Osu/src/com/android/hotspot2/osu/UserInputListener.java
deleted file mode 100644
index ca30e3d..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/UserInputListener.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.net.Network;
-
-import java.net.URL;
-
-public interface UserInputListener {
- /**
- * Launch an appropriate application to handle user input and HTTP exchanges to the target
- * URL. Under normal circumstances this implies that a web-browser is started and pointed at
- * the target URL from which it is supposed to perform an initial HTTP GET operation.
- * This call must not block beyond the time it takes to launch the user agent, i.e. must return
- * well before the HTTP exchange terminates.
- * @param target A fully encoded URL to which to send an initial HTTP GET and then handle
- * subsequent HTTP exchanges.
- * @param endRedirect A URL to which the user agent will be redirected upon completion of
- * the HTTP exchange. This parameter is for informational purposes only
- * as the redirect to the URL is the responsibility of the remote server.
- */
- public void requestUserInput(URL target, Network network, URL endRedirect);
-
- /**
- * Notification that status of the OSU operation has changed. The implementation may choose to
- * return a string that will be passed to the user agent. Please note that the string is
- * passed as the payload of (the redirect) HTTP connection to the agent and must be formatted
- * appropriately (e.g. as well formed HTML).
- * Returning a null string on the initial status update of UserInputComplete or UserInputAborted
- * will cause the local "redirect" web-server to terminate and any further strings returned will
- * be ignored.
- * If programmatic termination of the user agent is desired, it should be initiated from within
- * the implementation of this method.
- * @param status
- * @param message
- * @return
- */
- public String operationStatus(String spIdentity, OSUOperationStatus status, String message);
-
- /**
- * Notify the user that a de-authentication event is imminent.
- * @param ess set to indicate that the de-authentication is for an ESS instead of a BSS
- * @param delay delay the number of seconds that the user will have to wait before
- * reassociating with the BSS or ESS.
- * @param url a URL to which to redirect the user
- */
- public void deAuthNotification(String spIdentity, boolean ess, int delay, URL url);
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/WiFiKeyManager.java b/packages/Osu/src/com/android/hotspot2/osu/WiFiKeyManager.java
deleted file mode 100644
index 54a3c4d..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/WiFiKeyManager.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.android.hotspot2.osu;
-
-import android.util.Log;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.net.ssl.X509KeyManager;
-import javax.security.auth.x500.X500Principal;
-
-public class WiFiKeyManager implements X509KeyManager {
- private final KeyStore mKeyStore;
- private final Map<X500Principal, String[]> mAliases = new HashMap<>();
-
- public WiFiKeyManager(KeyStore keyStore) throws IOException {
- mKeyStore = keyStore;
- }
-
- public void enableClientAuth(List<String> issuerNames) throws GeneralSecurityException,
- IOException {
-
- Set<X500Principal> acceptedIssuers = new HashSet<>();
- for (String issuerName : issuerNames) {
- acceptedIssuers.add(new X500Principal(issuerName));
- }
-
- Enumeration<String> aliases = mKeyStore.aliases();
- while (aliases.hasMoreElements()) {
- String alias = aliases.nextElement();
- Certificate cert = mKeyStore.getCertificate(alias);
- if ((cert instanceof X509Certificate) && mKeyStore.getKey(alias, null) != null) {
- X509Certificate x509Certificate = (X509Certificate) cert;
- X500Principal issuer = x509Certificate.getIssuerX500Principal();
- if (acceptedIssuers.contains(issuer)) {
- mAliases.put(issuer, new String[]{alias, cert.getPublicKey().getAlgorithm()});
- }
- }
- }
-
- if (mAliases.isEmpty()) {
- throw new IOException("No aliases match requested issuers: " + issuerNames);
- }
- }
-
- private static class AliasEntry implements Comparable<AliasEntry> {
- private final int mPreference;
- private final String mAlias;
-
- private AliasEntry(int preference, String alias) {
- mPreference = preference;
- mAlias = alias;
- }
-
- public int getPreference() {
- return mPreference;
- }
-
- public String getAlias() {
- return mAlias;
- }
-
- @Override
- public int compareTo(AliasEntry other) {
- return Integer.compare(getPreference(), other.getPreference());
- }
- }
-
- @Override
- public String chooseClientAlias(String[] keyTypes, Principal[] issuers, Socket socket) {
-
- Map<String, Integer> keyPrefs = new HashMap<>(keyTypes.length);
- int pref = 0;
- for (String keyType : keyTypes) {
- keyPrefs.put(keyType, pref++);
- }
-
- List<AliasEntry> aliases = new ArrayList<>();
- if (issuers != null) {
- for (Principal issuer : issuers) {
- if (issuer instanceof X500Principal) {
- String[] aliasAndKey = mAliases.get((X500Principal) issuer);
- if (aliasAndKey != null) {
- Integer preference = keyPrefs.get(aliasAndKey[1]);
- if (preference != null) {
- aliases.add(new AliasEntry(preference, aliasAndKey[0]));
- }
- }
- }
- }
- } else {
- for (String[] aliasAndKey : mAliases.values()) {
- Integer preference = keyPrefs.get(aliasAndKey[1]);
- if (preference != null) {
- aliases.add(new AliasEntry(preference, aliasAndKey[0]));
- }
- }
- }
- Collections.sort(aliases);
- return aliases.isEmpty() ? null : aliases.get(0).getAlias();
- }
-
- @Override
- public String[] getClientAliases(String keyType, Principal[] issuers) {
- List<String> aliases = new ArrayList<>();
- if (issuers != null) {
- for (Principal issuer : issuers) {
- if (issuer instanceof X500Principal) {
- String[] aliasAndKey = mAliases.get((X500Principal) issuer);
- if (aliasAndKey != null) {
- aliases.add(aliasAndKey[0]);
- }
- }
- }
- } else {
- for (String[] aliasAndKey : mAliases.values()) {
- aliases.add(aliasAndKey[0]);
- }
- }
- return aliases.isEmpty() ? null : aliases.toArray(new String[aliases.size()]);
- }
-
- @Override
- public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String[] getServerAliases(String keyType, Principal[] issuers) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public X509Certificate[] getCertificateChain(String alias) {
- try {
- List<X509Certificate> certs = new ArrayList<>();
- for (Certificate certificate : mKeyStore.getCertificateChain(alias)) {
- if (certificate instanceof X509Certificate) {
- certs.add((X509Certificate) certificate);
- }
- }
- return certs.toArray(new X509Certificate[certs.size()]);
- } catch (KeyStoreException kse) {
- Log.w(OSUManager.TAG, "Failed to retrieve certificates: " + kse);
- return null;
- }
- }
-
- @Override
- public PrivateKey getPrivateKey(String alias) {
- try {
- return (PrivateKey) mKeyStore.getKey(alias, null);
- } catch (GeneralSecurityException gse) {
- Log.w(OSUManager.TAG, "Failed to retrieve private key: " + gse);
- return null;
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/XMLParser.java b/packages/Osu/src/com/android/hotspot2/osu/XMLParser.java
deleted file mode 100644
index b23e555..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/XMLParser.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.android.hotspot2.osu;
-
-import com.android.hotspot2.omadm.XMLNode;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-public class XMLParser extends DefaultHandler {
- private final SAXParser mParser;
- private final InputSource mInputSource;
-
- private XMLNode mRoot;
- private XMLNode mCurrent;
-
- public XMLParser(InputStream in) throws ParserConfigurationException, SAXException {
- mParser = SAXParserFactory.newInstance().newSAXParser();
- mInputSource = new InputSource(new BufferedReader(
- new InputStreamReader(in, StandardCharsets.UTF_8)));
- }
-
- public XMLNode getRoot() throws SAXException, IOException {
- mParser.parse(mInputSource, this);
- return mRoot;
- }
-
- @Override
- public void startElement(String uri, String localName, String qName, Attributes attributes)
- throws SAXException {
- XMLNode parent = mCurrent;
-
- mCurrent = new XMLNode(mCurrent, qName, attributes);
- //System.out.println("Added " + mCurrent.getTag() + ", atts " + mCurrent.getAttributes());
-
- if (mRoot == null)
- mRoot = mCurrent;
- else
- parent.addChild(mCurrent);
- }
-
- @Override
- public void endElement(String uri, String localName, String qName) throws SAXException {
- if (!qName.equals(mCurrent.getTag()))
- throw new SAXException("End tag '" + qName + "' doesn't match current node: " +
- mCurrent);
-
- try {
- mCurrent.close();
- } catch (IOException ioe) {
- throw new SAXException("Failed to close element", ioe);
- }
-
- mCurrent = mCurrent.getParent();
- }
-
- @Override
- public void characters(char[] ch, int start, int length) throws SAXException {
- mCurrent.addText(ch, start, length);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/commands/BrowserURI.java b/packages/Osu/src/com/android/hotspot2/osu/commands/BrowserURI.java
deleted file mode 100644
index 137dbc9..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/commands/BrowserURI.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.android.hotspot2.osu.commands;
-
-import com.android.hotspot2.omadm.XMLNode;
-
-/*
- <spp:sppPostDevDataResponse xmlns:spp="http://www.wi-fi.org/specifications/hotspot2dot0/v1.0/spp"
- spp:sessionID="D74A7B03005645DAA516191DEE77B94F" spp:sppStatus="OK"
- spp:sppVersion="1.0">
- <spp:exec>
- <spp:launchBrowserToURI>
- https://subscription-server.r2-testbed-rks.wi-fi.org:8443/web/ruckuswireles/home/-/onlinesignup/subscriberDetails?Credentials=USERNAME_PASSWORD&SessionID=D74A7B03005645DAA516191DEE77B94F&RedirectURI=http://127.0.0.1:12345/index.htm&UpdateMethod=SPP-ClientInitiated
- </spp:launchBrowserToURI>
- </spp:exec>
- </spp:sppPostDevDataResponse>
- */
-
-public class BrowserURI implements OSUCommandData {
- private final String mURI;
-
- public BrowserURI(XMLNode commandNode) {
- mURI = commandNode.getText();
- }
-
- public String getURI() {
- return mURI;
- }
-
- @Override
- public String toString() {
- return "URI: " + mURI;
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/commands/ClientCertInfo.java b/packages/Osu/src/com/android/hotspot2/osu/commands/ClientCertInfo.java
deleted file mode 100644
index f877353..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/commands/ClientCertInfo.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.android.hotspot2.osu.commands;
-
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.XMLNode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/*
-<xsd:element name="useClientCertTLS">
- <xsd:annotation>
- <xsd:documentation>Command to mobile to re-negotiate the TLS connection using a client certificate of the accepted type or Issuer to authenticate with the Subscription server.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="providerIssuerName" minOccurs="0"
- maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:attribute name="name" type="xsd:string">
- <xsd:annotation>
- <xsd:documentation>The issuer name of an acceptable provider-issued certificate. The text of this element is formatted in accordance with the Issuer Name field in RFC-3280. This element is present only when acceptProviderCerts is true.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:any namespace="##other" minOccurs="0"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="acceptMfgCerts" type="xsd:boolean"
- use="optional" default="false">
- <xsd:annotation>
- <xsd:documentation>When this boolean is true, IEEE 802.1ar manufacturing certificates are acceptable for mobile device authentication.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="acceptProviderCerts" type="xsd:boolean"
- use="optional" default="true">
- <xsd:annotation>
- <xsd:documentation>When this boolean is true, X509v3 certificates issued by providers identified in the providerIssuerName child element(s) are acceptable for mobile device authentication.</xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:anyAttribute namespace="##other"/>
- </xsd:complexType>
-</xsd:element>
- */
-
-public class ClientCertInfo implements OSUCommandData {
- private final boolean mAcceptMfgCerts;
- private final boolean mAcceptProviderCerts;
- /*
- * The issuer name of an acceptable provider-issued certificate.
- * The text of this element is formatted in accordance with the Issuer Name field in RFC-3280.
- * This element is present only when acceptProviderCerts is true.
- */
- private final List<String> mIssuerNames;
-
- public ClientCertInfo(XMLNode commandNode) throws OMAException {
- mAcceptMfgCerts = Boolean.parseBoolean(commandNode.getAttributeValue("acceptMfgCerts"));
- mAcceptProviderCerts =
- Boolean.parseBoolean(commandNode.getAttributeValue("acceptProviderCerts"));
-
- if (mAcceptMfgCerts) {
- mIssuerNames = new ArrayList<>();
- for (XMLNode node : commandNode.getChildren()) {
- if (node.getStrippedTag().equals("providerIssuerName")) {
- mIssuerNames.add(node.getAttributeValue("name"));
- }
- }
- } else {
- mIssuerNames = null;
- }
- }
-
- public boolean doesAcceptMfgCerts() {
- return mAcceptMfgCerts;
- }
-
- public boolean doesAcceptProviderCerts() {
- return mAcceptProviderCerts;
- }
-
- public List<String> getIssuerNames() {
- return mIssuerNames;
- }
-
- @Override
- public String toString() {
- return "ClientCertInfo{" +
- "acceptMfgCerts=" + mAcceptMfgCerts +
- ", acceptProviderCerts=" + mAcceptProviderCerts +
- ", issuerNames=" + mIssuerNames +
- '}';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/commands/GetCertData.java b/packages/Osu/src/com/android/hotspot2/osu/commands/GetCertData.java
deleted file mode 100644
index 60a73fb..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/commands/GetCertData.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.android.hotspot2.osu.commands;
-
-import android.util.Base64;
-
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.XMLNode;
-
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
-/*
- <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope">
- <env:Header/>
- <env:Body>
- <spp:sppPostDevDataResponse xmlns:spp="http://www.wi-fi.org/specifications/hotspot2dot0/v1.0/spp"
- spp:sessionID="A40103ACEDE94C45BA127A41239BD60F" spp:sppStatus="OK"
- spp:sppVersion="1.0">
- <spp:exec>
- <spp:getCertificate enrollmentProtocol="EST">
- <spp:enrollmentServerURI>https://osu-server.r2-testbed-rks.wi-fi.org:9446/.well-known/est
- </spp:enrollmentServerURI>
- <spp:estUserID>a88c4830-aafd-420b-b790-c08f457a0fa3</spp:estUserID>
- <spp:estPassword>cnVja3VzMTIzNA==</spp:estPassword>
- </spp:getCertificate>
- </spp:exec>
- </spp:sppPostDevDataResponse>
- </env:Body>
- </env:Envelope>
- */
-
-public class GetCertData implements OSUCommandData {
- private final String mProtocol;
- private final String mServer;
- private final String mUserName;
- private final byte[] mPassword;
-
- public GetCertData(XMLNode commandNode) throws OMAException {
- mProtocol = commandNode.getAttributeValue("enrollmentProtocol");
-
- Map<String, String> values = new HashMap<>(3);
- for (XMLNode node : commandNode.getChildren()) {
- values.put(node.getStrippedTag(), node.getText());
- }
-
- mServer = values.get("enrollmentserveruri");
- mUserName = values.get("estuserid");
- mPassword = Base64.decode(values.get("estpassword"), Base64.DEFAULT);
- }
-
- public String getProtocol() {
- return mProtocol;
- }
-
- public String getServer() {
- return mServer;
- }
-
- public String getUserName() {
- return mUserName;
- }
-
- public byte[] getPassword() {
- return mPassword;
- }
-
- @Override
- public String toString() {
- return "GetCertData " +
- "protocol='" + mProtocol + '\'' +
- ", server='" + mServer + '\'' +
- ", userName='" + mUserName + '\'' +
- ", password='" + new String(mPassword, StandardCharsets.ISO_8859_1) + '\'';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/commands/MOData.java b/packages/Osu/src/com/android/hotspot2/osu/commands/MOData.java
deleted file mode 100644
index aa83db0..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/commands/MOData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.android.hotspot2.osu.commands;
-
-import android.net.wifi.PasspointManagementObjectDefinition;
-
-import com.android.hotspot2.omadm.MOTree;
-import com.android.hotspot2.omadm.OMAConstants;
-import com.android.hotspot2.omadm.OMAParser;
-import com.android.hotspot2.omadm.XMLNode;
-
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-
-public class MOData implements OSUCommandData {
- private final String mBaseURI;
- private final String mURN;
- private final MOTree mMOTree;
-
- public MOData(XMLNode root) {
- mBaseURI = root.getAttributeValue("spp:managementTreeURI");
- mURN = root.getAttributeValue("spp:moURN");
- mMOTree = root.getMOTree();
- }
-
- public String getBaseURI() {
- return mBaseURI;
- }
-
- public String getURN() {
- return mURN;
- }
-
- public MOTree getMOTree() {
- return mMOTree;
- }
-
- @Override
- public String toString() {
- return "Base URI: " + mBaseURI + ", MO: " + mMOTree;
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/commands/MOURN.java b/packages/Osu/src/com/android/hotspot2/osu/commands/MOURN.java
deleted file mode 100644
index 46394ef..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/commands/MOURN.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.android.hotspot2.osu.commands;
-
-/*
-<xsd:element name="uploadMO" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>Command to mobile to upload the MO named in the moURN attribute to the SPP server.</xsd:documentation>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:attribute ref="moURN"/>
- </xsd:complexType>
-</xsd:element>
- */
-
-import com.android.hotspot2.omadm.XMLNode;
-
-public class MOURN implements OSUCommandData {
- private final String mURN;
-
- public MOURN(XMLNode root) {
- mURN = root.getAttributeValue("spp:moURN");
- }
-
- public String getURN() {
- return mURN;
- }
-
- @Override
- public String toString() {
- return "MOURN{" +
- "URN='" + mURN + '\'' +
- '}';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/commands/OSUCommandData.java b/packages/Osu/src/com/android/hotspot2/osu/commands/OSUCommandData.java
deleted file mode 100644
index 06f81bf..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/commands/OSUCommandData.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.android.hotspot2.osu.commands;
-
-/**
- * Marker interface
- */
-public interface OSUCommandData {
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/service/RedirectListener.java b/packages/Osu/src/com/android/hotspot2/osu/service/RedirectListener.java
deleted file mode 100644
index 105a96d..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/service/RedirectListener.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package com.android.hotspot2.osu.service;
-
-import android.util.Log;
-
-import com.android.hotspot2.flow.PlatformAdapter;
-import com.android.hotspot2.osu.OSUOperationStatus;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Random;
-
-public class RedirectListener extends Thread {
- private static final long ThreadTimeout = 3000L;
- private static final long UserTimeout = 3600000L;
- private static final int MaxRetry = 5;
- private static final String TAG = "OSULSN";
-
- private static final String HTTPResponseHeader =
- "HTTP/1.1 304 Not Modified\r\n" +
- "Server: dummy\r\n" +
- "Keep-Alive: timeout=500, max=5\r\n\r\n";
-
- private static final String GoodBye =
- "<html>" +
- "<head><title>Goodbye</title></head>" +
- "<body>" +
- "<h3>Killing browser...</h3>" +
- "</body>" +
- "</html>\r\n";
-
- private final PlatformAdapter mPlatformAdapter;
- private final String mSpName;
- private final ServerSocket mServerSocket;
- private final String mPath;
- private final URL mURL;
- private final Object mLock = new Object();
-
- private boolean mListening;
- private OSUOperationStatus mUserStatus;
- private volatile boolean mAborted;
-
- public RedirectListener(PlatformAdapter platformAdapter, String spName) throws IOException {
- mPlatformAdapter = platformAdapter;
- mSpName = spName;
- mServerSocket = new ServerSocket(0, 5, InetAddress.getLocalHost());
- Random rnd = new Random(System.currentTimeMillis());
- mPath = "rnd" + Integer.toString(Math.abs(rnd.nextInt()), Character.MAX_RADIX);
- mURL = new URL("http", mServerSocket.getInetAddress().getHostAddress(),
- mServerSocket.getLocalPort(), mPath);
-
- Log.d(TAG, "Redirect URL: " + mURL);
- setName("HS20-Redirect-Listener");
- setDaemon(true);
- }
-
- public void startService() throws IOException {
- start();
- synchronized (mLock) {
- long bail = System.currentTimeMillis() + ThreadTimeout;
- long remainder = ThreadTimeout;
- while (remainder > 0 && !mListening) {
- try {
- mLock.wait(remainder);
- } catch (InterruptedException ie) {
- /**/
- }
- if (mListening) {
- break;
- }
- remainder = bail - System.currentTimeMillis();
- }
- if (!mListening) {
- throw new IOException("Failed to start listener");
- } else {
- Log.d(TAG, "OSU Redirect listener running");
- }
- }
- }
-
- public boolean waitForUser() {
- boolean success;
- synchronized (mLock) {
- long bail = System.currentTimeMillis() + UserTimeout;
- long remainder = UserTimeout;
- while (remainder > 0 && mUserStatus == null) {
- try {
- mLock.wait(remainder);
- } catch (InterruptedException ie) {
- /**/
- }
- if (mUserStatus != null) {
- break;
- }
- remainder = bail - System.currentTimeMillis();
- }
- success = mUserStatus == OSUOperationStatus.UserInputComplete;
- }
- abort();
- return success;
- }
-
- public void abort() {
- try {
- synchronized (mLock) {
- mUserStatus = OSUOperationStatus.UserInputAborted;
- mLock.notifyAll();
- }
- mAborted = true;
- mServerSocket.close();
- } catch (IOException ioe) {
- /**/
- }
- }
-
- public URL getURL() {
- return mURL;
- }
-
- @Override
- public void run() {
- int count = 0;
- synchronized (mLock) {
- mListening = true;
- mLock.notifyAll();
- }
-
- boolean terminate = false;
-
- for (; ; ) {
- count++;
- try (Socket instance = mServerSocket.accept()) {
- try (BufferedReader in = new BufferedReader(
- new InputStreamReader(instance.getInputStream(), StandardCharsets.UTF_8))) {
- boolean detected = false;
- StringBuilder sb = new StringBuilder();
- String s;
- while ((s = in.readLine()) != null) {
- sb.append(s).append('\n');
- if (!detected && s.startsWith("GET")) {
- String[] segments = s.split(" ");
- if (segments.length == 3 &&
- segments[2].startsWith("HTTP/") &&
- segments[1].regionMatches(1, mPath, 0, mPath.length())) {
- detected = true;
- }
- }
- if (s.length() == 0) {
- break;
- }
- }
- Log.d(TAG, "Redirect receive: " + sb);
- String response = null;
- if (detected) {
- response = status(OSUOperationStatus.UserInputComplete);
- if (response == null) {
- response = GoodBye;
- terminate = true;
- }
- }
- try (BufferedWriter out = new BufferedWriter(
- new OutputStreamWriter(instance.getOutputStream(),
- StandardCharsets.UTF_8))) {
-
- out.write(HTTPResponseHeader);
- if (response != null) {
- out.write(response);
- }
- }
- if (terminate) {
- break;
- } else if (count > MaxRetry) {
- status(OSUOperationStatus.UserInputAborted);
- break;
- }
- }
- } catch (IOException ioe) {
- if (mAborted) {
- return;
- } else if (count > MaxRetry) {
- status(OSUOperationStatus.UserInputAborted);
- break;
- }
- }
- }
- }
-
- private String status(OSUOperationStatus status) {
- Log.d(TAG, "User input status: " + status);
- synchronized (mLock) {
- mUserStatus = status;
- mLock.notifyAll();
- }
- String message = (status == OSUOperationStatus.UserInputAborted) ?
- "Browser closed" : null;
-
- return mPlatformAdapter.notifyUser(status, message, mSpName);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/osu/service/RemediationHandler.java b/packages/Osu/src/com/android/hotspot2/osu/service/RemediationHandler.java
deleted file mode 100644
index e1c6af6..0000000
--- a/packages/Osu/src/com/android/hotspot2/osu/service/RemediationHandler.java
+++ /dev/null
@@ -1,585 +0,0 @@
-package com.android.hotspot2.osu.service;
-
-import android.app.AlarmManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.net.Network;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.android.hotspot2.PasspointMatch;
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.flow.FlowService;
-import com.android.hotspot2.omadm.MOManager;
-import com.android.hotspot2.omadm.MOTree;
-import com.android.hotspot2.omadm.OMAConstants;
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.OMAParser;
-import com.android.hotspot2.osu.OSUManager;
-import com.android.hotspot2.pps.HomeSP;
-import com.android.hotspot2.pps.UpdateInfo;
-import com.android.hotspot2.flow.IFlowService;
-
-import org.xml.sax.SAXException;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import static com.android.hotspot2.pps.UpdateInfo.UpdateRestriction;
-
-public class RemediationHandler implements AlarmManager.OnAlarmListener {
- private final Context mContext;
- private final File mStateFile;
-
- private final Map<String, PasspointConfig> mPasspointConfigs = new HashMap<>();
- private final Map<String, List<RemediationEvent>> mUpdates = new HashMap<>();
- private final LinkedList<PendingUpdate> mOutstanding = new LinkedList<>();
-
- private WifiInfo mActiveWifiInfo;
- private PasspointConfig mActivePasspointConfig;
-
- public RemediationHandler(Context context, File stateFile) {
- mContext = context;
- mStateFile = stateFile;
- Log.d(OSUManager.TAG, "State file: " + stateFile);
- reloadAll(context, mPasspointConfigs, stateFile, mUpdates);
- mActivePasspointConfig = getActivePasspointConfig();
- calculateTimeout();
- }
-
- /**
- * Network configs change: Re-evaluate set of HomeSPs and recalculate next time-out.
- */
- public void networkConfigChange() {
- Log.d(OSUManager.TAG, "Networks changed");
- mPasspointConfigs.clear();
- mUpdates.clear();
- Iterator<PendingUpdate> updates = mOutstanding.iterator();
- while (updates.hasNext()) {
- PendingUpdate update = updates.next();
- if (!update.isWnmBased()) {
- updates.remove();
- }
- }
- reloadAll(mContext, mPasspointConfigs, mStateFile, mUpdates);
- calculateTimeout();
- }
-
- /**
- * Connected to new network: Try to rematch any outstanding remediation entries to the new
- * config.
- */
- public void newConnection(WifiInfo newNetwork) {
- mActivePasspointConfig = newNetwork != null ? getActivePasspointConfig() : null;
- if (mActivePasspointConfig != null) {
- Log.d(OSUManager.TAG, "New connection to "
- + mActivePasspointConfig.getHomeSP().getFQDN());
- } else {
- Log.d(OSUManager.TAG, "No passpoint connection");
- return;
- }
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- WifiInfo wifiInfo = wifiManager.getConnectionInfo();
- Network network = wifiManager.getCurrentNetwork();
-
- Iterator<PendingUpdate> updates = mOutstanding.iterator();
- while (updates.hasNext()) {
- PendingUpdate update = updates.next();
- try {
- if (update.matches(wifiInfo, mActivePasspointConfig.getHomeSP())) {
- update.remediate(network);
- updates.remove();
- } else if (update.isWnmBased()) {
- Log.d(OSUManager.TAG, "WNM sender mismatches with BSS, cancelling remediation");
- // Drop WNM update if it doesn't match the connected network
- updates.remove();
- }
- } catch (IOException ioe) {
- updates.remove();
- }
- }
- }
-
- /**
- * Remediation timer fired: Iterate HomeSP and either pass on to remediation if there is a
- * policy match or put on hold-off queue until a new network connection is made.
- */
- @Override
- public void onAlarm() {
- Log.d(OSUManager.TAG, "Remediation timer");
- calculateTimeout();
- }
-
- /**
- * Remediation frame received, either pass on to pre-remediation check right away or await
- * network connection.
- */
- public void wnmReceived(long bssid, String url) {
- PendingUpdate update = new PendingUpdate(bssid, url);
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- WifiInfo wifiInfo = wifiManager.getConnectionInfo();
- try {
- if (mActivePasspointConfig == null) {
- Log.d(OSUManager.TAG, String.format("WNM remediation frame '%s' through %012x " +
- "received, adding to outstanding remediations", url, bssid));
- mOutstanding.addFirst(new PendingUpdate(bssid, url));
- } else if (update.matches(wifiInfo, mActivePasspointConfig.getHomeSP())) {
- Log.d(OSUManager.TAG, String.format("WNM remediation frame '%s' through %012x " +
- "received, remediating now", url, bssid));
- update.remediate(wifiManager.getCurrentNetwork());
- } else {
- Log.w(OSUManager.TAG, String.format("WNM remediation frame '%s' through %012x " +
- "does not meet restriction", url, bssid));
- }
- } catch (IOException ioe) {
- Log.w(OSUManager.TAG, "Failed to remediate from WNM: " + ioe);
- }
- }
-
- /**
- * Callback to indicate that remediation has succeeded.
- * @param fqdn The SPs FQDN
- * @param policy set if this update was a policy update rather than a subscription update.
- */
- public void remediationDone(String fqdn, boolean policy) {
- Log.d(OSUManager.TAG, "Remediation complete for " + fqdn);
- long now = System.currentTimeMillis();
- List<RemediationEvent> events = mUpdates.get(fqdn);
- if (events == null) {
- events = new ArrayList<>();
- events.add(new RemediationEvent(fqdn, policy, now));
- mUpdates.put(fqdn, events);
- } else {
- Iterator<RemediationEvent> eventsIterator = events.iterator();
- while (eventsIterator.hasNext()) {
- RemediationEvent event = eventsIterator.next();
- if (event.isPolicy() == policy) {
- eventsIterator.remove();
- }
- }
- events.add(new RemediationEvent(fqdn, policy, now));
- }
- saveUpdates(mStateFile, mUpdates);
- }
-
- public String getCurrentSpName() {
- PasspointConfig config = getActivePasspointConfig();
- return config != null ? config.getHomeSP().getFriendlyName() : "unknown";
- }
-
- private PasspointConfig getActivePasspointConfig() {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- mActiveWifiInfo = wifiManager.getConnectionInfo();
- if (mActiveWifiInfo == null) {
- return null;
- }
-
- for (PasspointConfig passpointConfig : mPasspointConfigs.values()) {
- if (passpointConfig.getWifiConfiguration().networkId
- == mActiveWifiInfo.getNetworkId()) {
- return passpointConfig;
- }
- }
- return null;
- }
-
- private void calculateTimeout() {
- long now = System.currentTimeMillis();
- long next = Long.MAX_VALUE;
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- Network network = wifiManager.getCurrentNetwork();
-
- boolean newBaseTimes = false;
- for (PasspointConfig passpointConfig : mPasspointConfigs.values()) {
- HomeSP homeSP = passpointConfig.getHomeSP();
-
- for (boolean policy : new boolean[] {false, true}) {
- Long expiry = getNextUpdate(homeSP, policy, now);
- Log.d(OSUManager.TAG, "Next remediation for " + homeSP.getFQDN()
- + (policy ? "/policy" : "/subscription")
- + " is " + toExpiry(expiry));
- if (expiry == null || inProgress(homeSP, policy)) {
- continue;
- } else if (expiry < 0) {
- next = now - expiry;
- newBaseTimes = true;
- continue;
- }
-
- if (expiry <= now) {
- String uri = policy ? homeSP.getPolicy().getPolicyUpdate().getURI()
- : homeSP.getSubscriptionUpdate().getURI();
- PendingUpdate update = new PendingUpdate(homeSP, uri, policy);
- try {
- if (update.matches(mActiveWifiInfo, homeSP)) {
- update.remediate(network);
- } else {
- Log.d(OSUManager.TAG, "Remediation for "
- + homeSP.getFQDN() + " pending");
- mOutstanding.addLast(update);
- }
- } catch (IOException ioe) {
- Log.w(OSUManager.TAG, "Failed to remediate "
- + homeSP.getFQDN() + ": " + ioe);
- }
- } else {
- next = Math.min(next, expiry);
- }
- }
- }
- if (newBaseTimes) {
- saveUpdates(mStateFile, mUpdates);
- }
- Log.d(OSUManager.TAG, "Next time-out at " + toExpiry(next));
- AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
- alarmManager.set(AlarmManager.RTC, next, "osu-remediation", this, null);
- }
-
- private static String toExpiry(Long time) {
- if (time == null) {
- return "n/a";
- } else if (time < 0) {
- return Utils.toHMS(-time) + " from now";
- } else if (time > 0xffffffffffffL) {
- return "infinity";
- } else {
- return Utils.toUTCString(time);
- }
- }
-
- /**
- * Get the next update time for the homeSP subscription or policy entry. Automatically add a
- * wall time reference if it is missing.
- * @param homeSP The HomeSP to check
- * @param policy policy or subscription object.
- * @return -interval if no wall time ref, null if n/a, otherwise wall time of next update.
- */
- private Long getNextUpdate(HomeSP homeSP, boolean policy, long now) {
- long interval;
- if (policy) {
- interval = homeSP.getPolicy().getPolicyUpdate().getInterval();
- } else if (homeSP.getSubscriptionUpdate() != null) {
- interval = homeSP.getSubscriptionUpdate().getInterval();
- } else {
- return null;
- }
- if (interval < 0) {
- return null;
- }
-
- RemediationEvent event = getMatchingEvent(mUpdates.get(homeSP.getFQDN()), policy);
- if (event == null) {
- List<RemediationEvent> events = mUpdates.get(homeSP.getFQDN());
- if (events == null) {
- events = new ArrayList<>();
- mUpdates.put(homeSP.getFQDN(), events);
- }
- events.add(new RemediationEvent(homeSP.getFQDN(), policy, now));
- return -interval;
- }
- return event.getLastUpdate() + interval;
- }
-
- private boolean inProgress(HomeSP homeSP, boolean policy) {
- Iterator<PendingUpdate> updates = mOutstanding.iterator();
- while (updates.hasNext()) {
- PendingUpdate update = updates.next();
- if (update.getHomeSP() != null
- && update.getHomeSP().getFQDN().equals(homeSP.getFQDN())) {
- if (update.isPolicy() && !policy) {
- // Subscription updates takes precedence over policy updates
- updates.remove();
- return false;
- } else {
- return true;
- }
- }
- }
- return false;
- }
-
- private static RemediationEvent getMatchingEvent(
- List<RemediationEvent> events, boolean policy) {
- if (events == null) {
- return null;
- }
- for (RemediationEvent event : events) {
- if (event.isPolicy() == policy) {
- return event;
- }
- }
- return null;
- }
-
- private static void reloadAll(Context context, Map<String, PasspointConfig> passpointConfigs,
- File stateFile, Map<String, List<RemediationEvent>> updates) {
-
- loadAllSps(context, passpointConfigs);
- try {
- loadUpdates(stateFile, updates);
- } catch (IOException ioe) {
- Log.w(OSUManager.TAG, "Failed to load updates file: " + ioe);
- }
-
- boolean change = false;
- Iterator<Map.Entry<String, List<RemediationEvent>>> events = updates.entrySet().iterator();
- while (events.hasNext()) {
- Map.Entry<String, List<RemediationEvent>> event = events.next();
- if (!passpointConfigs.containsKey(event.getKey())) {
- events.remove();
- change = true;
- }
- }
- Log.d(OSUManager.TAG, "Updates: " + updates);
- if (change) {
- saveUpdates(stateFile, updates);
- }
- }
-
- private static void loadAllSps(Context context, Map<String, PasspointConfig> passpointConfigs) {
- WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- List<WifiConfiguration> configs = wifiManager.getPrivilegedConfiguredNetworks();
- if (configs == null) {
- return;
- }
- int count = 0;
- for (WifiConfiguration config : configs) {
- String moTree = config.getMoTree();
- if (moTree != null) {
- try {
- passpointConfigs.put(config.FQDN, new PasspointConfig(config));
- count++;
- } catch (IOException | SAXException e) {
- Log.w(OSUManager.TAG, "Failed to parse MO: " + e);
- }
- }
- }
- Log.d(OSUManager.TAG, "Loaded " + count + " SPs");
- }
-
- private static void loadUpdates(File file, Map<String, List<RemediationEvent>> updates)
- throws IOException {
- try (BufferedReader in = new BufferedReader(new FileReader(file))) {
- String line;
- while ((line = in.readLine()) != null) {
- try {
- RemediationEvent event = new RemediationEvent(line);
- List<RemediationEvent> events = updates.get(event.getFqdn());
- if (events == null) {
- events = new ArrayList<>();
- updates.put(event.getFqdn(), events);
- }
- events.add(event);
- } catch (IOException | NumberFormatException e) {
- Log.w(OSUManager.TAG, "Bad line in " + file + ": '" + line + "': " + e);
- }
- }
- }
- }
-
- private static void saveUpdates(File file, Map<String, List<RemediationEvent>> updates) {
- try (BufferedWriter out = new BufferedWriter(new FileWriter(file, false))) {
- for (List<RemediationEvent> events : updates.values()) {
- for (RemediationEvent event : events) {
- Log.d(OSUManager.TAG, "Writing wall time ref for " + event);
- out.write(event.toString());
- out.newLine();
- }
- }
- } catch (IOException ioe) {
- Log.w(OSUManager.TAG, "Failed to save update state: " + ioe);
- }
- }
-
- private static class PasspointConfig {
- private final WifiConfiguration mWifiConfiguration;
- private final MOTree mMOTree;
- private final HomeSP mHomeSP;
-
- private PasspointConfig(WifiConfiguration config) throws IOException, SAXException {
- mWifiConfiguration = config;
- OMAParser omaParser = new OMAParser();
- mMOTree = omaParser.parse(config.getMoTree(), OMAConstants.PPS_URN);
- List<HomeSP> spList = MOManager.buildSPs(mMOTree);
- if (spList.size() != 1) {
- throw new OMAException("Expected exactly one HomeSP, got " + spList.size());
- }
- mHomeSP = spList.iterator().next();
- }
-
- public WifiConfiguration getWifiConfiguration() {
- return mWifiConfiguration;
- }
-
- public HomeSP getHomeSP() {
- return mHomeSP;
- }
-
- public MOTree getMOTree() {
- return mMOTree;
- }
- }
-
- private static class RemediationEvent {
- private final String mFqdn;
- private final boolean mPolicy;
- private final long mLastUpdate;
-
- private RemediationEvent(String value) throws IOException {
- String[] segments = value.split(" ");
- if (segments.length != 3) {
- throw new IOException("Bad line: '" + value + "'");
- }
- mFqdn = segments[0];
- mPolicy = segments[1].equals("1");
- mLastUpdate = Long.parseLong(segments[2]);
- }
-
- private RemediationEvent(String fqdn, boolean policy, long now) {
- mFqdn = fqdn;
- mPolicy = policy;
- mLastUpdate = now;
- }
-
- public String getFqdn() {
- return mFqdn;
- }
-
- public boolean isPolicy() {
- return mPolicy;
- }
-
- public long getLastUpdate() {
- return mLastUpdate;
- }
-
- @Override
- public String toString() {
- return String.format("%s %c %d", mFqdn, mPolicy ? '1' : '0', mLastUpdate);
- }
- }
-
- private class PendingUpdate {
- private final HomeSP mHomeSP; // For time based updates
- private final long mBssid; // WNM based
- private final String mUrl; // WNM based
- private final boolean mPolicy;
-
- private PendingUpdate(HomeSP homeSP, String url, boolean policy) {
- mHomeSP = homeSP;
- mPolicy = policy;
- mBssid = 0L;
- mUrl = url;
- }
-
- private PendingUpdate(long bssid, String url) {
- mBssid = bssid;
- mUrl = url;
- mHomeSP = null;
- mPolicy = false;
- }
-
- private boolean matches(WifiInfo wifiInfo, HomeSP activeSP) throws IOException {
- if (mHomeSP == null) {
- // WNM initiated remediation, HomeSP restriction
- Log.d(OSUManager.TAG, String.format("Checking applicability of %s to %012x\n",
- wifiInfo != null ? wifiInfo.getBSSID() : "-", mBssid));
- return wifiInfo != null
- && Utils.parseMac(wifiInfo.getBSSID()) == mBssid
- && passesRestriction(activeSP); // !!! b/28600780
- } else {
- return passesRestriction(mHomeSP);
- }
- }
-
- private boolean passesRestriction(HomeSP restrictingSP)
- throws IOException {
- UpdateInfo updateInfo;
- if (mPolicy) {
- if (restrictingSP.getPolicy() == null) {
- throw new IOException("No policy object");
- }
- updateInfo = restrictingSP.getPolicy().getPolicyUpdate();
- } else {
- updateInfo = restrictingSP.getSubscriptionUpdate();
- }
-
- if (updateInfo.getUpdateRestriction() == UpdateRestriction.Unrestricted) {
- return true;
- }
-
- PasspointMatch match = matchProviderWithCurrentNetwork(restrictingSP.getFQDN());
- Log.d(OSUManager.TAG, "Current match for '" + restrictingSP.getFQDN()
- + "' is " + match + ", restriction " + updateInfo.getUpdateRestriction());
- return match == PasspointMatch.HomeProvider
- || (match == PasspointMatch.RoamingProvider
- && updateInfo.getUpdateRestriction() == UpdateRestriction.RoamingPartner);
- }
-
- private void remediate(Network network) {
- RemediationHandler.this.remediate(mHomeSP != null ? mHomeSP.getFQDN() : null,
- mUrl, mPolicy, network);
- }
-
- private HomeSP getHomeSP() {
- return mHomeSP;
- }
-
- private boolean isPolicy() {
- return mPolicy;
- }
-
- private boolean isWnmBased() {
- return mHomeSP == null;
- }
-
- private PasspointMatch matchProviderWithCurrentNetwork(String fqdn) {
- WifiManager wifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- return Utils.mapEnum(wifiManager.matchProviderWithCurrentNetwork(fqdn),
- PasspointMatch.class);
- }
- }
-
- /**
- * Initiate remediation
- * @param spFqdn The FQDN of the current SP, not set for WNM based remediation
- * @param url The URL of the remediation server
- * @param policy Set if this is a policy update rather than a subscription update
- * @param network The network to use for remediation
- */
- private void remediate(final String spFqdn, final String url,
- final boolean policy, final Network network) {
- mContext.bindService(new Intent(mContext, FlowService.class), new ServiceConnection() {
- @Override
- public void onServiceConnected(ComponentName name, IBinder service) {
- try {
- IFlowService fs = IFlowService.Stub.asInterface(service);
- fs.remediate(spFqdn, url, policy, network);
- } catch (RemoteException re) {
- Log.e(OSUManager.TAG, "Caught re: " + re);
- }
- }
-
- @Override
- public void onServiceDisconnected(ComponentName name) {
-
- }
- }, Context.BIND_AUTO_CREATE);
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/pps/Credential.java b/packages/Osu/src/com/android/hotspot2/pps/Credential.java
deleted file mode 100644
index 15f0dcf..0000000
--- a/packages/Osu/src/com/android/hotspot2/pps/Credential.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.android.hotspot2.pps;
-
-import android.text.TextUtils;
-import android.util.Base64;
-
-import com.android.anqp.eap.EAPMethod;
-import com.android.hotspot2.IMSIParameter;
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.omadm.OMAException;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-
-public class Credential {
- public enum CertType {IEEE, x509v3}
-
- public static final String CertTypeX509 = "x509v3";
- public static final String CertTypeIEEE = "802.1ar";
-
- private final long mCtime;
- private final long mExpTime;
- private final String mRealm;
- private final boolean mCheckAAACert;
-
- private final String mUserName;
- private final String mPassword;
- private final boolean mDisregardPassword;
- private final boolean mMachineManaged;
- private final String mSTokenApp;
- private final boolean mShare;
- private final EAPMethod mEAPMethod;
-
- private final CertType mCertType;
- private final byte[] mFingerPrint;
-
- private final IMSIParameter mImsi;
-
- public Credential(long ctime, long expTime, String realm, boolean checkAAACert,
- EAPMethod eapMethod, String userName, String password,
- boolean machineManaged, String stApp, boolean share) {
- mCtime = ctime;
- mExpTime = expTime;
- mRealm = realm;
- mCheckAAACert = checkAAACert;
- mEAPMethod = eapMethod;
- mUserName = userName;
-
- if (!TextUtils.isEmpty(password)) {
- byte[] pwOctets = Base64.decode(password, Base64.DEFAULT);
- mPassword = new String(pwOctets, StandardCharsets.UTF_8);
- } else {
- mPassword = null;
- }
- mDisregardPassword = false;
-
- mMachineManaged = machineManaged;
- mSTokenApp = stApp;
- mShare = share;
-
- mCertType = null;
- mFingerPrint = null;
-
- mImsi = null;
- }
-
- public Credential(long ctime, long expTime, String realm, boolean checkAAACert,
- EAPMethod eapMethod, Credential.CertType certType, byte[] fingerPrint) {
- mCtime = ctime;
- mExpTime = expTime;
- mRealm = realm;
- mCheckAAACert = checkAAACert;
- mEAPMethod = eapMethod;
- mCertType = certType;
- mFingerPrint = fingerPrint;
-
- mUserName = null;
- mPassword = null;
- mDisregardPassword = false;
- mMachineManaged = false;
- mSTokenApp = null;
- mShare = false;
-
- mImsi = null;
- }
-
- public Credential(long ctime, long expTime, String realm, boolean checkAAACert,
- EAPMethod eapMethod, IMSIParameter imsi) {
- mCtime = ctime;
- mExpTime = expTime;
- mRealm = realm;
- mCheckAAACert = checkAAACert;
- mEAPMethod = eapMethod;
- mImsi = imsi;
-
- mCertType = null;
- mFingerPrint = null;
-
- mUserName = null;
- mPassword = null;
- mDisregardPassword = false;
- mMachineManaged = false;
- mSTokenApp = null;
- mShare = false;
- }
-
- public Credential(Credential other, String password) {
- mCtime = other.mCtime;
- mExpTime = other.mExpTime;
- mRealm = other.mRealm;
- mCheckAAACert = other.mCheckAAACert;
- mUserName = other.mUserName;
- mPassword = password;
- mDisregardPassword = other.mDisregardPassword;
- mMachineManaged = other.mMachineManaged;
- mSTokenApp = other.mSTokenApp;
- mShare = other.mShare;
- mEAPMethod = other.mEAPMethod;
- mCertType = other.mCertType;
- mFingerPrint = other.mFingerPrint;
- mImsi = other.mImsi;
- }
-
- public static CertType mapCertType(String certType) throws OMAException {
- if (certType.equalsIgnoreCase(CertTypeX509)) {
- return CertType.x509v3;
- } else if (certType.equalsIgnoreCase(CertTypeIEEE)) {
- return CertType.IEEE;
- } else {
- throw new OMAException("Invalid cert type: '" + certType + "'");
- }
- }
-
- public EAPMethod getEAPMethod() {
- return mEAPMethod;
- }
-
- public String getRealm() {
- return mRealm;
- }
-
- public IMSIParameter getImsi() {
- return mImsi;
- }
-
- public String getUserName() {
- return mUserName;
- }
-
- public String getPassword() {
- return mPassword;
- }
-
- public boolean hasDisregardPassword() {
- return mDisregardPassword;
- }
-
- public CertType getCertType() {
- return mCertType;
- }
-
- public byte[] getFingerPrint() {
- return mFingerPrint;
- }
-
- public long getCtime() {
- return mCtime;
- }
-
- public long getExpTime() {
- return mExpTime;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Credential that = (Credential) o;
-
- if (mCheckAAACert != that.mCheckAAACert) return false;
- if (mCtime != that.mCtime) return false;
- if (mExpTime != that.mExpTime) return false;
- if (mMachineManaged != that.mMachineManaged) return false;
- if (mShare != that.mShare) return false;
- if (mCertType != that.mCertType) return false;
- if (!mEAPMethod.equals(that.mEAPMethod)) return false;
- if (!Arrays.equals(mFingerPrint, that.mFingerPrint)) return false;
- if (!safeEquals(mImsi, that.mImsi)) {
- return false;
- }
-
- if (!mDisregardPassword && !safeEquals(mPassword, that.mPassword)) {
- return false;
- }
-
- if (!mRealm.equals(that.mRealm)) return false;
- if (!safeEquals(mSTokenApp, that.mSTokenApp)) {
- return false;
- }
- if (!safeEquals(mUserName, that.mUserName)) {
- return false;
- }
-
- return true;
- }
-
- private static boolean safeEquals(Object s1, Object s2) {
- if (s1 == null) {
- return s2 == null;
- } else {
- return s2 != null && s1.equals(s2);
- }
- }
-
- @Override
- public int hashCode() {
- int result = (int) (mCtime ^ (mCtime >>> 32));
- result = 31 * result + (int) (mExpTime ^ (mExpTime >>> 32));
- result = 31 * result + mRealm.hashCode();
- result = 31 * result + (mCheckAAACert ? 1 : 0);
- result = 31 * result + (mUserName != null ? mUserName.hashCode() : 0);
- result = 31 * result + (mPassword != null ? mPassword.hashCode() : 0);
- result = 31 * result + (mMachineManaged ? 1 : 0);
- result = 31 * result + (mSTokenApp != null ? mSTokenApp.hashCode() : 0);
- result = 31 * result + (mShare ? 1 : 0);
- result = 31 * result + mEAPMethod.hashCode();
- result = 31 * result + (mCertType != null ? mCertType.hashCode() : 0);
- result = 31 * result + (mFingerPrint != null ? Arrays.hashCode(mFingerPrint) : 0);
- result = 31 * result + (mImsi != null ? mImsi.hashCode() : 0);
- return result;
- }
-
- @Override
- public String toString() {
- return "Credential{" +
- "mCtime=" + Utils.toUTCString(mCtime) +
- ", mExpTime=" + Utils.toUTCString(mExpTime) +
- ", mRealm='" + mRealm + '\'' +
- ", mCheckAAACert=" + mCheckAAACert +
- ", mUserName='" + mUserName + '\'' +
- ", mPassword='" + mPassword + '\'' +
- ", mDisregardPassword=" + mDisregardPassword +
- ", mMachineManaged=" + mMachineManaged +
- ", mSTokenApp='" + mSTokenApp + '\'' +
- ", mShare=" + mShare +
- ", mEAPMethod=" + mEAPMethod +
- ", mCertType=" + mCertType +
- ", mFingerPrint=" + Utils.toHexString(mFingerPrint) +
- ", mImsi='" + mImsi + '\'' +
- '}';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/pps/DomainMatcher.java b/packages/Osu/src/com/android/hotspot2/pps/DomainMatcher.java
deleted file mode 100644
index 10768d6..0000000
--- a/packages/Osu/src/com/android/hotspot2/pps/DomainMatcher.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.android.hotspot2.pps;
-
-import com.android.hotspot2.Utils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-public class DomainMatcher {
-
- public enum Match {None, Primary, Secondary}
-
- private final Label mRoot;
-
- private static class Label {
- private final Map<String, Label> mSubDomains;
- private final Match mMatch;
-
- private Label(Match match) {
- mMatch = match;
- mSubDomains = match == Match.None ? new HashMap<String, Label>() : null;
- }
-
- private void addDomain(Iterator<String> labels, Match match) {
- String labelName = labels.next();
- if (labels.hasNext()) {
- Label subLabel = new Label(Match.None);
- mSubDomains.put(labelName, subLabel);
- subLabel.addDomain(labels, match);
- } else {
- mSubDomains.put(labelName, new Label(match));
- }
- }
-
- private Label getSubLabel(String labelString) {
- return mSubDomains.get(labelString);
- }
-
- public Match getMatch() {
- return mMatch;
- }
-
- private void toString(StringBuilder sb) {
- if (mSubDomains != null) {
- sb.append(".{");
- for (Map.Entry<String, Label> entry : mSubDomains.entrySet()) {
- sb.append(entry.getKey());
- entry.getValue().toString(sb);
- }
- sb.append('}');
- } else {
- sb.append('=').append(mMatch);
- }
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- toString(sb);
- return sb.toString();
- }
- }
-
- public DomainMatcher(List<String> primary, List<List<String>> secondary) {
- mRoot = new Label(Match.None);
- for (List<String> secondaryLabel : secondary) {
- mRoot.addDomain(secondaryLabel.iterator(), Match.Secondary);
- }
- // Primary overwrites secondary.
- mRoot.addDomain(primary.iterator(), Match.Primary);
- }
-
- /**
- * Check if domain is either a the same or a sub-domain of any of the domains in the domain tree
- * in this matcher, i.e. all or or a sub-set of the labels in domain matches a path in the tree.
- *
- * @param domain Domain to be checked.
- * @return None if domain is not a sub-domain, Primary if it matched one of the primary domains
- * or Secondary if it matched on of the secondary domains.
- */
- public Match isSubDomain(List<String> domain) {
-
- Label label = mRoot;
- for (String labelString : domain) {
- label = label.getSubLabel(labelString);
- if (label == null) {
- return Match.None;
- } else if (label.getMatch() != Match.None) {
- return label.getMatch();
- }
- }
- return Match.None; // Domain is a super domain
- }
-
- public static boolean arg2SubdomainOfArg1(List<String> arg1, List<String> arg2) {
- if (arg2.size() < arg1.size()) {
- return false;
- }
-
- Iterator<String> l1 = arg1.iterator();
- Iterator<String> l2 = arg2.iterator();
-
- while (l1.hasNext()) {
- if (!l1.next().equals(l2.next())) {
- return false;
- }
- }
- return true;
- }
-
- @Override
- public String toString() {
- return "Domain matcher " + mRoot;
- }
-
- private static final String[] TestDomains = {
- "garbage.apple.com",
- "apple.com",
- "com",
- "jan.android.google.com.",
- "jan.android.google.com",
- "android.google.com",
- "google.com",
- "jan.android.google.net.",
- "jan.android.google.net",
- "android.google.net",
- "google.net",
- "net.",
- "."
- };
-
- public static void main(String[] args) {
- DomainMatcher dm1 = new DomainMatcher(Utils.splitDomain("android.google.com"),
- Collections.<List<String>>emptyList());
- for (String domain : TestDomains) {
- System.out.println(domain + ": " + dm1.isSubDomain(Utils.splitDomain(domain)));
- }
- List<List<String>> secondaries = new ArrayList<List<String>>();
- secondaries.add(Utils.splitDomain("apple.com"));
- secondaries.add(Utils.splitDomain("net"));
- DomainMatcher dm2 = new DomainMatcher(Utils.splitDomain("android.google.com"), secondaries);
- for (String domain : TestDomains) {
- System.out.println(domain + ": " + dm2.isSubDomain(Utils.splitDomain(domain)));
- }
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/pps/HomeSP.java b/packages/Osu/src/com/android/hotspot2/pps/HomeSP.java
deleted file mode 100644
index cfbf9d1..0000000
--- a/packages/Osu/src/com/android/hotspot2/pps/HomeSP.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.android.hotspot2.pps;
-
-import com.android.hotspot2.Utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class HomeSP {
- private final Map<String, Long> mSSIDs; // SSID, HESSID, [0,N]
- private final String mFQDN;
- private final DomainMatcher mDomainMatcher;
- private final Set<String> mOtherHomePartners;
- private final HashSet<Long> mRoamingConsortiums; // [0,N]
- private final Set<Long> mMatchAnyOIs; // [0,N]
- private final List<Long> mMatchAllOIs; // [0,N]
-
- private final Credential mCredential;
-
- // Informational:
- private final String mFriendlyName; // [1]
- private final String mIconURL; // [0,1]
-
- private final Policy mPolicy;
- private final int mCredentialPriority;
- private final Map<String, String> mAAATrustRoots;
- private final UpdateInfo mSubscriptionUpdate;
- private final SubscriptionParameters mSubscriptionParameters;
- private final int mUpdateIdentifier;
-
- @Deprecated
- public HomeSP(Map<String, Long> ssidMap,
- /*@NotNull*/ String fqdn,
- /*@NotNull*/ HashSet<Long> roamingConsortiums,
- /*@NotNull*/ Set<String> otherHomePartners,
- /*@NotNull*/ Set<Long> matchAnyOIs,
- /*@NotNull*/ List<Long> matchAllOIs,
- String friendlyName,
- String iconURL,
- Credential credential) {
-
- mSSIDs = ssidMap;
- List<List<String>> otherPartners = new ArrayList<>(otherHomePartners.size());
- for (String otherPartner : otherHomePartners) {
- otherPartners.add(Utils.splitDomain(otherPartner));
- }
- mOtherHomePartners = otherHomePartners;
- mFQDN = fqdn;
- mDomainMatcher = new DomainMatcher(Utils.splitDomain(fqdn), otherPartners);
- mRoamingConsortiums = roamingConsortiums;
- mMatchAnyOIs = matchAnyOIs;
- mMatchAllOIs = matchAllOIs;
- mFriendlyName = friendlyName;
- mIconURL = iconURL;
- mCredential = credential;
-
- mPolicy = null;
- mCredentialPriority = -1;
- mAAATrustRoots = null;
- mSubscriptionUpdate = null;
- mSubscriptionParameters = null;
- mUpdateIdentifier = -1;
- }
-
- public HomeSP(Map<String, Long> ssidMap,
- /*@NotNull*/ String fqdn,
- /*@NotNull*/ HashSet<Long> roamingConsortiums,
- /*@NotNull*/ Set<String> otherHomePartners,
- /*@NotNull*/ Set<Long> matchAnyOIs,
- /*@NotNull*/ List<Long> matchAllOIs,
- String friendlyName,
- String iconURL,
- Credential credential,
-
- Policy policy,
- int credentialPriority,
- Map<String, String> AAATrustRoots,
- UpdateInfo subscriptionUpdate,
- SubscriptionParameters subscriptionParameters,
- int updateIdentifier) {
-
- mSSIDs = ssidMap;
- List<List<String>> otherPartners = new ArrayList<>(otherHomePartners.size());
- for (String otherPartner : otherHomePartners) {
- otherPartners.add(Utils.splitDomain(otherPartner));
- }
- mOtherHomePartners = otherHomePartners;
- mFQDN = fqdn;
- mDomainMatcher = new DomainMatcher(Utils.splitDomain(fqdn), otherPartners);
- mRoamingConsortiums = roamingConsortiums;
- mMatchAnyOIs = matchAnyOIs;
- mMatchAllOIs = matchAllOIs;
- mFriendlyName = friendlyName;
- mIconURL = iconURL;
- mCredential = credential;
-
- mPolicy = policy;
- mCredentialPriority = credentialPriority;
- mAAATrustRoots = AAATrustRoots;
- mSubscriptionUpdate = subscriptionUpdate;
- mSubscriptionParameters = subscriptionParameters;
- mUpdateIdentifier = updateIdentifier;
- }
-
- public int getUpdateIdentifier() {
- return mUpdateIdentifier;
- }
-
- public UpdateInfo getSubscriptionUpdate() {
- return mSubscriptionUpdate;
- }
-
- public Policy getPolicy() {
- return mPolicy;
- }
-
- private String imsiMatch(List<String> imsis, String mccMnc) {
- if (mCredential.getImsi().matchesMccMnc(mccMnc)) {
- for (String imsi : imsis) {
- if (imsi.startsWith(mccMnc)) {
- return imsi;
- }
- }
- }
- return null;
- }
-
- public String getFQDN() {
- return mFQDN;
- }
-
- public String getFriendlyName() {
- return mFriendlyName;
- }
-
- public HashSet<Long> getRoamingConsortiums() {
- return mRoamingConsortiums;
- }
-
- public Credential getCredential() {
- return mCredential;
- }
-
- public Map<String, Long> getSSIDs() {
- return mSSIDs;
- }
-
- public Collection<String> getOtherHomePartners() {
- return mOtherHomePartners;
- }
-
- public Set<Long> getMatchAnyOIs() {
- return mMatchAnyOIs;
- }
-
- public List<Long> getMatchAllOIs() {
- return mMatchAllOIs;
- }
-
- public String getIconURL() {
- return mIconURL;
- }
-
- public boolean deepEquals(HomeSP other) {
- return mFQDN.equals(other.mFQDN) &&
- mSSIDs.equals(other.mSSIDs) &&
- mOtherHomePartners.equals(other.mOtherHomePartners) &&
- mRoamingConsortiums.equals(other.mRoamingConsortiums) &&
- mMatchAnyOIs.equals(other.mMatchAnyOIs) &&
- mMatchAllOIs.equals(other.mMatchAllOIs) &&
- mFriendlyName.equals(other.mFriendlyName) &&
- Utils.compare(mIconURL, other.mIconURL) == 0 &&
- mCredential.equals(other.mCredential);
- }
-
- @Override
- public boolean equals(Object thatObject) {
- if (this == thatObject) {
- return true;
- } else if (thatObject == null || getClass() != thatObject.getClass()) {
- return false;
- }
-
- HomeSP that = (HomeSP) thatObject;
- return mFQDN.equals(that.mFQDN);
- }
-
- @Override
- public int hashCode() {
- return mFQDN.hashCode();
- }
-
- @Override
- public String toString() {
- return "HomeSP{" +
- "SSIDs=" + mSSIDs +
- ", FQDN='" + mFQDN + '\'' +
- ", DomainMatcher=" + mDomainMatcher +
- ", RoamingConsortiums={" + Utils.roamingConsortiumsToString(mRoamingConsortiums) +
- '}' +
- ", MatchAnyOIs={" + Utils.roamingConsortiumsToString(mMatchAnyOIs) + '}' +
- ", MatchAllOIs={" + Utils.roamingConsortiumsToString(mMatchAllOIs) + '}' +
- ", Credential=" + mCredential +
- ", FriendlyName='" + mFriendlyName + '\'' +
- ", IconURL='" + mIconURL + '\'' +
- '}';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/pps/Policy.java b/packages/Osu/src/com/android/hotspot2/pps/Policy.java
deleted file mode 100644
index 5180436..0000000
--- a/packages/Osu/src/com/android/hotspot2/pps/Policy.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.android.hotspot2.pps;
-
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.omadm.MOManager;
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.OMANode;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.android.hotspot2.omadm.MOManager.TAG_Country;
-import static com.android.hotspot2.omadm.MOManager.TAG_DLBandwidth;
-import static com.android.hotspot2.omadm.MOManager.TAG_FQDN_Match;
-import static com.android.hotspot2.omadm.MOManager.TAG_IPProtocol;
-import static com.android.hotspot2.omadm.MOManager.TAG_MaximumBSSLoadValue;
-import static com.android.hotspot2.omadm.MOManager.TAG_MinBackhaulThreshold;
-import static com.android.hotspot2.omadm.MOManager.TAG_NetworkType;
-import static com.android.hotspot2.omadm.MOManager.TAG_PolicyUpdate;
-import static com.android.hotspot2.omadm.MOManager.TAG_PortNumber;
-import static com.android.hotspot2.omadm.MOManager.TAG_PreferredRoamingPartnerList;
-import static com.android.hotspot2.omadm.MOManager.TAG_Priority;
-import static com.android.hotspot2.omadm.MOManager.TAG_RequiredProtoPortTuple;
-import static com.android.hotspot2.omadm.MOManager.TAG_SPExclusionList;
-import static com.android.hotspot2.omadm.MOManager.TAG_SSID;
-import static com.android.hotspot2.omadm.MOManager.TAG_ULBandwidth;
-
-public class Policy {
- private final List<PreferredRoamingPartner> mPreferredRoamingPartners;
- private final List<MinBackhaul> mMinBackhaulThresholds;
- private final UpdateInfo mPolicyUpdate;
- private final List<String> mSPExclusionList;
- private final Map<Integer, List<Integer>> mRequiredProtos;
- private final int mMaxBSSLoad;
-
- public Policy(OMANode node) throws OMAException {
-
- OMANode rpNode = node.getChild(TAG_PreferredRoamingPartnerList);
- if (rpNode == null) {
- mPreferredRoamingPartners = null;
- } else {
- mPreferredRoamingPartners = new ArrayList<>(rpNode.getChildren().size());
- for (OMANode instance : rpNode.getChildren()) {
- if (instance.isLeaf()) {
- throw new OMAException("Not expecting leaf node in " +
- TAG_PreferredRoamingPartnerList);
- }
- mPreferredRoamingPartners.add(new PreferredRoamingPartner(instance));
- }
- }
-
- OMANode bhtNode = node.getChild(TAG_MinBackhaulThreshold);
- if (bhtNode == null) {
- mMinBackhaulThresholds = null;
- } else {
- mMinBackhaulThresholds = new ArrayList<>(bhtNode.getChildren().size());
- for (OMANode instance : bhtNode.getChildren()) {
- if (instance.isLeaf()) {
- throw new OMAException("Not expecting leaf node in " +
- TAG_MinBackhaulThreshold);
- }
- mMinBackhaulThresholds.add(new MinBackhaul(instance));
- }
- }
-
- mPolicyUpdate = new UpdateInfo(node.getChild(TAG_PolicyUpdate));
-
- OMANode sxNode = node.getChild(TAG_SPExclusionList);
- if (sxNode == null) {
- mSPExclusionList = null;
- } else {
- mSPExclusionList = new ArrayList<>(sxNode.getChildren().size());
- for (OMANode instance : sxNode.getChildren()) {
- if (instance.isLeaf()) {
- throw new OMAException("Not expecting leaf node in " + TAG_SPExclusionList);
- }
- mSPExclusionList.add(MOManager.getString(instance, TAG_SSID));
- }
- }
-
- OMANode rptNode = node.getChild(TAG_RequiredProtoPortTuple);
- if (rptNode == null) {
- mRequiredProtos = null;
- } else {
- mRequiredProtos = new HashMap<>(rptNode.getChildren().size());
- for (OMANode instance : rptNode.getChildren()) {
- if (instance.isLeaf()) {
- throw new OMAException("Not expecting leaf node in " +
- TAG_RequiredProtoPortTuple);
- }
- int protocol = (int) MOManager.getLong(instance, TAG_IPProtocol, null);
- String[] portSegments = MOManager.getString(instance, TAG_PortNumber).split(",");
- List<Integer> ports = new ArrayList<>(portSegments.length);
- for (String portSegment : portSegments) {
- try {
- ports.add(Integer.parseInt(portSegment));
- } catch (NumberFormatException nfe) {
- throw new OMAException("Port is not a number: " + portSegment);
- }
- }
- mRequiredProtos.put(protocol, ports);
- }
- }
-
- mMaxBSSLoad = (int) MOManager.getLong(node, TAG_MaximumBSSLoadValue, Long.MAX_VALUE);
- }
-
- public List<PreferredRoamingPartner> getPreferredRoamingPartners() {
- return mPreferredRoamingPartners;
- }
-
- public List<MinBackhaul> getMinBackhaulThresholds() {
- return mMinBackhaulThresholds;
- }
-
- public UpdateInfo getPolicyUpdate() {
- return mPolicyUpdate;
- }
-
- public List<String> getSPExclusionList() {
- return mSPExclusionList;
- }
-
- public Map<Integer, List<Integer>> getRequiredProtos() {
- return mRequiredProtos;
- }
-
- public int getMaxBSSLoad() {
- return mMaxBSSLoad;
- }
-
- private static class PreferredRoamingPartner {
- private final List<String> mDomain;
- private final Boolean mIncludeSubDomains;
- private final int mPriority;
- private final String mCountry;
-
- private PreferredRoamingPartner(OMANode node)
- throws OMAException {
-
- String[] segments = MOManager.getString(node, TAG_FQDN_Match).split(",");
- if (segments.length != 2) {
- throw new OMAException("Bad FQDN match string: " + TAG_FQDN_Match);
- }
- mDomain = Utils.splitDomain(segments[0]);
- mIncludeSubDomains = MOManager.getSelection(TAG_FQDN_Match, segments[1]);
- mPriority = (int) MOManager.getLong(node, TAG_Priority, null);
- mCountry = MOManager.getString(node, TAG_Country);
- }
-
- @Override
- public String toString() {
- return "PreferredRoamingPartner{" +
- "domain=" + mDomain +
- ", includeSubDomains=" + mIncludeSubDomains +
- ", priority=" + mPriority +
- ", country='" + mCountry + '\'' +
- '}';
- }
- }
-
- private static class MinBackhaul {
- private final Boolean mHome;
- private final long mDL;
- private final long mUL;
-
- private MinBackhaul(OMANode node) throws OMAException {
- mHome = MOManager.getSelection(node, TAG_NetworkType);
- mDL = MOManager.getLong(node, TAG_DLBandwidth, Long.MAX_VALUE);
- mUL = MOManager.getLong(node, TAG_ULBandwidth, Long.MAX_VALUE);
- }
-
- @Override
- public String toString() {
- return "MinBackhaul{" +
- "home=" + mHome +
- ", DL=" + mDL +
- ", UL=" + mUL +
- '}';
- }
- }
-
- @Override
- public String toString() {
- return "Policy{" +
- "preferredRoamingPartners=" + mPreferredRoamingPartners +
- ", minBackhaulThresholds=" + mMinBackhaulThresholds +
- ", policyUpdate=" + mPolicyUpdate +
- ", SPExclusionList=" + mSPExclusionList +
- ", requiredProtos=" + mRequiredProtos +
- ", maxBSSLoad=" + mMaxBSSLoad +
- '}';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/pps/SubscriptionParameters.java b/packages/Osu/src/com/android/hotspot2/pps/SubscriptionParameters.java
deleted file mode 100644
index e073ad7..0000000
--- a/packages/Osu/src/com/android/hotspot2/pps/SubscriptionParameters.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.android.hotspot2.pps;
-
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.omadm.MOManager;
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.OMANode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.android.hotspot2.omadm.MOManager.TAG_CreationDate;
-import static com.android.hotspot2.omadm.MOManager.TAG_DataLimit;
-import static com.android.hotspot2.omadm.MOManager.TAG_ExpirationDate;
-import static com.android.hotspot2.omadm.MOManager.TAG_StartDate;
-import static com.android.hotspot2.omadm.MOManager.TAG_TimeLimit;
-import static com.android.hotspot2.omadm.MOManager.TAG_TypeOfSubscription;
-import static com.android.hotspot2.omadm.MOManager.TAG_UsageLimits;
-import static com.android.hotspot2.omadm.MOManager.TAG_UsageTimePeriod;
-
-public class SubscriptionParameters {
- private final long mCDate;
- private final long mXDate;
- private final String mType;
- private final List<Limit> mLimits;
-
- public SubscriptionParameters(OMANode node) throws OMAException {
- mCDate = MOManager.getTime(node.getChild(TAG_CreationDate));
- mXDate = MOManager.getTime(node.getChild(TAG_ExpirationDate));
- mType = MOManager.getString(node.getChild(TAG_TypeOfSubscription));
-
- OMANode ulNode = node.getChild(TAG_UsageLimits);
- if (ulNode == null) {
- mLimits = null;
- } else {
- mLimits = new ArrayList<>(ulNode.getChildren().size());
- for (OMANode instance : ulNode.getChildren()) {
- if (instance.isLeaf()) {
- throw new OMAException("Not expecting leaf node in " +
- TAG_UsageLimits);
- }
- mLimits.add(new Limit(instance));
- }
- }
-
- }
-
- private static class Limit {
- private final long mDataLimit;
- private final long mStartDate;
- private final long mTimeLimit;
- private final long mUsageTimePeriod;
-
- private Limit(OMANode node) throws OMAException {
- mDataLimit = MOManager.getLong(node, TAG_DataLimit, Long.MAX_VALUE);
- mStartDate = MOManager.getTime(node.getChild(TAG_StartDate));
- mTimeLimit = MOManager.getLong(node, TAG_TimeLimit, Long.MAX_VALUE) *
- MOManager.IntervalFactor;
- mUsageTimePeriod = MOManager.getLong(node, TAG_UsageTimePeriod, null);
- }
-
- @Override
- public String toString() {
- return "Limit{" +
- "dataLimit=" + mDataLimit +
- ", startDate=" + Utils.toUTCString(mStartDate) +
- ", timeLimit=" + mTimeLimit +
- ", usageTimePeriod=" + mUsageTimePeriod +
- '}';
- }
- }
-
- @Override
- public String toString() {
- return "SubscriptionParameters{" +
- "cDate=" + Utils.toUTCString(mCDate) +
- ", xDate=" + Utils.toUTCString(mXDate) +
- ", type='" + mType + '\'' +
- ", limits=" + mLimits +
- '}';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/pps/UpdateInfo.java b/packages/Osu/src/com/android/hotspot2/pps/UpdateInfo.java
deleted file mode 100644
index 645e1fa..0000000
--- a/packages/Osu/src/com/android/hotspot2/pps/UpdateInfo.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.android.hotspot2.pps;
-
-import android.util.Base64;
-
-import com.android.hotspot2.Utils;
-import com.android.hotspot2.omadm.MOManager;
-import com.android.hotspot2.omadm.OMAException;
-import com.android.hotspot2.omadm.OMANode;
-
-import java.nio.charset.StandardCharsets;
-
-import static com.android.hotspot2.omadm.MOManager.TAG_CertSHA256Fingerprint;
-import static com.android.hotspot2.omadm.MOManager.TAG_CertURL;
-import static com.android.hotspot2.omadm.MOManager.TAG_Password;
-import static com.android.hotspot2.omadm.MOManager.TAG_Restriction;
-import static com.android.hotspot2.omadm.MOManager.TAG_TrustRoot;
-import static com.android.hotspot2.omadm.MOManager.TAG_URI;
-import static com.android.hotspot2.omadm.MOManager.TAG_UpdateInterval;
-import static com.android.hotspot2.omadm.MOManager.TAG_UpdateMethod;
-import static com.android.hotspot2.omadm.MOManager.TAG_Username;
-import static com.android.hotspot2.omadm.MOManager.TAG_UsernamePassword;
-
-public class UpdateInfo {
- public enum UpdateRestriction {HomeSP, RoamingPartner, Unrestricted}
-
- public static final long NO_UPDATE = 0xffffffffL;
-
- private final long mInterval;
- private final boolean mSPPClientInitiated;
- private final UpdateRestriction mUpdateRestriction;
- private final String mURI;
- private final String mUsername;
- private final String mPassword;
- private final String mCertURL;
- private final String mCertFP;
-
- public UpdateInfo(OMANode policyUpdate) throws OMAException {
- long minutes = MOManager.getLong(policyUpdate, TAG_UpdateInterval, null);
- mInterval = minutes == NO_UPDATE ? -1 : minutes * MOManager.IntervalFactor;
- mSPPClientInitiated = MOManager.getSelection(policyUpdate, TAG_UpdateMethod);
- mUpdateRestriction = MOManager.getSelection(policyUpdate, TAG_Restriction);
- mURI = MOManager.getString(policyUpdate, TAG_URI);
-
- OMANode unp = policyUpdate.getChild(TAG_UsernamePassword);
- if (unp != null) {
- mUsername = MOManager.getString(unp.getChild(TAG_Username));
- String pw = MOManager.getString(unp.getChild(TAG_Password));
- mPassword = new String(Base64.decode(pw.getBytes(StandardCharsets.US_ASCII),
- Base64.DEFAULT), StandardCharsets.UTF_8);
- } else {
- mUsername = null;
- mPassword = null;
- }
-
- OMANode trustRoot = MOManager.getChild(policyUpdate, TAG_TrustRoot);
- mCertURL = MOManager.getString(trustRoot, TAG_CertURL);
- mCertFP = MOManager.getString(trustRoot, TAG_CertSHA256Fingerprint);
- }
-
- public long getInterval() {
- return mInterval;
- }
-
- public boolean isSPPClientInitiated() {
- return mSPPClientInitiated;
- }
-
- public UpdateRestriction getUpdateRestriction() {
- return mUpdateRestriction;
- }
-
- public String getURI() {
- return mURI;
- }
-
- public String getUsername() {
- return mUsername;
- }
-
- public String getPassword() {
- return mPassword;
- }
-
- public String getCertURL() {
- return mCertURL;
- }
-
- public String getCertFP() {
- return mCertFP;
- }
-
- @Override
- public String toString() {
- return "UpdateInfo{" +
- "interval=" + Utils.toHMS(mInterval) +
- ", SPPClientInitiated=" + mSPPClientInitiated +
- ", updateRestriction=" + mUpdateRestriction +
- ", URI='" + mURI + '\'' +
- ", username='" + mUsername + '\'' +
- ", password=" + mPassword +
- ", certURL='" + mCertURL + '\'' +
- ", certFP='" + mCertFP + '\'' +
- '}';
- }
-}
diff --git a/packages/Osu/src/com/android/hotspot2/utils/HTTPMessage.java b/packages/Osu/src/com/android/hotspot2/utils/HTTPMessage.java
deleted file mode 100644
index c675efd..0000000
--- a/packages/Osu/src/com/android/hotspot2/utils/HTTPMessage.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.android.hotspot2.utils;
-
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.Map;
-
-public interface HTTPMessage {
- public static final String HTTPVersion = "HTTP/1.1";
- public static final String AgentHeader = "User-Agent";
- public static final String AgentName = "Android HS Client";
- public static final String HostHeader = "Host";
- public static final String AcceptHeader = "Accept";
- public static final String LengthHeader = "Content-Length";
- public static final String ContentTypeHeader = "Content-Type";
- public static final String ContentLengthHeader = "Content-Length";
- public static final String ContentEncodingHeader = "Content-Transfer-Encoding";
- public static final String AuthHeader = "WWW-Authenticate";
- public static final String AuthorizationHeader = "Authorization";
-
- public static final String ContentTypeSOAP = "application/soap+xml";
-
- public static final int RX_BUFFER = 32768;
- public static final String CRLF = "\r\n";
- public static final int BODY_SEPARATOR = 0x0d0a0d0a;
- public static final int BODY_SEPARATOR_LENGTH = 4;
-
- public enum Method {GET, PUT, POST}
-
- public Map<String, String> getHeaders();
-
- public InputStream getPayloadStream();
-
- public ByteBuffer getPayload();
-
- public ByteBuffer getBinaryPayload();
-}
diff --git a/packages/Osu/src/com/android/hotspot2/utils/HTTPRequest.java b/packages/Osu/src/com/android/hotspot2/utils/HTTPRequest.java
deleted file mode 100644
index e97c15a..0000000
--- a/packages/Osu/src/com/android/hotspot2/utils/HTTPRequest.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package com.android.hotspot2.utils;
-
-import android.util.Base64;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.SecureRandom;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-public class HTTPRequest implements HTTPMessage {
- private static final Charset HeaderCharset = StandardCharsets.US_ASCII;
- private static final int HTTPS_PORT = 443;
-
- private final String mMethodLine;
- private final Map<String, String> mHeaderFields;
- private final byte[] mBody;
-
- public HTTPRequest(Method method, URL url) {
- this(null, null, method, url, null, false);
- }
-
- public HTTPRequest(String payload, Charset charset, Method method, URL url, String contentType,
- boolean base64) {
- mBody = payload != null ? payload.getBytes(charset) : null;
-
- mHeaderFields = new LinkedHashMap<>();
- mHeaderFields.put(AgentHeader, AgentName);
- if (url.getPort() != HTTPS_PORT) {
- mHeaderFields.put(HostHeader, url.getHost() + ':' + url.getPort());
- } else {
- mHeaderFields.put(HostHeader, url.getHost());
- }
- mHeaderFields.put(AcceptHeader, "*/*");
- if (payload != null) {
- if (base64) {
- mHeaderFields.put(ContentTypeHeader, contentType);
- mHeaderFields.put(ContentEncodingHeader, "base64");
- } else {
- mHeaderFields.put(ContentTypeHeader, contentType + "; charset=" +
- charset.displayName().toLowerCase());
- }
- mHeaderFields.put(ContentLengthHeader, Integer.toString(mBody.length));
- }
-
- mMethodLine = method.name() + ' ' + url.getPath() + ' ' + HTTPVersion + CRLF;
- }
-
- public void doAuthenticate(HTTPResponse httpResponse, String userName, byte[] password,
- URL url, int sequence) throws IOException, GeneralSecurityException {
- mHeaderFields.put(HTTPMessage.AuthorizationHeader,
- generateAuthAnswer(httpResponse, userName, password, url, sequence));
- }
-
- private static String generateAuthAnswer(HTTPResponse httpResponse, String userName,
- byte[] password, URL url, int sequence)
- throws IOException, GeneralSecurityException {
-
- String authRequestLine = httpResponse.getHeader(HTTPMessage.AuthHeader);
- if (authRequestLine == null) {
- throw new IOException("Missing auth line");
- }
- String[] tokens = authRequestLine.split("[ ,]+");
- //System.out.println("Tokens: " + Arrays.toString(tokens));
- if (tokens.length < 3 || !tokens[0].equalsIgnoreCase("digest")) {
- throw new IOException("Bad " + HTTPMessage.AuthHeader + ": '" + authRequestLine + "'");
- }
-
- Map<String, String> itemMap = new HashMap<>();
- for (int n = 1; n < tokens.length; n++) {
- String s = tokens[n];
- int split = s.indexOf('=');
- if (split < 0) {
- continue;
- }
- itemMap.put(s.substring(0, split).trim().toLowerCase(),
- unquote(s.substring(split + 1).trim()));
- }
-
- Set<String> qops = splitValue(itemMap.remove("qop"));
- if (!qops.contains("auth")) {
- throw new IOException("Unsupported quality of protection value(s): '" + qops + "'");
- }
- String algorithm = itemMap.remove("algorithm");
- if (algorithm != null && !algorithm.equalsIgnoreCase("md5")) {
- throw new IOException("Unsupported algorithm: '" + algorithm + "'");
- }
- String realm = itemMap.remove("realm");
- String nonceText = itemMap.remove("nonce");
- if (realm == null || nonceText == null) {
- throw new IOException("realm and/or nonce missing: '" + authRequestLine + "'");
- }
- //System.out.println("Remaining tokens: " + itemMap);
-
- byte[] cnonce = new byte[16];
- SecureRandom prng = new SecureRandom();
- prng.nextBytes(cnonce);
-
- /*
- * H(data) = MD5(data)
- * KD(secret, data) = H(concat(secret, ":", data))
- *
- * A1 = unq(username-value) ":" unq(realm-value) ":" passwd
- * A2 = Method ":" digest-uri-value
- *
- * response = KD ( H(A1), unq(nonce-value) ":" nc-value ":" unq(cnonce-value) ":"
- * unq(qop-value) ":" H(A2) )
- */
-
- String nc = String.format("%08d", sequence);
-
- /*
- * This bears witness to the ingenuity of the emerging "web generation" and the authors of
- * RFC-2617: Strings are treated as a sequence of octets in blind ignorance of character
- * encoding, whereas octets strings apparently aren't "good enough" and expanded to
- * "hex strings"...
- * As a wild guess I apply UTF-8 below.
- */
- String passwordString = new String(password, StandardCharsets.UTF_8);
- String cNonceString = bytesToHex(cnonce);
-
- byte[] a1 = hash(userName, realm, passwordString);
- byte[] a2 = hash("POST", url.getPath());
- byte[] response = hash(a1, nonceText, nc, cNonceString, "auth", a2);
-
- StringBuilder authLine = new StringBuilder();
- authLine.append("Digest ")
- .append("username=\"").append(userName).append("\", ")
- .append("realm=\"").append(realm).append("\", ")
- .append("nonce=\"").append(nonceText).append("\", ")
- .append("uri=\"").append(url.getPath()).append("\", ")
- .append("qop=\"auth\", ")
- .append("nc=").append(nc).append(", ")
- .append("cnonce=\"").append(cNonceString).append("\", ")
- .append("response=\"").append(bytesToHex(response)).append('"');
- String opaque = itemMap.get("opaque");
- if (opaque != null) {
- authLine.append(", \"").append(opaque).append('"');
- }
-
- return authLine.toString();
- }
-
- private static Set<String> splitValue(String value) {
- Set<String> result = new HashSet<>();
- if (value != null) {
- for (String s : value.split(",")) {
- result.add(s.trim());
- }
- }
- return result;
- }
-
- private static byte[] hash(Object... objects) throws GeneralSecurityException {
- MessageDigest hash = MessageDigest.getInstance("MD5");
-
- //System.out.println("<Hash>");
- boolean first = true;
- for (Object object : objects) {
- byte[] octets;
- if (object.getClass() == String.class) {
- //System.out.println("+= '" + object + "'");
- octets = ((String) object).getBytes(StandardCharsets.UTF_8);
- } else {
- octets = bytesToHexBytes((byte[]) object);
- //System.out.println("+= " + new String(octets, StandardCharsets.ISO_8859_1));
- }
- if (first) {
- first = false;
- } else {
- hash.update((byte) ':');
- }
- hash.update(octets);
- }
- //System.out.println("</Hash>");
- return hash.digest();
- }
-
- private static String unquote(String s) {
- return s.startsWith("\"") ? s.substring(1, s.length() - 1) : s;
- }
-
- private static byte[] bytesToHexBytes(byte[] octets) {
- return bytesToHex(octets).getBytes(StandardCharsets.ISO_8859_1);
- }
-
- private static String bytesToHex(byte[] octets) {
- StringBuilder sb = new StringBuilder(octets.length * 2);
- for (byte b : octets) {
- sb.append(String.format("%02x", b & 0xff));
- }
- return sb.toString();
- }
-
- private byte[] buildHeader() {
- StringBuilder header = new StringBuilder();
- header.append(mMethodLine);
- for (Map.Entry<String, String> entry : mHeaderFields.entrySet()) {
- header.append(entry.getKey()).append(": ").append(entry.getValue()).append(CRLF);
- }
- header.append(CRLF);
-
- //System.out.println("HTTP Request:");
- StringBuilder sb2 = new StringBuilder();
- sb2.append(header);
- if (mBody != null) {
- sb2.append(new String(mBody, StandardCharsets.ISO_8859_1));
- }
- //System.out.println(sb2);
- //System.out.println("End HTTP Request.");
-
- return header.toString().getBytes(HeaderCharset);
- }
-
- public void send(OutputStream out) throws IOException {
- out.write(buildHeader());
- if (mBody != null) {
- out.write(mBody);
- }
- out.flush();
- }
-
- @Override
- public Map<String, String> getHeaders() {
- return Collections.unmodifiableMap(mHeaderFields);
- }
-
- @Override
- public InputStream getPayloadStream() {
- return mBody != null ? new ByteArrayInputStream(mBody) : null;
- }
-
- @Override
- public ByteBuffer getPayload() {
- return mBody != null ? ByteBuffer.wrap(mBody) : null;
- }
-
- @Override
- public ByteBuffer getBinaryPayload() {
- byte[] binary = Base64.decode(mBody, Base64.DEFAULT);
- return ByteBuffer.wrap(binary);
- }
-
- public static void main(String[] args) throws GeneralSecurityException {
- test("Mufasa", "testrealm@host.com", "Circle Of Life", "GET", "/dir/index.html",
- "dcd98b7102dd2f0e8b11d0f600bfb0c093", "0a4f113b", "00000001", "auth",
- "6629fae49393a05397450978507c4ef1");
-
- // WWW-Authenticate: Digest realm="wi-fi.org", qop="auth",
- // nonce="MTQzMTg1MTIxMzUyNzo0OGFhNGU5ZTg4Y2M4YmFhYzM2MzAwZDg5MGNiYTJlNw=="
- // Authorization: Digest
- // username="1c7e1582-604d-4c00-b411-bb73735cbcb0"
- // realm="wi-fi.org"
- // nonce="MTQzMTg1MTIxMzUyNzo0OGFhNGU5ZTg4Y2M4YmFhYzM2MzAwZDg5MGNiYTJlNw=="
- // uri="/.well-known/est/simpleenroll"
- // cnonce="NzA3NDk0"
- // nc=00000001
- // qop="auth"
- // response="2c485d24076452e712b77f4e70776463"
-
- String nonce = "MTQzMTg1MTIxMzUyNzo0OGFhNGU5ZTg4Y2M4YmFhYzM2MzAwZDg5MGNiYTJlNw==";
- String cnonce = "NzA3NDk0";
- test("1c7e1582-604d-4c00-b411-bb73735cbcb0", "wi-fi.org", "ruckus1234", "POST",
- "/.well-known/est/simpleenroll",
- /*new String(Base64.getDecoder().decode(nonce), StandardCharsets.ISO_8859_1)*/
- nonce,
- /*new String(Base64.getDecoder().decode(cnonce), StandardCharsets.ISO_8859_1)*/
- cnonce, "00000001", "auth", "2c485d24076452e712b77f4e70776463");
- }
-
- private static void test(String user, String realm, String password, String method, String path,
- String nonce, String cnonce, String nc, String qop, String expect)
- throws GeneralSecurityException {
- byte[] a1 = hash(user, realm, password);
- System.out.println("HA1: " + bytesToHex(a1));
- byte[] a2 = hash(method, path);
- System.out.println("HA2: " + bytesToHex(a2));
- byte[] response = hash(a1, nonce, nc, cnonce, qop, a2);
-
- StringBuilder authLine = new StringBuilder();
- String responseString = bytesToHex(response);
- authLine.append("Digest ")
- .append("username=\"").append(user).append("\", ")
- .append("realm=\"").append(realm).append("\", ")
- .append("nonce=\"").append(nonce).append("\", ")
- .append("uri=\"").append(path).append("\", ")
- .append("qop=\"").append(qop).append("\", ")
- .append("nc=").append(nc).append(", ")
- .append("cnonce=\"").append(cnonce).append("\", ")
- .append("response=\"").append(responseString).append('"');
-
- System.out.println(authLine);
- System.out.println("Success: " + responseString.equals(expect));
- }
-}
\ No newline at end of file
diff --git a/packages/Osu/src/com/android/hotspot2/utils/HTTPResponse.java b/packages/Osu/src/com/android/hotspot2/utils/HTTPResponse.java
deleted file mode 100644
index b82814d..0000000
--- a/packages/Osu/src/com/android/hotspot2/utils/HTTPResponse.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.android.hotspot2.utils;
-
-import android.util.Base64;
-import android.util.Log;
-
-import com.android.hotspot2.osu.OSUManager;
-
-import java.io.ByteArrayInputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class HTTPResponse implements HTTPMessage {
- private final int mStatusCode;
- private final Map<String, String> mHeaders = new LinkedHashMap<>();
- private final ByteBuffer mBody;
-
- private static final String csIndicator = "charset=";
-
- public HTTPResponse(InputStream in) throws IOException {
- int expected = Integer.MAX_VALUE;
- int offset = 0;
- int body = -1;
- byte[] input = new byte[RX_BUFFER];
-
- int statusCode = -1;
- int bodyPattern = 0;
-
- while (offset < expected) {
- int amount = in.read(input, offset, input.length - offset);
- if (amount < 0) {
- throw new EOFException();
- }
-
- if (body < 0) {
- for (int n = offset; n < offset + amount; n++) {
- bodyPattern = (bodyPattern << 8) | (input[n] & 0xff);
- if (bodyPattern == 0x0d0a0d0a) {
- body = n + 1;
- statusCode = parseHeader(input, body, mHeaders);
- expected = calculateLength(body, mHeaders);
- if (expected > input.length) {
- input = Arrays.copyOf(input, expected);
- }
- break;
- }
- }
- }
- offset += amount;
- if (offset < expected && offset == input.length) {
- input = Arrays.copyOf(input, input.length * 2);
- }
- }
- mStatusCode = statusCode;
- mBody = ByteBuffer.wrap(input, body, expected - body);
- }
-
- private static int parseHeader(byte[] input, int body, Map<String, String> headers)
- throws IOException {
- String headerText = new String(input, 0, body - BODY_SEPARATOR_LENGTH,
- StandardCharsets.ISO_8859_1);
- //System.out.println("Received header: " + headerText);
- Iterator<String> headerLines = Arrays.asList(headerText.split(CRLF)).iterator();
- if (!headerLines.hasNext()) {
- throw new IOException("Bad HTTP Request");
- }
-
- int statusCode;
- String line0 = headerLines.next();
- String[] status = line0.split(" ");
- if (status.length != 3 || !"HTTP/1.1".equals(status[0])) {
- throw new IOException("Bad HTTP Result: " + line0);
- }
- try {
- statusCode = Integer.parseInt(status[1].trim());
- } catch (NumberFormatException nfe) {
- throw new IOException("Bad HTTP header line: '" + line0 + "'");
- }
-
- while (headerLines.hasNext()) {
- String line = headerLines.next();
- int keyEnd = line.indexOf(':');
- if (keyEnd < 0) {
- throw new IOException("Bad header line: '" + line + "'");
- }
- String key = line.substring(0, keyEnd).trim();
- String value = line.substring(keyEnd + 1).trim();
- headers.put(key, value);
- }
- return statusCode;
- }
-
- private static int calculateLength(int body, Map<String, String> headers) throws IOException {
- String contentLength = headers.get(LengthHeader);
- if (contentLength == null) {
- throw new IOException("No " + LengthHeader);
- }
- try {
- return body + Integer.parseInt(contentLength);
- } catch (NumberFormatException nfe) {
- throw new IOException("Bad " + LengthHeader + ": " + contentLength);
- }
- }
-
- public int getStatusCode() {
- return mStatusCode;
- }
-
- @Override
- public Map<String, String> getHeaders() {
- return Collections.unmodifiableMap(mHeaders);
- }
-
- public String getHeader(String key) {
- return mHeaders.get(key);
- }
-
- @Override
- public InputStream getPayloadStream() {
- return new ByteArrayInputStream(mBody.array(), mBody.position(),
- mBody.limit() - mBody.position());
- }
-
- @Override
- public ByteBuffer getPayload() {
- return mBody.duplicate();
- }
-
- @Override
- public ByteBuffer getBinaryPayload() {
- byte[] data = new byte[mBody.remaining()];
- mBody.duplicate().get(data);
- byte[] binary = Base64.decode(data, Base64.DEFAULT);
- return ByteBuffer.wrap(binary);
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("Status: ").append(mStatusCode).append(CRLF);
- for (Map.Entry<String, String> entry : mHeaders.entrySet()) {
- sb.append(entry.getKey()).append(": ").append(entry.getValue()).append(CRLF);
- }
- sb.append(CRLF);
- Charset charset;
- try {
- charset = Charset.forName(getCharset());
- } catch (IllegalArgumentException iae) {
- charset = StandardCharsets.ISO_8859_1;
- }
- sb.append(new String(mBody.array(), mBody.position(),
- mBody.limit() - mBody.position(), charset));
- return sb.toString();
- }
-
- public String getCharset() {
- String contentType = mHeaders.get(ContentTypeHeader);
- if (contentType == null) {
- return null;
- }
- int csPos = contentType.indexOf(csIndicator);
- return csPos < 0 ? null : contentType.substring(csPos + csIndicator.length()).trim();
- }
-
- private static boolean equals(byte[] b1, int offset, byte[] pattern) {
- for (int n = 0; n < pattern.length; n++) {
- if (b1[n + offset] != pattern[n]) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/packages/Osu2/Android.mk b/packages/Osu2/Android.mk
deleted file mode 100644
index 7de8908..0000000
--- a/packages/Osu2/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := Osu2
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-include $(BUILD_PACKAGE)
-
-########################
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/Osu2/AndroidManifest.xml b/packages/Osu2/AndroidManifest.xml
deleted file mode 100644
index 236b120b..0000000
--- a/packages/Osu2/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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="com.android.osu">
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
- <uses-permission android:name="android.permission.INTERNET" />
-
- <application
- android:enabled="true"
- android:icon="@mipmap/ic_launcher"
- android:label="@string/app_name">
- <activity android:name=".MainActivity" android:exported="true">
- </activity>
- </application>
-
-</manifest>
diff --git a/packages/Osu2/res/layout/activity_main.xml b/packages/Osu2/res/layout/activity_main.xml
deleted file mode 100644
index f9504c9..0000000
--- a/packages/Osu2/res/layout/activity_main.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
-</LinearLayout>
diff --git a/packages/Osu2/res/mipmap-hdpi/ic_launcher.png b/packages/Osu2/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bc..0000000
--- a/packages/Osu2/res/mipmap-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu2/res/mipmap-mdpi/ic_launcher.png b/packages/Osu2/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0c..0000000
--- a/packages/Osu2/res/mipmap-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu2/res/mipmap-xhdpi/ic_launcher.png b/packages/Osu2/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0..0000000
--- a/packages/Osu2/res/mipmap-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu2/res/mipmap-xxhdpi/ic_launcher.png b/packages/Osu2/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72c..0000000
--- a/packages/Osu2/res/mipmap-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu2/res/mipmap-xxxhdpi/ic_launcher.png b/packages/Osu2/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e1..0000000
--- a/packages/Osu2/res/mipmap-xxxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/packages/Osu2/res/values-w820dp/dimens.xml b/packages/Osu2/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc816..0000000
--- a/packages/Osu2/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
- <!-- Example customization of dimensions originally defined in res/values/dimens.xml
- (such as screen margins) for screens with more than 820dp of available width. This
- would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
- <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/packages/Osu2/res/values/colors.xml b/packages/Osu2/res/values/colors.xml
deleted file mode 100644
index 3ab3e9c..0000000
--- a/packages/Osu2/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <color name="colorPrimary">#3F51B5</color>
- <color name="colorPrimaryDark">#303F9F</color>
- <color name="colorAccent">#FF4081</color>
-</resources>
diff --git a/packages/Osu2/res/values/dimens.xml b/packages/Osu2/res/values/dimens.xml
deleted file mode 100644
index 47c8224..0000000
--- a/packages/Osu2/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
- <!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">16dp</dimen>
- <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/packages/Osu2/res/values/strings.xml b/packages/Osu2/res/values/strings.xml
deleted file mode 100644
index e5b1af6..0000000
--- a/packages/Osu2/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <string name="app_name">Passpoint Online Sign-Up</string>
-</resources>
diff --git a/packages/Osu2/src/com/android/osu/Constants.java b/packages/Osu2/src/com/android/osu/Constants.java
deleted file mode 100644
index cd046d8..0000000
--- a/packages/Osu2/src/com/android/osu/Constants.java
+++ /dev/null
@@ -1,24 +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 com.android.osu;
-
-public final class Constants {
- public static final String INTENT_EXTRA_COMMAND = "com.android.osu.extra.COMMAND";
- public static final String INTENT_EXTRA_OSU_PROVIDER = "com.android.osu.extra.OSU_PROVIDER";
-
- public static final String COMMAND_PROVISION = "Provision";
-}
\ No newline at end of file
diff --git a/packages/Osu2/src/com/android/osu/MainActivity.java b/packages/Osu2/src/com/android/osu/MainActivity.java
deleted file mode 100644
index 4e2136b..0000000
--- a/packages/Osu2/src/com/android/osu/MainActivity.java
+++ /dev/null
@@ -1,76 +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 com.android.osu;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.wifi.hotspot2.OsuProvider;
-import android.os.Bundle;
-import android.util.Log;
-
-/**
- * Main entry point for the OSU (Online Sign-Up) app.
- */
-public class MainActivity extends Activity {
- private static final String TAG = "OSU_MainActivity";
- private OsuService mService;
-
- @Override
- protected void onCreate(Bundle saveInstanceState) {
- super.onCreate(saveInstanceState);
-
- Intent intent = getIntent();
- if (intent == null) {
- Log.e(TAG, "Intent not provided");
- finish();
- }
-
- if (!intent.hasExtra(Constants.INTENT_EXTRA_COMMAND)) {
- Log.e(TAG, "Command not provided");
- finish();
- }
-
- String command = intent.getStringExtra(Constants.INTENT_EXTRA_COMMAND);
- switch (command) {
- case Constants.COMMAND_PROVISION:
- if (!startProvisionService(intent.getParcelableExtra(
- Constants.INTENT_EXTRA_OSU_PROVIDER))) {
- finish();
- }
- break;
- default:
- Log.e(TAG, "Unknown command: '" + command + "'");
- finish();
- break;
- }
- }
-
- /**
- * Start the {@link ProvisionService} to perform provisioning tasks.
- *
- * @return true if service is started
- */
- private boolean startProvisionService(OsuProvider provider) {
- if (provider == null) {
- Log.e(TAG, "OSU Provider not provided");
- return false;
- }
- mService = new ProvisionService(this, provider);
- mService.start();
- return true;
- }
-}
diff --git a/packages/Osu2/src/com/android/osu/NetworkConnection.java b/packages/Osu2/src/com/android/osu/NetworkConnection.java
deleted file mode 100644
index 9f5b929..0000000
--- a/packages/Osu2/src/com/android/osu/NetworkConnection.java
+++ /dev/null
@@ -1,206 +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 com.android.osu;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Network;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiSsid;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.util.Log;
-
-import java.io.IOException;
-
-/**
- * Responsible for setup/monitor on a Wi-Fi connection.
- */
-public class NetworkConnection {
- private static final String TAG = "OSU_NetworkConnection";
-
- private final WifiManager mWifiManager;
- private final Callbacks mCallbacks;
- private final int mNetworkId;
- private boolean mConnected = false;
-
- /**
- * Callbacks on Wi-Fi connection state changes.
- */
- public interface Callbacks {
- /**
- * Invoked when network connection is established with IP connectivity.
- *
- * @param network {@link Network} associated with the connected network.
- */
- public void onConnected(Network network);
-
- /**
- * Invoked when the targeted network is disconnected.
- */
- public void onDisconnected();
-
- /**
- * Invoked when network connection is not established within the pre-defined timeout.
- */
- public void onTimeout();
- }
-
- /**
- * Create an instance of {@link NetworkConnection} for the specified Wi-Fi network.
- * The Wi-Fi network (specified by its SSID) will be added/enabled as part of this object
- * creation.
- *
- * {@link #teardown} will need to be invoked once you're done with this connection,
- * to remove the given Wi-Fi network from the framework.
- *
- * @param context The application context
- * @param handler The handler to dispatch the processing of received broadcast intents
- * @param ssid The SSID to connect to
- * @param nai The network access identifier associated with the AP
- * @param callbacks The callbacks to be invoked on network change events
- * @throws IOException when failed to add/enable the specified Wi-Fi network
- */
- public NetworkConnection(Context context, Handler handler, WifiSsid ssid, String nai,
- Callbacks callbacks) throws IOException {
- mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- mCallbacks = callbacks;
- mNetworkId = connect(ssid, nai);
-
- // TODO(zqiu): setup alarm to timed out the connection attempt.
-
- IntentFilter filter = new IntentFilter();
- filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
- BroadcastReceiver receiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
- if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
- handleNetworkStateChanged(
- intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO),
- intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO));
- }
- }
- };
- // Provide a Handler so that the onReceive call will be run on the specified handler
- // thread instead of the main thread.
- context.registerReceiver(receiver, filter, null, handler);
- }
-
- /**
- * Teardown the network connection by removing the network.
- */
- public void teardown() {
- mWifiManager.removeNetwork(mNetworkId);
- }
-
- /**
- * Connect to a OSU Wi-Fi network specified by the given SSID. The security type of the Wi-Fi
- * network is either open or OSEN (OSU Server-only authenticated layer 2 Encryption Network).
- * When network access identifier is provided, OSEN is used.
- *
- * @param ssid The SSID to connect to
- * @param nai Network access identifier of the network
- *
- * @return unique ID associated with the network
- * @throws IOException
- */
- private int connect(WifiSsid ssid, String nai) throws IOException {
- WifiConfiguration config = new WifiConfiguration();
- config.SSID = "\"" + ssid.toString() + "\"";
- if (TextUtils.isEmpty(nai)) {
- config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
- } else {
- // TODO(zqiu): configuration setup for OSEN.
- }
- int networkId = mWifiManager.addNetwork(config);
- if (networkId < 0) {
- throw new IOException("Failed to add OSU network");
- }
- if (!mWifiManager.enableNetwork(networkId, true)) {
- throw new IOException("Failed to enable OSU network");
- }
- return networkId;
- }
-
- /**
- * Handle network state changed events.
- *
- * @param networkInfo {@link NetworkInfo} indicating the current network state
- * @param wifiInfo {@link WifiInfo} associated with the current network when connected
- */
- private void handleNetworkStateChanged(NetworkInfo networkInfo, WifiInfo wifiInfo) {
- if (networkInfo == null) {
- Log.e(TAG, "NetworkInfo not provided for network state changed event");
- return;
- }
- switch (networkInfo.getDetailedState()) {
- case CONNECTED:
- handleConnectedEvent(wifiInfo);
- break;
- case DISCONNECTED:
- handleDisconnectedEvent();
- break;
- default:
- Log.d(TAG, "Ignore uninterested state: " + networkInfo.getDetailedState());
- break;
- }
- }
-
- /**
- * Handle network connected event.
- *
- * @param wifiInfo {@link WifiInfo} associated with the current connection
- */
- private void handleConnectedEvent(WifiInfo wifiInfo) {
- if (mConnected) {
- // No-op if already connected.
- return;
- }
- if (wifiInfo == null) {
- Log.e(TAG, "WifiInfo not provided for connected event");
- return;
- }
- if (wifiInfo.getNetworkId() != mNetworkId) {
- return;
- }
- Network network = mWifiManager.getCurrentNetwork();
- if (network == null) {
- Log.e(TAG, "Current network is not set");
- return;
- }
- mConnected = true;
- mCallbacks.onConnected(network);
- }
-
- /**
- * Handle network disconnected event.
- */
- private void handleDisconnectedEvent() {
- if (!mConnected) {
- // No-op if not connected, most likely a disconnect event for a different network.
- return;
- }
- mConnected = false;
- mCallbacks.onDisconnected();
- }
-}
diff --git a/packages/Osu2/src/com/android/osu/OsuService.java b/packages/Osu2/src/com/android/osu/OsuService.java
deleted file mode 100644
index 46a3c84..0000000
--- a/packages/Osu2/src/com/android/osu/OsuService.java
+++ /dev/null
@@ -1,33 +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 com.android.osu;
-
-/**
- * Abstraction for services that can be performed by the OSU app, such as provisioning,
- * subscription remediation, and etc.
- */
-public interface OsuService {
- /**
- * Start the service.
- */
- public void start();
-
- /**
- * Stop the service.
- */
- public void stop();
-}
diff --git a/packages/Osu2/src/com/android/osu/ProvisionService.java b/packages/Osu2/src/com/android/osu/ProvisionService.java
deleted file mode 100644
index b1d43b2..0000000
--- a/packages/Osu2/src/com/android/osu/ProvisionService.java
+++ /dev/null
@@ -1,119 +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 com.android.osu;
-
-import android.content.Context;
-import android.net.Network;
-import android.net.wifi.hotspot2.OsuProvider;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.util.Log;
-
-import java.io.IOException;
-
-/**
- * Service responsible for performing Passpoint subscription provisioning tasks.
- * This service will run on a separate thread to avoid blocking on the Main thread.
- */
-public class ProvisionService implements OsuService {
- private static final String TAG = "OSU_ProvisionService";
- private static final int COMMAND_START = 1;
- private static final int COMMAND_STOP = 2;
-
- private final Context mContext;
- private final HandlerThread mHandlerThread;
- private final ServiceHandler mServiceHandler;
- private final OsuProvider mProvider;
-
- private boolean mStarted = false;
- private NetworkConnection mNetworkConnection = null;
-
- public ProvisionService(Context context, OsuProvider provider) {
- mContext = context;
- mProvider = provider;
- mHandlerThread = new HandlerThread(TAG);
- mHandlerThread.start();
- mServiceHandler = new ServiceHandler(mHandlerThread.getLooper());
- }
-
- @Override
- public void start() {
- mServiceHandler.sendMessage(mServiceHandler.obtainMessage(COMMAND_START));
- }
-
- @Override
- public void stop() {
- mServiceHandler.sendMessage(mServiceHandler.obtainMessage(COMMAND_STOP));
- }
-
- /**
- * Handler class for handling commands to the ProvisionService.
- */
- private final class ServiceHandler extends Handler {
- public ServiceHandler(Looper looper) {
- super(looper);
- }
-
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case COMMAND_START:
- if (mStarted) {
- Log.e(TAG, "Service already started");
- return;
- }
- try {
- // Initiate network connection to the OSU AP.
- mNetworkConnection = new NetworkConnection(
- mContext, this, mProvider.getOsuSsid(),
- mProvider.getNetworkAccessIdentifier(), new NetworkCallbacks());
- mStarted = true;
- } catch (IOException e) {
- // TODO(zqiu): broadcast failure event via LocalBroadcastManager.
- }
- break;
- case COMMAND_STOP:
- if (!mStarted) {
- Log.e(TAG, "Service not started");
- return;
- }
- Log.e(TAG, "Stop provision service");
- break;
- default:
- Log.e(TAG, "Unknown command: " + msg.what);
- break;
- }
- }
- }
-
- private final class NetworkCallbacks implements NetworkConnection.Callbacks {
- @Override
- public void onConnected(Network network) {
- Log.d(TAG, "Connected to OSU AP");
- }
-
- @Override
- public void onDisconnected() {
- }
-
- @Override
- public void onTimeout() {
- }
- }
-}
diff --git a/packages/Osu2/tests/Android.mk b/packages/Osu2/tests/Android.mk
deleted file mode 100644
index 23db7a9..0000000
--- a/packages/Osu2/tests/Android.mk
+++ /dev/null
@@ -1,44 +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.
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-
-LOCAL_JACK_FLAGS := --multi-dex native
-
-LOCAL_PACKAGE_NAME := OsuTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-LOCAL_INSTRUMENTATION_FOR := Osu2
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
- android-support-test \
- mockito-target-minus-junit4 \
- frameworks-base-testutils
-
-# Code coverage puts us over the dex limit, so enable multi-dex for coverage-enabled builds
-ifeq (true,$(EMMA_INSTRUMENT))
-LOCAL_JACK_FLAGS := --multi-dex native
-LOCAL_DX_FLAGS := --multi-dex
-endif # EMMA_INSTRUMENT
-
-include $(BUILD_PACKAGE)
diff --git a/packages/Osu2/tests/AndroidManifest.xml b/packages/Osu2/tests/AndroidManifest.xml
deleted file mode 100644
index e22c112..0000000
--- a/packages/Osu2/tests/AndroidManifest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="com.android.osu.tests">
-
- <application>
- <uses-library android:name="android.test.runner" />
- <activity android:label="OsuTestDummyLabel"
- android:name="OsuTestDummyName">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER"/>
- </intent-filter>
- </activity>
- </application>
-
- <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.osu"
- android:label="OSU App Tests">
- </instrumentation>
-
-</manifest>
diff --git a/packages/Osu2/tests/AndroidTest.xml b/packages/Osu2/tests/AndroidTest.xml
deleted file mode 100644
index 9514dab..0000000
--- a/packages/Osu2/tests/AndroidTest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 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.
--->
-<!-- This test config file is auto-generated. -->
-<configuration description="Runs OSU App Tests.">
- <option name="test-suite-tag" value="apct" />
- <option name="test-suite-tag" value="apct-instrumentation" />
- <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
- <option name="cleanup-apks" value="true" />
- <option name="test-file-name" value="Osu2.apk" />
- <option name="test-file-name" value="OsuTests.apk" />
- </target_preparer>
-
- <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
- <option name="package" value="com.android.osu.tests" />
- <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
- </test>
-</configuration>
diff --git a/packages/Osu2/tests/README.md b/packages/Osu2/tests/README.md
deleted file mode 100644
index dbfa79c..0000000
--- a/packages/Osu2/tests/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# OSU Unit Tests
-This package contains unit tests for the OSU app based on the
-[Android Testing Support Library](http://developer.android.com/tools/testing-support-library/index.html).
-The test cases are built using the [JUnit](http://junit.org/) and [Mockito](http://mockito.org/)
-libraries.
-
-## Running Tests
-The easiest way to run tests is simply run
-
-```
-frameworks/base/packages/Osu2/tests/runtests.sh
-```
-
-`runtests.sh` will build the test project and all of its dependencies and push the APK to the
-connected device. It will then run the tests on the device.
-
-To enable syncing data to the device for first time after clean reflash:
-1. adb disable-verity
-2. adb reboot
-3. adb remount
-
-See below for a few example of options to limit which tests are run.
-See the
-[AndroidJUnitRunner Documentation](https://developer.android.com/reference/android/support/test/runner/AndroidJUnitRunner.html)
-for more details on the supported options.
-
-```
-runtests.sh -e package com.android.osu
-runtests.sh -e class com.android.osu.NetworkConnectionTest
-```
-
-If you manually build and push the test APK to the device you can run tests using
-
-```
-adb shell am instrument -w 'com.android.osu.tests/android.support.test.runner.AndroidJUnitRunner'
-```
-
-## Adding Tests
-Tests can be added by adding classes to the src directory. JUnit4 style test cases can
-be written by simply annotating test methods with `org.junit.Test`.
-
-## Debugging Tests
-If you are trying to debug why tests are not doing what you expected, you can add android log
-statements and use logcat to view them. The beginning and end of every tests is automatically logged
-with the tag `TestRunner`.
diff --git a/packages/Osu2/tests/runtests.sh b/packages/Osu2/tests/runtests.sh
deleted file mode 100755
index 3513f5b..0000000
--- a/packages/Osu2/tests/runtests.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z $ANDROID_BUILD_TOP ]; then
- echo "You need to source and lunch before you can use this script"
- exit 1
-fi
-
-echo "Running tests"
-
-set -e # fail early
-
-echo "+ mmma -j32 $ANDROID_BUILD_TOP/frameworks/base/packages/Osu2/tests"
-# NOTE Don't actually run the command above since this shell doesn't inherit functions from the
-# caller.
-make -j32 -C $ANDROID_BUILD_TOP -f build/core/main.mk MODULES-IN-frameworks-base-packages-Osu2-tests
-
-set -x # print commands
-
-adb root
-adb wait-for-device
-
-adb install -r -g "$OUT/data/app/OsuTests/OsuTests.apk"
-
-adb shell am instrument -w "$@" 'com.android.osu.tests/android.support.test.runner.AndroidJUnitRunner'
diff --git a/packages/Osu2/tests/src/com/android/osu/NetworkConnectionTest.java b/packages/Osu2/tests/src/com/android/osu/NetworkConnectionTest.java
deleted file mode 100644
index 2753249..0000000
--- a/packages/Osu2/tests/src/com/android/osu/NetworkConnectionTest.java
+++ /dev/null
@@ -1,132 +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 com.android.osu;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiSsid;
-import android.os.Handler;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-
-import java.io.IOException;
-
-/**
- * Unit tests for {@link com.android.osu.NetworkConnection}.
- */
-@SmallTest
-public class NetworkConnectionTest {
- private static final String TEST_SSID = "TEST SSID";
- private static final String TEST_SSID_WITH_QUOTES = "\"" + TEST_SSID + "\"";
- private static final int TEST_NETWORK_ID = 1;
-
- @Mock Context mContext;
- @Mock Handler mHandler;
- @Mock WifiManager mWifiManager;
- @Mock NetworkConnection.Callbacks mCallbacks;
-
- @Before
- public void setUp() throws Exception {
- initMocks(this);
- when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
- }
-
- /**
- * Verify that an IOException will be thrown when failed to add the network.
- *
- * @throws Exception
- */
- @Test(expected = IOException.class)
- public void networkAddFailed() throws Exception {
- when(mWifiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(-1);
- new NetworkConnection(mContext, mHandler, WifiSsid.createFromAsciiEncoded(TEST_SSID),
- null, mCallbacks);
- }
-
- /**
- * Verify that an IOException will be thrown when failed to enable the network.
- *
- * @throws Exception
- */
- @Test(expected = IOException.class)
- public void networkEnableFailed() throws Exception {
- when(mWifiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(TEST_NETWORK_ID);
- when(mWifiManager.enableNetwork(eq(TEST_NETWORK_ID), eq(true))).thenReturn(false);
- new NetworkConnection(mContext, mHandler, WifiSsid.createFromAsciiEncoded(TEST_SSID),
- null, mCallbacks);
- }
-
- /**
- * Verify that the connection is established after receiving a
- * WifiManager.NETWORK_STATE_CHANGED_ACTION intent indicating that we are connected.
- *
- * @throws Exception
- */
- @Test
- public void openNetworkConnectionEstablished() throws Exception {
- when(mWifiManager.addNetwork(any(WifiConfiguration.class))).thenReturn(TEST_NETWORK_ID);
- when(mWifiManager.enableNetwork(eq(TEST_NETWORK_ID), eq(true))).thenReturn(true);
- NetworkConnection connection = new NetworkConnection(mContext, mHandler,
- WifiSsid.createFromAsciiEncoded(TEST_SSID), null, mCallbacks);
-
- // Verify the WifiConfiguration being added.
- ArgumentCaptor<WifiConfiguration> wifiConfig =
- ArgumentCaptor.forClass(WifiConfiguration.class);
- verify(mWifiManager).addNetwork(wifiConfig.capture());
- assertEquals(wifiConfig.getValue().SSID, TEST_SSID_WITH_QUOTES);
-
- // Capture the BroadcastReceiver.
- ArgumentCaptor<BroadcastReceiver> receiver =
- ArgumentCaptor.forClass(BroadcastReceiver.class);
- verify(mContext).registerReceiver(receiver.capture(), any(), any(), any());
-
- // Setup intent.
- Intent intent = new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION);
- NetworkInfo networkInfo = new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0, "WIFI", "");
- networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
- intent.putExtra(WifiManager.EXTRA_NETWORK_INFO, networkInfo);
- WifiInfo wifiInfo = new WifiInfo();
- wifiInfo.setNetworkId(TEST_NETWORK_ID);
- intent.putExtra(WifiManager.EXTRA_WIFI_INFO, wifiInfo);
-
- // Send intent to the receiver.
- Network network = new Network(0);
- when(mWifiManager.getCurrentNetwork()).thenReturn(network);
- receiver.getValue().onReceive(mContext, intent);
-
- // Verify we are connected.
- verify(mCallbacks).onConnected(eq(network));
- }
-}
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index b5407dc..d53f1a0 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -607,5 +607,6 @@
<action android:name="com.android.intent.action.SHOW_KEYBOARD_SHORTCUTS" />
</intent-filter>
</receiver>
+
</application>
</manifest>
diff --git a/packages/SystemUI/res/drawable/ic_memory.xml b/packages/SystemUI/res/drawable/ic_memory.xml
new file mode 100644
index 0000000..ada36c5
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_memory.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2018 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M16.0,5.0l-8.0,0.0l0.0,14.0l8.0,0.0z"
+ android:fillAlpha="0.5"
+ android:fillColor="#000000"/>
+ <path
+ android:pathData="M6,9 L6,7 L4,7 L4,5 L6,5 C6,3.9 6.9,3 8,3 L16,3 C17.1,3 18,3.9 18,5 L20,5 L20,7 L18,7 L18,9 L20,9 L20,11 L18,11 L18,13 L20,13 L20,15 L18,15 L18,17 L20,17 L20,19 L18,19 C18,20.1 17.1,21 16,21 L8,21 C6.9,21 6,20.1 6,19 L4,19 L4,17 L6,17 L6,15 L4,15 L4,13 L6,13 L6,11 L4,11 L4,9 L6,9 Z M16,19 L16,5 L8,5 L8,19 L16,19 Z"
+ android:fillColor="#000000"/>
+</vector>
diff --git a/packages/SystemUI/res/layout/status_bar_notification_footer.xml b/packages/SystemUI/res/layout/status_bar_notification_footer.xml
index 22f1618..b4c2ba8 100644
--- a/packages/SystemUI/res/layout/status_bar_notification_footer.xml
+++ b/packages/SystemUI/res/layout/status_bar_notification_footer.xml
@@ -19,7 +19,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingEnd="8dp"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
android:visibility="gone">
<FrameLayout
android:id="@+id/content"
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 88e3331..b9cde7c 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -491,4 +491,6 @@
This name is in the ComponentName flattened format (package/class) -->
<string name="config_screenshotEditor" translatable="false"></string>
+ <!-- On debuggable builds, alert the user if SystemUI PSS goes over this number (in kb) -->
+ <integer name="watch_heap_limit">256000</integer>
</resources>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 50e7b5c..1b4b15e 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -2227,4 +2227,9 @@
<!-- URl of the webpage that explains battery saver. -->
<string name="help_uri_battery_saver_learn_more_link_target" translatable="false"></string>
+
+ <!-- Name for a quick settings tile, used only by platform developers, to extract the SystemUI process memory and send it to another
+ app for debugging. Will not be seen by users. [CHAR LIMIT=20] -->
+ <string name="heap_dump_tile_name">Dump SysUI Heap</string>
+
</resources>
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
index 7cc37c4..81cf3ae 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
@@ -140,12 +140,6 @@
mImm.hideSoftInputFromWindow(getWindowToken(), 0);
}
- @Override
- public void reset() {
- super.reset();
- mPasswordEntry.requestFocus();
- }
-
private void updateSwitchImeButton() {
// If there's more than one IME, enable the IME switcher button
final boolean wasVisible = mSwitchImeButton.getVisibility() == View.VISIBLE;
@@ -193,8 +187,6 @@
// Set selected property on so the view can send accessibility events.
mPasswordEntry.setSelected(true);
- mPasswordEntry.requestFocus();
-
mSwitchImeButton = findViewById(R.id.switch_ime_button);
mSwitchImeButton.setOnClickListener(new OnClickListener() {
@Override
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
index 1d3f9a1..a2befef 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
@@ -23,13 +23,16 @@
import android.view.MotionEvent;
import android.view.View;
+import com.android.internal.annotations.VisibleForTesting;
+
/**
* A Pin based Keyguard input view
*/
public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
implements View.OnKeyListener, View.OnTouchListener {
- protected PasswordTextView mPasswordEntry;
+ @VisibleForTesting
+ PasswordTextView mPasswordEntry;
private View mOkButton;
private View mDeleteButton;
private View mButton0;
@@ -52,12 +55,6 @@
}
@Override
- public void reset() {
- mPasswordEntry.requestFocus();
- super.reset();
- }
-
- @Override
protected boolean onRequestFocusInDescendants(int direction, Rect previouslyFocusedRect) {
// send focus to the password field
return mPasswordEntry.requestFocus(direction, previouslyFocusedRect);
@@ -238,6 +235,12 @@
}
@Override
+ public void onResume(int reason) {
+ super.onResume(reason);
+ mPasswordEntry.requestFocus();
+ }
+
+ @Override
public boolean onTouch(View v, MotionEvent event) {
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
doHapticKeyClick();
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index 7d19784..beb3c53 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -247,10 +247,14 @@
getDependency(LeakDetector.class),
getDependency(LEAK_REPORT_EMAIL)));
- mProviders.put(GarbageMonitor.class, () -> new GarbageMonitor(
- getDependency(BG_LOOPER),
- getDependency(LeakDetector.class),
- getDependency(LeakReporter.class)));
+ mProviders.put(
+ GarbageMonitor.class,
+ () ->
+ new GarbageMonitor(
+ mContext,
+ getDependency(BG_LOOPER),
+ getDependency(LeakDetector.class),
+ getDependency(LeakReporter.class)));
mProviders.put(TunerService.class, () ->
new TunerServiceImpl(mContext));
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
index 9593b0f..53a576d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
@@ -24,6 +24,7 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable;
+import android.os.Build;
import android.os.Handler;
import android.service.quicksettings.TileService;
import android.text.TextUtils;
@@ -37,8 +38,10 @@
import com.android.systemui.qs.QSTileHost;
import com.android.systemui.qs.external.CustomTile;
import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIcon;
+import com.android.systemui.util.leak.GarbageMonitor;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -68,7 +71,6 @@
// Enqueue jobs to fetch every system tile and then ever package tile.
addStockTiles(host);
addPackageTiles(host);
- // TODO: Live?
}
public boolean isFinished() {
@@ -77,10 +79,14 @@
private void addStockTiles(QSTileHost host) {
String possible = mContext.getString(R.string.quick_settings_tiles_stock);
- String[] possibleTiles = possible.split(",");
+ final ArrayList<String> possibleTiles = new ArrayList<>();
+ possibleTiles.addAll(Arrays.asList(possible.split(",")));
+ if (Build.IS_DEBUGGABLE) {
+ possibleTiles.add(GarbageMonitor.MemoryTile.TILE_SPEC);
+ }
+
final ArrayList<QSTile> tilesToAdd = new ArrayList<>();
- for (int i = 0; i < possibleTiles.length; i++) {
- final String spec = possibleTiles[i];
+ for (String spec : possibleTiles) {
final QSTile tile = host.createTile(spec);
if (tile == null) {
continue;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java
index 8d48890..ac7ef5d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java
@@ -15,6 +15,7 @@
package com.android.systemui.qs.tileimpl;
import android.content.Context;
+import android.os.Build;
import android.util.Log;
import android.view.ContextThemeWrapper;
@@ -41,6 +42,7 @@
import com.android.systemui.qs.tiles.WifiTile;
import com.android.systemui.qs.tiles.WorkModeTile;
import com.android.systemui.qs.QSTileHost;
+import com.android.systemui.util.leak.GarbageMonitor;
public class QSFactoryImpl implements QSFactory {
@@ -60,30 +62,58 @@
}
private QSTileImpl createTileInternal(String tileSpec) {
- if (tileSpec.equals("wifi")) return new WifiTile(mHost);
- else if (tileSpec.equals("bt")) return new BluetoothTile(mHost);
- else if (tileSpec.equals("cell")) return new CellularTile(mHost);
- else if (tileSpec.equals("dnd")) return new DndTile(mHost);
- else if (tileSpec.equals("inversion")) return new ColorInversionTile(mHost);
- else if (tileSpec.equals("airplane")) return new AirplaneModeTile(mHost);
- else if (tileSpec.equals("work")) return new WorkModeTile(mHost);
- else if (tileSpec.equals("rotation")) return new RotationLockTile(mHost);
- else if (tileSpec.equals("flashlight")) return new FlashlightTile(mHost);
- else if (tileSpec.equals("location")) return new LocationTile(mHost);
- else if (tileSpec.equals("cast")) return new CastTile(mHost);
- else if (tileSpec.equals("hotspot")) return new HotspotTile(mHost);
- else if (tileSpec.equals("user")) return new UserTile(mHost);
- else if (tileSpec.equals("battery")) return new BatterySaverTile(mHost);
- else if (tileSpec.equals("saver")) return new DataSaverTile(mHost);
- else if (tileSpec.equals("night")) return new NightDisplayTile(mHost);
- else if (tileSpec.equals("nfc")) return new NfcTile(mHost);
- // Intent tiles.
- else if (tileSpec.startsWith(IntentTile.PREFIX)) return IntentTile.create(mHost, tileSpec);
- else if (tileSpec.startsWith(CustomTile.PREFIX)) return CustomTile.create(mHost, tileSpec);
- else {
- Log.w(TAG, "Bad tile spec: " + tileSpec);
- return null;
+ // Stock tiles.
+ switch (tileSpec) {
+ case "wifi":
+ return new WifiTile(mHost);
+ case "bt":
+ return new BluetoothTile(mHost);
+ case "cell":
+ return new CellularTile(mHost);
+ case "dnd":
+ return new DndTile(mHost);
+ case "inversion":
+ return new ColorInversionTile(mHost);
+ case "airplane":
+ return new AirplaneModeTile(mHost);
+ case "work":
+ return new WorkModeTile(mHost);
+ case "rotation":
+ return new RotationLockTile(mHost);
+ case "flashlight":
+ return new FlashlightTile(mHost);
+ case "location":
+ return new LocationTile(mHost);
+ case "cast":
+ return new CastTile(mHost);
+ case "hotspot":
+ return new HotspotTile(mHost);
+ case "user":
+ return new UserTile(mHost);
+ case "battery":
+ return new BatterySaverTile(mHost);
+ case "saver":
+ return new DataSaverTile(mHost);
+ case "night":
+ return new NightDisplayTile(mHost);
+ case "nfc":
+ return new NfcTile(mHost);
}
+
+ // Intent tiles.
+ if (tileSpec.startsWith(IntentTile.PREFIX)) return IntentTile.create(mHost, tileSpec);
+ if (tileSpec.startsWith(CustomTile.PREFIX)) return CustomTile.create(mHost, tileSpec);
+
+ // Debug tiles.
+ if (Build.IS_DEBUGGABLE) {
+ if (tileSpec.equals(GarbageMonitor.MemoryTile.TILE_SPEC)) {
+ return new GarbageMonitor.MemoryTile(mHost);
+ }
+ }
+
+ // Broken tiles.
+ Log.w(TAG, "Bad tile spec: " + tileSpec);
+ return null;
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
index df6a977..29c3ebd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
@@ -58,6 +58,7 @@
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final int givenSize = MeasureSpec.getSize(heightMeasureSpec);
+ final int viewHorizontalPadding = getPaddingStart() + getPaddingEnd();
int ownMaxHeight = Integer.MAX_VALUE;
int heightMode = MeasureSpec.getMode(heightMeasureSpec);
if (heightMode != MeasureSpec.UNSPECIFIED && givenSize != 0) {
@@ -80,8 +81,8 @@
? MeasureSpec.makeMeasureSpec(ownMaxHeight, MeasureSpec.EXACTLY)
: MeasureSpec.makeMeasureSpec(layoutParams.height, MeasureSpec.EXACTLY);
}
- child.measure(
- getChildMeasureSpec(widthMeasureSpec, 0 /* padding */, layoutParams.width),
+ child.measure(getChildMeasureSpec(
+ widthMeasureSpec, viewHorizontalPadding, layoutParams.width),
childHeightSpec);
int childHeight = child.getMeasuredHeight();
maxChildHeight = Math.max(maxChildHeight, childHeight);
@@ -94,7 +95,7 @@
newHeightSpec = MeasureSpec.makeMeasureSpec(ownHeight, MeasureSpec.EXACTLY);
for (View child : mMatchParentViews) {
child.measure(getChildMeasureSpec(
- widthMeasureSpec, 0 /* padding */, child.getLayoutParams().width),
+ widthMeasureSpec, viewHorizontalPadding, child.getLayoutParams().width),
newHeightSpec);
}
mMatchParentViews.clear();
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 3e01aec..f134151 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -54,6 +54,8 @@
private static final String TAG = "KeyguardBouncer";
static final float ALPHA_EXPANSION_THRESHOLD = 0.95f;
+ private static final float EXPANSION_HIDDEN = 1f;
+ private static final float EXPANSION_VISIBLE = 0f;
protected final Context mContext;
protected final ViewMediatorCallback mCallback;
@@ -71,10 +73,15 @@
}
};
private final Runnable mRemoveViewRunnable = this::removeView;
+ protected KeyguardHostView mKeyguardView;
+ private final Runnable mResetRunnable = ()-> {
+ if (mKeyguardView != null) {
+ mKeyguardView.reset();
+ }
+ };
private int mStatusBarHeight;
- private float mExpansion;
- protected KeyguardHostView mKeyguardView;
+ private float mExpansion = EXPANSION_HIDDEN;
protected ViewGroup mRoot;
private boolean mShowingSoon;
private int mBouncerPromptReason;
@@ -96,7 +103,7 @@
}
public void show(boolean resetSecuritySelection) {
- show(resetSecuritySelection, true /* notifyFalsing */);
+ show(resetSecuritySelection, true /* animated */);
}
/**
@@ -120,8 +127,7 @@
// Later, at the end of the animation, when the bouncer is at the top of the screen,
// onFullyShown() will be called and FalsingManager will stop recording touches.
if (animated) {
- mFalsingManager.onBouncerShown();
- setExpansion(0);
+ setExpansion(EXPANSION_VISIBLE);
}
if (resetSecuritySelection) {
@@ -152,6 +158,7 @@
mShowingSoon = true;
// Split up the work over multiple frames.
+ DejankUtils.removeCallbacks(mResetRunnable);
DejankUtils.postAfterTraversal(mShowRunnable);
mCallback.onBouncerVisiblityChanged(true /* shown */);
@@ -181,6 +188,7 @@
mRoot.setVisibility(View.INVISIBLE);
}
mFalsingManager.onBouncerHidden();
+ DejankUtils.postAfterTraversal(mResetRunnable);
}
}
@@ -210,6 +218,9 @@
mKeyguardView.requestLayout();
}
mShowingSoon = false;
+ if (mExpansion == EXPANSION_VISIBLE) {
+ mKeyguardView.onResume();
+ }
StatsLog.write(StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
StatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN);
}
@@ -303,7 +314,7 @@
public boolean isShowing() {
return (mShowingSoon || (mRoot != null && mRoot.getVisibility() == View.VISIBLE))
- && mExpansion == 0 && !isAnimatingAway();
+ && mExpansion == EXPANSION_VISIBLE && !isAnimatingAway();
}
/**
@@ -337,10 +348,10 @@
mKeyguardView.setTranslationY(fraction * mKeyguardView.getHeight());
}
- if (fraction == 0 && oldExpansion != 0) {
+ if (fraction == EXPANSION_VISIBLE && oldExpansion != EXPANSION_VISIBLE) {
onFullyShown();
mExpansionCallback.onFullyShown();
- } else if (fraction == 1 && oldExpansion != 0) {
+ } else if (fraction == EXPANSION_HIDDEN && oldExpansion != EXPANSION_HIDDEN) {
onFullyHidden();
mExpansionCallback.onFullyHidden();
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissHandler.java
index 759a0d1..76ddca4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissHandler.java
@@ -23,7 +23,9 @@
/** Executes actions that require the screen to be unlocked. */
public interface KeyguardDismissHandler {
- /** Executes an action that requres the screen to be unlocked. */
- void dismissKeyguardThenExecute(
- OnDismissAction action, @Nullable Runnable cancelAction, boolean afterKeyguardGone);
+ /**
+ * Executes an action that requres the screen to be unlocked, showing the keyguard if
+ * necessary. Does not close the notification shade (in case it was open).
+ */
+ void executeWhenUnlocked(OnDismissAction action);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissUtil.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissUtil.java
index c38b0b6..d676692 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissUtil.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardDismissUtil.java
@@ -40,14 +40,13 @@
* <p>Must be called after {@link #setDismissHandler}.
*/
@Override
- public void dismissKeyguardThenExecute(
- OnDismissAction action, Runnable cancelAction, boolean afterKeyguardGone) {
+ public void executeWhenUnlocked(OnDismissAction action) {
KeyguardDismissHandler dismissHandler = mDismissHandler;
if (dismissHandler == null) {
Log.wtf(TAG, "KeyguardDismissHandler not set.");
action.onDismiss();
return;
}
- dismissHandler.dismissKeyguardThenExecute(action, cancelAction, afterKeyguardGone);
+ dismissHandler.executeWhenUnlocked(action);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index d6b45d6..ae93d98 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -92,7 +92,7 @@
/**
* Default alpha value for most scrims.
*/
- public static final float GRADIENT_SCRIM_ALPHA = 0.70f;
+ public static final float GRADIENT_SCRIM_ALPHA = 0.45f;
/**
* A scrim varies its opacity based on a busyness factor, for example
* how many notifications are currently visible.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
index bbdaa99..1c5df58 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java
@@ -60,7 +60,7 @@
@Override
public float getBehindAlpha(float busynessFactor) {
return MathUtils.map(0 /* start */, 1 /* stop */,
- ScrimController.GRADIENT_SCRIM_ALPHA, ScrimController.GRADIENT_SCRIM_ALPHA_BUSY,
+ mScrimBehindAlphaKeyguard, ScrimController.GRADIENT_SCRIM_ALPHA_BUSY,
busynessFactor);
}
},
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 57a3556..5f07599 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -1326,8 +1326,7 @@
mKeyguardViewMediatorCallback = keyguardViewMediator.getViewMediatorCallback();
mLightBarController.setFingerprintUnlockController(mFingerprintUnlockController);
- Dependency.get(KeyguardDismissUtil.class).setDismissHandler(
- this::dismissKeyguardThenExecute);
+ Dependency.get(KeyguardDismissUtil.class).setDismissHandler(this::executeWhenUnlocked);
Trace.endSection();
}
@@ -3088,6 +3087,13 @@
}
}
+ private void executeWhenUnlocked(OnDismissAction action) {
+ if (mStatusBarKeyguardViewManager.isShowing()) {
+ mLeaveOpenOnKeyguardHide = true;
+ }
+ dismissKeyguardThenExecute(action, null /* cancelAction */, false /* afterKeyguardGone */);
+ }
+
protected void dismissKeyguardThenExecute(OnDismissAction action, boolean afterKeyguardGone) {
dismissKeyguardThenExecute(action, null /* cancelRunnable */, afterKeyguardGone);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java
index b4fa2e8..351868d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java
@@ -183,8 +183,7 @@
};
b.setOnClickListener(view -> {
- mKeyguardDismissUtil.dismissKeyguardThenExecute(
- action, null /* cancelAction */, false /* afterKeyguardGone */);
+ mKeyguardDismissUtil.executeWhenUnlocked(action);
});
b.setAccessibilityDelegate(new AccessibilityDelegate() {
diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java b/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java
new file mode 100644
index 0000000..2995eba
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java
@@ -0,0 +1,175 @@
+/*
+ * 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.util.leak;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.support.v4.content.FileProvider;
+import android.util.Log;
+
+import com.android.systemui.Dependency;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * Utility class for dumping, compressing, sending, and serving heap dump files.
+ *
+ * <p>Unlike the Internet, this IS a big truck you can dump something on.
+ */
+public class DumpTruck {
+ private static final String FILEPROVIDER_AUTHORITY = "com.android.systemui.fileprovider";
+ private static final String FILEPROVIDER_PATH = "leak";
+
+ private static final String TAG = "DumpTruck";
+ private static final int BUFSIZ = 512 * 1024; // 512K
+
+ private final Context context;
+ private Uri hprofUri;
+ final StringBuilder body = new StringBuilder();
+
+ public DumpTruck(Context context) {
+ this.context = context;
+ }
+
+ /**
+ * Capture memory for the given processes and zip them up for sharing.
+ *
+ * @param pids
+ * @return this, for chaining
+ */
+ public DumpTruck captureHeaps(int[] pids) {
+ final GarbageMonitor gm = Dependency.get(GarbageMonitor.class);
+
+ final File dumpDir = new File(context.getCacheDir(), FILEPROVIDER_PATH);
+ dumpDir.mkdirs();
+ hprofUri = null;
+
+ body.setLength(0);
+ body.append("Build: ").append(Build.DISPLAY).append("\n\nProcesses:\n");
+
+ final ArrayList<String> paths = new ArrayList<String>();
+ final int myPid = android.os.Process.myPid();
+
+ final int[] pids_copy = Arrays.copyOf(pids, pids.length);
+ for (int pid : pids_copy) {
+ body.append(" pid ").append(pid);
+ if (gm != null) {
+ GarbageMonitor.ProcessMemInfo info = gm.getMemInfo(pid);
+ if (info != null) {
+ body.append(":")
+ .append(" up=")
+ .append(info.getUptime())
+ .append(" pss=")
+ .append(info.currentPss)
+ .append(" uss=")
+ .append(info.currentUss);
+ }
+ }
+ if (pid == myPid) {
+ final String path =
+ new File(dumpDir, String.format("heap-%d.ahprof", pid)).getPath();
+ Log.v(TAG, "Dumping memory info for process " + pid + " to " + path);
+ try {
+ android.os.Debug.dumpHprofData(path); // will block
+ paths.add(path);
+ body.append(" (hprof attached)");
+ } catch (IOException e) {
+ Log.e(TAG, "error dumping memory:", e);
+ body.append("\n** Could not dump heap: \n").append(e.toString()).append("\n");
+ }
+ }
+ body.append("\n");
+ }
+
+ try {
+ final String zipfile =
+ new File(dumpDir, String.format("hprof-%d.zip", System.currentTimeMillis()))
+ .getCanonicalPath();
+ if (DumpTruck.zipUp(zipfile, paths)) {
+ final File pathFile = new File(zipfile);
+ hprofUri = FileProvider.getUriForFile(context, FILEPROVIDER_AUTHORITY, pathFile);
+ }
+ } catch (IOException e) {
+ Log.e(TAG, "unable to zip up heapdumps", e);
+ body.append("\n** Could not zip up files: \n").append(e.toString()).append("\n");
+ }
+
+ return this;
+ }
+
+ /**
+ * Get the Uri of the current heap dump. Be sure to call captureHeaps first.
+ *
+ * @return Uri to the dump served by the SystemUI file provider
+ */
+ public Uri getDumpUri() {
+ return hprofUri;
+ }
+
+ /**
+ * Get an ACTION_SEND intent suitable for startActivity() or attaching to a Notification.
+ *
+ * @return share intent
+ */
+ public Intent createShareIntent() {
+ Intent shareIntent = new Intent(Intent.ACTION_SEND);
+ shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ shareIntent.putExtra(Intent.EXTRA_SUBJECT, "SystemUI memory dump");
+
+ shareIntent.putExtra(Intent.EXTRA_TEXT, body.toString());
+
+ if (hprofUri != null) {
+ shareIntent.setType("application/zip");
+ shareIntent.putExtra(Intent.EXTRA_STREAM, hprofUri);
+ }
+ return shareIntent;
+ }
+
+ private static boolean zipUp(String zipfilePath, ArrayList<String> paths) {
+ try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipfilePath))) {
+ final byte[] buf = new byte[BUFSIZ];
+
+ for (String filename : paths) {
+ try (InputStream is = new BufferedInputStream(new FileInputStream(filename))) {
+ ZipEntry entry = new ZipEntry(filename);
+ zos.putNextEntry(entry);
+ int len;
+ while (0 < (len = is.read(buf, 0, BUFSIZ))) {
+ zos.write(buf, 0, len);
+ }
+ zos.closeEntry();
+ }
+ }
+ return true;
+ } catch (IOException e) {
+ Log.e(TAG, "error zipping up profile data", e);
+ }
+ return false;
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java b/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java
index 021f9c4..b2cc269 100644
--- a/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java
+++ b/packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java
@@ -16,88 +16,469 @@
package com.android.systemui.util.leak;
+import static com.android.internal.logging.MetricsLogger.VIEW_UNKNOWN;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
import android.os.Build;
+import android.os.Debug;
import android.os.Handler;
import android.os.Looper;
+import android.os.Message;
+import android.os.Process;
import android.os.SystemProperties;
import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
+import android.service.quicksettings.Tile;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.util.LongSparseArray;
import com.android.systemui.Dependency;
+import com.android.systemui.R;
import com.android.systemui.SystemUI;
+import com.android.systemui.plugins.qs.QSTile;
+import com.android.systemui.qs.QSHost;
+import com.android.systemui.qs.tileimpl.QSTileImpl;
+
+import java.util.ArrayList;
public class GarbageMonitor {
+ private static final boolean LEAK_REPORTING_ENABLED =
+ Build.IS_DEBUGGABLE
+ && SystemProperties.getBoolean("debug.enable_leak_reporting", false);
+ private static final String FORCE_ENABLE_LEAK_REPORTING = "sysui_force_enable_leak_reporting";
+
+ private static final boolean HEAP_TRACKING_ENABLED = Build.IS_DEBUGGABLE;
+ private static final boolean ENABLE_AM_HEAP_LIMIT = true; // use ActivityManager.setHeapLimit
private static final String TAG = "GarbageMonitor";
- private static final long GARBAGE_INSPECTION_INTERVAL = 5 * 60 * 1000; // 5min
+ private static final long GARBAGE_INSPECTION_INTERVAL =
+ 15 * DateUtils.MINUTE_IN_MILLIS; // 15 min
+ private static final long HEAP_TRACK_INTERVAL = 1 * DateUtils.MINUTE_IN_MILLIS; // 1 min
+
+ private static final int DO_GARBAGE_INSPECTION = 1000;
+ private static final int DO_HEAP_TRACK = 3000;
+
private static final int GARBAGE_ALLOWANCE = 5;
private final Handler mHandler;
private final TrackedGarbage mTrackedGarbage;
private final LeakReporter mLeakReporter;
+ private final Context mContext;
+ private final ActivityManager mAm;
+ private MemoryTile mQSTile;
+ private DumpTruck mDumpTruck;
- public GarbageMonitor(Looper bgLooper, LeakDetector leakDetector,
+ private final LongSparseArray<ProcessMemInfo> mData = new LongSparseArray<>();
+ private final ArrayList<Long> mPids = new ArrayList<>();
+ private int[] mPidsArray = new int[1];
+
+ private long mHeapLimit;
+
+ public GarbageMonitor(
+ Context context,
+ Looper bgLooper,
+ LeakDetector leakDetector,
LeakReporter leakReporter) {
- mHandler = bgLooper != null ? new Handler(bgLooper): null;
+ mContext = context.getApplicationContext();
+ mAm = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+
+ mHandler = new BackgroundHeapCheckHandler(bgLooper);
+
mTrackedGarbage = leakDetector.getTrackedGarbage();
mLeakReporter = leakReporter;
+
+ mDumpTruck = new DumpTruck(mContext);
+
+ if (ENABLE_AM_HEAP_LIMIT) {
+ mHeapLimit = mContext.getResources().getInteger(R.integer.watch_heap_limit);
+ }
}
- public void start() {
+ public void startLeakMonitor() {
if (mTrackedGarbage == null) {
return;
}
- scheduleInspectGarbage(this::inspectGarbage);
+ mHandler.sendEmptyMessage(DO_GARBAGE_INSPECTION);
}
- @VisibleForTesting
- void scheduleInspectGarbage(Runnable runnable) {
- mHandler.postDelayed(runnable, GARBAGE_INSPECTION_INTERVAL);
+ public void startHeapTracking() {
+ startTrackingProcess(
+ android.os.Process.myPid(), mContext.getPackageName(), System.currentTimeMillis());
+ mHandler.sendEmptyMessage(DO_HEAP_TRACK);
}
- private void inspectGarbage() {
+ private boolean gcAndCheckGarbage() {
if (mTrackedGarbage.countOldGarbage() > GARBAGE_ALLOWANCE) {
Runtime.getRuntime().gc();
-
- // Allow some time to for ReferenceQueue to catch up.
- scheduleReinspectGarbage(this::reinspectGarbageAfterGc);
+ return true;
}
- scheduleInspectGarbage(this::inspectGarbage);
+ return false;
}
- @VisibleForTesting
- void scheduleReinspectGarbage(Runnable runnable) {
- mHandler.postDelayed(runnable, (long) 100);
- }
-
- private void reinspectGarbageAfterGc() {
+ void reinspectGarbageAfterGc() {
int count = mTrackedGarbage.countOldGarbage();
if (count > GARBAGE_ALLOWANCE) {
mLeakReporter.dumpLeak(count);
}
}
+ public ProcessMemInfo getMemInfo(int pid) {
+ return mData.get(pid);
+ }
+
+ public int[] getTrackedProcesses() {
+ return mPidsArray;
+ }
+
+ public void startTrackingProcess(long pid, String name, long start) {
+ synchronized (mPids) {
+ if (mPids.contains(pid)) return;
+
+ mPids.add(pid);
+ updatePidsArrayL();
+
+ mData.put(pid, new ProcessMemInfo(pid, name, start));
+ }
+ }
+
+ private void updatePidsArrayL() {
+ final int N = mPids.size();
+ mPidsArray = new int[N];
+ StringBuffer sb = new StringBuffer("Now tracking processes: ");
+ for (int i = 0; i < N; i++) {
+ final int p = mPids.get(i).intValue();
+ mPidsArray[i] = p;
+ sb.append(p);
+ sb.append(" ");
+ }
+ Log.v(TAG, sb.toString());
+ }
+
+ private void update() {
+ synchronized (mPids) {
+ Debug.MemoryInfo[] dinfos = mAm.getProcessMemoryInfo(mPidsArray);
+ for (int i = 0; i < dinfos.length; i++) {
+ Debug.MemoryInfo dinfo = dinfos[i];
+ if (i > mPids.size()) {
+ Log.e(TAG, "update: unknown process info received: " + dinfo);
+ break;
+ }
+ final long pid = mPids.get(i).intValue();
+ final ProcessMemInfo info = mData.get(pid);
+ info.head = (info.head + 1) % info.pss.length;
+ info.pss[info.head] = info.currentPss = dinfo.getTotalPss();
+ info.uss[info.head] = info.currentUss = dinfo.getTotalPrivateDirty();
+ if (info.currentPss > info.max) info.max = info.currentPss;
+ if (info.currentUss > info.max) info.max = info.currentUss;
+ if (info.currentPss == 0) {
+ Log.v(TAG, "update: pid " + pid + " has pss=0, it probably died");
+ mData.remove(pid);
+ }
+ }
+ for (int i = mPids.size() - 1; i >= 0; i--) {
+ final long pid = mPids.get(i).intValue();
+ if (mData.get(pid) == null) {
+ mPids.remove(i);
+ updatePidsArrayL();
+ }
+ }
+ }
+ if (mQSTile != null) mQSTile.update();
+ }
+
+ private void setTile(MemoryTile tile) {
+ mQSTile = tile;
+ if (tile != null) tile.update();
+ }
+
+ private static String formatBytes(long b) {
+ String[] SUFFIXES = {"B", "K", "M", "G", "T"};
+ int i;
+ for (i = 0; i < SUFFIXES.length; i++) {
+ if (b < 1024) break;
+ b /= 1024;
+ }
+ return b + SUFFIXES[i];
+ }
+
+ private void dumpHprofAndShare() {
+ final Intent share = mDumpTruck.captureHeaps(getTrackedProcesses()).createShareIntent();
+ mContext.startActivity(share);
+ }
+
+ private static class MemoryIconDrawable extends Drawable {
+ long pss, limit;
+ final Drawable baseIcon;
+ final Paint paint = new Paint();
+ final float dp;
+
+ MemoryIconDrawable(Context context) {
+ baseIcon = context.getDrawable(R.drawable.ic_memory).mutate();
+ dp = context.getResources().getDisplayMetrics().density;
+ paint.setColor(QSTileImpl.getColorForState(context, Tile.STATE_ACTIVE));
+ }
+
+ public void setPss(long pss) {
+ if (pss != this.pss) {
+ this.pss = pss;
+ invalidateSelf();
+ }
+ }
+
+ public void setLimit(long limit) {
+ if (limit != this.limit) {
+ this.limit = limit;
+ invalidateSelf();
+ }
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ baseIcon.draw(canvas);
+
+ if (limit > 0 && pss > 0) {
+ float frac = Math.min(1f, (float) pss / limit);
+
+ final Rect bounds = getBounds();
+ canvas.translate(bounds.left + 8 * dp, bounds.top + 5 * dp);
+ //android:pathData="M16.0,5.0l-8.0,0.0l0.0,14.0l8.0,0.0z"
+ canvas.drawRect(0, 14 * dp * (1 - frac), 8 * dp + 1, 14 * dp + 1, paint);
+ }
+ }
+
+ @Override
+ public void setBounds(int left, int top, int right, int bottom) {
+ super.setBounds(left, top, right, bottom);
+ baseIcon.setBounds(left, top, right, bottom);
+ }
+
+ @Override
+ public int getIntrinsicHeight() {
+ return baseIcon.getIntrinsicHeight();
+ }
+
+ @Override
+ public int getIntrinsicWidth() {
+ return baseIcon.getIntrinsicWidth();
+ }
+
+ @Override
+ public void setAlpha(int i) {
+ baseIcon.setAlpha(i);
+ }
+
+ @Override
+ public void setColorFilter(ColorFilter colorFilter) {
+ baseIcon.setColorFilter(colorFilter);
+ paint.setColorFilter(colorFilter);
+ }
+
+ @Override
+ public void setTint(int tint) {
+ super.setTint(tint);
+ baseIcon.setTint(tint);
+ }
+
+ @Override
+ public void setTintList(ColorStateList tint) {
+ super.setTintList(tint);
+ baseIcon.setTintList(tint);
+ }
+
+ @Override
+ public void setTintMode(PorterDuff.Mode tintMode) {
+ super.setTintMode(tintMode);
+ baseIcon.setTintMode(tintMode);
+ }
+
+ @Override
+ public int getOpacity() {
+ return PixelFormat.TRANSLUCENT;
+ }
+ }
+
+ private static class MemoryGraphIcon extends QSTile.Icon {
+ long pss, limit;
+
+ public void setPss(long pss) {
+ this.pss = pss;
+ }
+
+ public void setHeapLimit(long limit) {
+ this.limit = limit;
+ }
+
+ @Override
+ public Drawable getDrawable(Context context) {
+ final MemoryIconDrawable drawable = new MemoryIconDrawable(context);
+ drawable.setPss(pss);
+ drawable.setLimit(limit);
+ return drawable;
+ }
+ }
+
+ public static class MemoryTile extends QSTileImpl<QSTile.State> {
+ public static final String TILE_SPEC = "dbg:mem";
+
+ private final GarbageMonitor gm;
+ private ProcessMemInfo pmi;
+
+ public MemoryTile(QSHost host) {
+ super(host);
+ gm = Dependency.get(GarbageMonitor.class);
+ }
+
+ @Override
+ public State newTileState() {
+ return new QSTile.State();
+ }
+
+ @Override
+ public Intent getLongClickIntent() {
+ return new Intent();
+ }
+
+ @Override
+ protected void handleClick() {
+ getHost().collapsePanels();
+ mHandler.post(gm::dumpHprofAndShare);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return VIEW_UNKNOWN;
+ }
+
+ @Override
+ public void handleSetListening(boolean listening) {
+ if (gm != null) gm.setTile(listening ? this : null);
+
+ final ActivityManager am = mContext.getSystemService(ActivityManager.class);
+ if (listening && gm.mHeapLimit > 0) {
+ am.setWatchHeapLimit(1024 * gm.mHeapLimit); // why is this in bytes?
+ } else {
+ am.clearWatchHeapLimit();
+ }
+ }
+
+ @Override
+ public CharSequence getTileLabel() {
+ return getState().label;
+ }
+
+ @Override
+ protected void handleUpdateState(State state, Object arg) {
+ pmi = gm.getMemInfo(Process.myPid());
+ final MemoryGraphIcon icon = new MemoryGraphIcon();
+ icon.setHeapLimit(gm.mHeapLimit);
+ if (pmi != null) {
+ icon.setPss(pmi.currentPss);
+ state.label = mContext.getString(R.string.heap_dump_tile_name);
+ state.secondaryLabel =
+ String.format(
+ "pss: %s / %s",
+ formatBytes(pmi.currentPss * 1024),
+ formatBytes(gm.mHeapLimit * 1024));
+ } else {
+ icon.setPss(0);
+ state.label = "Dump SysUI";
+ state.secondaryLabel = null;
+ }
+ state.icon = icon;
+ }
+
+ public void update() {
+ refreshState();
+ }
+
+ public long getPss() {
+ return pmi != null ? pmi.currentPss : 0;
+ }
+
+ public long getHeapLimit() {
+ return gm != null ? gm.mHeapLimit : 0;
+ }
+ }
+
+ public static class ProcessMemInfo {
+ public long pid;
+ public String name;
+ public long startTime;
+ public long currentPss, currentUss;
+ public long[] pss = new long[256];
+ public long[] uss = new long[256];
+ public long max = 1;
+ public int head = 0;
+
+ public ProcessMemInfo(long pid, String name, long start) {
+ this.pid = pid;
+ this.name = name;
+ this.startTime = start;
+ }
+
+ public long getUptime() {
+ return System.currentTimeMillis() - startTime;
+ }
+ }
+
public static class Service extends SystemUI {
-
- // TODO(b/35345376): Turn this back on for debuggable builds after known leak fixed.
- private static final boolean ENABLED = Build.IS_DEBUGGABLE
- && SystemProperties.getBoolean("debug.enable_leak_reporting", false);
- private static final String FORCE_ENABLE = "sysui_force_garbage_monitor";
-
private GarbageMonitor mGarbageMonitor;
@Override
public void start() {
- boolean forceEnable = Settings.Secure.getInt(mContext.getContentResolver(),
- FORCE_ENABLE, 0) != 0;
- if (!ENABLED && !forceEnable) {
- return;
- }
+ boolean forceEnable =
+ Settings.Secure.getInt(
+ mContext.getContentResolver(), FORCE_ENABLE_LEAK_REPORTING, 0)
+ != 0;
mGarbageMonitor = Dependency.get(GarbageMonitor.class);
- mGarbageMonitor.start();
+ if (LEAK_REPORTING_ENABLED || forceEnable) {
+ mGarbageMonitor.startLeakMonitor();
+ }
+ if (HEAP_TRACKING_ENABLED || forceEnable) {
+ mGarbageMonitor.startHeapTracking();
+ }
+ }
+ }
+
+ private class BackgroundHeapCheckHandler extends Handler {
+ BackgroundHeapCheckHandler(Looper onLooper) {
+ super(onLooper);
+ if (Looper.getMainLooper().equals(onLooper)) {
+ throw new RuntimeException(
+ "BackgroundHeapCheckHandler may not run on the ui thread");
+ }
+ }
+
+ @Override
+ public void handleMessage(Message m) {
+ switch (m.what) {
+ case DO_GARBAGE_INSPECTION:
+ if (gcAndCheckGarbage()) {
+ postDelayed(GarbageMonitor.this::reinspectGarbageAfterGc, 100);
+ }
+
+ removeMessages(DO_GARBAGE_INSPECTION);
+ sendEmptyMessageDelayed(DO_GARBAGE_INSPECTION, GARBAGE_INSPECTION_INTERVAL);
+ break;
+
+ case DO_HEAP_TRACK:
+ update();
+ removeMessages(DO_HEAP_TRACK);
+ sendEmptyMessageDelayed(DO_HEAP_TRACK, HEAP_TRACK_INTERVAL);
+ break;
+ }
}
}
}
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPinBasedInputViewTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPinBasedInputViewTest.java
new file mode 100644
index 0000000..e79c9d0
--- /dev/null
+++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardPinBasedInputViewTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2018 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.keyguard;
+
+import static org.mockito.Mockito.verify;
+
+import android.support.test.filters.SmallTest;
+import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper.RunWithLooper;
+import android.view.LayoutInflater;
+
+import com.android.systemui.SysuiTestCase;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@SmallTest
+@RunWith(AndroidTestingRunner.class)
+@RunWithLooper(setAsMainLooper = true)
+public class KeyguardPinBasedInputViewTest extends SysuiTestCase {
+
+ @Mock
+ private PasswordTextView mPasswordTextView;
+ private KeyguardPinBasedInputView mKeyguardPinView;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ LayoutInflater inflater = LayoutInflater.from(getContext());
+ mKeyguardPinView =
+ (KeyguardPinBasedInputView) inflater.inflate(R.layout.keyguard_pin_view, null);
+ mKeyguardPinView.mPasswordEntry = mPasswordTextView;
+ }
+
+ @Test
+ public void onResume_requestsFocus() {
+ mKeyguardPinView.onResume(KeyguardSecurityView.SCREEN_ON);
+ verify(mPasswordTextView).requestFocus();
+ }
+}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SmartReplyViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SmartReplyViewTest.java
index 99c06e6..f3d79fd 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SmartReplyViewTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SmartReplyViewTest.java
@@ -87,8 +87,7 @@
MockitoAnnotations.initMocks(this);
mReceiver = new BlockingQueueIntentReceiver();
mContext.registerReceiver(mReceiver, new IntentFilter(TEST_ACTION));
- mDependency.get(KeyguardDismissUtil.class).setDismissHandler(
- (action, cancelAction, afterKeyguardGone) -> action.onDismiss());
+ mDependency.get(KeyguardDismissUtil.class).setDismissHandler(action -> action.onDismiss());
mContainer = new View(mContext, null);
mView = SmartReplyView.inflate(mContext, null);
@@ -130,12 +129,7 @@
@Test
public void testSendSmartReply_keyguardCancelled() throws InterruptedException {
- mDependency.get(KeyguardDismissUtil.class).setDismissHandler(
- (action, cancelAction, afterKeyguardGone) -> {
- if (cancelAction != null) {
- cancelAction.run();
- }
- });
+ mDependency.get(KeyguardDismissUtil.class).setDismissHandler(action -> {});
setRepliesFromRemoteInput(TEST_CHOICES);
mView.getChildAt(2).performClick();
@@ -146,8 +140,7 @@
@Test
public void testSendSmartReply_waitsForKeyguard() throws InterruptedException {
AtomicReference<OnDismissAction> actionRef = new AtomicReference<>();
- mDependency.get(KeyguardDismissUtil.class).setDismissHandler(
- (action, cancelAction, afterKeyguardGone) -> actionRef.set(action));
+ mDependency.get(KeyguardDismissUtil.class).setDismissHandler(actionRef::set);
setRepliesFromRemoteInput(TEST_CHOICES);
mView.getChildAt(2).performClick();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/leak/GarbageMonitorTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/leak/GarbageMonitorTest.java
index a3b258f..c095472 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/util/leak/GarbageMonitorTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/util/leak/GarbageMonitorTest.java
@@ -16,16 +16,18 @@
package com.android.systemui.util.leak;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.content.Context;
+import android.os.Looper;
import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import android.testing.AndroidTestingRunner;
+import android.testing.TestableLooper;
+import android.testing.TestableLooper.RunWithLooper;
import com.android.systemui.SysuiTestCase;
@@ -34,7 +36,8 @@
import org.junit.runner.RunWith;
@SmallTest
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidTestingRunner.class)
+@RunWithLooper
public class GarbageMonitorTest extends SysuiTestCase {
private LeakReporter mLeakReporter;
@@ -45,14 +48,17 @@
public void setup() {
mTrackedGarbage = mock(TrackedGarbage.class);
mLeakReporter = mock(LeakReporter.class);
- mGarbageMonitor = new TestableGarbageMonitor(
- new LeakDetector(null, mTrackedGarbage, null),
- mLeakReporter);
+ mGarbageMonitor =
+ new TestableGarbageMonitor(
+ mContext,
+ TestableLooper.get(this).getLooper(),
+ new LeakDetector(null, mTrackedGarbage, null),
+ mLeakReporter);
}
@Test
public void testCallbacks_getScheduled() {
- mGarbageMonitor.start();
+ mGarbageMonitor.startLeakMonitor();
mGarbageMonitor.runCallbacksOnce();
mGarbageMonitor.runCallbacksOnce();
mGarbageMonitor.runCallbacksOnce();
@@ -62,7 +68,7 @@
public void testNoGarbage_doesntDump() {
when(mTrackedGarbage.countOldGarbage()).thenReturn(0);
- mGarbageMonitor.start();
+ mGarbageMonitor.startLeakMonitor();
mGarbageMonitor.runCallbacksOnce();
mGarbageMonitor.runCallbacksOnce();
mGarbageMonitor.runCallbacksOnce();
@@ -74,7 +80,7 @@
public void testALittleGarbage_doesntDump() {
when(mTrackedGarbage.countOldGarbage()).thenReturn(4);
- mGarbageMonitor.start();
+ mGarbageMonitor.startLeakMonitor();
mGarbageMonitor.runCallbacksOnce();
mGarbageMonitor.runCallbacksOnce();
mGarbageMonitor.runCallbacksOnce();
@@ -86,7 +92,7 @@
public void testTransientGarbage_doesntDump() {
when(mTrackedGarbage.countOldGarbage()).thenReturn(100);
- mGarbageMonitor.start();
+ mGarbageMonitor.startLeakMonitor();
mGarbageMonitor.runInspectCallback();
when(mTrackedGarbage.countOldGarbage()).thenReturn(0);
@@ -100,56 +106,34 @@
public void testLotsOfPersistentGarbage_dumps() {
when(mTrackedGarbage.countOldGarbage()).thenReturn(100);
- mGarbageMonitor.start();
+ mGarbageMonitor.startLeakMonitor();
mGarbageMonitor.runCallbacksOnce();
verify(mLeakReporter).dumpLeak(anyInt());
}
private static class TestableGarbageMonitor extends GarbageMonitor {
- Runnable mInspectCallback;
- Runnable mReinspectCallback;
-
- public TestableGarbageMonitor(LeakDetector leakDetector,
+ public TestableGarbageMonitor(
+ Context context,
+ Looper looper,
+ LeakDetector leakDetector,
LeakReporter leakReporter) {
- super(null /* bgLooper */, leakDetector, leakReporter);
- }
-
- @Override
- void scheduleInspectGarbage(Runnable runnable) {
- assertNull("must not have more than one pending inspect callback", mInspectCallback);
- mInspectCallback = runnable;
+ super(context, looper, leakDetector, leakReporter);
}
void runInspectCallback() {
- assertNotNull("expected an inspect callback to be scheduled", mInspectCallback);
- Runnable callback = mInspectCallback;
- mInspectCallback = null;
- callback.run();
- }
-
- @Override
- void scheduleReinspectGarbage(Runnable runnable) {
- assertNull("must not have more than one reinspect callback", mReinspectCallback);
- mReinspectCallback = runnable;
+ startLeakMonitor();
}
void runReinspectCallback() {
- assertNotNull("expected a reinspect callback to be scheduled", mInspectCallback);
- maybeRunReinspectCallback();
- }
-
- void maybeRunReinspectCallback() {
- Runnable callback = mReinspectCallback;
- mReinspectCallback = null;
- if (callback != null) {
- callback.run();
- }
+ reinspectGarbageAfterGc();
}
void runCallbacksOnce() {
+ // Note that TestableLooper doesn't currently support delayed messages so we need to run
+ // callbacks explicitly.
runInspectCallback();
- maybeRunReinspectCallback();
+ runReinspectCallback();
}
}
}
\ No newline at end of file
diff --git a/services/core/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java
index d818bd6..13503e6 100644
--- a/services/core/java/com/android/server/AppOpsService.java
+++ b/services/core/java/com/android/server/AppOpsService.java
@@ -48,6 +48,7 @@
import android.util.AtomicFile;
import android.util.Slog;
import android.util.SparseArray;
+import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
import android.util.TimeUtils;
import android.util.Xml;
@@ -108,6 +109,9 @@
// Write at most every 30 minutes.
static final long WRITE_DELAY = DEBUG ? 1000 : 30*60*1000;
+ // How long we want for a drop in uid state to settle before applying it.
+ static final long STATE_SETTLE_TIME = 10*1000;
+
// Constant meaning that any UID should be matched when dispatching callbacks
private static final int UID_ANY = -2;
@@ -162,13 +166,6 @@
"rc", // UID_STATE_CACHED
};
- static final String[] MODE_NAMES = new String[] {
- "allow", // MODE_ALLOWED
- "ignore", // MODE_IGNORED
- "deny", // MODE_ERRORED
- "default", // MODE_DEFAULT
- };
-
Context mContext;
final AtomicFile mFile;
final Handler mHandler;
@@ -194,6 +191,8 @@
@VisibleForTesting
final SparseArray<UidState> mUidStates = new SparseArray<>();
+ long mLastUptime;
+
/*
* These are app op restrictions imposed per user from various parties.
*/
@@ -202,11 +201,17 @@
@VisibleForTesting
static final class UidState {
public final int uid;
+
public int state = UID_STATE_CACHED;
+ public int pendingState = UID_STATE_CACHED;
+ public long pendingStateCommitTime;
+
public int startNesting;
public ArrayMap<String, Ops> pkgOps;
public SparseIntArray opModes;
+ public SparseBooleanArray foregroundOps;
+
public UidState(int uid) {
this.uid = uid;
}
@@ -220,6 +225,32 @@
return (pkgOps == null || pkgOps.isEmpty())
&& (opModes == null || opModes.size() <= 0);
}
+
+ int evalMode(int mode) {
+ if (mode == AppOpsManager.MODE_FOREGROUND) {
+ return state <= UID_STATE_FOREGROUND_SERVICE
+ ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED;
+ }
+ return mode;
+ }
+
+ public void evalForegroundOps() {
+ SparseBooleanArray which = null;
+ if (pkgOps != null) {
+ for (int i = pkgOps.size() - 1; i >= 0; i--) {
+ Ops ops = pkgOps.valueAt(i);
+ for (int j = ops.size() - 1; j >= 0; j--) {
+ if (ops.valueAt(j).mode == AppOpsManager.MODE_FOREGROUND) {
+ if (which == null) {
+ which = new SparseBooleanArray();
+ }
+ which.put(ops.keyAt(j), true);
+ }
+ }
+ }
+ }
+ foregroundOps = which;
+ }
}
final static class Ops extends SparseArray<Op> {
@@ -267,6 +298,10 @@
}
return false;
}
+
+ int getMode() {
+ return uidState.evalMode(mode);
+ }
}
final SparseArray<ArraySet<ModeCallback>> mOpModeWatchers = new SparseArray<>();
@@ -575,7 +610,16 @@
synchronized (this) {
final UidState uidState = getUidStateLocked(uid, true);
final int newState = PROCESS_STATE_TO_UID_STATE[procState];
- if (uidState != null && uidState.state != newState) {
+ if (uidState != null && uidState.pendingState != newState) {
+ if (newState < uidState.state) {
+ // We are moving to a more important state, always do it immediately.
+ uidState.state = newState;
+ uidState.pendingStateCommitTime = 0;
+ } else if (uidState.pendingStateCommitTime == 0) {
+ // We are moving to a less important state for the first time,
+ // delay the application for a bit.
+ uidState.pendingStateCommitTime = SystemClock.uptimeMillis() + STATE_SETTLE_TIME;
+ }
if (uidState.startNesting != 0) {
// There is some actively running operation... need to find it
// and appropriately update its state.
@@ -585,13 +629,13 @@
for (int j = ops.size() - 1; j >= 0; j--) {
final Op op = ops.valueAt(j);
if (op.startNesting > 0) {
- op.time[uidState.state] = now;
+ op.time[uidState.pendingState] = now;
op.time[newState] = now;
}
}
}
}
- uidState.state = newState;
+ uidState.pendingState = newState;
}
}
}
@@ -887,6 +931,9 @@
if (op != null) {
if (op.mode != mode) {
op.mode = mode;
+ if (uidState != null) {
+ uidState.evalForegroundOps();
+ }
ArraySet<ModeCallback> cbs = mOpModeWatchers.get(code);
if (cbs != null) {
if (repCbs == null) {
@@ -1046,6 +1093,7 @@
Map<String, Ops> packages = uidState.pkgOps;
Iterator<Map.Entry<String, Ops>> it = packages.entrySet().iterator();
+ boolean uidChanged = false;
while (it.hasNext()) {
Map.Entry<String, Ops> ent = it.next();
String packageName = ent.getKey();
@@ -1060,6 +1108,7 @@
&& curOp.mode != AppOpsManager.opToDefaultMode(curOp.op)) {
curOp.mode = AppOpsManager.opToDefaultMode(curOp.op);
changed = true;
+ uidChanged = true;
callbacks = addCallbacks(callbacks, curOp.op, curOp.uid, packageName,
mOpModeWatchers.get(curOp.op));
callbacks = addCallbacks(callbacks, curOp.op, curOp.uid, packageName,
@@ -1076,6 +1125,9 @@
if (uidState.isDefault()) {
mUidStates.remove(uidState.uid);
}
+ if (uidChanged) {
+ uidState.evalForegroundOps();
+ }
}
if (changed) {
@@ -1197,7 +1249,7 @@
if (op == null) {
return AppOpsManager.opToDefaultMode(code);
}
- return op.mode;
+ return op.mode == AppOpsManager.MODE_FOREGROUND ? AppOpsManager.MODE_ALLOWED : op.mode;
}
}
@@ -1352,9 +1404,9 @@
// If there is a non-default per UID policy (we set UID op mode only if
// non-default) it takes over, otherwise use the per package policy.
if (uidState.opModes != null && uidState.opModes.indexOfKey(switchCode) >= 0) {
- final int uidMode = uidState.opModes.get(switchCode);
+ final int uidMode = uidState.evalMode(uidState.opModes.get(switchCode));
if (uidMode != AppOpsManager.MODE_ALLOWED) {
- if (DEBUG) Slog.d(TAG, "noteOperation: reject #" + op.mode + " for code "
+ if (DEBUG) Slog.d(TAG, "noteOperation: uid reject #" + uidMode + " for code "
+ switchCode + " (" + code + ") uid " + uid + " package "
+ packageName);
op.rejectTime[uidState.state] = System.currentTimeMillis();
@@ -1362,12 +1414,13 @@
}
} else {
final Op switchOp = switchCode != code ? getOpLocked(ops, switchCode, true) : op;
- if (switchOp.mode != AppOpsManager.MODE_ALLOWED) {
- if (DEBUG) Slog.d(TAG, "noteOperation: reject #" + op.mode + " for code "
+ final int mode = switchOp.getMode();
+ if (mode != AppOpsManager.MODE_ALLOWED) {
+ if (DEBUG) Slog.d(TAG, "noteOperation: reject #" + mode + " for code "
+ switchCode + " (" + code + ") uid " + uid + " package "
+ packageName);
op.rejectTime[uidState.state] = System.currentTimeMillis();
- return switchOp.mode;
+ return mode;
}
}
if (DEBUG) Slog.d(TAG, "noteOperation: allowing code " + code + " uid " + uid
@@ -1458,10 +1511,10 @@
// If there is a non-default per UID policy (we set UID op mode only if
// non-default) it takes over, otherwise use the per package policy.
if (uidState.opModes != null && uidState.opModes.indexOfKey(switchCode) >= 0) {
- final int uidMode = uidState.opModes.get(switchCode);
+ final int uidMode = uidState.evalMode(uidState.opModes.get(switchCode));
if (uidMode != AppOpsManager.MODE_ALLOWED
&& (!startIfModeDefault || uidMode != AppOpsManager.MODE_DEFAULT)) {
- if (DEBUG) Slog.d(TAG, "noteOperation: reject #" + op.mode + " for code "
+ if (DEBUG) Slog.d(TAG, "noteOperation: uid reject #" + uidMode + " for code "
+ switchCode + " (" + code + ") uid " + uid + " package "
+ resolvedPackageName);
op.rejectTime[uidState.state] = System.currentTimeMillis();
@@ -1469,13 +1522,14 @@
}
} else {
final Op switchOp = switchCode != code ? getOpLocked(ops, switchCode, true) : op;
- if (switchOp.mode != AppOpsManager.MODE_ALLOWED
- && (!startIfModeDefault || switchOp.mode != AppOpsManager.MODE_DEFAULT)) {
- if (DEBUG) Slog.d(TAG, "startOperation: reject #" + op.mode + " for code "
+ final int mode = switchOp.getMode();
+ if (mode != AppOpsManager.MODE_ALLOWED
+ && (!startIfModeDefault || mode != AppOpsManager.MODE_DEFAULT)) {
+ if (DEBUG) Slog.d(TAG, "startOperation: reject #" + mode + " for code "
+ switchCode + " (" + code + ") uid " + uid + " package "
+ resolvedPackageName);
op.rejectTime[uidState.state] = System.currentTimeMillis();
- return switchOp.mode;
+ return mode;
}
}
if (DEBUG) Slog.d(TAG, "startOperation: allowing code " + code + " uid " + uid
@@ -1642,6 +1696,19 @@
}
uidState = new UidState(uid);
mUidStates.put(uid, uidState);
+ } else {
+ if (uidState.pendingStateCommitTime != 0) {
+ if (uidState.pendingStateCommitTime < mLastUptime) {
+ uidState.state = uidState.pendingState;
+ uidState.pendingStateCommitTime = 0;
+ } else {
+ mLastUptime = SystemClock.uptimeMillis();
+ if (uidState.pendingStateCommitTime < mLastUptime) {
+ uidState.state = uidState.pendingState;
+ uidState.pendingStateCommitTime = 0;
+ }
+ }
+ }
}
return uidState;
}
@@ -1870,6 +1937,7 @@
if (uidState.pkgOps == null) {
continue;
}
+ boolean changed = false;
for (int j = 0; j < uidState.pkgOps.size(); j++) {
Ops ops = uidState.pkgOps.valueAt(j);
if (ops != null) {
@@ -1879,9 +1947,13 @@
AppOpsManager.OP_RUN_ANY_IN_BACKGROUND);
copy.mode = op.mode;
ops.put(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, copy);
+ changed = true;
}
}
}
+ if (changed) {
+ uidState.evalForegroundOps();
+ }
}
}
@@ -2077,6 +2149,10 @@
XmlUtils.skipCurrentTag(parser);
}
}
+ UidState uidState = getUidStateLocked(uid, false);
+ if (uidState != null) {
+ uidState.evalForegroundOps();
+ }
}
void writeState() {
@@ -2152,12 +2228,12 @@
out.attribute(null, "m", Integer.toString(op.getMode()));
}
for (int k = 0; k < _NUM_UID_STATE; k++) {
- final long time = op.getTimeFor(k);
+ final long time = op.getLastTimeFor(k);
if (time != 0) {
out.attribute(null, UID_STATE_TIME_ATTRS[k],
Long.toString(time));
}
- final long rejectTime = op.getRejectTimeFor(k);
+ final long rejectTime = op.getLastRejectTimeFor(k);
if (rejectTime != 0) {
out.attribute(null, UID_STATE_REJECT_ATTRS[k],
Long.toString(rejectTime));
@@ -2229,7 +2305,7 @@
dumpCommandHelp(pw);
}
- private int strOpToOp(String op, PrintWriter err) {
+ static private int strOpToOp(String op, PrintWriter err) {
try {
return AppOpsManager.strOpToOp(op);
} catch (IllegalArgumentException e) {
@@ -2247,8 +2323,8 @@
}
int strModeToMode(String modeStr, PrintWriter err) {
- for (int i = MODE_NAMES.length - 1; i >= 0; i--) {
- if (MODE_NAMES[i].equals(modeStr)) {
+ for (int i = AppOpsManager.MODE_NAMES.length - 1; i >= 0; i--) {
+ if (AppOpsManager.MODE_NAMES[i].equals(modeStr)) {
return i;
}
}
@@ -2470,7 +2546,7 @@
if (ops == null || ops.size() <= 0) {
pw.println("No operations.");
if (shell.op > AppOpsManager.OP_NONE && shell.op < AppOpsManager._NUM_OP) {
- pw.println("Default mode: " + AppOpsManager.modeToString(
+ pw.println("Default mode: " + AppOpsManager.modeToName(
AppOpsManager.opToDefaultMode(shell.op)));
}
return 0;
@@ -2482,7 +2558,7 @@
AppOpsManager.OpEntry ent = entries.get(j);
pw.print(AppOpsManager.opToName(ent.getOp()));
pw.print(": ");
- pw.print(AppOpsManager.modeToString(ent.getMode()));
+ pw.print(AppOpsManager.modeToName(ent.getMode()));
if (ent.getTime() != 0) {
pw.print("; time=");
TimeUtils.formatDuration(now - ent.getTime(), pw);
@@ -2636,7 +2712,10 @@
private void dumpHelp(PrintWriter pw) {
pw.println("AppOps service (appops) dump options:");
- pw.println(" none");
+ pw.println(" -h");
+ pw.println(" Print this help text.");
+ pw.println(" --op [OP]");
+ pw.println(" Limit output to data associated with the given app op code.");
}
private void dumpTimesLocked(PrintWriter pw, String firstPrefix, String prefix, long[] times,
@@ -2671,6 +2750,8 @@
protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
if (!DumpUtils.checkDumpAndUsageStatsPermission(mContext, TAG, pw)) return;
+ int dumpOp = -1;
+
if (args != null) {
for (int i=0; i<args.length; i++) {
String arg = args[i];
@@ -2679,6 +2760,16 @@
return;
} else if ("-a".equals(arg)) {
// dump all data
+ } else if ("--op".equals(arg)) {
+ i++;
+ if (i >= args.length) {
+ pw.println("No argument for --op option");
+ return;
+ }
+ dumpOp = Shell.strOpToOp(args[i], pw);
+ if (dumpOp < 0) {
+ return;
+ }
} else if (arg.length() > 0 && arg.charAt(0) == '-'){
pw.println("Unknown option: " + arg);
return;
@@ -2693,13 +2784,21 @@
pw.println("Current AppOps Service state:");
final long now = System.currentTimeMillis();
final long nowElapsed = SystemClock.elapsedRealtime();
+ final long nowUptime = SystemClock.uptimeMillis();
final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
final Date date = new Date();
boolean needSep = false;
if (mOpModeWatchers.size() > 0) {
needSep = true;
- pw.println(" Op mode watchers:");
+ boolean printedHeader = false;
for (int i=0; i<mOpModeWatchers.size(); i++) {
+ if (dumpOp >= 0 && dumpOp != mOpModeWatchers.keyAt(i)) {
+ continue;
+ }
+ if (!printedHeader) {
+ pw.println(" Op mode watchers:");
+ printedHeader = true;
+ }
pw.print(" Op "); pw.print(AppOpsManager.opToName(mOpModeWatchers.keyAt(i)));
pw.println(":");
ArraySet<ModeCallback> callbacks = mOpModeWatchers.valueAt(i);
@@ -2722,7 +2821,7 @@
}
}
}
- if (mModeWatchers.size() > 0) {
+ if (mModeWatchers.size() > 0 && dumpOp < 0) {
needSep = true;
pw.println(" All op mode watchers:");
for (int i=0; i<mModeWatchers.size(); i++) {
@@ -2733,12 +2832,19 @@
}
if (mActiveWatchers.size() > 0) {
needSep = true;
- pw.println(" All op active watchers:");
+ boolean printedHeader = false;
for (int i = 0; i < mActiveWatchers.size(); i++) {
final SparseArray<ActiveCallback> activeWatchers = mActiveWatchers.valueAt(i);
if (activeWatchers.size() <= 0) {
continue;
}
+ if (dumpOp >= 0 && activeWatchers.indexOfKey(dumpOp) < 0) {
+ continue;
+ }
+ if (!printedHeader) {
+ pw.println(" All op active watchers:");
+ printedHeader = true;
+ }
pw.print(" ");
pw.print(Integer.toHexString(System.identityHashCode(
mActiveWatchers.keyAt(i))));
@@ -2746,6 +2852,9 @@
pw.print(" [");
final int opCount = activeWatchers.size();
for (i = 0; i < opCount; i++) {
+ if (i > 0) {
+ pw.print(' ');
+ }
pw.print(AppOpsManager.opToName(activeWatchers.keyAt(i)));
if (i < opCount - 1) {
pw.print(',');
@@ -2758,15 +2867,30 @@
}
if (mClients.size() > 0) {
needSep = true;
- pw.println(" Clients:");
+ boolean printedHeader = false;
for (int i=0; i<mClients.size(); i++) {
- pw.print(" "); pw.print(mClients.keyAt(i)); pw.println(":");
+ boolean printedClient = false;
ClientState cs = mClients.valueAt(i);
- pw.print(" "); pw.println(cs);
if (cs.mStartedOps.size() > 0) {
- pw.println(" Started ops:");
+ boolean printedStarted = false;
for (int j=0; j<cs.mStartedOps.size(); j++) {
Op op = cs.mStartedOps.get(j);
+ if (dumpOp >= 0 && op.op != dumpOp) {
+ continue;
+ }
+ if (!printedHeader) {
+ pw.println(" Clients:");
+ printedHeader = true;
+ }
+ if (!printedClient) {
+ pw.print(" "); pw.print(mClients.keyAt(i)); pw.println(":");
+ pw.print(" "); pw.println(cs);
+ printedClient = true;
+ }
+ if (!printedStarted) {
+ pw.println(" Started ops:");
+ printedStarted = true;
+ }
pw.print(" "); pw.print("uid="); pw.print(op.uid);
pw.print(" pkg="); pw.print(op.packageName);
pw.print(" op="); pw.println(AppOpsManager.opToName(op.op));
@@ -2774,7 +2898,7 @@
}
}
}
- if (mAudioRestrictions.size() > 0) {
+ if (mAudioRestrictions.size() > 0 && dumpOp < 0) {
boolean printedHeader = false;
for (int o=0; o<mAudioRestrictions.size(); o++) {
final String op = AppOpsManager.opToName(mAudioRestrictions.keyAt(o));
@@ -2789,7 +2913,7 @@
pw.print(" "); pw.print(op);
pw.print(" usage="); pw.print(AudioAttributes.usageToString(usage));
Restriction r = restrictions.valueAt(i);
- pw.print(": mode="); pw.println(MODE_NAMES[r.mode]);
+ pw.print(": mode="); pw.println(AppOpsManager.modeToName(r.mode));
if (!r.exceptionPackages.isEmpty()) {
pw.println(" Exceptions:");
for (int j=0; j<r.exceptionPackages.size(); j++) {
@@ -2804,38 +2928,83 @@
}
for (int i=0; i<mUidStates.size(); i++) {
UidState uidState = mUidStates.valueAt(i);
+ final SparseIntArray opModes = uidState.opModes;
+ final ArrayMap<String, Ops> pkgOps = uidState.pkgOps;
+
+ if (dumpOp >= 0) {
+ boolean hasOp = uidState.opModes != null
+ && uidState.opModes.indexOfKey(dumpOp) >= 0;
+ if (pkgOps != null) {
+ for (int pkgi = 0; !hasOp && pkgi < pkgOps.size(); pkgi++) {
+ Ops ops = pkgOps.valueAt(pkgi);
+ if (ops != null && ops.indexOfKey(dumpOp) >= 0) {
+ hasOp = true;
+ continue;
+ }
+ }
+ }
+ if (!hasOp) {
+ continue;
+ }
+ }
pw.print(" Uid "); UserHandle.formatUid(pw, uidState.uid); pw.println(":");
pw.print(" state=");
pw.println(UID_STATE_NAMES[uidState.state]);
+ if (uidState.state != uidState.pendingState) {
+ pw.print(" pendingState=");
+ pw.println(UID_STATE_NAMES[uidState.pendingState]);
+ }
+ if (uidState.pendingStateCommitTime != 0) {
+ pw.print(" pendingStateCommitTime=");
+ TimeUtils.formatDuration(uidState.pendingStateCommitTime, nowUptime, pw);
+ pw.println();
+ }
if (uidState.startNesting != 0) {
pw.print(" startNesting=");
pw.println(uidState.startNesting);
}
+ if (uidState.foregroundOps != null) {
+ pw.println(" foregroundOps:");
+ for (int j = 0; j < uidState.foregroundOps.size(); j++) {
+ pw.print(" ");
+ pw.println(AppOpsManager.opToName(uidState.foregroundOps.keyAt(j)));
+ }
+ }
needSep = true;
- SparseIntArray opModes = uidState.opModes;
if (opModes != null) {
final int opModeCount = opModes.size();
for (int j = 0; j < opModeCount; j++) {
final int code = opModes.keyAt(j);
final int mode = opModes.valueAt(j);
+ if (dumpOp >= 0 && dumpOp != code) {
+ continue;
+ }
pw.print(" "); pw.print(AppOpsManager.opToName(code));
- pw.print(": mode="); pw.println(MODE_NAMES[mode]);
+ pw.print(": mode="); pw.println(AppOpsManager.modeToName(mode));
}
}
- ArrayMap<String, Ops> pkgOps = uidState.pkgOps;
if (pkgOps == null) {
continue;
}
- for (Ops ops : pkgOps.values()) {
- pw.print(" Package "); pw.print(ops.packageName); pw.println(":");
+ for (int pkgi = 0; pkgi < pkgOps.size(); pkgi++) {
+ Ops ops = pkgOps.valueAt(pkgi);
+ boolean printedPackage = false;
for (int j=0; j<ops.size(); j++) {
Op op = ops.valueAt(j);
+ if (dumpOp >= 0 && dumpOp != op.op) {
+ continue;
+ }
+ if (!printedPackage) {
+ pw.print(" Package "); pw.print(ops.packageName); pw.println(":");
+ printedPackage = true;
+ }
pw.print(" "); pw.print(AppOpsManager.opToName(op.op));
- pw.print(" ("); pw.print(MODE_NAMES[op.mode]); pw.println("): ");
+ pw.print(" ("); pw.print(AppOpsManager.modeToName(op.mode));
+ pw.println("): ");
dumpTimesLocked(pw,
" Access: ",
" ", op.time, now, sdf, date);
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 41f413d..607db4e 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -117,10 +117,10 @@
return (onSubscriptionsChangedListenerCallback != null);
}
- boolean canReadPhoneState() {
+ boolean canReadCallLog() {
try {
- return TelephonyPermissions.checkReadPhoneState(
- context, subId, callerPid, callerUid, callingPackage, "listen");
+ return TelephonyPermissions.checkReadCallLog(
+ context, subId, callerPid, callerUid, callingPackage);
} catch (SecurityException e) {
return false;
}
@@ -667,8 +667,8 @@
}
private String getCallIncomingNumber(Record record, int phoneId) {
- // Hide the number if record's process can't currently read phone state.
- return record.canReadPhoneState() ? mCallIncomingNumber[phoneId] : "";
+ // Only reveal the incoming number if the record has read call log permission.
+ return record.canReadCallLog() ? mCallIncomingNumber[phoneId] : "";
}
private Record add(IBinder binder) {
@@ -729,13 +729,13 @@
}
}
- public void notifyCallState(int state, String incomingNumber) {
+ public void notifyCallState(int state, String phoneNumber) {
if (!checkNotifyPermission("notifyCallState()")) {
return;
}
if (VDBG) {
- log("notifyCallState: state=" + state + " incomingNumber=" + incomingNumber);
+ log("notifyCallState: state=" + state + " phoneNumber=" + phoneNumber);
}
synchronized (mRecords) {
@@ -743,8 +743,10 @@
if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_CALL_STATE) &&
(r.subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID)) {
try {
- String incomingNumberOrEmpty = r.canReadPhoneState() ? incomingNumber : "";
- r.callback.onCallStateChanged(state, incomingNumberOrEmpty);
+ // Ensure the listener has read call log permission; if they do not return
+ // an empty phone number.
+ String phoneNumberOrEmpty = r.canReadCallLog() ? phoneNumber : "";
+ r.callback.onCallStateChanged(state, phoneNumberOrEmpty);
} catch (RemoteException ex) {
mRemoveList.add(r.binder);
}
@@ -755,7 +757,7 @@
// Called only by Telecomm to communicate call state across different phone accounts. So
// there is no need to add a valid subId or slotId.
- broadcastCallStateChanged(state, incomingNumber,
+ broadcastCallStateChanged(state, phoneNumber,
SubscriptionManager.INVALID_PHONE_INDEX,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
}
@@ -1571,9 +1573,6 @@
Intent intent = new Intent(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
intent.putExtra(PhoneConstants.STATE_KEY,
PhoneConstantConversions.convertCallState(state).toString());
- if (!TextUtils.isEmpty(incomingNumber)) {
- intent.putExtra(TelephonyManager.EXTRA_INCOMING_NUMBER, incomingNumber);
- }
// If a valid subId was specified, we should fire off a subId-specific state
// change intent and include the subId.
@@ -1589,13 +1588,20 @@
// Wakeup apps for the (SUBSCRIPTION_)PHONE_STATE broadcast.
intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
+ Intent intentWithPhoneNumber = new Intent(intent);
+ if (!TextUtils.isEmpty(incomingNumber)) {
+ intentWithPhoneNumber.putExtra(TelephonyManager.EXTRA_INCOMING_NUMBER, incomingNumber);
+ }
// Send broadcast twice, once for apps that have PRIVILEGED permission and once for those
// that have the runtime one
- mContext.sendBroadcastAsUser(intent, UserHandle.ALL,
+ mContext.sendBroadcastAsUser(intentWithPhoneNumber, UserHandle.ALL,
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
mContext.sendBroadcastAsUser(intent, UserHandle.ALL,
android.Manifest.permission.READ_PHONE_STATE,
AppOpsManager.OP_READ_PHONE_STATE);
+ mContext.sendBroadcastAsUserMultiplePermissions(intentWithPhoneNumber, UserHandle.ALL,
+ new String[] { android.Manifest.permission.READ_PHONE_STATE,
+ android.Manifest.permission.READ_CALL_LOG});
}
private void broadcastDataConnectionStateChanged(int state,
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index e86850e..a85df03 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -17,6 +17,7 @@
package com.android.server.am;
import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SPLIT_SCREEN;
+import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
@@ -1784,6 +1785,14 @@
final int otherWindowingMode = other.getWindowingMode();
if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN) {
+ // In this case the home stack isn't resizeable even though we are in split-screen
+ // mode. We still want the primary splitscreen stack to be visible as there will be
+ // a slight hint of it in the status bar area above the non-resizeable home
+ // activity.
+ if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY
+ && other.getActivityType() == ACTIVITY_TYPE_HOME) {
+ return true;
+ }
if (other.isStackTranslucent(starting)) {
// Can be visible behind a translucent fullscreen stack.
continue;
diff --git a/services/core/java/com/android/server/fingerprint/ClientMonitor.java b/services/core/java/com/android/server/fingerprint/ClientMonitor.java
index 4100a9a..b935ba2 100644
--- a/services/core/java/com/android/server/fingerprint/ClientMonitor.java
+++ b/services/core/java/com/android/server/fingerprint/ClientMonitor.java
@@ -80,7 +80,7 @@
mGroupId = groupId;
mIsRestricted = restricted;
mOwner = owner;
- mSuccessVibrationEffect = getSuccessVibrationEffect(context);
+ mSuccessVibrationEffect = VibrationEffect.get(VibrationEffect.EFFECT_CLICK);
mErrorVibrationEffect = VibrationEffect.get(VibrationEffect.EFFECT_DOUBLE_CLICK);
try {
if (token != null) {
@@ -239,25 +239,4 @@
vibrator.vibrate(mErrorVibrationEffect, FINGERPRINT_SONFICATION_ATTRIBUTES);
}
}
-
- private static VibrationEffect getSuccessVibrationEffect(Context ctx) {
- int[] arr = ctx.getResources().getIntArray(
- com.android.internal.R.array.config_longPressVibePattern);
- final long[] vibePattern;
- if (arr == null || arr.length == 0) {
- vibePattern = DEFAULT_SUCCESS_VIBRATION_PATTERN;
- } else {
- vibePattern = new long[arr.length];
- for (int i = 0; i < arr.length; i++) {
- vibePattern[i] = arr[i];
- }
- }
- if (vibePattern.length == 1) {
- return VibrationEffect.createOneShot(
- vibePattern[0], VibrationEffect.DEFAULT_AMPLITUDE);
- } else {
- return VibrationEffect.createWaveform(vibePattern, -1);
- }
- }
-
}
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index 64750b0..4e6307d 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -1887,9 +1887,26 @@
GPS_CAPABILITY_MEASUREMENTS));
mGnssNavigationMessageProvider.onCapabilitiesUpdated(hasCapability(
GPS_CAPABILITY_NAV_MESSAGES));
+ restartRequests();
}
});
- }
+ }
+
+ private void restartRequests() {
+ Log.i(TAG, "restartRequests");
+
+ restartLocationRequest();
+ mGnssMeasurementsProvider.resumeIfStarted();
+ mGnssNavigationMessageProvider.resumeIfStarted();
+ mGnssBatchingProvider.resumeIfStarted();
+ mGnssGeofenceProvider.resumeIfStarted();
+ }
+
+ private void restartLocationRequest() {
+ if (DEBUG) Log.d(TAG, "restartLocationRequest");
+ mStarted = false;
+ updateRequirements();
+ }
/**
* Called from native code to inform us the hardware year.
@@ -1909,6 +1926,23 @@
mHardwareModelName = modelName;
}
+ /**
+ * Called from native code to inform us GNSS HAL service died.
+ */
+ private void reportGnssServiceDied() {
+ if (DEBUG) Log.d(TAG, "reportGnssServiceDied");
+ mHandler.post(() -> {
+ class_init_native();
+ native_init_once();
+ if (isEnabled()) {
+ // re-calls native_init() and other setup.
+ handleEnable();
+ // resend configuration into the restarted HAL service.
+ reloadGpsProperties(mContext, mProperties);
+ }
+ });
+ }
+
public interface GnssSystemInfoProvider {
/**
* Returns the year of underlying GPS hardware.
diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java
index febce31..7f141ee 100644
--- a/services/core/java/com/android/server/notification/RankingHelper.java
+++ b/services/core/java/com/android/server/notification/RankingHelper.java
@@ -116,17 +116,12 @@
private final ArrayMap<String, Record> mRecords = new ArrayMap<>(); // pkg|uid => Record
private final ArrayMap<String, NotificationRecord> mProxyByGroupTmp = new ArrayMap<>();
private final ArrayMap<String, Record> mRestoredWithoutUids = new ArrayMap<>(); // pkg => Record
- private final ArrayMap<Pair<String, Integer>, Boolean> mSystemAppCache = new ArrayMap<>();
private final Context mContext;
private final RankingHandler mRankingHandler;
private final PackageManager mPm;
private SparseBooleanArray mBadgingEnabled;
- private Signature[] mSystemSignature;
- private String mPermissionControllerPackageName;
- private String mServicesSystemSharedLibPackageName;
- private String mSharedSystemSharedLibPackageName;
private boolean mAreChannelsBypassingDnd;
private ZenModeHelper mZenModeHelper;
@@ -161,7 +156,6 @@
}
}
- getSignatures();
updateChannelsBypassingDnd();
}
@@ -623,7 +617,6 @@
if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(channel.getId())) {
throw new IllegalArgumentException("Reserved id");
}
- final boolean isSystemApp = isSystemPackage(pkg, uid);
NotificationChannel existing = r.channels.get(channel.getId());
// Keep most of the existing settings
if (existing != null && fromTargetApp) {
@@ -651,7 +644,7 @@
// system apps and dnd access apps can bypass dnd if the user hasn't changed any
// fields on the channel yet
- if (existing.getUserLockedFields() == 0 && (isSystemApp || hasDndAccess)) {
+ if (existing.getUserLockedFields() == 0 && hasDndAccess) {
boolean bypassDnd = channel.canBypassDnd();
existing.setBypassDnd(bypassDnd);
@@ -669,7 +662,7 @@
}
// Reset fields that apps aren't allowed to set.
- if (fromTargetApp && !(isSystemApp || hasDndAccess)) {
+ if (fromTargetApp && !hasDndAccess) {
channel.setBypassDnd(r.priority == Notification.PRIORITY_MAX);
}
if (fromTargetApp) {
@@ -695,65 +688,6 @@
channel.unlockFields(channel.getUserLockedFields());
}
- /**
- * Determine whether a package is a "system package", in which case certain things (like
- * bypassing DND) should be allowed.
- */
- private boolean isSystemPackage(String pkg, int uid) {
- Pair<String, Integer> app = new Pair(pkg, uid);
- if (mSystemAppCache.containsKey(app)) {
- return mSystemAppCache.get(app);
- }
-
- PackageInfo pi;
- try {
- pi = mPm.getPackageInfoAsUser(
- pkg, PackageManager.GET_SIGNATURES, UserHandle.getUserId(uid));
- } catch (NameNotFoundException e) {
- Slog.w(TAG, "Can't find pkg", e);
- return false;
- }
- boolean isSystem = (mSystemSignature[0] != null
- && mSystemSignature[0].equals(getFirstSignature(pi)))
- || pkg.equals(mPermissionControllerPackageName)
- || pkg.equals(mServicesSystemSharedLibPackageName)
- || pkg.equals(mSharedSystemSharedLibPackageName)
- || pkg.equals(PrintManager.PRINT_SPOOLER_PACKAGE_NAME)
- || isDeviceProvisioningPackage(pkg);
- mSystemAppCache.put(app, isSystem);
- return isSystem;
- }
-
- private Signature getFirstSignature(PackageInfo pkg) {
- if (pkg != null && pkg.signatures != null && pkg.signatures.length > 0) {
- return pkg.signatures[0];
- }
- return null;
- }
-
- private Signature getSystemSignature() {
- try {
- final PackageInfo sys = mPm.getPackageInfoAsUser(
- "android", PackageManager.GET_SIGNATURES, UserHandle.USER_SYSTEM);
- return getFirstSignature(sys);
- } catch (NameNotFoundException e) {
- }
- return null;
- }
-
- private boolean isDeviceProvisioningPackage(String packageName) {
- String deviceProvisioningPackage = mContext.getResources().getString(
- com.android.internal.R.string.config_deviceProvisioningPackage);
- return deviceProvisioningPackage != null && deviceProvisioningPackage.equals(packageName);
- }
-
- private void getSignatures() {
- mSystemSignature = new Signature[]{getSystemSignature()};
- mPermissionControllerPackageName = mPm.getPermissionControllerPackageName();
- mServicesSystemSharedLibPackageName = mPm.getServicesSystemSharedLibraryPackageName();
- mSharedSystemSharedLibPackageName = mPm.getSharedSystemSharedLibraryPackageName();
- }
-
@Override
public void updateNotificationChannel(String pkg, int uid, NotificationChannel updatedChannel,
boolean fromUser) {
diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
index fd51be5..8562572 100644
--- a/services/core/java/com/android/server/om/OverlayManagerService.java
+++ b/services/core/java/com/android/server/om/OverlayManagerService.java
@@ -389,11 +389,16 @@
final PackageInfo pi = mPackageManager.getPackageInfo(packageName, userId,
false);
if (pi != null) {
+ /*
+ * Only update overlay settings when an overlay becomes enabled or disabled.
+ * Enabling or disabling components of a target should not change the
+ * target's overlays. Since, overlays do not have components, this will only
+ * update overlay settings if an overlay package becomes enabled or
+ * disabled.
+ */
mPackageManager.cachePackageInfo(packageName, userId, pi);
if (pi.isOverlayPackage()) {
mImpl.onOverlayPackageChanged(packageName, userId);
- } else {
- mImpl.onTargetPackageChanged(packageName, userId);
}
}
}
diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
index c57f97b..bb36ab1 100644
--- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
+++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
@@ -212,16 +212,6 @@
}
}
- void onTargetPackageChanged(@NonNull final String packageName, final int userId) {
- if (DEBUG) {
- Slog.d(TAG, "onTargetPackageChanged packageName=" + packageName + " userId=" + userId);
- }
-
- if (updateAllOverlaysForTarget(packageName, userId, 0)) {
- mListener.onOverlaysChanged(packageName, userId);
- }
- }
-
void onTargetPackageUpgrading(@NonNull final String packageName, final int userId) {
if (DEBUG) {
Slog.d(TAG, "onTargetPackageUpgrading packageName=" + packageName + " userId="
diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index a3428f0..4a6587b 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1287,6 +1287,12 @@
if (!shown)
return false;
+ // If we had a preserved surface it's no longer needed, and it may be harmful
+ // if we are transparent.
+ if (mPendingDestroySurface != null && mDestroyPreservedSurfaceUponRedraw) {
+ mPendingDestroySurface.mSurfaceControl.hide();
+ }
+
return true;
}
diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index a3a7e1e..288f350 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -64,6 +64,7 @@
static jmethodID method_reportMeasurementData;
static jmethodID method_reportNavigationMessages;
static jmethodID method_reportLocationBatch;
+static jmethodID method_reportGnssServiceDied;
/*
* Save a pointer to JavaVm to attach/detach threads executing
@@ -120,10 +121,10 @@
{
// hidl_death_recipient interface
virtual void serviceDied(uint64_t cookie, const wp<IBase>& who) override {
- // TODO(b/37460011): implement a better death recovery mechanism without
- // crashing system server process as described in go//treble-gnss-death
- LOG_ALWAYS_FATAL("Abort due to IGNSS hidl service failure,"
- " restarting system server");
+ ALOGE("IGNSS hidl service failed, trying to recover...");
+
+ JNIEnv* env = android::AndroidRuntime::getJNIEnv();
+ env->CallVoidMethod(mCallbacksObj, method_reportGnssServiceDied);
}
};
@@ -1177,6 +1178,7 @@
clazz,
"reportLocationBatch",
"([Landroid/location/Location;)V");
+ method_reportGnssServiceDied = env->GetMethodID(clazz, "reportGnssServiceDied", "()V");
/*
* Save a pointer to JVM.
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 94f8f38..ab93a8a 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3944,6 +3944,7 @@
if (metrics.quality != quality) {
metrics.quality = quality;
updatePasswordValidityCheckpointLocked(userId, parent);
+ saveSettingsLocked(userId);
}
maybeLogPasswordComplexitySet(who, userId, parent, metrics);
}
@@ -4055,6 +4056,7 @@
if (metrics.length != length) {
metrics.length = length;
updatePasswordValidityCheckpointLocked(userId, parent);
+ saveSettingsLocked(userId);
}
maybeLogPasswordComplexitySet(who, userId, parent, metrics);
}
@@ -4079,6 +4081,7 @@
if (ap.passwordHistoryLength != length) {
ap.passwordHistoryLength = length;
updatePasswordValidityCheckpointLocked(userId, parent);
+ saveSettingsLocked(userId);
}
}
if (SecurityLog.isLoggingEnabled()) {
@@ -4280,6 +4283,7 @@
if (metrics.upperCase != length) {
metrics.upperCase = length;
updatePasswordValidityCheckpointLocked(userId, parent);
+ saveSettingsLocked(userId);
}
maybeLogPasswordComplexitySet(who, userId, parent, metrics);
}
@@ -4302,6 +4306,7 @@
if (metrics.lowerCase != length) {
metrics.lowerCase = length;
updatePasswordValidityCheckpointLocked(userId, parent);
+ saveSettingsLocked(userId);
}
maybeLogPasswordComplexitySet(who, userId, parent, metrics);
}
@@ -4327,6 +4332,7 @@
if (metrics.letters != length) {
metrics.letters = length;
updatePasswordValidityCheckpointLocked(userId, parent);
+ saveSettingsLocked(userId);
}
maybeLogPasswordComplexitySet(who, userId, parent, metrics);
}
@@ -4352,6 +4358,7 @@
if (metrics.numeric != length) {
metrics.numeric = length;
updatePasswordValidityCheckpointLocked(userId, parent);
+ saveSettingsLocked(userId);
}
maybeLogPasswordComplexitySet(who, userId, parent, metrics);
}
@@ -4377,6 +4384,7 @@
if (metrics.symbols != length) {
ap.minimumPasswordMetrics.symbols = length;
updatePasswordValidityCheckpointLocked(userId, parent);
+ saveSettingsLocked(userId);
}
maybeLogPasswordComplexitySet(who, userId, parent, metrics);
}
@@ -4402,6 +4410,7 @@
if (metrics.nonLetter != length) {
ap.minimumPasswordMetrics.nonLetter = length;
updatePasswordValidityCheckpointLocked(userId, parent);
+ saveSettingsLocked(userId);
}
maybeLogPasswordComplexitySet(who, userId, parent, metrics);
}
@@ -6087,6 +6096,7 @@
synchronized (getLockObject()) {
policy.mFailedPasswordAttempts = 0;
updatePasswordValidityCheckpointLocked(userId, /* parent */ false);
+ saveSettingsLocked(userId);
updatePasswordExpirationsLocked(userId);
setExpirationAlarmCheckLocked(mContext, userId, /* parent */ false);
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
index b76064b..1acecfc 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
@@ -4259,7 +4259,14 @@
// Drain ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED broadcasts as part of
// reportPasswordChanged()
- verify(mContext.spiedContext, times(3)).sendBroadcastAsUser(
+ // This broadcast should be sent 4 times:
+ // * Twice from calls to DevicePolicyManagerService.updatePasswordExpirationsLocked,
+ // once for each affected user, in DevicePolicyManagerService.reportPasswordChanged.
+ // * Twice from calls to DevicePolicyManagerService.saveSettingsLocked
+ // in DevicePolicyManagerService.reportPasswordChanged, once with the userId
+ // the password change is relevant to and another with the credential owner of said
+ // userId.
+ verify(mContext.spiedContext, times(4)).sendBroadcastAsUser(
MockUtils.checkIntentAction(
DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED),
MockUtils.checkUserHandle(userHandle));
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
index e2ba4d5..213961c 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java
@@ -254,6 +254,12 @@
}
@Override
+ public void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,
+ String[] receiverPermissions) {
+ spiedContext.sendBroadcastAsUserMultiplePermissions(intent, user, receiverPermissions);
+ }
+
+ @Override
public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) {
spiedContext.sendBroadcast(intent, receiverPermission, options);
}
diff --git a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java
index c2a0ccf..dee2556 100644
--- a/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java
+++ b/services/tests/servicestests/src/com/android/server/usage/AppStandbyControllerTests.java
@@ -46,6 +46,7 @@
import static org.mockito.Mockito.mock;
import android.app.usage.UsageEvents;
+import android.app.usage.UsageStatsManagerInternal;
import android.appwidget.AppWidgetManager;
import android.content.Context;
import android.content.ContextWrapper;
@@ -74,6 +75,8 @@
import java.util.Arrays;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
/**
* Unit test for AppStandbyController.
@@ -101,6 +104,8 @@
private static final long WORKING_SET_THRESHOLD = 12 * HOUR_MS;
private static final long FREQUENT_THRESHOLD = 24 * HOUR_MS;
private static final long RARE_THRESHOLD = 48 * HOUR_MS;
+ // Short STABLE_CHARGING_THRESHOLD for testing purposes
+ private static final long STABLE_CHARGING_THRESHOLD = 2000;
private MyInjector mInjector;
private AppStandbyController mController;
@@ -209,7 +214,8 @@
return "screen_thresholds=0/0/0/" + HOUR_MS + ",elapsed_thresholds=0/"
+ WORKING_SET_THRESHOLD + "/"
+ FREQUENT_THRESHOLD + "/"
- + RARE_THRESHOLD;
+ + RARE_THRESHOLD + ","
+ + "stable_charging_threshold=" + STABLE_CHARGING_THRESHOLD;
}
// Internal methods
@@ -276,6 +282,10 @@
return controller;
}
+ private long getCurrentTime() {
+ return TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
+ }
+
@Before
public void setUp() throws Exception {
MyContextWrapper myContext = new MyContextWrapper(InstrumentationRegistry.getContext());
@@ -284,21 +294,101 @@
setChargingState(mController, false);
}
+ private class TestParoleListener extends UsageStatsManagerInternal.AppIdleStateChangeListener {
+ private boolean mOnParole = false;
+ private CountDownLatch mLatch;
+ private long mLastParoleChangeTime;
+
+ public boolean getParoleState() {
+ synchronized (this) {
+ return mOnParole;
+ }
+ }
+
+ public void rearmLatch() {
+ synchronized (this) {
+ mLatch = new CountDownLatch(1);
+ }
+ }
+
+ public void awaitOnLatch(long time) throws Exception {
+ mLatch.await(time, TimeUnit.MILLISECONDS);
+ }
+
+ public long getLastParoleChangeTime() {
+ synchronized (this) {
+ return mLastParoleChangeTime;
+ }
+ }
+
+ @Override
+ public void onAppIdleStateChanged(String packageName, int userId, boolean idle,
+ int bucket, int reason) {
+ }
+
+ @Override
+ public void onParoleStateChanged(boolean isParoleOn) {
+ synchronized (this) {
+ // Only record information if it is being looked for
+ if (mLatch.getCount() > 0) {
+ mOnParole = isParoleOn;
+ mLastParoleChangeTime = getCurrentTime();
+ mLatch.countDown();
+ }
+ }
+ }
+ }
+
@Test
public void testCharging() throws Exception {
- setChargingState(mController, true);
- mInjector.mElapsedRealtime = RARE_THRESHOLD + 1;
- assertFalse(mController.isAppIdleFilteredOrParoled(PACKAGE_1, USER_ID,
- mInjector.mElapsedRealtime, false));
+ long startTime;
+ TestParoleListener paroleListener = new TestParoleListener();
+ long marginOfError = 200;
- setChargingState(mController, false);
- mInjector.mElapsedRealtime = 2 * RARE_THRESHOLD + 2;
- mController.checkIdleStates(USER_ID);
- assertTrue(mController.isAppIdleFilteredOrParoled(PACKAGE_1, USER_ID,
- mInjector.mElapsedRealtime, false));
+ // Charging
+ paroleListener.rearmLatch();
+ mController.addListener(paroleListener);
+ startTime = getCurrentTime();
setChargingState(mController, true);
- assertFalse(mController.isAppIdleFilteredOrParoled(PACKAGE_1,USER_ID,
- mInjector.mElapsedRealtime, false));
+ paroleListener.awaitOnLatch(STABLE_CHARGING_THRESHOLD * 3 / 2);
+ assertTrue(paroleListener.mOnParole);
+ // Parole will only be granted after device has been charging for a sufficient amount of
+ // time.
+ assertEquals(STABLE_CHARGING_THRESHOLD,
+ paroleListener.getLastParoleChangeTime() - startTime,
+ marginOfError);
+
+ // Discharging
+ paroleListener.rearmLatch();
+ startTime = getCurrentTime();
+ setChargingState(mController, false);
+ mController.checkIdleStates(USER_ID);
+ paroleListener.awaitOnLatch(STABLE_CHARGING_THRESHOLD * 3 / 2);
+ assertFalse(paroleListener.getParoleState());
+ // Parole should be revoked immediately
+ assertEquals(0,
+ paroleListener.getLastParoleChangeTime() - startTime,
+ marginOfError);
+
+ // Brief Charging
+ paroleListener.rearmLatch();
+ setChargingState(mController, true);
+ setChargingState(mController, false);
+ // Device stopped charging before the stable charging threshold.
+ // Parole should not be granted at the end of the threshold
+ paroleListener.awaitOnLatch(STABLE_CHARGING_THRESHOLD * 3 / 2);
+ assertFalse(paroleListener.getParoleState());
+
+ // Charging Again
+ paroleListener.rearmLatch();
+ startTime = getCurrentTime();
+ setChargingState(mController, true);
+ paroleListener.awaitOnLatch(STABLE_CHARGING_THRESHOLD * 3 / 2);
+ assertTrue(paroleListener.getParoleState());
+ assertTrue(paroleListener.mOnParole);
+ assertEquals(STABLE_CHARGING_THRESHOLD,
+ paroleListener.getLastParoleChangeTime() - startTime,
+ marginOfError);
}
private void assertTimeout(AppStandbyController controller, long elapsedTime, int bucket) {
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java
index 8183a74..8905950 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java
@@ -1714,13 +1714,13 @@
}
@Test
- public void testAndroidPkgCanBypassDnd_creation() {
+ public void testAndroidPkgCannotBypassDnd_creation() {
NotificationChannel test = new NotificationChannel("A", "a", IMPORTANCE_LOW);
test.setBypassDnd(true);
mHelper.createNotificationChannel(SYSTEM_PKG, SYSTEM_UID, test, true, false);
- assertTrue(mHelper.getNotificationChannel(SYSTEM_PKG, SYSTEM_UID, "A", false)
+ assertFalse(mHelper.getNotificationChannel(SYSTEM_PKG, SYSTEM_UID, "A", false)
.canBypassDnd());
}
@@ -1745,7 +1745,7 @@
}
@Test
- public void testAndroidPkgCanBypassDnd_update() throws Exception {
+ public void testAndroidPkgCannotBypassDnd_update() throws Exception {
NotificationChannel test = new NotificationChannel("A", "a", IMPORTANCE_LOW);
mHelper.createNotificationChannel(SYSTEM_PKG, SYSTEM_UID, test, true, false);
@@ -1753,11 +1753,8 @@
update.setBypassDnd(true);
mHelper.createNotificationChannel(SYSTEM_PKG, SYSTEM_UID, update, true, false);
- assertTrue(mHelper.getNotificationChannel(SYSTEM_PKG, SYSTEM_UID, "A", false)
+ assertFalse(mHelper.getNotificationChannel(SYSTEM_PKG, SYSTEM_UID, "A", false)
.canBypassDnd());
-
- // setup + 1st check
- verify(mPm, times(2)).getPackageInfoAsUser(any(), anyInt(), anyInt());
}
@Test
diff --git a/services/usage/java/com/android/server/usage/AppStandbyController.java b/services/usage/java/com/android/server/usage/AppStandbyController.java
index 97c5ac9..08b0496 100644
--- a/services/usage/java/com/android/server/usage/AppStandbyController.java
+++ b/services/usage/java/com/android/server/usage/AppStandbyController.java
@@ -192,6 +192,7 @@
/** Check the state of one app: arg1 = userId, arg2 = uid, obj = (String) packageName */
static final int MSG_CHECK_PACKAGE_IDLE_STATE = 11;
static final int MSG_REPORT_EXEMPTED_SYNC_START = 12;
+ static final int MSG_UPDATE_STABLE_CHARGING= 13;
long mCheckIdleIntervalMillis;
long mAppIdleParoleIntervalMillis;
@@ -213,10 +214,13 @@
long mExemptedSyncAdapterTimeoutMillis;
/** Maximum time a system interaction should keep the buckets elevated. */
long mSystemInteractionTimeoutMillis;
+ /** The length of time phone must be charging before considered stable enough to run jobs */
+ long mStableChargingThresholdMillis;
volatile boolean mAppIdleEnabled;
boolean mAppIdleTempParoled;
boolean mCharging;
+ boolean mChargingStable;
private long mLastAppIdleParoledTime;
private boolean mSystemServicesReady = false;
// There was a system update, defaults need to be initialized after services are ready
@@ -297,7 +301,7 @@
mPackageManager = mContext.getPackageManager();
mDeviceStateReceiver = new DeviceStateReceiver();
- IntentFilter deviceStates = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+ IntentFilter deviceStates = new IntentFilter(BatteryManager.ACTION_CHARGING);
deviceStates.addAction(BatteryManager.ACTION_DISCHARGING);
deviceStates.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);
mContext.registerReceiver(mDeviceStateReceiver, deviceStates);
@@ -405,6 +409,27 @@
synchronized (mAppIdleLock) {
if (mCharging != charging) {
mCharging = charging;
+ if (DEBUG) Slog.d(TAG, "Setting mCharging to " + charging);
+ if (charging) {
+ if (DEBUG) {
+ Slog.d(TAG, "Scheduling MSG_UPDATE_STABLE_CHARGING delay = "
+ + mStableChargingThresholdMillis);
+ }
+ mHandler.sendEmptyMessageDelayed(MSG_UPDATE_STABLE_CHARGING,
+ mStableChargingThresholdMillis);
+ } else {
+ mHandler.removeMessages(MSG_UPDATE_STABLE_CHARGING);
+ updateChargingStableState();
+ }
+ }
+ }
+ }
+
+ void updateChargingStableState() {
+ synchronized (mAppIdleLock) {
+ if (mChargingStable != mCharging) {
+ if (DEBUG) Slog.d(TAG, "Setting mChargingStable to " + mCharging);
+ mChargingStable = mCharging;
postParoleStateChanged();
}
}
@@ -431,7 +456,8 @@
boolean isParoledOrCharging() {
if (!mAppIdleEnabled) return true;
synchronized (mAppIdleLock) {
- return mAppIdleTempParoled || mCharging;
+ // Only consider stable charging when determining charge state.
+ return mAppIdleTempParoled || mChargingStable;
}
}
@@ -1371,11 +1397,15 @@
pw.print("mAppIdleEnabled="); pw.print(mAppIdleEnabled);
pw.print(" mAppIdleTempParoled="); pw.print(mAppIdleTempParoled);
pw.print(" mCharging="); pw.print(mCharging);
+ pw.print(" mChargingStable="); pw.print(mChargingStable);
pw.print(" mLastAppIdleParoledTime=");
TimeUtils.formatDuration(mLastAppIdleParoledTime, pw);
pw.println();
pw.print("mScreenThresholds="); pw.println(Arrays.toString(mAppStandbyScreenThresholds));
pw.print("mElapsedThresholds="); pw.println(Arrays.toString(mAppStandbyElapsedThresholds));
+ pw.print("mStableChargingThresholdMillis=");
+ TimeUtils.formatDuration(mStableChargingThresholdMillis, pw);
+ pw.println();
}
/**
@@ -1549,7 +1579,7 @@
case MSG_PAROLE_STATE_CHANGED:
if (DEBUG) Slog.d(TAG, "Parole state: " + mAppIdleTempParoled
- + ", Charging state:" + mCharging);
+ + ", Charging state:" + mChargingStable);
informParoleStateChanged();
break;
case MSG_CHECK_PACKAGE_IDLE_STATE:
@@ -1561,6 +1591,10 @@
reportExemptedSyncStart((String) msg.obj, msg.arg1);
break;
+ case MSG_UPDATE_STABLE_CHARGING:
+ updateChargingStableState();
+ break;
+
default:
super.handleMessage(msg);
break;
@@ -1572,11 +1606,16 @@
private class DeviceStateReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- final String action = intent.getAction();
- if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
- setChargingState(intent.getIntExtra("plugged", 0) != 0);
- } else if (PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED.equals(action)) {
- onDeviceIdleModeChanged();
+ switch (intent.getAction()) {
+ case BatteryManager.ACTION_CHARGING:
+ setChargingState(true);
+ break;
+ case BatteryManager.ACTION_DISCHARGING:
+ setChargingState(false);
+ break;
+ case PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED:
+ onDeviceIdleModeChanged();
+ break;
}
}
}
@@ -1620,9 +1659,11 @@
*/
@Deprecated
private static final String KEY_IDLE_DURATION_OLD = "idle_duration";
-
+ @Deprecated
private static final String KEY_IDLE_DURATION = "idle_duration2";
+ @Deprecated
private static final String KEY_WALLCLOCK_THRESHOLD = "wallclock_threshold";
+
private static final String KEY_PAROLE_INTERVAL = "parole_interval";
private static final String KEY_PAROLE_WINDOW = "parole_window";
private static final String KEY_PAROLE_DURATION = "parole_duration";
@@ -1638,12 +1679,14 @@
private static final String KEY_EXEMPTED_SYNC_HOLD_DURATION = "exempted_sync_duration";
private static final String KEY_SYSTEM_INTERACTION_HOLD_DURATION =
"system_interaction_duration";
+ private static final String KEY_STABLE_CHARGING_THRESHOLD = "stable_charging_threshold";
public static final long DEFAULT_STRONG_USAGE_TIMEOUT = 1 * ONE_HOUR;
public static final long DEFAULT_NOTIFICATION_TIMEOUT = 12 * ONE_HOUR;
public static final long DEFAULT_SYSTEM_UPDATE_TIMEOUT = 2 * ONE_HOUR;
public static final long DEFAULT_SYSTEM_INTERACTION_TIMEOUT = 10 * ONE_MINUTE;
public static final long DEFAULT_SYNC_ADAPTER_TIMEOUT = 10 * ONE_MINUTE;
public static final long DEFAULT_EXEMPTED_SYNC_TIMEOUT = 10 * ONE_MINUTE;
+ public static final long DEFAULT_STABLE_CHARGING_THRESHOLD = 10 * ONE_MINUTE;
private final KeyValueListParser mParser = new KeyValueListParser(',');
@@ -1733,6 +1776,9 @@
mSystemInteractionTimeoutMillis = mParser.getDurationMillis
(KEY_SYSTEM_INTERACTION_HOLD_DURATION,
COMPRESS_TIME ? ONE_MINUTE : DEFAULT_SYSTEM_INTERACTION_TIMEOUT);
+ mStableChargingThresholdMillis = mParser.getDurationMillis
+ (KEY_STABLE_CHARGING_THRESHOLD,
+ COMPRESS_TIME ? ONE_MINUTE : DEFAULT_STABLE_CHARGING_THRESHOLD);
}
}
diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java
index 006d7ab9..c2e779e 100644
--- a/telephony/java/android/telephony/PhoneStateListener.java
+++ b/telephony/java/android/telephony/PhoneStateListener.java
@@ -444,7 +444,7 @@
* Callback invoked when device call state changes.
* @param state call state
* @param phoneNumber call phone number. If application does not have
- * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} permission or carrier
+ * {@link android.Manifest.permission#READ_CALL_LOG READ_CALL_LOG} permission or carrier
* privileges (see {@link TelephonyManager#hasCarrierPrivileges}), an empty string will be
* passed as an argument.
*
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 01fb299..5a77a9f 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -334,10 +334,12 @@
*
* <p>
* The {@link #EXTRA_STATE} extra indicates the new call state.
- * If the new state is RINGING, a second extra
- * {@link #EXTRA_INCOMING_NUMBER} provides the incoming phone number as
- * a String.
- *
+ * If a receiving app has {@link android.Manifest.permission#READ_CALL_LOG} permission, a second
+ * extra {@link #EXTRA_INCOMING_NUMBER} provides the phone number for incoming and outoing calls
+ * as a String. Note: If the receiving app has
+ * {@link android.Manifest.permission#READ_CALL_LOG} and
+ * {@link android.Manifest.permission#READ_PHONE_STATE} permission, it will receive the
+ * broadcast twice; one with the phone number and another without it.
* <p class="note">
* This was a {@link android.content.Context#sendStickyBroadcast sticky}
* broadcast in version 1.0, but it is no longer sticky.
diff --git a/telephony/java/com/android/ims/ImsConfig.java b/telephony/java/com/android/ims/ImsConfig.java
index 1dda6bf..90e9880 100644
--- a/telephony/java/com/android/ims/ImsConfig.java
+++ b/telephony/java/com/android/ims/ImsConfig.java
@@ -35,7 +35,6 @@
private static final String TAG = "ImsConfig";
private boolean DBG = true;
private final IImsConfig miConfig;
- private Context mContext;
/**
* Broadcast action: the feature enable status was changed
@@ -541,14 +540,12 @@
public static final int WIFI_PREFERRED = 2;
}
- public ImsConfig(IImsConfig iconfig, Context context) {
- if (DBG) Rlog.d(TAG, "ImsConfig created");
+ public ImsConfig(IImsConfig iconfig) {
miConfig = iconfig;
- mContext = context;
}
/**
- * @deprecated see {@link #getInt(int)} instead.
+ * @deprecated see {@link #getConfigInt(int)} instead.
*/
public int getProvisionedValue(int item) throws ImsException {
return getConfigInt(item);
diff --git a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
index a182f2b..bbe38b7 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java
@@ -15,6 +15,9 @@
*/
package com.android.internal.telephony;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+
+import android.Manifest;
import android.app.AppOpsManager;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -75,7 +78,7 @@
/**
* Check whether the app with the given pid/uid can read phone state.
*
- * <p>This method behaves in one of the following ways:
+ * <p>This method behaves in one of the following ways:
* <ul>
* <li>return true: if the caller has the READ_PRIVILEGED_PHONE_STATE permission, the
* READ_PHONE_STATE runtime permission, or carrier privileges on the given subId.
@@ -132,6 +135,40 @@
}
/**
+ * Check whether the app with the given pid/uid can read the call log.
+ * @return {@code true} if the specified app has the read call log permission and AppOpp granted
+ * to it, {@code false} otherwise.
+ */
+ public static boolean checkReadCallLog(
+ Context context, int subId, int pid, int uid, String callingPackage) {
+ return checkReadCallLog(
+ context, TELEPHONY_SUPPLIER, subId, pid, uid, callingPackage);
+ }
+
+ @VisibleForTesting
+ public static boolean checkReadCallLog(
+ Context context, Supplier<ITelephony> telephonySupplier, int subId, int pid, int uid,
+ String callingPackage) {
+
+ if (context.checkPermission(Manifest.permission.READ_CALL_LOG, pid, uid)
+ != PERMISSION_GRANTED) {
+ // If we don't have the runtime permission, but do have carrier privileges, that
+ // suffices for being able to see the call phone numbers.
+ if (SubscriptionManager.isValidSubscriptionId(subId)) {
+ enforceCarrierPrivilege(telephonySupplier, subId, uid, "readCallLog");
+ return true;
+ }
+ return false;
+ }
+
+ // We have READ_CALL_LOG permission, so return true as long as the AppOps bit hasn't been
+ // revoked.
+ AppOpsManager appOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+ return appOps.noteOp(AppOpsManager.OP_READ_CALL_LOG, uid, callingPackage) ==
+ AppOpsManager.MODE_ALLOWED;
+ }
+
+ /**
* Returns whether the caller can read phone numbers.
*
* <p>Besides apps with the ability to read phone state per {@link #checkReadPhoneState}, the
@@ -204,7 +241,7 @@
public static void enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
Context context, int subId, String message) {
if (context.checkCallingOrSelfPermission(android.Manifest.permission.MODIFY_PHONE_STATE) ==
- PackageManager.PERMISSION_GRANTED) {
+ PERMISSION_GRANTED) {
return;
}
diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java
index 4dfd050..9d260eb 100644
--- a/test-mock/src/android/test/mock/MockContext.java
+++ b/test-mock/src/android/test/mock/MockContext.java
@@ -364,6 +364,13 @@
}
/** @hide */
+ @Override
+ public void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,
+ String[] receiverPermissions) {
+ throw new UnsupportedOperationException();
+ }
+
+ /** @hide */
@SystemApi
@Override
public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) {
diff --git a/tests/utils/testutils/java/com/android/internal/util/test/BroadcastInterceptingContext.java b/tests/utils/testutils/java/com/android/internal/util/test/BroadcastInterceptingContext.java
index 2166240..25bd7c0 100644
--- a/tests/utils/testutils/java/com/android/internal/util/test/BroadcastInterceptingContext.java
+++ b/tests/utils/testutils/java/com/android/internal/util/test/BroadcastInterceptingContext.java
@@ -175,6 +175,12 @@
}
@Override
+ public void sendBroadcastAsUserMultiplePermissions(Intent intent, UserHandle user,
+ String[] receiverPermissions) {
+ sendBroadcast(intent);
+ }
+
+ @Override
public void sendBroadcastAsUser(Intent intent, UserHandle user) {
sendBroadcast(intent);
}
