diff options
306 files changed, 3513 insertions, 2929 deletions
diff --git a/api/current.txt b/api/current.txt index d7e1a7a6bb0e..f6410834f257 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39997,8 +39997,10 @@ package android.telephony { public class PhoneNumberUtils { ctor public PhoneNumberUtils(); method public static void addTtsSpan(android.text.Spannable, int, int); - method public static java.lang.String calledPartyBCDFragmentToString(byte[], int, int); - method public static java.lang.String calledPartyBCDToString(byte[], int, int); + method public static deprecated java.lang.String calledPartyBCDFragmentToString(byte[], int, int); + method public static java.lang.String calledPartyBCDFragmentToString(byte[], int, int, int); + method public static deprecated java.lang.String calledPartyBCDToString(byte[], int, int); + method public static java.lang.String calledPartyBCDToString(byte[], int, int, int); method public static boolean compare(java.lang.String, java.lang.String); method public static boolean compare(android.content.Context, java.lang.String, java.lang.String); method public static java.lang.String convertKeypadLettersToDigits(java.lang.String); @@ -40031,12 +40033,15 @@ package android.telephony { method public static byte[] networkPortionToCalledPartyBCD(java.lang.String); method public static byte[] networkPortionToCalledPartyBCDWithLength(java.lang.String); method public static java.lang.String normalizeNumber(java.lang.String); - method public static byte[] numberToCalledPartyBCD(java.lang.String); + method public static deprecated byte[] numberToCalledPartyBCD(java.lang.String); + method public static byte[] numberToCalledPartyBCD(java.lang.String, int); method public static java.lang.String replaceUnicodeDigits(java.lang.String); method public static java.lang.String stringFromStringAndTOA(java.lang.String, int); method public static java.lang.String stripSeparators(java.lang.String); method public static java.lang.String toCallerIDMinMatch(java.lang.String); method public static int toaFromString(java.lang.String); + field public static final int BCD_EXTENDED_TYPE_CALLED_PARTY = 2; // 0x2 + field public static final int BCD_EXTENDED_TYPE_EF_ADN = 1; // 0x1 field public static final int FORMAT_JAPAN = 2; // 0x2 field public static final int FORMAT_NANP = 1; // 0x1 field public static final int FORMAT_UNKNOWN = 0; // 0x0 diff --git a/api/system-current.txt b/api/system-current.txt index 4f4b9db1b43a..eee24dea55dc 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -43472,8 +43472,10 @@ package android.telephony { public class PhoneNumberUtils { ctor public PhoneNumberUtils(); method public static void addTtsSpan(android.text.Spannable, int, int); - method public static java.lang.String calledPartyBCDFragmentToString(byte[], int, int); - method public static java.lang.String calledPartyBCDToString(byte[], int, int); + method public static deprecated java.lang.String calledPartyBCDFragmentToString(byte[], int, int); + method public static java.lang.String calledPartyBCDFragmentToString(byte[], int, int, int); + method public static deprecated java.lang.String calledPartyBCDToString(byte[], int, int); + method public static java.lang.String calledPartyBCDToString(byte[], int, int, int); method public static boolean compare(java.lang.String, java.lang.String); method public static boolean compare(android.content.Context, java.lang.String, java.lang.String); method public static java.lang.String convertKeypadLettersToDigits(java.lang.String); @@ -43506,12 +43508,15 @@ package android.telephony { method public static byte[] networkPortionToCalledPartyBCD(java.lang.String); method public static byte[] networkPortionToCalledPartyBCDWithLength(java.lang.String); method public static java.lang.String normalizeNumber(java.lang.String); - method public static byte[] numberToCalledPartyBCD(java.lang.String); + method public static deprecated byte[] numberToCalledPartyBCD(java.lang.String); + method public static byte[] numberToCalledPartyBCD(java.lang.String, int); method public static java.lang.String replaceUnicodeDigits(java.lang.String); method public static java.lang.String stringFromStringAndTOA(java.lang.String, int); method public static java.lang.String stripSeparators(java.lang.String); method public static java.lang.String toCallerIDMinMatch(java.lang.String); method public static int toaFromString(java.lang.String); + field public static final int BCD_EXTENDED_TYPE_CALLED_PARTY = 2; // 0x2 + field public static final int BCD_EXTENDED_TYPE_EF_ADN = 1; // 0x1 field public static final int FORMAT_JAPAN = 2; // 0x2 field public static final int FORMAT_NANP = 1; // 0x1 field public static final int FORMAT_UNKNOWN = 0; // 0x0 diff --git a/api/test-current.txt b/api/test-current.txt index 0902fc6daaf1..a54a79a689b8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -6226,11 +6226,28 @@ package android.app { } public class WindowConfiguration implements java.lang.Comparable android.os.Parcelable { + ctor public WindowConfiguration(); method public int compareTo(android.app.WindowConfiguration); method public int describeContents(); + method public int getActivityType(); + method public android.graphics.Rect getAppBounds(); + method public int getWindowingMode(); + method public void setActivityType(int); + method public void setAppBounds(android.graphics.Rect); + method public void setTo(android.app.WindowConfiguration); + method public void setWindowingMode(int); method public void writeToParcel(android.os.Parcel, int); + field public static final int ACTIVITY_TYPE_ASSISTANT = 4; // 0x4 field public static final int ACTIVITY_TYPE_HOME = 2; // 0x2 field public static final int ACTIVITY_TYPE_RECENTS = 3; // 0x3 + field public static final int ACTIVITY_TYPE_STANDARD = 1; // 0x1 + field public static final int ACTIVITY_TYPE_UNDEFINED = 0; // 0x0 + field public static final int WINDOWING_MODE_FREEFORM = 5; // 0x5 + field public static final int WINDOWING_MODE_FULLSCREEN = 1; // 0x1 + field public static final int WINDOWING_MODE_PINNED = 2; // 0x2 + field public static final int WINDOWING_MODE_SPLIT_SCREEN_PRIMARY = 3; // 0x3 + field public static final int WINDOWING_MODE_SPLIT_SCREEN_SECONDARY = 4; // 0x4 + field public static final int WINDOWING_MODE_UNDEFINED = 0; // 0x0 } } @@ -11328,6 +11345,7 @@ package android.content.res { field public int smallestScreenWidthDp; field public int touchscreen; field public int uiMode; + field public final android.app.WindowConfiguration windowConfiguration; } public class ObbInfo implements android.os.Parcelable { @@ -31798,7 +31816,7 @@ package android.os { method public static android.os.StrictMode.VmPolicy getVmPolicy(); method public static void noteSlowCall(java.lang.String); method public static void setThreadPolicy(android.os.StrictMode.ThreadPolicy); - method public static void setViolationListener(android.os.StrictMode.ViolationListener); + method public static void setViolationLogger(android.os.StrictMode.ViolationLogger); method public static void setVmPolicy(android.os.StrictMode.VmPolicy); } @@ -31832,8 +31850,30 @@ package android.os { method public android.os.StrictMode.ThreadPolicy.Builder permitUnbufferedIo(); } - public static abstract interface StrictMode.ViolationListener { - method public abstract void onViolation(java.lang.String); + public static final class StrictMode.ViolationInfo implements android.os.Parcelable { + ctor public StrictMode.ViolationInfo(); + ctor public StrictMode.ViolationInfo(java.lang.Throwable, int); + ctor public StrictMode.ViolationInfo(java.lang.String, java.lang.Throwable, int); + ctor public StrictMode.ViolationInfo(android.os.Parcel); + ctor public StrictMode.ViolationInfo(android.os.Parcel, boolean); + method public int describeContents(); + method public void dump(android.util.Printer, java.lang.String); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.os.StrictMode.ViolationInfo> CREATOR; + field public java.lang.String broadcastIntentAction; + field public final android.app.ApplicationErrorReport.CrashInfo crashInfo; + field public int durationMillis; + field public final java.lang.String message; + field public int numAnimationsRunning; + field public long numInstances; + field public final int policy; + field public java.lang.String[] tags; + field public int violationNumThisLoop; + field public long violationUptimeMillis; + } + + public static abstract interface StrictMode.ViolationLogger { + method public abstract void log(android.os.StrictMode.ViolationInfo); } public static final class StrictMode.VmPolicy { @@ -40288,8 +40328,10 @@ package android.telephony { public class PhoneNumberUtils { ctor public PhoneNumberUtils(); method public static void addTtsSpan(android.text.Spannable, int, int); - method public static java.lang.String calledPartyBCDFragmentToString(byte[], int, int); - method public static java.lang.String calledPartyBCDToString(byte[], int, int); + method public static deprecated java.lang.String calledPartyBCDFragmentToString(byte[], int, int); + method public static java.lang.String calledPartyBCDFragmentToString(byte[], int, int, int); + method public static deprecated java.lang.String calledPartyBCDToString(byte[], int, int); + method public static java.lang.String calledPartyBCDToString(byte[], int, int, int); method public static boolean compare(java.lang.String, java.lang.String); method public static boolean compare(android.content.Context, java.lang.String, java.lang.String); method public static java.lang.String convertKeypadLettersToDigits(java.lang.String); @@ -40322,12 +40364,15 @@ package android.telephony { method public static byte[] networkPortionToCalledPartyBCD(java.lang.String); method public static byte[] networkPortionToCalledPartyBCDWithLength(java.lang.String); method public static java.lang.String normalizeNumber(java.lang.String); - method public static byte[] numberToCalledPartyBCD(java.lang.String); + method public static deprecated byte[] numberToCalledPartyBCD(java.lang.String); + method public static byte[] numberToCalledPartyBCD(java.lang.String, int); method public static java.lang.String replaceUnicodeDigits(java.lang.String); method public static java.lang.String stringFromStringAndTOA(java.lang.String, int); method public static java.lang.String stripSeparators(java.lang.String); method public static java.lang.String toCallerIDMinMatch(java.lang.String); method public static int toaFromString(java.lang.String); + field public static final int BCD_EXTENDED_TYPE_CALLED_PARTY = 2; // 0x2 + field public static final int BCD_EXTENDED_TYPE_EF_ADN = 1; // 0x1 field public static final int FORMAT_JAPAN = 2; // 0x2 field public static final int FORMAT_NANP = 1; // 0x1 field public static final int FORMAT_UNKNOWN = 0; // 0x0 diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java index ad989dee7b55..79faa1bf97a2 100644 --- a/cmds/pm/src/com/android/commands/pm/Pm.java +++ b/cmds/pm/src/com/android/commands/pm/Pm.java @@ -636,7 +636,7 @@ public final class Pm { out = session.openWrite(splitName, 0, sizeBytes); int total = 0; - byte[] buffer = new byte[65536]; + byte[] buffer = new byte[1024 * 1024]; int c; while ((c = in.read(buffer)) != -1) { total += c; diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp index 35f8bbb57e50..6ded24648353 100644 --- a/cmds/screencap/screencap.cpp +++ b/cmds/screencap/screencap.cpp @@ -101,9 +101,6 @@ static uint32_t dataSpaceToInt(android_dataspace d) static status_t notifyMediaScanner(const char* fileName) { String8 cmd("am broadcast -a android.intent.action.MEDIA_SCANNER_SCAN_FILE -d file://"); - String8 fileUrl("\""); - fileUrl.append(fileName); - fileUrl.append("\""); cmd.append(fileName); cmd.append(" > /dev/null"); int result = system(cmd.string()); diff --git a/cmds/statsd/Android.mk b/cmds/statsd/Android.mk index f1b3c053b2cb..9c2e63e42933 100644 --- a/cmds/statsd/Android.mk +++ b/cmds/statsd/Android.mk @@ -46,6 +46,7 @@ LOCAL_SRC_FILES := \ src/LogReader.cpp \ src/main.cpp \ src/DropboxWriter.cpp \ + src/parse_util.cpp \ src/StatsLogProcessor.cpp \ src/stats_log.proto \ src/statsd_config.proto \ diff --git a/cmds/statsd/src/DropboxReader.cpp b/cmds/statsd/src/DropboxReader.cpp index 187f4ada61ca..cda2f431e435 100644 --- a/cmds/statsd/src/DropboxReader.cpp +++ b/cmds/statsd/src/DropboxReader.cpp @@ -15,9 +15,7 @@ */ #include <android/os/DropBoxManager.h> #include <android-base/file.h> -#include <cutils/log.h> #include <androidfw/ZipUtils.h> -#include <stdio.h> #include "DropboxReader.h" @@ -25,14 +23,14 @@ using android::sp; using android::String16; using android::binder::Status; using android::base::unique_fd; +using android::os::statsd::EventMetricData; using android::os::DropBoxManager; -using android::os::statsd::StatsLogEntry; using android::ZipUtils; using std::vector; status_t DropboxReader::readStatsLogs(FILE* out, const string& tag, long msec) { sp<DropBoxManager> dropbox = new DropBoxManager(); - StatsLogList logList; + StatsLogReport logReport; long timestamp = msec; // instead of while(true), put a hard limit 1000. Dropbox won't have more than 1000 files. @@ -51,23 +49,23 @@ status_t DropboxReader::readStatsLogs(FILE* out, const string& tag, long msec) { timestamp = entry.getTimestamp(); if (entry.getFlags() & DropBoxManager::IS_GZIPPED) { - if (!parseFromGzipFile(fd, logList)) { + if (!parseFromGzipFile(fd, logReport)) { // Failed to parse from the file. Continue to fetch the next entry. continue; } } else { - if (!parseFromFile(fd, logList)) { + if (!parseFromFile(fd, logReport)) { // Failed to parse from the file. Continue to fetch the next entry. continue; } } - printLog(out, logList); + printLog(out, logReport); } return android::OK; } -bool DropboxReader::parseFromGzipFile(const unique_fd& fd, StatsLogList& list) { +bool DropboxReader::parseFromGzipFile(const unique_fd& fd, StatsLogReport& logReport) { FILE *file = fdopen(fd, "r"); bool result = false; bool scanResult; @@ -80,7 +78,7 @@ bool DropboxReader::parseFromGzipFile(const unique_fd& fd, StatsLogList& list) { if (scanResult && method == kCompressDeflated) { vector<uint8_t> buf(uncompressedLen); if (ZipUtils::inflateToBuffer(file, &buf[0], uncompressedLen, compressedLen)) { - if (list.ParseFromArray(&buf[0], uncompressedLen)) { + if (logReport.ParseFromArray(&buf[0], uncompressedLen)) { result = true; } } @@ -92,29 +90,30 @@ bool DropboxReader::parseFromGzipFile(const unique_fd& fd, StatsLogList& list) { } // parse a non zipped file. -bool DropboxReader::parseFromFile(const unique_fd& fd, StatsLogList& list) { +bool DropboxReader::parseFromFile(const unique_fd& fd, StatsLogReport& logReport) { string content; if (!android::base::ReadFdToString(fd, &content)) { ALOGE("Failed to read file"); return false; } - if (!list.ParseFromString(content)) { + if (!logReport.ParseFromString(content)) { ALOGE("failed to parse log entry from data"); return false; } return true; } -void DropboxReader::printLog(FILE* out, const StatsLogList& list) { - for (int i = 0; i < list.stats_log_entry_size(); i++) { - const StatsLogEntry entry = list.stats_log_entry(i); - // TODO: print pretty - fprintf(out, "time_msec=%lld, type=%d, aggregate_type=%d, uid=%d, pid=%d ", - entry.start_report_millis(), entry.type(), entry.aggregate_type(), - entry.uid(), entry.pid()); - for (int j = 0; j < entry.pairs_size(); j++) { - fprintf(out, "msg=%s ", entry.pairs(j).value_str().c_str()); +void DropboxReader::printLog(FILE* out, const StatsLogReport& logReport) { + fprintf(out, "start_time_msec=%lld, end_time_msec=%lld, ", + logReport.start_report_millis(), logReport.end_report_millis()); + for (int i = 0; i < logReport.event_metrics().data_size(); i++) { + EventMetricData eventMetricData = logReport.event_metrics().data(i); + for (int j = 0; j < eventMetricData.key_value_pair_size(); j++) { + fprintf(out, "key=%d, ", eventMetricData.key_value_pair(j).key()); + fprintf(out, "value_str=%s ", eventMetricData.key_value_pair(j).value_str().c_str()); + fprintf(out, "value_int=%lld ", eventMetricData.key_value_pair(j).value_int()); + fprintf(out, "value_float=%f ", eventMetricData.key_value_pair(j).value_float()); } - fprintf(out, "\n"); } + fprintf(out, "\n"); } diff --git a/cmds/statsd/src/DropboxReader.h b/cmds/statsd/src/DropboxReader.h index a62ffde6b255..f7d5a8205f57 100644 --- a/cmds/statsd/src/DropboxReader.h +++ b/cmds/statsd/src/DropboxReader.h @@ -23,7 +23,7 @@ #include <stdio.h> using android::base::unique_fd; -using android::os::statsd::StatsLogList; +using android::os::statsd::StatsLogReport; using android::status_t; using std::string; @@ -33,13 +33,13 @@ public: static status_t readStatsLogs(FILE* out, const string& tag, long msec); private: - static bool parseFromFile(const unique_fd& fd, StatsLogList& list); - static bool parseFromGzipFile(const unique_fd& fd, StatsLogList& list); - static void printLog(FILE* out, const StatsLogList& list); + static bool parseFromFile(const unique_fd& fd, StatsLogReport& logReport); + static bool parseFromGzipFile(const unique_fd& fd, StatsLogReport& logReport); + static void printLog(FILE* out, const StatsLogReport& logReport); enum { kCompressStored = 0, // no compression kCompressDeflated = 8, // standard deflate }; }; -#endif //DROPBOX_READER_H
\ No newline at end of file +#endif //DROPBOX_READER_H diff --git a/cmds/statsd/src/DropboxWriter.cpp b/cmds/statsd/src/DropboxWriter.cpp index a251056d9e81..01a9eac317d8 100644 --- a/cmds/statsd/src/DropboxWriter.cpp +++ b/cmds/statsd/src/DropboxWriter.cpp @@ -15,7 +15,6 @@ */ #include <android/os/DropBoxManager.h> -#include <cutils/log.h> #include "DropboxWriter.h" @@ -26,36 +25,35 @@ using android::String16; using std::vector; DropboxWriter::DropboxWriter(const string& tag) - : mTag(tag), mLogList(), mBufferSize(0) { + : mTag(tag), mLogReport(), mBufferSize(0) { } -void DropboxWriter::addEntry(const StatsLogEntry& entry) { - flushIfNecessary(entry); - StatsLogEntry* newEntry = mLogList.add_stats_log_entry(); - newEntry->CopyFrom(entry); - mBufferSize += entry.ByteSize(); +void DropboxWriter::addStatsLogReport(const StatsLogReport& log) { + mLogReport = log; + flushIfNecessary(log); + mBufferSize += log.ByteSize(); } -void DropboxWriter::flushIfNecessary(const StatsLogEntry& entry) { - // The serialized size of the StatsLogList is approximately the sum of the serialized size of - // every StatsLogEntry inside it. - if (entry.ByteSize() + mBufferSize > kMaxSerializedBytes) { - flush(); - } +void DropboxWriter::flushIfNecessary(const StatsLogReport& log) { + // TODO: Decide to flush depending on the serialized size of the StatsLogReport. + // if (entry.ByteSize() + mBufferSize > kMaxSerializedBytes) { + // flush(); + // } + flush(); } void DropboxWriter::flush() { // now we get an exact byte size of the output - const int numBytes = mLogList.ByteSize(); + const int numBytes = mLogReport.ByteSize(); vector<uint8_t> buffer(numBytes); sp<DropBoxManager> dropbox = new DropBoxManager(); - mLogList.SerializeToArray(&buffer[0], numBytes); + mLogReport.SerializeToArray(&buffer[0], numBytes); Status status = dropbox->addData(String16(mTag.c_str()), &buffer[0], numBytes, 0 /* no flag */); if (!status.isOk()) { ALOGE("failed to write to dropbox"); //TODO: What to do if flush fails?? } - mLogList.Clear(); + mLogReport.Clear(); mBufferSize = 0; } diff --git a/cmds/statsd/src/DropboxWriter.h b/cmds/statsd/src/DropboxWriter.h index 176ac8b944a7..31b3f2764bb9 100644 --- a/cmds/statsd/src/DropboxWriter.h +++ b/cmds/statsd/src/DropboxWriter.h @@ -20,8 +20,7 @@ #include <frameworks/base/cmds/statsd/src/stats_log.pb.h> using std::string; -using android::os::statsd::StatsLogEntry; -using android::os::statsd::StatsLogList; +using android::os::statsd::StatsLogReport; class DropboxWriter { public: @@ -30,7 +29,7 @@ public: */ DropboxWriter(const string& tag); - void addEntry(const StatsLogEntry& entry); + void addStatsLogReport(const StatsLogReport& log); /* Request a flush to dropbox. */ void flush(); @@ -46,11 +45,11 @@ private: const string mTag; - /* StatsLogList is a wrapper for storing a list of StatsLogEntry */ - StatsLogList mLogList; + /* Data that was captured for a single metric over a given interval of time. */ + StatsLogReport mLogReport; /* Current *serialized* size of the logs kept in memory. - To save computation, we will not calculate the size of the StatsLogList every time when a new + To save computation, we will not calculate the size of the StatsLogReport every time when a new entry is added, which would recursively call ByteSize() on every log entry. Instead, we keep the sum of all individual stats log entry sizes. The size of a proto is approximately the sum of the size of all member protos. @@ -59,7 +58,7 @@ private: /* Check if the buffer size exceeds the max buffer size when the new entry is added, and flush the logs to dropbox if true. */ - void flushIfNecessary(const StatsLogEntry& entry); + void flushIfNecessary(const StatsLogReport& log); }; diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp index 5f5e216fe3a6..c2fffd8a2d84 100644 --- a/cmds/statsd/src/StatsLogProcessor.cpp +++ b/cmds/statsd/src/StatsLogProcessor.cpp @@ -16,14 +16,13 @@ #include <StatsLogProcessor.h> -#include <log/event_tag_map.h> -#include <log/logprint.h> +#include <log/log_event_list.h> #include <utils/Errors.h> -#include <cutils/log.h> -#include <frameworks/base/cmds/statsd/src/stats_log.pb.h> +#include <parse_util.h> using namespace android; -using android::os::statsd::StatsLogEntry; +using android::os::statsd::EventMetricData; +using android::os::statsd::StatsLogReport; StatsLogProcessor::StatsLogProcessor() : m_dropbox_writer("all-logs") { @@ -57,12 +56,12 @@ StatsLogProcessor::OnLogEvent(const log_msg& msg) // dump all statsd logs to dropbox for now. // TODO: Add filtering, aggregation, etc. if (err == NO_ERROR) { - StatsLogEntry logEntry; - logEntry.set_uid(entry.uid); - logEntry.set_pid(entry.pid); - logEntry.set_start_report_millis(entry.tv_sec / 1000 + entry.tv_nsec / 1000 / 1000); - logEntry.add_pairs()->set_value_str(entry.message, entry.messageLen); - m_dropbox_writer.addEntry(logEntry); + StatsLogReport logReport; + logReport.set_start_report_millis(entry.tv_sec / 1000 + entry.tv_nsec / 1000 / 1000); + EventMetricData *eventMetricData = logReport.mutable_event_metrics()->add_data(); + *eventMetricData = parse(msg); + + m_dropbox_writer.addStatsLogReport(logReport); } } @@ -71,4 +70,4 @@ StatsLogProcessor::UpdateConfig(const int config_source, StatsdConfig config) { m_configs[config_source] = config; ALOGD("Updated configuration for source %i", config_source); -}
\ No newline at end of file +} diff --git a/cmds/statsd/src/StatsLogProcessor.h b/cmds/statsd/src/StatsLogProcessor.h index d2daecd541db..5df84245a406 100644 --- a/cmds/statsd/src/StatsLogProcessor.h +++ b/cmds/statsd/src/StatsLogProcessor.h @@ -16,12 +16,8 @@ #ifndef STATS_LOG_PROCESSOR_H #define STATS_LOG_PROCESSOR_H -#include "LogReader.h" -#include "DropboxWriter.h" +#include "parse_util.h" -#include <frameworks/base/cmds/statsd/src/statsd_config.pb.h> -#include <log/logprint.h> -#include <stdio.h> #include <unordered_map> using android::os::statsd::StatsdConfig; diff --git a/cmds/statsd/src/parse_util.cpp b/cmds/statsd/src/parse_util.cpp new file mode 100644 index 000000000000..9caeacf3b538 --- /dev/null +++ b/cmds/statsd/src/parse_util.cpp @@ -0,0 +1,113 @@ +/* + * 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 <parse_util.h> +#include <log/log_event_list.h> + +using android::os::statsd::EventMetricData; +using android::os::statsd::KeyId; +using android::os::statsd::KeyId_IsValid; +using android::os::statsd::KeyValuePair; +using android::os::statsd::TagId; +using android::os::statsd::TagId_IsValid; + +EventMetricData parse(log_msg msg) +{ + // dump all statsd logs to dropbox for now. + // TODO: Add filtering, aggregation, etc. + EventMetricData eventMetricData; + android_log_context context = create_android_log_parser(const_cast<log_msg*>(&msg)->msg() + + sizeof(uint32_t), + const_cast<log_msg*>(&msg)->len() + - sizeof(uint32_t)); + android_log_list_element elem; + + if (context) { + memset(&elem, 0, sizeof(elem)); + size_t index = 0; + int32_t key = -1; + int32_t tag = -1; + + do { + elem = android_log_read_next(context); + switch ((int)elem.type) { + case EVENT_TYPE_INT: + if (index == 0) { + tag = elem.data.int32; + if (TagId_IsValid(tag)) { + eventMetricData.set_tag(static_cast<TagId>(tag)); + } else { + break; + } + } else if (index % 2 == 1) { + key = elem.data.int32; + } else if (KeyId_IsValid(key)) { + int32_t val = elem.data.int32; + KeyValuePair *keyValuePair = eventMetricData.add_key_value_pair(); + keyValuePair->set_key(static_cast<KeyId>(key)); + keyValuePair->set_value_int(val); + } else { + } + index++; + break; + case EVENT_TYPE_FLOAT: + if (index % 2 == 0 && KeyId_IsValid(key)) { + float val = elem.data.float32; + KeyValuePair *keyValuePair = eventMetricData.add_key_value_pair(); + keyValuePair->set_key(static_cast<KeyId>(key)); + keyValuePair->set_value_float(val); + } + index++; + break; + case EVENT_TYPE_STRING: + if (index % 2 == 0 && KeyId_IsValid(key)) { + char* val = elem.data.string; + KeyValuePair *keyValuePair = eventMetricData.add_key_value_pair(); + keyValuePair->set_key(static_cast<KeyId>(key)); + keyValuePair->set_value_str(val); + } + index++; + break; + case EVENT_TYPE_LONG: + if (index % 2 == 0 && KeyId_IsValid(key)) { + int64_t val = elem.data.int64; + KeyValuePair *keyValuePair = eventMetricData.add_key_value_pair(); + keyValuePair->set_key(static_cast<KeyId>(key)); + keyValuePair->set_value_int(val); + } + index++; + break; + case EVENT_TYPE_LIST: + break; + case EVENT_TYPE_LIST_STOP: + break; + case EVENT_TYPE_UNKNOWN: + break; + default: + elem.complete = true; + break; + } + + if (elem.complete) { + break; + } + } while ((elem.type != EVENT_TYPE_UNKNOWN) && !elem.complete); + + android_log_destroy(&context); + } + + return eventMetricData; +} diff --git a/cmds/statsd/src/parse_util.h b/cmds/statsd/src/parse_util.h new file mode 100644 index 000000000000..8750f822102d --- /dev/null +++ b/cmds/statsd/src/parse_util.h @@ -0,0 +1,28 @@ +/* + * 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. + */ +#ifndef PARSE_UTIL_H +#define PARSE_UTIL_H + +#include "LogReader.h" +#include "DropboxWriter.h" + +#include <log/logprint.h> + +using android::os::statsd::EventMetricData; + +EventMetricData parse(const log_msg msg); + +#endif // PARSE_UTIL_H diff --git a/cmds/statsd/src/stats_constants.proto b/cmds/statsd/src/stats_constants.proto index 1787ae3cba2e..3f8bd1c5a9fc 100644 --- a/cmds/statsd/src/stats_constants.proto +++ b/cmds/statsd/src/stats_constants.proto @@ -22,10 +22,17 @@ option optimize_for = LITE_RUNTIME; option java_package = "com.android.internal.logging"; option java_outer_classname = "StatsConstantsProto"; -message StatsConstants { - // Event type. - enum Type { - WAKELOCK = 1; - SCREEN= 2; - } +enum TagId { + WAKELOCK = 1; + SCREEN = 1003; +} + +enum KeyId { + STATE = 1; + ANOTHER_STATE = 2; + EVENT_TIMESTAMP = 1001; + PACKAGE_NAME = 1002; + PACKAGE_VERSION = 1003; + PACKAGE_VERSION_STRING = 1004; + ATTRIBUTION_CHAIN = 1005; } diff --git a/cmds/statsd/src/stats_log.proto b/cmds/statsd/src/stats_log.proto index ec92023c873a..2c66ded0c7ed 100644 --- a/cmds/statsd/src/stats_log.proto +++ b/cmds/statsd/src/stats_log.proto @@ -25,53 +25,53 @@ option java_outer_classname = "StatsLog"; import "frameworks/base/cmds/statsd/src/statsd_config.proto"; import "frameworks/base/cmds/statsd/src/stats_constants.proto"; -// StatsLogEntry is a generic proto holding a single metrics data. -message StatsLogEntry { - // Type of stats. - optional android.os.statsd.StatsConstants.Type type = 1; - - // Aggregation type of the data. - optional android.os.statsd.TrackedAggregateType aggregate_type = 2; - - // Start timestamp of the interval. Timestamp for event-type data will have - // equal value for start_report_millis and end_report_millis. - optional int64 start_report_millis = 3; - - // End timestamp of the interval. - optional int64 end_report_millis = 4; - - // Package information for application-level data. - optional string package_name = 5; - optional int32 package_version = 6; - optional string package_version_string = 7; - - // UID associated with the data. - optional int32 uid = 8; - - // PID associated with the data. - optional int32 pid = 9; - - // Payload contains key value pairs of the data from statsd. - message KeyValuePair { - // Integer representation of data type. - optional int32 key = 1; - - oneof value { - string value_str = 2; - int64 value_int = 3; - bool value_bool = 4; - } +message KeyValuePair { + optional KeyId key = 1; + + oneof value { + string value_str = 2; + int64 value_int = 3; + bool value_bool = 4; + float value_float = 5; } - repeated KeyValuePair pairs = 10; +} + +message EventMetricData { + optional TagId tag = 1; + + repeated KeyValuePair key_value_pair = 2; +} - // Next tag: 11 +message CountBucketInfo { + optional int64 start_bucket_millis = 1; + + optional int64 end_bucket_millis = 2; + + optional int64 count = 3; } -// Data captured for a given metric during a given period of time. -message StatsLogList { - // Unique ID for this metric. +message CountMetricData { + repeated KeyValuePair dimension = 1; + + repeated CountBucketInfo bucket_info = 2; +} + +message StatsLogReport { optional int32 metric_id = 1; - // List of stats log entry. - repeated StatsLogEntry stats_log_entry = 2; + optional int64 start_report_millis = 2; + + optional int64 end_report_millis = 3; + + message EventMetricDataWrapper { + repeated EventMetricData data = 1; + } + message CountMetricDataWrapper { + repeated CountMetricData data = 1; + } + + oneof data { + EventMetricDataWrapper event_metrics = 4; + CountMetricDataWrapper count_metrics = 5; + } } diff --git a/cmds/statsd/src/statsd_config.proto b/cmds/statsd/src/statsd_config.proto index 2d034e50f4b5..c6119df691a3 100644 --- a/cmds/statsd/src/statsd_config.proto +++ b/cmds/statsd/src/statsd_config.proto @@ -1,40 +1,3 @@ -/* - * 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. - */ - - -// Version 1. -// Important: Update the version line above before copy-pasting this file -// from/to Google3 and Android repository. -// This proto needs to be manually synced between Google3 and Android versions. - -/* - * Note about semantics of the buckets: - * In this current proto scheme, the buckets are updated only when an event - * occurs. In the case of durations, this means that we update at the end of a - * duration. - * - * For example, suppose we have buckets at every 10 min: - * 0, 10, 20, 30, 40, etc. - * And then suppose a wakelock is first held starting at min 5 and lasts for 21 - * mins. Then the buckets for 0-10 and 10-20 don't contain anything and inside - * the bucket for 20-30, we add the value of 21 minutes. - * - * Also note that buckets are only aligned to wall-clock (no custom time-bases). - */ - syntax = "proto2"; package android.os.statsd; @@ -43,30 +6,21 @@ option optimize_for = LITE_RUNTIME; option java_package = "com.android.internal.os"; option java_outer_classname = "StatsdConfigProto"; -// KeyMatcher specifies how to match the key. -message KeyMatcher { - oneof contents { - int32 key = 1; // ID of the key to match. +import "frameworks/base/cmds/statsd/src/stats_constants.proto"; - // Special matcher for package name. This will match either the package name - // or the UID (statsD will map the UID of the source event to a package - // name). Specify the package name to match in eq_string. - bool use_package = 2; - } +message KeyMatcher { + optional KeyId key = 1; + optional bool as_package_name = 2 [ default = false ]; } -// FieldMatcher allows us to match specific fields/keys in an event. -message FieldMatcher { +message KeyValueMatcher { optional KeyMatcher key_matcher = 1; oneof value_matcher { - // Equality matchers bool eq_bool = 2; string eq_string = 3; int32 eq_int32 = 4; int64 eq_int64 = 5; - - // Numeric comparisons; int32 lt_int32 = 6; int32 gt_int32 = 7; int64 lt_int64 = 8; @@ -76,374 +30,90 @@ message FieldMatcher { } } -enum OperationType { +enum LogicalOperation { AND = 1; OR = 2; - NOT = 3; // Must have only a single operand when using NOT operator. - NAND = 4; // NAND and NOR as conveniences to avoid NOT+(AND/OR)-layers. + NOT = 3; + NAND = 4; NOR = 5; } -enum TrackedAggregateType { - // IS_RUNNING; // whether it is currently running - VALUE_COUNT = 1; // count number of events - VALUE_SUM = 2; - VALUE_MAX = 3; - VALUE_MIN = 4; - DURATION_SUM = 5; // cumulative total time - DURATION_MAX = 6; // longest continuously-on time - DURATION_MIN = 7; // shortest continuously-on time - //DURATION_CURRENT = 6; // current continuously-on time (not bucketed) +message SimpleLogEntryMatcher { + repeated TagId tag = 1; + + repeated KeyValueMatcher key_value_matcher = 2; } -// Assume the events come in with a tag and an array of (key, value) tuples -// where the key must be an int32 and value can be any type. -message LineMatcher { - // For now, we assume that we don't flatten the tags (ie, one tag corresponds - // to screen-on and screen-off events and key 1 represents ON or OFF). - repeated int32 tag = 1; // Must match at least one of the tags. +message LogEntryMatcher { + optional string name = 1; - message Nested { - optional OperationType operation = 1; - repeated LineMatcher matcher = 2; + message Combination { + optional LogicalOperation operation = 1; + repeated LogEntryMatcher matcher = 2; } oneof contents { - FieldMatcher requirement = 2; - Nested nested = 3; + SimpleLogEntryMatcher simple_log_entry_matcher = 2; + Combination combination = 3; } } -// Defines when an AggregateCounter or EventMatcher applies. +message SimpleCondition { + optional string start = 1; + + optional string stop = 2; + + optional bool count_nesting = 3 [default = true]; + + optional string stop_all = 4; +} + message Condition { - message Nested { - optional OperationType operation = 1; - repeated Condition nested_conditions = 2; // operands that are themselves - // conditions (recursively) - } + optional string name = 1; + + message Combination { + optional LogicalOperation operation = 1; - // Leaf node of condition. - message RangeMatcher { - optional LineMatcher start = 1; - optional LineMatcher stop = 2; - optional bool count_nesting = 3 - [default = true]; // true if "start start stop" is still - // considered running - - // Configure which fields define the slices. These fields must be present in - // both the start and stop lines. Note that this can be a subset of all the - // slices defined in the AggregateCounter. - // For example, if the counter slices on both app name and wake lock name, - // we can define that this range only slices on app name. - repeated KeyMatcher slice = 4; + repeated string condition = 2; } oneof contents { - RangeMatcher range = 1; // Represents a leaf node. - Nested nested = 2; // Represents a non-leaf node. + SimpleCondition simple_condition = 2; + Combination combination = 3; } } -// Emits matching events to statsd event buffer. -message EventMatcher { - // Tracks what configuration led to uploading of this event. - optional int32 metric_id = 1; +message Bucket { + optional int64 bucket_size_millis = 1; +} - // LineMatcher for the event to emit. - optional LineMatcher what = 2; +message EventMetric { + optional int64 metric_id = 1; - optional Condition condition = 3; + optional string what = 2; - // TODO: Have a clear use-case for this in P or-else drop this for P. - message Filter { - } - optional Filter filter = 4; + optional string condition = 3; } -// Hard-code the possible metrics that we can pull. -// For example, NETSTATS_BY_UID would provide network usage per uid. -// We should treat the results like a batch of individual log events, and we -// should process them one-by-one to re-use our LineMatcher logic. -enum PulledMetricSource { - NETSTATS = 1; -} +message CountMetric { + optional int64 metric_id = 1; -message AggregateCounter { // previously called Timer - // Specifies which fields in the message act as dimensions. - // For both pushed and pulled metrics, we assume every record has all the - // dimensions set. - message Slicer { - repeated KeyMatcher keys = 1; - } - optional Slicer slicer = 1; - - message ValueSource { - message PushedMetric { - // LineMatcher for the event to apply. - // Slicing (which keys act as dimensions) should not be specified here. - optional LineMatcher what = 1; - - // Only needed if one key should be treated as the value. - optional int32 value_key = 2; - } - - // The values for pulled metrics are computed and aggregated at the end of - // the condition. - message PulledMetric { - optional bool compute_diff = - 1; // If we want the diff (if this - // metric is pulled when condition opens/closes). - optional PulledMetricSource metric = 2; - - // We treat the pulled metrics as a batch of log-records that look like - // they came from LogD. - optional LineMatcher what = 3; - optional int32 value_field = 4; - } - - oneof value { - PushedMetric pushed_metric = 1; - - // Pulled metrics are computed when the duration closes (and are also - // fetched at the open if we need to compute a diff). - // Pulled metrics require a condition being defined. - // These metrics are not pulled at the end of every bucket. - PulledMetric pulled_metric = 2; - - // Polled Metrics are pulled at the end of every bucket. - // Since the buckets are only planned to be on wall-clock for Android P, - // condition is NOT supported for polled metrics. - PulledMetric polled_metric = 3; - } - } - optional ValueSource value = 2; - - message TrackedAggregate { - // Must be an integer that is uniquely chosen so we can identify the metric - // on server. We will provide a tool on server to help generate this. - optional int32 metric_id = 1; - - optional TrackedAggregateType type = 2; - - // Alert if the value, when summed over the Counter's number_of_buckets - // most-recent bins, exceeds min_threshold or is below max_threshold. For - // Anomaly Detection. - message Alert { - message IncidentdDetails { - optional string - alert_name = 1; // for humans and incidentd to identify this issue - repeated int32 incidentd_sections = 2; // tells incidentd what to do if - // alert triggers - } - optional IncidentdDetails incidentd_details = 1; - optional int32 number_of_buckets = 2; - // NOTE: that we assume the aggregate is only int. - optional int64 trigger_if_gt = 3; // min threshold - optional int64 trigger_if_lt = 4; // max_threshold; - optional int32 refractory_period_secs = 5; // alarm cannot fire a second - // time until elapsed - } - repeated Alert alerts = 3; // Support diff alert params for same aggregate. - } // end TrackedAggregate - repeated TrackedAggregate tracked_aggregates = 3; - - optional Condition condition = 4; - - message Bucket { - // TODO: Consider switching to second granularity. - // In practice, this must be chosen from a pre-defined list. So that we have - // flexiblity, we don't hard-code this as an enum today. - optional int64 bucket_size_msec = 1; - optional int32 max_number_of_bits = 2; // Max bits per bucket. - } - optional Bucket bucket = 5; + optional string what = 2; - message MiscellaneousEffect { - optional LineMatcher matcher = 1; // When to trigger the effect - - enum Effect { - STOP_ALL = 1; // Needed for stop-all events, where nested start value is - // forced to 0. - } - repeated Effect effects = 2; - } // end MiscellaneousEffect - repeated MiscellaneousEffect misc_effects = 6; -} // end Counter - -// Alarm configs not tied to a particular Counter. -message GlobalAlertParameters { - // No alarm can fire after any other alarm fired until this many seconds has - // elapsed. - optional int32 global_refractory_period_seconds = 1; + optional string condition = 3; + + repeated KeyMatcher dimension = 4; + + optional Bucket bucket = 5; } -// The config defining all metrics to be captured. message StatsdConfig { - // Event matchers. - repeated EventMatcher event_matchers = 1; + optional int64 config_id = 1; - // Aggregate counters. - repeated AggregateCounter aggregate_counters = 2; -} + repeated EventMetric event_metric = 2; -/* Sample configurations start here: -----Screen on time---- -AggregateCounter < - condition < - range < - start < - tag: SCREEN_ON - requirement < - key_matcher< - key: SCREEN_ON_VALUE - eq_bool: true - stop < - tag: SCREEN_ON - requirement < - key_matcher< - key: SCREEN_ON_VALUE - eq_bool: false - metric_id: # set on server - tracked_aggregates < - DURATION_SUM - (For brevity, omit the bucket options but they can also be set) - -----Screen off time---- -Should be like aboe but reversing start and stop - -----Log the screen change events---- -EventMatcher < - metric_id: # set on server - what < - tag: SCREEN_ON - -----Number of crashes (across system)---- -AggregateCounter < - metric_id: # set on server - tracked_aggregates < - VALUE_COUNT - value < - pushed_metric < - what < - tag: CRASH_TAG - -----Network Usage in bytes Per App While in Background---- -AggregateCounter < - metric_id: # set on server - slicer < - keys < - use_package_name: true - tracked_aggregates < - VALUE_SUM - value < - pulled_metric < - compute_diff: true - metric: Enum corresponding to network usage in bytes - condition < - range < - sliced: true - start < - tag: APP_FOREGROUND_TRANSITION (assume false means move to background) - requirement < - key_matcher< - key: APP_FOREGROUND_STATE - eq_bool: false - stop < - tag: APP_FOREGROUND_TRANSITION (assume false means move to background) - requirement < - key_matcher< - key: APP_FOREGROUND_STATE - eq_bool: true - -----Wakelock Acquire time per app and wakelock - while unplugged and screen off and in background process state---- -AggregateCounter < - metric_id: # set on server - slicer < - keys < - use_package_name: true - keys < - key: Key corresponding to wake_lock ID - tracked_aggregates < - DURATION_SUM - condition < - nested < - operation: AND - nested_conditions < - range < - start < - tag: PLUGGED_IN (assume false means uncharged) - requirement < - key_matcher< - key: PLUGGED_IN_STATE - eq_bool: false - stop < - tag: PLUGGED_IN (assume false means uncharged) - requirement < - key_matcher< - key: PLUGGED_IN_STATE - eq_bool: true - nested_conditions < - range < - start < - tag: SCREEN_ON - requirement < - key_matcher< - key: SCREEN_ON_STATE - eq_bool: false - stop < - tag: SCREEN_ON - requirement < - key_matcher< - key: SCREEN_ON_STATE - eq_bool: true - nested_conditions < - range < - start < - tag: PROCESS_CHANGE - requirement < - key_matcher< - key: PROCESS_STATE_VALUE - eq_int32: BACKGROUND_PROCESS - stop < - tag: PROCESS_CHANGE - nested < - operation: NOT - matcher< (This is an example of using the NOT to define stop) - requirement < (Note this requirement should match the start.) - key_matcher< - key: PROCESS_STATE_VALUE - eq_int32: BACKGROUND_PROCESS - slice< - use_package_name: true - - -----Number of crashes (per app) ---- -AggregateCounter < - metric_id: # set on server - slicer < - keys< - use_package_name: true - tracked_aggregates < - VALUE_COUNT - value < - pushed_metric < - what < - tag: CRASH_TAG - ----- Number of transitions to background (per app) ---- -AggregateCounter < - metric_id: # set on server - slicer < - keys< - use_package_name: true - tracked_aggregates < - VALUE_COUNT - value < - pushed_metric < - what < - tag: APP_FOREGROUND_TRANSITION - requirement< - key: APP_FOREGROUND_TRANSITION_STATE - eq_bool: false - -*/ + repeated CountMetric count_metric = 3; + + repeated LogEntryMatcher log_entry_matcher = 4; + + repeated Condition condition = 5; +} diff --git a/config/preloaded-classes b/config/preloaded-classes index cd2965392c44..cb3cbe196230 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -1848,6 +1848,7 @@ android.os.SharedMemory android.os.ShellCallback android.os.StatFs android.os.StrictMode +android.os.StrictMode$$Lambda$0 android.os.StrictMode$1 android.os.StrictMode$2 android.os.StrictMode$3 @@ -1872,6 +1873,7 @@ android.os.StrictMode$ThreadPolicy$Builder android.os.StrictMode$ThreadSpanState android.os.StrictMode$ViolationInfo android.os.StrictMode$ViolationInfo$1 +android.os.StrictMode$ViolationLogger android.os.StrictMode$VmPolicy android.os.StrictMode$VmPolicy$Builder android.os.SystemClock diff --git a/core/java/android/accounts/AbstractAccountAuthenticator.java b/core/java/android/accounts/AbstractAccountAuthenticator.java index bf9bd79e63ef..a3b3a9f21954 100644 --- a/core/java/android/accounts/AbstractAccountAuthenticator.java +++ b/core/java/android/accounts/AbstractAccountAuthenticator.java @@ -175,6 +175,9 @@ public abstract class AbstractAccountAuthenticator { } if (result != null) { response.onResult(result); + } else { + response.onError(AccountManager.ERROR_CODE_INVALID_RESPONSE, + "null bundle returned"); } } catch (Exception e) { handleException(response, "addAccount", accountType, e); diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index dd6ad55fba6d..bd9c9fa30536 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -2321,6 +2321,10 @@ public class AccountManager { private class Response extends IAccountManagerResponse.Stub { @Override public void onResult(Bundle bundle) { + if (bundle == null) { + onError(ERROR_CODE_INVALID_RESPONSE, "null bundle returned"); + return; + } Intent intent = bundle.getParcelable(KEY_INTENT); if (intent != null && mActivity != null) { // since the user provided an Activity we will silently start intents diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 0ceb28841e40..c567946a830d 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -307,7 +307,15 @@ interface IActivityManager { boolean shouldUpRecreateTask(in IBinder token, in String destAffinity); boolean navigateUpTo(in IBinder token, in Intent target, int resultCode, in Intent resultData); - void setLockScreenShown(boolean showing); + /** + * Informs ActivityManagerService that the keyguard is showing. + * + * @param showing True if the keyguard is showing, false otherwise. + * @param secondaryDisplayShowing The displayId of the secondary display on which the keyguard + * is showing, or INVALID_DISPLAY if there is no such display. Only meaningful if + * showing is true. + */ + void setLockScreenShown(boolean showing, int secondaryDisplayShowing); boolean finishActivityAffinity(in IBinder token); // This is not public because you need to be very careful in how you // manage your activity to make sure it is always the uid you expect. diff --git a/core/java/android/app/VrManager.java b/core/java/android/app/VrManager.java index 363e20a76a1f..578623892a9d 100644 --- a/core/java/android/app/VrManager.java +++ b/core/java/android/app/VrManager.java @@ -62,7 +62,10 @@ public class VrManager { * @param callback The callback to register. * @hide */ - @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) + @RequiresPermission(anyOf = { + android.Manifest.permission.RESTRICTED_VR_ACCESS, + android.Manifest.permission.ACCESS_VR_STATE + }) public void registerVrStateCallback(VrStateCallback callback, @NonNull Handler handler) { if (callback == null || mCallbackMap.containsKey(callback)) { return; @@ -88,7 +91,10 @@ public class VrManager { * @param callback The callback to deregister. * @hide */ - @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) + @RequiresPermission(anyOf = { + android.Manifest.permission.RESTRICTED_VR_ACCESS, + android.Manifest.permission.ACCESS_VR_STATE + }) public void unregisterVrStateCallback(VrStateCallback callback) { CallbackEntry entry = mCallbackMap.remove(callback); if (entry != null) { @@ -110,7 +116,10 @@ public class VrManager { * Returns the current VrMode state. * @hide */ - @RequiresPermission(android.Manifest.permission.ACCESS_VR_STATE) + @RequiresPermission(anyOf = { + android.Manifest.permission.RESTRICTED_VR_ACCESS, + android.Manifest.permission.ACCESS_VR_STATE + }) public boolean getVrModeEnabled() { try { return mService.getVrModeState(); @@ -124,7 +133,10 @@ public class VrManager { * Returns the current VrMode state. * @hide */ - @RequiresPermission(android.Manifest.permission.ACCESS_VR_STATE) + @RequiresPermission(anyOf = { + android.Manifest.permission.RESTRICTED_VR_ACCESS, + android.Manifest.permission.ACCESS_VR_STATE + }) public boolean getPersistentVrModeEnabled() { try { return mService.getPersistentVrModeEnabled(); diff --git a/core/java/android/app/WindowConfiguration.java b/core/java/android/app/WindowConfiguration.java index 5d87e1c2a157..07eb5de15d9f 100644 --- a/core/java/android/app/WindowConfiguration.java +++ b/core/java/android/app/WindowConfiguration.java @@ -17,6 +17,9 @@ package android.app; import static android.app.ActivityThread.isSystem; +import static android.app.WindowConfigurationProto.ACTIVITY_TYPE; +import static android.app.WindowConfigurationProto.APP_BOUNDS; +import static android.app.WindowConfigurationProto.WINDOWING_MODE; import android.annotation.IntDef; import android.annotation.NonNull; @@ -25,6 +28,7 @@ import android.content.res.Configuration; import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; +import android.util.proto.ProtoOutputStream; import android.view.DisplayInfo; /** @@ -48,26 +52,20 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu /** The current windowing mode of the configuration. */ private @WindowingMode int mWindowingMode; - /** Windowing mode is currently not defined. - * @hide */ + /** Windowing mode is currently not defined. */ public static final int WINDOWING_MODE_UNDEFINED = 0; - /** Occupies the full area of the screen or the parent container. - * @hide */ + /** Occupies the full area of the screen or the parent container. */ public static final int WINDOWING_MODE_FULLSCREEN = 1; - /** Always on-top (always visible). of other siblings in its parent container. - * @hide */ + /** Always on-top (always visible). of other siblings in its parent container. */ public static final int WINDOWING_MODE_PINNED = 2; - /** The primary container driving the screen to be in split-screen mode. - * @hide */ + /** The primary container driving the screen to be in split-screen mode. */ public static final int WINDOWING_MODE_SPLIT_SCREEN_PRIMARY = 3; /** * The containers adjacent to the {@link #WINDOWING_MODE_SPLIT_SCREEN_PRIMARY} container in * split-screen mode. - * @hide */ public static final int WINDOWING_MODE_SPLIT_SCREEN_SECONDARY = 4; - /** Can be freely resized within its parent container. - * @hide */ + /** Can be freely resized within its parent container. */ public static final int WINDOWING_MODE_FREEFORM = 5; /** @hide */ @@ -84,18 +82,15 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu /** The current activity type of the configuration. */ private @ActivityType int mActivityType; - /** Activity type is currently not defined. - * @hide */ + /** Activity type is currently not defined. */ public static final int ACTIVITY_TYPE_UNDEFINED = 0; - /** Standard activity type. Nothing special about the activity... - * @hide */ + /** Standard activity type. Nothing special about the activity... */ public static final int ACTIVITY_TYPE_STANDARD = 1; /** Home/Launcher activity type. */ public static final int ACTIVITY_TYPE_HOME = 2; /** Recents/Overview activity type. */ public static final int ACTIVITY_TYPE_RECENTS = 3; - /** Assistant activity type. - * @hide */ + /** Assistant activity type. */ public static final int ACTIVITY_TYPE_ASSISTANT = 4; /** @hide */ @@ -127,7 +122,6 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu }) public @interface WindowConfig {} - /** @hide */ public WindowConfiguration() { unset(); } @@ -176,7 +170,6 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu * Set {@link #mAppBounds} to the input Rect. * @param rect The rect value to set {@link #mAppBounds} to. * @see #getAppBounds() - * @hide */ public void setAppBounds(Rect rect) { if (rect == null) { @@ -200,26 +193,20 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu mAppBounds.set(left, top, right, bottom); } - /** - * @see #setAppBounds(Rect) - * @hide - */ + /** @see #setAppBounds(Rect) */ public Rect getAppBounds() { return mAppBounds; } - /** @hide */ public void setWindowingMode(@WindowingMode int windowingMode) { mWindowingMode = windowingMode; } - /** @hide */ @WindowingMode public int getWindowingMode() { return mWindowingMode; } - /** @hide */ public void setActivityType(@ActivityType int activityType) { if (mActivityType == activityType) { return; @@ -237,13 +224,11 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu mActivityType = activityType; } - /** @hide */ @ActivityType public int getActivityType() { return mActivityType; } - /** @hide */ public void setTo(WindowConfiguration other) { setAppBounds(other.mAppBounds); setWindowingMode(other.mWindowingMode); @@ -382,6 +367,24 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu } /** + * Write to a protocol buffer output stream. + * Protocol buffer message definition at {@link android.app.WindowConfigurationProto} + * + * @param protoOutputStream Stream to write the WindowConfiguration object to. + * @param fieldId Field Id of the WindowConfiguration as defined in the parent message + * @hide + */ + public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) { + final long token = protoOutputStream.start(fieldId); + if (mAppBounds != null) { + mAppBounds.writeToProto(protoOutputStream, APP_BOUNDS); + } + protoOutputStream.write(WINDOWING_MODE, mWindowingMode); + protoOutputStream.write(ACTIVITY_TYPE, mActivityType); + protoOutputStream.end(token); + } + + /** * Returns true if the activities associated with this window configuration display a shadow * around their border. * @hide diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index 5bfc54d267ca..76cb3f5b548e 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -232,7 +232,7 @@ public final class BluetoothUuid { */ public static int getServiceIdentifierFromParcelUuid(ParcelUuid parcelUuid) { UUID uuid = parcelUuid.getUuid(); - long value = (uuid.getMostSignificantBits() & 0x0000FFFF00000000L) >>> 32; + long value = (uuid.getMostSignificantBits() & 0xFFFFFFFF00000000L) >>> 32; return (int) value; } diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 08acfb651b18..c238ffbbaf4d 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -10071,6 +10071,27 @@ public class Intent implements Parcelable, Cloneable { return false; } + /** + * Convert the dock state to a human readable format. + * @hide + */ + public static String dockStateToString(int dock) { + switch (dock) { + case EXTRA_DOCK_STATE_HE_DESK: + return "EXTRA_DOCK_STATE_HE_DESK"; + case EXTRA_DOCK_STATE_LE_DESK: + return "EXTRA_DOCK_STATE_LE_DESK"; + case EXTRA_DOCK_STATE_CAR: + return "EXTRA_DOCK_STATE_CAR"; + case EXTRA_DOCK_STATE_DESK: + return "EXTRA_DOCK_STATE_DESK"; + case EXTRA_DOCK_STATE_UNDOCKED: + return "EXTRA_DOCK_STATE_UNDOCKED"; + default: + return Integer.toString(dock); + } + } + private static ClipData.Item makeClipItem(ArrayList<Uri> streams, ArrayList<CharSequence> texts, ArrayList<String> htmlTexts, int which) { Uri uri = streams != null ? streams.get(which) : null; diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 48587b3630d9..486ff43a6467 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -34,8 +34,7 @@ import java.lang.annotation.RetentionPolicy; * from the AndroidManifest.xml's <activity> and * <receiver> tags. */ -public class ActivityInfo extends ComponentInfo - implements Parcelable { +public class ActivityInfo extends ComponentInfo implements Parcelable { // NOTE: When adding new data members be sure to update the copy-constructor, Parcel // constructor, and writeToParcel. @@ -1211,6 +1210,51 @@ public class ActivityInfo extends ComponentInfo return isFloating || isTranslucent || isSwipeToDismiss; } + /** + * Convert the screen orientation constant to a human readable format. + * @hide + */ + public static String screenOrientationToString(int orientation) { + switch(orientation) { + case SCREEN_ORIENTATION_UNSET: + return "SCREEN_ORIENTATION_UNSET"; + case SCREEN_ORIENTATION_UNSPECIFIED: + return "SCREEN_ORIENTATION_UNSPECIFIED"; + case SCREEN_ORIENTATION_LANDSCAPE: + return "SCREEN_ORIENTATION_LANDSCAPE"; + case SCREEN_ORIENTATION_PORTRAIT: + return "SCREEN_ORIENTATION_PORTRAIT"; + case SCREEN_ORIENTATION_USER: + return "SCREEN_ORIENTATION_USER"; + case SCREEN_ORIENTATION_BEHIND: + return "SCREEN_ORIENTATION_BEHIND"; + case SCREEN_ORIENTATION_SENSOR: + return "SCREEN_ORIENTATION_SENSOR"; + case SCREEN_ORIENTATION_NOSENSOR: + return "SCREEN_ORIENTATION_NOSENSOR"; + case SCREEN_ORIENTATION_SENSOR_LANDSCAPE: + return "SCREEN_ORIENTATION_SENSOR_LANDSCAPE"; + case SCREEN_ORIENTATION_SENSOR_PORTRAIT: + return "SCREEN_ORIENTATION_SENSOR_PORTRAIT"; + case SCREEN_ORIENTATION_REVERSE_LANDSCAPE: + return "SCREEN_ORIENTATION_REVERSE_LANDSCAPE"; + case SCREEN_ORIENTATION_REVERSE_PORTRAIT: + return "SCREEN_ORIENTATION_REVERSE_PORTRAIT"; + case SCREEN_ORIENTATION_FULL_SENSOR: + return "SCREEN_ORIENTATION_FULL_SENSOR"; + case SCREEN_ORIENTATION_USER_LANDSCAPE: + return "SCREEN_ORIENTATION_USER_LANDSCAPE"; + case SCREEN_ORIENTATION_USER_PORTRAIT: + return "SCREEN_ORIENTATION_USER_PORTRAIT"; + case SCREEN_ORIENTATION_FULL_USER: + return "SCREEN_ORIENTATION_FULL_USER"; + case SCREEN_ORIENTATION_LOCKED: + return "SCREEN_ORIENTATION_LOCKED"; + default: + return Integer.toString(orientation); + } + } + public static final Parcelable.Creator<ActivityInfo> CREATOR = new Parcelable.Creator<ActivityInfo>() { public ActivityInfo createFromParcel(Parcel source) { diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 780e6f769290..dfd3bbf04d35 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -16,9 +16,20 @@ package android.content.res; +import static android.content.ConfigurationProto.DENSITY_DPI; +import static android.content.ConfigurationProto.FONT_SCALE; +import static android.content.ConfigurationProto.ORIENTATION; +import static android.content.ConfigurationProto.SCREEN_HEIGHT_DP; +import static android.content.ConfigurationProto.SCREEN_LAYOUT; +import static android.content.ConfigurationProto.SCREEN_WIDTH_DP; +import static android.content.ConfigurationProto.SMALLEST_SCREEN_WIDTH_DP; +import static android.content.ConfigurationProto.UI_MODE; +import static android.content.ConfigurationProto.WINDOW_CONFIGURATION; + import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.TestApi; import android.app.WindowConfiguration; import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo.Config; @@ -27,6 +38,7 @@ import android.os.LocaleList; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; +import android.util.proto.ProtoOutputStream; import android.view.View; import com.android.internal.util.XmlUtils; @@ -295,11 +307,12 @@ public final class Configuration implements Parcelable, Comparable<Configuration public int screenLayout; /** - * @hide * Configuration relating to the windowing state of the object associated with this * Configuration. Contents of this field are not intended to affect resources, but need to be * communicated and propagated at the same time as the rest of Configuration. + * @hide */ + @TestApi public final WindowConfiguration windowConfiguration = new WindowConfiguration(); /** @hide */ @@ -1054,6 +1067,55 @@ public final class Configuration implements Parcelable, Comparable<Configuration } /** + * Write to a protocol buffer output stream. + * Protocol buffer message definition at {@link android.content.ConfigurationProto} + * + * @param protoOutputStream Stream to write the Configuration object to. + * @param fieldId Field Id of the Configuration as defined in the parent message + * @hide + */ + public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) { + final long token = protoOutputStream.start(fieldId); + protoOutputStream.write(FONT_SCALE, fontScale); + protoOutputStream.write(SCREEN_LAYOUT, screenLayout); + protoOutputStream.write(ORIENTATION, orientation); + protoOutputStream.write(UI_MODE, uiMode); + protoOutputStream.write(SCREEN_WIDTH_DP, screenWidthDp); + protoOutputStream.write(SCREEN_HEIGHT_DP, screenHeightDp); + protoOutputStream.write(SMALLEST_SCREEN_WIDTH_DP, smallestScreenWidthDp); + protoOutputStream.write(DENSITY_DPI, densityDpi); + windowConfiguration.writeToProto(protoOutputStream, WINDOW_CONFIGURATION); + protoOutputStream.end(token); + } + + /** + * Convert the UI mode to a human readable format. + * @hide + */ + public static String uiModeToString(int uiMode) { + switch (uiMode) { + case UI_MODE_TYPE_UNDEFINED: + return "UI_MODE_TYPE_UNDEFINED"; + case UI_MODE_TYPE_NORMAL: + return "UI_MODE_TYPE_NORMAL"; + case UI_MODE_TYPE_DESK: + return "UI_MODE_TYPE_DESK"; + case UI_MODE_TYPE_CAR: + return "UI_MODE_TYPE_CAR"; + case UI_MODE_TYPE_TELEVISION: + return "UI_MODE_TYPE_TELEVISION"; + case UI_MODE_TYPE_APPLIANCE: + return "UI_MODE_TYPE_APPLIANCE"; + case UI_MODE_TYPE_WATCH: + return "UI_MODE_TYPE_WATCH"; + case UI_MODE_TYPE_VR_HEADSET: + return "UI_MODE_TYPE_VR_HEADSET"; + default: + return Integer.toString(uiMode); + } + } + + /** * Set this object to the system defaults. */ public void setToDefaults() { diff --git a/core/java/android/hardware/camera2/DngCreator.java b/core/java/android/hardware/camera2/DngCreator.java index 1a51acd6c5ec..cc484eaf265c 100644 --- a/core/java/android/hardware/camera2/DngCreator.java +++ b/core/java/android/hardware/camera2/DngCreator.java @@ -18,7 +18,6 @@ package android.hardware.camera2; import android.annotation.IntRange; import android.annotation.NonNull; -import android.annotation.Nullable; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.ImageFormat; @@ -37,6 +36,7 @@ import java.nio.ByteBuffer; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Locale; import java.util.TimeZone; /** @@ -122,7 +122,7 @@ public final class DngCreator implements AutoCloseable { // Create this fresh each time since the time zone may change while a long-running application // is active. final DateFormat dateTimeStampFormat = - new SimpleDateFormat(TIFF_DATETIME_FORMAT); + new SimpleDateFormat(TIFF_DATETIME_FORMAT, Locale.US); dateTimeStampFormat.setTimeZone(TimeZone.getDefault()); // Format for metadata @@ -472,7 +472,8 @@ public final class DngCreator implements AutoCloseable { private static final String GPS_DATE_FORMAT_STR = "yyyy:MM:dd"; private static final String TIFF_DATETIME_FORMAT = "yyyy:MM:dd HH:mm:ss"; - private static final DateFormat sExifGPSDateStamp = new SimpleDateFormat(GPS_DATE_FORMAT_STR); + private static final DateFormat sExifGPSDateStamp = + new SimpleDateFormat(GPS_DATE_FORMAT_STR, Locale.US); private final Calendar mGPSTimeStampCalendar = Calendar .getInstance(TimeZone.getTimeZone("UTC")); diff --git a/core/java/android/hardware/location/NanoAppInstanceInfo.java b/core/java/android/hardware/location/NanoAppInstanceInfo.java index ac6d83f622b2..26238304d8e9 100644 --- a/core/java/android/hardware/location/NanoAppInstanceInfo.java +++ b/core/java/android/hardware/location/NanoAppInstanceInfo.java @@ -287,8 +287,10 @@ public class NanoAppInstanceInfo { mPublisher = in.readString(); mName = in.readString(); + mHandle = in.readInt(); mAppId = in.readLong(); mAppVersion = in.readInt(); + mContexthubId = in.readInt(); mNeededReadMemBytes = in.readInt(); mNeededWriteMemBytes = in.readInt(); mNeededExecMemBytes = in.readInt(); @@ -309,6 +311,8 @@ public class NanoAppInstanceInfo { public void writeToParcel(Parcel out, int flags) { out.writeString(mPublisher); out.writeString(mName); + + out.writeInt(mHandle); out.writeLong(mAppId); out.writeInt(mAppVersion); out.writeInt(mContexthubId); diff --git a/core/java/android/net/metrics/WakeupStats.java b/core/java/android/net/metrics/WakeupStats.java index d520b9745918..97e83f969c38 100644 --- a/core/java/android/net/metrics/WakeupStats.java +++ b/core/java/android/net/metrics/WakeupStats.java @@ -35,7 +35,7 @@ public class WakeupStats { public long systemWakeups = 0; public long nonApplicationWakeups = 0; public long applicationWakeups = 0; - public long unroutedWakeups = 0; + public long noUidWakeups = 0; public long durationSec = 0; public WakeupStats(String iface) { @@ -58,7 +58,7 @@ public class WakeupStats { systemWakeups++; break; case NO_UID: - unroutedWakeups++; + noUidWakeups++; break; default: if (ev.uid >= Process.FIRST_APPLICATION_UID) { @@ -80,7 +80,7 @@ public class WakeupStats { .append(", system: ").append(systemWakeups) .append(", apps: ").append(applicationWakeups) .append(", non-apps: ").append(nonApplicationWakeups) - .append(", unrouted: ").append(unroutedWakeups) + .append(", no uid: ").append(noUidWakeups) .append(", ").append(durationSec).append("s)") .toString(); } diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index f02631c7fe61..2528439a5e1f 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -16,6 +16,7 @@ package android.os; import android.animation.ValueAnimator; +import android.annotation.Nullable; import android.annotation.TestApi; import android.app.ActivityManager; import android.app.ActivityThread; @@ -322,16 +323,36 @@ public final class StrictMode { /** {@hide} */ @TestApi - public interface ViolationListener { - public void onViolation(String message); + public interface ViolationLogger { + + /** Called when penaltyLog is enabled and a violation needs logging. */ + void log(ViolationInfo info); } - private static volatile ViolationListener sListener; + private static final ViolationLogger LOGCAT_LOGGER = + info -> { + String msg; + if (info.durationMillis != -1) { + msg = "StrictMode policy violation; ~duration=" + info.durationMillis + " ms:"; + } else { + msg = "StrictMode policy violation:"; + } + if (info.crashInfo != null) { + Log.d(TAG, msg + " " + info.crashInfo.stackTrace); + } else { + Log.d(TAG, msg + " missing stack trace!"); + } + }; + + private static volatile ViolationLogger sLogger = LOGCAT_LOGGER; /** {@hide} */ @TestApi - public static void setViolationListener(ViolationListener listener) { - sListener = listener; + public static void setViolationLogger(ViolationLogger listener) { + if (listener == null) { + listener = LOGCAT_LOGGER; + } + sLogger = listener; } /** @@ -1512,28 +1533,16 @@ public final class StrictMode { lastViolationTime = vtime; } } else { - mLastViolationTime = new ArrayMap<Integer, Long>(1); + mLastViolationTime = new ArrayMap<>(1); } long now = SystemClock.uptimeMillis(); mLastViolationTime.put(crashFingerprint, now); long timeSinceLastViolationMillis = lastViolationTime == 0 ? Long.MAX_VALUE : (now - lastViolationTime); - if ((info.policy & PENALTY_LOG) != 0 && sListener != null) { - sListener.onViolation(info.crashInfo.stackTrace); - } if ((info.policy & PENALTY_LOG) != 0 && timeSinceLastViolationMillis > MIN_LOG_INTERVAL_MS) { - if (info.durationMillis != -1) { - Log.d( - TAG, - "StrictMode policy violation; ~duration=" - + info.durationMillis - + " ms: " - + info.crashInfo.stackTrace); - } else { - Log.d(TAG, "StrictMode policy violation: " + info.crashInfo.stackTrace); - } + sLogger.log(info); } // The violationMaskSubset, passed to ActivityManager, is a @@ -1925,11 +1934,11 @@ public final class StrictMode { } } - if (penaltyLog && sListener != null) { - sListener.onViolation(originStack.toString()); + if (penaltyLog && sLogger != null) { + sLogger.log(info); } if (penaltyLog && timeSinceLastViolationMillis > MIN_LOG_INTERVAL_MS) { - Log.e(TAG, message, originStack); + sLogger.log(info); } int violationMaskSubset = PENALTY_DROPBOX | (ALL_VM_DETECT_BITS & sVmPolicy.mask); @@ -2339,11 +2348,12 @@ public final class StrictMode { * * @hide */ - public static class ViolationInfo implements Parcelable { + @TestApi + public static final class ViolationInfo implements Parcelable { public final String message; /** Stack and other stuff info. */ - public final ApplicationErrorReport.CrashInfo crashInfo; + @Nullable public final ApplicationErrorReport.CrashInfo crashInfo; /** The strict mode policy mask at the time of violation. */ public final int policy; diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 2c1f73468ca6..ddced6cdd83f 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -762,7 +762,7 @@ public class Surface implements Parcelable { return "ROTATION_270"; } default: { - throw new IllegalArgumentException("Invalid rotation: " + rotation); + return Integer.toString(rotation); } } } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index e5bd5ac076f3..1556297a4cec 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -127,6 +127,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -1078,6 +1079,29 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * <a href="#attr_android:autofillHint"> {@code android:autofillHint}</a> (in which case the * value should be <code>{@value #AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE}</code>). * + * <p>When annotating a view with this hint, it's recommended to use a date autofill value to + * avoid ambiguity when the autofill service provides a value for it. To understand why a + * value can be ambiguous, consider "April of 2020", which could be represented as either of + * the following options: + * + * <ul> + * <li>{@code "04/2020"} + * <li>{@code "4/2020"} + * <li>{@code "2020/04"} + * <li>{@code "2020/4"} + * <li>{@code "April/2020"} + * <li>{@code "Apr/2020"} + * </ul> + * + * <p>You define a date autofill value for the view by overriding the following methods: + * + * <ol> + * <li>{@link #getAutofillType()} to return {@link #AUTOFILL_TYPE_DATE}. + * <li>{@link #getAutofillValue()} to return a + * {@link AutofillValue#forDate(long) date autofillvalue}. + * <li>{@link #autofill(AutofillValue)} to expect a data autofillvalue. + * </ol> + * * <p>See {@link #setAutofillHints(String...)} for more info about autofill hints. */ public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE = @@ -1090,6 +1114,22 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * <a href="#attr_android:autofillHint"> {@code android:autofillHint}</a> (in which case the * value should be <code>{@value #AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH}</code>). * + * <p>When annotating a view with this hint, it's recommended to use a text autofill value + * whose value is the numerical representation of the month, starting on {@code 1} to avoid + * ambiguity when the autofill service provides a value for it. To understand why a + * value can be ambiguous, consider "January", which could be represented as either of + * + * <ul> + * <li>{@code "1"}: recommended way. + * <li>{@code "0"}: if following the {@link Calendar#MONTH} convention. + * <li>{@code "January"}: full name, in English. + * <li>{@code "jan"}: abbreviated name, in English. + * <li>{@code "Janeiro"}: full name, in another language. + * </ul> + * + * <p>Another recommended approach is to use a date autofill value - see + * {@link #AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE} for more details. + * * <p>See {@link #setAutofillHints(String...)} for more info about autofill hints. */ public static final String AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH = diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index 66506a18296b..4131fd1ae9ff 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -617,6 +617,38 @@ public interface WindowManagerPolicy { * @param listener callback to call when display can be turned off */ void screenTurningOff(ScreenOffListener listener); + + /** + * Convert the lid state to a human readable format. + */ + static String lidStateToString(int lid) { + switch (lid) { + case LID_ABSENT: + return "LID_ABSENT"; + case LID_CLOSED: + return "LID_CLOSED"; + case LID_OPEN: + return "LID_OPEN"; + default: + return Integer.toString(lid); + } + } + + /** + * Convert the camera lens state to a human readable format. + */ + static String cameraLensStateToString(int lens) { + switch (lens) { + case CAMERA_LENS_COVER_ABSENT: + return "CAMERA_LENS_COVER_ABSENT"; + case CAMERA_LENS_UNCOVERED: + return "CAMERA_LENS_UNCOVERED"; + case CAMERA_LENS_COVERED: + return "CAMERA_LENS_COVERED"; + default: + return Integer.toString(lens); + } + } } public interface PointerEventListener { @@ -1750,4 +1782,34 @@ public interface WindowManagerPolicy { * @return true if ready; false otherwise. */ boolean canDismissBootAnimation(); + + /** + * Convert the user rotation mode to a human readable format. + */ + static String userRotationModeToString(int mode) { + switch(mode) { + case USER_ROTATION_FREE: + return "USER_ROTATION_FREE"; + case USER_ROTATION_LOCKED: + return "USER_ROTATION_LOCKED"; + default: + return Integer.toString(mode); + } + } + + /** + * Convert the off reason to a human readable format. + */ + static String offReasonToString(int why) { + switch (why) { + case OFF_BECAUSE_OF_ADMIN: + return "OFF_BECAUSE_OF_ADMIN"; + case OFF_BECAUSE_OF_USER: + return "OFF_BECAUSE_OF_USER"; + case OFF_BECAUSE_OF_TIMEOUT: + return "OFF_BECAUSE_OF_TIMEOUT"; + default: + return Integer.toString(why); + } + } } diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 61cbce976844..27eeb2e67fb7 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -44,7 +44,7 @@ import android.view.View; import com.android.internal.annotations.GuardedBy; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.io.PrintWriter; import java.lang.annotation.Retention; @@ -1245,10 +1245,10 @@ public final class AutofillManager { } } - final LogMaker log = new LogMaker(MetricsProto.MetricsEvent.AUTOFILL_DATASET_APPLIED); - log.addTaggedData(MetricsProto.MetricsEvent.FIELD_AUTOFILL_NUM_VALUES, itemCount); - log.addTaggedData(MetricsProto.MetricsEvent.FIELD_AUTOFILL_NUM_VIEWS_FILLED, - numApplied); + final LogMaker log = new LogMaker(MetricsEvent.AUTOFILL_DATASET_APPLIED) + .setPackageName(mContext.getPackageName()) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_NUM_VALUES, itemCount) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_NUM_VIEWS_FILLED, numApplied); mMetricsLogger.write(log); } } diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 419b7b24fddb..3a4bfd686333 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2718,25 +2718,20 @@ public class WebView extends AbsoluteLayout * {@code IFRAME}, in which case it would be treated the same way as multiple forms described * above, except that the {@link ViewStructure#setWebDomain(String) web domain} of the * {@code FORM} contains the {@code src} attribute from the {@code IFRAME} node. - * <li>If the Android SDK provides a similar View, then should be set with the - * fully-qualified class name of such view. * <li>The W3C autofill field ({@code autocomplete} tag attribute) maps to - * {@link ViewStructure#setAutofillHints(String[])}. - * <li>The {@code type} attribute of {@code INPUT} tags maps to - * {@link ViewStructure#setInputType(int)}. - * <li>The {@code value} attribute of {@code INPUT} tags maps to - * {@link ViewStructure#setText(CharSequence)}. - * <li>If the view is editalbe, the {@link ViewStructure#setAutofillType(int)} and + * {@link ViewStructure#setAutofillHints(String[])}. + * <li>If the view is editable, the {@link ViewStructure#setAutofillType(int)} and * {@link ViewStructure#setAutofillValue(AutofillValue)} must be set. * <li>The {@code placeholder} attribute maps to {@link ViewStructure#setHint(CharSequence)}. * <li>Other HTML attributes can be represented through * {@link ViewStructure#setHtmlInfo(android.view.ViewStructure.HtmlInfo)}. * </ol> * - * <p>It should also call {@code structure.setDataIsSensitive(false)} for fields whose value - * were not dynamically changed (for example, through Javascript). + * <p>If the WebView implementation can determine that the value of a field was set statically + * (for example, not through Javascript), it should also call + * {@code structure.setDataIsSensitive(false)}. * - * <p>Example1: an HTML form with 2 fields for username and password. + * <p>For example, an HTML form with 2 fields for username and password: * * <pre class="prettyprint"> * <input type="text" name="username" id="user" value="Type your username" autocomplete="username" placeholder="Email or username"> @@ -2749,51 +2744,27 @@ public class WebView extends AbsoluteLayout * int index = structure.addChildCount(2); * ViewStructure username = structure.newChild(index); * username.setAutofillId(structure.getAutofillId(), 1); // id 1 - first child - * username.setClassName("input"); - * username.setInputType("android.widget.EditText"); * username.setAutofillHints("username"); * username.setHtmlInfo(username.newHtmlInfoBuilder("input") * .addAttribute("type", "text") * .addAttribute("name", "username") - * .addAttribute("id", "user") * .build()); * username.setHint("Email or username"); * username.setAutofillType(View.AUTOFILL_TYPE_TEXT); * username.setAutofillValue(AutofillValue.forText("Type your username")); - * username.setText("Type your username"); - * // Value of the field is not sensitive because it was not dynamically changed: + * // Value of the field is not sensitive because it was created statically and not changed. * username.setDataIsSensitive(false); * * ViewStructure password = structure.newChild(index + 1); * username.setAutofillId(structure, 2); // id 2 - second child - * password.setInputType("android.widget.EditText"); - * password.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD); * password.setAutofillHints("current-password"); * password.setHtmlInfo(password.newHtmlInfoBuilder("input") * .addAttribute("type", "password") * .addAttribute("name", "password") - * .addAttribute("id", "pass") * .build()); * password.setHint("Password"); * password.setAutofillType(View.AUTOFILL_TYPE_TEXT); * </pre> - * - * <p>Example2: an IFRAME tag. - * - * <pre class="prettyprint"> - * <iframe src="https://example.com/login"/> - * </pre> - * - * <p>Would map to: - * - * <pre class="prettyprint"> - * int index = structure.addChildCount(1); - * ViewStructure iframe = structure.newChildFor(index); - * iframe.setAutofillId(structure.getAutofillId(), 1); - * iframe.setHtmlInfo(iframe.newHtmlInfoBuilder("iframe") - * .addAttribute("src", "https://example.com/login") - * .build()); - * </pre> */ @Override public void onProvideAutofillVirtualStructure(ViewStructure structure, int flags) { diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index efcc3a2f7a2b..2de552777756 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -5549,7 +5549,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener public final void setHint(CharSequence hint) { setHintInternal(hint); - if (isInputMethodTarget()) { + if (mEditor != null && isInputMethodTarget()) { mEditor.reportExtractedText(); } } diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index 5ee0918c336a..cbc63cf813cb 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -49,6 +49,11 @@ public final class Zygote { /** Make the code Java debuggable by turning off some optimizations. */ public static final int DEBUG_JAVA_DEBUGGABLE = 1 << 8; + /** Turn off the verifier. */ + public static final int DISABLE_VERIFIER = 1 << 9; + /** Only use oat files located in /system. Otherwise use dex/jar/apk . */ + public static final int ONLY_USE_SYSTEM_OAT_FILES = 1 << 10; + /** No external storage should be mounted. */ public static final int MOUNT_EXTERNAL_NONE = IVold.REMOUNT_MODE_NONE; /** Default external storage should be mounted. */ diff --git a/core/proto/android/app/window_configuration.proto b/core/proto/android/app/window_configuration.proto new file mode 100644 index 000000000000..03910df09194 --- /dev/null +++ b/core/proto/android/app/window_configuration.proto @@ -0,0 +1,31 @@ +/* + * 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. + */ + +syntax = "proto3"; + +option java_package = "android.app"; +option java_multiple_files = true; + +package android.app; + +import "frameworks/base/core/proto/android/graphics/rect.proto"; + +/** Proto representation for WindowConfiguration.java class. */ +message WindowConfigurationProto { + .android.graphics.RectProto app_bounds = 1; + int32 windowing_mode = 2; + int32 activity_type = 3; +} diff --git a/core/proto/android/content/configuration.proto b/core/proto/android/content/configuration.proto index f46b73afa750..804e0b489c0d 100644 --- a/core/proto/android/content/configuration.proto +++ b/core/proto/android/content/configuration.proto @@ -21,6 +21,7 @@ option java_multiple_files = true; package android.content; +import "frameworks/base/core/proto/android/app/window_configuration.proto"; import "frameworks/base/core/proto/android/content/locale.proto"; /** @@ -43,5 +44,6 @@ message ConfigurationProto { uint32 screen_height_dp = 14; uint32 smallest_screen_width_dp = 15; uint32 density_dpi = 16; + .android.app.WindowConfigurationProto window_configuration = 17; } diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index ee8a6dc452b7..d177f1ca8104 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -16,6 +16,7 @@ syntax = "proto3"; +import "frameworks/base/core/proto/android/content/configuration.proto"; import "frameworks/base/core/proto/android/graphics/rect.proto"; import "frameworks/base/core/proto/android/view/displayinfo.proto"; import "frameworks/base/core/proto/android/view/windowlayoutparams.proto"; @@ -26,17 +27,23 @@ option java_multiple_files = true; message WindowManagerServiceProto { WindowManagerPolicyProto policy = 1; - /* window manager hierarchy structure */ + /* window hierarchy root */ + RootWindowContainerProto root_window_container = 2; + IdentifierProto focused_window = 3; + string focused_app = 4; + IdentifierProto input_method_window = 5; + bool display_frozen = 6; + int32 rotation = 7; + int32 last_orientation = 8; + AppTransitionProto app_transition = 9; +} + +/* represents DisplayContent */ +message RootWindowContainerProto { + WindowContainerProto window_container = 1; repeated DisplayProto displays = 2; /* window references in top down z order */ repeated IdentifierProto windows = 3; - IdentifierProto focused_window = 4; - string focused_app = 5; - IdentifierProto input_method_window = 6; - bool display_frozen = 7; - int32 rotation = 8; - int32 last_orientation = 9; - AppTransitionProto app_transition = 10; } /* represents PhoneWindowManager */ @@ -81,18 +88,19 @@ message AppTransitionProto { /* represents DisplayContent */ message DisplayProto { - int32 id = 1; - repeated StackProto stacks = 2; - DockedStackDividerControllerProto docked_stack_divider_controller = 3; - PinnedStackControllerProto pinned_stack_controller = 4; + WindowContainerProto window_container = 1; + int32 id = 2; + repeated StackProto stacks = 3; + DockedStackDividerControllerProto docked_stack_divider_controller = 4; + PinnedStackControllerProto pinned_stack_controller = 5; /* non app windows */ - repeated WindowTokenProto above_app_windows = 5; - repeated WindowTokenProto below_app_windows = 6; - repeated WindowTokenProto ime_windows = 7; - int32 dpi = 8; - .android.view.DisplayInfoProto display_info = 9; - int32 rotation = 10; - ScreenRotationAnimationProto screen_rotation_animation = 11; + repeated WindowTokenProto above_app_windows = 6; + repeated WindowTokenProto below_app_windows = 7; + repeated WindowTokenProto ime_windows = 8; + int32 dpi = 9; + .android.view.DisplayInfoProto display_info = 10; + int32 rotation = 11; + ScreenRotationAnimationProto screen_rotation_animation = 12; } @@ -109,20 +117,22 @@ message PinnedStackControllerProto { /* represents TaskStack */ message StackProto { - int32 id = 1; - repeated TaskProto tasks = 2; - bool fills_parent = 3; - .android.graphics.RectProto bounds = 4; - bool animation_background_surface_is_dimming = 5; + WindowContainerProto window_container = 1; + int32 id = 2; + repeated TaskProto tasks = 3; + bool fills_parent = 4; + .android.graphics.RectProto bounds = 5; + bool animation_background_surface_is_dimming = 6; } /* represents Task */ message TaskProto { - int32 id = 1; - repeated AppWindowTokenProto app_window_tokens = 2; - bool fills_parent = 3; - .android.graphics.RectProto bounds = 4; - .android.graphics.RectProto temp_inset_bounds = 5; + WindowContainerProto window_container = 1; + int32 id = 2; + repeated AppWindowTokenProto app_window_tokens = 3; + bool fills_parent = 4; + .android.graphics.RectProto bounds = 5; + .android.graphics.RectProto temp_inset_bounds = 6; } /* represents AppWindowToken */ @@ -134,26 +144,28 @@ message AppWindowTokenProto { /* represents WindowToken */ message WindowTokenProto { - int32 hash_code = 1; - repeated WindowStateProto windows = 2; + WindowContainerProto window_container = 1; + int32 hash_code = 2; + repeated WindowStateProto windows = 3; } /* represents WindowState */ message WindowStateProto { - IdentifierProto identifier = 1; - int32 display_id = 2; - int32 stack_id = 3; - .android.view.WindowLayoutParamsProto attributes = 4; - .android.graphics.RectProto given_content_insets = 5; - .android.graphics.RectProto frame = 6; - .android.graphics.RectProto containing_frame = 7; - .android.graphics.RectProto parent_frame = 8; - .android.graphics.RectProto content_frame = 9; - .android.graphics.RectProto content_insets = 10; - .android.graphics.RectProto surface_insets = 11; - WindowStateAnimatorProto animator = 12; - bool animating_exit = 13; - repeated WindowStateProto child_windows = 14; + WindowContainerProto window_container = 1; + IdentifierProto identifier = 2; + int32 display_id = 3; + int32 stack_id = 4; + .android.view.WindowLayoutParamsProto attributes = 5; + .android.graphics.RectProto given_content_insets = 6; + .android.graphics.RectProto frame = 7; + .android.graphics.RectProto containing_frame = 8; + .android.graphics.RectProto parent_frame = 9; + .android.graphics.RectProto content_frame = 10; + .android.graphics.RectProto content_insets = 11; + .android.graphics.RectProto surface_insets = 12; + WindowStateAnimatorProto animator = 13; + bool animating_exit = 14; + repeated WindowStateProto child_windows = 15; } message IdentifierProto { @@ -178,4 +190,17 @@ message WindowSurfaceControllerProto { message ScreenRotationAnimationProto { bool started = 1; bool animation_running = 2; -}
\ No newline at end of file +} + +/* represents WindowContainer */ +message WindowContainerProto { + ConfigurationContainerProto configuration_container = 1; + int32 orientation = 2; +} + +/* represents ConfigurationContainer */ +message ConfigurationContainerProto { + .android.content.ConfigurationProto override_configuration = 1; + .android.content.ConfigurationProto full_configuration = 2; + .android.content.ConfigurationProto merged_override_configuration = 3; +} diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 8122eb7de9b9..aa94e0ff19e6 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3910,6 +3910,9 @@ android:permission="android.permission.BIND_JOB_SERVICE" > </service> + <service android:name="com.android.server.timezone.TimeZoneUpdateIdler" + android:permission="android.permission.BIND_JOB_SERVICE" > + </service> </application> </manifest> diff --git a/core/res/res/layout/autofill_save.xml b/core/res/res/layout/autofill_save.xml index 92419c8c525b..5c5b985b26a2 100644 --- a/core/res/res/layout/autofill_save.xml +++ b/core/res/res/layout/autofill_save.xml @@ -46,13 +46,14 @@ <ImageView android:id="@+id/autofill_save_icon" - android:layout_width="wrap_content" - android:layout_height="24sp"/> + android:scaleType="fitStart" + android:layout_width="24dp" + android:layout_height="24dp"/> <TextView android:id="@+id/autofill_save_title" android:paddingLeft="8dp" - android:layout_width="0dp" + android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/autofill_save_title" android:textSize="16sp" diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 28e1fe19f06f..d3ba7ef5e25e 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Instellings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Help"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Stembystand"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Snelsluit"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nuwe kennisgewing"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuele sleutelbord"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index dc5222e8096a..a3c2cab5f78d 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ቅንብሮች"</string> <string name="global_action_assist" msgid="3892832961594295030">"ደግፍ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"የድምጽ እርዳታ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ወደ ቁልፎ ማሰር ይግቡ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"አዲስ ማሳወቂያ"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ምናባዊ የቁልፍ ሰሌዳ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 7c5822ae925b..5ff51f2d1df6 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -242,8 +242,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"الإعدادات"</string> <string name="global_action_assist" msgid="3892832961594295030">"مساعدة"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"المساعد الصوتي"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"تفعيل الإغلاق"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"إشعار جديد"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"لوحة المفاتيح الافتراضية"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index c907446a1ba9..bd63c27c22b3 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ayarlar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Yardım"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Səs Yardımçısı"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kilid əlavə edin"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Yeni bildiriş"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual klaviatura"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 38b7b90410d1..e362a87d959b 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Podešavanja"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoć"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Zaključaj"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Novo obaveštenje"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelna tastatura"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 4db9d4d39a97..fdbe702666d6 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Налады"</string> <string name="global_action_assist" msgid="3892832961594295030">"Дапамога"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Галас. дапамога"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Увесці блакіроўку"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Новае апавяшчэнне"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Віртуальная клавіятура"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 36829048ed6e..ae4cc61488e3 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Настройки"</string> <string name="global_action_assist" msgid="3892832961594295030">"Помощ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласова помощ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Въведете заключване"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ново известие"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуална клавиатура"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index ec15c48b8eed..e3ecfda94c32 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"সেটিংস"</string> <string name="global_action_assist" msgid="3892832961594295030">"সহযোগিতা"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ভয়েস সহায়তা"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"লকডাউন লিখুন"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"৯৯৯+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"নতুন বিজ্ঞপ্তি"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ভার্চুয়াল কীবোর্ড"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index ba0f952fb33e..232a4e17df0b 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Postavke"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoć"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Unesite blokadu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Novo obavještenje"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelna tastatura"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index d79eae1dd75b..d713c1b00731 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configuració"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistència"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. per veu"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Bloqueja"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"+999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificació nova"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclat virtual"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index c907236620f5..31e7487771c9 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Nastavení"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistence"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Hlas. asistence"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Zamknout"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nové oznámení"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuální klávesnice"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index f3a34ef580b8..f1ba1740ca7e 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Indstillinger"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistance"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Taleassistent"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Aktivér lukning"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ny underretning"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelt tastatur"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index d387035645b6..cc510d78f591 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Einstellungen"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistent"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Sprachassistent"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Sperren"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Neue Benachrichtigung"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Bildschirmtastatur"</string> @@ -1095,7 +1094,7 @@ <string name="ringtone_picker_title_notification" msgid="4837740874822788802">"Benachrichtigungstöne"</string> <string name="ringtone_unknown" msgid="3914515995813061520">"Unbekannt"</string> <plurals name="wifi_available" formatted="false" msgid="7900333017752027322"> - <item quantity="other">WLANe verfügbar</item> + <item quantity="other">WLANs verfügbar</item> <item quantity="one">WLAN verfügbar</item> </plurals> <plurals name="wifi_available_detailed" formatted="false" msgid="1140699367193975606"> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index ed81487ed526..ede305cdb7bd 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ρυθμίσεις"</string> <string name="global_action_assist" msgid="3892832961594295030">"Βοήθεια"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Φων.υποβοηθ."</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Εισαγ. κλειδώμ."</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Νέα ειδοποίηση"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Εικονικό πληκτρολόγιο"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index b0ac9df4cfec..fa7f1801a147 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index b0ac9df4cfec..fa7f1801a147 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index b0ac9df4cfec..fa7f1801a147 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index b0ac9df4cfec..fa7f1801a147 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml index 03210c93613e..353b437fb2c4 100644 --- a/core/res/res/values-en-rXC/strings.xml +++ b/core/res/res/values-en-rXC/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Enter lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 3ed9a2a747b2..4a7a191ea870 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configuración"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistencia"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Ingresa bloqueo"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificación nueva"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 06a666901534..425e9884dd12 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ajustes"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistencia"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Activar bloqueo"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"> 999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificación nueva"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 3d703fee28cd..7c57dafdd20e 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Seaded"</string> <string name="global_action_assist" msgid="3892832961594295030">"Abi"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Häälabi"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kasuta lukust."</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Uus märguanne"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuaalne klaviatuur"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 69a8e67f385e..5556a5d44f18 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ezarpenak"</string> <string name="global_action_assist" msgid="3892832961594295030">"Lagundu"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ahots-laguntza"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Sartu blokeo moduan"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Jakinarazpen berria"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teklatu birtuala"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 7a0d81774a10..bb9635a85300 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"تنظیمات"</string> <string name="global_action_assist" msgid="3892832961594295030">"دستیار"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"دستیار صوتی"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"قفل همه را وارد کنید"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"۹۹۹+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"اعلان جدید"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"صفحهکلید مجازی"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index d586760c81c9..a32db2cfcb93 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Asetukset"</string> <string name="global_action_assist" msgid="3892832961594295030">"Auta"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ääniapuri"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Lukitse"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Uusi ilmoitus"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuaalinen näppäimistö"</string> @@ -1427,7 +1426,7 @@ <string name="default_audio_route_category_name" msgid="3722811174003886946">"Järjestelmä"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-ääni"</string> <string name="wireless_display_route_description" msgid="9070346425023979651">"Langaton näyttö"</string> - <string name="media_route_button_content_description" msgid="591703006349356016">"Lähetä"</string> + <string name="media_route_button_content_description" msgid="591703006349356016">"Suoratoisto"</string> <string name="media_route_chooser_title" msgid="1751618554539087622">"Yhdistä laitteeseen"</string> <string name="media_route_chooser_title_for_remote_display" msgid="3395541745872017583">"Lähetä näyttö laitteeseen"</string> <string name="media_route_chooser_searching" msgid="4776236202610828706">"Etsitään laitteita…"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 5ff39ab47b67..8fe60e3fe483 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Paramètres"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistance"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. vocale"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Entrez verrou."</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nouvelle notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Clavier virtuel"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 0482d3ad0606..52d482482625 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Paramètres"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistance"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Assistance vocale"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Verrouiller"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nouvelle notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Clavier virtuel"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index 54f00c5204b4..9a3a83f81fbb 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configuración"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistencia"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistente voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Activar bloqueo"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificación nova"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 464f832cddd0..ec8023647fbe 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"સેટિંગ્સ"</string> <string name="global_action_assist" msgid="3892832961594295030">"સહાય"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"વૉઇસ સહાય"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"લોકડાઉન દાખલ કરો"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"નવું નોટિફિકેશન"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"વર્ચ્યુઅલ કીબોર્ડ"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 3fb8cadc63e2..217d106cb028 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"सेटिंग"</string> <string name="global_action_assist" msgid="3892832961594295030">"सहायता"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"आवाज़ से डिवाइस का इस्तेमाल"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"लॉकडाउन डालें"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"नई सूचना"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"वर्चुअल कीबोर्ड"</string> @@ -1163,7 +1162,7 @@ <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"कभी भी अनुमति न दें"</string> <string name="sim_removed_title" msgid="6227712319223226185">"सिमकार्ड निकाला गया"</string> <string name="sim_removed_message" msgid="2333164559970958645">"मान्य सिम कार्ड डालकर पुन: प्रारंभ करने तक मोबाइल नेटवर्क अनुपलब्ध रहेगा."</string> - <string name="sim_done_button" msgid="827949989369963775">"पूर्ण"</string> + <string name="sim_done_button" msgid="827949989369963775">"हो गया"</string> <string name="sim_added_title" msgid="3719670512889674693">"सिम कार्ड जोड़ा गया"</string> <string name="sim_added_message" msgid="6599945301141050216">"मोबाइल नेटवर्क की पहुंच पाने लिए अपना डिवाइस फिर से चालू करें."</string> <string name="sim_restart_button" msgid="4722407842815232347">"फिर से शुरू करें"</string> @@ -1175,7 +1174,7 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"समय सेट करें"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"तारीख सेट करें"</string> <string name="date_time_set" msgid="5777075614321087758">"सेट करें"</string> - <string name="date_time_done" msgid="2507683751759308828">"पूर्ण"</string> + <string name="date_time_done" msgid="2507683751759308828">"हो गया"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"नया: "</font></string> <string name="perms_description_app" msgid="5139836143293299417">"<xliff:g id="APP_NAME">%1$s</xliff:g> द्वारा प्रदत्त."</string> <string name="no_permissions" msgid="7283357728219338112">"किसी अनुमति की आवश्यकता नहीं है"</string> @@ -1187,7 +1186,7 @@ <string name="usb_ptp_notification_title" msgid="1347328437083192112">"फ़ोटो स्थानांतरण के लिए USB"</string> <string name="usb_midi_notification_title" msgid="4850904915889144654">"MIDI के लिए USB"</string> <string name="usb_accessory_notification_title" msgid="7848236974087653666">"USB सहायक सामग्री से कनेक्ट किया गया"</string> - <string name="usb_notification_message" msgid="3370903770828407960">"अधिक विकल्पों के लिए टैप करें."</string> + <string name="usb_notification_message" msgid="3370903770828407960">"ज़्यादा विकल्पों के लिए टैप करें."</string> <string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"एनालॉग ऑडियो एक्सेसरी का पता चला"</string> <string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"अटैच किया गया डिवाइस इस फ़ोन से संगत नहीं है. अधिक जानने के लिए टैप करें."</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB डीबग कनेक्ट किया गया"</string> @@ -1266,7 +1265,7 @@ <string name="ime_action_search" msgid="658110271822807811">"सर्च करें"</string> <string name="ime_action_send" msgid="2316166556349314424">"भेजें"</string> <string name="ime_action_next" msgid="3138843904009813834">"आगे"</string> - <string name="ime_action_done" msgid="8971516117910934605">"पूर्ण"</string> + <string name="ime_action_done" msgid="8971516117910934605">"हो गया"</string> <string name="ime_action_previous" msgid="1443550039250105948">"पीछे जाएं"</string> <string name="ime_action_default" msgid="2840921885558045721">"निष्पादित करें"</string> <string name="dial_number_using" msgid="5789176425167573586">"<xliff:g id="NUMBER">%s</xliff:g> के उपयोग द्वारा \n नंबर डायल करें"</string> @@ -1310,14 +1309,14 @@ <string name="disable_tether_notification_message" msgid="2913366428516852495">"जानकारी के लिए अपने एडमिन से संपर्क करें"</string> <string name="back_button_label" msgid="2300470004503343439">"वापस जाएं"</string> <string name="next_button_label" msgid="1080555104677992408">"आगे"</string> - <string name="skip_button_label" msgid="1275362299471631819">"रद्द करें"</string> + <string name="skip_button_label" msgid="1275362299471631819">"अभी नहीं"</string> <string name="no_matches" msgid="8129421908915840737">"कोई मिलान नहीं"</string> <string name="find_on_page" msgid="1946799233822820384">"पेज पर ढूंढें"</string> <plurals name="matches_found" formatted="false" msgid="1210884353962081884"> <item quantity="one"><xliff:g id="TOTAL">%d</xliff:g> में से <xliff:g id="INDEX">%d</xliff:g></item> <item quantity="other"><xliff:g id="TOTAL">%d</xliff:g> में से <xliff:g id="INDEX">%d</xliff:g></item> </plurals> - <string name="action_mode_done" msgid="7217581640461922289">"पूर्ण"</string> + <string name="action_mode_done" msgid="7217581640461922289">"हो गया"</string> <string name="progress_erasing" product="nosdcard" msgid="4521573321524340058">"USB मेमोरी मिटाया जा रहा है…"</string> <string name="progress_erasing" product="default" msgid="6596988875507043042">"SD कार्ड मिटाया जा रहा है…"</string> <string name="share" msgid="1778686618230011964">"साझा करें"</string> @@ -1359,7 +1358,7 @@ <string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string> <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"रद्द करें"</string> <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"मिटाएं"</string> - <string name="keyboardview_keycode_done" msgid="1992571118466679775">"पूर्ण"</string> + <string name="keyboardview_keycode_done" msgid="1992571118466679775">"हो गया"</string> <string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"Mode change"</string> <string name="keyboardview_keycode_shift" msgid="2270748814315147690">"Shift"</string> <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enter"</string> @@ -1495,7 +1494,7 @@ <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"सुलभता शॉर्टकट ने <xliff:g id="SERVICE_NAME">%1$s</xliff:g> को बंद किया"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"सुलभता बटन पर टैप करते समय इस्तेमाल की जाने वाली सुविधा चुनें:"</string> <string name="accessibility_button_instructional_text" msgid="6942300463612999993">"सुविधाओं में बदलाव करने के लिए, सुलभता बटन को दबाकर रखें."</string> - <string name="accessibility_magnification_chooser_text" msgid="1227146738764986237">"आवर्धन"</string> + <string name="accessibility_magnification_chooser_text" msgid="1227146738764986237">"बड़ा करें"</string> <string name="user_switched" msgid="3768006783166984410">"मौजूदा उपयोगकर्ता <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> पर स्विच किया जा रहा है…"</string> <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> द्वारा प्रस्थान किया जा रहा है…"</string> @@ -1610,7 +1609,7 @@ <string name="immersive_cling_title" msgid="8394201622932303336">"पूरे स्क्रीन पर देखें"</string> <string name="immersive_cling_description" msgid="3482371193207536040">"बाहर निकलने के लिए, ऊपर से नीचे स्वाइप करें."</string> <string name="immersive_cling_positive" msgid="5016839404568297683">"ठीक है"</string> - <string name="done_label" msgid="2093726099505892398">"पूर्ण"</string> + <string name="done_label" msgid="2093726099505892398">"हो गया"</string> <string name="hour_picker_description" msgid="6698199186859736512">"घंटो का चक्राकार स्लाइडर"</string> <string name="minute_picker_description" msgid="8606010966873791190">"मिनटों का चक्राकार स्लाइडर"</string> <string name="select_hours" msgid="6043079511766008245">"घंटे चुनें"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 9029f1fae25c..60a0cc2f5085 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Postavke"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoć"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Glasovna pomoć"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Zaključaj"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nova obavijest"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtualna tipkovnica"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 2fa26281506f..3c40d569cd0d 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Beállítások"</string> <string name="global_action_assist" msgid="3892832961594295030">"Segítség"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Hangsegéd"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Zár megadása"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Új értesítés"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuális billentyűzet"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 2b78c71e250b..190b2d5ea753 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Կարգավորումներ"</string> <string name="global_action_assist" msgid="3892832961594295030">"Օգնական"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ձայնային օգնութ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Արգելափակել"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Նոր ծանուցում"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Վիրտուալ ստեղնաշար"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 5d41c13fd64a..b6a8aa28fbd9 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Setelan"</string> <string name="global_action_assist" msgid="3892832961594295030">"Bantuan"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kunci total"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notifikasi baru"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Keyboard virtual"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 7add51d1c3f8..8cc5f97ab7c4 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Stillingar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Aðstoð"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Raddaðstoð"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Virkja læsingu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ný tilkynning"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Sýndarlyklaborð"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index fdab6dc2f6e7..611a9a1a6454 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Impostazioni"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistenza"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Inser. blocco"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nuova notifica"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastiera virtuale"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 3d60b4211bff..40aeba43a426 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"הגדרות"</string> <string name="global_action_assist" msgid="3892832961594295030">"סיוע"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"נעילת חירום"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"הודעה חדשה"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"מקלדת וירטואלית"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 83426add9405..aa86db3accac 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"設定"</string> <string name="global_action_assist" msgid="3892832961594295030">"サポート"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"音声アシスト"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ロックダウンを入力"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"新しい通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"仮想キーボード"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 173c16b9c86c..ea993378e5ed 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"პარამეტრები"</string> <string name="global_action_assist" msgid="3892832961594295030">"დახმარება"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ხმოვანი ასისტ."</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"დაბლოკვა"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ახალი შეტყობინება"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ვირტუალური კლავიატურა"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 288b72e4871c..d02dc0e4f69a 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Параметрлер"</string> <string name="global_action_assist" msgid="3892832961594295030">"Көмек"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Дауыс көмекшісі"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Құлыптауды енгізу"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Жаңа хабарландыру"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуалды пернетақта"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index ab23b009e1a8..38ee22f1e248 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ការកំណត់"</string> <string name="global_action_assist" msgid="3892832961594295030">"ជំនួយ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ជំនួយសម្លេង"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"បញ្ជូលការចាក់សោជាប់"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ការជូនដំណឹងថ្មី"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ក្ដារចុចនិម្មិត"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 352f57a87ec8..5116c5d0810d 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="global_action_assist" msgid="3892832961594295030">"ಸಹಾಯ ಮಾಡು"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ಧ್ವನಿ ಸಹಾಯಕ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ಲಾಕ್ಡೌನ್"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ಹೊಸ ಅಧಿಸೂಚನೆ"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ವರ್ಚುಯಲ್ ಕೀಬೋರ್ಡ್"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index c9fdc465952d..722b25156f0c 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"설정"</string> <string name="global_action_assist" msgid="3892832961594295030">"지원"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"음성 지원"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"잠금 설정"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"새 알림"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"가상 키보드"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 681df65e489a..9cf927e1ddc7 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Жөндөөлөр"</string> <string name="global_action_assist" msgid="3892832961594295030">"Жардам"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Үн жардамчысы"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Кулпуну иштетүү"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Жаңы эскертме"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуалдык баскычтоп"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index ade01c27d82f..27601af1f8a6 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ການຕັ້ງຄ່າ"</string> <string name="global_action_assist" msgid="3892832961594295030">"ຕົວຊ່ວຍ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ຊ່ວຍເຫຼືອທາງສຽງ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ລະບຸການລັອກ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ການແຈ້ງເຕືອນໃໝ່"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ແປ້ນພິມສະເໝືອນ"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index e7fc04e7350f..9e807b03ebe5 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Nustatymai"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pagalba"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Užrakinti"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Naujas pranešimas"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtualioji klaviatūra"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 6159e1f27aca..5058d43d6393 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Iestatījumi"</string> <string name="global_action_assist" msgid="3892832961594295030">"Palīdzība"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Balss palīgs"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Iest. bloķēšanu"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"Pārsniedz"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Jauns paziņojums"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuālā tastatūra"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index b06f45e258ac..ef5430c3a35d 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Поставки"</string> <string name="global_action_assist" msgid="3892832961594295030">"Асистенција"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помош"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Заклучување"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ново известување"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуелна тастатура"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 2cb564c77fd5..68501191e393 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ക്രമീകരണം"</string> <string name="global_action_assist" msgid="3892832961594295030">"അസിസ്റ്റ്"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"വോയ്സ് സഹായം"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ലോക്ക്ഡൗൺ നൽകൂ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"പുതിയ അറിയിപ്പ്"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"വെർച്വൽ കീബോർഡ്"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 011a2bd394ee..319ea011874f 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Тохиргоо"</string> <string name="global_action_assist" msgid="3892832961594295030">"Туслах"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Дуут туслах"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Хүчтэй түгжээ оруулах"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Шинэ мэдэгдэл"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуал гар"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 2ef0960effff..8436eb454d63 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -172,10 +172,10 @@ <string name="work_profile_deleted_description" msgid="1100529432509639864">"प्रशासक अॅप गहाळ असल्यामुळे कार्य प्रोफाइल हटवले गेले"</string> <string name="work_profile_deleted_details" msgid="6307630639269092360">"कार्य प्रोफाइल प्रशासक अॅप गहाळ आहे किंवा करप्ट आहे. परिणामी, आपले कार्य प्रोफाइल आणि संबंधित डेटा हटवले गेले आहेत. सहाय्यासाठी आपल्या प्रशासकाशी संपर्क साधा."</string> <string name="work_profile_deleted_description_dpm_wipe" msgid="8823792115612348820">"आपले कार्य प्रोफाइल आता या डिव्हाइसवर उपलब्ध नाही"</string> - <string name="network_logging_notification_title" msgid="6399790108123704477">"डीव्हाइस व्यवस्थापित केले आहे"</string> - <string name="network_logging_notification_text" msgid="7930089249949354026">"आपली संस्था हे डीव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे निरीक्षण करू शकते. तपशीलांसाठी टॅप करा."</string> - <string name="factory_reset_warning" msgid="5423253125642394387">"तुमचे डीव्हाइस मिटविले जाईल"</string> - <string name="factory_reset_message" msgid="7972496262232832457">"हे प्रशासक अॅप वापरले जाऊ शकत नाही. तुमचे डीव्हाइस आता मिटवले जाईल.\n\nतुम्हाला प्रश्न असल्यास, तुमच्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string> + <string name="network_logging_notification_title" msgid="6399790108123704477">"डिव्हाइस व्यवस्थापित केले आहे"</string> + <string name="network_logging_notification_text" msgid="7930089249949354026">"आपली संस्था हे डिव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे निरीक्षण करू शकते. तपशीलांसाठी टॅप करा."</string> + <string name="factory_reset_warning" msgid="5423253125642394387">"तुमचे डिव्हाइस मिटविले जाईल"</string> + <string name="factory_reset_message" msgid="7972496262232832457">"हे प्रशासक अॅप वापरले जाऊ शकत नाही. तुमचे डिव्हाइस आता मिटवले जाईल.\n\nतुम्हाला प्रश्न असल्यास, तुमच्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string> <string name="me" msgid="6545696007631404292">"मी"</string> <string name="power_dialog" product="tablet" msgid="8545351420865202853">"टॅबलेट पर्याय"</string> <string name="power_dialog" product="tv" msgid="6153888706430556356">"टीव्ही पर्याय"</string> @@ -212,11 +212,11 @@ <string name="global_action_emergency" msgid="7112311161137421166">"आणीबाणी"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"बग रीपोर्ट"</string> <string name="bugreport_title" msgid="2667494803742548533">"बग रीपोर्ट घ्या"</string> - <string name="bugreport_message" msgid="398447048750350456">"ई-मेल संदेश म्हणून पाठविण्यासाठी, हे तुमच्या सद्य डीव्हाइस स्थितीविषयी माहिती संकलित करेल. बग रीपोर्ट सुरू करण्यापासून तो पाठविण्यापर्यंत थोडा वेळ लागेल; कृपया धीर धरा."</string> + <string name="bugreport_message" msgid="398447048750350456">"ई-मेल संदेश म्हणून पाठविण्यासाठी, हे तुमच्या सद्य डिव्हाइस स्थितीविषयी माहिती संकलित करेल. बग रीपोर्ट सुरू करण्यापासून तो पाठविण्यापर्यंत थोडा वेळ लागेल; कृपया धीर धरा."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"परस्परसंवादी अहवाल"</string> <string name="bugreport_option_interactive_summary" msgid="229299488536107968">"बहुतांश प्रसंगांमध्ये याचा वापर करा. ते आपल्याला अहवालाच्या प्रगतीचा मागोवा घेण्याची, समस्येविषयी आणखी तपाशील प्रविष्ट करण्याची आणि स्क्रीनशॉट घेण्याची अनुमती देते. ते कदाचित अहवाल देण्यासाठी बराच वेळ घेणारे कमी-वापरलेले विभाग वगळू शकते."</string> <string name="bugreport_option_full_title" msgid="6354382025840076439">"संपूर्ण अहवाल"</string> - <string name="bugreport_option_full_summary" msgid="7210859858969115745">"तुमचे डीव्हाइस प्रतिसाद देत नाही किंवा खूप धीमे असते किंवा तुम्हाला सर्व अहवाल विभागांची आवश्यकता असते तेव्हा कमीतकमी सिस्टम हस्तक्षेपासाठी या पर्यायाचा वापर करा. तुम्हाला आणखी तपशील एंटर करण्याची किंवा अतिरिक्त स्क्रीनशॉट घेण्याची अनुमती देत नाही."</string> + <string name="bugreport_option_full_summary" msgid="7210859858969115745">"तुमचे डिव्हाइस प्रतिसाद देत नाही किंवा खूप धीमे असते किंवा तुम्हाला सर्व अहवाल विभागांची आवश्यकता असते तेव्हा कमीतकमी सिस्टम हस्तक्षेपासाठी या पर्यायाचा वापर करा. तुम्हाला आणखी तपशील एंटर करण्याची किंवा अतिरिक्त स्क्रीनशॉट घेण्याची अनुमती देत नाही."</string> <plurals name="bugreport_countdown" formatted="false" msgid="6878900193900090368"> <item quantity="one">दोष अहवालासाठी <xliff:g id="NUMBER_1">%d</xliff:g> सेकंदामध्ये स्क्रीनशॉट घेत आहे.</item> <item quantity="other">दोष अहवालासाठी <xliff:g id="NUMBER_1">%d</xliff:g> सेकंदांमध्ये स्क्रीनशॉट घेत आहे.</item> @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"सेटिंग्ज"</string> <string name="global_action_assist" msgid="3892832961594295030">"सहाय्यता"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"व्हॉइस सहाय्य"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"लॉकडाउन टाका"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"नवीन सूचना"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"व्हर्च्युअल कीबोर्ड"</string> @@ -245,7 +244,7 @@ <string name="notification_channel_network_alerts" msgid="2895141221414156525">"नेटवर्क सूचना"</string> <string name="notification_channel_network_available" msgid="4531717914138179517">"नेटवर्क उपलब्ध"</string> <string name="notification_channel_vpn" msgid="8330103431055860618">"VPN स्थिती"</string> - <string name="notification_channel_device_admin" msgid="1568154104368069249">"डीव्हाइस प्रशासन"</string> + <string name="notification_channel_device_admin" msgid="1568154104368069249">"डिव्हाइस प्रशासन"</string> <string name="notification_channel_alerts" msgid="4496839309318519037">"सूचना"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"रीटेल डेमो"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB कनेक्शन"</string> @@ -271,7 +270,7 @@ <string name="permgroupdesc_sms" msgid="4656988620100940350">"SMS संदेश पाठवणे आणि पाहणे हे"</string> <string name="permgrouprequest_sms" msgid="605618939583628306">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ला SMS संदेश पाठवू आणि पाहू द्या"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"संचयन"</string> - <string name="permgroupdesc_storage" msgid="637758554581589203">"तुमच्या डीव्हाइस वरील फोटो, मीडिया आणि फायलींमध्ये अॅक्सेस"</string> + <string name="permgroupdesc_storage" msgid="637758554581589203">"तुमच्या डिव्हाइस वरील फोटो, मीडिया आणि फायलींमध्ये अॅक्सेस"</string> <string name="permgrouprequest_storage" msgid="7429669910547860218">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ला तुमच्या डीव्हाइसवरील फोटो, मीडिया आणि फायली अॅक्सेस करू द्या"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"मायक्रोफोन"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"ऑडिओ रेकॉर्ड"</string> @@ -298,7 +297,7 @@ <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"फिंगरप्रिंट जेश्चर"</string> <string name="capability_desc_canCaptureFingerprintGestures" msgid="7102111919385702482">"डिव्हाइसच्या फिंगरप्रिंट सेंसरवर केलेले जेश्चर कॅप्चर करू शकते."</string> <string name="permlab_statusBar" msgid="7417192629601890791">"स्टेटस बार अक्षम करा किंवा सुधारित करा"</string> - <string name="permdesc_statusBar" msgid="8434669549504290975">"स्टेटस बार अक्षम करण्यासाठी किंवा सिस्टीम चिन्हे जोडण्यासाठी आणि काढण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_statusBar" msgid="8434669549504290975">"स्टेटस बार अक्षम करण्यासाठी किंवा सिस्टम चिन्हे जोडण्यासाठी आणि काढण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_statusBarService" msgid="4826835508226139688">"स्टेटस बार होऊ द्या"</string> <string name="permdesc_statusBarService" msgid="716113660795976060">"स्टेटस बार होण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_expandStatusBar" msgid="1148198785937489264">"स्टेटस बार विस्तृत करा/संकुचित करा"</string> @@ -329,8 +328,8 @@ <string name="permdesc_receiveWapPush" msgid="748232190220583385">"WAP संदेश प्राप्त करण्यास आणि त्यावर प्रक्रिया करण्यासाठी अॅप ला अनुमती देते. ही परवानगी आपल्याला पाठविलेले संदेश आपल्याला न दर्शविता त्यांचे परीक्षण करण्याची आणि ते हटविण्याची क्षमता समाविष्ट करते."</string> <string name="permlab_getTasks" msgid="6466095396623933906">"चालणारे अॅप्स पुनर्प्राप्त करा"</string> <string name="permdesc_getTasks" msgid="7454215995847658102">"सध्या आणि अलीकडे चालणार्या कार्यांविषयी माहिती पुनर्प्राप्त करण्यासाठी अॅप ला अनुमती देते. हे डिव्हाइसवर कोणते अॅप्लिकेशन वापरले जात आहेत त्याविषयी माहिती शोधण्यासाठी अॅप ला अनुमती देऊ शकतात."</string> - <string name="permlab_manageProfileAndDeviceOwners" msgid="7918181259098220004">"प्रोफाईल आणि डीव्हाइस मालक व्यवस्थापित करा"</string> - <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"प्रोफाईल मालक आणि डीव्हाइस मालक सेट करण्याची अॅप्सना अनुमती द्या."</string> + <string name="permlab_manageProfileAndDeviceOwners" msgid="7918181259098220004">"प्रोफाईल आणि डिव्हाइस मालक व्यवस्थापित करा"</string> + <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"प्रोफाईल मालक आणि डिव्हाइस मालक सेट करण्याची अॅप्सना अनुमती द्या."</string> <string name="permlab_reorderTasks" msgid="2018575526934422779">"चालणारे अॅप्स पुनर्क्रमित करा"</string> <string name="permdesc_reorderTasks" msgid="7734217754877439351">"समोर आणि पार्श्वभूमीवर कार्ये हलविण्यासाठी अॅप ला अनुमती देते. अॅप हे आपल्या इनपुटशिवाय करू शकतो."</string> <string name="permlab_enableCarMode" msgid="5684504058192921098">"कार मोड सक्षम करा"</string> @@ -352,9 +351,9 @@ <string name="permlab_writeSettings" msgid="2226195290955224730">"सिस्टम सेटिंग्ज सुधारित करा"</string> <string name="permdesc_writeSettings" msgid="7775723441558907181">"सिस्टीमचा सेटिंग्ज डेटा सुधारित करण्यासाठी अॅप ला अनुमती देते. दुर्भावनापूर्ण अॅप्स आपल्या सिस्टीमचे कॉन्फिगरेशन दूषित करू शकतात."</string> <string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"सुरूवातीस चालवा"</string> - <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"जसे सिस्टीम बूट करणे समाप्त करते तसे अॅप ला स्वतः प्रारंभ करण्यास अनुमती देते. यामुळे टॅबलेट प्रारंभ करण्यास वेळ लागू शकतो आणि नेहमी चालू राहून एकंदर टॅबलेटला धीमे करण्यास अॅप ला अनुमती देते."</string> - <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"सिस्टीम बूट करणे समाप्त करते तसेच अॅपने स्वतः प्रारंभ करण्यास त्याला अनुमती देते. यामुळे टीव्ही प्रारंभ करण्यासाठी त्यास जास्त वेळ लागू शकतो आणि नेहमी चालू ठेवून संपूर्ण टॅबलेट धीमे करण्यासाठी अॅपला अनुमती देते."</string> - <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"जसे सिस्टीम बूट करणे समाप्त करते तसे अॅप ला स्वतः प्रारंभ करण्यास अनुमती देते. यामुळे फोन प्रारंभ करण्यास वेळ लागू शकतो आणि नेहमी चालू राहून एकंदर फोनला धीमे करण्यास अॅप ला अनुमती देते."</string> + <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"जसे सिस्टम बूट करणे समाप्त करते तसे अॅप ला स्वतः प्रारंभ करण्यास अनुमती देते. यामुळे टॅबलेट प्रारंभ करण्यास वेळ लागू शकतो आणि नेहमी चालू राहून एकंदर टॅबलेटला धीमे करण्यास अॅप ला अनुमती देते."</string> + <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"सिस्टम बूट करणे समाप्त करते तसेच अॅपने स्वतः प्रारंभ करण्यास त्याला अनुमती देते. यामुळे टीव्ही प्रारंभ करण्यासाठी त्यास जास्त वेळ लागू शकतो आणि नेहमी चालू ठेवून संपूर्ण टॅबलेट धीमे करण्यासाठी अॅपला अनुमती देते."</string> + <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"जसे सिस्टम बूट करणे समाप्त करते तसे अॅप ला स्वतः प्रारंभ करण्यास अनुमती देते. यामुळे फोन प्रारंभ करण्यास वेळ लागू शकतो आणि नेहमी चालू राहून एकंदर फोनला धीमे करण्यास अॅप ला अनुमती देते."</string> <string name="permlab_broadcastSticky" msgid="7919126372606881614">"रोचक प्रसारण पाठवा"</string> <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"रोचक प्रसारणे पाठविण्यासाठी अॅप ला अनुमती देते, जे प्रसारण समाप्त झाल्यानंतर देखील तसेच राहते. अत्याधिक वापरामुळे बरीच मेमरी वापरली जाऊन तो टॅब्लेटला धीमा किंवा अस्थिर करू शकतो."</string> <string name="permdesc_broadcastSticky" product="tv" msgid="6839285697565389467">"रोचक प्रसारणे पाठविण्यास अॅपला अनुमती देते, जे प्रसारण समाप्त झाल्यानंतर तसेच रहाते. अतिरिक्त वापर टीव्ही धीमा किंवा यासाठी बरीच मेमरी वापरली जात असल्यामुळे तो अस्थिर करू शकतो."</string> @@ -406,7 +405,7 @@ <string name="permlab_accessImsCallService" msgid="3574943847181793918">"IMS कॉल सेवा अॅक्सेस करा"</string> <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"आपल्या हस्तक्षेपाशिवाय अॅपला कॉल करण्यासाठी IMS सेवा वापरण्याची अनुमती देते."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"फोन स्थिती आणि ओळख वाचा"</string> - <string name="permdesc_readPhoneState" msgid="1639212771826125528">"डीव्हाइस च्या फोन वैशिष्ट्यांवर अॅक्सेस करण्यास अॅपला अनुमती देते. ही परवानगी कॉल अॅक्टिव्हेट असला किंवा नसला तरीही, फोन नंबर आणि डीव्हाइस आयडी आणि कॉलद्वारे कनेक्ट केलेला रीमोट नंबर निर्धारित करण्यासाठी अॅपला अनुमती देते."</string> + <string name="permdesc_readPhoneState" msgid="1639212771826125528">"डिव्हाइस च्या फोन वैशिष्ट्यांवर अॅक्सेस करण्यास अॅपला अनुमती देते. ही परवानगी कॉल अॅक्टिव्हेट असला किंवा नसला तरीही, फोन नंबर आणि डिव्हाइस आयडी आणि कॉलद्वारे कनेक्ट केलेला रीमोट नंबर निर्धारित करण्यासाठी अॅपला अनुमती देते."</string> <string name="permlab_manageOwnCalls" msgid="1503034913274622244">"प्रणालीच्या माध्यमातून कॉल रूट करा"</string> <string name="permdesc_manageOwnCalls" msgid="6552974537554717418">"कॉल करण्याचा अनुभव सुधारण्यासाठी अॅपला त्याचे कॉल प्रणालीच्या माध्यमातून रूट करू देते."</string> <string name="permlab_readPhoneNumbers" msgid="6108163940932852440">"फोन नंबर वाचा"</string> @@ -422,9 +421,9 @@ <string name="permdesc_transmitIr" product="tv" msgid="3926790828514867101">"टीव्हीचे इन्फ्रारेड ट्रान्समीटर वापरण्यासाठी अॅपला अनुमती देते."</string> <string name="permdesc_transmitIr" product="default" msgid="7957763745020300725">"अॅप ला फोनच्या इन्फ्रारेड ट्रान्समीटरचा वापर करण्याची अनुमती देते."</string> <string name="permlab_setWallpaper" msgid="6627192333373465143">"वॉलपेपर सेट करा"</string> - <string name="permdesc_setWallpaper" msgid="7373447920977624745">"सिस्टीम वॉलपेपर सेट करण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_setWallpaper" msgid="7373447920977624745">"सिस्टम वॉलपेपर सेट करण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_setWallpaperHints" msgid="3278608165977736538">"आपला वॉलपेपर आकार समायोजित करा"</string> - <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"सिस्टीम वॉलपेपर आकार सूचना सेट करण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"सिस्टम वॉलपेपर आकार सूचना सेट करण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_setTimeZone" msgid="2945079801013077340">"टाइम झोन सेट करा"</string> <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"टॅब्लेटचा टाइम झोन बदलण्यासाठी अॅप ला अनुमती देते."</string> <string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"टीव्हीचा टाईम झोन बदलण्यासाठी अॅपला अनुमती देते."</string> @@ -444,15 +443,15 @@ <string name="permlab_accessWifiState" msgid="5202012949247040011">"वाय-फाय कनेक्शन पहा"</string> <string name="permdesc_accessWifiState" msgid="5002798077387803726">"वाय-फाय सक्षम केले आहे किंवा नाही आणि कनेक्ट केलेल्या वाय-फाय डीव्हाइसचे नाव यासारख्या, वाय-फाय नेटवर्किंग विषयीची माहिती पाहण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_changeWifiState" msgid="6550641188749128035">"वाय-फाय वरून कनेक्ट करा आणि डिस्कनेक्ट करा"</string> - <string name="permdesc_changeWifiState" msgid="7137950297386127533">"वाय-फाय अॅक्सेस बिंदूंवर कनेक्ट करण्यासाठी आणि त्यावरून डिस्कनेक्ट करण्यासाठी आणि वाय-फाय नेटवर्कसाठी डीव्हाइस कॉंफिगरेशनमध्ये बदल करण्यासाठी अॅपला अनुमती देते."</string> + <string name="permdesc_changeWifiState" msgid="7137950297386127533">"वाय-फाय अॅक्सेस बिंदूंवर कनेक्ट करण्यासाठी आणि त्यावरून डिस्कनेक्ट करण्यासाठी आणि वाय-फाय नेटवर्कसाठी डिव्हाइस कॉंफिगरेशनमध्ये बदल करण्यासाठी अॅपला अनुमती देते."</string> <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"वाय-फाय मल्टिकास्ट रिसेप्शनला अनुमती द्या"</string> <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"मल्टिकास्ट पत्ते वापरून फक्त तुमच्या टॅब्लेटवर नाही, तर वाय-फाय नेटवर्कवरील सर्व डीव्हाइसवर पाठविलेले पॅकेट प्राप्त करण्यासाठी अॅप ला अनुमती देते. हे मल्टिकास्टखेरिज इतर मोडसाठी अधिक पॉवर वापरते."</string> <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"केवळ आपला टीव्ही न वापरता, एकाधिक पत्ते वापरून एका वाय-फाय नेटवकवरील सर्व डीव्हाइसवर पाठविलेली पॅकेट प्राप्त करण्यासाठी अॅपला अनुमती देते."</string> <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"मल्टिकास्ट पत्ते वापरून फक्त तुमच्या फोनवर नाही, तर वाय-फाय नेटवर्कवरील सर्व डीव्हाइसवर पाठविलेले पॅकेट प्राप्त करण्यासाठी अॅप ला अनुमती देते. हे मल्टिकास्टखेरिज इतर मोडसाठी अधिक पॉवर वापरते."</string> <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"ब्लूटूथ सेटिंग्ज अॅक्सेस करा"</string> - <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"स्थानिक ब्लूटूथ टॅबलेट कॉंफिगर करण्याकरिता आणि दूरस्थ डीव्हाइस शोधण्यासाठी आणि त्यासह जोडण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"स्थानिक ब्लूटूथ टॅबलेट कॉंफिगर करण्याकरिता आणि दूरस्थ डिव्हाइस शोधण्यासाठी आणि त्यासह जोडण्यासाठी अॅप ला अनुमती देते."</string> <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"स्थानिक ब्लूटूथ टीव्ही कॉंफिगर करण्यासाठी आणि दूरस्थ डीव्हाइससह शोधण्यासाठी आणि जोडण्यासाठी अॅपला अनुमती देते."</string> - <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"स्थानिक ब्लूटूथ फोन कॉंफिगर करण्याकरिता आणि दूरस्थ डीव्हाइस शोधण्यासाठी आणि त्यासह जोडण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"स्थानिक ब्लूटूथ फोन कॉंफिगर करण्याकरिता आणि दूरस्थ डिव्हाइस शोधण्यासाठी आणि त्यासह जोडण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_accessWimaxState" msgid="4195907010610205703">"WiMAX कनेक्ट करा आणि त्यावरून डिस्कनेक्ट करा"</string> <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"WiMAX सक्षम केले आहे किंवा नाही आणि कनेक्ट केलेल्या कोणत्याही WiMAX नेटवर्क विषयीची माहिती निर्धारित करण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_changeWimaxState" msgid="340465839241528618">"WiMAX स्थिती बदला"</string> @@ -535,7 +534,7 @@ <string name="permdesc_invokeCarrierSetup" msgid="4159549152529111920">"होल्डरला वाहकद्वारे-प्रदान केलेल्या कॉन्फिगरेशन अॅपची विनंती करण्याची अनुमती देते. सामान्य अॅप्ससाठी कधीही आवश्यक नसावे."</string> <string name="permlab_accessNetworkConditions" msgid="8206077447838909516">"नेटवर्क स्थितींवरील निरीक्षणांसाठी ऐका"</string> <string name="permdesc_accessNetworkConditions" msgid="6899102075825272211">"अनु्प्रयोगाला नेटवर्क स्थितींवरील निरीक्षणे ऐकण्यासाठी अनुमती देते. सामान्य अॅप्ससाठी कधीही आवश्यक नसावे."</string> - <string name="permlab_setInputCalibration" msgid="4902620118878467615">"इनपुट डीव्हाइस कॅलिब्रेशन बदला"</string> + <string name="permlab_setInputCalibration" msgid="4902620118878467615">"इनपुट डिव्हाइस कॅलिब्रेशन बदला"</string> <string name="permdesc_setInputCalibration" msgid="4527511047549456929">"स्पर्श स्क्रीनची कॅलिब्रेशन प्राचले सुधारित करण्यासाठी अॅप ला अनुमती देते. सामान्य अॅप्स साठी कधीही आवश्यक नसते."</string> <string name="permlab_accessDrmCertificates" msgid="7436886640723203615">"DRM प्रमाणपत्रे अॅक्सेस करा"</string> <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"DRM प्रमाणपत्रांची तरतूद करण्यासाठी आणि वापरण्यासाठी अनुप्रयोगास अनुमती देते. सामान्य अॅप्सकरिता कधीही आवश्यकता नसते."</string> @@ -570,14 +569,14 @@ <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="6336255514635308054">"कोणत्याही चेतावणी शिवाय या वापरकर्त्याचा या टॅब्लेटवरील डेटा मिटवा."</string> <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2086473496848351810">"कोणत्याही चेतावणी शिवाय या वापरकर्त्याचा या टीव्ही वरील डेटा मिटवा."</string> <string name="policydesc_wipeData_secondaryUser" product="default" msgid="6787904546711590238">"कोणत्याही चेतावणी शिवाय या वापरकर्त्याचा या फोनवरील डेटा मिटवा."</string> - <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"डीव्हाइस समग्र प्रॉक्सी सेट करा"</string> - <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"धोरण सक्षम असताना वापरण्यासाठी डीव्हाइस समग्र प्रॉक्सी सेट करा. फक्त डीव्हाइस मालक समग्र प्रॉक्सी सेट करु शकतो."</string> + <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"डिव्हाइस समग्र प्रॉक्सी सेट करा"</string> + <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"धोरण सक्षम असताना वापरण्यासाठी डिव्हाइस समग्र प्रॉक्सी सेट करा. फक्त डिव्हाइस मालक समग्र प्रॉक्सी सेट करु शकतो."</string> <string name="policylab_expirePassword" msgid="5610055012328825874">"स्क्रीन लॉक संकेतशब्द कालबाह्यता सेट करा"</string> <string name="policydesc_expirePassword" msgid="5367525762204416046">"लॉक-स्क्रीन संकेतशब्द किती वारंवार बदलणे आवश्यक आहे ते बदला."</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"स्टोरेज एंक्रिप्शन सेट करा"</string> <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"स्टोअर केलेला अॅप डेटा एंक्रिप्ट केला जाणे आवश्यक आहे."</string> <string name="policylab_disableCamera" msgid="6395301023152297826">"कॅमेरे अक्षम करा"</string> - <string name="policydesc_disableCamera" msgid="2306349042834754597">"सर्व डीव्हाइस कॅमेर्यांचा वापर प्रतिबंधित करा."</string> + <string name="policydesc_disableCamera" msgid="2306349042834754597">"सर्व डिव्हाइस कॅमेर्यांचा वापर प्रतिबंधित करा."</string> <string name="policylab_disableKeyguardFeatures" msgid="8552277871075367771">"काही स्क्रीन लॉक वैशिष्ट्ये अक्षम करा"</string> <string name="policydesc_disableKeyguardFeatures" msgid="2044755691354158439">"काही स्क्रीन लॉक वैशिष्ट्यांचा वापर प्रतिबंधित करा."</string> <string-array name="phoneTypes"> @@ -1017,7 +1016,7 @@ <string name="whichImageCaptureApplicationLabel" msgid="6390303445371527066">"इमेज कॅप्चर करा"</string> <string name="alwaysUse" msgid="4583018368000610438">"या क्रियेसाठी डीफॉल्टनुसार वापरा."</string> <string name="use_a_different_app" msgid="8134926230585710243">"एक भिन्न अॅप वापरा"</string> - <string name="clearDefaultHintMsg" msgid="3252584689512077257">"डाउनलोड केलेल्या सिस्टीम सेटिंग्ज > Apps > मधील डीफॉल्ट साफ करा."</string> + <string name="clearDefaultHintMsg" msgid="3252584689512077257">"डाउनलोड केलेल्या सिस्टम सेटिंग्ज > Apps > मधील डीफॉल्ट साफ करा."</string> <string name="chooseActivity" msgid="7486876147751803333">"क्रिया निवडा"</string> <string name="chooseUsbActivity" msgid="6894748416073583509">"USB डिव्हाइससाठी अॅप निवडा"</string> <string name="noApplications" msgid="2991814273936504689">"कोणतेही अॅप्स ही क्रिया करू शकत नाहीत."</string> @@ -1028,7 +1027,7 @@ <string name="aerr_restart" msgid="7581308074153624475">"अॅप पुन्हा उघडा"</string> <string name="aerr_report" msgid="5371800241488400617">"अभिप्राय पाठवा"</string> <string name="aerr_close" msgid="2991640326563991340">"बंद करा"</string> - <string name="aerr_mute" msgid="1974781923723235953">"डीव्हाइस रीस्टार्ट होईपर्यंत म्युट करा"</string> + <string name="aerr_mute" msgid="1974781923723235953">"डिव्हाइस रीस्टार्ट होईपर्यंत म्युट करा"</string> <string name="aerr_wait" msgid="3199956902437040261">"प्रतीक्षा करा"</string> <string name="aerr_close_app" msgid="3269334853724920302">"अॅप बंद करा"</string> <string name="anr_title" msgid="4351948481459135709"></string> @@ -1045,7 +1044,7 @@ <string name="launch_warning_original" msgid="188102023021668683">"<xliff:g id="APP_NAME">%1$s</xliff:g> मूळतः लाँच केले."</string> <string name="screen_compat_mode_scale" msgid="3202955667675944499">"स्केल"</string> <string name="screen_compat_mode_show" msgid="4013878876486655892">"नेहमी दर्शवा"</string> - <string name="screen_compat_mode_hint" msgid="1064524084543304459">"सिस्टीम सेटिंग्ज > Apps > डाउनलोड केलेले मध्ये हे पुन्हा-सक्षम करा."</string> + <string name="screen_compat_mode_hint" msgid="1064524084543304459">"सिस्टम सेटिंग्ज > Apps > डाउनलोड केलेले मध्ये हे पुन्हा-सक्षम करा."</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> वर्तमान डिस्प्ले आकार सेटिंगला समर्थन देत नाही आणि अनपेक्षित वर्तन करू शकते."</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"नेहमी दर्शवा"</string> <string name="smv_application" msgid="3307209192155442829">"अॅप <xliff:g id="APPLICATION">%1$s</xliff:g> (प्रक्रिया <xliff:g id="PROCESS">%2$s</xliff:g>) ने तिच्या स्वयं-लागू केलेल्या StrictMode धोरणाचे उल्लंघन केले आहे."</string> @@ -1116,7 +1115,7 @@ <string name="wifi_no_internet" msgid="8451173622563841546">"वाय-फायवरून इंटरनेटवर अॅक्सेस नाही"</string> <string name="wifi_no_internet_detailed" msgid="8083079241212301741">"पर्यायांसाठी टॅप करा"</string> <string name="network_switch_metered" msgid="4671730921726992671">"<xliff:g id="NETWORK_TYPE">%1$s</xliff:g> वर स्विच केले"</string> - <string name="network_switch_metered_detail" msgid="5325661434777870353">"<xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> कडे इंटरनेट अॅक्सेस नसताना डीव्हाइस <xliff:g id="NEW_NETWORK">%1$s</xliff:g> वापरते. शुल्क लागू शकेल."</string> + <string name="network_switch_metered_detail" msgid="5325661434777870353">"<xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> कडे इंटरनेट अॅक्सेस नसताना डिव्हाइस <xliff:g id="NEW_NETWORK">%1$s</xliff:g> वापरते. शुल्क लागू शकेल."</string> <string name="network_switch_metered_toast" msgid="5779283181685974304">"<xliff:g id="PREVIOUS_NETWORK">%1$s</xliff:g> वरून <xliff:g id="NEW_NETWORK">%2$s</xliff:g> वर स्विच केले"</string> <string-array name="network_switch_type_name"> <item msgid="3979506840912951943">"मोबाइल डेटा"</item> @@ -1165,7 +1164,7 @@ <string name="sim_removed_message" msgid="2333164559970958645">"आपण एक वैध सिम कार्ड घालून प्रारंभ करेपर्यंत मोबाईल नेटवर्क अनुपलब्ध असेल."</string> <string name="sim_done_button" msgid="827949989369963775">"पूर्ण झाले"</string> <string name="sim_added_title" msgid="3719670512889674693">"सिम कार्ड जोडले"</string> - <string name="sim_added_message" msgid="6599945301141050216">"मोबाईल नेटवर्कवर अॅक्सेस करण्यासाठी तुमचे डीव्हाइस रीस्टार्ट करा."</string> + <string name="sim_added_message" msgid="6599945301141050216">"मोबाईल नेटवर्कवर अॅक्सेस करण्यासाठी तुमचे डिव्हाइस रीस्टार्ट करा."</string> <string name="sim_restart_button" msgid="4722407842815232347">"रीस्टार्ट"</string> <string name="carrier_app_dialog_message" msgid="7066156088266319533">"आपल्या नवीन सिमने योग्यरित्या कार्य करण्यासाठी, आपल्याला अॅप इंस्टॉल करण्याची आणि तो आपल्या वाहकामधून उघडण्याची आवश्यकता असेल."</string> <string name="carrier_app_dialog_button" msgid="7900235513678617329">"अॅप मिळवा"</string> @@ -1181,7 +1180,7 @@ <string name="no_permissions" msgid="7283357728219338112">"परवानग्या आवश्यक नाहीत"</string> <string name="perm_costs_money" msgid="4902470324142151116">"यासाठी आपले पैसे खर्च होऊ शकतात"</string> <string name="dlg_ok" msgid="7376953167039865701">"ठीक"</string> - <string name="usb_charging_notification_title" msgid="6895185153353640787">"USB हे डीव्हाइस चार्ज करत आहे"</string> + <string name="usb_charging_notification_title" msgid="6895185153353640787">"USB हे डिव्हाइस चार्ज करत आहे"</string> <string name="usb_supplying_notification_title" msgid="5310642257296510271">"USB संलग्न केलेल्या डिव्हाइसला पॉवरचा पुरवठा करीत आहे"</string> <string name="usb_mtp_notification_title" msgid="8396264943589760855">"स्थानांतरणासाठी USB"</string> <string name="usb_ptp_notification_title" msgid="1347328437083192112">"फोटो स्थानांतरणासाठी USB"</string> @@ -1219,8 +1218,8 @@ <string name="ext_media_unmountable_notification_message" msgid="2343202057122495773">"<xliff:g id="NAME">%s</xliff:g> दूषित आहे. निराकरण करण्यासाठी टॅप करा."</string> <string name="ext_media_unmountable_notification_message" product="tv" msgid="3941179940297874950">"<xliff:g id="NAME">%s</xliff:g> दूषित आहे. निश्चित करण्यासाठी निवडा."</string> <string name="ext_media_unsupported_notification_title" msgid="3797642322958803257">"<xliff:g id="NAME">%s</xliff:g> असमर्थित"</string> - <string name="ext_media_unsupported_notification_message" msgid="6121601473787888589">"हे डीव्हाइस <xliff:g id="NAME">%s</xliff:g> ला सपोर्ट करत नाही. सपोर्ट असलेल्या फॉरमॅटमध्ये सेट करण्यासाठी टॅप करा."</string> - <string name="ext_media_unsupported_notification_message" product="tv" msgid="3725436899820390906">"हे डीव्हाइस <xliff:g id="NAME">%s</xliff:g> ला सपोर्ट करत नाही. सपोर्ट असलेल्या फॉरमॅटमध्ये सेट करण्यासाठी निवडा."</string> + <string name="ext_media_unsupported_notification_message" msgid="6121601473787888589">"हे डिव्हाइस <xliff:g id="NAME">%s</xliff:g> ला सपोर्ट करत नाही. सपोर्ट असलेल्या फॉरमॅटमध्ये सेट करण्यासाठी टॅप करा."</string> + <string name="ext_media_unsupported_notification_message" product="tv" msgid="3725436899820390906">"हे डिव्हाइस <xliff:g id="NAME">%s</xliff:g> ला सपोर्ट करत नाही. सपोर्ट असलेल्या फॉरमॅटमध्ये सेट करण्यासाठी निवडा."</string> <string name="ext_media_badremoval_notification_title" msgid="3206248947375505416">"<xliff:g id="NAME">%s</xliff:g> अनपेक्षितरित्या काढले"</string> <string name="ext_media_badremoval_notification_message" msgid="380176703346946313">"डेटा गमावणे टाळण्यासाठी काढण्यापूर्वी <xliff:g id="NAME">%s</xliff:g> अनमाउंट करा"</string> <string name="ext_media_nomedia_notification_title" msgid="1704840188641749091">"<xliff:g id="NAME">%s</xliff:g> काढले"</string> @@ -1231,7 +1230,7 @@ <string name="ext_media_unmount_action" msgid="1121883233103278199">"बाहेर काढा"</string> <string name="ext_media_browse_action" msgid="8322172381028546087">"एक्सप्लोर करा"</string> <string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> गहाळ आहे"</string> - <string name="ext_media_missing_message" msgid="5761133583368750174">"हे डीव्हाइस पुन्हा घाला"</string> + <string name="ext_media_missing_message" msgid="5761133583368750174">"हे डिव्हाइस पुन्हा घाला"</string> <string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> हलवित आहे"</string> <string name="ext_media_move_title" msgid="1022809140035962662">"डेटा हलवित आहे"</string> <string name="ext_media_move_success_title" msgid="8575300932957954671">"हलविणे पूर्ण"</string> @@ -1631,7 +1630,7 @@ <string name="package_installed_device_owner" msgid="6875717669960212648">"आपल्या प्रशासकाने इंस्टॉल केले"</string> <string name="package_updated_device_owner" msgid="1847154566357862089">"आपल्या प्रशासकाने अपडेट केले"</string> <string name="package_deleted_device_owner" msgid="2307122077550236438">"आपल्या प्रशासकाने हटवले"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"बॅटरी लाइफ सुधारित करण्यासाठी, बॅटरी सेव्हर तुमच्या डीव्हाइस ची कामगिरी कमी करतो आणि कंपन, स्थान सेवा आणि बराच पार्श्वभूमी डेटा मर्यादित करतो. सिंकवर अवलंबून असणारे ईमेल, मेसेजिंग आणि इतर अॅप्स तुम्ही उघडल्याशिवाय अपडेट होऊ शकत नाहीत.\n\nतुमचे डीव्हाइस चार्ज होत असते तेव्हा बॅटरी सेव्हर आपोआप बंद होतो."</string> + <string name="battery_saver_description" msgid="1960431123816253034">"बॅटरी लाइफ सुधारित करण्यासाठी, बॅटरी सेव्हर तुमच्या डिव्हाइस ची कामगिरी कमी करतो आणि कंपन, स्थान सेवा आणि बराच पार्श्वभूमी डेटा मर्यादित करतो. सिंकवर अवलंबून असणारे ईमेल, मेसेजिंग आणि इतर अॅप्स तुम्ही उघडल्याशिवाय अपडेट होऊ शकत नाहीत.\n\nतुमचे डिव्हाइस चार्ज होत असते तेव्हा बॅटरी सेव्हर आपोआप बंद होतो."</string> <string name="data_saver_description" msgid="6015391409098303235">"डेटा वापर कमी करण्यात मदत करण्यासाठी, डेटा सर्व्हर काही अॅप्सना पार्श्वभूमीमध्ये डेटा पाठविण्यास किंवा प्राप्त करण्यास प्रतिबंधित करतो. आपण सध्या वापरत असलेला अॅप डेटामध्ये प्रवेश करू शकतो परंतु तसे तो खूप कमी वेळा करू शकतो. याचा अर्थ, उदाहरणार्थ, आपण इमेज टॅप करेपर्यंत त्या प्रदर्शित करणार नाहीत असा असू शकतो."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"डेटा बचतकर्ता चालू करायचा?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"चालू करा"</string> @@ -1732,7 +1731,7 @@ <string name="app_info" msgid="6856026610594615344">"अॅप माहिती"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="demo_starting_message" msgid="5268556852031489931">"डेमो प्रारंभ करत आहे..."</string> - <string name="demo_restarting_message" msgid="952118052531642451">"डीव्हाइस रीसेट करत आहे..."</string> + <string name="demo_restarting_message" msgid="952118052531642451">"डिव्हाइस रीसेट करत आहे..."</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> अक्षम केले"</string> <string name="conference_call" msgid="3751093130790472426">"परिषद कॉल"</string> <string name="tooltip_popup_title" msgid="5253721848739260181">"टूलटिप"</string> @@ -1744,7 +1743,7 @@ <string name="app_category_news" msgid="7496506240743986873">"बातम्या आणि मासिके"</string> <string name="app_category_maps" msgid="5878491404538024367">"नकाशे आणि नेव्हिगेशन"</string> <string name="app_category_productivity" msgid="3742083261781538852">"उत्पादनक्षमता"</string> - <string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"डीव्हाइस स्टोरेज"</string> + <string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"डिव्हाइस स्टोरेज"</string> <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB डीबगिंग"</string> <string name="time_picker_hour_label" msgid="2979075098868106450">"तास"</string> <string name="time_picker_minute_label" msgid="5168864173796598399">"मिनिट"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index b17abd709e28..67d81d439318 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Tetapan"</string> <string name="global_action_assist" msgid="3892832961594295030">"Bantu"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Bantuan Suara"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kunci semua"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Pemberitahuan baharu"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Papan kekunci maya"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 79bdc566291c..d4325057468d 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ဆက်တင်များ"</string> <string name="global_action_assist" msgid="3892832961594295030">"အကူအညီ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"အသံ အကူအညီ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ချိပ်ပိတ်ရန်"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"၉၉၉+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"အကြောင်းကြားချက်အသစ်"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ပကတိအသွင်ကီးဘုတ်"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index de6a9a820933..07a622cddeb3 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Innstillinger"</string> <string name="global_action_assist" msgid="3892832961594295030">"Hjelp"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Talehjelp"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Start låsing"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nytt varsel"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuelt tastatur"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index ce3683f281f3..581f34410cda 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"सेटिङ्हरू"</string> <string name="global_action_assist" msgid="3892832961594295030">"सहायता दिनुहोस्"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"आवाज सहायता"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"लकडाउन प्रविष्ट गर्नुहोस्"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"९९९+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"नयाँ सूचना"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"भर्चुअल किबोर्ड"</string> @@ -353,7 +352,7 @@ <string name="permdesc_writeSettings" msgid="7775723441558907181">"प्रणालीका सेटिङ डेटालाई परिवर्तन गर्नको लागि अनुप्रयोगलाई अनुमति दिन्छ। खराब अनुप्रयोगहरूले सायद तपाईँको प्रणालीको कन्फिगरेसनलाई क्षति पुर्याउन सक्छन्।"</string> <string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"स्टार्टअपमा चलाउनुहोस्"</string> <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"आनुप्रयोगलाई प्रणाली बुट प्रक्रिया पूर्ण हुने बितिकै आफैलाई सुरु गर्ने अनुमति दिन्छ। यसले ट्याब्लेट सुरु गर्नमा ढिला गर्न सक्दछ र अनुप्रयोगलाई समग्रमा ट्याब्लेट सधैँ चालु गरेर ढिला बनाउँदछ।"</string> - <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"अनुप्रयोगलाई अनुमति दिन्छ प्रणालीले बुटिङ सकेपछि आफै सुरूवात हुन। यसले TV सुरू गर्न लामो समय लिन सक्छ र अनुप्रयोगहरूलाई अनुमति दिन सक्छ सँधै सञ्चालन भई समग्र रूपमा ट्याब्लेटलाई ढिलो गराएर।"</string> + <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"अनुप्रयोगलाई अनुमति दिन्छ प्रणालीले बुटिङ सकेपछि आफै सुरुवात हुन। यसले TV सुरु गर्न लामो समय लिन सक्छ र अनुप्रयोगहरूलाई अनुमति दिन सक्छ सँधै सञ्चालन भई समग्र रूपमा ट्याब्लेटलाई ढिलो गराएर।"</string> <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"अनुप्रयोगलाई प्रणाली बुट गरी सकेपछि जति सक्दो चाँडो आफैंमा सुरु गर्न अनुमति दिन्छ। यसले फोन सुरु गर्नमा ढिला गर्न सक्दछ र अनप्रयोगलाई समग्रमा फोन सधैँ चालु गरेर ढिला बनाउँदछ।"</string> <string name="permlab_broadcastSticky" msgid="7919126372606881614">"स्टिकि प्रसारण पठाउनुहोस्"</string> <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"औपचारिक प्रसारणलाई पठाउनको लागि एउटा अनुप्रयोगलाई अनुमति दिन्छ, जुन प्रसारण समाप्त भएपछि बाँकी रहन्छ। अत्यधिक प्रयोगले धेरै मेमोरी प्रयोग गरेको कारणले ट्याब्लेटलाई ढिलो र अस्थिर बनाउन सक्छ।"</string> @@ -1172,7 +1171,7 @@ <string name="sim_done_button" msgid="827949989369963775">"भयो"</string> <string name="sim_added_title" msgid="3719670512889674693">"SIM कार्ड थप गरियो"</string> <string name="sim_added_message" msgid="6599945301141050216">"मोबाइल नेटवर्क पहुँच गर्न तपाईँको उपकरण पुनःस्टार्ट गर्नुहोस्।"</string> - <string name="sim_restart_button" msgid="4722407842815232347">"पुनः सुरू गर्नुहोस्"</string> + <string name="sim_restart_button" msgid="4722407842815232347">"पुनः सुरु गर्नुहोस्"</string> <string name="carrier_app_dialog_message" msgid="7066156088266319533">"तपाईंको नयाँ SIM ले राम्रोसँग काम गर्न, तपाईंले आफ्नो वाहक मार्फत अनुप्रयोग स्थापना र खोल्न आवश्यक हुनेछ।"</string> <string name="carrier_app_dialog_button" msgid="7900235513678617329">"अनुप्रयोग प्राप्त गर्नुहोस्"</string> <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"अहिले होइन"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 123d2917d2ed..45dd701bb24c 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Instellingen"</string> <string name="global_action_assist" msgid="3892832961594295030">"Helpen"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Spraakassistent"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Afschermen activeren"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nieuwe melding"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtueel toetsenbord"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 8c428088fd67..bc09332a3e38 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ਸੈਟਿੰਗਾਂ"</string> <string name="global_action_assist" msgid="3892832961594295030">"ਸਹਾਇਤਾ ਕਰੋ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ਅਵਾਜ਼ੀ ਸਹਾਇਕ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ਲਾਕਡਾਊਨ ਦਾਖਲ ਕਰੋ"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"ਨਵੀਂ ਸੂਚਨਾ"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ਆਭਾਸੀ ਕੀ-ਬੋਰਡ"</string> @@ -294,14 +293,14 @@ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"ਡਿਸਪਲੇ ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨਾ"</string> <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"ਡਿਸਪਲੇ ਦੇ ਜ਼ੂਮ ਪੱਧਰ ਅਤੇ ਸਥਿਤੀ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ।"</string> <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"ਸੰਕੇਤ ਕਰਦੀ ਹੈ"</string> - <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"ਟੈਪ ਕਰ ਸਕਦੀ ਹੈ, ਸਵਾਈਪ ਕਰ ਸਕਦੀ ਹੈ, ਪਿੰਚ ਕਰ ਸਕਦੀ ਹੈ, ਅਤੇ ਹੋਰ ਸੰਕੇਤ ਕਰ ਸਕਦੀ ਹੈ।"</string> + <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"ਟੈਪ ਕਰ ਸਕਦੀ ਹੈ, ਸਵਾਈਪ ਕਰ ਸਕਦੀ ਹੈ, ਚੂੰਢੀ ਭਰ ਸਕਦੀ ਹੈ, ਅਤੇ ਹੋਰ ਸੰਕੇਤ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੰਕੇਤ"</string> <string name="capability_desc_canCaptureFingerprintGestures" msgid="7102111919385702482">"ਡੀਵਾਈਸਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਕੀਤੇ ਗਏ ਸੰਕੇਤਾਂ ਨੂੰ ਕੈਪਚਰ ਕਰ ਸਕਦੀ ਹੈ।"</string> - <string name="permlab_statusBar" msgid="7417192629601890791">"ਸਥਿਤੀ ਬਾਰ ਅਸਮਰੱਥ ਬਣਾਓ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string> - <string name="permdesc_statusBar" msgid="8434669549504290975">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਪੱਟੀ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਜਾਂ ਸਿਸਟਮ ਆਈਕਨਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਅਤੇ ਹਟਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> + <string name="permlab_statusBar" msgid="7417192629601890791">"ਸਥਿਤੀ ਪੱਟੀ ਬੰਦ ਕਰੋ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string> + <string name="permdesc_statusBar" msgid="8434669549504290975">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਪੱਟੀ ਨੂੰ ਚਾਲੂ ਕਰਨ ਜਾਂ ਸਿਸਟਮ ਪ੍ਰਤੀਕਾਂ ਨੂੰ ਜੋੜਨ ਅਤੇ ਹਟਾਉਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> <string name="permlab_statusBarService" msgid="4826835508226139688">"ਸਥਿਤੀ ਪੱਟੀ ਬਣਨ ਦਿਓ"</string> - <string name="permdesc_statusBarService" msgid="716113660795976060">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਬਾਰ ਹੋਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> - <string name="permlab_expandStatusBar" msgid="1148198785937489264">"ਸਥਿਤੀ ਪੱਟੀ ਦਾ ਵਿਸਤਾਰ/ਸੰਖਿਪਤ ਕਰੋ"</string> + <string name="permdesc_statusBarService" msgid="716113660795976060">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਪੱਟੀ ਹੋਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> + <string name="permlab_expandStatusBar" msgid="1148198785937489264">"ਸਥਿਤੀ ਪੱਟੀ ਦਾ ਵਿਸਤਾਰ/ਨਸ਼ਟ ਕਰੋ"</string> <string name="permdesc_expandStatusBar" msgid="6917549437129401132">"ਐਪ ਨੂੰ ਸਥਿਤੀ ਪੱਟੀ ਦਾ ਵਿਸਤਾਰ ਕਰਨ ਜਾਂ ਨਸ਼ਟ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> <string name="permlab_install_shortcut" msgid="4279070216371564234">"ਸ਼ਾਰਟਕੱਟ ਸਥਾਪਤ ਕਰੋ"</string> <string name="permdesc_install_shortcut" msgid="8341295916286736996">"ਇੱਕ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਵਰਤੋਂਕਾਰ ਦੇ ਦਖ਼ਲ ਤੋਂ ਬਿਨਾਂ ਹੋਮਸਕ੍ਰੀਨ ਸ਼ਾਰਟਕੱਟ ਸ਼ਾਮਲ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> @@ -371,7 +370,7 @@ <string name="permdesc_readCallLog" msgid="3204122446463552146">"ਇਹ ਐਪ ਤੁਹਾਡਾ ਕਾਲ ਇਤਿਹਾਸ ਪੜ੍ਹ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"ਕਾਲ ਲੌਗ ਲਿਖੋ"</string> <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡਾਟਾ ਸਮੇਤ। ਖਰਾਬ ਐਪਾਂ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> - <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ TV ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡਾਟਾ ਸਮੇਤ। ਖਰਾਬ ਐਪਾਂ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> + <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਟੀਵੀ ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡਾਟਾ ਸਮੇਤ। ਖਰਾਬ ਐਪਾਂ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦਾ ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ, ਇਨਕਮਿੰਗ ਅਤੇ ਆਊਟਗੋਇੰਗ ਕਾਲਾਂ ਬਾਰੇ ਡਾਟਾ ਸਮੇਤ। ਖਰਾਬ ਐਪਾਂ ਇਸਦੀ ਵਰਤੋਂ ਤੁਹਾਡੇ ਕਾਲ ਲੌਗ ਨੂੰ ਮਿਟਾਉਣ ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"ਸਰੀਰ ਸੰਵੇਦਕਾਂ \'ਤੇ ਪਹੁੰਚ ਕਰੋ (ਜਿਵੇਂ ਦਿਲ ਦੀ ਧੜਕਣ ਦੇ ਨਿਰੀਖਕ)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"ਐਪ ਨੂੰ ਉਹਨਾਂ ਸੰਵੇਦਕਾਂ ਦੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜੋ ਤੁਹਾਡੀ ਸਰੀਰਕ ਸਥਿਤੀ ਦਾ ਨਿਰੀਖਣ ਕਰ ਸਕਦੇ ਹਨ, ਜਿਵੇਂ ਤੁਹਾਡੇ ਦਿਲ ਦੀ ਧੜਕਣ।"</string> @@ -491,7 +490,7 @@ <string name="fingerprint_icon_content_description" msgid="2340202869968465936">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਪ੍ਰਤੀਕ"</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"ਸਿੰਕ ਸੈਟਿੰਗਾਂ ਪੜ੍ਹੋ"</string> <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"ਐਪ ਨੂੰ ਕਿਸੇ ਖਾਤੇ ਲਈ ਸਮਕਾਲੀਕਰਨ ਸੈਟਿੰਗਾਂ ਪੜ੍ਹਨ ਦੇ ਯੋਗ ਬਣਾਉਂਦਾ ਹੈ। ਉਦਾਹਰਨ ਲਈ, ਇਹ ਪਤਾ ਕਰ ਸਕਦਾ ਹੈ ਕਿ People ਐਪ ਦਾ ਕਿਸੇ ਖਾਤੇ ਨਾਲ ਸਮਕਾਲੀਕਿਰਤ ਕੀਤਾ ਗਿਆ ਹੈ ਜਾਂ ਨਹੀਂ।"</string> - <string name="permlab_writeSyncSettings" msgid="5408694875793945314">"ਸਿੰਕ ਟੌਗਲ ਚਾਲੂ ਅਤੇ ਬੰਦ"</string> + <string name="permlab_writeSyncSettings" msgid="5408694875793945314">"ਸਮਕਾਲੀਕਰਨ ਚਾਲੂ ਅਤੇ ਬੰਦ ਨੂੰ ਟੌਗਲ ਕਰੋ"</string> <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"ਐਪ ਨੂੰ ਇੱਕ ਖਾਤੇ ਲਈ ਸਮਕਾਲੀਕਰਨ ਸੈਟਿੰਗਾਂ ਸੋਧਣ ਦੇ ਯੋਗ ਬਣਾਉਂਦਾ ਹੈ। ਉਦਾਹਰਨ ਲਈ, ਇਸਦੀ ਵਰਤੋਂ ਕਿਸੇ ਖਾਤੇ ਨਾਲ People ਐਪ ਦਾ ਸਮਕਾਲੀਕਰਨ ਚਾਲੂ ਕਰਨ ਲਈ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"ਸਿੰਕ ਅੰਕੜੇ ਪੜ੍ਹੋ"</string> <string name="permdesc_readSyncStats" msgid="1510143761757606156">"ਐਪ ਨੂੰ ਇੱਕ ਖਾਤੇ ਲਈ ਸਮਕਾਲੀਕਰਨ ਸਥਿਤੀ ਪੜ੍ਹਨ ਦੇ ਯੋਗ ਬਣਾਉਂਦਾ ਹੈ, ਇਸ ਵਿੱਚ ਸਮਕਾਲੀਕਰਨ ਵਰਤਾਰਿਆਂ ਦਾ ਇਤਿਹਾਸ ਅਤੇ ਕਿੰਨੇ ਡਾਟਾ ਦਾ ਸਮਕਾਲੀਕਿਰਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ, ਵੀ ਸ਼ਾਮਲ ਹੈ।"</string> @@ -550,7 +549,7 @@ <string name="permlab_access_notification_policy" msgid="4247510821662059671">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string> <string name="permdesc_access_notification_policy" msgid="3296832375218749580">"ਐਪ ਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਕੌਂਫਿਗਰੇਸ਼ਨ ਨੂੰ ਪੜ੍ਹਨ ਅਤੇ ਲਿਖਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string> <string name="policylab_limitPassword" msgid="4497420728857585791">"ਪਾਸਵਰਡ ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</string> - <string name="policydesc_limitPassword" msgid="2502021457917874968">"ਸਕ੍ਰੀਨ ਲੌਕ ਪਾਸਵਰਡਾਂ ਅਤੇ ਪਿੰਨ ਵਿੱਚ ਆਗਿਆ ਦਿੱਤੀ ਲੰਮਾਈ ਅਤੇ ਅੱਖਰਾਂ ਤੇ ਨਿਯੰਤਰਣ ਪਾਓ।"</string> + <string name="policydesc_limitPassword" msgid="2502021457917874968">"ਸਕ੍ਰੀਨ ਲਾਕ ਪਾਸਵਰਡਾਂ ਅਤੇ ਪਿੰਨ ਵਿੱਚ ਆਗਿਆ ਦਿੱਤੀ ਲੰਮਾਈ ਅਤੇ ਅੱਖਰਾਂ ਤੇ ਨਿਯੰਤਰਣ ਪਾਓ।"</string> <string name="policylab_watchLogin" msgid="5091404125971980158">"ਸਕ੍ਰੀਨ ਅਣਲਾਕ ਕਰਨ ਦੀਆਂ ਕੋਸ਼ਿਸ਼ਾਂ \'ਤੇ ਨਿਗਰਾਨੀ ਰੱਖੋ"</string> <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕਰਦੇ ਹੋਏ ਟਾਈਪ ਕੀਤੇ ਗਲਤ ਪਾਸਵਰਡਾਂ ਦੀ ਸੰਖਿਆ ਦਾ ਨਿਰੀਖਣ ਕਰੋ ਅਤੇ ਟੈਬਲੈੱਟ ਨੂੰ ਲਾਕ ਕਰੋ ਜਾਂ ਟੈਬਲੈੱਟ ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ, ਜੇਕਰ ਬਹੁਤ ਜ਼ਿਆਦਾ ਗਲਤ ਪਾਸਵਰਡ ਟਾਈਪ ਕੀਤੇ ਹਨ।"</string> <string name="policydesc_watchLogin" product="TV" msgid="2707817988309890256">"ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਦੇ ਸਮੇਂ ਟਾਈਪ ਕੀਤੇ ਗ਼ਲਤ ਪਾਸਵਰਡਾਂ ਦੀ ਸੰਖਿਆ ਦਾ ਨਿਰੀਖਣ ਕਰੋ ਅਤੇ TV ਨੂੰ ਲੌਕ ਕਰੋ ਜਾਂ TV ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ ਜੇਕਰ ਬਹੁਤ ਜ਼ਿਆਦਾ ਗ਼ਲਤ ਪਾਸਵਰਡ ਟਾਈਪ ਕੀਤੇ ਹਨ।"</string> @@ -730,11 +729,11 @@ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"ਪਲੇ ਕਰੋ"</string> <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"ਰੋਕੋ"</string> <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"ਰੀਵਾਈਂਡ ਕਰੋ"</string> - <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"ਅੱਗੇ ਭੇਜੋ"</string> + <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"ਤੇਜ਼ੀ ਨਾਲ ਅੱਗੇ ਭੇਜੋ"</string> <string name="emergency_calls_only" msgid="6733978304386365407">"ਕੇਵਲ ਐਮਰਜੈਂਸੀ ਕਾਲਾਂ"</string> <string name="lockscreen_network_locked_message" msgid="143389224986028501">"ਨੈੱਟਵਰਕ ਲੌਕ ਕੀਤਾ"</string> <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM ਕਾਰਡ PUK-ਲੌਕਡ ਹੈ।"</string> - <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"ਉਪਭੋਗਤਾ ਗਾਈਡ ਦੇਖੋ ਜਾਂ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਫੋਨ ਕਰੋ।"</string> + <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"ਵਰਤੋਂਕਾਰ ਗਾਈਡ ਦੇਖੋ ਜਾਂ ਗਾਹਕ ਸੇਵਾ ਨੂੰ ਫ਼ੋਨ ਕਰੋ।"</string> <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM ਕਾਰਡ ਲੌਕ ਕੀਤਾ ਹੋਇਆ ਹੈ।"</string> <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"SIM ਕਾਰਡ ਅਨਲੌਕ ਕਰ ਰਿਹਾ ਹੈ…"</string> <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"ਤੁਸੀਂ <xliff:g id="NUMBER_0">%1$d</xliff:g> ਵਾਰ ਆਪਣਾ ਅਣਲਾਕ ਪੈਟਰਨ ਗਲਤ ਢੰਗ ਨਾਲ ਉਲੀਕਿਆ ਹੈ। \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string> @@ -853,7 +852,7 @@ <string name="search_go" msgid="8298016669822141719">"ਖੋਜੋ"</string> <string name="search_hint" msgid="1733947260773056054">"ਖੋਜ…"</string> <string name="searchview_description_search" msgid="6749826639098512120">"ਖੋਜੋ"</string> - <string name="searchview_description_query" msgid="5911778593125355124">"ਸਵਾਲ ਖੋਜੋ"</string> + <string name="searchview_description_query" msgid="5911778593125355124">"ਖੋਜ ਪੁੱਛਗਿੱਛ"</string> <string name="searchview_description_clear" msgid="1330281990951833033">"ਸਵਾਲ ਹਟਾਓ"</string> <string name="searchview_description_submit" msgid="2688450133297983542">"ਸਵਾਲ ਪ੍ਰਸਤੁਤ ਕਰੋ"</string> <string name="searchview_description_voice" msgid="2453203695674994440">"ਵੌਇਸ ਖੋਜ"</string> @@ -964,7 +963,7 @@ <string name="copy" msgid="2681946229533511987">"ਕਾਪੀ ਕਰੋ"</string> <string name="failed_to_copy_to_clipboard" msgid="1833662432489814471">"ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string> <string name="paste" msgid="5629880836805036433">"ਪੇਸਟ ਕਰੋ"</string> - <string name="paste_as_plain_text" msgid="5427792741908010675">"ਸਧਾਰਨ ਲਿਖਤ ਦੇ ਤੌਰ \'ਤੇ ਪੇਸਟ ਕਰੋ"</string> + <string name="paste_as_plain_text" msgid="5427792741908010675">"ਸਰਲ ਲਿਖਤ ਦੇ ਤੌਰ \'ਤੇ ਪੇਸਟ ਕਰੋ"</string> <string name="replace" msgid="5781686059063148930">"ਬਦਲੋ…"</string> <string name="delete" msgid="6098684844021697789">"ਮਿਟਾਓ"</string> <string name="copyUrl" msgid="2538211579596067402">"URL ਕਾਪੀ ਕਰੋ"</string> @@ -1374,7 +1373,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"ਹੋਰ ਚੋਣਾਂ"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="3570990907910199483">"ਸਾਂਝੀ ਕੀਤੀ ਗਈ ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string> + <string name="storage_internal" msgid="3570990907910199483">"ਅੰਦਰੂਨੀ ਸਾਂਝੀ ਕੀਤੀ ਸਟੋਰੇਜ"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD ਕਾਰਡ"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD ਕਾਰਡ"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ਡ੍ਰਾਇਵ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 0f4e2e87d7c6..5bca5a95dd13 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ustawienia"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoc"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asystent głosowy"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Użyj blokady"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nowe powiadomienie"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Klawiatura wirtualna"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index bb370553763c..43c0bb177f7c 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configurações"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistência"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Bloqueio. total"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nova notificação"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 60d79000b8e9..d130f978c3e6 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Definições"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistência"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Assist. de voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Ativar bloqueio"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nova notificação"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index bb370553763c..43c0bb177f7c 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Configurações"</string> <string name="global_action_assist" msgid="3892832961594295030">"Assistência"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ajuda de voz"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Bloqueio. total"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nova notificação"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Teclado virtual"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 81ab4dd6a3e3..d49694152cc2 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Setări"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asistență"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Asistent vocal"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Introduceți blocarea"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"˃999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Notificare nouă"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastatură virtuală"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index b01a6fc23888..564dbbb23dbb 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Настройки"</string> <string name="global_action_assist" msgid="3892832961594295030">"Помощник"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Аудиоподсказки"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Заблокировать"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">">999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Новое уведомление"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуальная клавиатура"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 25558253e5b0..39caed3a91bf 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"සැකසීම්"</string> <string name="global_action_assist" msgid="3892832961594295030">"සහාය දීම"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"හඬ සහායක"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"අගුලු දැමීමට යන්න"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"නව දැනුම්දීම"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"අතථ්ය යතුරු පුවරුව"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 4bf240a10f22..11b9c88d3a71 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Nastavenia"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomôcť"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Hlasový asistent"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Uzamknúť"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Nové upozornenie"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuálna klávesnica"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 31582d240b6f..71b7126ab8f7 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Nastavitve"</string> <string name="global_action_assist" msgid="3892832961594295030">"Pomoč"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Glas. pomočnik"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Vklopi zaklep"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999 +"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Novo obvestilo"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Navidezna tipkovnica"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index d9bbed001ada..3ad574a1bfca 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Cilësimet"</string> <string name="global_action_assist" msgid="3892832961594295030">"Ndihma"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ndihma zanore"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Kyç"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Njoftim i ri"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Tastiera virtuale"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 138df3b8bd69..f9b865d2fff2 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -233,8 +233,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Подешавања"</string> <string name="global_action_assist" msgid="3892832961594295030">"Помоћ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Гласовна помоћ"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Закључај"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ново обавештење"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Виртуелна тастатура"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 0edf2773e2b3..3f7cecb94fc6 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Inställningar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Hjälp"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Ange låsning"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Ny avisering"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtuellt tangentbord"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 08d930a7456c..8bda7f84f55f 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -228,8 +228,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Mipangilio"</string> <string name="global_action_assist" msgid="3892832961594295030">"Mapendekezo"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Usaidizi wa Sauti"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Weka kipengele cha kufunga"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Arifa mpya"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Kibodi pepe"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index c76f53f3c2b7..9405608cf48a 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"அமைப்பு"</string> <string name="global_action_assist" msgid="3892832961594295030">"உதவி"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"குரல் உதவி"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"பூட்டினை அமை"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"புதிய அறிவிப்பு"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"விர்ச்சுவல் விசைப்பலகை"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 1117cea64ecd..bd984c534cef 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"సెట్టింగ్లు"</string> <string name="global_action_assist" msgid="3892832961594295030">"సహాయం"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"వాయిస్ అసిస్టెంట్"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"లాక్డౌన్ నమోదు చేయండి"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"కొత్త నోటిఫికేషన్"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"వర్చువల్ కీబోర్డ్"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index dd1b62deef45..2653dea7f729 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"การตั้งค่า"</string> <string name="global_action_assist" msgid="3892832961594295030">"ผู้ช่วย"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"ตัวช่วยเสียง"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"ป้อนการปิดล็อก"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"การแจ้งเตือนใหม่"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"แป้นพิมพ์เสมือน"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 1a8751f544c9..da41b9e87ef3 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Mga Setting"</string> <string name="global_action_assist" msgid="3892832961594295030">"Tulong"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Mag-lockdown"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Bagong notification"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual na keyboard"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 803233850a15..41a3eae12eca 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Ayarlar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Asist"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Sesli Yardım"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Tam kilitlemeye geç"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Yeni bildirim"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Sanal klavye"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index ee06099e54af..f0e2c1dd3bdd 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -236,8 +236,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Налаштування"</string> <string name="global_action_assist" msgid="3892832961594295030">"Підказки"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Голос. підказки"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Введіть код блокування"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Нове сповіщення"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Віртуальна клавіатура"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index df6af2b69e9b..2d9717d4861e 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"ترتیبات"</string> <string name="global_action_assist" msgid="3892832961594295030">"اسسٹ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"مقفل درج کریں"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"نئی اطلاع"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"ورچوئل کی بورڈ"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index d91b8f43b9ea..f639e800d054 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Sozlamalar"</string> <string name="global_action_assist" msgid="3892832961594295030">"Yordam"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Ovozli yordam"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Bloklash"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Yangi bildirishnoma"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual klaviatura"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 08c257d57ee8..58e0e34a24eb 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Cài đặt"</string> <string name="global_action_assist" msgid="3892832961594295030">"Hỗ trợ"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Trợ lý thoại"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Nhập khóa"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Thông báo mới"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Bàn phím ảo"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 2f6439aafd7e..e87f76cdc5ac 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"设置"</string> <string name="global_action_assist" msgid="3892832961594295030">"助理"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"语音助理"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"进入锁定模式"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"新通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虚拟键盘"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 69133b82559c..56ea6a05dc16 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"設定"</string> <string name="global_action_assist" msgid="3892832961594295030">"協助"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"語音助手"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"輸入鎖定項目"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"新通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虛擬鍵盤"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index b34d1ef32f70..17c80b5c15f4 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"設定"</string> <string name="global_action_assist" msgid="3892832961594295030">"協助"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"語音小幫手"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"輸入鎖定"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"超過 999"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"新通知"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"虛擬鍵盤"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 6ddddfb6a9aa..88fb1d78aa86 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -230,8 +230,7 @@ <string name="global_action_settings" msgid="1756531602592545966">"Izilungiselelo"</string> <string name="global_action_assist" msgid="3892832961594295030">"Siza"</string> <string name="global_action_voice_assist" msgid="7751191495200504480">"Isisekeli sezwi"</string> - <!-- no translation found for global_action_lockdown (2277328351790053477) --> - <skip /> + <string name="global_action_lockdown" msgid="2277328351790053477">"Faka iukhiye"</string> <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> <string name="notification_hidden_text" msgid="6351207030447943784">"Isaziso esisha"</string> <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Ikhibhodi ebonakalayo"</string> diff --git a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java index 50e29c2863c2..9d75c784fe41 100644 --- a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java +++ b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java @@ -267,7 +267,7 @@ public class DatabaseGeneralTest extends AndroidTestCase implements PerformanceT * @throws Exception */ @SmallTest - public void testPhoneNumbersEqualInternationl() throws Exception { + public void testPhoneNumbersEqualInternational() throws Exception { assertPhoneNumberEqual("1", "1"); assertPhoneNumberEqual("123123", "123123"); assertPhoneNumberNotEqual("123123", "923123"); @@ -288,6 +288,16 @@ public class DatabaseGeneralTest extends AndroidTestCase implements PerformanceT // French trunk digit assertPhoneNumberEqual("+33123456789", "0123456789"); + // Hungarian two digit trunk (currently only works for loose comparison) + assertPhoneNumberEqual("+36 1 234 5678", "06 1234-5678", false); + + // Mexican two digit trunk (currently only works for loose comparison) + assertPhoneNumberEqual("+52 55 1234 5678", "01 55 1234 5678", false); + + // Mongolian two digit trunk (currently only works for loose comparison) + assertPhoneNumberEqual("+976 1 123 4567", "01 1 23 4567", false); + assertPhoneNumberEqual("+976 2 234 5678", "02 2 34 5678", false); + // Trunk digit for city codes in the Netherlands assertPhoneNumberEqual("+31771234567", "0771234567"); @@ -317,9 +327,22 @@ public class DatabaseGeneralTest extends AndroidTestCase implements PerformanceT assertPhoneNumberEqual("008001231234", "8001231234", false); assertPhoneNumberNotEqual("008001231234", "8001231234", true); - // Confirm that the bug found before does not re-appear in the strict compalation - assertPhoneNumberEqual("080-1234-5678", "+819012345678", false); - assertPhoneNumberNotEqual("080-1234-5678", "+819012345678", true); + // Confirm that the bug found before does not re-appear + assertPhoneNumberNotEqual("080-1234-5678", "+819012345678"); + + // Wrong prefix for Japan (currently only works for loose comparison) + assertPhoneNumberNotEqual("290-1234-5678", "+819012345678", false); + assertPhoneNumberNotEqual("+819012345678", "290-1234-5678", false); + + // Wrong prefix for USA + assertPhoneNumberNotEqual("550-450-3605", "+14504503605"); + assertPhoneNumberNotEqual("550-450-3605", "+15404503605"); + assertPhoneNumberNotEqual("550-450-3605", "+15514503605"); + assertPhoneNumberNotEqual("5504503605", "+14504503605"); + assertPhoneNumberNotEqual("+14504503605", "550-450-3605"); + assertPhoneNumberNotEqual("+15404503605", "550-450-3605"); + assertPhoneNumberNotEqual("+15514503605", "550-450-3605"); + assertPhoneNumberNotEqual("+14504503605", "5504503605"); } @MediumTest diff --git a/core/tests/coretests/src/android/database/NewDatabasePerformanceTests.java b/core/tests/coretests/src/android/database/NewDatabasePerformanceTests.java index bcd90600b48a..75809c0fce4b 100644 --- a/core/tests/coretests/src/android/database/NewDatabasePerformanceTests.java +++ b/core/tests/coretests/src/android/database/NewDatabasePerformanceTests.java @@ -18,41 +18,70 @@ package android.database; import android.content.ContentValues; import android.database.sqlite.SQLiteDatabase; +import android.os.SystemProperties; import android.test.PerformanceTestCase; +import android.util.ArrayMap; import android.util.Log; import junit.framework.TestCase; import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.List; +import java.util.Map; import java.util.Random; /** - * Database Performance Tests - * + * Database Performance Tests. + * + * <p>Usage: + * <code>./frameworks/base/core/tests/coretests/src/android/database/run_newdb_perf_test.sh</code> + * <p>Test with WAL journaling enabled: + * <code>setprop debug.NewDatabasePerformanceTests.enable_wal 1</code> */ - public class NewDatabasePerformanceTests { private static final String TAG = "NewDatabasePerformanceTests"; + private static final boolean DEBUG_ENABLE_WAL = SystemProperties + .getBoolean("debug.NewDatabasePerformanceTests.enable_wal", false); + private static final int DATASET_SIZE = 100; // Size of dataset to use for testing private static final int FAST_OP_MULTIPLIER = 25; private static final int FAST_OP_COUNT = FAST_OP_MULTIPLIER * DATASET_SIZE; + private static Long sInitialWriteBytes; + + static { + sInitialWriteBytes = getIoStats().get("write_bytes"); + if (DEBUG_ENABLE_WAL) { + Log.i(TAG, "Testing with WAL enabled"); + } + } + public static class PerformanceBase extends TestCase - implements PerformanceTestCase { + implements PerformanceTestCase { protected static final int CURRENT_DATABASE_VERSION = 42; protected SQLiteDatabase mDatabase; protected File mDatabaseFile; private long mSetupFinishedTime; + private Long mSetupWriteBytes; public void setUp() { long setupStarted = System.currentTimeMillis(); mDatabaseFile = new File("/sdcard", "perf_database_test.db"); if (mDatabaseFile.exists()) { - mDatabaseFile.delete(); + SQLiteDatabase.deleteDatabase(mDatabaseFile); + } + SQLiteDatabase.OpenParams.Builder params = new SQLiteDatabase.OpenParams.Builder(); + params.addOpenFlags(SQLiteDatabase.CREATE_IF_NECESSARY); + if (DEBUG_ENABLE_WAL) { + params.addOpenFlags(SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING); + } + mDatabase = SQLiteDatabase.openDatabase(mDatabaseFile, params.build()); + if (DEBUG_ENABLE_WAL) { + assertTrue("Cannot enable WAL", mDatabase.isWriteAheadLoggingEnabled()); } - mDatabase = SQLiteDatabase.openOrCreateDatabase(mDatabaseFile.getPath(), null); - assertTrue(mDatabase != null); mDatabase.setVersion(CURRENT_DATABASE_VERSION); mDatabase.beginTransactionNonExclusive(); prepareForTest(); @@ -61,6 +90,7 @@ public class NewDatabasePerformanceTests { mSetupFinishedTime = System.currentTimeMillis(); Log.i(TAG, "Setup for " + getClass().getSimpleName() + " took " + (mSetupFinishedTime - setupStarted) + " ms"); + mSetupWriteBytes = getIoStats().get("write_bytes"); } protected void prepareForTest() { @@ -70,7 +100,14 @@ public class NewDatabasePerformanceTests { long duration = System.currentTimeMillis() - mSetupFinishedTime; Log.i(TAG, "Test " + getClass().getSimpleName() + " took " + duration + " ms"); mDatabase.close(); - mDatabaseFile.delete(); + SQLiteDatabase.deleteDatabase(mDatabaseFile); + Long writeBytes = getIoStats().get("write_bytes"); + if (writeBytes != null && sInitialWriteBytes != null) { + long testWriteBytes = writeBytes - mSetupWriteBytes; + long totalWriteBytes = (writeBytes - sInitialWriteBytes); + Log.i(TAG, "Test " + getClass().getSimpleName() + " write_bytes=" + testWriteBytes + + ". Since tests started - totalWriteBytes=" + totalWriteBytes); + } } public boolean isPerformanceOnly() { @@ -897,4 +934,31 @@ public class NewDatabasePerformanceTests { static final String[] TENS = {"", "ten", "twenty", "thirty", "forty", "fifty", "sixty", "seventy", "eighty", "ninety"}; + + static Map<String, Long> getIoStats() { + String ioStat = "/proc/self/io"; + Map<String, Long> results = new ArrayMap<>(); + try { + List<String> lines = Files.readAllLines(new File(ioStat).toPath()); + for (String line : lines) { + line = line.trim(); + String[] split = line.split(":"); + if (split.length == 2) { + try { + String key = split[0].trim(); + Long value = Long.valueOf(split[1].trim()); + results.put(key, value); + } catch (NumberFormatException e) { + Log.e(TAG, "Cannot parse number from " + line); + } + } else if (line.isEmpty()) { + Log.e(TAG, "Cannot parse line " + line); + } + } + } catch (IOException e) { + Log.e(TAG, "Can't read: " + ioStat, e); + } + return results; + } + } diff --git a/core/tests/coretests/src/android/database/process_newdb_perf_test_logs.py b/core/tests/coretests/src/android/database/process_newdb_perf_test_logs.py index 1faeceb78d8b..27b20c327c0b 100644 --- a/core/tests/coretests/src/android/database/process_newdb_perf_test_logs.py +++ b/core/tests/coretests/src/android/database/process_newdb_perf_test_logs.py @@ -25,7 +25,16 @@ def main(): all_lines = f.readlines() timings = {} running_sum = 0 + # If WAL was enabled for the test + wal_enabled = False + # Number of bytes which test process caused to be sent to the storage layer. + # Reported as max value across all runs. + max_write_bytes = 0 for line in all_lines: + if "NewDatabasePerformanceTests: Testing with WAL enabled" in line: + wal_enabled = True + continue + regex = r"NewDatabasePerformanceTests: Test (\w+) took (\d+) ms" matches = re.search(regex, line) if matches: @@ -35,16 +44,31 @@ def main(): timings[test_name] = [] timings[test_name].append(duration) running_sum += duration + continue + if ("TestRunner: run finished:" in line) and (running_sum > 0): - test_name = '*** TOTAL ALL TESTS (ms) ***' + test_name = ('*** TOTAL ALL TESTS [WAL] (ms) ***' if wal_enabled + else '*** TOTAL ALL TESTS (ms) ***') if not test_name in timings: timings[test_name] = [] timings[test_name].append(running_sum) running_sum=0 + continue + + # Determine max from all reported totalWriteBytes + regex = r"Test .* totalWriteBytes=(\d+)" + matches = re.search(regex, line) + if matches: + max_write_bytes = max(max_write_bytes, int(matches.group(1))) + continue for k in sorted(timings): timings_ar = timings[k] print "%s: %s avg: %s" % (k, timings_ar, sum(timings_ar) / float(len(timings_ar)) ) + + print "\nAdditional stats: " + print " max write_bytes: %d" % max_write_bytes + if __name__ == '__main__': main() diff --git a/core/tests/coretests/src/android/net/LinkPropertiesTest.java b/core/tests/coretests/src/android/net/LinkPropertiesTest.java index bc2b9a632b72..1cb0ecdba7f3 100644 --- a/core/tests/coretests/src/android/net/LinkPropertiesTest.java +++ b/core/tests/coretests/src/android/net/LinkPropertiesTest.java @@ -753,7 +753,7 @@ public class LinkPropertiesTest extends TestCase { @SmallTest public void testCompareResult() { // Either adding or removing items - testCompareResult(Arrays.asList(1), Arrays.asList(1, 2, 3, 4), + testCompareResult(Arrays.asList(1, 2, 3, 4), Arrays.asList(1), Arrays.asList(2, 3, 4), new ArrayList<>()); testCompareResult(Arrays.asList(1, 2), Arrays.asList(3, 2, 1, 4), new ArrayList<>(), Arrays.asList(3, 4)); @@ -780,9 +780,9 @@ public class LinkPropertiesTest extends TestCase { assertEquals(expectedSet, actualSet); } - private <T> void testCompareResult(List<T> oldItems, List<T> newItems, List<T> expectAdded, - List<T> expectRemoved) { - CompareResult<T> result = new CompareResult<>(newItems, oldItems); + private <T> void testCompareResult(List<T> oldItems, List<T> newItems, List<T> expectRemoved, + List<T> expectAdded) { + CompareResult<T> result = new CompareResult<>(oldItems, newItems); assertEquals(new ArraySet<>(expectAdded), new ArraySet<>(result.added)); assertEquals(new ArraySet<>(expectRemoved), (new ArraySet<>(result.removed))); } diff --git a/libs/hwui/VectorDrawable.h b/libs/hwui/VectorDrawable.h index 10d3e05c067f..4b80542ad0d0 100644 --- a/libs/hwui/VectorDrawable.h +++ b/libs/hwui/VectorDrawable.h @@ -558,6 +558,16 @@ public: SkPaint* getPaint(); void syncProperties() { if (mStagingProperties.mNonAnimatablePropertiesDirty) { + mCache.dirty |= (mProperties.mNonAnimatableProperties.viewportWidth + != mStagingProperties.mNonAnimatableProperties.viewportWidth) + || (mProperties.mNonAnimatableProperties.viewportHeight + != mStagingProperties.mNonAnimatableProperties.viewportHeight) + || (mProperties.mNonAnimatableProperties.scaledWidth + != mStagingProperties.mNonAnimatableProperties.scaledWidth) + || (mProperties.mNonAnimatableProperties.scaledHeight + != mStagingProperties.mNonAnimatableProperties.scaledHeight) + || (mProperties.mNonAnimatableProperties.bounds + != mStagingProperties.mNonAnimatableProperties.bounds); mProperties.syncNonAnimatableProperties(mStagingProperties); mStagingProperties.mNonAnimatablePropertiesDirty = false; } diff --git a/libs/hwui/service/GraphicsStatsService.cpp b/libs/hwui/service/GraphicsStatsService.cpp index 3a77195824ad..afb1193657e1 100644 --- a/libs/hwui/service/GraphicsStatsService.cpp +++ b/libs/hwui/service/GraphicsStatsService.cpp @@ -40,7 +40,7 @@ static_assert(sizeof(sCurrentFileVersion) == sHeaderSize, "Header size is wrong" constexpr int sHistogramSize = ProfileData::HistogramSize(); -static void mergeProfileDataIntoProto(service::GraphicsStatsProto* proto, +static bool mergeProfileDataIntoProto(service::GraphicsStatsProto* proto, const std::string& package, int versionCode, int64_t startTime, int64_t endTime, const ProfileData* data); static void dumpAsTextToFd(service::GraphicsStatsProto* proto, int outFd); @@ -159,7 +159,7 @@ bool GraphicsStatsService::parseFromFile(const std::string& path, service::Graph return success; } -void mergeProfileDataIntoProto(service::GraphicsStatsProto* proto, const std::string& package, +bool mergeProfileDataIntoProto(service::GraphicsStatsProto* proto, const std::string& package, int versionCode, int64_t startTime, int64_t endTime, const ProfileData* data) { if (proto->stats_start() == 0 || proto->stats_start() > startTime) { proto->set_stats_start(startTime); @@ -188,23 +188,31 @@ void mergeProfileDataIntoProto(service::GraphicsStatsProto* proto, const std::st proto->mutable_histogram()->Reserve(sHistogramSize); creatingHistogram = true; } else if (proto->histogram_size() != sHistogramSize) { - LOG_ALWAYS_FATAL("Histogram size mismatch, proto is %d expected %d", + ALOGE("Histogram size mismatch, proto is %d expected %d", proto->histogram_size(), sHistogramSize); + return false; } int index = 0; + bool hitMergeError = false; data->histogramForEach([&](ProfileData::HistogramEntry entry) { + if (hitMergeError) return; + service::GraphicsStatsHistogramBucketProto* bucket; if (creatingHistogram) { bucket = proto->add_histogram(); bucket->set_render_millis(entry.renderTimeMs); } else { bucket = proto->mutable_histogram(index); - LOG_ALWAYS_FATAL_IF(bucket->render_millis() != static_cast<int32_t>(entry.renderTimeMs), - "Frame time mistmatch %d vs. %u", bucket->render_millis(), entry.renderTimeMs); + if (bucket->render_millis() != static_cast<int32_t>(entry.renderTimeMs)) { + ALOGW("Frame time mistmatch %d vs. %u", bucket->render_millis(), entry.renderTimeMs); + hitMergeError = true; + return; + } } bucket->set_frame_count(bucket->frame_count() + entry.frameCount); index++; }); + return !hitMergeError; } static int32_t findPercentile(service::GraphicsStatsProto* proto, int percentile) { @@ -221,9 +229,11 @@ static int32_t findPercentile(service::GraphicsStatsProto* proto, int percentile void dumpAsTextToFd(service::GraphicsStatsProto* proto, int fd) { // This isn't a full validation, just enough that we can deref at will - LOG_ALWAYS_FATAL_IF(proto->package_name().empty() - || !proto->has_summary(), "package_name() '%s' summary %d", - proto->package_name().c_str(), proto->has_summary()); + if (proto->package_name().empty() || !proto->has_summary()) { + ALOGW("Skipping dump, invalid package_name() '%s' or summary %d", + proto->package_name().c_str(), proto->has_summary()); + return; + } dprintf(fd, "\nPackage: %s", proto->package_name().c_str()); dprintf(fd, "\nVersion: %d", proto->version_code()); dprintf(fd, "\nStats since: %lldns", proto->stats_start()); @@ -254,14 +264,20 @@ void GraphicsStatsService::saveBuffer(const std::string& path, const std::string if (!parseFromFile(path, &statsProto)) { statsProto.Clear(); } - mergeProfileDataIntoProto(&statsProto, package, versionCode, startTime, endTime, data); + if (!mergeProfileDataIntoProto(&statsProto, package, versionCode, startTime, endTime, data)) { + return; + } // Although we might not have read any data from the file, merging the existing data // should always fully-initialize the proto - LOG_ALWAYS_FATAL_IF(!statsProto.IsInitialized(), "%s", - statsProto.InitializationErrorString().c_str()); - LOG_ALWAYS_FATAL_IF(statsProto.package_name().empty() - || !statsProto.has_summary(), "package_name() '%s' summary %d", - statsProto.package_name().c_str(), statsProto.has_summary()); + if (!statsProto.IsInitialized()) { + ALOGE("proto initialization error %s", statsProto.InitializationErrorString().c_str()); + return; + } + if (statsProto.package_name().empty() || !statsProto.has_summary()) { + ALOGE("missing package_name() '%s' summary %d", + statsProto.package_name().c_str(), statsProto.has_summary()); + return; + } int outFd = open(path.c_str(), O_CREAT | O_RDWR | O_TRUNC, 0660); if (outFd <= 0) { int err = errno; @@ -312,8 +328,9 @@ void GraphicsStatsService::addToDump(Dump* dump, const std::string& path, const if (!path.empty() && !parseFromFile(path, &statsProto)) { statsProto.Clear(); } - if (data) { - mergeProfileDataIntoProto(&statsProto, package, versionCode, startTime, endTime, data); + if (data && !mergeProfileDataIntoProto( + &statsProto, package, versionCode, startTime, endTime, data)) { + return; } if (!statsProto.IsInitialized()) { ALOGW("Failed to load profile data from path '%s' and data %p", diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index f85925d8d867..f41e33f7c102 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -2749,8 +2749,8 @@ public final class MediaCodecInfo { mQualityRange = Utils .parseIntRange(info.getString("quality-range"), mQualityRange); } - if (info.containsKey("feature-bitrate-control")) { - for (String mode: info.getString("feature-bitrate-control").split(",")) { + if (info.containsKey("feature-bitrate-modes")) { + for (String mode: info.getString("feature-bitrate-modes").split(",")) { mBitControl |= parseBitrateMode(mode); } } diff --git a/packages/BackupRestoreConfirmation/res/values-mr/strings.xml b/packages/BackupRestoreConfirmation/res/values-mr/strings.xml index ea3b2f05e8f3..3ee60ca84e74 100644 --- a/packages/BackupRestoreConfirmation/res/values-mr/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values-mr/strings.xml @@ -25,11 +25,11 @@ <string name="allow_restore_button_label" msgid="3081286752277127827">"माझा डेटा पुनर्संचयित करा"</string> <string name="deny_restore_button_label" msgid="1724367334453104378">"पुनर्संचयित करू नका"</string> <string name="current_password_text" msgid="8268189555578298067">"कृपया आपला वर्तमान बॅकअप संकेतशब्द खाली प्रविष्ट करा:"</string> - <string name="device_encryption_restore_text" msgid="1570864916855208992">"कृपया तुमचे डीव्हाइस एंक्रिप्शन पासवर्ड खाली एंटर करा."</string> - <string name="device_encryption_backup_text" msgid="5866590762672844664">"कृपया तुमचे डीव्हाइस एंक्रिप्शन पासवर्ड खाली एंटर करा. हा बॅकअप संग्रह एंक्रिप्ट करण्यासाठी देखील वापरला जाईल."</string> + <string name="device_encryption_restore_text" msgid="1570864916855208992">"कृपया तुमचे डिव्हाइस एंक्रिप्शन पासवर्ड खाली एंटर करा."</string> + <string name="device_encryption_backup_text" msgid="5866590762672844664">"कृपया तुमचे डिव्हाइस एंक्रिप्शन पासवर्ड खाली एंटर करा. हा बॅकअप संग्रह एंक्रिप्ट करण्यासाठी देखील वापरला जाईल."</string> <string name="backup_enc_password_text" msgid="4981585714795233099">"कृपया पूर्ण बॅकअप डेटा एंक्रिप्ट करण्यासाठी वापरण्याकरिता पासवर्ड एंटर करा. हे रिक्त सोडल्यास, आपला वर्तमान बॅकअप पासवर्ड वापरला जाईल:"</string> <string name="backup_enc_password_optional" msgid="1350137345907579306">"तुम्ही पूर्ण बॅकअप डेटा एंक्रिप्ट करू इच्छित असल्यास, खालील पासवर्ड एंटर करा:"</string> - <string name="backup_enc_password_required" msgid="7889652203371654149">"तुमचे डीव्हाइस एंक्रिप्ट केले असल्यामुळे, तुम्हाला तुमचा बॅक अप एंक्रिप्ट करणे आवश्यक आहे. कृपया खाली एक पासवर्ड एंटर करा:"</string> + <string name="backup_enc_password_required" msgid="7889652203371654149">"तुमचे डिव्हाइस एंक्रिप्ट केले असल्यामुळे, तुम्हाला तुमचा बॅक अप एंक्रिप्ट करणे आवश्यक आहे. कृपया खाली एक पासवर्ड एंटर करा:"</string> <string name="restore_enc_password_text" msgid="6140898525580710823">"पुनर्स्टोअर केलेला डेटा एंक्रिप्ट केला असल्यास, कृपया पासवर्ड खाली एंटर करा:"</string> <string name="toast_backup_started" msgid="550354281452756121">"बॅकअप सुरू होत आहे..."</string> <string name="toast_backup_ended" msgid="3818080769548726424">"बॅकअप समाप्त झाले"</string> diff --git a/packages/InputDevices/res/values-mr/strings.xml b/packages/InputDevices/res/values-mr/strings.xml index 70b7c77b69e9..e8575a85cf73 100644 --- a/packages/InputDevices/res/values-mr/strings.xml +++ b/packages/InputDevices/res/values-mr/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="8016145283189546017">"इनपुट डीव्हाइस"</string> + <string name="app_label" msgid="8016145283189546017">"इनपुट डिव्हाइस"</string> <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android कीबोर्ड"</string> <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"इंग्रजी (यूके)"</string> <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"इंग्रजी (यूएस)"</string> diff --git a/packages/MtpDocumentsProvider/res/values-mr/strings.xml b/packages/MtpDocumentsProvider/res/values-mr/strings.xml index 9b50e93cf11a..89a9d14243d9 100644 --- a/packages/MtpDocumentsProvider/res/values-mr/strings.xml +++ b/packages/MtpDocumentsProvider/res/values-mr/strings.xml @@ -20,6 +20,6 @@ <string name="downloads_app_label" msgid="7120690641874849726">"डाउनलोड"</string> <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string> <string name="accessing_notification_title" msgid="3030133609230917944">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> मधून फायलींंमध्ये प्रवेश करीत आहे"</string> - <string name="error_busy_device" msgid="3997316850357386589">"दुसरे डीव्हाइस व्यस्त आहे. ते उपलब्ध होईपर्यंत तुम्ही फायली ट्रांसफर करू शकत नाही."</string> - <string name="error_locked_device" msgid="7557872102188356147">"कोणत्याही फायली आढळल्या नाहीत. दुसरे डीव्हाइस कदाचित बंद असू शकते. तसे असल्यास, ते अनलॉक करा आणि पुन्हा प्रयत्न करा."</string> + <string name="error_busy_device" msgid="3997316850357386589">"दुसरे डिव्हाइस व्यस्त आहे. ते उपलब्ध होईपर्यंत तुम्ही फायली ट्रांसफर करू शकत नाही."</string> + <string name="error_locked_device" msgid="7557872102188356147">"कोणत्याही फायली आढळल्या नाहीत. दुसरे डिव्हाइस कदाचित बंद असू शकते. तसे असल्यास, ते अनलॉक करा आणि पुन्हा प्रयत्न करा."</string> </resources> diff --git a/packages/PrintSpooler/res/values-ne/strings.xml b/packages/PrintSpooler/res/values-ne/strings.xml index 75991f572aaa..18f96dde9e07 100644 --- a/packages/PrintSpooler/res/values-ne/strings.xml +++ b/packages/PrintSpooler/res/values-ne/strings.xml @@ -84,7 +84,7 @@ <string name="failed_notification_title_template" msgid="2256217208186530973">"प्रिन्टर त्रुटि <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string> <string name="blocked_notification_title_template" msgid="1175435827331588646">"प्रिन्टर ब्लक गरियो <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string> <string name="cancel" msgid="4373674107267141885">"रद्द गर्नुहोस्"</string> - <string name="restart" msgid="2472034227037808749">"पुनः सुरू गर्नुहोस्"</string> + <string name="restart" msgid="2472034227037808749">"पुनः सुरु गर्नुहोस्"</string> <string name="no_connection_to_printer" msgid="2159246915977282728">"प्रिन्टरमा कुनै जडान छैन"</string> <string name="reason_unknown" msgid="5507940196503246139">"अज्ञात"</string> <string name="print_service_security_warning_title" msgid="2160752291246775320">"<xliff:g id="SERVICE">%1$s</xliff:g> प्रयोग गर्ने हो?"</string> diff --git a/packages/PrintSpooler/res/values-pa/strings.xml b/packages/PrintSpooler/res/values-pa/strings.xml index 634ce90b8220..4ce8f97315e3 100644 --- a/packages/PrintSpooler/res/values-pa/strings.xml +++ b/packages/PrintSpooler/res/values-pa/strings.xml @@ -30,8 +30,8 @@ <string name="destination_default_text" msgid="5422708056807065710">"ਇੱਕ ਪ੍ਰਿੰਟਰ ਚੁਣੋ"</string> <string name="template_all_pages" msgid="3322235982020148762">"ਸਾਰੇ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string> <string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ਦੀ ਰੇਂਜ"</string> - <string name="pages_range_example" msgid="8558694453556945172">"ਉਦਾਹਰਨ ਲਈ 1—5,8,11—13"</string> - <string name="print_preview" msgid="8010217796057763343">"ਪ੍ਰਿੰਟ ਪ੍ਰੀਵਿਊ"</string> + <string name="pages_range_example" msgid="8558694453556945172">"ਉਦਾਹਰਨ ਵਜੋਂ 1—5,8,11—13"</string> + <string name="print_preview" msgid="8010217796057763343">"ਪ੍ਰਿੰਟ ਦੀ ਪੂਰਵ-ਝਲਕ"</string> <string name="install_for_print_preview" msgid="6366303997385509332">"ਪੂਰਵ-ਝਲਕ ਲਈ PDF ਵਿਊਅਰ ਸਥਾਪਤ ਕਰੋ"</string> <string name="printing_app_crashed" msgid="854477616686566398">"ਪ੍ਰਿੰਟਿੰਗ ਐਪ ਕ੍ਰੈਸ਼ ਹੋਇਆ"</string> <string name="generating_print_job" msgid="3119608742651698916">"ਪ੍ਰਿੰਟ ਜੌਬ ਬਣਾ ਰਿਹਾ ਹੈ"</string> @@ -106,6 +106,6 @@ <string name="print_error_default_message" msgid="8602678405502922346">"ਮਾਫ਼ ਕਰਨਾ, ਉਸਨੇ ਲਾਭਕਾਰੀ ਨਹੀਂ ਹੋਇਆ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string> <string name="print_error_retry" msgid="1426421728784259538">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string> <string name="print_error_printer_unavailable" msgid="8985614415253203381">"ਇਹ ਪ੍ਰਿੰਟਰ ਇਸ ਵੇਲੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string> - <string name="print_cannot_load_page" msgid="6179560924492912009">"ਪੂਰਵ-ਝਲਕ ਨਹੀਂ ਪ੍ਰਦਰਸ਼ਿਤ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string> - <string name="print_preparing_preview" msgid="3939930735671364712">"ਪ੍ਰੀਵਿਊ ਦੀ ਤਿਆਰੀ ਕਰ ਰਿਹਾ ਹੈ…"</string> + <string name="print_cannot_load_page" msgid="6179560924492912009">"ਪੂਰਵ-ਝਲਕ ਨਹੀਂ ਦਿਖਾਈ ਜਾ ਸਕਦੀ"</string> + <string name="print_preparing_preview" msgid="3939930735671364712">"ਪੂਰਵ-ਝਲਕ ਦੀ ਤਿਆਰੀ ਕਰ ਰਿਹਾ ਹੈ…"</string> </resources> diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml index b53765b2bf60..f8cf1070a987 100644 --- a/packages/SettingsLib/res/values-fr/strings.xml +++ b/packages/SettingsLib/res/values-fr/strings.xml @@ -377,8 +377,8 @@ <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Petit"</string> <string name="screen_zoom_summary_default" msgid="2247006805614056507">"Par défaut"</string> <string name="screen_zoom_summary_large" msgid="4835294730065424084">"Grand"</string> - <string name="screen_zoom_summary_very_large" msgid="7108563375663670067">"Plus grand"</string> - <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"Le plus grand"</string> + <string name="screen_zoom_summary_very_large" msgid="7108563375663670067">"Très grand"</string> + <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"Extrêmement grand"</string> <string name="screen_zoom_summary_custom" msgid="5611979864124160447">"Personnalisé (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string> <string name="help_feedback_label" msgid="6815040660801785649">"Aide et commentaires"</string> <string name="content_description_menu_button" msgid="8182594799812351266">"Menu"</string> diff --git a/packages/SettingsLib/res/values-mr/strings.xml b/packages/SettingsLib/res/values-mr/strings.xml index 99dd3a185295..5e9ecdb0e14c 100644 --- a/packages/SettingsLib/res/values-mr/strings.xml +++ b/packages/SettingsLib/res/values-mr/strings.xml @@ -368,9 +368,9 @@ <string name="install_other_apps" msgid="6986686991775883017">"अज्ञात अॅप्स इंस्टॉल करा"</string> <string name="home" msgid="3256884684164448244">"सेटिंग्ज होम"</string> <string-array name="battery_labels"> - <item msgid="8494684293649631252">"0%"</item> - <item msgid="8934126114226089439">"50%"</item> - <item msgid="1286113608943010849">"100%"</item> + <item msgid="8494684293649631252">"०%"</item> + <item msgid="8934126114226089439">"५०%"</item> + <item msgid="1286113608943010849">"१००%"</item> </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> पूर्वी"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> शिल्लक"</string> diff --git a/packages/SettingsLib/res/values-pa/arrays.xml b/packages/SettingsLib/res/values-pa/arrays.xml index b6e97ca99eda..750aee0ec856 100644 --- a/packages/SettingsLib/res/values-pa/arrays.xml +++ b/packages/SettingsLib/res/values-pa/arrays.xml @@ -249,7 +249,7 @@ <string-array name="usb_configuration_titles"> <item msgid="488237561639712799">"ਚਾਰਜਿੰਗ"</item> <item msgid="5220695614993094977">"MTP (ਮੀਡੀਆ ਟ੍ਰਾਂਸਫਰ ਪ੍ਰੋਟੋਕੋਲ)"</item> - <item msgid="2086000968159047375">"PTP (ਤਸਵੀਰ ਟ੍ਰਾਂਸਫਰ ਪ੍ਰੋਟੋਕੋਲ)"</item> + <item msgid="2086000968159047375">"PTP (ਪਿਕਚਰ ਟ੍ਰਾਂਸਫਰ ਪ੍ਰੋਟੋਕੋਲ)"</item> <item msgid="7398830860950841822">"RNDIS (USB ਈਥਰਨੈਟ)"</item> <item msgid="1718924214939774352">" ਆਡੀਓ ਸਰੋਤ"</item> <item msgid="8126315616613006284">"MIDI"</item> diff --git a/packages/SettingsLib/res/values-pa/strings.xml b/packages/SettingsLib/res/values-pa/strings.xml index 10a1b0de1880..6e93e86992a9 100644 --- a/packages/SettingsLib/res/values-pa/strings.xml +++ b/packages/SettingsLib/res/values-pa/strings.xml @@ -36,7 +36,7 @@ <string name="wifi_no_internet" msgid="3880396223819116454">"ਕੋਈ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਨਹੀਂ"</string> <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> ਵੱਲੋਂ ਸੁਰੱਖਿਅਤ ਕੀਤਾ"</string> <string name="connected_via_network_scorer" msgid="5713793306870815341">"%1$s ਰਾਹੀਂ ਆਪਣੇ-ਆਪ ਕਨੈਕਟ ਹੋਇਆ"</string> - <string name="connected_via_network_scorer_default" msgid="7867260222020343104">"ਨੈੱਟਵਰਕ ਰੇਟਿੰਗ ਪ੍ਰਦਾਨਕ ਰਾਹੀਂ ਆਪਣੇ-ਆਪ ਕਨੈਕਟ ਹੋਇਆ"</string> + <string name="connected_via_network_scorer_default" msgid="7867260222020343104">"ਨੈੱਟਵਰਕ ਰੇਟਿੰਗ ਪ੍ਰਦਾਨਕ ਰਾਹੀਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਕਨੈਕਟ ਹੋਇਆ"</string> <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s ਰਾਹੀਂ ਕਨੈਕਟ ਕੀਤਾ"</string> <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s ਰਾਹੀਂ ਉਪਲਬਧ"</string> <string name="wifi_connected_no_internet" msgid="3149853966840874992">"ਕਨੈਕਟ ਕੀਤਾ, ਕੋਈ ਇੰਟਰਨੈੱਟ ਨਹੀਂ"</string> @@ -171,7 +171,7 @@ <string name="tethering_settings_not_available" msgid="6765770438438291012">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਟੈਦਰਿੰਗ ਸੈਟਿੰਗਾਂ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string> <string name="apn_settings_not_available" msgid="7873729032165324000">"ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਨਾਮ ਸੈਟਿੰਗਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string> <string name="enable_adb" msgid="7982306934419797485">"USB ਡੀਬਗਿੰਗ"</string> - <string name="enable_adb_summary" msgid="4881186971746056635">"ਡੀਬਗ ਮੋਡ ਜਦੋਂ USB ਕਨੈਕਟ ਕੀਤੀ ਜਾਏ"</string> + <string name="enable_adb_summary" msgid="4881186971746056635">"ਡੀਬੱਗ ਮੋਡ ਜਦੋਂ USB ਕਨੈਕਟ ਕੀਤੀ ਜਾਏ"</string> <string name="clear_adb_keys" msgid="4038889221503122743">"USB ਡੀਬਗਿੰਗ ਅਧਿਕਾਰ ਰੱਦ ਕਰੋ"</string> <string name="bugreport_in_power" msgid="7923901846375587241">"ਬੱਗ ਰਿਪੋਰਟ ਸ਼ਾਰਟਕੱਟ"</string> <string name="bugreport_in_power_summary" msgid="1778455732762984579">"ਇੱਕ ਬੱਗ ਰਿਪੋਰਟ ਲੈਣ ਲਈ ਪਾਵਰ ਮੀਨੂ ਵਿੱਚ ਇੱਕ ਬਟਨ ਦਿਖਾਓ"</string> @@ -180,7 +180,7 @@ <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ਬਲੂਟੁੱਥ HCI ਸਨੂਪ ਲੌਗ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string> <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ਇੱਕ ਫਾਈਲ ਵਿੱਚ ਸਾਰੇ bluetooth HCI ਪੈਕੇਟ ਕੈਪਚਰ ਕਰੋ"</string> <string name="oem_unlock_enable" msgid="6040763321967327691">"OEM ਅਣਲਾਕ ਕਰਨਾ"</string> - <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ਬੂਟਲੋਡਰ ਨੂੰ ਅਨਲੌਕ ਕੀਤੇ ਜਾਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string> + <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"ਬੂਟਲੋਡਰ ਨੂੰ ਅਣਲਾਕ ਕੀਤੇ ਜਾਣ ਦੀ ਆਗਿਆ ਦਿਓ"</string> <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"ਕੀ OEM ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ਚਿਤਾਵਨੀ: ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਉਦੋਂ ਇਸ ਡੀਵਾਈਸ ਤੇ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਇਹ ਸੈਟਿੰਗ ਚਾਲੂ ਹੋਵੇਗੀ।"</string> <string name="mock_location_app" msgid="7966220972812881854">"ਮੌਕ ਸਥਾਨ ਐਪ ਚੁਣੋ"</string> @@ -223,7 +223,7 @@ <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB ਕੌਂਫਿਗਰੇਸ਼ਨ ਚੁਣੋ"</string> <string name="allow_mock_location" msgid="2787962564578664888">"ਨਕਲੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string> <string name="allow_mock_location_summary" msgid="317615105156345626">"ਨਕਲੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨਾਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string> - <string name="debug_view_attributes" msgid="6485448367803310384">"ਗੁਣ ਛਾਣਬੀਣ ਦੇਖੋ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string> + <string name="debug_view_attributes" msgid="6485448367803310384">"ਵਿਸ਼ੇਸ਼ਤਾ ਛਾਣਬੀਣ ਦੇਖੋ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string> <string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ਹਮੇਸ਼ਾਂ ਮੋਬਾਈਲ ਡਾਟਾ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖੋ ਭਾਵੇਂ ਵਾਈ‑ਫਾਈ ਕਿਰਿਆਸ਼ੀਲ ਹੋਵੇ (ਤੇਜ਼ ਨੈੱਟਵਰਕ ਸਵਿੱਚਿੰਗ ਲਈ)।"</string> <string name="tethering_hardware_offload_summary" msgid="7726082075333346982">"ਉਪਲਬਧ ਹੋਣ \'ਤੇ ਟੈਦਰਿੰਗ ਹਾਰਡਵੇਅਰ ਐਕਸੈੱਲਰੇਸ਼ਨ ਵਰਤੋ"</string> <string name="adb_warning_title" msgid="6234463310896563253">"ਕੀ USB ਡੀਬਗਿੰਗ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string> @@ -241,13 +241,13 @@ <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP ਜਾਂਚ"</string> <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP ਜਾਂਚ ਵਿਵਹਾਰ ਸੈੱਟ ਕਰੋ"</string> <string name="debug_debugging_category" msgid="6781250159513471316">"ਡੀਬਗਿੰਗ"</string> - <string name="debug_app" msgid="8349591734751384446">"ਡੀਬਗ ਐਪ ਚੁਣੋ"</string> - <string name="debug_app_not_set" msgid="718752499586403499">"ਕੋਈ ਡੀਬਗ ਐਪਲੀਕੇਸ਼ਨ ਸੈਟ ਨਹੀਂ ਕੀਤੀ"</string> + <string name="debug_app" msgid="8349591734751384446">"ਡੀਬੱਗ ਐਪ ਚੁਣੋ"</string> + <string name="debug_app_not_set" msgid="718752499586403499">"ਕੋਈ ਡੀਬੱਗ ਐਪਲੀਕੇਸ਼ਨ ਸੈੱਟ ਨਹੀਂ ਕੀਤੀ"</string> <string name="debug_app_set" msgid="2063077997870280017">"ਡੀਬਗਿੰਗ ਐਪਲੀਕੇਸ਼ਨ: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="select_application" msgid="5156029161289091703">"ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ"</string> <string name="no_application" msgid="2813387563129153880">"ਕੁਝ ਨਹੀਂ"</string> - <string name="wait_for_debugger" msgid="1202370874528893091">"ਡੀਬਗਰ ਦੀ ਉਡੀਕ ਕਰੋ"</string> - <string name="wait_for_debugger_summary" msgid="1766918303462746804">"ਡੀਬਗ ਕੀਤੇ ਐਪਲੀਕੇਸ਼ਨ ਐਗਜੀਕਿਊਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਅਟੈਚ ਕਰਨ ਲਈ ਡੀਬਗਰ ਦੀ ਉਡੀਕ ਕਰਦੇ ਹਨ"</string> + <string name="wait_for_debugger" msgid="1202370874528893091">"ਡੀਬੱਗਰ ਦੀ ਉਡੀਕ ਕਰੋ"</string> + <string name="wait_for_debugger_summary" msgid="1766918303462746804">"ਡੀਬੱਗ ਕੀਤੇ ਐਪਲੀਕੇਸ਼ਨ ਐਗਜੀਕਿਊਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਅਟੈਚ ਕਰਨ ਲਈ ਡੀਬੱਗਰ ਦੀ ਉਡੀਕ ਕਰਦੇ ਹਨ"</string> <string name="telephony_monitor_switch" msgid="1764958220062121194">"ਟੈਲੀਫ਼ੋਨੀ ਮੋਨੀਟਰ"</string> <string name="telephony_monitor_switch_summary" msgid="7695552966547975635">"ਟੈਲੀਫ਼ੋਨੀ ਮੋਨੀਟਰ ਟੈਲੀਫ਼ੋਨੀ/ਮੌਡਮ ਪ੍ਰਕਾਰਜਾਤਮਕਤਾ ਵਿੱਚ ਕਿਸੇ ਸਮੱਸਿਆ ਦਾ ਪਤਾ ਲੱਗਣ \'ਤੇ ਲੌਗਾਂ ਨੂੰ ਇਕੱਤਰ ਕਰੇਗਾ ਅਤੇ ਵਰਤੋਂਕਾਰ ਨੂੰ ਇੱਕ ਬੱਗ ਦਾਇਰ ਕਰਨ ਲਈ ਸੂਚਨਾ ਦੇਵੇਗਾ"</string> <string name="debug_input_category" msgid="1811069939601180246">"ਇਨਪੁਟ"</string> @@ -283,7 +283,7 @@ <string name="force_hw_ui_summary" msgid="5535991166074861515">"2d ਡ੍ਰਾਇੰਗ ਲਈ GPU ਦੀ ਵਰਤੋਂ ਤੇ ਜ਼ੋਰ ਪਾਓ"</string> <string name="force_msaa" msgid="7920323238677284387">"4x MSAA ਤੇ ਜ਼ੋਰ ਪਾਓ"</string> <string name="force_msaa_summary" msgid="9123553203895817537">"OpenGL ES 2.0 ਐਪਾਂ ਵਿੱਚ 4x MSAA ਨੂੰ ਚਾਲੂ ਕਰੋ"</string> - <string name="show_non_rect_clip" msgid="505954950474595172">"ਗ਼ੈਰ-ਆਇਤਾਕਾਰ ਕਲਿਪ ਓਪਰੇਸ਼ਨ ਡੀਬਗ ਕਰੋ"</string> + <string name="show_non_rect_clip" msgid="505954950474595172">"ਗੈਰ-ਆਇਤਾਕਾਰ ਕਲਿੱਪ ਓਪਰੇਸ਼ਨ ਡੀਬੱਗ ਕਰੋ"</string> <string name="track_frame_time" msgid="6146354853663863443">"ਪ੍ਰੋਫਾਈਲ GPU ਰੈਂਡਰਿੰਗ"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"ਵਿੰਡੋ ਐਨੀਮੇਸ਼ਨ ਸਕੇਲ"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"ਟ੍ਰਾਂਜਿਸ਼ਨ ਐਨੀਮੇਸ਼ਨ ਸਕੇਲ"</string> diff --git a/packages/SettingsProvider/res/values-af/defaults.xml b/packages/SettingsProvider/res/values-af/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-af/defaults.xml +++ b/packages/SettingsProvider/res/values-af/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-am/defaults.xml b/packages/SettingsProvider/res/values-am/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-am/defaults.xml +++ b/packages/SettingsProvider/res/values-am/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ar/defaults.xml b/packages/SettingsProvider/res/values-ar/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ar/defaults.xml +++ b/packages/SettingsProvider/res/values-ar/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-az/defaults.xml b/packages/SettingsProvider/res/values-az/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-az/defaults.xml +++ b/packages/SettingsProvider/res/values-az/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-b+sr+Latn/defaults.xml b/packages/SettingsProvider/res/values-b+sr+Latn/defaults.xml index 524132e57827..16aed2ec05a3 100644 --- a/packages/SettingsProvider/res/values-b+sr+Latn/defaults.xml +++ b/packages/SettingsProvider/res/values-b+sr+Latn/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%2$s %1$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-be/defaults.xml b/packages/SettingsProvider/res/values-be/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-be/defaults.xml +++ b/packages/SettingsProvider/res/values-be/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-bg/defaults.xml b/packages/SettingsProvider/res/values-bg/defaults.xml index 715e78f83391..7a4c28c65a97 100644 --- a/packages/SettingsProvider/res/values-bg/defaults.xml +++ b/packages/SettingsProvider/res/values-bg/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%2$s от %1$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-bn/defaults.xml b/packages/SettingsProvider/res/values-bn/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-bn/defaults.xml +++ b/packages/SettingsProvider/res/values-bn/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-bs/defaults.xml b/packages/SettingsProvider/res/values-bs/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-bs/defaults.xml +++ b/packages/SettingsProvider/res/values-bs/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ca/defaults.xml b/packages/SettingsProvider/res/values-ca/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ca/defaults.xml +++ b/packages/SettingsProvider/res/values-ca/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-cs/defaults.xml b/packages/SettingsProvider/res/values-cs/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-cs/defaults.xml +++ b/packages/SettingsProvider/res/values-cs/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-da/defaults.xml b/packages/SettingsProvider/res/values-da/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-da/defaults.xml +++ b/packages/SettingsProvider/res/values-da/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-de/defaults.xml b/packages/SettingsProvider/res/values-de/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-de/defaults.xml +++ b/packages/SettingsProvider/res/values-de/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-el/defaults.xml b/packages/SettingsProvider/res/values-el/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-el/defaults.xml +++ b/packages/SettingsProvider/res/values-el/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-en-rAU/defaults.xml b/packages/SettingsProvider/res/values-en-rAU/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-en-rAU/defaults.xml +++ b/packages/SettingsProvider/res/values-en-rAU/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-en-rCA/defaults.xml b/packages/SettingsProvider/res/values-en-rCA/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-en-rCA/defaults.xml +++ b/packages/SettingsProvider/res/values-en-rCA/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-en-rGB/defaults.xml b/packages/SettingsProvider/res/values-en-rGB/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-en-rGB/defaults.xml +++ b/packages/SettingsProvider/res/values-en-rGB/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-en-rIN/defaults.xml b/packages/SettingsProvider/res/values-en-rIN/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-en-rIN/defaults.xml +++ b/packages/SettingsProvider/res/values-en-rIN/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-en-rXC/defaults.xml b/packages/SettingsProvider/res/values-en-rXC/defaults.xml index b32199f372dc..34f63e7abebf 100644 --- a/packages/SettingsProvider/res/values-en-rXC/defaults.xml +++ b/packages/SettingsProvider/res/values-en-rXC/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-es-rUS/defaults.xml b/packages/SettingsProvider/res/values-es-rUS/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-es-rUS/defaults.xml +++ b/packages/SettingsProvider/res/values-es-rUS/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-es/defaults.xml b/packages/SettingsProvider/res/values-es/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-es/defaults.xml +++ b/packages/SettingsProvider/res/values-es/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-et/defaults.xml b/packages/SettingsProvider/res/values-et/defaults.xml index 5ec05cb5688e..37dab156c59f 100644 --- a/packages/SettingsProvider/res/values-et/defaults.xml +++ b/packages/SettingsProvider/res/values-et/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%2$s, %1$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-eu/defaults.xml b/packages/SettingsProvider/res/values-eu/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-eu/defaults.xml +++ b/packages/SettingsProvider/res/values-eu/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-fa/defaults.xml b/packages/SettingsProvider/res/values-fa/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-fa/defaults.xml +++ b/packages/SettingsProvider/res/values-fa/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-fi/defaults.xml b/packages/SettingsProvider/res/values-fi/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-fi/defaults.xml +++ b/packages/SettingsProvider/res/values-fi/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-fr-rCA/defaults.xml b/packages/SettingsProvider/res/values-fr-rCA/defaults.xml index b7280139184a..f439312cbfe9 100644 --- a/packages/SettingsProvider/res/values-fr-rCA/defaults.xml +++ b/packages/SettingsProvider/res/values-fr-rCA/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%2$s de %1$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-fr/defaults.xml b/packages/SettingsProvider/res/values-fr/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-fr/defaults.xml +++ b/packages/SettingsProvider/res/values-fr/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-gl/defaults.xml b/packages/SettingsProvider/res/values-gl/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-gl/defaults.xml +++ b/packages/SettingsProvider/res/values-gl/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-gu/defaults.xml b/packages/SettingsProvider/res/values-gu/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-gu/defaults.xml +++ b/packages/SettingsProvider/res/values-gu/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-hi/defaults.xml b/packages/SettingsProvider/res/values-hi/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-hi/defaults.xml +++ b/packages/SettingsProvider/res/values-hi/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-hr/defaults.xml b/packages/SettingsProvider/res/values-hr/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-hr/defaults.xml +++ b/packages/SettingsProvider/res/values-hr/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-hu/defaults.xml b/packages/SettingsProvider/res/values-hu/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-hu/defaults.xml +++ b/packages/SettingsProvider/res/values-hu/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-hy/defaults.xml b/packages/SettingsProvider/res/values-hy/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-hy/defaults.xml +++ b/packages/SettingsProvider/res/values-hy/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-in/defaults.xml b/packages/SettingsProvider/res/values-in/defaults.xml index 71f1d3b1569d..a63de85206eb 100644 --- a/packages/SettingsProvider/res/values-in/defaults.xml +++ b/packages/SettingsProvider/res/values-in/defaults.xml @@ -24,4 +24,5 @@ <!-- no translation found for def_device_name_simple (9037785625140748221) --> <skip /> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-is/defaults.xml b/packages/SettingsProvider/res/values-is/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-is/defaults.xml +++ b/packages/SettingsProvider/res/values-is/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-it/defaults.xml b/packages/SettingsProvider/res/values-it/defaults.xml index 524132e57827..16aed2ec05a3 100644 --- a/packages/SettingsProvider/res/values-it/defaults.xml +++ b/packages/SettingsProvider/res/values-it/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%2$s %1$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-iw/defaults.xml b/packages/SettingsProvider/res/values-iw/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-iw/defaults.xml +++ b/packages/SettingsProvider/res/values-iw/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ja/defaults.xml b/packages/SettingsProvider/res/values-ja/defaults.xml index 524132e57827..16aed2ec05a3 100644 --- a/packages/SettingsProvider/res/values-ja/defaults.xml +++ b/packages/SettingsProvider/res/values-ja/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%2$s %1$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ka/defaults.xml b/packages/SettingsProvider/res/values-ka/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ka/defaults.xml +++ b/packages/SettingsProvider/res/values-ka/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-kk/defaults.xml b/packages/SettingsProvider/res/values-kk/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-kk/defaults.xml +++ b/packages/SettingsProvider/res/values-kk/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-km/defaults.xml b/packages/SettingsProvider/res/values-km/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-km/defaults.xml +++ b/packages/SettingsProvider/res/values-km/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-kn/defaults.xml b/packages/SettingsProvider/res/values-kn/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-kn/defaults.xml +++ b/packages/SettingsProvider/res/values-kn/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ko/defaults.xml b/packages/SettingsProvider/res/values-ko/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ko/defaults.xml +++ b/packages/SettingsProvider/res/values-ko/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ky/defaults.xml b/packages/SettingsProvider/res/values-ky/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ky/defaults.xml +++ b/packages/SettingsProvider/res/values-ky/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-lo/defaults.xml b/packages/SettingsProvider/res/values-lo/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-lo/defaults.xml +++ b/packages/SettingsProvider/res/values-lo/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-lt/defaults.xml b/packages/SettingsProvider/res/values-lt/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-lt/defaults.xml +++ b/packages/SettingsProvider/res/values-lt/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-lv/defaults.xml b/packages/SettingsProvider/res/values-lv/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-lv/defaults.xml +++ b/packages/SettingsProvider/res/values-lv/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-mk/defaults.xml b/packages/SettingsProvider/res/values-mk/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-mk/defaults.xml +++ b/packages/SettingsProvider/res/values-mk/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ml/defaults.xml b/packages/SettingsProvider/res/values-ml/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ml/defaults.xml +++ b/packages/SettingsProvider/res/values-ml/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-mn/defaults.xml b/packages/SettingsProvider/res/values-mn/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-mn/defaults.xml +++ b/packages/SettingsProvider/res/values-mn/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-mr/defaults.xml b/packages/SettingsProvider/res/values-mr/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-mr/defaults.xml +++ b/packages/SettingsProvider/res/values-mr/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ms/defaults.xml b/packages/SettingsProvider/res/values-ms/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ms/defaults.xml +++ b/packages/SettingsProvider/res/values-ms/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-my/defaults.xml b/packages/SettingsProvider/res/values-my/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-my/defaults.xml +++ b/packages/SettingsProvider/res/values-my/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-nb/defaults.xml b/packages/SettingsProvider/res/values-nb/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-nb/defaults.xml +++ b/packages/SettingsProvider/res/values-nb/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ne/defaults.xml b/packages/SettingsProvider/res/values-ne/defaults.xml index 71f1d3b1569d..a63de85206eb 100644 --- a/packages/SettingsProvider/res/values-ne/defaults.xml +++ b/packages/SettingsProvider/res/values-ne/defaults.xml @@ -24,4 +24,5 @@ <!-- no translation found for def_device_name_simple (9037785625140748221) --> <skip /> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-nl/defaults.xml b/packages/SettingsProvider/res/values-nl/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-nl/defaults.xml +++ b/packages/SettingsProvider/res/values-nl/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-pa/defaults.xml b/packages/SettingsProvider/res/values-pa/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-pa/defaults.xml +++ b/packages/SettingsProvider/res/values-pa/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-pl/defaults.xml b/packages/SettingsProvider/res/values-pl/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-pl/defaults.xml +++ b/packages/SettingsProvider/res/values-pl/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-pt-rBR/defaults.xml b/packages/SettingsProvider/res/values-pt-rBR/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-pt-rBR/defaults.xml +++ b/packages/SettingsProvider/res/values-pt-rBR/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-pt-rPT/defaults.xml b/packages/SettingsProvider/res/values-pt-rPT/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-pt-rPT/defaults.xml +++ b/packages/SettingsProvider/res/values-pt-rPT/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-pt/defaults.xml b/packages/SettingsProvider/res/values-pt/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-pt/defaults.xml +++ b/packages/SettingsProvider/res/values-pt/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ro/defaults.xml b/packages/SettingsProvider/res/values-ro/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ro/defaults.xml +++ b/packages/SettingsProvider/res/values-ro/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ru/defaults.xml b/packages/SettingsProvider/res/values-ru/defaults.xml index 524132e57827..16aed2ec05a3 100644 --- a/packages/SettingsProvider/res/values-ru/defaults.xml +++ b/packages/SettingsProvider/res/values-ru/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%2$s %1$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-si/defaults.xml b/packages/SettingsProvider/res/values-si/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-si/defaults.xml +++ b/packages/SettingsProvider/res/values-si/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-sk/defaults.xml b/packages/SettingsProvider/res/values-sk/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-sk/defaults.xml +++ b/packages/SettingsProvider/res/values-sk/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-sl/defaults.xml b/packages/SettingsProvider/res/values-sl/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-sl/defaults.xml +++ b/packages/SettingsProvider/res/values-sl/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-sq/defaults.xml b/packages/SettingsProvider/res/values-sq/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-sq/defaults.xml +++ b/packages/SettingsProvider/res/values-sq/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-sr/defaults.xml b/packages/SettingsProvider/res/values-sr/defaults.xml index 524132e57827..16aed2ec05a3 100644 --- a/packages/SettingsProvider/res/values-sr/defaults.xml +++ b/packages/SettingsProvider/res/values-sr/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%2$s %1$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-sv/defaults.xml b/packages/SettingsProvider/res/values-sv/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-sv/defaults.xml +++ b/packages/SettingsProvider/res/values-sv/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-sw/defaults.xml b/packages/SettingsProvider/res/values-sw/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-sw/defaults.xml +++ b/packages/SettingsProvider/res/values-sw/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ta/defaults.xml b/packages/SettingsProvider/res/values-ta/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ta/defaults.xml +++ b/packages/SettingsProvider/res/values-ta/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-te/defaults.xml b/packages/SettingsProvider/res/values-te/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-te/defaults.xml +++ b/packages/SettingsProvider/res/values-te/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-th/defaults.xml b/packages/SettingsProvider/res/values-th/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-th/defaults.xml +++ b/packages/SettingsProvider/res/values-th/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-tl/defaults.xml b/packages/SettingsProvider/res/values-tl/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-tl/defaults.xml +++ b/packages/SettingsProvider/res/values-tl/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-tr/defaults.xml b/packages/SettingsProvider/res/values-tr/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-tr/defaults.xml +++ b/packages/SettingsProvider/res/values-tr/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-uk/defaults.xml b/packages/SettingsProvider/res/values-uk/defaults.xml index a8e1fe819184..71b29ef66489 100644 --- a/packages/SettingsProvider/res/values-uk/defaults.xml +++ b/packages/SettingsProvider/res/values-uk/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%2$s о %1$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-ur/defaults.xml b/packages/SettingsProvider/res/values-ur/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-ur/defaults.xml +++ b/packages/SettingsProvider/res/values-ur/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-uz/defaults.xml b/packages/SettingsProvider/res/values-uz/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-uz/defaults.xml +++ b/packages/SettingsProvider/res/values-uz/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-vi/defaults.xml b/packages/SettingsProvider/res/values-vi/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-vi/defaults.xml +++ b/packages/SettingsProvider/res/values-vi/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml +++ b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-zh-rHK/defaults.xml b/packages/SettingsProvider/res/values-zh-rHK/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-zh-rHK/defaults.xml +++ b/packages/SettingsProvider/res/values-zh-rHK/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-zh-rTW/defaults.xml b/packages/SettingsProvider/res/values-zh-rTW/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-zh-rTW/defaults.xml +++ b/packages/SettingsProvider/res/values-zh-rTW/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/SettingsProvider/res/values-zu/defaults.xml b/packages/SettingsProvider/res/values-zu/defaults.xml index 4a87a1250404..2b8033c98c5f 100644 --- a/packages/SettingsProvider/res/values-zu/defaults.xml +++ b/packages/SettingsProvider/res/values-zu/defaults.xml @@ -22,4 +22,5 @@ <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> + <string name="def_backup_manager_constants" msgid="75273734665044867"></string> </resources> diff --git a/packages/Shell/res/values-pa/strings.xml b/packages/Shell/res/values-pa/strings.xml index de29ff1a4ee6..cdf37695fa21 100644 --- a/packages/Shell/res/values-pa/strings.xml +++ b/packages/Shell/res/values-pa/strings.xml @@ -28,7 +28,7 @@ <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਬਿਨਾਂ ਆਪਣੀ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਚੁਣੋ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਪੂਰੇ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰੋ"</string> <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਬਿਨਾਂ ਆਪਣੀ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਸਾਂਝੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਪੂਰੇ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰੋ"</string> <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਬਿਨਾਂ ਆਪਣੀ ਬੱਗ ਰਿਪੋਰਟ ਨੂੰ ਸਾਂਝੀ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੇ ਪੂਰੇ ਹੋਣ ਦੀ ਉਡੀਕ ਕਰੋ"</string> - <string name="bugreport_confirm" msgid="5917407234515812495">"ਬੱਗ ਰਿਪੋਰਟਾਂ ਵਿੱਚ ਸਿਸਟਮ ਦੀਆਂ ਵੱਖ-ਵੱਖ ਲੌਗ ਫ਼ਾਈਲਾਂ ਦਾ ਡਾਟਾ ਸ਼ਾਮਲ ਹੁੰਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਉਹ ਡਾਟਾ ਸ਼ਾਮਲ ਹੋ ਸਕਦਾ ਹੈ ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਸੰਵੇਦਨਸ਼ੀਲ ਮੰਨਦੇ ਹੋ (ਜਿਵੇਂ ਕਿ ਐਪ-ਵਰਤੋਂ ਅਤੇ ਟਿਕਾਣਾ ਡਾਟਾ )। ਬੱਗ ਰਿਪੋਰਟਾਂ ਨੂੰ ਸਿਰਫ਼ ਆਪਣੇ ਭਰੋਸੇਯੋਗ ਲੋਕਾਂ ਅਤੇ ਐਪਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰੋ।"</string> + <string name="bugreport_confirm" msgid="5917407234515812495">"ਬੱਗ ਰਿਪੋਰਟਾਂ ਵਿੱਚ ਸਿਸਟਮ ਦੀਆਂ ਵੱਖ-ਵੱਖ ਲੌਗ ਫ਼ਾਈਲਾਂ ਦਾ ਡਾਟਾ ਸ਼ਾਮਲ ਹੁੰਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਉਹ ਡਾਟਾ ਸ਼ਾਮਲ ਹੋ ਸਕਦਾ ਹੈ ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਸੰਵੇਦਨਸ਼ੀਲ ਮੰਨਦੇ ਹੋ (ਜਿਵੇਂ ਕਿ ਐਪ-ਵਰਤੋਂ ਅਤੇ ਟਿਕਾਣਾ ਡਾਟਾ)। ਬੱਗ ਰਿਪੋਰਟਾਂ ਨੂੰ ਸਿਰਫ਼ ਆਪਣੇ ਭਰੋਸੇਯੋਗ ਲੋਕਾਂ ਅਤੇ ਐਪਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰੋ।"</string> <string name="bugreport_confirm_dont_repeat" msgid="6179945398364357318">"ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"</string> <string name="bugreport_storage_title" msgid="5332488144740527109">"ਬਗ ਰਿਪੋਰਟਾਂ"</string> <string name="bugreport_unreadable_text" msgid="586517851044535486">"ਬਗ ਰਿਪੋਰਟ ਫ਼ਾਈਲ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ"</string> diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS new file mode 100644 index 000000000000..baefdd51ef7c --- /dev/null +++ b/packages/SystemUI/OWNERS @@ -0,0 +1,8 @@ +set noparent # do not inherit owners in parent directories + +per-file Android.bp = build.master@android.com # special file expert +per-file Android.bp = android-sysui-eng+reviews@google.com +per-file Android.mk = build.master@android.com # special file expert +per-file Android.mk = android-sysui-eng+reviews@google.com + +android-sysui-eng+reviews@google.com diff --git a/packages/SystemUI/res-keyguard/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml index 160ed6554720..ecee06bc9f44 100644 --- a/packages/SystemUI/res-keyguard/values-mr/strings.xml +++ b/packages/SystemUI/res-keyguard/values-mr/strings.xml @@ -64,7 +64,7 @@ <string name="kg_pattern_instructions" msgid="5547646893001491340">"तुमचा पॅटर्न काढा"</string> <string name="kg_sim_pin_instructions" msgid="6389000973113699187">"सिम पिन एंटर करा"</string> <string name="kg_sim_pin_instructions_multi" msgid="1643757228644271861">"\"<xliff:g id="CARRIER">%1$s</xliff:g>\" साठी सिम पिन एंटर करा"</string> - <string name="kg_sim_lock_instructions_esim" msgid="4957650659201013804">"मोबाइल सेवांशिवाय डीव्हाइस वापरण्यासाठी eSIM बंद करा."</string> + <string name="kg_sim_lock_instructions_esim" msgid="4957650659201013804">"मोबाइल सेवांशिवाय डिव्हाइस वापरण्यासाठी eSIM बंद करा."</string> <string name="kg_pin_instructions" msgid="4069609316644030034">"पिन प्रविष्ट करा"</string> <string name="kg_password_instructions" msgid="136952397352976538">"संकेतशब्द प्रविष्ट करा"</string> <string name="kg_puk_enter_puk_hint" msgid="2288964170039899277">"सिम आता अक्षम केले आहे. सुरू ठेवण्यासाठी PUK कोड प्रविष्ट करा. तपशीलांसाठी वाहकाशी संपर्क साधा."</string> @@ -94,7 +94,7 @@ <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="8476407539834855">"आपण फोन अनलॉक करण्याचा <xliff:g id="NUMBER">%d</xliff:g> वेळा चुकीच्या पद्धतीने प्रयत्न केला आहे. कार्य प्रोफाइल काढली जाईल, जे सर्व प्रोफाइल डेटा हटवेल."</string> <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="956706236554092172">"तुम्ही आपला अनलॉक पॅटर्न <xliff:g id="NUMBER_0">%1$d</xliff:g> वेळा अयोग्यपणे काढला आहे. आणखी <xliff:g id="NUMBER_1">%2$d</xliff:g> अयशस्वी प्रयत्नांनंतर, तुमच्याला ईमेल खाते वापरून आपला टॅब्लेट अनलॉक करण्यास सांगितले जाईल.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> सेकंदांमध्ये पुन्हा प्रयत्न करा."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="8364140853305528449">"तुम्ही आपला अनलॉक पॅटर्न <xliff:g id="NUMBER_0">%1$d</xliff:g> वेळा अयोग्यपणे काढला आहे. आणखी <xliff:g id="NUMBER_1">%2$d</xliff:g> अयशस्वी प्रयत्नांनंतर, तुमच्याला ईमेल खाते वापरून आपला फोन अनलॉक करण्यास सांगितले जाईल.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> सेकंदांमध्ये पुन्हा प्रयत्न करा."</string> - <string name="kg_password_wrong_pin_code_pukked" msgid="3389829202093674267">"सिम पिन कोड चुकीचा आहे तुम्ही आता तुमचे डीव्हाइस अनलॉक करण्यासाठी तुमच्या वाहकाशी संपर्क साधावा."</string> + <string name="kg_password_wrong_pin_code_pukked" msgid="3389829202093674267">"सिम पिन कोड चुकीचा आहे तुम्ही आता तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमच्या वाहकाशी संपर्क साधावा."</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="4314341367727055967"> <item quantity="one">चुकीचा सिम पिन कोड, तुमच्याकडे <xliff:g id="NUMBER_1">%d</xliff:g> प्रयत्न शिल्लक आहेत.</item> <item quantity="other">चुकीचा सिम पिन कोड, तुमच्याकडे <xliff:g id="NUMBER_1">%d</xliff:g> प्रयत्न शिल्लक आहेत.</item> @@ -110,28 +110,28 @@ <string name="keyguard_carrier_default" msgid="4274828292998453695">"सेवा नाही."</string> <string name="accessibility_ime_switch_button" msgid="2695096475319405612">"इनपुट पद्धत स्विच करा"</string> <string name="airplane_mode" msgid="3807209033737676010">"विमान मोड"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="7246972020562621506">"डीव्हाइस रीस्टार्ट झाल्यावर पॅटर्न आवश्यक आहे"</string> - <string name="kg_prompt_reason_restart_pin" msgid="6303592361322290145">"डीव्हाइस रीस्टार्ट झाल्यावर पिन आवश्यक आहे"</string> - <string name="kg_prompt_reason_restart_password" msgid="6984641181515902406">"डीव्हाइस रीस्टार्ट झाल्यावर पासवर्ड आवश्यक आहे"</string> + <string name="kg_prompt_reason_restart_pattern" msgid="7246972020562621506">"डिव्हाइस रीस्टार्ट झाल्यावर पॅटर्न आवश्यक आहे"</string> + <string name="kg_prompt_reason_restart_pin" msgid="6303592361322290145">"डिव्हाइस रीस्टार्ट झाल्यावर पिन आवश्यक आहे"</string> + <string name="kg_prompt_reason_restart_password" msgid="6984641181515902406">"डिव्हाइस रीस्टार्ट झाल्यावर पासवर्ड आवश्यक आहे"</string> <string name="kg_prompt_reason_timeout_pattern" msgid="5304487696073914063">"अतिरिक्त सुरक्षिततेसाठी पॅटर्न आवश्यक आहे"</string> <string name="kg_prompt_reason_timeout_pin" msgid="8851462864335757813">"अतिरिक्त सुरक्षिततेसाठी पिन आवश्यक आहे"</string> <string name="kg_prompt_reason_timeout_password" msgid="6563904839641583441">"अतिरिक्त सुरक्षिततेसाठी संकेतशब्द आवश्यक आहे"</string> <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3398054847288438444">"तुम्ही प्रोफाईल स्विच करता तेव्हा पॅटर्न आवश्यक आहे"</string> <string name="kg_prompt_reason_switch_profiles_pin" msgid="7426368139226961699">"आपण प्रोफाईल स्विच करता तेव्हा पिन आवश्यक आहे"</string> <string name="kg_prompt_reason_switch_profiles_password" msgid="8383831046318421845">"आपण प्रोफाईल स्विच करता तेव्हा संकेतशब्द आवश्यक आहे"</string> - <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"प्रशासकाद्वारे लॉक केलेले डीव्हाइस"</string> - <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"डीव्हाइस मॅन्युअली लॉक केले होते"</string> + <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"प्रशासकाद्वारे लॉक केलेले डिव्हाइस"</string> + <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"डिव्हाइस मॅन्युअली लॉक केले होते"</string> <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="71299470072448533"> - <item quantity="one">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पॅटर्नची खात्री करा.</item> - <item quantity="other">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पॅटर्नची खात्री करा.</item> + <item quantity="one">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पॅटर्नची खात्री करा.</item> + <item quantity="other">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पॅटर्नची खात्री करा.</item> </plurals> <plurals name="kg_prompt_reason_time_pin" formatted="false" msgid="34586942088144385"> - <item quantity="one">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पिनची खात्री करा.</item> - <item quantity="other">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पिन ची खात्री करा.</item> + <item quantity="one">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पिनची खात्री करा.</item> + <item quantity="other">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पिन ची खात्री करा.</item> </plurals> <plurals name="kg_prompt_reason_time_password" formatted="false" msgid="257297696215346527"> - <item quantity="one">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पासवर्डची खात्री करा.</item> - <item quantity="other">डीव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पासवर्डची खात्री करा.</item> + <item quantity="one">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासासाठी अनलॉक केले गेले नाही. पासवर्डची खात्री करा.</item> + <item quantity="other">डिव्हाइस <xliff:g id="NUMBER_1">%d</xliff:g> तासांसाठी अनलॉक केले गेले नाही. पासवर्डची खात्री करा.</item> </plurals> <string name="fingerprint_not_recognized" msgid="348813995267914625">"ओळखले नाही"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 25baf2043bda..0a5c7365b1f8 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -308,7 +308,7 @@ <string name="quick_settings_inversion_label" msgid="8790919884718619648">"रंग उलटें"</string> <string name="quick_settings_color_space_label" msgid="853443689745584770">"रंग सुधार मोड"</string> <string name="quick_settings_more_settings" msgid="326112621462813682">"और सेटिंग"</string> - <string name="quick_settings_done" msgid="3402999958839153376">"पूर्ण"</string> + <string name="quick_settings_done" msgid="3402999958839153376">"हो गया"</string> <string name="quick_settings_connected" msgid="1722253542984847487">"कनेक्ट है"</string> <string name="quick_settings_connected_battery_level" msgid="4136051440381328892">"कनेक्ट किया गया, बैटरी <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g> है"</string> <string name="quick_settings_connecting" msgid="47623027419264404">"कनेक्ट हो रहा है..."</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index fe006396cfb3..0503b48eb0c5 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -53,7 +53,7 @@ <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"वास्तविक कीबोर्ड"</string> <string name="usb_device_permission_prompt" msgid="834698001271562057">"USB डिव्हाइसवर प्रवेश करण्यासाठी <xliff:g id="APPLICATION">%1$s</xliff:g> अॅप ला अनुमती द्यायची?"</string> <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"अॅप <xliff:g id="APPLICATION">%1$s</xliff:g> ला USB उपसाधनात प्रवेश करण्याची अनुमती द्यायची?"</string> - <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"हे USB डीव्हाइस कनेक्ट केलेले असते तेव्हा <xliff:g id="ACTIVITY">%1$s</xliff:g> उघडायचे?"</string> + <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"हे USB डिव्हाइस कनेक्ट केलेले असते तेव्हा <xliff:g id="ACTIVITY">%1$s</xliff:g> उघडायचे?"</string> <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"हे USB उपसाधन कनेक्ट केलेले असते तेव्हा <xliff:g id="ACTIVITY">%1$s</xliff:g> उघडायचे?"</string> <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"इंस्टॉल केलेले अॅप्स या USB उपसाधनासह कार्य करत नाहीत. <xliff:g id="URL">%1$s</xliff:g> येथे या उपसाधनाविषयी अधिक जाणून घ्या"</string> <string name="title_usb_accessory" msgid="4966265263465181372">"USB उपसाधन"</string> @@ -271,7 +271,7 @@ <string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"केवळ अलार्म"</string> <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"संपूर्ण शांतता"</string> <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"ब्लूटूथ"</string> - <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"ब्लूटूथ (<xliff:g id="NUMBER">%d</xliff:g> डीव्हाइस)"</string> + <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"ब्लूटूथ (<xliff:g id="NUMBER">%d</xliff:g> डिव्हाइस)"</string> <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"ब्लूटूथ बंद"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="4910015762433302860">"कोणतेही जोडलेले डिव्हाइसेस उपलब्ध नाहीत"</string> <string name="quick_settings_brightness_label" msgid="6968372297018755815">"चमक"</string> @@ -284,7 +284,7 @@ <string name="quick_settings_ime_label" msgid="7073463064369468429">"इनपुट पद्धत"</string> <string name="quick_settings_location_label" msgid="5011327048748762257">"स्थान"</string> <string name="quick_settings_location_off_label" msgid="7464544086507331459">"स्थान बंद"</string> - <string name="quick_settings_media_device_label" msgid="1302906836372603762">"मीडिया डीव्हाइस"</string> + <string name="quick_settings_media_device_label" msgid="1302906836372603762">"मीडिया डिव्हाइस"</string> <string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string> <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"फक्त आणीबाणीचे कॉल"</string> <string name="quick_settings_settings_label" msgid="5326556592578065401">"सेटिंग्ज"</string> @@ -300,7 +300,7 @@ <string name="quick_settings_wifi_detail_empty_text" msgid="269990350383909226">"वाय-फाय नेटवर्क उपलब्ध नाहीत"</string> <string name="quick_settings_cast_title" msgid="7709016546426454729">"कास्ट करा"</string> <string name="quick_settings_casting" msgid="6601710681033353316">"कास्ट करत आहे"</string> - <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"निनावी डीव्हाइस"</string> + <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"निनावी डिव्हाइस"</string> <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"कास्ट करण्यास तयार"</string> <string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"कोणतेही डिव्हाइसेस उपलब्ध नाहीत"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"चमक"</string> @@ -362,8 +362,8 @@ <string name="speed_bump_explanation" msgid="1288875699658819755">"खाली कमी तातडीच्या सूचना"</string> <string name="notification_tap_again" msgid="7590196980943943842">"उघडण्यासाठी पुन्हा टॅप करा"</string> <string name="keyguard_unlock" msgid="8043466894212841998">"अनलॉक करण्यासाठी स्वाइप करा"</string> - <string name="do_disclosure_generic" msgid="5615898451805157556">"हे डीव्हाइस तुमची संस्था व्यवस्थापित करते"</string> - <string name="do_disclosure_with_name" msgid="5640615509915445501">"हे डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ने व्यवस्थापित केले आहे"</string> + <string name="do_disclosure_generic" msgid="5615898451805157556">"हे डिव्हाइस तुमची संस्था व्यवस्थापित करते"</string> + <string name="do_disclosure_with_name" msgid="5640615509915445501">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ने व्यवस्थापित केले आहे"</string> <string name="phone_hint" msgid="4872890986869209950">"फोनसाठी चिन्हावरून स्वाइप करा"</string> <string name="voice_hint" msgid="8939888732119726665">"व्हॉइस सहाय्यासाठी चिन्हावरून स्वाइप करा"</string> <string name="camera_hint" msgid="7939688436797157483">"कॅमेर्यासाठी चिन्हावरून स्वाइप करा"</string> @@ -415,22 +415,22 @@ <string name="profile_owned_footer" msgid="8021888108553696069">"प्रोफाईलचे परीक्षण केले जाऊ शकते"</string> <string name="vpn_footer" msgid="2388611096129106812">"नेटवर्कचे परीक्षण केले जाऊ शकते"</string> <string name="branded_vpn_footer" msgid="2168111859226496230">"नेटवर्कचे परीक्षण केले जाऊ शकते"</string> - <string name="quick_settings_disclosure_management_monitoring" msgid="6645176135063957394">"आपली संस्था हे डीव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे परीक्षण करू शकते"</string> - <string name="quick_settings_disclosure_named_management_monitoring" msgid="370622174777570853">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> हे डीव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे परीक्षण करू शकते"</string> - <string name="quick_settings_disclosure_management_named_vpn" msgid="1085137869053332307">"डीव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित केले जाते आणि ते <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> - <string name="quick_settings_disclosure_named_management_named_vpn" msgid="6290456493852584017">"डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते आणि ते <xliff:g id="VPN_APP">%2$s</xliff:g> शी कनेक्ट केलेले आहे"</string> - <string name="quick_settings_disclosure_management" msgid="3294967280853150271">"डीव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित आहे"</string> - <string name="quick_settings_disclosure_named_management" msgid="1059403025094542908">"डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते"</string> - <string name="quick_settings_disclosure_management_vpns" msgid="3698767349925266482">"डीव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित केले जाते आणि ते VPN शी कनेक्ट केलेले आहे"</string> - <string name="quick_settings_disclosure_named_management_vpns" msgid="7777821385318891527">"डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते आणि ते VPN शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_management_monitoring" msgid="6645176135063957394">"आपली संस्था हे डिव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे परीक्षण करू शकते"</string> + <string name="quick_settings_disclosure_named_management_monitoring" msgid="370622174777570853">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> हे डिव्हाइस व्यवस्थापित करते आणि नेटवर्क रहदारीचे परीक्षण करू शकते"</string> + <string name="quick_settings_disclosure_management_named_vpn" msgid="1085137869053332307">"डिव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित केले जाते आणि ते <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_named_management_named_vpn" msgid="6290456493852584017">"डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते आणि ते <xliff:g id="VPN_APP">%2$s</xliff:g> शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_management" msgid="3294967280853150271">"डिव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित आहे"</string> + <string name="quick_settings_disclosure_named_management" msgid="1059403025094542908">"डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते"</string> + <string name="quick_settings_disclosure_management_vpns" msgid="3698767349925266482">"डिव्हाइस तुमच्या संस्थेद्वारे व्यवस्थापित केले जाते आणि ते VPN शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_named_management_vpns" msgid="7777821385318891527">"डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते आणि ते VPN शी कनेक्ट केलेले आहे"</string> <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="5125463987558278215">"आपली संस्था आपल्या कार्य प्रोफाइलमधील नेटवर्क रहदारीचे परीक्षण करू शकते"</string> <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8973606847896650284">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> आपल्या कार्य प्रोफाइलमधील नेटवर्क रहदारीचे परीक्षण करू शकते"</string> <string name="quick_settings_disclosure_monitoring" msgid="679658227269205728">"नेटवर्कचे परीक्षण केले जाऊ शकते"</string> - <string name="quick_settings_disclosure_vpns" msgid="8170318392053156330">"डीव्हाइस VPN शी कनेक्ट केलेले आहे"</string> + <string name="quick_settings_disclosure_vpns" msgid="8170318392053156330">"डिव्हाइस VPN शी कनेक्ट केलेले आहे"</string> <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="3494535754792751741">"कार्य प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="4467456202486569906">"वैयक्तिक प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> - <string name="quick_settings_disclosure_named_vpn" msgid="6943724064780847080">"डीव्हाइस <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> - <string name="monitoring_title_device_owned" msgid="1652495295941959815">"डीव्हाइस व्यवस्थापन"</string> + <string name="quick_settings_disclosure_named_vpn" msgid="6943724064780847080">"डिव्हाइस <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केलेले आहे"</string> + <string name="monitoring_title_device_owned" msgid="1652495295941959815">"डिव्हाइस व्यवस्थापन"</string> <string name="monitoring_title_profile_owned" msgid="6790109874733501487">"प्रोफाईल परीक्षण"</string> <string name="monitoring_title" msgid="169206259253048106">"नेटवर्क परीक्षण"</string> <string name="monitoring_subtitle_vpn" msgid="876537538087857300">"VPN"</string> @@ -439,8 +439,8 @@ <string name="disable_vpn" msgid="4435534311510272506">"VPN अक्षम करा"</string> <string name="disconnect_vpn" msgid="1324915059568548655">"VPN डिस्कनेक्ट करा"</string> <string name="monitoring_button_view_policies" msgid="100913612638514424">"धोरणे पहा"</string> - <string name="monitoring_description_named_management" msgid="5281789135578986303">"तुमचे डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> व्यवस्थापित करते.\n\nतुमचा प्रशासक सेटिंग्ज, कॉर्पोरेट अॅक्सेस, अॅप्स, तुमच्या डीव्हाइस शी संबंधित डेटा आणि तुमच्या डीव्हाइस च्या ठिकाणाची माहिती मॉनिटर करू शकते आणि ती व्यवस्थापित करू शकतो.\n\nआणखी माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा."</string> - <string name="monitoring_description_management" msgid="4573721970278370790">"तुमचे डीव्हाइस तुमची संस्था व्यवस्थापित करते.\n\nतुमचा प्रशासक सेटिंग्ज, कॉर्पोरेट अॅक्सेस, अॅप्स, तुमच्या डीव्हाइस शी संबंधित डेटा आणि तुमच्या डीव्हाइस च्या ठिकाणाची माहिती मॉनिटर करू शकतो आणि ती व्यवस्थापित करू शकतो.\n\nआणखी माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा."</string> + <string name="monitoring_description_named_management" msgid="5281789135578986303">"तुमचे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> व्यवस्थापित करते.\n\nतुमचा प्रशासक सेटिंग्ज, कॉर्पोरेट अॅक्सेस, अॅप्स, तुमच्या डिव्हाइस शी संबंधित डेटा आणि तुमच्या डिव्हाइस च्या ठिकाणाची माहिती मॉनिटर करू शकते आणि ती व्यवस्थापित करू शकतो.\n\nआणखी माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा."</string> + <string name="monitoring_description_management" msgid="4573721970278370790">"तुमचे डिव्हाइस तुमची संस्था व्यवस्थापित करते.\n\nतुमचा प्रशासक सेटिंग्ज, कॉर्पोरेट अॅक्सेस, अॅप्स, तुमच्या डिव्हाइस शी संबंधित डेटा आणि तुमच्या डिव्हाइस च्या ठिकाणाची माहिती मॉनिटर करू शकतो आणि ती व्यवस्थापित करू शकतो.\n\nआणखी माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा."</string> <string name="monitoring_description_management_ca_certificate" msgid="5202023784131001751">"आपल्या संस्थेने या डिव्हाइसवर प्रमाणपत्र अधिकार इंस्टॉल केला आहे. आपल्या सुरक्षित नेटवर्क रहदारीचे परीक्षण केले जाऊ शकते किंवा ती सुधारली जाऊ शकते."</string> <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"आपल्या संस्थेने आपल्या कार्य प्रोफाइलवर प्रमाणपत्र अधिकार इंस्टॉल केला आहे. आपल्या सुरक्षित नेटवर्क रहदारीचे परीक्षण केले जाऊ शकते किंवा ती सुधारली जाऊ शकते."</string> <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"या डिव्हाइसवर प्रमाणपत्र अधिकार इंस्टॉल केला आहे. आपल्या सुरक्षित नेटवर्क रहदारीचे परीक्षण केले जाऊ शकते किंवा ती सुधारली जाऊ शकते."</string> @@ -449,8 +449,8 @@ <string name="monitoring_description_two_named_vpns" msgid="4198511413729213802">"तुम्ही <xliff:g id="VPN_APP_0">%1$s</xliff:g> आणि <xliff:g id="VPN_APP_1">%2$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसहित आपल्या नेटवर्क क्रिया मॉनिटर करू शकते."</string> <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"आपले कार्य प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"आपले वैयक्तिक प्रोफाइल <xliff:g id="VPN_APP">%1$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> - <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"तुमचे डीव्हाइस <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g> ने व्यवस्थापित केले आहे."</string> - <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"तुमचे डीव्हाइस व्यवस्थापित करण्यासाठी <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> वापरते."</string> + <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"तुमचे डिव्हाइस <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g> ने व्यवस्थापित केले आहे."</string> + <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"तुमचे डिव्हाइस व्यवस्थापित करण्यासाठी <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> वापरते."</string> <string name="monitoring_description_do_body" msgid="3639594537660975895">"आपला प्रशासक सेटिंग्ज, कॉर्पोरेट प्रवेश, अॅप्स, आपल्या डिव्हाइशी संबंधित डेटा आणि डिव्हाइसच्या स्थान माहितीचे निरीक्षण आणि व्यवस्थापन करू शकतो."</string> <string name="monitoring_description_do_learn_more_separator" msgid="3785251953067436862">" "</string> <string name="monitoring_description_do_learn_more" msgid="1849514470437907421">"अधिक जाणून घ्या"</string> @@ -460,7 +460,7 @@ <string name="monitoring_description_ca_cert_settings_separator" msgid="4987350385906393626">" "</string> <string name="monitoring_description_ca_cert_settings" msgid="5489969458872997092">"विश्वासू क्रेडेंशियल उघडा"</string> <string name="monitoring_description_network_logging" msgid="7223505523384076027">"आपल्या प्रशासकाने नेटवर्क लॉगिंग चालू केले आहे, जे आपल्या डिव्हाइसवरील रहदारीचे निरीक्षण करते.\n\nअधिक माहितीसाठी आपल्या प्रशासकाशी संपर्क साधा."</string> - <string name="monitoring_description_vpn" msgid="4445150119515393526">"तुम्ही VPN कनेक्शन सेट करण्यासाठी अॅपला परवानगी दिली.\n\nहा अॅप ईमेल, अॅप्स आणि वेबसाइटसह, तुमच्या डीव्हाइस आणि नेटवर्क अॅक्टिव्हिटीचे परीक्षण करू शकतो."</string> + <string name="monitoring_description_vpn" msgid="4445150119515393526">"तुम्ही VPN कनेक्शन सेट करण्यासाठी अॅपला परवानगी दिली.\n\nहा अॅप ईमेल, अॅप्स आणि वेबसाइटसह, तुमच्या डिव्हाइस आणि नेटवर्क अॅक्टिव्हिटीचे परीक्षण करू शकतो."</string> <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"आपले कार्य प्रोफाइल <xliff:g id="ORGANIZATION">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते.\n\nआपला प्रशासक ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क अॅक्टिव्हिटीचे निरीक्षण करण्यास सक्षम आहे.\n\nअधिक माहितीसाठी आपल्या प्रशासकाशी संपर्क साधा.\n\nआपण VPN शी देखील कनेक्ट आहात, जे आपल्या नेटवर्क अॅक्टिव्हिटीचे निरीक्षण करू शकते."</string> <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string> <string name="monitoring_description_app" msgid="1828472472674709532">"आपण <xliff:g id="APPLICATION">%1$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> @@ -470,7 +470,7 @@ <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"आपले कार्य प्रोफाइल <xliff:g id="ORGANIZATION">%1$s</xliff:g> द्वारे व्यवस्थापित केले जाते. प्रोफाइल <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> शी कनेक्ट केले आहे, जे ईमेल, अॅप्स आणि वेबसाइटसह आपल्या कार्य नेटवर्क क्रियाकलापाचे परीक्षण करू शकते.\n\nआपण <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> शीदेखील कनेक्ट केले आहे, जे आपल्या वैयक्तिक नेटवर्क क्रियाकलापाचे परीक्षण करू शकते."</string> <string name="keyguard_indication_trust_granted" msgid="4985003749105182372">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी अनलॉक केले"</string> <string name="keyguard_indication_trust_managed" msgid="8319646760022357585">"<xliff:g id="TRUST_AGENT">%1$s</xliff:g> चालू आहे"</string> - <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"तुम्ही मॅन्युअली अनलॉक करेपर्यंत डीव्हाइस लॉक राहील"</string> + <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"तुम्ही मॅन्युअली अनलॉक करेपर्यंत डिव्हाइस लॉक राहील"</string> <string name="hidden_notifications_title" msgid="7139628534207443290">"सूचना अधिक जलद मिळवा"</string> <string name="hidden_notifications_text" msgid="2326409389088668981">"आपण अनलॉक करण्यापूर्वी त्यांना पहा"</string> <string name="hidden_notifications_cancel" msgid="3690709735122344913">"नाही, नको"</string> @@ -489,7 +489,7 @@ <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"लपवा"</string> <string name="managed_profile_foreground_toast" msgid="5421487114739245972">"आपण आपले कार्य प्रोफाईल वापरत आहात"</string> <string name="stream_voice_call" msgid="4410002696470423714">"कॉल करा"</string> - <string name="stream_system" msgid="7493299064422163147">"सिस्टीम"</string> + <string name="stream_system" msgid="7493299064422163147">"सिस्टम"</string> <string name="stream_ring" msgid="8213049469184048338">"रिंग करा"</string> <string name="stream_music" msgid="9086982948697544342">"मीडिया"</string> <string name="stream_alarm" msgid="5209444229227197703">"अलार्म"</string> @@ -510,7 +510,7 @@ <string name="quick_settings" msgid="10042998191725428">"द्रुत सेटिंग्ज"</string> <string name="status_bar" msgid="4877645476959324760">"स्टेटस बार"</string> <string name="overview" msgid="4018602013895926956">"अवलोकन"</string> - <string name="demo_mode" msgid="2532177350215638026">"सिस्टीम UI डेमो मोड"</string> + <string name="demo_mode" msgid="2532177350215638026">"सिस्टम UI डेमो मोड"</string> <string name="enable_demo_mode" msgid="4844205668718636518">"डेमो मोड सुरू करा"</string> <string name="show_demo_mode" msgid="2018336697782464029">"डेमो मोड दर्शवा"</string> <string name="status_bar_ethernet" msgid="5044290963549500128">"इथरनेट"</string> @@ -614,7 +614,7 @@ <string name="keyboard_key_insert" msgid="8530501581636082614">"घाला"</string> <string name="keyboard_key_num_lock" msgid="5052537581246772117">"Num Lock"</string> <string name="keyboard_key_numpad_template" msgid="8729216555174634026">"Numpad <xliff:g id="NAME">%1$s</xliff:g>"</string> - <string name="keyboard_shortcut_group_system" msgid="6472647649616541064">"सिस्टीम"</string> + <string name="keyboard_shortcut_group_system" msgid="6472647649616541064">"सिस्टम"</string> <string name="keyboard_shortcut_group_system_home" msgid="3054369431319891965">"होम"</string> <string name="keyboard_shortcut_group_system_recents" msgid="3154851905021926744">"अलीकडील"</string> <string name="keyboard_shortcut_group_system_back" msgid="2207004531216446378">"परत"</string> diff --git a/packages/SystemUI/res/values-ne/strings_car.xml b/packages/SystemUI/res/values-ne/strings_car.xml index d81a488bb2e7..d4d7d0bd5117 100644 --- a/packages/SystemUI/res/values-ne/strings_car.xml +++ b/packages/SystemUI/res/values-ne/strings_car.xml @@ -20,5 +20,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="unknown_user_label" msgid="4323896111737677955">"अज्ञात"</string> - <string name="start_driving" msgid="864023351402918991">"ड्राइभिङ सुरू गर्नुहोस्"</string> + <string name="start_driving" msgid="864023351402918991">"ड्राइभिङ सुरु गर्नुहोस्"</string> </resources> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index b746182d6007..166e0cb0a5c8 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -24,7 +24,7 @@ <string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"ਸੂਚੀ ਵਿੱਚੋਂ ਹਟਾਓ"</string> <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"ਐਪ ਜਾਣਕਾਰੀ"</string> <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"ਤੁਹਾਡੀਆਂ ਹਾਲੀਆ ਸਕ੍ਰੀਨਾਂ ਇੱਥੇ ਪ੍ਰਗਟ ਹੋਣਗੀਆਂ"</string> - <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"ਹਾਲੀਆ ਐਪਾਂ ਰੱਦ ਕਰੋ"</string> + <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"ਹਾਲੀਆ ਐਪਾਂ ਨੂੰ ਖਾਰਜ ਕਰੋ"</string> <plurals name="status_bar_accessibility_recent_apps" formatted="false" msgid="9138535907802238759"> <item quantity="one">ਰੂਪ-ਰੇਖਾ ਵਿੱਚ %d ਸਕ੍ਰੀਨਾਂ</item> <item quantity="other">ਰੂਪ-ਰੇਖਾ ਵਿੱਚ %d ਸਕ੍ਰੀਨਾਂ</item> @@ -175,7 +175,7 @@ <!-- no translation found for accessibility_casting (6887382141726543668) --> <skip /> <string name="accessibility_work_mode" msgid="2478631941714607225">"ਕੰਮ ਮੋਡ"</string> - <string name="accessibility_recents_item_will_be_dismissed" msgid="395770242498031481">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਰੱਦ ਕਰੋ।"</string> + <string name="accessibility_recents_item_will_be_dismissed" msgid="395770242498031481">"<xliff:g id="APP">%s</xliff:g> ਨੂੰ ਖਾਰਜ ਕਰੋ।"</string> <string name="accessibility_recents_item_dismissed" msgid="6803574935084867070">"<xliff:g id="APP">%s</xliff:g> ਰੱਦ ਕੀਤਾ।"</string> <string name="accessibility_recents_all_items_dismissed" msgid="4464697366179168836">"ਸਾਰੀਆਂ ਹਾਲੀਆ ਐਪਲੀਕੇਸ਼ਨਾਂ ਰੱਦ ਕੀਤੀਆਂ।"</string> <string name="accessibility_recents_item_open_app_info" msgid="5107479759905883540">"<xliff:g id="APP">%s</xliff:g> ਐਪਲੀਕੇਸ਼ਨਾਂ ਜਾਣਕਾਰੀ ਖੋਲ੍ਹੋ।"</string> @@ -502,13 +502,13 @@ <string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s। ਮਿਊਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ। ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਮਿਊਟ ਹੋ ਸਕਦੀਆਂ ਹਨ।"</string> <string name="volume_stream_content_description_vibrate_a11y" msgid="6427727603978431301">"%1$s। ਥਰਥਰਾਹਟ \'ਤੇ ਸੈੱਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="volume_stream_content_description_mute_a11y" msgid="8995013018414535494">"%1$s। ਮਿਊਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> - <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"%s ਵੌਲਿਊਮ ਕੰਟਰੋਲ ਦਿਖਾਏ ਗਏ ਹਨ। ਖਾਰਜ ਕਰਨ ਲਈ ਉੱਪਰ ਸਵਾਈਪ ਕਰੋ।"</string> + <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"%s ਅਵਾਜ਼ ਕੰਟਰੋਲ ਦਿਖਾਏ ਗਏ ਹਨ। ਖਾਰਜ ਕਰਨ ਲਈ ਉੱਪਰ ਸਵਾਈਪ ਕਰੋ।"</string> <string name="volume_dialog_accessibility_dismissed_message" msgid="51543526013711399">"ਵੌਲਿਊਮ ਕੰਟਰੋਲ ਲੁਕਾਏ ਗਏ ਹਨ"</string> <string name="system_ui_tuner" msgid="708224127392452018">"System UI ਟਿਊਨਰ"</string> <string name="show_battery_percentage" msgid="5444136600512968798">"ਜੋਡ਼ੀ ਗਈ ਬੈਟਰੀ ਪ੍ਰਤਿਸ਼ਤਤਾ ਦਿਖਾਓ"</string> <string name="show_battery_percentage_summary" msgid="3215025775576786037">"ਜਦੋਂ ਚਾਰਜ ਨਾ ਹੋ ਰਹੀ ਹੋਵੇ ਤਾਂ ਸਥਿਤੀ ਪੱਟੀ ਪ੍ਰਤੀਕ ਦੇ ਅੰਦਰ ਬੈਟਰੀ ਪੱਧਰ ਪ੍ਰਤਿਸ਼ਤਤਾ ਦਿਖਾਓ"</string> <string name="quick_settings" msgid="10042998191725428">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ"</string> - <string name="status_bar" msgid="4877645476959324760">"ਸਥਿਤੀ ਬਾਰ"</string> + <string name="status_bar" msgid="4877645476959324760">"ਸਥਿਤੀ ਪੱਟੀ"</string> <string name="overview" msgid="4018602013895926956">"ਰੂਪ-ਰੇਖਾ"</string> <string name="demo_mode" msgid="2532177350215638026">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</string> <string name="enable_demo_mode" msgid="4844205668718636518">"ਡੈਮੋ ਮੋਡ ਚਾਲੂ ਕਰੋ"</string> @@ -535,7 +535,7 @@ <string name="remove_from_settings_prompt" msgid="6069085993355887748">"ਕੀ ਸੈਟਿੰਗਾਂ ਤੋਂ ਸਿਸਟਮ UI ਟਿਊਨਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ ਅਤੇ ਇਸਦੀਆਂ ਸਾਰੀਆਂ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕਣਾ ਹੈ?"</string> <string name="activity_not_found" msgid="348423244327799974">"ਐਪਲੀਕੇਸ਼ਨ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੇ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਗਈ ਹੈ"</string> <string name="clock_seconds" msgid="7689554147579179507">"ਘੜੀ ਸਕਿੰਟ ਦਿਖਾਓ"</string> - <string name="clock_seconds_desc" msgid="6282693067130470675">"ਸਥਿਤੀ ਬਾਰ ਵਿੱਚ ਘੜੀ ਸਕਿੰਟ ਦਿਖਾਓ। ਬੈਟਰੀ ਸਮਰੱਥਾ ਤੇ ਅਸਰ ਪੈ ਸਕਦਾ ਹੈ।"</string> + <string name="clock_seconds_desc" msgid="6282693067130470675">"ਸਥਿਤੀ ਪੱਟੀ ਵਿੱਚ ਘੜੀ ਸਕਿੰਟ ਦਿਖਾਓ। ਬੈਟਰੀ ਸਮਰੱਥਾ ਤੇ ਅਸਰ ਪੈ ਸਕਦਾ ਹੈ।"</string> <string name="qs_rearrange" msgid="8060918697551068765">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਨੂੰ ਦੁਬਾਰਾ ਕ੍ਰਮ ਦਿਓ"</string> <string name="show_brightness" msgid="6613930842805942519">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਚਮਕ ਦਿਖਾਓ"</string> <string name="experimental" msgid="6198182315536726162">"ਪ੍ਰਯੋਗਾਤਮਿਕ"</string> @@ -549,7 +549,7 @@ <string name="tuner_full_importance_settings" msgid="3207312268609236827">"ਪਾਵਰ ਸੂਚਨਾ ਕੰਟਰੋਲ"</string> <string name="tuner_full_importance_settings_on" msgid="7545060756610299966">"ਚਾਲੂ"</string> <string name="tuner_full_importance_settings_off" msgid="8208165412614935229">"ਬੰਦ"</string> - <string name="power_notification_controls_description" msgid="4372459941671353358">"ਪਾਵਰ ਸੂਚਨਾ ਕੰਟਰੋਲਾਂ ਨਾਲ, ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਲਈ ਮਹੱਤਤਾ ਪੱਧਰ ਨੂੰ 0 ਤੋਂ 5 ਤੱਕ ਸੈੱਟ ਕਰ ਸਕਦੇ ਹੋ। \n\n"<b>"ਪੱਧਰ 5"</b>" \n- ਸੂਚਨਾ ਸੂਚੀ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਖਾਓ \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਦੀ ਆਗਿਆ ਦਿਓ \n- ਹਮੇਸ਼ਾਂ ਝਲਕ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 4"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਹਮੇਸ਼ਾਂ ਝਲਕ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 3"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 2"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n- ਕਦੇ ਵੀ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਾ ਕਰੋ \n\n"<b>"ਪੱਧਰ 1"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n- ਕਦੇ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਾ ਕਰੋ \n- ਲੌਕ ਸਕ੍ਰੀਨ ਅਤੇ ਸਥਿਤੀ ਪੱਟੀ ਤੋਂ ਲੁਕਾਓ \n- ਸੂਚਨਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 0"</b>" \n- ਐਪ ਤੋਂ ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬਲਾਕ ਕਰੋ"</string> + <string name="power_notification_controls_description" msgid="4372459941671353358">"ਪਾਵਰ ਸੂਚਨਾ ਕੰਟਰੋਲਾਂ ਨਾਲ, ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਲਈ ਮਹੱਤਤਾ ਪੱਧਰ ਨੂੰ 0 ਤੋਂ 5 ਤੱਕ ਸੈੱਟ ਕਰ ਸਕਦੇ ਹੋ। \n\n"<b>"ਪੱਧਰ 5"</b>" \n- ਸੂਚਨਾ ਸੂਚੀ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਖਾਓ \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਦੀ ਆਗਿਆ ਦਿਓ \n- ਹਮੇਸ਼ਾਂ ਝਲਕ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 4"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਹਮੇਸ਼ਾਂ ਝਲਕ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 3"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 2"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n- ਕਦੇ ਵੀ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਾ ਕਰੋ \n\n"<b>"ਪੱਧਰ 1"</b>" \n- ਪੂਰੀ ਸਕ੍ਰੀਨ ਰੁਕਾਵਟ ਨੂੰ ਰੋਕੋ \n- ਕਦੇ ਝਲਕ ਨਾ ਦਿਖਾਓ \n- ਕਦੇ ਧੁਨੀ ਜਾਂ ਥਰਥਰਾਹਟ ਨਾ ਕਰੋ \n- ਲਾਕ ਸਕ੍ਰੀਨ ਅਤੇ ਸਥਿਤੀ ਪੱਟੀ ਤੋਂ ਲੁਕਾਓ \n- ਸੂਚਨਾ ਸੂਚੀ ਦੇ ਹੇਠਾਂ ਦਿਖਾਓ \n\n"<b>"ਪੱਧਰ 0"</b>" \n- ਐਪ ਤੋਂ ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬਲਾਕ ਕਰੋ"</string> <string name="notification_header_default_channel" msgid="7506845022070889909">"ਸੂਚਨਾਵਾਂ"</string> <string name="notification_channel_disabled" msgid="2139193533791840539">"ਤੁਹਾਨੂੰ ਹੁਣ ਇਹ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਣਗੀਆਂ"</string> <string name="notification_num_channels" msgid="2048144408999179471">"<xliff:g id="NUMBER">%d</xliff:g> ਸੂਚਨਾ ਸ਼੍ਰੇਣੀਆਂ"</string> @@ -605,7 +605,7 @@ <string name="keyboard_key_media_next" msgid="1894394911630345607">"ਅੱਗੇ"</string> <string name="keyboard_key_media_previous" msgid="4256072387192967261">"ਪਿਛਲਾ"</string> <string name="keyboard_key_media_rewind" msgid="2654808213360820186">"Rewind"</string> - <string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"Fast Forward"</string> + <string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"ਤੇਜ਼ੀ ਨਾਲ ਅੱਗੇ ਭੇਜੋ"</string> <string name="keyboard_key_page_up" msgid="5654098530106845603">"Page Up"</string> <string name="keyboard_key_page_down" msgid="8720502083731906136">"Page Down"</string> <string name="keyboard_key_forward_del" msgid="1391451334716490176">"ਮਿਟਾਓ"</string> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java index 8de1d317c5ed..2bc0e45c725d 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java @@ -15,6 +15,8 @@ */ package com.android.keyguard; +import static android.view.Display.INVALID_DISPLAY; + import android.app.Presentation; import android.content.Context; import android.content.DialogInterface; @@ -28,16 +30,21 @@ import android.view.Display; import android.view.View; import android.view.WindowManager; +// TODO(multi-display): Support multiple external displays public class KeyguardDisplayManager { protected static final String TAG = "KeyguardDisplayManager"; private static boolean DEBUG = KeyguardConstants.DEBUG; + + private final ViewMediatorCallback mCallback; + private final MediaRouter mMediaRouter; + private final Context mContext; + Presentation mPresentation; - private MediaRouter mMediaRouter; - private Context mContext; private boolean mShowing; - public KeyguardDisplayManager(Context context) { + public KeyguardDisplayManager(Context context, ViewMediatorCallback callback) { mContext = context; + mCallback = callback; mMediaRouter = (MediaRouter) mContext.getSystemService(Context.MEDIA_ROUTER_SERVICE); } @@ -90,6 +97,7 @@ public class KeyguardDisplayManager { }; protected void updateDisplays(boolean showing) { + Presentation originalPresentation = mPresentation; if (showing) { MediaRouter.RouteInfo route = mMediaRouter.getSelectedRoute( MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY); @@ -121,6 +129,13 @@ public class KeyguardDisplayManager { mPresentation = null; } } + + // mPresentation is only updated when the display changes + if (mPresentation != originalPresentation) { + final int displayId = mPresentation != null + ? mPresentation.getDisplay().getDisplayId() : INVALID_DISPLAY; + mCallback.onSecondaryDisplayShowingChanged(displayId); + } } private final static class KeyguardPresentation extends Presentation { diff --git a/packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java b/packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java index 327d218913d2..b194de43a718 100644 --- a/packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java +++ b/packages/SystemUI/src/com/android/keyguard/ViewMediatorCallback.java @@ -88,4 +88,9 @@ public interface ViewMediatorCallback { * {@link KeyguardSecurityView#PROMPT_REASON_TIMEOUT}. */ int getBouncerPromptReason(); + + /** + * Invoked when the secondary display showing a keyguard window changes. + */ + void onSecondaryDisplayShowingChanged(int displayId); } diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 4cbbbd6c2e90..189badfc42fc 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java @@ -1280,7 +1280,23 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn mGradientDrawable.setScreenSize(displaySize.x, displaySize.y); GradientColors colors = mColorExtractor.getColors(mKeyguardShowing ? WallpaperManager.FLAG_LOCK : WallpaperManager.FLAG_SYSTEM); - mGradientDrawable.setColors(colors, false); + updateColors(colors, false /* animate */); + } + + /** + * Updates background and system bars according to current GradientColors. + * @param colors Colors and hints to use. + * @param animate Interpolates gradient if true, just sets otherwise. + */ + private void updateColors(GradientColors colors, boolean animate) { + mGradientDrawable.setColors(colors, animate); + View decorView = getWindow().getDecorView(); + if (colors.supportsDarkText()) { + decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR | + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); + } else { + decorView.setSystemUiVisibility(0); + } } @Override @@ -1350,11 +1366,13 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn public void onColorsChanged(ColorExtractor extractor, int which) { if (mKeyguardShowing) { if ((WallpaperManager.FLAG_LOCK & which) != 0) { - mGradientDrawable.setColors(extractor.getColors(WallpaperManager.FLAG_LOCK)); + updateColors(extractor.getColors(WallpaperManager.FLAG_LOCK), + true /* animate */); } } else { if ((WallpaperManager.FLAG_SYSTEM & which) != 0) { - mGradientDrawable.setColors(extractor.getColors(WallpaperManager.FLAG_SYSTEM)); + updateColors(extractor.getColors(WallpaperManager.FLAG_SYSTEM), + true /* animate */); } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 3eb68f5214c0..28adca97b8bf 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -17,6 +17,7 @@ package com.android.systemui.keyguard; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; +import static android.view.Display.INVALID_DISPLAY; import static com.android.internal.telephony.IccCardConstants.State.ABSENT; import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST; @@ -239,6 +240,9 @@ public class KeyguardViewMediator extends SystemUI { // answer whether the input should be restricted) private boolean mShowing; + // display id of the secondary display on which we have put a keyguard window + private int mSecondaryDisplayShowing = INVALID_DISPLAY; + /** Cached value of #isInputRestricted */ private boolean mInputRestricted; @@ -646,6 +650,13 @@ public class KeyguardViewMediator extends SystemUI { } return KeyguardSecurityView.PROMPT_REASON_NONE; } + + @Override + public void onSecondaryDisplayShowingChanged(int displayId) { + synchronized (KeyguardViewMediator.this) { + setShowingLocked(mShowing, displayId, false); + } + } }; public void userActivity() { @@ -670,7 +681,7 @@ public class KeyguardViewMediator extends SystemUI { filter.addAction(Intent.ACTION_SHUTDOWN); mContext.registerReceiver(mBroadcastReceiver, filter); - mKeyguardDisplayManager = new KeyguardDisplayManager(mContext); + mKeyguardDisplayManager = new KeyguardDisplayManager(mContext, mViewMediatorCallback); mAlarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE); @@ -685,7 +696,8 @@ public class KeyguardViewMediator extends SystemUI { com.android.keyguard.R.bool.config_enableKeyguardService)) { setShowingLocked(!shouldWaitForProvisioning() && !mLockPatternUtils.isLockScreenDisabled( - KeyguardUpdateMonitor.getCurrentUser()), true /* forceCallbacks */); + KeyguardUpdateMonitor.getCurrentUser()), + mSecondaryDisplayShowing, true /* forceCallbacks */); } mStatusBarKeyguardViewManager = @@ -1694,10 +1706,10 @@ public class KeyguardViewMediator extends SystemUI { playSound(mTrustedSoundId); } - private void updateActivityLockScreenState(boolean showing) { + private void updateActivityLockScreenState(boolean showing, int secondaryDisplayShowing) { mUiOffloadThread.submit(() -> { try { - ActivityManager.getService().setLockScreenShown(showing); + ActivityManager.getService().setLockScreenShown(showing, secondaryDisplayShowing); } catch (RemoteException e) { } }); @@ -2060,30 +2072,39 @@ public class KeyguardViewMediator extends SystemUI { } private void setShowingLocked(boolean showing) { - setShowingLocked(showing, false /* forceCallbacks */); + setShowingLocked(showing, mSecondaryDisplayShowing, false /* forceCallbacks */); } - private void setShowingLocked(boolean showing, boolean forceCallbacks) { - if (showing != mShowing || forceCallbacks) { + private void setShowingLocked( + boolean showing, int secondaryDisplayShowing, boolean forceCallbacks) { + final boolean notifyDefaultDisplayCallbacks = showing != mShowing || forceCallbacks; + if (notifyDefaultDisplayCallbacks || secondaryDisplayShowing != mSecondaryDisplayShowing) { mShowing = showing; - int size = mKeyguardStateCallbacks.size(); - for (int i = size - 1; i >= 0; i--) { - IKeyguardStateCallback callback = mKeyguardStateCallbacks.get(i); - try { - callback.onShowingStateChanged(showing); - } catch (RemoteException e) { - Slog.w(TAG, "Failed to call onShowingStateChanged", e); - if (e instanceof DeadObjectException) { - mKeyguardStateCallbacks.remove(callback); - } + mSecondaryDisplayShowing = secondaryDisplayShowing; + if (notifyDefaultDisplayCallbacks) { + notifyDefaultDisplayCallbacks(showing); + } + updateActivityLockScreenState(showing, secondaryDisplayShowing); + } + } + + private void notifyDefaultDisplayCallbacks(boolean showing) { + int size = mKeyguardStateCallbacks.size(); + for (int i = size - 1; i >= 0; i--) { + IKeyguardStateCallback callback = mKeyguardStateCallbacks.get(i); + try { + callback.onShowingStateChanged(showing); + } catch (RemoteException e) { + Slog.w(TAG, "Failed to call onShowingStateChanged", e); + if (e instanceof DeadObjectException) { + mKeyguardStateCallbacks.remove(callback); } } - updateInputRestrictedLocked(); - mUiOffloadThread.submit(() -> { - mTrustManager.reportKeyguardShowingChanged(); - }); - updateActivityLockScreenState(showing); } + updateInputRestrictedLocked(); + mUiOffloadThread.submit(() -> { + mTrustManager.reportKeyguardShowingChanged(); + }); } private void notifyTrustedChangedLocked(boolean trusted) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index 7fe7f399f123..8fa904e10b4a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -2024,14 +2024,15 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } @Override - public int getMinHeight() { - if (mGuts != null && mGuts.isExposed()) { + public int getMinHeight(boolean ignoreTemporaryStates) { + if (!ignoreTemporaryStates && mGuts != null && mGuts.isExposed()) { return mGuts.getIntrinsicHeight(); - } else if (isHeadsUpAllowed() && mIsHeadsUp && mHeadsUpManager.isTrackingHeadsUp()) { + } else if (!ignoreTemporaryStates && isHeadsUpAllowed() && mIsHeadsUp + && mHeadsUpManager.isTrackingHeadsUp()) { return getPinnedHeadsUpHeight(false /* atLeastMinHeight */); } else if (mIsSummaryWithChildren && !isGroupExpanded() && !mShowingPublic) { return mChildrenContainer.getMinHeight(); - } else if (isHeadsUpAllowed() && mIsHeadsUp) { + } else if (!ignoreTemporaryStates && isHeadsUpAllowed() && mIsHeadsUp) { return mHeadsUpHeight; } NotificationContentView showingLayout = getShowingLayout(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java index efe5e0c2ade4..aac9af8a0234 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java @@ -151,9 +151,21 @@ public abstract class ExpandableView extends FrameLayout { } /** - * @return The minimum content height of this notification. + * @return The minimum content height of this notification. This also respects the temporary + * states of the view. */ public int getMinHeight() { + return getMinHeight(false /* ignoreTemporaryStates */); + } + + /** + * Get the minimum height of this view. + * + * @param ignoreTemporaryStates should temporary states be ignored like the guts or heads-up. + * + * @return The minimum height that this view needs. + */ + public int getMinHeight(boolean ignoreTemporaryStates) { return getHeight(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java index ddc7dd063d4e..d0417b59448d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java @@ -292,8 +292,8 @@ public class NotificationData { if (mRankingMap != null) { // RankingMap as received from NoMan - mRankingMap.getRanking(a.key, mRankingA); - mRankingMap.getRanking(b.key, mRankingB); + getRanking(a.key, mRankingA); + getRanking(b.key, mRankingB); aImportance = mRankingA.getImportance(); bImportance = mRankingB.getImportance(); aRank = mRankingA.getRank(); @@ -381,7 +381,7 @@ public class NotificationData { public boolean isAmbient(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.isAmbient(); } return false; @@ -389,7 +389,7 @@ public class NotificationData { public int getVisibilityOverride(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getVisibilityOverride(); } return Ranking.VISIBILITY_NO_OVERRIDE; @@ -397,7 +397,7 @@ public class NotificationData { public boolean shouldSuppressScreenOff(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return (mTmpRanking.getSuppressedVisualEffects() & NotificationListenerService.SUPPRESSED_EFFECT_SCREEN_OFF) != 0; } @@ -406,7 +406,7 @@ public class NotificationData { public boolean shouldSuppressScreenOn(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return (mTmpRanking.getSuppressedVisualEffects() & NotificationListenerService.SUPPRESSED_EFFECT_SCREEN_ON) != 0; } @@ -415,7 +415,7 @@ public class NotificationData { public int getImportance(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getImportance(); } return NotificationManager.IMPORTANCE_UNSPECIFIED; @@ -423,7 +423,7 @@ public class NotificationData { public String getOverrideGroupKey(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getOverrideGroupKey(); } return null; @@ -431,7 +431,7 @@ public class NotificationData { public List<SnoozeCriterion> getSnoozeCriteria(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getSnoozeCriteria(); } return null; @@ -439,7 +439,7 @@ public class NotificationData { public NotificationChannel getChannel(String key) { if (mRankingMap != null) { - mRankingMap.getRanking(key, mTmpRanking); + getRanking(key, mTmpRanking); return mTmpRanking.getChannel(); } return null; @@ -452,6 +452,9 @@ public class NotificationData { final int N = mEntries.size(); for (int i = 0; i < N; i++) { Entry entry = mEntries.valueAt(i); + if (!getRanking(entry.key, mTmpRanking)) { + continue; + } final StatusBarNotification oldSbn = entry.notification.cloneLight(); final String overrideGroupKey = getOverrideGroupKey(entry.key); if (!Objects.equals(oldSbn.getOverrideGroupKey(), overrideGroupKey)) { @@ -466,6 +469,19 @@ public class NotificationData { filterAndSort(); } + /** + * Get the ranking from the current ranking map. + * + * @param key the key to look up + * @param outRanking the ranking to populate + * + * @return {@code true} if the ranking was properly obtained. + */ + @VisibleForTesting + protected boolean getRanking(String key, Ranking outRanking) { + return mRankingMap.getRanking(key, outRanking); + } + // TODO: This should not be public. Instead the Environment should notify this class when // anything changed, and this class should call back the UI so it updates itself. public void filterAndSort() { @@ -573,7 +589,7 @@ public class NotificationData { } private void dumpEntry(PrintWriter pw, String indent, int i, Entry e) { - mRankingMap.getRanking(e.key, mTmpRanking); + getRanking(e.key, mTmpRanking); pw.print(indent); pw.println(" [" + i + "] key=" + e.key + " icon=" + e.icon); StatusBarNotification n = e.notification; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java index 1f44abea755a..4bca79715422 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java @@ -50,7 +50,7 @@ public class BarTransitions { public static final int MODE_LIGHTS_OUT_TRANSPARENT = 6; public static final int LIGHTS_IN_DURATION = 250; - public static final int LIGHTS_OUT_DURATION = 750; + public static final int LIGHTS_OUT_DURATION = 1500; public static final int BACKGROUND_DURATION = 200; private final String mTag; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 078e8189f5b3..c19161839998 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -509,7 +509,8 @@ public class NotificationPanelView extends PanelView implements if (row.isRemoved()) { continue; } - availableSpace -= child.getMinHeight() + notificationPadding; + availableSpace -= child.getMinHeight(true /* ignoreTemporaryStates */) + + notificationPadding; if (availableSpace >= 0 && count < maximum) { count++; } else if (availableSpace > -shelfSize) { 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 efc8d8b97114..200cada972a7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -339,7 +339,7 @@ public class StatusBar extends SystemUI implements DemoMode, private static final int STATUS_OR_NAV_TRANSIENT = View.STATUS_BAR_TRANSIENT | View.NAVIGATION_BAR_TRANSIENT; - private static final long AUTOHIDE_TIMEOUT_MS = 3000; + private static final long AUTOHIDE_TIMEOUT_MS = 2250; /** The minimum delay in ms between reports of notification visibility. */ private static final int VISIBILITY_REPORT_MIN_DELAY_MS = 500; @@ -3321,7 +3321,6 @@ public class StatusBar extends SystemUI implements DemoMode, } else { cancelAutohide(); } - touchAutoDim(); } protected int computeStatusBarMode(int oldVal, int newVal) { @@ -3404,10 +3403,10 @@ public class StatusBar extends SystemUI implements DemoMode, } // manually dismiss the volume panel when interacting with the nav bar if (changing && interacting && barWindow == StatusBarManager.WINDOW_NAVIGATION_BAR) { + touchAutoDim(); dismissVolumeDialog(); } checkBarModes(); - touchAutoDim(); } private void dismissVolumeDialog() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java index 18c5756b3fb6..972eddb46901 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java @@ -135,5 +135,11 @@ public class NotificationDataTest extends SysuiTestCase { public NotificationChannel getChannel(String key) { return new NotificationChannel(null, null, 0); } + + @Override + protected boolean getRanking(String key, NotificationListenerService.Ranking outRanking) { + super.getRanking(key, outRanking); + return true; + } } } diff --git a/proto/src/ipconnectivity.proto b/proto/src/ipconnectivity.proto index 777468a9e0d2..437da8f3f17a 100644 --- a/proto/src/ipconnectivity.proto +++ b/proto/src/ipconnectivity.proto @@ -501,8 +501,8 @@ message WakeupStats { // between [1001, 9999]. See android.os.Process for possible uids. optional int64 non_application_wakeups = 6; - // The total number of wakeup packets with no associated sockets. - optional int64 unrouted_wakeups = 7; + // The total number of wakeup packets with no associated socket or uid. + optional int64 no_uid_wakeups = 7; } // Represents one of the IP connectivity event defined in this file. diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index aa4217cec802..07302706d134 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -4451,6 +4451,82 @@ message MetricsEvent { // OS: O MR FIELD_SELECTION_SMART_RANGE = 1123; + // The value of an autofillable and savable view was reset + // Package: Package of app that was autofilled + // OS: O MR + // Tag FIELD_AUTOFILL_SERVICE: Package of service that processed the request + // Tag FIELD_AUTOFILL_PREVIOUS_LENGTH: the previous length of the value + AUTOFILL_VALUE_RESET = 1124; + + // Tag of AUTOFILL_VALUE_RESET + // OS: O MR + FIELD_AUTOFILL_PREVIOUS_LENGTH = 1125; + + // An autofill dataset authentification succeeded + // Package: Package of app that was autofilled + // OS: O MR + // Tag FIELD_AUTOFILL_SERVICE: Package of service that processed the request + AUTOFILL_DATASET_AUTHENTICATED = 1126; + + // An autofill service provided an invalid dataset authentification + // Package: Package of app that was autofilled + // OS: O MR + // Tag FIELD_AUTOFILL_SERVICE: Package of service that processed the request + AUTOFILL_INVALID_DATASET_AUTHENTICATION = 1127; + + // An autofill service provided an invalid authentification extra + // Package: Package of app that was autofilled + // OS: O MR + // Tag FIELD_AUTOFILL_SERVICE: Package of service that processed the request + AUTOFILL_INVALID_AUTHENTICATION = 1128; + + // An autofill service used a custom description (using RemoteViews) in the Save affordance + // Package: Package of app that is autofilled + // OS: O MR + // Tag FIELD_AUTOFILL_SERVICE: Package of service that processed the request + // Tag FIELD_AUTOFILL_SAVE_TYPE: Type of save object passed by the service + AUTOFILL_SAVE_CUSTOM_DESCRIPTION = 1129; + + // FIELD - Type of save object passed by the service when the Save UI is shown + // OS: O MR + FIELD_AUTOFILL_SAVE_TYPE = 1130; + + // An autofill service used a custom subtitle (String) in the Save affordance + // Package: Package of app that is autofilled + // OS: O MR + // Tag FIELD_AUTOFILL_SERVICE: Package of service that processed the request + // Tag FIELD_AUTOFILL_SAVE_TYPE: Type of save object passed by the service + AUTOFILL_SAVE_CUSTOM_SUBTITLE = 1131; + + // User tapped a link in the custom description of the Save affordance provided by an autofill service + // Package: Package of app that is autofilled + // OS: O MR + // Type TYPE_UNKNOWN: The link was not properly set by the service + // Type TYPE_OPEN: The link launched an activity + // Type TYPE_FAILURE: The link could not launc an activity + // Tag FIELD_AUTOFILL_SERVICE: Package of service that processed the request + // Tag FIELD_AUTOFILL_SAVE_TYPE: Type of save object passed by the service + AUTOFILL_SAVE_LINK_TAPPED = 1132; + + // Result of the validation on save when an autofill service provided a validator + // Package: Package of app that is autofilled + // OS: O MR + // Type TYPE_FAILURE: The validation could not be performed due to an error + // Type TYPE_SUCCESS: The validation passed + // Type TYPE_DISMISS: The validation failed + // Tag FIELD_AUTOFILL_SERVICE: Package of service that processed the request + // Tag FIELD_AUTOFILL_SAVE_TYPE: Type of save object passed by the service + AUTOFILL_SAVE_VALIDATION = 1133; + + // Result of an operation in the autofill save affordance after the user tapped a link in the custom description + // provided by the autofill service + // Package: Package of app that is autofilled + // OS: O MR + // Type TYPE_OPEN: The save affordance was restored + // Type TYPE_DISMISS: The save affordcance was destroyed + // Type TYPE_FAILURE: An invalid opperation was reported by the app's AutofillManager + AUTOFILL_PENDING_SAVE_UI_OPERATION = 1134; + // ---- End O-MR1 Constants, all O-MR1 constants go above this line ---- // OPEN: Settings > Network & Internet > Mobile network diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java index ddc819d39d5e..a1c75bfc16c0 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java @@ -650,7 +650,7 @@ public final class AutofillManagerService extends SystemService { synchronized (mLock) { final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId); if (service == null) return false; - return Objects.equals(packageName, service.getPackageName()); + return Objects.equals(packageName, service.getServicePackageName()); } } diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index f2f96f824e5b..77ce87171a4b 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -146,8 +146,9 @@ final class AutofillManagerServiceImpl { updateLocked(disabled); } + @Nullable CharSequence getServiceName() { - final String packageName = getPackageName(); + final String packageName = getServicePackageName(); if (packageName == null) { return null; } @@ -162,7 +163,8 @@ final class AutofillManagerServiceImpl { } } - String getPackageName() { + @Nullable + String getServicePackageName() { final ComponentName serviceComponent = getServiceComponentName(); if (serviceComponent != null) { return serviceComponent.getPackageName(); diff --git a/services/autofill/java/com/android/server/autofill/Helper.java b/services/autofill/java/com/android/server/autofill/Helper.java index 086dd29f0c97..236fbfd94f53 100644 --- a/services/autofill/java/com/android/server/autofill/Helper.java +++ b/services/autofill/java/com/android/server/autofill/Helper.java @@ -18,6 +18,7 @@ package com.android.server.autofill; import android.annotation.NonNull; import android.annotation.Nullable; +import android.metrics.LogMaker; import android.os.Bundle; import android.service.autofill.Dataset; import android.util.ArrayMap; @@ -25,6 +26,8 @@ import android.util.ArraySet; import android.view.autofill.AutofillId; import android.view.autofill.AutofillValue; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; + import java.util.ArrayList; import java.util.Arrays; import java.util.Objects; @@ -99,4 +102,14 @@ public final class Helper { } return fields; } + + @NonNull + public static LogMaker newLogMaker(int category, String packageName, + String servicePackageName) { + final LogMaker log = new LogMaker(category).setPackageName(packageName); + if (servicePackageName != null) { + log.addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, servicePackageName); + } + return log; + } } diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index 171053fd8ddf..09ecdd534da9 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -417,7 +417,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState mPackageName = packageName; mClient = IAutoFillManagerClient.Stub.asInterface(client); - mMetricsLogger.action(MetricsEvent.AUTOFILL_SESSION_STARTED, mPackageName); + writeLog(MetricsEvent.AUTOFILL_SESSION_STARTED); } /** @@ -477,13 +477,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState processResponseLocked(response, requestFlags); } - final LogMaker log = (new LogMaker(MetricsEvent.AUTOFILL_REQUEST)) + final LogMaker log = newLogMaker(MetricsEvent.AUTOFILL_REQUEST, servicePackageName) .setType(MetricsEvent.TYPE_SUCCESS) - .setPackageName(mPackageName) .addTaggedData(MetricsEvent.FIELD_AUTOFILL_NUM_DATASETS, - response.getDatasets() == null ? 0 : response.getDatasets().size()) - .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, - servicePackageName); + response.getDatasets() == null ? 0 : response.getDatasets().size()); mMetricsLogger.write(log); } @@ -499,10 +496,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } mService.resetLastResponse(); } - LogMaker log = (new LogMaker(MetricsEvent.AUTOFILL_REQUEST)) - .setType(MetricsEvent.TYPE_FAILURE) - .setPackageName(mPackageName) - .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, servicePackageName); + LogMaker log = newLogMaker(MetricsEvent.AUTOFILL_REQUEST, servicePackageName) + .setType(MetricsEvent.TYPE_FAILURE); mMetricsLogger.write(log); getUiForShowing().showError(message, this); @@ -521,11 +516,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState return; } } - LogMaker log = (new LogMaker( - MetricsEvent.AUTOFILL_DATA_SAVE_REQUEST)) - .setType(MetricsEvent.TYPE_SUCCESS) - .setPackageName(mPackageName) - .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, servicePackageName); + LogMaker log = newLogMaker(MetricsEvent.AUTOFILL_DATA_SAVE_REQUEST, servicePackageName) + .setType(MetricsEvent.TYPE_SUCCESS); mMetricsLogger.write(log); // Nothing left to do... @@ -545,11 +537,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState return; } } - LogMaker log = (new LogMaker( - MetricsEvent.AUTOFILL_DATA_SAVE_REQUEST)) - .setType(MetricsEvent.TYPE_FAILURE) - .setPackageName(mPackageName) - .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, servicePackageName); + LogMaker log = newLogMaker(MetricsEvent.AUTOFILL_DATA_SAVE_REQUEST, servicePackageName) + .setType(MetricsEvent.TYPE_FAILURE); mMetricsLogger.write(log); getUiForShowing().showError(message, this); @@ -746,21 +735,22 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState final Parcelable result = data.getParcelable(AutofillManager.EXTRA_AUTHENTICATION_RESULT); if (sDebug) Slog.d(TAG, "setAuthenticationResultLocked(): result=" + result); if (result instanceof FillResponse) { - final FillResponse response = (FillResponse) result; - mMetricsLogger.action(MetricsEvent.AUTOFILL_AUTHENTICATED, mPackageName); - replaceResponseLocked(authenticatedResponse, response); + writeLog(MetricsEvent.AUTOFILL_AUTHENTICATED); + replaceResponseLocked(authenticatedResponse, (FillResponse) result); } else if (result instanceof Dataset) { - // TODO: add proper metric if (datasetIdx != AutofillManager.AUTHENTICATION_ID_DATASET_ID_UNDEFINED) { + writeLog(MetricsEvent.AUTOFILL_DATASET_AUTHENTICATED); final Dataset dataset = (Dataset) result; authenticatedResponse.getDatasets().set(datasetIdx, dataset); autoFill(requestId, datasetIdx, dataset, false); + } else { + writeLog(MetricsEvent.AUTOFILL_INVALID_DATASET_AUTHENTICATION); } } else { if (result != null) { Slog.w(TAG, "service returned invalid auth type: " + result); } - // TODO: add proper metric (on else) + writeLog(MetricsEvent.AUTOFILL_INVALID_AUTHENTICATION); processNullResponseLocked(0); } } @@ -774,43 +764,57 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState mHasCallback = hasIt; } - /** - * Shows the save UI, when session can be saved. - * - * @return {@code true} if session is done, or {@code false} if it's pending user action. - */ - public boolean showSaveLocked() { - if (mDestroyed) { - Slog.w(TAG, "Call to Session#showSaveLocked() rejected - session: " - + id + " destroyed"); - return false; - } + @Nullable + private FillResponse getLastResponseLocked(@Nullable String logPrefix) { if (mContexts == null) { - Slog.d(TAG, "showSaveLocked(): no contexts"); - return true; + if (sDebug && logPrefix != null) Slog.d(TAG, logPrefix + ": no contexts"); + return null; } if (mResponses == null) { // Happens when the activity / session was finished before the service replied, or // when the service cannot autofill it (and returned a null response). - if (sVerbose) { - Slog.v(TAG, "showSaveLocked(): no responses on session"); + if (sVerbose && logPrefix != null) { + Slog.v(TAG, logPrefix + ": no responses on session"); } - return true; + return null; } final int lastResponseIdx = getLastResponseIndexLocked(); if (lastResponseIdx < 0) { - Slog.w(TAG, "showSaveLocked(): did not get last response. mResponses=" + mResponses - + ", mViewStates=" + mViewStates); - return true; + if (logPrefix != null) { + Slog.w(TAG, logPrefix + ": did not get last response. mResponses=" + mResponses + + ", mViewStates=" + mViewStates); + } + return null; } final FillResponse response = mResponses.valueAt(lastResponseIdx); - final SaveInfo saveInfo = response.getSaveInfo(); - if (sVerbose) { - Slog.v(TAG, "showSaveLocked(): mResponses=" + mResponses + ", mContexts=" + mContexts + if (sVerbose && logPrefix != null) { + Slog.v(TAG, logPrefix + ": mResponses=" + mResponses + ", mContexts=" + mContexts + ", mViewStates=" + mViewStates); } + return response; + } + + @Nullable + private SaveInfo getSaveInfoLocked() { + final FillResponse response = getLastResponseLocked(null); + return response == null ? null : response.getSaveInfo(); + } + + /** + * Shows the save UI, when session can be saved. + * + * @return {@code true} if session is done, or {@code false} if it's pending user action. + */ + public boolean showSaveLocked() { + if (mDestroyed) { + Slog.w(TAG, "Call to Session#showSaveLocked() rejected - session: " + + id + " destroyed"); + return false; + } + final FillResponse response = getLastResponseLocked("showSaveLocked()"); + final SaveInfo saveInfo = response == null ? null : response.getSaveInfo(); /* * The Save dialog is only shown if all conditions below are met: @@ -922,15 +926,21 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState final InternalValidator validator = saveInfo.getValidator(); if (validator != null) { + final LogMaker log = newLogMaker(MetricsEvent.AUTOFILL_SAVE_VALIDATION); boolean isValid; try { isValid = validator.isValid(valueFinder); + log.setType(isValid + ? MetricsEvent.TYPE_SUCCESS + : MetricsEvent.TYPE_DISMISS); } catch (Exception e) { - Slog.e(TAG, "Not showing save UI because of exception during validation " - + e.getClass()); + Slog.e(TAG, "Not showing save UI because validation failed:", e); + log.setType(MetricsEvent.TYPE_FAILURE); + mMetricsLogger.write(log); return true; } + mMetricsLogger.write(log); if (!isValid) { Slog.i(TAG, "not showing save UI because fields failed validation"); return true; @@ -978,7 +988,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState final IAutoFillManagerClient client = getClient(); mPendingSaveUi = new PendingUi(mActivityToken, id, client); getUiForShowing().showSaveUi(mService.getServiceLabel(), mService.getServiceIcon(), - saveInfo, valueFinder, mPackageName, this, mPendingSaveUi); + mService.getServicePackageName(), saveInfo, valueFinder, mPackageName, this, + mPendingSaveUi); if (client != null) { try { client.setSaveUiState(id, true); @@ -1244,6 +1255,21 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState break; case ACTION_VALUE_CHANGED: if (value != null && !value.equals(viewState.getCurrentValue())) { + if (value.isEmpty() + && viewState.getCurrentValue() != null + && viewState.getCurrentValue().isText() + && viewState.getCurrentValue().getTextValue() != null + && getSaveInfoLocked() != null) { + final int length = viewState.getCurrentValue().getTextValue().length(); + if (sDebug) { + Slog.d(TAG, "updateLocked(" + id + "): resetting value that was " + + length + " chars long"); + } + final LogMaker log = newLogMaker(MetricsEvent.AUTOFILL_VALUE_RESET) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_PREVIOUS_LENGTH, length); + mMetricsLogger.write(log); + } + // Always update the internal state. viewState.setCurrentValue(value); @@ -1319,7 +1345,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState filterText = value.getTextValue().toString(); } - getUiForShowing().showFillUi(filledId, response, filterText, mPackageName, this); + getUiForShowing().showFillUi(filledId, response, filterText, + mService.getServicePackageName(), mPackageName, this); } boolean isDestroyed() { @@ -1735,7 +1762,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState mUi.destroyAll(mPendingSaveUi, this); mUi.clearCallback(this); mDestroyed = true; - mMetricsLogger.action(MetricsEvent.AUTOFILL_SESSION_FINISHED, mPackageName); + writeLog(MetricsEvent.AUTOFILL_SESSION_FINISHED); return mRemoteFillService; } @@ -1820,4 +1847,16 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } return lastResponseIdx; } + + private LogMaker newLogMaker(int category) { + return newLogMaker(category, mService.getServicePackageName()); + } + + private LogMaker newLogMaker(int category, String servicePackageName) { + return Helper.newLogMaker(category, mPackageName, servicePackageName); + } + + private void writeLog(int category) { + mMetricsLogger.write(newLogMaker(category)); + } } diff --git a/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java b/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java index cac2bff579ed..434b590d2d12 100644 --- a/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java +++ b/services/autofill/java/com/android/server/autofill/ui/AutoFillUI.java @@ -40,8 +40,9 @@ import android.view.autofill.IAutofillWindowPresenter; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.server.UiThread; +import com.android.server.autofill.Helper; import java.io.PrintWriter; @@ -158,21 +159,22 @@ public final class AutoFillUI { * @param focusedId the currently focused field * @param response the current fill response * @param filterText text of the view to be filled + * @param servicePackageName package name of the autofill service filling the activity * @param packageName package name of the activity that is filled * @param callback Identifier for the caller */ public void showFillUi(@NonNull AutofillId focusedId, @NonNull FillResponse response, - @Nullable String filterText, @NonNull String packageName, - @NonNull AutoFillUiCallback callback) { + @Nullable String filterText, @Nullable String servicePackageName, + @NonNull String packageName, @NonNull AutoFillUiCallback callback) { if (sDebug) { final int size = filterText == null ? 0 : filterText.length(); Slog.d(TAG, "showFillUi(): id=" + focusedId + ", filter=" + size + " chars"); } - final LogMaker log = (new LogMaker(MetricsProto.MetricsEvent.AUTOFILL_FILL_UI)) - .setPackageName(packageName) - .addTaggedData(MetricsProto.MetricsEvent.FIELD_AUTOFILL_FILTERTEXT_LEN, + final LogMaker log = + Helper.newLogMaker(MetricsEvent.AUTOFILL_FILL_UI, packageName, servicePackageName) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_FILTERTEXT_LEN, filterText == null ? 0 : filterText.length()) - .addTaggedData(MetricsProto.MetricsEvent.FIELD_AUTOFILL_NUM_DATASETS, + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_NUM_DATASETS, response.getDatasets() == null ? 0 : response.getDatasets().size()); mHandler.post(() -> { @@ -184,7 +186,7 @@ public final class AutoFillUI { filterText, mOverlayControl, new FillUi.Callback() { @Override public void onResponsePicked(FillResponse response) { - log.setType(MetricsProto.MetricsEvent.TYPE_DETAIL); + log.setType(MetricsEvent.TYPE_DETAIL); hideFillUiUiThread(callback); if (mCallback != null) { mCallback.authenticate(response.getRequestId(), @@ -195,7 +197,7 @@ public final class AutoFillUI { @Override public void onDatasetPicked(Dataset dataset) { - log.setType(MetricsProto.MetricsEvent.TYPE_ACTION); + log.setType(MetricsEvent.TYPE_ACTION); hideFillUiUiThread(callback); if (mCallback != null) { final int datasetIndex = response.getDatasets().indexOf(dataset); @@ -205,14 +207,14 @@ public final class AutoFillUI { @Override public void onCanceled() { - log.setType(MetricsProto.MetricsEvent.TYPE_DISMISS); + log.setType(MetricsEvent.TYPE_DISMISS); hideFillUiUiThread(callback); } @Override public void onDestroy() { - if (log.getType() == MetricsProto.MetricsEvent.TYPE_UNKNOWN) { - log.setType(MetricsProto.MetricsEvent.TYPE_CLOSE); + if (log.getType() == MetricsEvent.TYPE_UNKNOWN) { + log.setType(MetricsEvent.TYPE_CLOSE); } mMetricsLogger.write(log); } @@ -246,27 +248,29 @@ public final class AutoFillUI { * Shows the UI asking the user to save for autofill. */ public void showSaveUi(@NonNull CharSequence serviceLabel, @NonNull Drawable serviceIcon, - @NonNull SaveInfo info,@NonNull ValueFinder valueFinder, @NonNull String packageName, + @Nullable String servicePackageName, @NonNull SaveInfo info, + @NonNull ValueFinder valueFinder, @NonNull String packageName, @NonNull AutoFillUiCallback callback, @NonNull PendingUi pendingSaveUi) { if (sVerbose) Slog.v(TAG, "showSaveUi() for " + packageName + ": " + info); int numIds = 0; numIds += info.getRequiredIds() == null ? 0 : info.getRequiredIds().length; numIds += info.getOptionalIds() == null ? 0 : info.getOptionalIds().length; - LogMaker log = (new LogMaker(MetricsProto.MetricsEvent.AUTOFILL_SAVE_UI)) - .setPackageName(packageName).addTaggedData( - MetricsProto.MetricsEvent.FIELD_AUTOFILL_NUM_IDS, numIds); + final LogMaker log = + Helper.newLogMaker(MetricsEvent.AUTOFILL_SAVE_UI, packageName, servicePackageName) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_NUM_IDS, numIds); mHandler.post(() -> { if (callback != mCallback) { return; } hideAllUiThread(callback); - mSaveUi = new SaveUi(mContext, pendingSaveUi, serviceLabel, serviceIcon, info, - valueFinder, mOverlayControl, new SaveUi.OnSaveListener() { + mSaveUi = new SaveUi(mContext, pendingSaveUi, serviceLabel, serviceIcon, + servicePackageName, packageName, info, valueFinder, mOverlayControl, + new SaveUi.OnSaveListener() { @Override public void onSave() { - log.setType(MetricsProto.MetricsEvent.TYPE_ACTION); + log.setType(MetricsEvent.TYPE_ACTION); hideSaveUiUiThread(mCallback); if (mCallback != null) { mCallback.save(); @@ -276,7 +280,7 @@ public final class AutoFillUI { @Override public void onCancel(IntentSender listener) { - log.setType(MetricsProto.MetricsEvent.TYPE_DISMISS); + log.setType(MetricsEvent.TYPE_DISMISS); hideSaveUiUiThread(mCallback); if (listener != null) { try { @@ -294,8 +298,8 @@ public final class AutoFillUI { @Override public void onDestroy() { - if (log.getType() == MetricsProto.MetricsEvent.TYPE_UNKNOWN) { - log.setType(MetricsProto.MetricsEvent.TYPE_CLOSE); + if (log.getType() == MetricsEvent.TYPE_UNKNOWN) { + log.setType(MetricsEvent.TYPE_CLOSE); if (mCallback != null) { mCallback.cancelSave(); diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java index d0b2e9240b58..32f4d69fc3e3 100644 --- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java @@ -20,16 +20,15 @@ import static com.android.server.autofill.Helper.sDebug; import static com.android.server.autofill.Helper.sVerbose; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.Dialog; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.IntentSender; import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; +import android.metrics.LogMaker; import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; @@ -53,6 +52,8 @@ import android.widget.ScrollView; import android.widget.TextView; import com.android.internal.R; +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.server.UiThread; import java.io.PrintWriter; @@ -111,6 +112,7 @@ final class SaveUi { } private final Handler mHandler = UiThread.getHandler(); + private final MetricsLogger mMetricsLogger = new MetricsLogger(); private final @NonNull Dialog mDialog; @@ -121,16 +123,21 @@ final class SaveUi { private final CharSequence mTitle; private final CharSequence mSubTitle; private final PendingUi mPendingUi; + private final String mServicePackageName; + private final String mPackageName; private boolean mDestroyed; SaveUi(@NonNull Context context, @NonNull PendingUi pendingUi, @NonNull CharSequence serviceLabel, @NonNull Drawable serviceIcon, + @Nullable String servicePackageName, @NonNull String packageName, @NonNull SaveInfo info, @NonNull ValueFinder valueFinder, @NonNull OverlayControl overlayControl, @NonNull OnSaveListener listener) { mPendingUi= pendingUi; mListener = new OneTimeListener(listener); mOverlayControl = overlayControl; + mServicePackageName = servicePackageName; + mPackageName = packageName; final LayoutInflater inflater = LayoutInflater.from(context); final View view = inflater.inflate(R.layout.autofill_save, null); @@ -181,6 +188,8 @@ final class SaveUi { ScrollView subtitleContainer = null; final CustomDescription customDescription = info.getCustomDescription(); if (customDescription != null) { + writeLog(MetricsEvent.AUTOFILL_SAVE_CUSTOM_DESCRIPTION, type); + mSubTitle = null; if (sDebug) Slog.d(TAG, "Using custom description"); @@ -190,40 +199,35 @@ final class SaveUi { @Override public boolean onClickHandler(View view, PendingIntent pendingIntent, Intent intent) { + final LogMaker log = + newLogMaker(MetricsEvent.AUTOFILL_SAVE_LINK_TAPPED, type); // We need to hide the Save UI before launching the pending intent, and // restore back it once the activity is finished, and that's achieved by // adding a custom extra in the activity intent. - if (pendingIntent != null) { - if (intent == null) { - Slog.w(TAG, - "remote view on custom description does not have intent"); - return false; - } - if (!pendingIntent.isActivity()) { - Slog.w(TAG, "ignoring custom description pending intent that's not " - + "for an activity: " + pendingIntent); - return false; - } - if (sVerbose) { - Slog.v(TAG, - "Intercepting custom description intent: " + intent); - } - final IBinder token = mPendingUi.getToken(); - intent.putExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN, token); - try { - pendingUi.client.startIntentSender(pendingIntent.getIntentSender(), - intent); - mPendingUi.setState(PendingUi.STATE_PENDING); - if (sDebug) { - Slog.d(TAG, "hiding UI until restored with token " + token); - } - hide(); - } catch (RemoteException e) { - Slog.w(TAG, "error triggering pending intent: " + intent); - return false; - } + final boolean isValid = isValidLink(pendingIntent, intent); + if (!isValid) { + log.setType(MetricsEvent.TYPE_UNKNOWN); + mMetricsLogger.write(log); + return false; + } + if (sVerbose) Slog.v(TAG, "Intercepting custom description intent"); + final IBinder token = mPendingUi.getToken(); + intent.putExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN, token); + try { + pendingUi.client.startIntentSender(pendingIntent.getIntentSender(), + intent); + mPendingUi.setState(PendingUi.STATE_PENDING); + if (sDebug) Slog.d(TAG, "hiding UI until restored with token " + token); + hide(); + log.setType(MetricsEvent.TYPE_OPEN); + mMetricsLogger.write(log); + return true; + } catch (RemoteException e) { + Slog.w(TAG, "error triggering pending intent: " + intent); + log.setType(MetricsEvent.TYPE_FAILURE); + mMetricsLogger.write(log); + return false; } - return true; } }; @@ -241,6 +245,7 @@ final class SaveUi { } else { mSubTitle = info.getDescription(); if (mSubTitle != null) { + writeLog(MetricsEvent.AUTOFILL_SAVE_CUSTOM_SUBTITLE, type); subtitleContainer = view.findViewById(R.id.autofill_save_custom_subtitle); final TextView subtitleView = new TextView(context); subtitleView.setText(mSubTitle); @@ -309,8 +314,39 @@ final class SaveUi { Slog.w(TAG, "Not adding service icon of size " + "(" + actualWidth + "x" + actualHeight + ") because maximum is " + "(" + maxWidth + "x" + maxHeight + ")."); - iconView.setVisibility(View.INVISIBLE); + ((ViewGroup)iconView.getParent()).removeView(iconView); + } + } + + private static boolean isValidLink(PendingIntent pendingIntent, Intent intent) { + if (pendingIntent == null) { + Slog.w(TAG, "isValidLink(): custom description without pending intent"); + return false; } + if (!pendingIntent.isActivity()) { + Slog.w(TAG, "isValidLink(): pending intent not for activity"); + return false; + } + if (intent == null) { + Slog.w(TAG, "isValidLink(): no intent"); + return false; + } + return true; + } + + private LogMaker newLogMaker(int category, int saveType) { + return newLogMaker(category) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SAVE_TYPE, saveType); + } + + private LogMaker newLogMaker(int category) { + return new LogMaker(category) + .setPackageName(mPackageName) + .addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, mServicePackageName); + } + + private void writeLog(int category, int saveType) { + mMetricsLogger.write(newLogMaker(category, saveType)); } /** @@ -326,17 +362,25 @@ final class SaveUi { + mPendingUi.getToken()); return; } - switch (operation) { - case AutofillManager.PENDING_UI_OPERATION_RESTORE: - if (sDebug) Slog.d(TAG, "Restoring save dialog for " + token); - show(); - break; - case AutofillManager.PENDING_UI_OPERATION_CANCEL: - if (sDebug) Slog.d(TAG, "Cancelling pending save dialog for " + token); - hide(); - break; - default: - Slog.w(TAG, "restore(): invalid operation " + operation); + final LogMaker log = newLogMaker(MetricsEvent.AUTOFILL_PENDING_SAVE_UI_OPERATION); + try { + switch (operation) { + case AutofillManager.PENDING_UI_OPERATION_RESTORE: + if (sDebug) Slog.d(TAG, "Restoring save dialog for " + token); + log.setType(MetricsEvent.TYPE_OPEN); + show(); + break; + case AutofillManager.PENDING_UI_OPERATION_CANCEL: + log.setType(MetricsEvent.TYPE_DISMISS); + if (sDebug) Slog.d(TAG, "Cancelling pending save dialog for " + token); + hide(); + break; + default: + log.setType(MetricsEvent.TYPE_FAILURE); + Slog.w(TAG, "restore(): invalid operation " + operation); + } + } finally { + mMetricsLogger.write(log); } mPendingUi.setState(PendingUi.STATE_FINISHED); } @@ -385,6 +429,8 @@ final class SaveUi { pw.print(prefix); pw.print("title: "); pw.println(mTitle); pw.print(prefix); pw.print("subtitle: "); pw.println(mSubTitle); pw.print(prefix); pw.print("pendingUi: "); pw.println(mPendingUi); + pw.print(prefix); pw.print("service: "); pw.println(mServicePackageName); + pw.print(prefix); pw.print("app: "); pw.println(mPackageName); final View view = mDialog.getWindow().getDecorView(); final int[] loc = view.getLocationOnScreen(); diff --git a/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java b/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java index 187d5d93bfdd..e29b7d58e018 100644 --- a/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java +++ b/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java @@ -21,7 +21,10 @@ import android.util.Slog; import com.android.internal.annotations.GuardedBy; import com.android.server.backup.RefactoredBackupManagerService; +import java.io.BufferedInputStream; +import java.io.DataInputStream; import java.io.EOFException; +import java.io.FileInputStream; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; @@ -130,7 +133,8 @@ final class ProcessedPackagesJournal { return; } - try (RandomAccessFile oldJournal = new RandomAccessFile(journalFile, "r")) { + try (DataInputStream oldJournal = new DataInputStream( + new BufferedInputStream(new FileInputStream(journalFile)))) { while (true) { String packageName = oldJournal.readUTF(); if (DEBUG) { diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java index f15866113931..8b4cc7f6d22b 100644 --- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java @@ -679,6 +679,29 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter return token; } + /* + * Construct a backup agent instance for the metadata pseudopackage. This is a + * process-local non-lifecycle agent instance, so we manually set up the context + * topology for it. + */ + public PackageManagerBackupAgent makeMetadataAgent() { + PackageManagerBackupAgent pmAgent = new PackageManagerBackupAgent(mPackageManager); + pmAgent.attach(mContext); + pmAgent.onCreate(); + return pmAgent; + } + + /* + * Same as above but with the explicit package-set configuration. + */ + public PackageManagerBackupAgent makeMetadataAgent(List<PackageInfo> packages) { + PackageManagerBackupAgent pmAgent = + new PackageManagerBackupAgent(mPackageManager, packages); + pmAgent.attach(mContext); + pmAgent.onCreate(); + return pmAgent; + } + // ----- Debug-only backup operation trace ----- public void addBackupTrace(String s) { if (DEBUG_BACKUP_TRACE) { @@ -809,17 +832,18 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter // Remember our ancestral dataset mTokenFile = new File(mBaseStateDir, "ancestral"); - try (RandomAccessFile tf = new RandomAccessFile(mTokenFile, "r")) { - int version = tf.readInt(); + try (DataInputStream tokenStream = new DataInputStream(new BufferedInputStream( + new FileInputStream(mTokenFile)))) { + int version = tokenStream.readInt(); if (version == CURRENT_ANCESTRAL_RECORD_VERSION) { - mAncestralToken = tf.readLong(); - mCurrentToken = tf.readLong(); + mAncestralToken = tokenStream.readLong(); + mCurrentToken = tokenStream.readLong(); - int numPackages = tf.readInt(); + int numPackages = tokenStream.readInt(); if (numPackages >= 0) { mAncestralPackages = new HashSet<>(); for (int i = 0; i < numPackages; i++) { - String pkgName = tf.readUTF(); + String pkgName = tokenStream.readUTF(); mAncestralPackages.add(pkgName); } } @@ -887,7 +911,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter PackageInfo pkg = mPackageManager.getPackageInfo(pkgName, 0); if (AppBackupUtils.appGetsFullBackup(pkg) && AppBackupUtils.appIsEligibleForBackup( - pkg.applicationInfo)) { + pkg.applicationInfo, mPackageManager)) { schedule.add(new FullBackupEntry(pkgName, lastBackup)); } else { if (DEBUG) { @@ -908,7 +932,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter for (PackageInfo app : apps) { if (AppBackupUtils.appGetsFullBackup(app) && AppBackupUtils.appIsEligibleForBackup( - app.applicationInfo)) { + app.applicationInfo, mPackageManager)) { if (!foundApps.contains(app.packageName)) { if (MORE_DEBUG) { Slog.i(TAG, "New full backup app " + app.packageName + " found"); @@ -934,7 +958,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter schedule = new ArrayList<>(apps.size()); for (PackageInfo info : apps) { if (AppBackupUtils.appGetsFullBackup(info) && AppBackupUtils.appIsEligibleForBackup( - info.applicationInfo)) { + info.applicationInfo, mPackageManager)) { schedule.add(new FullBackupEntry(info.packageName, 0)); } } @@ -1219,7 +1243,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter PackageInfo app = mPackageManager.getPackageInfo(packageName, 0); if (AppBackupUtils.appGetsFullBackup(app) && AppBackupUtils.appIsEligibleForBackup( - app.applicationInfo)) { + app.applicationInfo, mPackageManager)) { enqueueFullBackup(packageName, now); scheduleNextFullBackupJob(0); } else { @@ -1516,7 +1540,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter long token = mAncestralToken; synchronized (mQueueLock) { - if (mProcessedPackagesJournal.hasBeenProcessed(packageName)) { + if (mCurrentToken != 0 && mProcessedPackagesJournal.hasBeenProcessed(packageName)) { if (MORE_DEBUG) { Slog.i(TAG, "App in ever-stored, so using current token"); } @@ -1577,7 +1601,8 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter try { PackageInfo packageInfo = mPackageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES); - if (!AppBackupUtils.appIsEligibleForBackup(packageInfo.applicationInfo)) { + if (!AppBackupUtils.appIsEligibleForBackup(packageInfo.applicationInfo, + mPackageManager)) { BackupObserverUtils.sendBackupOnPackageResult(observer, packageName, BackupManager.ERROR_BACKUP_NOT_ALLOWED); continue; @@ -2825,8 +2850,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter final long oldId = Binder.clearCallingIdentity(); try { String prevTransport = mTransportManager.selectTransport(transport); - Settings.Secure.putString(mContext.getContentResolver(), - Settings.Secure.BACKUP_TRANSPORT, transport); + updateStateForTransport(transport); Slog.v(TAG, "selectBackupTransport() set " + mTransportManager.getCurrentTransportName() + " returning " + prevTransport); return prevTransport; @@ -2851,9 +2875,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter @Override public void onSuccess(String transportName) { mTransportManager.selectTransport(transportName); - Settings.Secure.putString(mContext.getContentResolver(), - Settings.Secure.BACKUP_TRANSPORT, - mTransportManager.getCurrentTransportName()); + updateStateForTransport(mTransportManager.getCurrentTransportName()); Slog.v(TAG, "Transport successfully selected: " + transport.flattenToShortString()); try { @@ -2878,6 +2900,28 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter Binder.restoreCallingIdentity(oldId); } + private void updateStateForTransport(String newTransportName) { + // Publish the name change + Settings.Secure.putString(mContext.getContentResolver(), + Settings.Secure.BACKUP_TRANSPORT, newTransportName); + + // And update our current-dataset bookkeeping + IBackupTransport transport = mTransportManager.getTransportBinder(newTransportName); + if (transport != null) { + try { + mCurrentToken = transport.getCurrentRestoreSet(); + } catch (Exception e) { + // Oops. We can't know the current dataset token, so reset and figure it out + // when we do the next k/v backup operation on this transport. + mCurrentToken = 0; + } + } else { + // The named transport isn't bound at this particular moment, so we can't + // know yet what its current dataset token is. Reset as above. + mCurrentToken = 0; + } + } + // Supply the configuration Intent for the given transport. If the name is not one // of the available transports, or if the transport does not supply any configuration // UI, the method returns null. @@ -3187,19 +3231,6 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter } } - // We also avoid backups of 'disabled' apps - private static boolean appIsDisabled(ApplicationInfo app, PackageManager pm) { - switch (pm.getApplicationEnabledSetting(app.packageName)) { - case PackageManager.COMPONENT_ENABLED_STATE_DISABLED: - case PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER: - case PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED: - return true; - - default: - return false; - } - } - @Override public boolean isAppEligibleForBackup(String packageName) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP, @@ -3207,9 +3238,10 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter try { PackageInfo packageInfo = mPackageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES); - if (!AppBackupUtils.appIsEligibleForBackup(packageInfo.applicationInfo) || + if (!AppBackupUtils.appIsEligibleForBackup(packageInfo.applicationInfo, + mPackageManager) || AppBackupUtils.appIsStopped(packageInfo.applicationInfo) || - appIsDisabled(packageInfo.applicationInfo, mPackageManager)) { + AppBackupUtils.appIsDisabled(packageInfo.applicationInfo, mPackageManager)) { return false; } IBackupTransport transport = mTransportManager.getCurrentTransportBinder(); diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java index 4085f63afa8c..f0b3e4a023f0 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java @@ -236,12 +236,11 @@ public class PerformAdbBackupTask extends FullBackupTask implements BackupRestor obbConnection.establish(); // we'll want this later sendStartBackup(); + PackageManager pm = backupManagerService.getPackageManager(); // doAllApps supersedes the package set if any if (mAllApps) { - List<PackageInfo> allPackages = - backupManagerService.getPackageManager().getInstalledPackages( - PackageManager.GET_SIGNATURES); + List<PackageInfo> allPackages = pm.getInstalledPackages(PackageManager.GET_SIGNATURES); for (int i = 0; i < allPackages.size(); i++) { PackageInfo pkg = allPackages.get(i); // Exclude system apps if we've been asked to do so @@ -288,7 +287,7 @@ public class PerformAdbBackupTask extends FullBackupTask implements BackupRestor Iterator<Entry<String, PackageInfo>> iter = packagesToBackup.entrySet().iterator(); while (iter.hasNext()) { PackageInfo pkg = iter.next().getValue(); - if (!AppBackupUtils.appIsEligibleForBackup(pkg.applicationInfo) + if (!AppBackupUtils.appIsEligibleForBackup(pkg.applicationInfo, pm) || AppBackupUtils.appIsStopped(pkg.applicationInfo)) { iter.remove(); if (DEBUG) { diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java index bc7c1174d17f..90134e1a3ead 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java @@ -140,10 +140,10 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba for (String pkg : whichPackages) { try { - PackageInfo info = backupManagerService.getPackageManager().getPackageInfo(pkg, - PackageManager.GET_SIGNATURES); + PackageManager pm = backupManagerService.getPackageManager(); + PackageInfo info = pm.getPackageInfo(pkg, PackageManager.GET_SIGNATURES); mCurrentPackage = info; - if (!AppBackupUtils.appIsEligibleForBackup(info.applicationInfo)) { + if (!AppBackupUtils.appIsEligibleForBackup(info.applicationInfo, pm)) { // Cull any packages that have indicated that backups are not permitted, // that run as system-domain uids but do not define their own backup agents, // as well as any explicit mention of the 'special' shared-storage agent @@ -306,6 +306,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba final int N = mPackages.size(); final byte[] buffer = new byte[8192]; for (int i = 0; i < N; i++) { + mBackupRunner = null; PackageInfo currentPackage = mPackages.get(i); String packageName = currentPackage.packageName; if (DEBUG) { @@ -491,7 +492,13 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba } EventLog.writeEvent(EventLogTags.FULL_BACKUP_AGENT_FAILURE, packageName, "transport rejected"); - // Do nothing, clean up, and continue looping. + // This failure state can come either a-priori from the transport, or + // from the preflight pass. If we got as far as preflight, we now need + // to tear down the target process. + if (mBackupRunner != null) { + backupManagerService.tearDownAgentAndKill(currentPackage.applicationInfo); + } + // ... and continue looping. } else if (backupPackageStatus == BackupTransport.TRANSPORT_QUOTA_EXCEEDED) { BackupObserverUtils .sendBackupOnPackageResult(mBackupObserver, packageName, @@ -501,6 +508,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba EventLog.writeEvent(EventLogTags.FULL_BACKUP_QUOTA_EXCEEDED, packageName); } + backupManagerService.tearDownAgentAndKill(currentPackage.applicationInfo); // Do nothing, clean up, and continue looping. } else if (backupPackageStatus == BackupTransport.AGENT_ERROR) { BackupObserverUtils @@ -527,6 +535,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba EventLog.writeEvent(EventLogTags.FULL_BACKUP_TRANSPORT_FAILURE); // Abort entire backup pass. backupRunStatus = BackupManager.ERROR_TRANSPORT_ABORTED; + backupManagerService.tearDownAgentAndKill(currentPackage.applicationInfo); return; } else { // Success! diff --git a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java index 6bbed8cbfdf9..7a8a920e7df7 100644 --- a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java +++ b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java @@ -321,8 +321,7 @@ public class PerformBackupTask implements BackupRestoreTask { // because it's cheap and this way we guarantee that we don't get out of // step even if we're selecting among various transports at run time. if (mStatus == BackupTransport.TRANSPORT_OK) { - PackageManagerBackupAgent pmAgent = new PackageManagerBackupAgent( - backupManagerService.getPackageManager()); + PackageManagerBackupAgent pmAgent = backupManagerService.makeMetadataAgent(); mStatus = invokeAgentForBackup( PACKAGE_MANAGER_SENTINEL, IBackupAgent.Stub.asInterface(pmAgent.onBind()), mTransport); @@ -390,11 +389,9 @@ public class PerformBackupTask implements BackupRestoreTask { // to sanity-check here. This also gives us the classname of the // package's backup agent. try { - mCurrentPackage = backupManagerService.getPackageManager().getPackageInfo( - request.packageName, - PackageManager.GET_SIGNATURES); - if (!AppBackupUtils.appIsEligibleForBackup( - mCurrentPackage.applicationInfo)) { + PackageManager pm = backupManagerService.getPackageManager(); + mCurrentPackage = pm.getPackageInfo(request.packageName, PackageManager.GET_SIGNATURES); + if (!AppBackupUtils.appIsEligibleForBackup(mCurrentPackage.applicationInfo, pm)) { // The manifest has changed but we had a stale backup request pending. // This won't happen again because the app won't be requesting further // backups. diff --git a/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java index 62ae065be1ac..22691bb60bfa 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java @@ -150,8 +150,7 @@ public class PerformAdbRestoreTask implements Runnable { mObserver = observer; mLatchObject = latch; mAgent = null; - mPackageManagerBackupAgent = new PackageManagerBackupAgent( - backupManagerService.getPackageManager()); + mPackageManagerBackupAgent = backupManagerService.makeMetadataAgent(); mAgentPackage = null; mTargetApp = null; mObbConnection = new FullBackupObbConnection(backupManagerService); diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java index 283a1f0e93dd..b538c6d4e472 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -198,8 +198,8 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { boolean hasSettings = false; for (int i = 0; i < filterSet.length; i++) { try { - PackageInfo info = backupManagerService.getPackageManager().getPackageInfo( - filterSet[i], 0); + PackageManager pm = backupManagerService.getPackageManager(); + PackageInfo info = pm.getPackageInfo(filterSet[i], 0); if ("android".equals(info.packageName)) { hasSystem = true; continue; @@ -209,8 +209,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { continue; } - if (AppBackupUtils.appIsEligibleForBackup( - info.applicationInfo)) { + if (AppBackupUtils.appIsEligibleForBackup(info.applicationInfo, pm)) { mAcceptSet.add(info); } } catch (NameNotFoundException e) { @@ -387,8 +386,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // Pull the Package Manager metadata from the restore set first mCurrentPackage = new PackageInfo(); mCurrentPackage.packageName = PACKAGE_MANAGER_SENTINEL; - mPmAgent = new PackageManagerBackupAgent(backupManagerService.getPackageManager(), - null); + mPmAgent = backupManagerService.makeMetadataAgent(null); mAgent = IBackupAgent.Stub.asInterface(mPmAgent.onBind()); if (MORE_DEBUG) { Slog.v(TAG, "initiating restore for PMBA"); diff --git a/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java b/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java index 4abf18add469..d7cac7770cc8 100644 --- a/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java +++ b/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java @@ -22,6 +22,7 @@ import static com.android.server.backup.RefactoredBackupManagerService.TAG; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; import android.content.pm.Signature; import android.os.Process; import android.util.Slog; @@ -44,7 +45,7 @@ public class AppBackupUtils { * <li>it is the special shared-storage backup package used for 'adb backup' * </ol> */ - public static boolean appIsEligibleForBackup(ApplicationInfo app) { + public static boolean appIsEligibleForBackup(ApplicationInfo app, PackageManager pm) { // 1. their manifest states android:allowBackup="false" if ((app.flags & ApplicationInfo.FLAG_ALLOW_BACKUP) == 0) { return false; @@ -60,11 +61,33 @@ public class AppBackupUtils { return false; } - return true; + // 4. it is an "instant" app + if (app.isInstantApp()) { + return false; + } + + // Everything else checks out; the only remaining roadblock would be if the + // package were disabled + return !appIsDisabled(app, pm); + } + + /** Avoid backups of 'disabled' apps. */ + public static boolean appIsDisabled(ApplicationInfo app, PackageManager pm) { + switch (pm.getApplicationEnabledSetting(app.packageName)) { + case PackageManager.COMPONENT_ENABLED_STATE_DISABLED: + case PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER: + case PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED: + return true; + + default: + return false; + } } /** - * Checks if the app is in a stopped state, that means it won't receive broadcasts. + * Checks if the app is in a stopped state. This is not part of the general "eligible for + * backup?" check because we *do* still need to restore data to apps in this state (e.g. + * newly-installing ones) */ public static boolean appIsStopped(ApplicationInfo app) { return ((app.flags & ApplicationInfo.FLAG_STOPPED) != 0); diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index c0fcfd07a75f..c7e22be1972d 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -111,8 +111,6 @@ import com.android.internal.util.HexDump; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.Preconditions; import com.android.internal.widget.LockPatternUtils; -import com.android.server.NativeDaemonConnector.Command; -import com.android.server.NativeDaemonConnector.SensitiveArg; import com.android.server.pm.PackageManagerService; import com.android.server.storage.AppFuseBridge; @@ -138,7 +136,6 @@ import java.security.spec.KeySpec; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -161,8 +158,7 @@ import javax.crypto.spec.PBEKeySpec; * watch for and manage dynamically added storage, such as SD cards and USB mass * storage. Also decides how storage should be presented to users on the device. */ -class StorageManagerService extends IStorageManager.Stub - implements INativeDaemonConnectorCallbacks, Watchdog.Monitor { +class StorageManagerService extends IStorageManager.Stub implements Watchdog.Monitor { // Static direct instance pointer for the tightly-coupled idle service to use static StorageManagerService sSelf = null; @@ -206,18 +202,12 @@ class StorageManagerService extends IStorageManager.Stub } } - /** Flag to enable binder-based interface to vold */ - private static final boolean ENABLE_BINDER = true; - private static final boolean DEBUG_EVENTS = false; private static final boolean DEBUG_OBB = false; // Disable this since it messes up long-running cryptfs operations. private static final boolean WATCHDOG_ENABLE = false; - /** Flag to enable ASECs */ - private static final boolean ASEC_ENABLE = false; - /** * Our goal is for all Android devices to be usable as development devices, * which includes the new Direct Boot mode added in N. For devices that @@ -232,66 +222,9 @@ class StorageManagerService extends IStorageManager.Stub private static final String TAG_STORAGE_BENCHMARK = "storage_benchmark"; private static final String TAG_STORAGE_TRIM = "storage_trim"; - private static final String VOLD_TAG = "VoldConnector"; - private static final String CRYPTD_TAG = "CryptdConnector"; - - /** Maximum number of ASEC containers allowed to be mounted. */ - private static final int MAX_CONTAINERS = 250; - /** Magic value sent by MoveTask.cpp */ private static final int MOVE_STATUS_COPY_FINISHED = 82; - /* - * Internal vold response code constants - */ - class VoldResponseCode { - /* - * 100 series - Requestion action was initiated; expect another reply - * before proceeding with a new command. - */ - public static final int VolumeListResult = 110; - public static final int AsecListResult = 111; - public static final int StorageUsersListResult = 112; - public static final int CryptfsGetfieldResult = 113; - - /* - * 200 series - Requestion action has been successfully completed. - */ - public static final int ShareStatusResult = 210; - public static final int AsecPathResult = 211; - public static final int ShareEnabledResult = 212; - - /* - * 400 series - Command was accepted, but the requested action - * did not take place. - */ - public static final int OpFailedNoMedia = 401; - public static final int OpFailedMediaBlank = 402; - public static final int OpFailedMediaCorrupt = 403; - public static final int OpFailedVolNotMounted = 404; - public static final int OpFailedStorageBusy = 405; - public static final int OpFailedStorageNotFound = 406; - - /* - * 600 series - Unsolicited broadcasts. - */ - public static final int DISK_CREATED = 640; - public static final int DISK_SIZE_CHANGED = 641; - public static final int DISK_LABEL_CHANGED = 642; - public static final int DISK_SCANNED = 643; - public static final int DISK_SYS_PATH_CHANGED = 644; - public static final int DISK_DESTROYED = 649; - - public static final int VOLUME_CREATED = 650; - public static final int VOLUME_STATE_CHANGED = 651; - public static final int VOLUME_FS_TYPE_CHANGED = 652; - public static final int VOLUME_FS_UUID_CHANGED = 653; - public static final int VOLUME_FS_LABEL_CHANGED = 654; - public static final int VOLUME_PATH_CHANGED = 655; - public static final int VOLUME_INTERNAL_PATH_CHANGED = 656; - public static final int VOLUME_DESTROYED = 659; - } - private static final int VERSION_INIT = 1; private static final int VERSION_ADD_PRIMARY = 2; private static final int VERSION_FIX_PRIMARY = 3; @@ -472,12 +405,6 @@ class StorageManagerService extends IStorageManager.Stub private final Context mContext; - private final NativeDaemonConnector mConnector; - private final NativeDaemonConnector mCryptConnector; - - private final Thread mConnectorThread; - private final Thread mCryptConnectorThread; - private volatile IVold mVold; private volatile boolean mSystemReady = false; @@ -489,21 +416,11 @@ class StorageManagerService extends IStorageManager.Stub private final Callbacks mCallbacks; private final LockPatternUtils mLockPatternUtils; - // Two connectors - mConnector & mCryptConnector - private final CountDownLatch mConnectedSignal = new CountDownLatch(2); - private final CountDownLatch mAsecsScanned = new CountDownLatch(1); - private final Object mUnmountLock = new Object(); @GuardedBy("mUnmountLock") private CountDownLatch mUnmountSignal; /** - * Private hash of currently mounted secure containers. - * Used as a lock in methods to manipulate secure containers. - */ - final private HashSet<String> mAsecMountSet = new HashSet<String>(); - - /** * The size of the crypto algorithm key in bits for OBB files. Currently * Twofish is used which takes 128-bit keys. */ @@ -616,7 +533,7 @@ class StorageManagerService extends IStorageManager.Stub if (DEBUG_OBB) Slog.i(TAG, "onServiceDisconnected"); } - }; + } // Used in the ObbActionHandler private IMediaContainerService mContainerService = null; @@ -655,13 +572,6 @@ class StorageManagerService extends IStorageManager.Stub break; } case H_FSTRIM: { - if (!isReady()) { - Slog.i(TAG, "fstrim requested, but no daemon connection yet; trying again"); - sendMessageDelayed(obtainMessage(H_FSTRIM, msg.obj), - DateUtils.SECOND_IN_MILLIS); - break; - } - Slog.i(TAG, "Running fstrim idle maintenance"); // Remember when we kicked it off @@ -687,12 +597,8 @@ class StorageManagerService extends IStorageManager.Stub final IStorageShutdownObserver obs = (IStorageShutdownObserver) msg.obj; boolean success = false; try { - if (ENABLE_BINDER) { - mVold.shutdown(); - success = true; - } else { - success = mConnector.execute("volume", "shutdown").isClassOk(); - } + mVold.shutdown(); + success = true; } catch (Exception e) { Slog.wtf(TAG, e); } @@ -711,12 +617,7 @@ class StorageManagerService extends IStorageManager.Stub break; } try { - if (ENABLE_BINDER) { - mVold.mount(vol.id, vol.mountFlags, vol.mountUserId); - } else { - mConnector.execute("volume", "mount", vol.id, vol.mountFlags, - vol.mountUserId); - } + mVold.mount(vol.id, vol.mountFlags, vol.mountUserId); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -778,11 +679,7 @@ class StorageManagerService extends IStorageManager.Stub if (Intent.ACTION_USER_ADDED.equals(action)) { final UserManager um = mContext.getSystemService(UserManager.class); final int userSerialNumber = um.getUserSerialNumber(userId); - if (ENABLE_BINDER) { - mVold.onUserAdded(userId, userSerialNumber); - } else { - mConnector.execute("volume", "user_added", userId, userSerialNumber); - } + mVold.onUserAdded(userId, userSerialNumber); } else if (Intent.ACTION_USER_REMOVED.equals(action)) { synchronized (mVolumes) { final int size = mVolumes.size(); @@ -794,11 +691,7 @@ class StorageManagerService extends IStorageManager.Stub } } } - if (ENABLE_BINDER) { - mVold.onUserRemoved(userId); - } else { - mConnector.execute("volume", "user_removed", userId); - } + mVold.onUserRemoved(userId); } } catch (Exception e) { Slog.wtf(TAG, e); @@ -808,11 +701,7 @@ class StorageManagerService extends IStorageManager.Stub @Override public void waitForAsecScan() { - waitForLatch(mAsecsScanned, "mAsecsScanned"); - } - - private void waitForReady() { - waitForLatch(mConnectedSignal, "mConnectedSignal"); + throw new UnsupportedOperationException(); } private void waitForLatch(CountDownLatch latch, String condition) { @@ -843,14 +732,6 @@ class StorageManagerService extends IStorageManager.Stub } } - private boolean isReady() { - try { - return mConnectedSignal.await(0, TimeUnit.MILLISECONDS); - } catch (InterruptedException e) { - return false; - } - } - private void handleSystemReady() { initIfReadyAndConnected(); resetIfReadyAndConnected(); @@ -917,19 +798,10 @@ class StorageManagerService extends IStorageManager.Stub for (UserInfo user : users) { try { if (initLocked) { - if (ENABLE_BINDER) { - mVold.lockUserKey(user.id); - } else { - mCryptConnector.execute("cryptfs", "lock_user_key", user.id); - } + mVold.lockUserKey(user.id); } else { - if (ENABLE_BINDER) { - mVold.unlockUserKey(user.id, user.serialNumber, encodeBytes(null), - encodeBytes(null)); - } else { - mCryptConnector.execute("cryptfs", "unlock_user_key", user.id, - user.serialNumber, "!", "!"); - } + mVold.unlockUserKey(user.id, user.serialNumber, encodeBytes(null), + encodeBytes(null)); } } catch (Exception e) { Slog.wtf(TAG, e); @@ -956,26 +828,14 @@ class StorageManagerService extends IStorageManager.Stub } try { - if (ENABLE_BINDER) { - mVold.reset(); - } else { - mConnector.execute("volume", "reset"); - } + mVold.reset(); // Tell vold about all existing and started users for (UserInfo user : users) { - if (ENABLE_BINDER) { - mVold.onUserAdded(user.id, user.serialNumber); - } else { - mConnector.execute("volume", "user_added", user.id, user.serialNumber); - } + mVold.onUserAdded(user.id, user.serialNumber); } for (int userId : systemUnlockedUsers) { - if (ENABLE_BINDER) { - mVold.onUserStarted(userId); - } else { - mConnector.execute("volume", "user_started", userId); - } + mVold.onUserStarted(userId); } } catch (Exception e) { Slog.wtf(TAG, e); @@ -990,11 +850,7 @@ class StorageManagerService extends IStorageManager.Stub // staging area is ready so it's ready for zygote-forked apps to // bind mount against. try { - if (ENABLE_BINDER) { - mVold.onUserStarted(userId); - } else { - mConnector.execute("volume", "user_started", userId); - } + mVold.onUserStarted(userId); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -1020,11 +876,7 @@ class StorageManagerService extends IStorageManager.Stub Slog.d(TAG, "onCleanupUser " + userId); try { - if (ENABLE_BINDER) { - mVold.onUserStopped(userId); - } else { - mConnector.execute("volume", "user_stopped", userId); - } + mVold.onUserStopped(userId); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -1050,10 +902,6 @@ class StorageManagerService extends IStorageManager.Stub return mLastMaintenance; } - /** - * Callback from NativeDaemonConnector - */ - @Override public void onDaemonConnected() { mDaemonConnected = true; mHandler.obtainMessage(H_DAEMON_CONNECTED).sendToTarget(); @@ -1063,29 +911,11 @@ class StorageManagerService extends IStorageManager.Stub initIfReadyAndConnected(); resetIfReadyAndConnected(); - /* - * Now that we've done our initialization, release - * the hounds! - */ - mConnectedSignal.countDown(); - if (mConnectedSignal.getCount() != 0) { - // More daemons need to connect - return; - } - // On an encrypted device we can't see system properties yet, so pull // the system locale out of the mount service. if ("".equals(SystemProperties.get("vold.encrypt_progress"))) { copyLocaleFromMountService(); } - - // Let package manager load internal ASECs. - if (ASEC_ENABLE) { - mPms.scanAvailableAsecs(); - } - - // Notify people waiting for ASECs to be scanned that it's done. - mAsecsScanned.countDown(); } private void copyLocaleFromMountService() { @@ -1114,148 +944,6 @@ class StorageManagerService extends IStorageManager.Stub SystemProperties.set("persist.sys.locale", locale.toLanguageTag()); } - /** - * Callback from NativeDaemonConnector - */ - @Override - public boolean onCheckHoldWakeLock(int code) { - return false; - } - - /** - * Callback from NativeDaemonConnector - */ - @Override - public boolean onEvent(int code, String raw, String[] cooked) { - synchronized (mLock) { - try { - return onEventLocked(code, raw, cooked); - } catch (RemoteException e) { - throw e.rethrowAsRuntimeException(); - } - } - } - - private boolean onEventLocked(int code, String raw, String[] cooked) throws RemoteException { - switch (code) { - case VoldResponseCode.DISK_CREATED: { - if (cooked.length != 3) break; - final String diskId = cooked[1]; - final int flags = Integer.parseInt(cooked[2]); - mListener.onDiskCreated(diskId, flags); - break; - } - case VoldResponseCode.DISK_SIZE_CHANGED: { - if (cooked.length != 3) break; - final DiskInfo disk = mDisks.get(cooked[1]); - if (disk != null) { - disk.size = Long.parseLong(cooked[2]); - } - break; - } - case VoldResponseCode.DISK_LABEL_CHANGED: { - final DiskInfo disk = mDisks.get(cooked[1]); - if (disk != null) { - final StringBuilder builder = new StringBuilder(); - for (int i = 2; i < cooked.length; i++) { - builder.append(cooked[i]).append(' '); - } - disk.label = builder.toString().trim(); - } - break; - } - case VoldResponseCode.DISK_SCANNED: { - if (cooked.length != 2) break; - final String diskId = cooked[1]; - mListener.onDiskScanned(diskId); - break; - } - case VoldResponseCode.DISK_SYS_PATH_CHANGED: { - if (cooked.length != 3) break; - final DiskInfo disk = mDisks.get(cooked[1]); - if (disk != null) { - disk.sysPath = cooked[2]; - } - break; - } - case VoldResponseCode.DISK_DESTROYED: { - if (cooked.length != 2) break; - final String diskId = cooked[1]; - mListener.onDiskDestroyed(diskId); - break; - } - - case VoldResponseCode.VOLUME_CREATED: { - final String volId = cooked[1]; - final int type = Integer.parseInt(cooked[2]); - final String diskId = TextUtils.nullIfEmpty(cooked[3]); - final String partGuid = TextUtils.nullIfEmpty(cooked[4]); - mListener.onVolumeCreated(volId, type, diskId, partGuid); - break; - } - case VoldResponseCode.VOLUME_STATE_CHANGED: { - if (cooked.length != 3) break; - final String volId = cooked[1]; - final int state = Integer.parseInt(cooked[2]); - mListener.onVolumeStateChanged(volId, state); - break; - } - case VoldResponseCode.VOLUME_FS_TYPE_CHANGED: { - if (cooked.length != 3) break; - final VolumeInfo vol = mVolumes.get(cooked[1]); - if (vol != null) { - vol.fsType = cooked[2]; - } - break; - } - case VoldResponseCode.VOLUME_FS_UUID_CHANGED: { - if (cooked.length != 3) break; - final VolumeInfo vol = mVolumes.get(cooked[1]); - if (vol != null) { - vol.fsUuid = cooked[2]; - } - break; - } - case VoldResponseCode.VOLUME_FS_LABEL_CHANGED: { - final VolumeInfo vol = mVolumes.get(cooked[1]); - if (vol != null) { - final StringBuilder builder = new StringBuilder(); - for (int i = 2; i < cooked.length; i++) { - builder.append(cooked[i]).append(' '); - } - vol.fsLabel = builder.toString().trim(); - } - // TODO: notify listeners that label changed - break; - } - case VoldResponseCode.VOLUME_PATH_CHANGED: { - if (cooked.length != 3) break; - final String volId = cooked[1]; - final String path = cooked[2]; - mListener.onVolumePathChanged(volId, path); - break; - } - case VoldResponseCode.VOLUME_INTERNAL_PATH_CHANGED: { - if (cooked.length != 3) break; - final String volId = cooked[1]; - final String internalPath = cooked[2]; - mListener.onVolumeInternalPathChanged(volId, internalPath); - break; - } - case VoldResponseCode.VOLUME_DESTROYED: { - if (cooked.length != 2) break; - final String volId = cooked[1]; - mListener.onVolumeDestroyed(volId); - break; - } - default: { - Slog.d(TAG, "Unhandled vold event " + code); - } - } - - return true; - } - private final IVoldListener mListener = new IVoldListener.Stub() { @Override public void onDiskCreated(String diskId, int flags) { @@ -1654,24 +1342,6 @@ class StorageManagerService extends IStorageManager.Stub LocalServices.addService(StorageManagerInternal.class, mStorageManagerInternal); - /* - * Create the connection to vold with a maximum queue of twice the - * amount of containers we'd ever expect to have. This keeps an - * "asec list" from blocking a thread repeatedly. - */ - - mConnector = new NativeDaemonConnector(this, "vold", MAX_CONTAINERS * 2, VOLD_TAG, 25, - null); - mConnector.setDebug(true); - mConnector.setWarnIfHeld(mLock); - mConnectorThread = new Thread(mConnector, VOLD_TAG); - - // Reuse parameters from first connector since they are tested and safe - mCryptConnector = new NativeDaemonConnector(this, "cryptd", - MAX_CONTAINERS * 2, CRYPTD_TAG, 25, null); - mCryptConnector.setDebug(true); - mCryptConnectorThread = new Thread(mCryptConnector, CRYPTD_TAG); - final IntentFilter userFilter = new IntentFilter(); userFilter.addAction(Intent.ACTION_USER_ADDED); userFilter.addAction(Intent.ACTION_USER_REMOVED); @@ -1689,8 +1359,6 @@ class StorageManagerService extends IStorageManager.Stub private void start() { connect(); - mConnectorThread.start(); - mCryptConnectorThread.start(); } private void connect() { @@ -1713,6 +1381,7 @@ class StorageManagerService extends IStorageManager.Stub mVold = IVold.Stub.asInterface(binder); try { mVold.setListener(mListener); + onDaemonConnected(); return; } catch (RemoteException e) { Slog.w(TAG, "vold listener rejected; trying again", e); @@ -1908,18 +1577,13 @@ class StorageManagerService extends IStorageManager.Stub @Override public void mount(String volId) { enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); - waitForReady(); final VolumeInfo vol = findVolumeByIdOrThrow(volId); if (isMountDisallowed(vol)) { throw new SecurityException("Mounting " + volId + " restricted by policy"); } try { - if (ENABLE_BINDER) { - mVold.mount(vol.id, vol.mountFlags, vol.mountUserId); - } else { - mConnector.execute("volume", "mount", vol.id, vol.mountFlags, vol.mountUserId); - } + mVold.mount(vol.id, vol.mountFlags, vol.mountUserId); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -1928,7 +1592,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void unmount(String volId) { enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); - waitForReady(); final VolumeInfo vol = findVolumeByIdOrThrow(volId); @@ -1948,11 +1611,7 @@ class StorageManagerService extends IStorageManager.Stub } try { - if (ENABLE_BINDER) { - mVold.unmount(vol.id); - } else { - mConnector.execute("volume", "unmount", vol.id); - } + mVold.unmount(vol.id); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -1961,15 +1620,10 @@ class StorageManagerService extends IStorageManager.Stub @Override public void format(String volId) { enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); - waitForReady(); final VolumeInfo vol = findVolumeByIdOrThrow(volId); try { - if (ENABLE_BINDER) { - mVold.format(vol.id, "auto"); - } else { - mConnector.execute("volume", "format", vol.id, "auto"); - } + mVold.format(vol.id, "auto"); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -1978,7 +1632,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public long benchmark(String volId) { enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); - waitForReady(); // TODO: refactor for callers to provide a listener try { @@ -2022,15 +1675,10 @@ class StorageManagerService extends IStorageManager.Stub @Override public void partitionPublic(String diskId) { enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); - waitForReady(); final CountDownLatch latch = findOrCreateDiskScanLatch(diskId); try { - if (ENABLE_BINDER) { - mVold.partition(diskId, IVold.PARTITION_TYPE_PUBLIC, -1); - } else { - mConnector.execute("volume", "partition", diskId, "public"); - } + mVold.partition(diskId, IVold.PARTITION_TYPE_PUBLIC, -1); waitForLatch(latch, "partitionPublic", 3 * DateUtils.MINUTE_IN_MILLIS); } catch (Exception e) { Slog.wtf(TAG, e); @@ -2041,15 +1689,10 @@ class StorageManagerService extends IStorageManager.Stub public void partitionPrivate(String diskId) { enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); enforceAdminUser(); - waitForReady(); final CountDownLatch latch = findOrCreateDiskScanLatch(diskId); try { - if (ENABLE_BINDER) { - mVold.partition(diskId, IVold.PARTITION_TYPE_PRIVATE, -1); - } else { - mConnector.execute("volume", "partition", diskId, "private"); - } + mVold.partition(diskId, IVold.PARTITION_TYPE_PRIVATE, -1); waitForLatch(latch, "partitionPrivate", 3 * DateUtils.MINUTE_IN_MILLIS); } catch (Exception e) { Slog.wtf(TAG, e); @@ -2060,15 +1703,10 @@ class StorageManagerService extends IStorageManager.Stub public void partitionMixed(String diskId, int ratio) { enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); enforceAdminUser(); - waitForReady(); final CountDownLatch latch = findOrCreateDiskScanLatch(diskId); try { - if (ENABLE_BINDER) { - mVold.partition(diskId, IVold.PARTITION_TYPE_MIXED, ratio); - } else { - mConnector.execute("volume", "partition", diskId, "mixed", ratio); - } + mVold.partition(diskId, IVold.PARTITION_TYPE_MIXED, ratio); waitForLatch(latch, "partitionMixed", 3 * DateUtils.MINUTE_IN_MILLIS); } catch (Exception e) { Slog.wtf(TAG, e); @@ -2078,7 +1716,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void setVolumeNickname(String fsUuid, String nickname) { enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); - waitForReady(); Preconditions.checkNotNull(fsUuid); synchronized (mLock) { @@ -2092,7 +1729,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void setVolumeUserFlags(String fsUuid, int flags, int mask) { enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); - waitForReady(); Preconditions.checkNotNull(fsUuid); synchronized (mLock) { @@ -2106,7 +1742,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void forgetVolume(String fsUuid) { enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); - waitForReady(); Preconditions.checkNotNull(fsUuid); @@ -2131,7 +1766,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void forgetAllVolumes() { enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); - waitForReady(); synchronized (mLock) { for (int i = 0; i < mRecords.size(); i++) { @@ -2155,11 +1789,7 @@ class StorageManagerService extends IStorageManager.Stub private void forgetPartition(String partGuid) { try { - if (ENABLE_BINDER) { - mVold.forgetPartition(partGuid); - } else { - mConnector.execute("volume", "forget_partition", partGuid); - } + mVold.forgetPartition(partGuid); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -2168,14 +1798,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void fstrim(int flags) { enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS); - waitForReady(); - - String cmd; - if ((flags & StorageManager.FSTRIM_FLAG_DEEP) != 0) { - cmd = "dodtrim"; - } else { - cmd = "dotrim"; - } try { mVold.fstrim(flags, new IVoldTaskListener.Stub() { @@ -2212,27 +1834,8 @@ class StorageManagerService extends IStorageManager.Stub } private void remountUidExternalStorage(int uid, int mode) { - waitForReady(); - - String modeName = "none"; - switch (mode) { - case Zygote.MOUNT_EXTERNAL_DEFAULT: { - modeName = "default"; - } break; - case Zygote.MOUNT_EXTERNAL_READ: { - modeName = "read"; - } break; - case Zygote.MOUNT_EXTERNAL_WRITE: { - modeName = "write"; - } break; - } - try { - if (ENABLE_BINDER) { - mVold.remountUid(uid, mode); - } else { - mConnector.execute("volume", "remount_uid", uid, modeName); - } + mVold.remountUid(uid, mode); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -2241,7 +1844,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void setDebugFlags(int flags, int mask) { enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); - waitForReady(); if ((mask & StorageManager.DEBUG_EMULATE_FBE) != 0) { if (!EMULATE_FBE_SUPPORTED) { @@ -2331,7 +1933,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void setPrimaryStorageUuid(String volumeUuid, IPackageMoveObserver callback) { enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); - waitForReady(); final VolumeInfo from; final VolumeInfo to; @@ -2405,29 +2006,7 @@ class StorageManagerService extends IStorageManager.Stub @Override public int[] getStorageUsers(String path) { - enforcePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); - waitForReady(); - try { - final String[] r = NativeDaemonEvent.filterMessageList( - mConnector.executeForList("storage", "users", path), - VoldResponseCode.StorageUsersListResult); - - // FMT: <pid> <process name> - int[] data = new int[r.length]; - for (int i = 0; i < r.length; i++) { - String[] tok = r[i].split(" "); - try { - data[i] = Integer.parseInt(tok[0]); - } catch (NumberFormatException nfe) { - Slog.e(TAG, String.format("Error parsing pid %s", tok[0])); - return new int[0]; - } - } - return data; - } catch (NativeDaemonConnectorException e) { - Slog.e(TAG, "Failed to retrieve storage users list", e); - return new int[0]; - } + throw new UnsupportedOperationException(); } private void warnOnNotMounted() { @@ -2444,290 +2023,65 @@ class StorageManagerService extends IStorageManager.Stub Slog.w(TAG, "No primary storage mounted!"); } + @Override public String[] getSecureContainerList() { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_ACCESS); - waitForReady(); - warnOnNotMounted(); - - try { - return NativeDaemonEvent.filterMessageList( - mConnector.executeForList("asec", "list"), VoldResponseCode.AsecListResult); - } catch (NativeDaemonConnectorException e) { - return new String[0]; - } + throw new UnsupportedOperationException(); } + @Override public int createSecureContainer(String id, int sizeMb, String fstype, String key, int ownerUid, boolean external) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_CREATE); - waitForReady(); - warnOnNotMounted(); - - int rc = StorageResultCode.OperationSucceeded; - try { - mConnector.execute("asec", "create", id, sizeMb, fstype, new SensitiveArg(key), - ownerUid, external ? "1" : "0"); - } catch (NativeDaemonConnectorException e) { - rc = StorageResultCode.OperationFailedInternalError; - } - - if (rc == StorageResultCode.OperationSucceeded) { - synchronized (mAsecMountSet) { - mAsecMountSet.add(id); - } - } - return rc; + throw new UnsupportedOperationException(); } @Override public int resizeSecureContainer(String id, int sizeMb, String key) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_CREATE); - waitForReady(); - warnOnNotMounted(); - - int rc = StorageResultCode.OperationSucceeded; - try { - mConnector.execute("asec", "resize", id, sizeMb, new SensitiveArg(key)); - } catch (NativeDaemonConnectorException e) { - rc = StorageResultCode.OperationFailedInternalError; - } - return rc; + throw new UnsupportedOperationException(); } + @Override public int finalizeSecureContainer(String id) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_CREATE); - warnOnNotMounted(); - - int rc = StorageResultCode.OperationSucceeded; - try { - mConnector.execute("asec", "finalize", id); - /* - * Finalization does a remount, so no need - * to update mAsecMountSet - */ - } catch (NativeDaemonConnectorException e) { - rc = StorageResultCode.OperationFailedInternalError; - } - return rc; + throw new UnsupportedOperationException(); } + @Override public int fixPermissionsSecureContainer(String id, int gid, String filename) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_CREATE); - warnOnNotMounted(); - - int rc = StorageResultCode.OperationSucceeded; - try { - mConnector.execute("asec", "fixperms", id, gid, filename); - /* - * Fix permissions does a remount, so no need to update - * mAsecMountSet - */ - } catch (NativeDaemonConnectorException e) { - rc = StorageResultCode.OperationFailedInternalError; - } - return rc; + throw new UnsupportedOperationException(); } + @Override public int destroySecureContainer(String id, boolean force) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_DESTROY); - waitForReady(); - warnOnNotMounted(); - - /* - * Force a GC to make sure AssetManagers in other threads of the - * system_server are cleaned up. We have to do this since AssetManager - * instances are kept as a WeakReference and it's possible we have files - * open on the external storage. - */ - Runtime.getRuntime().gc(); - - int rc = StorageResultCode.OperationSucceeded; - try { - final Command cmd = new Command("asec", "destroy", id); - if (force) { - cmd.appendArg("force"); - } - mConnector.execute(cmd); - } catch (NativeDaemonConnectorException e) { - int code = e.getCode(); - if (code == VoldResponseCode.OpFailedStorageBusy) { - rc = StorageResultCode.OperationFailedStorageBusy; - } else { - rc = StorageResultCode.OperationFailedInternalError; - } - } - - if (rc == StorageResultCode.OperationSucceeded) { - synchronized (mAsecMountSet) { - if (mAsecMountSet.contains(id)) { - mAsecMountSet.remove(id); - } - } - } - - return rc; + throw new UnsupportedOperationException(); } + @Override public int mountSecureContainer(String id, String key, int ownerUid, boolean readOnly) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_MOUNT_UNMOUNT); - waitForReady(); - warnOnNotMounted(); - - synchronized (mAsecMountSet) { - if (mAsecMountSet.contains(id)) { - return StorageResultCode.OperationFailedStorageMounted; - } - } - - int rc = StorageResultCode.OperationSucceeded; - try { - mConnector.execute("asec", "mount", id, new SensitiveArg(key), ownerUid, - readOnly ? "ro" : "rw"); - } catch (NativeDaemonConnectorException e) { - int code = e.getCode(); - if (code != VoldResponseCode.OpFailedStorageBusy) { - rc = StorageResultCode.OperationFailedInternalError; - } - } - - if (rc == StorageResultCode.OperationSucceeded) { - synchronized (mAsecMountSet) { - mAsecMountSet.add(id); - } - } - return rc; + throw new UnsupportedOperationException(); } + @Override public int unmountSecureContainer(String id, boolean force) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_MOUNT_UNMOUNT); - waitForReady(); - warnOnNotMounted(); - - synchronized (mAsecMountSet) { - if (!mAsecMountSet.contains(id)) { - return StorageResultCode.OperationFailedStorageNotMounted; - } - } - - /* - * Force a GC to make sure AssetManagers in other threads of the - * system_server are cleaned up. We have to do this since AssetManager - * instances are kept as a WeakReference and it's possible we have files - * open on the external storage. - */ - Runtime.getRuntime().gc(); - - int rc = StorageResultCode.OperationSucceeded; - try { - final Command cmd = new Command("asec", "unmount", id); - if (force) { - cmd.appendArg("force"); - } - mConnector.execute(cmd); - } catch (NativeDaemonConnectorException e) { - int code = e.getCode(); - if (code == VoldResponseCode.OpFailedStorageBusy) { - rc = StorageResultCode.OperationFailedStorageBusy; - } else { - rc = StorageResultCode.OperationFailedInternalError; - } - } - - if (rc == StorageResultCode.OperationSucceeded) { - synchronized (mAsecMountSet) { - mAsecMountSet.remove(id); - } - } - return rc; + throw new UnsupportedOperationException(); } + @Override public boolean isSecureContainerMounted(String id) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_ACCESS); - waitForReady(); - warnOnNotMounted(); - - synchronized (mAsecMountSet) { - return mAsecMountSet.contains(id); - } + throw new UnsupportedOperationException(); } + @Override public int renameSecureContainer(String oldId, String newId) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_RENAME); - waitForReady(); - warnOnNotMounted(); - - synchronized (mAsecMountSet) { - /* - * Because a mounted container has active internal state which cannot be - * changed while active, we must ensure both ids are not currently mounted. - */ - if (mAsecMountSet.contains(oldId) || mAsecMountSet.contains(newId)) { - return StorageResultCode.OperationFailedStorageMounted; - } - } - - int rc = StorageResultCode.OperationSucceeded; - try { - mConnector.execute("asec", "rename", oldId, newId); - } catch (NativeDaemonConnectorException e) { - rc = StorageResultCode.OperationFailedInternalError; - } - - return rc; + throw new UnsupportedOperationException(); } + @Override public String getSecureContainerPath(String id) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_ACCESS); - waitForReady(); - warnOnNotMounted(); - - final NativeDaemonEvent event; - try { - event = mConnector.execute("asec", "path", id); - event.checkCode(VoldResponseCode.AsecPathResult); - return event.getMessage(); - } catch (NativeDaemonConnectorException e) { - int code = e.getCode(); - if (code == VoldResponseCode.OpFailedStorageNotFound) { - Slog.i(TAG, String.format("Container '%s' not found", id)); - return null; - } else { - throw new IllegalStateException(String.format("Unexpected response code %d", code)); - } - } + throw new UnsupportedOperationException(); } + @Override public String getSecureContainerFilesystemPath(String id) { - if (!ASEC_ENABLE) throw new UnsupportedOperationException(); - enforcePermission(android.Manifest.permission.ASEC_ACCESS); - waitForReady(); - warnOnNotMounted(); - - final NativeDaemonEvent event; - try { - event = mConnector.execute("asec", "fspath", id); - event.checkCode(VoldResponseCode.AsecPathResult); - return event.getMessage(); - } catch (NativeDaemonConnectorException e) { - int code = e.getCode(); - if (code == VoldResponseCode.OpFailedStorageNotFound) { - Slog.i(TAG, String.format("Container '%s' not found", id)); - return null; - } else { - throw new IllegalStateException(String.format("Unexpected response code %d", code)); - } - } + throw new UnsupportedOperationException(); } @Override @@ -2762,10 +2116,10 @@ class StorageManagerService extends IStorageManager.Stub return callerUid == packageUid; } + @Override public String getMountedObbPath(String rawPath) { Preconditions.checkNotNull(rawPath, "rawPath cannot be null"); - waitForReady(); warnOnNotMounted(); final ObbState state; @@ -2777,23 +2131,7 @@ class StorageManagerService extends IStorageManager.Stub return null; } - if (ENABLE_BINDER) { - return findVolumeByIdOrThrow(state.volId).getPath().getAbsolutePath(); - } - - final NativeDaemonEvent event; - try { - event = mConnector.execute("obb", "path", state.canonicalPath); - event.checkCode(VoldResponseCode.AsecPathResult); - return event.getMessage(); - } catch (NativeDaemonConnectorException e) { - int code = e.getCode(); - if (code == VoldResponseCode.OpFailedStorageNotFound) { - return null; - } else { - throw new IllegalStateException(String.format("Unexpected response code %d", code)); - } - } + return findVolumeByIdOrThrow(state.volId).getPath().getAbsolutePath(); } @Override @@ -2850,28 +2188,10 @@ class StorageManagerService extends IStorageManager.Stub mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); - waitForReady(); - - if (ENABLE_BINDER) { - try { - return mVold.fdeComplete(); - } catch (Exception e) { - Slog.wtf(TAG, e); - return StorageManager.ENCRYPTION_STATE_ERROR_UNKNOWN; - } - } - - final NativeDaemonEvent event; try { - event = mCryptConnector.execute("cryptfs", "cryptocomplete"); - return Integer.parseInt(event.getMessage()); - } catch (NumberFormatException e) { - // Bad result - unexpected. - Slog.w(TAG, "Unable to parse result from cryptfs cryptocomplete"); - return StorageManager.ENCRYPTION_STATE_ERROR_UNKNOWN; - } catch (NativeDaemonConnectorException e) { - // Something bad happened. - Slog.w(TAG, "Error in communicating with cryptfs in validating"); + return mVold.fdeComplete(); + } catch (Exception e) { + Slog.wtf(TAG, e); return StorageManager.ENCRYPTION_STATE_ERROR_UNKNOWN; } } @@ -2881,8 +2201,6 @@ class StorageManagerService extends IStorageManager.Stub mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); - waitForReady(); - if (TextUtils.isEmpty(password)) { throw new IllegalArgumentException("password cannot be empty"); } @@ -2891,55 +2209,27 @@ class StorageManagerService extends IStorageManager.Stub Slog.i(TAG, "decrypting storage..."); } - if (ENABLE_BINDER) { - try { - mVold.fdeCheckPassword(password); - mHandler.postDelayed(() -> { - try { - mVold.fdeRestart(); - } catch (Exception e) { - Slog.wtf(TAG, e); - } - }, DateUtils.SECOND_IN_MILLIS); - return 0; - } catch (Exception e) { - Slog.wtf(TAG, e); - return StorageManager.ENCRYPTION_STATE_ERROR_UNKNOWN; - } - } - - final NativeDaemonEvent event; try { - event = mCryptConnector.execute("cryptfs", "checkpw", new SensitiveArg(password)); - - final int code = Integer.parseInt(event.getMessage()); - if (code == 0) { - // Decrypt was successful. Post a delayed message before restarting in order - // to let the UI to clear itself - mHandler.postDelayed(new Runnable() { - public void run() { - try { - mCryptConnector.execute("cryptfs", "restart"); - } catch (NativeDaemonConnectorException e) { - Slog.e(TAG, "problem executing in background", e); - } - } - }, 1000); // 1 second - } - - return code; - } catch (NativeDaemonConnectorException e) { - // Decryption failed - return e.getCode(); + mVold.fdeCheckPassword(password); + mHandler.postDelayed(() -> { + try { + mVold.fdeRestart(); + } catch (Exception e) { + Slog.wtf(TAG, e); + } + }, DateUtils.SECOND_IN_MILLIS); + return 0; + } catch (Exception e) { + Slog.wtf(TAG, e); + return StorageManager.ENCRYPTION_STATE_ERROR_UNKNOWN; } } + @Override public int encryptStorage(int type, String password) { mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); - waitForReady(); - if (type == StorageManager.CRYPT_TYPE_DEFAULT) { password = ""; } else if (TextUtils.isEmpty(password)) { @@ -2951,17 +2241,7 @@ class StorageManagerService extends IStorageManager.Stub } try { - if (ENABLE_BINDER) { - mVold.fdeEnable(type, password, IVold.ENCRYPTION_FLAG_IN_PLACE); - } else { - if (type == StorageManager.CRYPT_TYPE_DEFAULT) { - mCryptConnector.execute("cryptfs", "enablecrypto", "inplace", - CRYPTO_TYPES[type]); - } else { - mCryptConnector.execute("cryptfs", "enablecrypto", "inplace", - CRYPTO_TYPES[type], new SensitiveArg(password)); - } - } + mVold.fdeEnable(type, password, IVold.ENCRYPTION_FLAG_IN_PLACE); } catch (Exception e) { Slog.wtf(TAG, e); return -1; @@ -2974,12 +2254,11 @@ class StorageManagerService extends IStorageManager.Stub * @param type One of the CRYPTO_TYPE_XXX consts defined in StorageManager. * @param password The password to set. */ + @Override public int changeEncryptionPassword(int type, String password) { mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); - waitForReady(); - if (type == StorageManager.CRYPT_TYPE_DEFAULT) { password = ""; } else if (TextUtils.isEmpty(password)) { @@ -2990,23 +2269,12 @@ class StorageManagerService extends IStorageManager.Stub Slog.i(TAG, "changing encryption password..."); } - if (ENABLE_BINDER) { - try { - mVold.fdeChangePassword(type, password); - return 0; - } catch (Exception e) { - Slog.wtf(TAG, e); - return -1; - } - } - try { - NativeDaemonEvent event = mCryptConnector.execute("cryptfs", "changepw", CRYPTO_TYPES[type], - new SensitiveArg(password)); - return Integer.parseInt(event.getMessage()); - } catch (NativeDaemonConnectorException e) { - // Encryption failed - return e.getCode(); + mVold.fdeChangePassword(type, password); + return 0; + } catch (Exception e) { + Slog.wtf(TAG, e); + return -1; } } @@ -3027,30 +2295,16 @@ class StorageManagerService extends IStorageManager.Stub throw new IllegalArgumentException("password cannot be empty"); } - waitForReady(); - if (DEBUG_EVENTS) { Slog.i(TAG, "validating encryption password..."); } - if (ENABLE_BINDER) { - try { - mVold.fdeVerifyPassword(password); - return 0; - } catch (Exception e) { - Slog.wtf(TAG, e); - return -1; - } - } - - final NativeDaemonEvent event; try { - event = mCryptConnector.execute("cryptfs", "verifypw", new SensitiveArg(password)); - Slog.i(TAG, "cryptfs verifypw => " + event.getMessage()); - return Integer.parseInt(event.getMessage()); - } catch (NativeDaemonConnectorException e) { - // Encryption failed - return e.getCode(); + mVold.fdeVerifyPassword(password); + return 0; + } catch (Exception e) { + Slog.wtf(TAG, e); + return -1; } } @@ -3063,28 +2317,11 @@ class StorageManagerService extends IStorageManager.Stub mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); - waitForReady(); - - if (ENABLE_BINDER) { - try { - return mVold.fdeGetPasswordType(); - } catch (Exception e) { - Slog.wtf(TAG, e); - return -1; - } - } - - final NativeDaemonEvent event; try { - event = mCryptConnector.execute("cryptfs", "getpwtype"); - for (int i = 0; i < CRYPTO_TYPES.length; ++i) { - if (CRYPTO_TYPES[i].equals(event.getMessage())) - return i; - } - - throw new IllegalStateException("unexpected return from cryptfs"); - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); + return mVold.fdeGetPasswordType(); + } catch (Exception e) { + Slog.wtf(TAG, e); + return -1; } } @@ -3098,23 +2335,12 @@ class StorageManagerService extends IStorageManager.Stub mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); - waitForReady(); - - if (ENABLE_BINDER) { - try { - mVold.fdeSetField(field, contents); - return; - } catch (Exception e) { - Slog.wtf(TAG, e); - return; - } - } - - final NativeDaemonEvent event; try { - event = mCryptConnector.execute("cryptfs", "setfield", field, contents); - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); + mVold.fdeSetField(field, contents); + return; + } catch (Exception e) { + Slog.wtf(TAG, e); + return; } } @@ -3128,29 +2354,11 @@ class StorageManagerService extends IStorageManager.Stub mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); - waitForReady(); - - if (ENABLE_BINDER) { - try { - return mVold.fdeGetField(field); - } catch (Exception e) { - Slog.wtf(TAG, e); - return null; - } - } - - final NativeDaemonEvent event; try { - final String[] contents = NativeDaemonEvent.filterMessageList( - mCryptConnector.executeForList("cryptfs", "getfield", field), - VoldResponseCode.CryptfsGetfieldResult); - String result = new String(); - for (String content : contents) { - result += content; - } - return result; - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); + return mVold.fdeGetField(field); + } catch (Exception e) { + Slog.wtf(TAG, e); + return null; } } @@ -3163,23 +2371,11 @@ class StorageManagerService extends IStorageManager.Stub mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "no permission to access the crypt keeper"); - waitForReady(); - - if (ENABLE_BINDER) { - try { - return mVold.isConvertibleToFbe(); - } catch (Exception e) { - Slog.wtf(TAG, e); - return false; - } - } - - final NativeDaemonEvent event; try { - event = mCryptConnector.execute("cryptfs", "isConvertibleToFBE"); - return Integer.parseInt(event.getMessage()) != 0; - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); + return mVold.isConvertibleToFbe(); + } catch (Exception e) { + Slog.wtf(TAG, e); + return false; } } @@ -3188,31 +2384,10 @@ class StorageManagerService extends IStorageManager.Stub mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "only keyguard can retrieve password"); - if (!isReady()) { - return new String(); - } - - if (ENABLE_BINDER) { - try { - return mVold.fdeGetPassword(); - } catch (Exception e) { - Slog.wtf(TAG, e); - return null; - } - } - - final NativeDaemonEvent event; try { - event = mCryptConnector.execute("cryptfs", "getpw"); - if ("-1".equals(event.getMessage())) { - // -1 equals no password - return null; - } - return event.getMessage(); - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); - } catch (IllegalArgumentException e) { - Slog.e(TAG, "Invalid response to getPassword"); + return mVold.fdeGetPassword(); + } catch (Exception e) { + Slog.wtf(TAG, e); return null; } } @@ -3222,40 +2397,21 @@ class StorageManagerService extends IStorageManager.Stub mContext.enforceCallingOrSelfPermission(Manifest.permission.CRYPT_KEEPER, "only keyguard can clear password"); - if (!isReady()) { - return; - } - - if (ENABLE_BINDER) { - try { - mVold.fdeClearPassword(); - return; - } catch (Exception e) { - Slog.wtf(TAG, e); - return; - } - } - - final NativeDaemonEvent event; try { - event = mCryptConnector.execute("cryptfs", "clearpw"); - } catch (NativeDaemonConnectorException e) { - throw e.rethrowAsParcelableException(); + mVold.fdeClearPassword(); + return; + } catch (Exception e) { + Slog.wtf(TAG, e); + return; } } @Override public void createUserKey(int userId, int serialNumber, boolean ephemeral) { enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); - waitForReady(); try { - if (ENABLE_BINDER) { - mVold.createUserKey(userId, serialNumber, ephemeral); - } else { - mCryptConnector.execute("cryptfs", "create_user_key", userId, serialNumber, - ephemeral ? 1 : 0); - } + mVold.createUserKey(userId, serialNumber, ephemeral); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -3264,14 +2420,9 @@ class StorageManagerService extends IStorageManager.Stub @Override public void destroyUserKey(int userId) { enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); - waitForReady(); try { - if (ENABLE_BINDER) { - mVold.destroyUserKey(userId); - } else { - mCryptConnector.execute("cryptfs", "destroy_user_key", userId); - } + mVold.destroyUserKey(userId); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -3295,16 +2446,9 @@ class StorageManagerService extends IStorageManager.Stub @Override public void addUserKeyAuth(int userId, int serialNumber, byte[] token, byte[] secret) { enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); - waitForReady(); try { - if (ENABLE_BINDER) { - mVold.addUserKeyAuth(userId, serialNumber, encodeBytes(token), encodeBytes(secret)); - } else { - mCryptConnector.execute("cryptfs", "add_user_key_auth", userId, serialNumber, - new SensitiveArg(encodeBytes(token)), - new SensitiveArg(encodeBytes(secret))); - } + mVold.addUserKeyAuth(userId, serialNumber, encodeBytes(token), encodeBytes(secret)); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -3316,14 +2460,9 @@ class StorageManagerService extends IStorageManager.Stub @Override public void fixateNewestUserKeyAuth(int userId) { enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); - waitForReady(); try { - if (ENABLE_BINDER) { - mVold.fixateNewestUserKeyAuth(userId); - } else { - mCryptConnector.execute("cryptfs", "fixate_newest_user_key_auth", userId); - } + mVold.fixateNewestUserKeyAuth(userId); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -3332,7 +2471,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void unlockUserKey(int userId, int serialNumber, byte[] token, byte[] secret) { enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); - waitForReady(); if (StorageManager.isFileEncryptedNativeOrEmulated()) { // When a user has secure lock screen, require secret to actually unlock. @@ -3342,14 +2480,8 @@ class StorageManagerService extends IStorageManager.Stub } try { - if (ENABLE_BINDER) { - mVold.unlockUserKey(userId, serialNumber, encodeBytes(token), - encodeBytes(secret)); - } else { - mCryptConnector.execute("cryptfs", "unlock_user_key", userId, serialNumber, - new SensitiveArg(encodeBytes(token)), - new SensitiveArg(encodeBytes(secret))); - } + mVold.unlockUserKey(userId, serialNumber, encodeBytes(token), + encodeBytes(secret)); } catch (Exception e) { Slog.wtf(TAG, e); return; @@ -3369,14 +2501,9 @@ class StorageManagerService extends IStorageManager.Stub @Override public void lockUserKey(int userId) { enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); - waitForReady(); try { - if (ENABLE_BINDER) { - mVold.lockUserKey(userId); - } else { - mCryptConnector.execute("cryptfs", "lock_user_key", userId); - } + mVold.lockUserKey(userId); } catch (Exception e) { Slog.wtf(TAG, e); return; @@ -3397,15 +2524,9 @@ class StorageManagerService extends IStorageManager.Stub @Override public void prepareUserStorage(String volumeUuid, int userId, int serialNumber, int flags) { enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); - waitForReady(); try { - if (ENABLE_BINDER) { - mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags); - } else { - mCryptConnector.execute("cryptfs", "prepare_user_storage", escapeNull(volumeUuid), - userId, serialNumber, flags); - } + mVold.prepareUserStorage(volumeUuid, userId, serialNumber, flags); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -3414,15 +2535,9 @@ class StorageManagerService extends IStorageManager.Stub @Override public void destroyUserStorage(String volumeUuid, int userId, int flags) { enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); - waitForReady(); try { - if (ENABLE_BINDER) { - mVold.destroyUserStorage(volumeUuid, userId, flags); - } else { - mCryptConnector.execute("cryptfs", "destroy_user_storage", escapeNull(volumeUuid), - userId, flags); - } + mVold.destroyUserStorage(volumeUuid, userId, flags); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -3431,14 +2546,9 @@ class StorageManagerService extends IStorageManager.Stub @Override public void secdiscard(String path) { enforcePermission(android.Manifest.permission.STORAGE_INTERNAL); - waitForReady(); try { - if (ENABLE_BINDER) { - mVold.secdiscard(path); - } else { - mCryptConnector.execute("cryptfs", "secdiscard", escapeNull(path)); - } + mVold.secdiscard(path); } catch (Exception e) { Slog.wtf(TAG, e); } @@ -3453,33 +2563,18 @@ class StorageManagerService extends IStorageManager.Stub @Override public ParcelFileDescriptor open() throws NativeDaemonConnectorException { - if (ENABLE_BINDER) { - try { - return new ParcelFileDescriptor( - mVold.mountAppFuse(uid, Process.myPid(), mountId)); - } catch (Exception e) { - throw new NativeDaemonConnectorException("Failed to mount", e); - } - } else { - final NativeDaemonEvent event = mConnector.execute( - "appfuse", "mount", uid, Process.myPid(), mountId); - opened = true; - if (event.getFileDescriptors() == null || - event.getFileDescriptors().length == 0) { - throw new NativeDaemonConnectorException("Cannot obtain device FD"); - } - return new ParcelFileDescriptor(event.getFileDescriptors()[0]); + try { + return new ParcelFileDescriptor( + mVold.mountAppFuse(uid, Process.myPid(), mountId)); + } catch (Exception e) { + throw new NativeDaemonConnectorException("Failed to mount", e); } } @Override public void close() throws Exception { if (opened) { - if (ENABLE_BINDER) { - mVold.unmountAppFuse(uid, Process.myPid(), mountId); - } else { - mConnector.execute("appfuse", "unmount", uid, Process.myPid(), mountId); - } + mVold.unmountAppFuse(uid, Process.myPid(), mountId); opened = false; } } @@ -3568,11 +2663,7 @@ class StorageManagerService extends IStorageManager.Stub } try { - if (ENABLE_BINDER) { - mVold.mkdirs(appPath); - } else { - mConnector.execute("volume", "mkdirs", appPath); - } + mVold.mkdirs(appPath); return 0; } catch (Exception e) { Slog.wtf(TAG, e); @@ -4124,7 +3215,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void handleExecute() throws IOException, RemoteException { - waitForReady(); warnOnNotMounted(); final ObbInfo obbInfo = getObbInfo(); @@ -4174,19 +3264,9 @@ class StorageManagerService extends IStorageManager.Stub int rc = StorageResultCode.OperationSucceeded; try { - if (ENABLE_BINDER) { - mObbState.volId = mVold.createObb(mObbState.canonicalPath, binderKey, - mObbState.ownerGid); - mVold.mount(mObbState.volId, 0, -1); - } else { - mConnector.execute("obb", "mount", mObbState.canonicalPath, - new SensitiveArg(hashedKey), mObbState.ownerGid); - } - } catch (NativeDaemonConnectorException e) { - int code = e.getCode(); - if (code != VoldResponseCode.OpFailedStorageBusy) { - rc = StorageResultCode.OperationFailedInternalError; - } + mObbState.volId = mVold.createObb(mObbState.canonicalPath, binderKey, + mObbState.ownerGid); + mVold.mount(mObbState.volId, 0, -1); } catch (Exception e) { Slog.w(TAG, e); rc = StorageResultCode.OperationFailedInternalError; @@ -4233,7 +3313,6 @@ class StorageManagerService extends IStorageManager.Stub @Override public void handleExecute() throws IOException { - waitForReady(); warnOnNotMounted(); final ObbState existingState; @@ -4255,27 +3334,9 @@ class StorageManagerService extends IStorageManager.Stub int rc = StorageResultCode.OperationSucceeded; try { - if (ENABLE_BINDER) { - mVold.unmount(mObbState.volId); - mVold.destroyObb(mObbState.volId); - mObbState.volId = null; - } else { - final Command cmd = new Command("obb", "unmount", mObbState.canonicalPath); - if (mForceUnmount) { - cmd.appendArg("force"); - } - mConnector.execute(cmd); - } - } catch (NativeDaemonConnectorException e) { - int code = e.getCode(); - if (code == VoldResponseCode.OpFailedStorageBusy) { - rc = StorageResultCode.OperationFailedStorageBusy; - } else if (code == VoldResponseCode.OpFailedStorageNotFound) { - // If it's not mounted then we've already won. - rc = StorageResultCode.OperationSucceeded; - } else { - rc = StorageResultCode.OperationFailedInternalError; - } + mVold.unmount(mObbState.volId); + mVold.destroyObb(mObbState.volId); + mObbState.volId = null; } catch (Exception e) { Slog.w(TAG, e); rc = StorageResultCode.OperationFailedInternalError; @@ -4506,18 +3567,6 @@ class StorageManagerService extends IStorageManager.Stub } pw.println(); - pw.println("mConnector:"); - pw.increaseIndent(); - mConnector.dump(fd, pw, args); - pw.decreaseIndent(); - - pw.println(); - pw.println("mCryptConnector:"); - pw.increaseIndent(); - mCryptConnector.dump(fd, pw, args); - pw.decreaseIndent(); - - pw.println(); pw.print("Last maintenance: "); pw.println(TimeUtils.formatForLogging(mLastMaintenance)); } @@ -4525,11 +3574,10 @@ class StorageManagerService extends IStorageManager.Stub /** {@inheritDoc} */ @Override public void monitor() { - if (mConnector != null) { - mConnector.monitor(); - } - if (mCryptConnector != null) { - mCryptConnector.monitor(); + try { + mVold.monitor(); + } catch (Exception e) { + Slog.wtf(TAG, e); } } diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index e0cde72ffff2..90ad8a5d0131 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -2162,6 +2162,15 @@ public final class ActiveServices { } } + if (r.fgRequired) { + if (DEBUG_FOREGROUND_SERVICE) { + Slog.v(TAG, "Whitelisting " + UserHandle.formatUid(r.appInfo.uid) + + " for fg-service launch"); + } + mAm.tempWhitelistUidLocked(r.appInfo.uid, + SERVICE_START_FOREGROUND_TIMEOUT, "fg-service-launch"); + } + if (!mPendingServices.contains(r)) { mPendingServices.add(r); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 02eb3b432dfe..d516d696ff84 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -682,11 +682,6 @@ public class ActivityManagerService extends IActivityManager.Stub ActivityInfo mLastAddedTaskActivity; /** - * List of packages whitelisted by DevicePolicyManager for locktask. Indexed by userId. - */ - SparseArray<String[]> mLockTaskPackages = new SparseArray<>(); - - /** * The package name of the DeviceOwner. This package is not permitted to have its data cleared. */ String mDeviceOwnerName; @@ -714,7 +709,7 @@ public class ActivityManagerService extends IActivityManager.Stub public boolean canShowErrorDialogs() { return mShowDialogs && !mSleeping && !mShuttingDown - && !mKeyguardController.isKeyguardShowing() + && !mKeyguardController.isKeyguardShowing(DEFAULT_DISPLAY) && !(UserManager.isDeviceInDemoMode(mContext) && mUserController.getCurrentUser().isDemo()); } @@ -1653,45 +1648,32 @@ public class ActivityManagerService extends IActivityManager.Stub static final int DISPATCH_PROCESSES_CHANGED_UI_MSG = 31; static final int DISPATCH_PROCESS_DIED_UI_MSG = 32; static final int REPORT_MEM_USAGE_MSG = 33; - static final int REPORT_USER_SWITCH_MSG = 34; - static final int CONTINUE_USER_SWITCH_MSG = 35; - static final int USER_SWITCH_TIMEOUT_MSG = 36; static final int IMMERSIVE_MODE_LOCK_MSG = 37; static final int PERSIST_URI_GRANTS_MSG = 38; static final int REQUEST_ALL_PSS_MSG = 39; - static final int START_PROFILES_MSG = 40; static final int UPDATE_TIME_PREFERENCE_MSG = 41; - static final int SYSTEM_USER_START_MSG = 42; - static final int SYSTEM_USER_CURRENT_MSG = 43; static final int ENTER_ANIMATION_COMPLETE_MSG = 44; static final int FINISH_BOOTING_MSG = 45; - static final int START_USER_SWITCH_UI_MSG = 46; static final int SEND_LOCALE_TO_MOUNT_DAEMON_MSG = 47; static final int DISMISS_DIALOG_UI_MSG = 48; static final int NOTIFY_CLEARTEXT_NETWORK_MSG = 49; static final int POST_DUMP_HEAP_NOTIFICATION_MSG = 50; static final int DELETE_DUMPHEAP_MSG = 51; - static final int FOREGROUND_PROFILE_CHANGED_MSG = 52; static final int DISPATCH_UIDS_CHANGED_UI_MSG = 53; static final int REPORT_TIME_TRACKER_MSG = 54; - static final int REPORT_USER_SWITCH_COMPLETE_MSG = 55; static final int SHUTDOWN_UI_AUTOMATION_CONNECTION_MSG = 56; static final int CONTENT_PROVIDER_PUBLISH_TIMEOUT_MSG = 57; static final int IDLE_UIDS_MSG = 58; - static final int SYSTEM_USER_UNLOCK_MSG = 59; static final int LOG_STACK_STATE = 60; static final int VR_MODE_CHANGE_MSG = 61; static final int SHOW_UNSUPPORTED_DISPLAY_SIZE_DIALOG_MSG = 62; static final int HANDLE_TRUST_STORAGE_UPDATE_MSG = 63; - static final int REPORT_LOCKED_BOOT_COMPLETE_MSG = 64; static final int NOTIFY_VR_SLEEPING_MSG = 65; static final int SERVICE_FOREGROUND_TIMEOUT_MSG = 66; static final int DISPATCH_PENDING_INTENT_CANCEL_MSG = 67; static final int PUSH_TEMP_WHITELIST_UI_MSG = 68; static final int SERVICE_FOREGROUND_CRASH_MSG = 69; static final int DISPATCH_OOM_ADJ_OBSERVER_MSG = 70; - static final int USER_SWITCH_CALLBACKS_TIMEOUT_MSG = 71; - static final int START_USER_SWITCH_FG_MSG = 712; static final int FIRST_ACTIVITY_STACK_MSG = 100; static final int FIRST_BROADCAST_QUEUE_MSG = 200; @@ -1904,10 +1886,6 @@ public class ActivityManagerService extends IActivityManager.Stub } break; } - case START_USER_SWITCH_UI_MSG: { - mUserController.showUserSwitchDialog((Pair<UserInfo, UserInfo>) msg.obj); - break; - } case DISMISS_DIALOG_UI_MSG: { final Dialog d = (Dialog) msg.obj; d.dismiss(); @@ -2136,26 +2114,6 @@ public class ActivityManagerService extends IActivityManager.Stub thread.start(); break; } - case START_USER_SWITCH_FG_MSG: { - mUserController.startUserInForeground(msg.arg1); - break; - } - case REPORT_USER_SWITCH_MSG: { - mUserController.dispatchUserSwitch((UserState) msg.obj, msg.arg1, msg.arg2); - break; - } - case CONTINUE_USER_SWITCH_MSG: { - mUserController.continueUserSwitch((UserState) msg.obj, msg.arg1, msg.arg2); - break; - } - case USER_SWITCH_TIMEOUT_MSG: { - mUserController.timeoutUserSwitch((UserState) msg.obj, msg.arg1, msg.arg2); - break; - } - case USER_SWITCH_CALLBACKS_TIMEOUT_MSG: { - mUserController.timeoutUserSwitchCallbacks(msg.arg1, msg.arg2); - break; - } case IMMERSIVE_MODE_LOCK_MSG: { final boolean nextState = (msg.arg1 != 0); if (mUpdateLock.isHeld() != nextState) { @@ -2180,12 +2138,6 @@ public class ActivityManagerService extends IActivityManager.Stub } break; } - case START_PROFILES_MSG: { - synchronized (ActivityManagerService.this) { - mUserController.startProfilesLocked(); - } - break; - } case UPDATE_TIME_PREFERENCE_MSG: { // The user's time format preference might have changed. // For convenience we re-use the Intent extra values. @@ -2204,35 +2156,6 @@ public class ActivityManagerService extends IActivityManager.Stub } break; } - case SYSTEM_USER_START_MSG: { - mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_USER_RUNNING_START, - Integer.toString(msg.arg1), msg.arg1); - mSystemServiceManager.startUser(msg.arg1); - break; - } - case SYSTEM_USER_UNLOCK_MSG: { - final int userId = msg.arg1; - mSystemServiceManager.unlockUser(userId); - synchronized (ActivityManagerService.this) { - mRecentTasks.loadUserRecentsLocked(userId); - } - if (userId == UserHandle.USER_SYSTEM) { - startPersistentApps(PackageManager.MATCH_DIRECT_BOOT_UNAWARE); - } - installEncryptionUnawareProviders(userId); - mUserController.finishUserUnlocked((UserState) msg.obj); - break; - } - case SYSTEM_USER_CURRENT_MSG: { - mBatteryStatsService.noteEvent( - BatteryStats.HistoryItem.EVENT_USER_FOREGROUND_FINISH, - Integer.toString(msg.arg2), msg.arg2); - mBatteryStatsService.noteEvent( - BatteryStats.HistoryItem.EVENT_USER_FOREGROUND_START, - Integer.toString(msg.arg1), msg.arg1); - mSystemServiceManager.switchUser(msg.arg1); - break; - } case ENTER_ANIMATION_COMPLETE_MSG: { synchronized (ActivityManagerService.this) { ActivityRecord r = ActivityRecord.forTokenLocked((IBinder) msg.obj); @@ -2372,19 +2295,10 @@ public class ActivityManagerService extends IActivityManager.Stub mMemWatchDumpUid = -1; } } break; - case FOREGROUND_PROFILE_CHANGED_MSG: { - mUserController.dispatchForegroundProfileChanged(msg.arg1); - } break; case REPORT_TIME_TRACKER_MSG: { AppTimeTracker tracker = (AppTimeTracker)msg.obj; tracker.deliverResult(mContext); } break; - case REPORT_USER_SWITCH_COMPLETE_MSG: { - mUserController.dispatchUserSwitchComplete(msg.arg1); - } break; - case REPORT_LOCKED_BOOT_COMPLETE_MSG: { - mUserController.dispatchLockedBootComplete(msg.arg1); - } break; case SHUTDOWN_UI_AUTOMATION_CONNECTION_MSG: { IUiAutomationConnection connection = (IUiAutomationConnection) msg.obj; try { @@ -3152,9 +3066,7 @@ public class ActivityManagerService extends IActivityManager.Stub } if (mLastResumedActivity != null && r.userId != mLastResumedActivity.userId) { - mHandler.removeMessages(FOREGROUND_PROFILE_CHANGED_MSG); - mHandler.obtainMessage( - FOREGROUND_PROFILE_CHANGED_MSG, r.userId, 0).sendToTarget(); + mUserController.sendForegroundProfileChanged(r.userId); } mLastResumedActivity = r; @@ -3874,6 +3786,12 @@ public class ActivityManagerService extends IActivityManager.Stub mNativeDebuggingApp = null; } + if (app.info.isPrivilegedApp() && + !SystemProperties.getBoolean("pm.dexopt.priv-apps", true)) { + runtimeFlags |= Zygote.DISABLE_VERIFIER; + runtimeFlags |= Zygote.ONLY_USE_SYSTEM_OAT_FILES; + } + String invokeWith = null; if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { // Debuggable apps may include a wrapper script with their library directory. @@ -4156,15 +4074,6 @@ public class ActivityManagerService extends IActivityManager.Stub } } - void enforceShellRestriction(String restriction, int userHandle) { - if (Binder.getCallingUid() == SHELL_UID) { - if (userHandle < 0 || mUserController.hasUserRestriction(restriction, userHandle)) { - throw new SecurityException("Shell does not have permission to access user " - + userHandle); - } - } - } - @Override public int getFrontActivityScreenCompatMode() { enforceNotIsolatedCaller("getFrontActivityScreenCompatMode"); @@ -7371,7 +7280,7 @@ public class ActivityManagerService extends IActivityManager.Stub } } }); - scheduleStartProfilesLocked(); + mUserController.scheduleStartProfilesLocked(); } } } @@ -10882,7 +10791,6 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public void updateLockTaskPackages(int userId, String[] packages) { - // TODO: move this into LockTaskController final int callingUid = Binder.getCallingUid(); if (callingUid != 0 && callingUid != SYSTEM_UID) { enforceCallingPermission(android.Manifest.permission.UPDATE_LOCK_TASK_PACKAGES, @@ -10891,8 +10799,7 @@ public class ActivityManagerService extends IActivityManager.Stub synchronized (this) { if (DEBUG_LOCKTASK) Slog.w(TAG_LOCKTASK, "Whitelisting " + userId + ":" + Arrays.toString(packages)); - mLockTaskPackages.put(userId, packages); - mLockTaskController.onLockTaskPackagesUpdated(); + mLockTaskController.updateLockTaskPackages(userId, packages); } } @@ -12073,7 +11980,7 @@ public class ActivityManagerService extends IActivityManager.Stub //mUsageStatsService.monitorPackages(); } - private void startPersistentApps(int matchFlags) { + void startPersistentApps(int matchFlags) { if (mFactoryTest == FactoryTest.FACTORY_TEST_LOW_LEVEL) return; synchronized (this) { @@ -12094,7 +12001,7 @@ public class ActivityManagerService extends IActivityManager.Stub * When a user is unlocked, we need to install encryption-unaware providers * belonging to any running apps. */ - private void installEncryptionUnawareProviders(int userId) { + void installEncryptionUnawareProviders(int userId) { // We're only interested in providers that are encryption unaware, and // we don't care about uninstalled apps, since there's no way they're // running at this point. @@ -12399,19 +12306,14 @@ public class ActivityManagerService extends IActivityManager.Stub void onWakefulnessChanged(int wakefulness) { synchronized(this) { + boolean wasAwake = mWakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE; + boolean isAwake = wakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE; mWakefulness = wakefulness; - // Also update state in a special way for running foreground services UI. - switch (mWakefulness) { - case PowerManagerInternal.WAKEFULNESS_ASLEEP: - case PowerManagerInternal.WAKEFULNESS_DREAMING: - case PowerManagerInternal.WAKEFULNESS_DOZING: - mServices.updateScreenStateLocked(false /* screenOn */); - break; - case PowerManagerInternal.WAKEFULNESS_AWAKE: - default: - mServices.updateScreenStateLocked(true /* screenOn */); - break; + if (wasAwake != isAwake) { + // Also update state in a special way for running foreground services UI. + mServices.updateScreenStateLocked(isAwake); + sendNotifyVrManagerOfSleepState(!isAwake); } } } @@ -12447,7 +12349,6 @@ public class ActivityManagerService extends IActivityManager.Stub } mStackSupervisor.applySleepTokensLocked(true /* applyToStacks */); if (wasSleeping) { - sendNotifyVrManagerOfSleepState(false); updateOomAdjLocked(); } } else if (!mSleeping && shouldSleep) { @@ -12457,7 +12358,6 @@ public class ActivityManagerService extends IActivityManager.Stub } mTopProcessState = ActivityManager.PROCESS_STATE_TOP_SLEEPING; mStackSupervisor.goingToSleepLocked(); - sendNotifyVrManagerOfSleepState(true); updateOomAdjLocked(); } } @@ -12551,7 +12451,7 @@ public class ActivityManagerService extends IActivityManager.Stub } @Override - public void setLockScreenShown(boolean showing) { + public void setLockScreenShown(boolean showing, int secondaryDisplayShowing) { if (checkCallingPermission(android.Manifest.permission.DEVICE_POWER) != PackageManager.PERMISSION_GRANTED) { throw new SecurityException("Requires permission " @@ -12561,7 +12461,7 @@ public class ActivityManagerService extends IActivityManager.Stub synchronized(this) { long ident = Binder.clearCallingIdentity(); try { - mKeyguardController.setKeyguardShown(showing); + mKeyguardController.setKeyguardShown(showing, secondaryDisplayShowing); } finally { Binder.restoreCallingIdentity(ident); } @@ -13982,10 +13882,10 @@ public class ActivityManagerService extends IActivityManager.Stub mContext.getPackageManager().hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT) || Settings.Global.getInt( resolver, DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, 0) != 0; - final boolean supportsPictureInPicture = - mContext.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE); final boolean supportsMultiWindow = ActivityManager.supportsMultiWindow(mContext); + final boolean supportsPictureInPicture = supportsMultiWindow && + mContext.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE); final boolean supportsSplitScreenMultiWindow = ActivityManager.supportsSplitScreenMultiWindow(mContext); final boolean supportsMultiDisplay = mContext.getPackageManager() @@ -23566,54 +23466,7 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public boolean switchUser(final int targetUserId) { - enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES, targetUserId); - int currentUserId; - UserInfo targetUserInfo; - synchronized (this) { - currentUserId = mUserController.getCurrentUserIdLocked(); - targetUserInfo = mUserController.getUserInfo(targetUserId); - if (targetUserId == currentUserId) { - Slog.i(TAG, "user #" + targetUserId + " is already the current user"); - return true; - } - if (targetUserInfo == null) { - Slog.w(TAG, "No user info for user #" + targetUserId); - return false; - } - if (!targetUserInfo.isDemo() && UserManager.isDeviceInDemoMode(mContext)) { - Slog.w(TAG, "Cannot switch to non-demo user #" + targetUserId - + " when device is in demo mode"); - return false; - } - if (!targetUserInfo.supportsSwitchTo()) { - Slog.w(TAG, "Cannot switch to User #" + targetUserId + ": not supported"); - return false; - } - if (targetUserInfo.isManagedProfile()) { - Slog.w(TAG, "Cannot switch to User #" + targetUserId + ": not a full user"); - return false; - } - mUserController.setTargetUserIdLocked(targetUserId); - } - if (mUserController.mUserSwitchUiEnabled) { - UserInfo currentUserInfo = mUserController.getUserInfo(currentUserId); - Pair<UserInfo, UserInfo> userNames = new Pair<>(currentUserInfo, targetUserInfo); - mUiHandler.removeMessages(START_USER_SWITCH_UI_MSG); - mUiHandler.sendMessage(mHandler.obtainMessage( - START_USER_SWITCH_UI_MSG, userNames)); - } else { - mHandler.removeMessages(START_USER_SWITCH_FG_MSG); - mHandler.sendMessage(mHandler.obtainMessage( - START_USER_SWITCH_FG_MSG, targetUserId, 0)); - } - return true; - } - - void scheduleStartProfilesLocked() { - if (!mHandler.hasMessages(START_PROFILES_MSG)) { - mHandler.sendMessageDelayed(mHandler.obtainMessage(START_PROFILES_MSG), - DateUtils.SECOND_IN_MILLIS); - } + return mUserController.switchUser(targetUserId); } @Override @@ -24025,7 +23878,7 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public void notifyKeyguardTrustedChanged() { synchronized (ActivityManagerService.this) { - if (mKeyguardController.isKeyguardShowing()) { + if (mKeyguardController.isKeyguardShowing(DEFAULT_DISPLAY)) { mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS); } } diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index a6a702fbfc13..6140c266f96b 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1962,7 +1962,8 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai boolean checkKeyguardVisibility(ActivityRecord r, boolean shouldBeVisible, boolean isTop) { final boolean isInPinnedStack = r.getStack().getStackId() == PINNED_STACK_ID; - final boolean keyguardShowing = mStackSupervisor.mKeyguardController.isKeyguardShowing(); + final boolean keyguardShowing = mStackSupervisor.mKeyguardController.isKeyguardShowing( + mDisplayId != INVALID_DISPLAY ? mDisplayId : DEFAULT_DISPLAY); final boolean keyguardLocked = mStackSupervisor.mKeyguardController.isKeyguardLocked(); final boolean showWhenLocked = r.canShowWhenLocked() && !isInPinnedStack; final boolean dismissKeyguard = r.hasDismissKeyguardWindows(); @@ -5194,8 +5195,8 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai voiceInteractor); // add the task to stack first, mTaskPositioner might need the stack association addTask(task, toTop, "createTaskRecord"); - final boolean isLockscreenShown = - mService.mStackSupervisor.mKeyguardController.isKeyguardShowing(); + final boolean isLockscreenShown = mService.mStackSupervisor.mKeyguardController + .isKeyguardShowing(mDisplayId != INVALID_DISPLAY ? mDisplayId : DEFAULT_DISPLAY); if (!layoutTaskInStack(task, info.windowLayout) && mBounds != null && task.isResizeable() && !isLockscreenShown) { task.updateOverrideConfiguration(mBounds); diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index d4a30df23d1e..c8a2a230a7e1 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -166,7 +166,6 @@ import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -3558,15 +3557,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D pw.println("mCurTaskIdForUser=" + mCurTaskIdForUser); pw.print(prefix); pw.println("mUserStackInFront=" + mUserStackInFront); pw.print(prefix); pw.println("mStacks=" + mStacks); - // TODO: move this to LockTaskController - final SparseArray<String[]> packages = mService.mLockTaskPackages; - if (packages.size() > 0) { - pw.print(prefix); pw.println("mLockTaskPackages (userId:packages)="); - for (int i = 0; i < packages.size(); ++i) { - pw.print(prefix); pw.print(prefix); pw.print(packages.keyAt(i)); - pw.print(":"); pw.println(Arrays.toString(packages.valueAt(i))); - } - } if (!mWaitingForActivityVisible.isEmpty()) { pw.print(prefix); pw.println("mWaitingForActivityVisible="); for (int i = 0; i < mWaitingForActivityVisible.size(); ++i) { diff --git a/services/core/java/com/android/server/am/KeyguardController.java b/services/core/java/com/android/server/am/KeyguardController.java index cea80c8d0e9d..85961135d84f 100644 --- a/services/core/java/com/android/server/am/KeyguardController.java +++ b/services/core/java/com/android/server/am/KeyguardController.java @@ -19,6 +19,7 @@ package com.android.server.am; import static android.app.ActivityManager.StackId.DOCKED_STACK_ID; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.Display.INVALID_DISPLAY; import static android.view.WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS; import static android.view.WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_TO_SHADE; import static android.view.WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER; @@ -66,6 +67,7 @@ class KeyguardController { private int mBeforeUnoccludeTransit; private int mVisibilityTransactionDepth; private SleepToken mSleepToken; + private int mSecondaryDisplayShowing = INVALID_DISPLAY; KeyguardController(ActivityManagerService service, ActivityStackSupervisor stackSupervisor) { @@ -78,10 +80,12 @@ class KeyguardController { } /** - * @return true if Keyguard is showing, not going away, and not being occluded, false otherwise + * @return true if Keyguard is showing, not going away, and not being occluded on the given + * display, false otherwise */ - boolean isKeyguardShowing() { - return mKeyguardShowing && !mKeyguardGoingAway && !mOccluded; + boolean isKeyguardShowing(int displayId) { + return mKeyguardShowing && !mKeyguardGoingAway && + (displayId == DEFAULT_DISPLAY ? !mOccluded : displayId == mSecondaryDisplayShowing); } /** @@ -94,15 +98,19 @@ class KeyguardController { /** * Update the Keyguard showing state. */ - void setKeyguardShown(boolean showing) { - if (showing == mKeyguardShowing) { + void setKeyguardShown(boolean showing, int secondaryDisplayShowing) { + boolean showingChanged = showing != mKeyguardShowing; + if (!showingChanged && secondaryDisplayShowing == mSecondaryDisplayShowing) { return; } mKeyguardShowing = showing; - dismissDockedStackIfNeeded(); - if (showing) { - setKeyguardGoingAway(false); - mDismissalRequested = false; + mSecondaryDisplayShowing = secondaryDisplayShowing; + if (showingChanged) { + dismissDockedStackIfNeeded(); + if (showing) { + setKeyguardGoingAway(false); + mDismissalRequested = false; + } } mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS); updateKeyguardSleepToken(); @@ -337,9 +345,9 @@ class KeyguardController { } private void updateKeyguardSleepToken() { - if (mSleepToken == null && isKeyguardShowing()) { + if (mSleepToken == null && isKeyguardShowing(DEFAULT_DISPLAY)) { mSleepToken = mService.acquireSleepToken("Keyguard", DEFAULT_DISPLAY); - } else if (mSleepToken != null && !isKeyguardShowing()) { + } else if (mSleepToken != null && !isKeyguardShowing(DEFAULT_DISPLAY)) { mSleepToken.release(); mSleepToken = null; } diff --git a/services/core/java/com/android/server/am/LockTaskController.java b/services/core/java/com/android/server/am/LockTaskController.java index d8706bcc5e35..241e58391144 100644 --- a/services/core/java/com/android/server/am/LockTaskController.java +++ b/services/core/java/com/android/server/am/LockTaskController.java @@ -31,6 +31,7 @@ import static android.os.UserHandle.USER_ALL; import static android.os.UserHandle.USER_CURRENT; import static android.provider.Settings.Secure.LOCK_TO_APP_EXIT_LOCKED; import static android.view.Display.DEFAULT_DISPLAY; + import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKTASK; import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_LOCKTASK; import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; @@ -55,7 +56,9 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.provider.Settings; import android.util.Slog; +import android.util.SparseArray; +import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.widget.LockPatternUtils; @@ -65,6 +68,7 @@ import com.android.server.wm.WindowManagerService; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; /** * Helper class that deals with all things related to task locking. This includes the screen pinning @@ -123,6 +127,11 @@ public class LockTaskController { private final ArrayList<TaskRecord> mLockTaskModeTasks = new ArrayList<>(); /** + * Packages that are allowed to be launched into the lock task mode for each user. + */ + private final SparseArray<String[]> mLockTaskPackages = new SparseArray<>(); + + /** * Store the current lock task mode. Possible values: * {@link ActivityManager#LOCK_TASK_MODE_NONE}, {@link ActivityManager#LOCK_TASK_MODE_LOCKED}, * {@link ActivityManager#LOCK_TASK_MODE_PINNED} @@ -159,8 +168,8 @@ public class LockTaskController { } /** - * @return whether the given task can be moved to the back of the stack. Locked tasks cannot be - * moved to the back of the stack. + * @return whether the given task is locked at the moment. Locked tasks cannot be moved to the + * back of the stack. */ boolean checkLockedTask(TaskRecord task) { if (mLockTaskModeTasks.contains(task)) { @@ -452,29 +461,35 @@ public class LockTaskController { } /** - * Called when the list of packages whitelisted for lock task mode is changed. Any currently - * locked tasks that got removed from the whitelist will be finished. + * Update packages that are allowed to be launched in lock task mode. + * @param userId Which user this whitelist is associated with + * @param packages The whitelist of packages allowed in lock task mode + * @see #mLockTaskPackages */ - // TODO: Missing unit tests - void onLockTaskPackagesUpdated() { - boolean didSomething = false; + void updateLockTaskPackages(int userId, String[] packages) { + mLockTaskPackages.put(userId, packages); + + boolean taskChanged = false; for (int taskNdx = mLockTaskModeTasks.size() - 1; taskNdx >= 0; --taskNdx) { final TaskRecord lockedTask = mLockTaskModeTasks.get(taskNdx); - final boolean wasWhitelisted = - (lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE) || - (lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED); + final boolean wasWhitelisted = lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE + || lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED; lockedTask.setLockTaskAuth(); - final boolean isWhitelisted = - (lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE) || - (lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED); - if (wasWhitelisted && !isWhitelisted) { - // Lost whitelisting authorization. End it now. - if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "onLockTaskPackagesUpdated: removing " + - lockedTask + " mLockTaskAuth()=" + lockedTask.lockTaskAuthToString()); - removeLockedTask(lockedTask); - lockedTask.performClearTaskLocked(); - didSomething = true; + final boolean isWhitelisted = lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE + || lockedTask.mLockTaskAuth == LOCK_TASK_AUTH_WHITELISTED; + + if (mLockTaskModeState != LOCK_TASK_MODE_LOCKED + || lockedTask.userId != userId + || !wasWhitelisted || isWhitelisted) { + continue; } + + // Terminate locked tasks that have recently lost whitelist authorization. + if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "onLockTaskPackagesUpdated: removing " + + lockedTask + " mLockTaskAuth()=" + lockedTask.lockTaskAuthToString()); + removeLockedTask(lockedTask); + lockedTask.performClearTaskLocked(); + taskChanged = true; } for (int displayNdx = mSupervisor.getChildCount() - 1; displayNdx >= 0; --displayNdx) { @@ -484,22 +499,40 @@ public class LockTaskController { stack.onLockTaskPackagesUpdatedLocked(); } } + final ActivityRecord r = mSupervisor.topRunningActivityLocked(); - final TaskRecord task = r != null ? r.getTask() : null; - if (mLockTaskModeTasks.isEmpty() && task != null + final TaskRecord task = (r != null) ? r.getTask() : null; + if (mLockTaskModeTasks.isEmpty() && task!= null && task.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE) { // This task must have just been authorized. if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "onLockTaskPackagesUpdated: starting new locktask task=" + task); - setLockTaskMode(task, LOCK_TASK_MODE_LOCKED, "package updated", - false); - didSomething = true; + setLockTaskMode(task, LOCK_TASK_MODE_LOCKED, "package updated", false); + taskChanged = true; } - if (didSomething) { + + if (taskChanged) { mSupervisor.resumeFocusedStackTopActivityLocked(); } } + boolean isPackageWhitelisted(int userId, String pkg) { + if (pkg == null) { + return false; + } + String[] whitelist; + whitelist = mLockTaskPackages.get(userId); + if (whitelist == null) { + return false; + } + for (String whitelistedPkg : whitelist) { + if (pkg.equals(whitelistedPkg)) { + return true; + } + } + return false; + } + /** * @return the topmost locked task */ @@ -556,8 +589,18 @@ public class LockTaskController { } public void dump(PrintWriter pw, String prefix) { - pw.print(prefix); pw.print("mLockTaskModeState=" + lockTaskModeToString()); - pw.println(" mLockTaskModeTasks" + mLockTaskModeTasks); + pw.println(prefix + "LockTaskController"); + prefix = prefix + " "; + pw.println(prefix + "mLockTaskModeState=" + lockTaskModeToString()); + pw.println(prefix + "mLockTaskModeTasks="); + for (int i = 0; i < mLockTaskModeTasks.size(); ++i) { + pw.println(prefix + " #" + i + " " + mLockTaskModeTasks.get(i)); + } + pw.println(prefix + "mLockTaskPackages (userId:packages)="); + for (int i = 0; i < mLockTaskPackages.size(); ++i) { + pw.println(prefix + " u" + mLockTaskPackages.keyAt(i) + + ":" + Arrays.toString(mLockTaskPackages.valueAt(i))); + } } private String lockTaskModeToString() { diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 0e651845df8d..48da6555e75c 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -78,7 +78,6 @@ import android.app.ActivityManager.TaskSnapshot; import android.app.ActivityOptions; import android.app.AppGlobals; import android.app.IActivityManager; -import android.app.WindowConfiguration; import android.content.ComponentName; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -857,8 +856,13 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi } mResizeMode = info.resizeMode; mSupportsPictureInPicture = info.supportsPictureInPicture(); - mLockTaskMode = info.lockTaskLaunchMode; mPrivileged = (info.applicationInfo.privateFlags & PRIVATE_FLAG_PRIVILEGED) != 0; + mLockTaskMode = info.lockTaskLaunchMode; + if (!mPrivileged && (mLockTaskMode == LOCK_TASK_LAUNCH_MODE_ALWAYS + || mLockTaskMode == LOCK_TASK_LAUNCH_MODE_NEVER)) { + // Non-priv apps are not allowed to use always or never, fall back to default + mLockTaskMode = LOCK_TASK_LAUNCH_MODE_DEFAULT; + } setLockTaskAuth(); } @@ -1396,16 +1400,11 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi } void setLockTaskAuth() { - if (!mPrivileged && - (mLockTaskMode == LOCK_TASK_LAUNCH_MODE_ALWAYS || - mLockTaskMode == LOCK_TASK_LAUNCH_MODE_NEVER)) { - // Non-priv apps are not allowed to use always or never, fall back to default - mLockTaskMode = LOCK_TASK_LAUNCH_MODE_DEFAULT; - } + final String pkg = (realActivity != null) ? realActivity.getPackageName() : null; switch (mLockTaskMode) { case LOCK_TASK_LAUNCH_MODE_DEFAULT: - mLockTaskAuth = isLockTaskWhitelistedLocked() ? - LOCK_TASK_AUTH_WHITELISTED : LOCK_TASK_AUTH_PINNABLE; + mLockTaskAuth = mService.mLockTaskController.isPackageWhitelisted(userId, pkg) + ? LOCK_TASK_AUTH_WHITELISTED : LOCK_TASK_AUTH_PINNABLE; break; case LOCK_TASK_LAUNCH_MODE_NEVER: @@ -1417,31 +1416,14 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi break; case LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED: - mLockTaskAuth = isLockTaskWhitelistedLocked() ? - LOCK_TASK_AUTH_LAUNCHABLE : LOCK_TASK_AUTH_PINNABLE; + mLockTaskAuth = mService.mLockTaskController.isPackageWhitelisted(userId, pkg) + ? LOCK_TASK_AUTH_LAUNCHABLE : LOCK_TASK_AUTH_PINNABLE; break; } if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "setLockTaskAuth: task=" + this + " mLockTaskAuth=" + lockTaskAuthToString()); } - private boolean isLockTaskWhitelistedLocked() { - String pkg = (realActivity != null) ? realActivity.getPackageName() : null; - if (pkg == null) { - return false; - } - String[] packages = mService.mLockTaskPackages.get(userId); - if (packages == null) { - return false; - } - for (int i = packages.length - 1; i >= 0; --i) { - if (pkg.equals(packages[i])) { - return true; - } - } - return false; - } - boolean isOverHomeStack() { return mTaskToReturnTo == ACTIVITY_TYPE_HOME; } diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index db6bb7d8e653..f2e294217999 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -22,6 +22,7 @@ import static android.app.ActivityManager.USER_OP_ERROR_IS_SYSTEM; import static android.app.ActivityManager.USER_OP_ERROR_RELATED_USERS_CANNOT_STOP; import static android.app.ActivityManager.USER_OP_IS_CURRENT; import static android.app.ActivityManager.USER_OP_SUCCESS; +import static android.os.Process.SHELL_UID; import static android.os.Process.SYSTEM_UID; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_MU; import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; @@ -30,14 +31,6 @@ import static com.android.server.am.ActivityManagerService.ALLOW_FULL_ONLY; import static com.android.server.am.ActivityManagerService.ALLOW_NON_FULL; import static com.android.server.am.ActivityManagerService.ALLOW_NON_FULL_IN_PROFILE; import static com.android.server.am.ActivityManagerService.MY_PID; -import static com.android.server.am.ActivityManagerService.REPORT_LOCKED_BOOT_COMPLETE_MSG; -import static com.android.server.am.ActivityManagerService.REPORT_USER_SWITCH_COMPLETE_MSG; -import static com.android.server.am.ActivityManagerService.REPORT_USER_SWITCH_MSG; -import static com.android.server.am.ActivityManagerService.SYSTEM_USER_CURRENT_MSG; -import static com.android.server.am.ActivityManagerService.SYSTEM_USER_START_MSG; -import static com.android.server.am.ActivityManagerService.SYSTEM_USER_UNLOCK_MSG; -import static com.android.server.am.ActivityManagerService.USER_SWITCH_CALLBACKS_TIMEOUT_MSG; -import static com.android.server.am.ActivityManagerService.USER_SWITCH_TIMEOUT_MSG; import static com.android.server.am.UserState.STATE_BOOTING; import static com.android.server.am.UserState.STATE_RUNNING_LOCKED; import static com.android.server.am.UserState.STATE_RUNNING_UNLOCKED; @@ -68,6 +61,7 @@ import android.os.IBinder; import android.os.IProgressListener; import android.os.IRemoteCallback; import android.os.IUserManager; +import android.os.Message; import android.os.Process; import android.os.RemoteCallbackList; import android.os.RemoteException; @@ -78,6 +72,7 @@ import android.os.UserManager; import android.os.UserManagerInternal; import android.os.storage.IStorageManager; import android.os.storage.StorageManager; +import android.text.format.DateUtils; import android.util.ArraySet; import android.util.IntArray; import android.util.Pair; @@ -93,6 +88,7 @@ import com.android.internal.util.ArrayUtils; import com.android.internal.util.Preconditions; import com.android.internal.widget.LockPatternUtils; import com.android.server.LocalServices; +import com.android.server.SystemServiceManager; import com.android.server.pm.UserManagerService; import com.android.server.wm.WindowManagerService; @@ -108,7 +104,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * Helper class for {@link ActivityManagerService} responsible for multi-user functionality. */ -class UserController { +class UserController implements Handler.Callback { private static final String TAG = TAG_WITH_CLASS_NAME ? "UserController" : TAG_AM; // Maximum number of users we allow to be running at a time. @@ -118,6 +114,23 @@ class UserController { // giving up on them and unfreezing the screen. static final int USER_SWITCH_TIMEOUT_MS = 3 * 1000; + // ActivityManager thread message constants + static final int REPORT_USER_SWITCH_MSG = 10; + static final int CONTINUE_USER_SWITCH_MSG = 20; + static final int USER_SWITCH_TIMEOUT_MSG = 30; + static final int START_PROFILES_MSG = 40; + static final int SYSTEM_USER_START_MSG = 50; + static final int SYSTEM_USER_CURRENT_MSG = 60; + static final int FOREGROUND_PROFILE_CHANGED_MSG = 70; + static final int REPORT_USER_SWITCH_COMPLETE_MSG = 80; + static final int USER_SWITCH_CALLBACKS_TIMEOUT_MSG = 90; + static final int SYSTEM_USER_UNLOCK_MSG = 100; + static final int REPORT_LOCKED_BOOT_COMPLETE_MSG = 110; + static final int START_USER_SWITCH_FG_MSG = 120; + + // UI thread message constants + static final int START_USER_SWITCH_UI_MSG = 1000; + // If a callback wasn't called within USER_SWITCH_CALLBACKS_TIMEOUT_MS after // USER_SWITCH_TIMEOUT_MS, an error is reported. Usually it indicates a problem in the observer // when it never calls back. @@ -126,6 +139,7 @@ class UserController { private final Object mLock; private final Injector mInjector; private final Handler mHandler; + private final Handler mUiHandler; // Holds the current foreground user's id. Use mLock when updating @GuardedBy("mLock") @@ -193,7 +207,8 @@ class UserController { UserController(Injector injector) { mInjector = injector; mLock = injector.getLock(); - mHandler = injector.getHandler(); + mHandler = mInjector.getHandler(this); + mUiHandler = mInjector.getUiHandler(this); // User 0 is the first and only user that runs at boot. final UserState uss = new UserState(UserHandle.SYSTEM); mStartedUsers.put(UserHandle.USER_SYSTEM, uss); @@ -499,7 +514,7 @@ class UserController { if (userId < 0 || userId == UserHandle.USER_SYSTEM) { throw new IllegalArgumentException("Can't stop system user " + userId); } - mInjector.enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES, userId); + enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES, userId); synchronized (mLock) { return stopUsersLocked(userId, force, callback); } @@ -635,7 +650,7 @@ class UserController { mInjector.batteryStatsServiceNoteEvent( BatteryStats.HistoryItem.EVENT_USER_RUNNING_FINISH, Integer.toString(userId), userId); - mInjector.systemServiceManagerStopUser(userId); + mInjector.getSystemServiceManager().stopUser(userId); synchronized (mLock) { mInjector.broadcastIntentLocked(shutdownIntent, @@ -765,6 +780,13 @@ class UserController { } } + void scheduleStartProfilesLocked() { + if (!mHandler.hasMessages(START_PROFILES_MSG)) { + mHandler.sendMessageDelayed(mHandler.obtainMessage(START_PROFILES_MSG), + DateUtils.SECOND_IN_MILLIS); + } + } + void startProfilesLocked() { if (DEBUG_MU) Slog.i(TAG, "startProfilesLocked"); List<UserInfo> profiles = mInjector.getUserManager().getProfiles( @@ -1080,6 +1102,50 @@ class UserController { return true; } + boolean switchUser(final int targetUserId) { + enforceShellRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES, targetUserId); + int currentUserId; + UserInfo targetUserInfo; + synchronized (mLock) { + currentUserId = getCurrentUserIdLocked(); + targetUserInfo = getUserInfo(targetUserId); + if (targetUserId == currentUserId) { + Slog.i(TAG, "user #" + targetUserId + " is already the current user"); + return true; + } + if (targetUserInfo == null) { + Slog.w(TAG, "No user info for user #" + targetUserId); + return false; + } + if (!targetUserInfo.isDemo() && UserManager.isDeviceInDemoMode(mInjector.getContext())) { + Slog.w(TAG, "Cannot switch to non-demo user #" + targetUserId + + " when device is in demo mode"); + return false; + } + if (!targetUserInfo.supportsSwitchTo()) { + Slog.w(TAG, "Cannot switch to User #" + targetUserId + ": not supported"); + return false; + } + if (targetUserInfo.isManagedProfile()) { + Slog.w(TAG, "Cannot switch to User #" + targetUserId + ": not a full user"); + return false; + } + setTargetUserIdLocked(targetUserId); + } + if (mUserSwitchUiEnabled) { + UserInfo currentUserInfo = getUserInfo(currentUserId); + Pair<UserInfo, UserInfo> userNames = new Pair<>(currentUserInfo, targetUserInfo); + mUiHandler.removeMessages(START_USER_SWITCH_UI_MSG); + mUiHandler.sendMessage(mHandler.obtainMessage( + START_USER_SWITCH_UI_MSG, userNames)); + } else { + mHandler.removeMessages(START_USER_SWITCH_FG_MSG); + mHandler.sendMessage(mHandler.obtainMessage( + START_USER_SWITCH_FG_MSG, targetUserId, 0)); + } + return true; + } + void showUserSwitchDialog(Pair<UserInfo, UserInfo> fromToUserPair) { // The dialog will show and then initiate the user switch by calling startUserInForeground mInjector.showUserSwitchingDialog(fromToUserPair.first, fromToUserPair.second); @@ -1215,7 +1281,7 @@ class UserController { void sendContinueUserSwitchLocked(UserState uss, int oldUserId, int newUserId) { mCurWaitingUserSwitchCallbacks = null; mHandler.removeMessages(USER_SWITCH_TIMEOUT_MSG); - mHandler.sendMessage(mHandler.obtainMessage(ActivityManagerService.CONTINUE_USER_SWITCH_MSG, + mHandler.sendMessage(mHandler.obtainMessage(CONTINUE_USER_SWITCH_MSG, oldUserId, newUserId, uss)); } @@ -1395,6 +1461,11 @@ class UserController { mUserSwitchObservers.register(observer, name); } + void sendForegroundProfileChanged(int userId) { + mHandler.removeMessages(FOREGROUND_PROFILE_CHANGED_MSG); + mHandler.obtainMessage(FOREGROUND_PROFILE_CHANGED_MSG, userId, 0).sendToTarget(); + } + void unregisterUserSwitchObserver(IUserSwitchObserver observer) { mUserSwitchObservers.unregister(observer); } @@ -1575,6 +1646,15 @@ class UserController { return mInjector.getUserManager().exists(userId); } + void enforceShellRestriction(String restriction, int userHandle) { + if (Binder.getCallingUid() == SHELL_UID) { + if (userHandle < 0 || hasUserRestriction(restriction, userHandle)) { + throw new SecurityException("Shell does not have permission to access user " + + userHandle); + } + } + } + boolean hasUserRestriction(String restriction, int userId) { return mInjector.getUserManager().hasUserRestriction(restriction, userId); } @@ -1667,6 +1747,72 @@ class UserController { } } + public boolean handleMessage(Message msg) { + switch (msg.what) { + case START_USER_SWITCH_FG_MSG: + startUserInForeground(msg.arg1); + break; + case REPORT_USER_SWITCH_MSG: + dispatchUserSwitch((UserState) msg.obj, msg.arg1, msg.arg2); + break; + case CONTINUE_USER_SWITCH_MSG: + continueUserSwitch((UserState) msg.obj, msg.arg1, msg.arg2); + break; + case USER_SWITCH_TIMEOUT_MSG: + timeoutUserSwitch((UserState) msg.obj, msg.arg1, msg.arg2); + break; + case USER_SWITCH_CALLBACKS_TIMEOUT_MSG: + timeoutUserSwitchCallbacks(msg.arg1, msg.arg2); + break; + case START_PROFILES_MSG: + synchronized (mLock) { + startProfilesLocked(); + } + break; + case SYSTEM_USER_START_MSG: + mInjector.batteryStatsServiceNoteEvent( + BatteryStats.HistoryItem.EVENT_USER_RUNNING_START, + Integer.toString(msg.arg1), msg.arg1); + mInjector.getSystemServiceManager().startUser(msg.arg1); + break; + case SYSTEM_USER_UNLOCK_MSG: + final int userId = msg.arg1; + mInjector.getSystemServiceManager().unlockUser(userId); + synchronized (mLock) { + mInjector.loadUserRecentsLocked(userId); + } + if (userId == UserHandle.USER_SYSTEM) { + mInjector.startPersistentApps(PackageManager.MATCH_DIRECT_BOOT_UNAWARE); + } + mInjector.installEncryptionUnawareProviders(userId); + finishUserUnlocked((UserState) msg.obj); + break; + case SYSTEM_USER_CURRENT_MSG: + mInjector.batteryStatsServiceNoteEvent( + BatteryStats.HistoryItem.EVENT_USER_FOREGROUND_FINISH, + Integer.toString(msg.arg2), msg.arg2); + mInjector.batteryStatsServiceNoteEvent( + BatteryStats.HistoryItem.EVENT_USER_FOREGROUND_START, + Integer.toString(msg.arg1), msg.arg1); + + mInjector.getSystemServiceManager().switchUser(msg.arg1); + break; + case FOREGROUND_PROFILE_CHANGED_MSG: + dispatchForegroundProfileChanged(msg.arg1); + break; + case REPORT_USER_SWITCH_COMPLETE_MSG: + dispatchUserSwitchComplete(msg.arg1); + break; + case REPORT_LOCKED_BOOT_COMPLETE_MSG: + dispatchLockedBootComplete(msg.arg1); + break; + case START_USER_SWITCH_UI_MSG: + showUserSwitchDialog((Pair<UserInfo, UserInfo>) msg.obj); + break; + } + return false; + } + @VisibleForTesting static class Injector { private final ActivityManagerService mService; @@ -1681,8 +1827,12 @@ class UserController { return mService; } - protected Handler getHandler() { - return mService.mHandler; + protected Handler getHandler(Handler.Callback callback) { + return new Handler(mService.mHandlerThread.getLooper(), callback); + } + + protected Handler getUiHandler(Handler.Callback callback) { + return new Handler(mService.mUiHandler.getLooper(), callback); } protected Context getContext() { @@ -1740,14 +1890,14 @@ class UserController { mService.mBatteryStatsService.noteEvent(code, name, uid); } - void systemServiceManagerStopUser(int userId) { - mService.mSystemServiceManager.stopUser(userId); - } - boolean isRuntimeRestarted() { return mService.mSystemServiceManager.isRuntimeRestarted(); } + SystemServiceManager getSystemServiceManager() { + return mService.mSystemServiceManager; + } + boolean isFirstBootOrUpgrade() { IPackageManager pm = AppGlobals.getPackageManager(); try { @@ -1788,8 +1938,16 @@ class UserController { mService.clearBroadcastQueueForUserLocked(userId); } - void enforceShellRestriction(String restriction, int userId) { - mService.enforceShellRestriction(restriction, userId); + void loadUserRecentsLocked(int userId) { + mService.mRecentTasks.loadUserRecentsLocked(userId); + } + + void startPersistentApps(int matchFlags) { + mService.startPersistentApps(matchFlags); + } + + void installEncryptionUnawareProviders(int userId) { + mService.installEncryptionUnawareProviders(userId); } void showUserSwitchingDialog(UserInfo fromUser, UserInfo toUser) { diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 91b15912fcb5..11d0470ee8e5 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -6134,12 +6134,12 @@ public class AudioService extends IAudioService.Stub private int mSafeMediaVolumeIndex; // mSafeUsbMediaVolumeIndex is used for USB Headsets and is the music volume UI index // corresponding to a gain of -30 dBFS in audio flinger mixer. - // We remove -15 dBs from the theoretical -15dB to account for the EQ boost when bands are set - // to max gain. + // We remove -22 dBs from the theoretical -15dB to account for the EQ + bass boost + // amplification when both effects are on with all band gains at maximum. // This level corresponds to a loudness of 85 dB SPL for the warning to be displayed when // the headset is compliant to EN 60950 with a max loudness of 100dB SPL. private int mSafeUsbMediaVolumeIndex; - private static final float SAFE_VOLUME_GAIN_DBFS = -30.0f; + private static final float SAFE_VOLUME_GAIN_DBFS = -37.0f; // mSafeMediaVolumeDevices lists the devices for which safe media volume is enforced, private final int mSafeMediaVolumeDevices = AudioSystem.DEVICE_OUT_WIRED_HEADSET | AudioSystem.DEVICE_OUT_WIRED_HEADPHONE | diff --git a/services/core/java/com/android/server/connectivity/IpConnectivityEventBuilder.java b/services/core/java/com/android/server/connectivity/IpConnectivityEventBuilder.java index 22330e66e126..67e72167faa7 100644 --- a/services/core/java/com/android/server/connectivity/IpConnectivityEventBuilder.java +++ b/services/core/java/com/android/server/connectivity/IpConnectivityEventBuilder.java @@ -126,7 +126,7 @@ final public class IpConnectivityEventBuilder { wakeupStats.systemWakeups = in.systemWakeups; wakeupStats.nonApplicationWakeups = in.nonApplicationWakeups; wakeupStats.applicationWakeups = in.applicationWakeups; - wakeupStats.unroutedWakeups = in.unroutedWakeups; + wakeupStats.noUidWakeups = in.noUidWakeups; final IpConnectivityEvent out = buildEvent(0, 0, in.iface); out.setWakeupStats(wakeupStats); return out; diff --git a/services/core/java/com/android/server/connectivity/NetdEventListenerService.java b/services/core/java/com/android/server/connectivity/NetdEventListenerService.java index 6f7ace2f6527..25dba3570e20 100644 --- a/services/core/java/com/android/server/connectivity/NetdEventListenerService.java +++ b/services/core/java/com/android/server/connectivity/NetdEventListenerService.java @@ -170,11 +170,11 @@ public class NetdEventListenerService extends INetdEventListener.Stub { timestampMs = System.currentTimeMillis(); } - addWakupEvent(iface, timestampMs, uid); + addWakeupEvent(iface, timestampMs, uid); } @GuardedBy("this") - private void addWakupEvent(String iface, long timestampMs, int uid) { + private void addWakeupEvent(String iface, long timestampMs, int uid) { int index = wakeupEventIndex(mWakeupEventCursor); mWakeupEventCursor++; WakeupEvent event = new WakeupEvent(); diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 930e4f098f5f..1f03e666d072 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -1441,7 +1441,7 @@ class PackageManagerShellCommand extends ShellCommand { out = session.openWrite(splitName, 0, sizeBytes); int total = 0; - byte[] buffer = new byte[65536]; + byte[] buffer = new byte[1024 * 1024]; int c; while ((c = in.read(buffer)) != -1) { total += c; diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 1d7f66f54faf..d19bf445ef04 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -198,6 +198,7 @@ import android.util.EventLog; import android.util.Log; import android.util.LongSparseArray; import android.util.MutableBoolean; +import android.util.PrintWriterPrinter; import android.util.Slog; import android.util.SparseArray; import android.util.proto.ProtoOutputStream; @@ -296,13 +297,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { static final int LONG_PRESS_POWER_SHUT_OFF = 2; static final int LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM = 3; - static final int LONG_PRESS_BACK_NOTHING = 0; - static final int LONG_PRESS_BACK_GO_TO_VOICE_ASSIST = 1; - static final int MULTI_PRESS_POWER_NOTHING = 0; static final int MULTI_PRESS_POWER_THEATER_MODE = 1; static final int MULTI_PRESS_POWER_BRIGHTNESS_BOOST = 2; + static final int LONG_PRESS_BACK_NOTHING = 0; + static final int LONG_PRESS_BACK_GO_TO_VOICE_ASSIST = 1; + // Number of presses needed before we induce panic press behavior on the back button static final int PANIC_PRESS_BACK_COUNT = 4; static final int PANIC_PRESS_BACK_NOTHING = 0; @@ -565,7 +566,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { int mLongPressOnBackBehavior; int mPanicPressOnBackBehavior; int mShortPressOnSleepBehavior; - int mShortPressWindowBehavior; + int mShortPressOnWindowBehavior; volatile boolean mAwake; boolean mScreenOnEarly; boolean mScreenOnFully; @@ -2180,9 +2181,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { mDoubleTapOnHomeBehavior = LONG_PRESS_HOME_NOTHING; } - mShortPressWindowBehavior = SHORT_PRESS_WINDOW_NOTHING; + mShortPressOnWindowBehavior = SHORT_PRESS_WINDOW_NOTHING; if (mContext.getPackageManager().hasSystemFeature(FEATURE_PICTURE_IN_PICTURE)) { - mShortPressWindowBehavior = SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE; + mShortPressOnWindowBehavior = SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE; } mNavBarOpacityMode = res.getInteger( @@ -6276,7 +6277,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { break; } case KeyEvent.KEYCODE_WINDOW: { - if (mShortPressWindowBehavior == SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE) { + if (mShortPressOnWindowBehavior == SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE) { if (mPictureInPictureVisible) { // Consumes the key only if picture-in-picture is visible to show // picture-in-picture control menu. This gives a chance to the foreground @@ -8323,9 +8324,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { pw.print(prefix); pw.print("mSafeMode="); pw.print(mSafeMode); pw.print(" mSystemReady="); pw.print(mSystemReady); pw.print(" mSystemBooted="); pw.println(mSystemBooted); - pw.print(prefix); pw.print("mLidState="); pw.print(mLidState); - pw.print(" mLidOpenRotation="); pw.print(mLidOpenRotation); - pw.print(" mCameraLensCoverState="); pw.print(mCameraLensCoverState); + pw.print(prefix); pw.print("mLidState="); + pw.print(WindowManagerFuncs.lidStateToString(mLidState)); + pw.print(" mLidOpenRotation="); + pw.println(Surface.rotationToString(mLidOpenRotation)); + pw.print(prefix); pw.print("mCameraLensCoverState="); + pw.print(WindowManagerFuncs.cameraLensStateToString(mCameraLensCoverState)); pw.print(" mHdmiPlugged="); pw.println(mHdmiPlugged); if (mLastSystemUiFlags != 0 || mResettingSystemUiFlags != 0 || mForceClearedSystemUiFlags != 0) { @@ -8343,16 +8347,24 @@ public class PhoneWindowManager implements WindowManagerPolicy { pw.print(prefix); pw.print("mWakeGestureEnabledSetting="); pw.println(mWakeGestureEnabledSetting); - pw.print(prefix); pw.print("mSupportAutoRotation="); pw.println(mSupportAutoRotation); - pw.print(prefix); pw.print("mUiMode="); pw.print(mUiMode); - pw.print(" mDockMode="); pw.print(mDockMode); - pw.print(" mEnableCarDockHomeCapture="); pw.print(mEnableCarDockHomeCapture); - pw.print(" mCarDockRotation="); pw.print(mCarDockRotation); - pw.print(" mDeskDockRotation="); pw.println(mDeskDockRotation); - pw.print(prefix); pw.print("mUserRotationMode="); pw.print(mUserRotationMode); - pw.print(" mUserRotation="); pw.print(mUserRotation); - pw.print(" mAllowAllRotations="); pw.println(mAllowAllRotations); - pw.print(prefix); pw.print("mCurrentAppOrientation="); pw.println(mCurrentAppOrientation); + pw.print(prefix); + pw.print("mSupportAutoRotation="); pw.print(mSupportAutoRotation); + pw.print(" mOrientationSensorEnabled="); pw.println(mOrientationSensorEnabled); + pw.print(prefix); pw.print("mUiMode="); pw.print(Configuration.uiModeToString(mUiMode)); + pw.print(" mDockMode="); pw.println(Intent.dockStateToString(mDockMode)); + pw.print(prefix); pw.print("mEnableCarDockHomeCapture="); + pw.print(mEnableCarDockHomeCapture); + pw.print(" mCarDockRotation="); + pw.print(Surface.rotationToString(mCarDockRotation)); + pw.print(" mDeskDockRotation="); + pw.println(Surface.rotationToString(mDeskDockRotation)); + pw.print(prefix); pw.print("mUserRotationMode="); + pw.print(WindowManagerPolicy.userRotationModeToString(mUserRotationMode)); + pw.print(" mUserRotation="); pw.print(Surface.rotationToString(mUserRotation)); + pw.print(" mAllowAllRotations="); + pw.println(allowAllRotationsToString(mAllowAllRotations)); + pw.print(prefix); pw.print("mCurrentAppOrientation="); + pw.println(ActivityInfo.screenOrientationToString(mCurrentAppOrientation)); pw.print(prefix); pw.print("mCarDockEnablesAccelerometer="); pw.print(mCarDockEnablesAccelerometer); pw.print(" mDeskDockEnablesAccelerometer="); @@ -8361,23 +8373,54 @@ public class PhoneWindowManager implements WindowManagerPolicy { pw.print(mLidKeyboardAccessibility); pw.print(" mLidNavigationAccessibility="); pw.print(mLidNavigationAccessibility); pw.print(" mLidControlsScreenLock="); pw.println(mLidControlsScreenLock); - pw.print(" mLidControlsSleep="); pw.println(mLidControlsSleep); + pw.print(prefix); pw.print("mLidControlsSleep="); pw.println(mLidControlsSleep); + pw.print(prefix); + pw.print("mLongPressOnBackBehavior="); + pw.println(longPressOnBackBehaviorToString(mLongPressOnBackBehavior)); + pw.print(prefix); + pw.print("mPanicPressOnBackBehavior="); + pw.println(panicPressOnBackBehaviorToString(mPanicPressOnBackBehavior)); + pw.print(prefix); + pw.print("mLongPressOnHomeBehavior="); + pw.println(longPressOnHomeBehaviorToString(mLongPressOnHomeBehavior)); + pw.print(prefix); + pw.print("mDoubleTapOnHomeBehavior="); + pw.println(doubleTapOnHomeBehaviorToString(mDoubleTapOnHomeBehavior)); + pw.print(prefix); + pw.print("mShortPressOnPowerBehavior="); + pw.println(shortPressOnPowerBehaviorToString(mShortPressOnPowerBehavior)); pw.print(prefix); - pw.print(" mLongPressOnBackBehavior="); pw.println(mLongPressOnBackBehavior); + pw.print("mLongPressOnPowerBehavior="); + pw.println(longPressOnPowerBehaviorToString(mLongPressOnPowerBehavior)); pw.print(prefix); - pw.print("mShortPressOnPowerBehavior="); pw.print(mShortPressOnPowerBehavior); - pw.print(" mLongPressOnPowerBehavior="); pw.println(mLongPressOnPowerBehavior); + pw.print("mDoublePressOnPowerBehavior="); + pw.println(multiPressOnPowerBehaviorToString(mDoublePressOnPowerBehavior)); pw.print(prefix); - pw.print("mDoublePressOnPowerBehavior="); pw.print(mDoublePressOnPowerBehavior); - pw.print(" mTriplePressOnPowerBehavior="); pw.println(mTriplePressOnPowerBehavior); - pw.print(prefix); pw.print("mHasSoftInput="); pw.println(mHasSoftInput); - pw.print(prefix); pw.print("mAwake="); pw.println(mAwake); - pw.print(prefix); pw.print("mScreenOnEarly="); pw.print(mScreenOnEarly); + pw.print("mTriplePressOnPowerBehavior="); + pw.println(multiPressOnPowerBehaviorToString(mTriplePressOnPowerBehavior)); + pw.print(prefix); + pw.print("mShortPressOnSleepBehavior="); + pw.println(shortPressOnSleepBehaviorToString(mShortPressOnSleepBehavior)); + pw.print(prefix); + pw.print("mShortPressOnWindowBehavior="); + pw.println(shortPressOnWindowBehaviorToString(mShortPressOnWindowBehavior)); + pw.print(prefix); + pw.print("mHasSoftInput="); pw.print(mHasSoftInput); + pw.print(" mDismissImeOnBackKeyPressed="); pw.println(mDismissImeOnBackKeyPressed); + pw.print(prefix); + pw.print("mIncallPowerBehavior="); + pw.print(incallPowerBehaviorToString(mIncallPowerBehavior)); + pw.print(" mIncallBackBehavior="); + pw.print(incallBackBehaviorToString(mIncallBackBehavior)); + pw.print(" mEndcallBehavior="); + pw.println(endcallBehaviorToString(mEndcallBehavior)); + pw.print(prefix); pw.print("mHomePressed="); pw.println(mHomePressed); + pw.print(prefix); + pw.print("mAwake="); pw.print(mAwake); + pw.print("mScreenOnEarly="); pw.print(mScreenOnEarly); pw.print(" mScreenOnFully="); pw.println(mScreenOnFully); pw.print(prefix); pw.print("mKeyguardDrawComplete="); pw.print(mKeyguardDrawComplete); pw.print(" mWindowManagerDrawComplete="); pw.println(mWindowManagerDrawComplete); - pw.print(prefix); pw.print("mOrientationSensorEnabled="); - pw.println(mOrientationSensorEnabled); pw.print(prefix); pw.print("mOverscanScreen=("); pw.print(mOverscanScreenLeft); pw.print(","); pw.print(mOverscanScreenTop); pw.print(") "); pw.print(mOverscanScreenWidth); @@ -8443,8 +8486,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { pw.print(prefix); pw.print("mLastInputMethodTargetWindow="); pw.println(mLastInputMethodTargetWindow); } - pw.print(prefix); pw.print("mDismissImeOnBackKeyPressed="); - pw.println(mDismissImeOnBackKeyPressed); if (mStatusBar != null) { pw.print(prefix); pw.print("mStatusBar="); pw.print(mStatusBar); pw.print(" isStatusBarKeyguard="); @@ -8477,26 +8518,28 @@ public class PhoneWindowManager implements WindowManagerPolicy { } pw.print(prefix); pw.print("mTopIsFullscreen="); pw.print(mTopIsFullscreen); pw.print(" mKeyguardOccluded="); pw.println(mKeyguardOccluded); - pw.print(" mKeyguardOccludedChanged="); pw.println(mKeyguardOccludedChanged); + pw.print(prefix); + pw.print("mKeyguardOccludedChanged="); pw.print(mKeyguardOccludedChanged); pw.print(" mPendingKeyguardOccluded="); pw.println(mPendingKeyguardOccluded); pw.print(prefix); pw.print("mForceStatusBar="); pw.print(mForceStatusBar); pw.print(" mForceStatusBarFromKeyguard="); pw.println(mForceStatusBarFromKeyguard); - pw.print(prefix); pw.print("mHomePressed="); pw.println(mHomePressed); pw.print(prefix); pw.print("mAllowLockscreenWhenOn="); pw.print(mAllowLockscreenWhenOn); pw.print(" mLockScreenTimeout="); pw.print(mLockScreenTimeout); pw.print(" mLockScreenTimerActive="); pw.println(mLockScreenTimerActive); - pw.print(prefix); pw.print("mEndcallBehavior="); pw.print(mEndcallBehavior); - pw.print(" mIncallPowerBehavior="); pw.print(mIncallPowerBehavior); - pw.print(" mIncallBackBehavior="); pw.print(mIncallBackBehavior); - pw.print(" mLongPressOnHomeBehavior="); pw.println(mLongPressOnHomeBehavior); - pw.print(prefix); pw.print("mLandscapeRotation="); pw.print(mLandscapeRotation); - pw.print(" mSeascapeRotation="); pw.println(mSeascapeRotation); - pw.print(prefix); pw.print("mPortraitRotation="); pw.print(mPortraitRotation); - pw.print(" mUpsideDownRotation="); pw.println(mUpsideDownRotation); - pw.print(prefix); pw.print("mDemoHdmiRotation="); pw.print(mDemoHdmiRotation); + pw.print(prefix); pw.print("mLandscapeRotation="); + pw.print(Surface.rotationToString(mLandscapeRotation)); + pw.print(" mSeascapeRotation="); + pw.println(Surface.rotationToString(mSeascapeRotation)); + pw.print(prefix); pw.print("mPortraitRotation="); + pw.print(Surface.rotationToString(mPortraitRotation)); + pw.print(" mUpsideDownRotation="); + pw.println(Surface.rotationToString(mUpsideDownRotation)); + pw.print(prefix); pw.print("mDemoHdmiRotation="); + pw.print(Surface.rotationToString(mDemoHdmiRotation)); pw.print(" mDemoHdmiRotationLock="); pw.println(mDemoHdmiRotationLock); - pw.print(prefix); pw.print("mUndockedHdmiRotation="); pw.println(mUndockedHdmiRotation); + pw.print(prefix); pw.print("mUndockedHdmiRotation="); + pw.println(Surface.rotationToString(mUndockedHdmiRotation)); if (mHasFeatureLeanback) { pw.print(prefix); pw.print("mAccessibilityTvKey1Pressed="); pw.println(mAccessibilityTvKey1Pressed); @@ -8523,5 +8566,169 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (mKeyguardDelegate != null) { mKeyguardDelegate.dump(prefix, pw); } + + pw.print(prefix); pw.println("Looper state:"); + mHandler.getLooper().dump(new PrintWriterPrinter(pw), prefix + " "); + } + + private static String allowAllRotationsToString(int allowAll) { + switch (allowAll) { + case -1: + return "unknown"; + case 0: + return "false"; + case 1: + return "true"; + default: + return Integer.toString(allowAll); + } + } + + private static String endcallBehaviorToString(int behavior) { + StringBuilder sb = new StringBuilder(); + if ((behavior & Settings.System.END_BUTTON_BEHAVIOR_HOME) != 0 ) { + sb.append("home|"); + } + if ((behavior & Settings.System.END_BUTTON_BEHAVIOR_SLEEP) != 0) { + sb.append("sleep|"); + } + + final int N = sb.length(); + if (N == 0) { + return "<nothing>"; + } else { + // Chop off the trailing '|' + return sb.substring(0, N - 1); + } + } + + private static String incallPowerBehaviorToString(int behavior) { + if ((behavior & Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0) { + return "hangup"; + } else { + return "sleep"; + } + } + + private static String incallBackBehaviorToString(int behavior) { + if ((behavior & Settings.Secure.INCALL_BACK_BUTTON_BEHAVIOR_HANGUP) != 0) { + return "hangup"; + } else { + return "<nothing>"; + } + } + + private static String longPressOnBackBehaviorToString(int behavior) { + switch (behavior) { + case LONG_PRESS_BACK_NOTHING: + return "LONG_PRESS_BACK_NOTHING"; + case LONG_PRESS_BACK_GO_TO_VOICE_ASSIST: + return "LONG_PRESS_BACK_GO_TO_VOICE_ASSIST"; + default: + return Integer.toString(behavior); + } + } + + private static String panicPressOnBackBehaviorToString(int behavior) { + switch (behavior) { + case PANIC_PRESS_BACK_NOTHING: + return "PANIC_PRESS_BACK_NOTHING"; + case PANIC_PRESS_BACK_HOME: + return "PANIC_PRESS_BACK_HOME"; + default: + return Integer.toString(behavior); + } + } + + private static String longPressOnHomeBehaviorToString(int behavior) { + switch (behavior) { + case LONG_PRESS_HOME_NOTHING: + return "LONG_PRESS_HOME_NOTHING"; + case LONG_PRESS_HOME_ALL_APPS: + return "LONG_PRESS_HOME_ALL_APPS"; + case LONG_PRESS_HOME_ASSIST: + return "LONG_PRESS_HOME_ASSIST"; + default: + return Integer.toString(behavior); + } + } + + private static String doubleTapOnHomeBehaviorToString(int behavior) { + switch (behavior) { + case DOUBLE_TAP_HOME_NOTHING: + return "DOUBLE_TAP_HOME_NOTHING"; + case DOUBLE_TAP_HOME_RECENT_SYSTEM_UI: + return "DOUBLE_TAP_HOME_RECENT_SYSTEM_UI"; + default: + return Integer.toString(behavior); + } + } + + private static String shortPressOnPowerBehaviorToString(int behavior) { + switch (behavior) { + case SHORT_PRESS_POWER_NOTHING: + return "SHORT_PRESS_POWER_NOTHING"; + case SHORT_PRESS_POWER_GO_TO_SLEEP: + return "SHORT_PRESS_POWER_GO_TO_SLEEP"; + case SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP: + return "SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP"; + case SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP_AND_GO_HOME: + return "SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP_AND_GO_HOME"; + case SHORT_PRESS_POWER_GO_HOME: + return "SHORT_PRESS_POWER_GO_HOME"; + case SHORT_PRESS_POWER_CLOSE_IME_OR_GO_HOME: + return "SHORT_PRESS_POWER_CLOSE_IME_OR_GO_HOME"; + default: + return Integer.toString(behavior); + } + } + + private static String longPressOnPowerBehaviorToString(int behavior) { + switch (behavior) { + case LONG_PRESS_POWER_NOTHING: + return "LONG_PRESS_POWER_NOTHING"; + case LONG_PRESS_POWER_GLOBAL_ACTIONS: + return "LONG_PRESS_POWER_GLOBAL_ACTIONS"; + case LONG_PRESS_POWER_SHUT_OFF: + return "LONG_PRESS_POWER_SHUT_OFF"; + case LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM: + return "LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM"; + default: + return Integer.toString(behavior); + } + } + private static String multiPressOnPowerBehaviorToString(int behavior) { + switch (behavior) { + case MULTI_PRESS_POWER_NOTHING: + return "MULTI_PRESS_POWER_NOTHING"; + case MULTI_PRESS_POWER_THEATER_MODE: + return "MULTI_PRESS_POWER_THEATER_MODE"; + case MULTI_PRESS_POWER_BRIGHTNESS_BOOST: + return "MULTI_PRESS_POWER_BRIGHTNESS_BOOST"; + default: + return Integer.toString(behavior); + } + } + + private static String shortPressOnSleepBehaviorToString(int behavior) { + switch (behavior) { + case SHORT_PRESS_SLEEP_GO_TO_SLEEP: + return "SHORT_PRESS_SLEEP_GO_TO_SLEEP"; + case SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME: + return "SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME"; + default: + return Integer.toString(behavior); + } + } + + private static String shortPressOnWindowBehaviorToString(int behavior) { + switch (behavior) { + case SHORT_PRESS_WINDOW_NOTHING: + return "SHORT_PRESS_WINDOW_NOTHING"; + case SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE: + return "SHORT_PRESS_WINDOW_PICTURE_IN_PICTURE"; + default: + return Integer.toString(behavior); + } } } diff --git a/services/core/java/com/android/server/policy/WindowOrientationListener.java b/services/core/java/com/android/server/policy/WindowOrientationListener.java index 64f64c0d45d6..169fd278f665 100644 --- a/services/core/java/com/android/server/policy/WindowOrientationListener.java +++ b/services/core/java/com/android/server/policy/WindowOrientationListener.java @@ -26,6 +26,7 @@ import android.os.SystemClock; import android.os.SystemProperties; import android.text.TextUtils; import android.util.Slog; +import android.view.Surface; import java.io.PrintWriter; import java.util.Arrays; @@ -236,7 +237,7 @@ public abstract class WindowOrientationListener { pw.println(prefix + TAG); prefix += " "; pw.println(prefix + "mEnabled=" + mEnabled); - pw.println(prefix + "mCurrentRotation=" + mCurrentRotation); + pw.println(prefix + "mCurrentRotation=" + Surface.rotationToString(mCurrentRotation)); pw.println(prefix + "mSensorType=" + mSensorType); pw.println(prefix + "mSensor=" + mSensor); pw.println(prefix + "mRate=" + mRate); @@ -1026,8 +1027,9 @@ public abstract class WindowOrientationListener { public void dumpLocked(PrintWriter pw, String prefix) { pw.println(prefix + "OrientationSensorJudge"); prefix += " "; - pw.println(prefix + "mDesiredRotation=" + mDesiredRotation); - pw.println(prefix + "mProposedRotation=" + mProposedRotation); + pw.println(prefix + "mDesiredRotation=" + Surface.rotationToString(mDesiredRotation)); + pw.println(prefix + "mProposedRotation=" + + Surface.rotationToString(mProposedRotation)); pw.println(prefix + "mTouching=" + mTouching); pw.println(prefix + "mTouchEndedTimestampNanos=" + mTouchEndedTimestampNanos); } diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java index 50e5e7bd2312..70cd54ffd09d 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java @@ -1,5 +1,7 @@ package com.android.server.policy.keyguard; +import static android.view.Display.INVALID_DISPLAY; + import android.app.ActivityManager; import android.content.ComponentName; import android.content.Context; @@ -13,6 +15,7 @@ import android.os.RemoteException; import android.os.UserHandle; import android.util.Log; import android.util.Slog; +import android.view.WindowManagerPolicy; import android.view.WindowManagerPolicy.OnKeyguardExitResult; import com.android.internal.policy.IKeyguardDismissCallback; @@ -201,7 +204,10 @@ public class KeyguardServiceDelegate { mKeyguardState.reset(); mHandler.post(() -> { try { - ActivityManager.getService().setLockScreenShown(true); + // There are no longer any keyguard windows on secondary displays, so pass + // INVALID_DISPLAY. All that means is that showWhenLocked activities on + // secondary displays now get to show. + ActivityManager.getService().setLockScreenShown(true, INVALID_DISPLAY); } catch (RemoteException e) { // Local call. } @@ -412,13 +418,45 @@ public class KeyguardServiceDelegate { pw.println(prefix + "systemIsReady=" + mKeyguardState.systemIsReady); pw.println(prefix + "deviceHasKeyguard=" + mKeyguardState.deviceHasKeyguard); pw.println(prefix + "enabled=" + mKeyguardState.enabled); - pw.println(prefix + "offReason=" + mKeyguardState.offReason); + pw.println(prefix + "offReason=" + + WindowManagerPolicy.offReasonToString(mKeyguardState.offReason)); pw.println(prefix + "currentUser=" + mKeyguardState.currentUser); pw.println(prefix + "bootCompleted=" + mKeyguardState.bootCompleted); - pw.println(prefix + "screenState=" + mKeyguardState.screenState); - pw.println(prefix + "interactiveState=" + mKeyguardState.interactiveState); + pw.println(prefix + "screenState=" + screenStateToString(mKeyguardState.screenState)); + pw.println(prefix + "interactiveState=" + + interactiveStateToString(mKeyguardState.interactiveState)); if (mKeyguardService != null) { mKeyguardService.dump(prefix, pw); } } + + private static String screenStateToString(int screen) { + switch (screen) { + case SCREEN_STATE_OFF: + return "SCREEN_STATE_OFF"; + case SCREEN_STATE_TURNING_ON: + return "SCREEN_STATE_TURNING_ON"; + case SCREEN_STATE_ON: + return "SCREEN_STATE_ON"; + case SCREEN_STATE_TURNING_OFF: + return "SCREEN_STATE_TURNING_OFF"; + default: + return Integer.toString(screen); + } + } + + private static String interactiveStateToString(int interactive) { + switch (interactive) { + case INTERACTIVE_STATE_SLEEP: + return "INTERACTIVE_STATE_SLEEP"; + case INTERACTIVE_STATE_WAKING: + return "INTERACTIVE_STATE_WAKING"; + case INTERACTIVE_STATE_AWAKE: + return "INTERACTIVE_STATE_AWAKE"; + case INTERACTIVE_STATE_GOING_TO_SLEEP: + return "INTERACTIVE_STATE_GOING_TO_SLEEP"; + default: + return Integer.toString(interactive); + } + } } diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 3b701302aae1..12ca89a93d02 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -120,7 +120,7 @@ public final class PowerManagerService extends SystemService implements Watchdog.Monitor { private static final String TAG = "PowerManagerService"; - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; private static final boolean DEBUG_SPEW = DEBUG && true; // Message: Sent when a user activity timeout occurs to update the power state. @@ -1569,12 +1569,15 @@ public final class PowerManagerService extends SystemService return true; } - private void setWakefulnessLocked(int wakefulness, int reason) { + @VisibleForTesting + void setWakefulnessLocked(int wakefulness, int reason) { if (mWakefulness != wakefulness) { mWakefulness = wakefulness; mWakefulnessChanging = true; mDirty |= DIRTY_WAKEFULNESS; - mNotifier.onWakefulnessChangeStarted(wakefulness, reason); + if (mNotifier != null) { + mNotifier.onWakefulnessChangeStarted(wakefulness, reason); + } } } @@ -2432,11 +2435,8 @@ public final class PowerManagerService extends SystemService return value >= -1.0f && value <= 1.0f; } - private int getDesiredScreenPolicyLocked() { - if (mIsVrModeEnabled) { - return DisplayPowerRequest.POLICY_VR; - } - + @VisibleForTesting + int getDesiredScreenPolicyLocked() { if (mWakefulness == WAKEFULNESS_ASLEEP || sQuiescent) { return DisplayPowerRequest.POLICY_OFF; } @@ -2452,6 +2452,13 @@ public final class PowerManagerService extends SystemService // doze after screen off. This causes the screen off transition to be skipped. } + // It is important that POLICY_VR check happens after the wakefulness checks above so + // that VR-mode does not prevent displays from transitioning to the correct state when + // dozing or sleeping. + if (mIsVrModeEnabled) { + return DisplayPowerRequest.POLICY_VR; + } + if ((mWakeLockSummary & WAKE_LOCK_SCREEN_BRIGHT) != 0 || (mUserActivitySummary & USER_ACTIVITY_SCREEN_BRIGHT) != 0 || !mBootCompleted @@ -3113,6 +3120,11 @@ public final class PowerManagerService extends SystemService } } + @VisibleForTesting + void setVrModeEnabled(boolean enabled) { + mIsVrModeEnabled = enabled; + } + private void powerHintInternal(int hintId, int data) { nativeSendPowerHint(hintId, data); } @@ -3810,7 +3822,7 @@ public final class PowerManagerService extends SystemService synchronized (mLock) { if (mIsVrModeEnabled != enabled) { - mIsVrModeEnabled = enabled; + setVrModeEnabled(enabled); mDirty |= DIRTY_VR_MODE_CHANGED; updatePowerStateLocked(); } diff --git a/services/core/java/com/android/server/timezone/IntentHelper.java b/services/core/java/com/android/server/timezone/IntentHelper.java index 0cb90657480e..5de543213009 100644 --- a/services/core/java/com/android/server/timezone/IntentHelper.java +++ b/services/core/java/com/android/server/timezone/IntentHelper.java @@ -23,15 +23,22 @@ package com.android.server.timezone; */ interface IntentHelper { - void initialize(String updateAppPackageName, String dataAppPackageName, Listener listener); + void initialize(String updateAppPackageName, String dataAppPackageName, + PackageTracker packageTracker); void sendTriggerUpdateCheck(CheckToken checkToken); - void enableReliabilityTriggering(); + /** + * Schedule a "reliability trigger" after at least minimumDelayMillis, replacing any existing + * scheduled one. A reliability trigger ensures that the {@link PackageTracker} can pick up + * reliably if a previous update check did not complete for some reason. It can happen when + * the device is idle. The trigger is expected to call + * {@link PackageTracker#triggerUpdateIfNeeded(boolean)} with a {@code false} value. + */ + void scheduleReliabilityTrigger(long minimumDelayMillis); - void disableReliabilityTriggering(); - - interface Listener { - void triggerUpdateIfNeeded(boolean packageUpdated); - } + /** + * Make sure there is no reliability trigger scheduled. No-op if there wasn't one. + */ + void unscheduleReliabilityTrigger(); } diff --git a/services/core/java/com/android/server/timezone/IntentHelperImpl.java b/services/core/java/com/android/server/timezone/IntentHelperImpl.java index 6db70cd870db..bc0f6e4b283b 100644 --- a/services/core/java/com/android/server/timezone/IntentHelperImpl.java +++ b/services/core/java/com/android/server/timezone/IntentHelperImpl.java @@ -36,16 +36,13 @@ final class IntentHelperImpl implements IntentHelper { private final Context mContext; private String mUpdaterAppPackageName; - private boolean mReliabilityReceiverEnabled; - private Receiver mReliabilityReceiver; - IntentHelperImpl(Context context) { mContext = context; } @Override - public void initialize( - String updaterAppPackageName, String dataAppPackageName, Listener listener) { + public void initialize(String updaterAppPackageName, String dataAppPackageName, + PackageTracker packageTracker) { mUpdaterAppPackageName = updaterAppPackageName; // Register for events of interest. @@ -78,10 +75,8 @@ final class IntentHelperImpl implements IntentHelper { // We do not register for ACTION_PACKAGE_DATA_CLEARED because the updater / data apps are // not expected to need local data. - Receiver packageUpdateReceiver = new Receiver(listener, true /* packageUpdated */); + Receiver packageUpdateReceiver = new Receiver(packageTracker); mContext.registerReceiver(packageUpdateReceiver, packageIntentFilter); - - mReliabilityReceiver = new Receiver(listener, false /* packageUpdated */); } /** Sends an intent to trigger an update check. */ @@ -93,39 +88,26 @@ final class IntentHelperImpl implements IntentHelper { } @Override - public synchronized void enableReliabilityTriggering() { - if (!mReliabilityReceiverEnabled) { - // The intent filter that exists to make updates reliable in the event of failures / - // reboots. - IntentFilter reliabilityIntentFilter = new IntentFilter(); - reliabilityIntentFilter.addAction(Intent.ACTION_IDLE_MAINTENANCE_START); - mContext.registerReceiver(mReliabilityReceiver, reliabilityIntentFilter); - mReliabilityReceiverEnabled = true; - } + public synchronized void scheduleReliabilityTrigger(long minimumDelayMillis) { + TimeZoneUpdateIdler.schedule(mContext, minimumDelayMillis); } @Override - public synchronized void disableReliabilityTriggering() { - if (mReliabilityReceiverEnabled) { - mContext.unregisterReceiver(mReliabilityReceiver); - mReliabilityReceiverEnabled = false; - } + public synchronized void unscheduleReliabilityTrigger() { + TimeZoneUpdateIdler.unschedule(mContext); } private static class Receiver extends BroadcastReceiver { - private final Listener mListener; - private final boolean mPackageUpdated; + private final PackageTracker mPackageTracker; - private Receiver(Listener listener, boolean packageUpdated) { - mListener = listener; - mPackageUpdated = packageUpdated; + private Receiver(PackageTracker packageTracker) { + mPackageTracker = packageTracker; } @Override public void onReceive(Context context, Intent intent) { Slog.d(TAG, "Received intent: " + intent.toString()); - mListener.triggerUpdateIfNeeded(mPackageUpdated); + mPackageTracker.triggerUpdateIfNeeded(true /* packageChanged */); } } - } diff --git a/services/core/java/com/android/server/timezone/PackageTracker.java b/services/core/java/com/android/server/timezone/PackageTracker.java index 24e0fe4841bc..f0306b9b0c38 100644 --- a/services/core/java/com/android/server/timezone/PackageTracker.java +++ b/services/core/java/com/android/server/timezone/PackageTracker.java @@ -51,7 +51,7 @@ import java.io.PrintWriter; */ // Also made non-final so it can be mocked. @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) -public class PackageTracker implements IntentHelper.Listener { +public class PackageTracker { private static final String TAG = "timezone.PackageTracker"; private final PackageManagerHelper mPackageManagerHelper; @@ -72,6 +72,13 @@ public class PackageTracker implements IntentHelper.Listener { // The number of failed checks in a row before reliability checks should stop happening. private long mFailedCheckRetryCount; + /* + * The minimum delay between a successive reliability triggers / other operations. Should to be + * larger than mCheckTimeAllowedMillis to avoid reliability triggers happening during package + * update checks. + */ + private int mDelayBeforeReliabilityCheckMillis; + // Reliability check state: If a check was triggered but not acknowledged within // mCheckTimeAllowedMillis then another one can be triggered. private Long mLastTriggerTimestamp = null; @@ -122,6 +129,7 @@ public class PackageTracker implements IntentHelper.Listener { mDataAppPackageName = mConfigHelper.getDataAppPackageName(); mCheckTimeAllowedMillis = mConfigHelper.getCheckTimeAllowedMillis(); mFailedCheckRetryCount = mConfigHelper.getFailedCheckRetryCount(); + mDelayBeforeReliabilityCheckMillis = mCheckTimeAllowedMillis + (60 * 1000); // Validate the device configuration including the application packages. // The manifest entries in the apps themselves are not validated until use as they can @@ -135,9 +143,10 @@ public class PackageTracker implements IntentHelper.Listener { // Initialize the intent helper. mIntentHelper.initialize(mUpdateAppPackageName, mDataAppPackageName, this); - // Enable the reliability triggering so we will have at least one reliability trigger if - // a package isn't updated. - mIntentHelper.enableReliabilityTriggering(); + // Schedule a reliability trigger so we will have at least one after boot. This will allow + // us to catch if a package updated wasn't handled to completion. There's no hurry: it's ok + // to delay for a while before doing this even if idle. + mIntentHelper.scheduleReliabilityTrigger(mDelayBeforeReliabilityCheckMillis); Slog.i(TAG, "Time zone updater / data package tracking enabled"); } @@ -195,7 +204,6 @@ public class PackageTracker implements IntentHelper.Listener { * @param packageChanged true if this method was called because a known packaged definitely * changed, false if the cause is a reliability trigger */ - @Override public synchronized void triggerUpdateIfNeeded(boolean packageChanged) { if (!mTrackingEnabled) { throw new IllegalStateException("Unexpected call. Tracking is disabled."); @@ -212,8 +220,8 @@ public class PackageTracker implements IntentHelper.Listener { + " updaterApp=" + updaterAppManifestValid + ", dataApp=" + dataAppManifestValid); - // There's no point in doing reliability checks if the current packages are bad. - mIntentHelper.disableReliabilityTriggering(); + // There's no point in doing any reliability triggers if the current packages are bad. + mIntentHelper.unscheduleReliabilityTrigger(); return; } @@ -238,7 +246,8 @@ public class PackageTracker implements IntentHelper.Listener { Slog.d(TAG, "triggerUpdateIfNeeded: checkComplete call is not yet overdue." + " Not triggering."); - // Not doing any work, but also not disabling future reliability triggers. + // Don't do any work now but we do schedule a future reliability trigger. + mIntentHelper.scheduleReliabilityTrigger(mDelayBeforeReliabilityCheckMillis); return; } } else if (mCheckFailureCount > mFailedCheckRetryCount) { @@ -247,13 +256,13 @@ public class PackageTracker implements IntentHelper.Listener { Slog.i(TAG, "triggerUpdateIfNeeded: number of allowed consecutive check failures" + " exceeded. Stopping reliability triggers until next reboot or package" + " update."); - mIntentHelper.disableReliabilityTriggering(); + mIntentHelper.unscheduleReliabilityTrigger(); return; } else if (mCheckFailureCount == 0) { // Case 4. Slog.i(TAG, "triggerUpdateIfNeeded: No reliability check required. Last check was" + " successful."); - mIntentHelper.disableReliabilityTriggering(); + mIntentHelper.unscheduleReliabilityTrigger(); return; } } @@ -263,7 +272,7 @@ public class PackageTracker implements IntentHelper.Listener { if (currentInstalledVersions == null) { // This should not happen if the device is configured in a valid way. Slog.e(TAG, "triggerUpdateIfNeeded: currentInstalledVersions was null"); - mIntentHelper.disableReliabilityTriggering(); + mIntentHelper.unscheduleReliabilityTrigger(); return; } @@ -288,7 +297,7 @@ public class PackageTracker implements IntentHelper.Listener { // The last check succeeded and nothing has changed. Do nothing and disable // reliability checks. Slog.i(TAG, "triggerUpdateIfNeeded: Prior check succeeded. No need to trigger."); - mIntentHelper.disableReliabilityTriggering(); + mIntentHelper.unscheduleReliabilityTrigger(); return; } } @@ -299,6 +308,8 @@ public class PackageTracker implements IntentHelper.Listener { if (checkToken == null) { Slog.w(TAG, "triggerUpdateIfNeeded: Unable to generate check token." + " Not sending check request."); + // Trigger again later: perhaps we'll have better luck. + mIntentHelper.scheduleReliabilityTrigger(mDelayBeforeReliabilityCheckMillis); return; } @@ -309,9 +320,9 @@ public class PackageTracker implements IntentHelper.Listener { // Update the reliability check state in case the update fails. setCheckInProgress(); - // Enable reliability triggering in case the check doesn't succeed and there is no - // response at all. Enabling reliability triggering is idempotent. - mIntentHelper.enableReliabilityTriggering(); + // Schedule a reliability trigger in case the update check doesn't succeed and there is no + // response at all. It will be cancelled if the check is successful in recordCheckResult. + mIntentHelper.scheduleReliabilityTrigger(mDelayBeforeReliabilityCheckMillis); } /** @@ -370,9 +381,9 @@ public class PackageTracker implements IntentHelper.Listener { + " storage state."); mPackageStatusStorage.resetCheckState(); - // Enable reliability triggering and reset the failure count so we know that the + // Schedule a reliability trigger and reset the failure count so we know that the // next reliability trigger will do something. - mIntentHelper.enableReliabilityTriggering(); + mIntentHelper.scheduleReliabilityTrigger(mDelayBeforeReliabilityCheckMillis); mCheckFailureCount = 0; } else { // This is the expected case when tracking is enabled: a check was triggered and it has @@ -385,13 +396,13 @@ public class PackageTracker implements IntentHelper.Listener { setCheckComplete(); if (success) { - // Since the check was successful, no more reliability checks are required until + // Since the check was successful, no reliability trigger is required until // there is a package change. - mIntentHelper.disableReliabilityTriggering(); + mIntentHelper.unscheduleReliabilityTrigger(); mCheckFailureCount = 0; } else { - // Enable reliability triggering to potentially check again in future. - mIntentHelper.enableReliabilityTriggering(); + // Enable schedule a reliability trigger to check again in future. + mIntentHelper.scheduleReliabilityTrigger(mDelayBeforeReliabilityCheckMillis); mCheckFailureCount++; } } else { @@ -400,8 +411,8 @@ public class PackageTracker implements IntentHelper.Listener { Slog.i(TAG, "recordCheckResult: could not update token=" + checkToken + " with success=" + success + ". Optimistic lock failure"); - // Enable reliability triggering to potentially try again in future. - mIntentHelper.enableReliabilityTriggering(); + // Schedule a reliability trigger to potentially try again in future. + mIntentHelper.scheduleReliabilityTrigger(mDelayBeforeReliabilityCheckMillis); mCheckFailureCount++; } } @@ -515,6 +526,7 @@ public class PackageTracker implements IntentHelper.Listener { ", mUpdateAppPackageName='" + mUpdateAppPackageName + '\'' + ", mDataAppPackageName='" + mDataAppPackageName + '\'' + ", mCheckTimeAllowedMillis=" + mCheckTimeAllowedMillis + + ", mDelayBeforeReliabilityCheckMillis=" + mDelayBeforeReliabilityCheckMillis + ", mFailedCheckRetryCount=" + mFailedCheckRetryCount + ", mLastTriggerTimestamp=" + mLastTriggerTimestamp + ", mCheckTriggered=" + mCheckTriggered + diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java index 3ad4419c7273..6824a597a5f8 100644 --- a/services/core/java/com/android/server/timezone/RulesManagerService.java +++ b/services/core/java/com/android/server/timezone/RulesManagerService.java @@ -69,18 +69,22 @@ public final class RulesManagerService extends IRulesManager.Stub { DistroVersion.CURRENT_FORMAT_MINOR_VERSION); public static class Lifecycle extends SystemService { - private RulesManagerService mService; - public Lifecycle(Context context) { super(context); } @Override public void onStart() { - mService = RulesManagerService.create(getContext()); - mService.start(); + RulesManagerService service = RulesManagerService.create(getContext()); + service.start(); + + // Publish the binder service so it can be accessed from other (appropriately + // permissioned) processes. + publishBinderService(Context.TIME_ZONE_RULES_MANAGER_SERVICE, service); - publishBinderService(Context.TIME_ZONE_RULES_MANAGER_SERVICE, mService); + // Publish the service instance locally so we can use it directly from within the system + // server from TimeZoneUpdateIdler. + publishLocalService(RulesManagerService.class, service); } } @@ -496,6 +500,16 @@ public final class RulesManagerService extends IRulesManager.Stub { mPackageTracker.dump(pw); } + /** + * Called when the device is considered idle. + */ + void notifyIdle() { + // No package has changed: we are just triggering because the device is idle and there + // *might* be work to do. + final boolean packageChanged = false; + mPackageTracker.triggerUpdateIfNeeded(packageChanged); + } + @Override public String toString() { return "RulesManagerService{" + diff --git a/services/core/java/com/android/server/timezone/TimeZoneUpdateIdler.java b/services/core/java/com/android/server/timezone/TimeZoneUpdateIdler.java new file mode 100644 index 000000000000..a7767a4fbd66 --- /dev/null +++ b/services/core/java/com/android/server/timezone/TimeZoneUpdateIdler.java @@ -0,0 +1,100 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.timezone; + +import com.android.server.LocalServices; + +import android.app.job.JobInfo; +import android.app.job.JobParameters; +import android.app.job.JobScheduler; +import android.app.job.JobService; +import android.content.ComponentName; +import android.content.Context; +import android.util.Slog; + +/** + * A JobService used to trigger time zone rules update work when a device falls idle. + */ +public final class TimeZoneUpdateIdler extends JobService { + + private static final String TAG = "timezone.TimeZoneUpdateIdler"; + + /** The static job ID used to handle on-idle work. */ + // Must be unique within UID (system service) + private static final int TIME_ZONE_UPDATE_IDLE_JOB_ID = 27042305; + + @Override + public boolean onStartJob(JobParameters params) { + RulesManagerService rulesManagerService = + LocalServices.getService(RulesManagerService.class); + + Slog.d(TAG, "onStartJob() called"); + + // Note: notifyIdle() explicitly handles canceling / re-scheduling so no need to reschedule + // here. + rulesManagerService.notifyIdle(); + + // Everything is handled synchronously. We are done. + return false; + } + + @Override + public boolean onStopJob(JobParameters params) { + // Reschedule if stopped unless it was cancelled due to unschedule(). + boolean reschedule = params.getStopReason() != JobParameters.REASON_CANCELED; + Slog.d(TAG, "onStopJob() called: Reschedule=" + reschedule); + return reschedule; + } + + /** + * Schedules the TimeZoneUpdateIdler job service to run once. + * + * @param context Context to use to get a job scheduler. + */ + public static void schedule(Context context, long minimumDelayMillis) { + // Request that the JobScheduler tell us when the device falls idle. + JobScheduler jobScheduler = + (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE); + + // The TimeZoneUpdateIdler will send an intent that will trigger the Receiver. + ComponentName idlerJobServiceName = + new ComponentName(context, TimeZoneUpdateIdler.class); + + // We require the device is idle, but also that it is charging to be as non-invasive as + // we can. + JobInfo.Builder jobInfoBuilder = + new JobInfo.Builder(TIME_ZONE_UPDATE_IDLE_JOB_ID, idlerJobServiceName) + .setRequiresDeviceIdle(true) + .setRequiresCharging(true) + .setMinimumLatency(minimumDelayMillis); + + Slog.d(TAG, "schedule() called: minimumDelayMillis=" + minimumDelayMillis); + jobScheduler.schedule(jobInfoBuilder.build()); + } + + /** + * Unschedules the TimeZoneUpdateIdler job service. + * + * @param context Context to use to get a job scheduler. + */ + public static void unschedule(Context context) { + JobScheduler jobScheduler = + (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE); + Slog.d(TAG, "unschedule() called"); + jobScheduler.cancel(TIME_ZONE_UPDATE_IDLE_JOB_ID); + } +} diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index ea2f305989fe..2d1fc912fcfc 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -53,6 +53,7 @@ import static com.android.server.wm.WindowManagerService.logWithStack; import static com.android.server.wm.proto.AppWindowTokenProto.NAME; import static com.android.server.wm.proto.AppWindowTokenProto.WINDOW_TOKEN; +import android.annotation.CallSuper; import android.annotation.NonNull; import android.app.Activity; import android.content.res.Configuration; @@ -1620,8 +1621,9 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } } + @CallSuper @Override - void writeToProto(ProtoOutputStream proto, long fieldId) { + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); writeNameToProto(proto, NAME); super.writeToProto(proto, WINDOW_TOKEN); diff --git a/services/core/java/com/android/server/wm/ConfigurationContainer.java b/services/core/java/com/android/server/wm/ConfigurationContainer.java index 28ba9b3db777..1da94da1b3b6 100644 --- a/services/core/java/com/android/server/wm/ConfigurationContainer.java +++ b/services/core/java/com/android/server/wm/ConfigurationContainer.java @@ -24,9 +24,14 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import static android.app.WindowConfiguration.activityTypeToString; +import static com.android.server.wm.proto.ConfigurationContainerProto.FULL_CONFIGURATION; +import static com.android.server.wm.proto.ConfigurationContainerProto.MERGED_OVERRIDE_CONFIGURATION; +import static com.android.server.wm.proto.ConfigurationContainerProto.OVERRIDE_CONFIGURATION; +import android.annotation.CallSuper; import android.app.WindowConfiguration; import android.content.res.Configuration; +import android.util.proto.ProtoOutputStream; import java.util.ArrayList; @@ -252,6 +257,24 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { } } + /** + * Write to a protocol buffer output stream. Protocol buffer message definition is at + * {@link com.android.server.wm.proto.ConfigurationContainerProto}. + * + * @param protoOutputStream Stream to write the ConfigurationContainer object to. + * @param fieldId Field Id of the ConfigurationContainer as defined in the parent + * message. + * @hide + */ + @CallSuper + public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) { + final long token = protoOutputStream.start(fieldId); + mOverrideConfiguration.writeToProto(protoOutputStream, OVERRIDE_CONFIGURATION); + mFullConfiguration.writeToProto(protoOutputStream, FULL_CONFIGURATION); + mMergedOverrideConfiguration.writeToProto(protoOutputStream, MERGED_OVERRIDE_CONFIGURATION); + protoOutputStream.end(token); + } + abstract protected int getChildCount(); abstract protected E getChildAt(int index); diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 6cf608ab0591..817a01c5c8d7 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -112,7 +112,9 @@ import static com.android.server.wm.proto.DisplayProto.PINNED_STACK_CONTROLLER; import static com.android.server.wm.proto.DisplayProto.ROTATION; import static com.android.server.wm.proto.DisplayProto.SCREEN_ROTATION_ANIMATION; import static com.android.server.wm.proto.DisplayProto.STACKS; +import static com.android.server.wm.proto.DisplayProto.WINDOW_CONTAINER; +import android.annotation.CallSuper; import android.annotation.NonNull; import android.app.ActivityManager.StackId; import android.app.WindowConfiguration; @@ -2119,8 +2121,11 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); proto.write(ID, mDisplayId); for (int stackNdx = mTaskStackContainers.size() - 1; stackNdx >= 0; --stackNdx) { final TaskStack stack = mTaskStackContainers.get(stackNdx); diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 8a749762f993..227e4b2b59af 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import android.annotation.CallSuper; import android.content.res.Configuration; import android.graphics.Rect; import android.hardware.power.V1_0.PowerHint; @@ -89,8 +90,9 @@ import static com.android.server.wm.WindowSurfacePlacer.SET_TURN_ON_SCREEN; import static com.android.server.wm.WindowSurfacePlacer.SET_UPDATE_ROTATION; import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_ACTION_PENDING; import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_MAY_CHANGE; -import static com.android.server.wm.proto.WindowManagerServiceProto.DISPLAYS; -import static com.android.server.wm.proto.WindowManagerServiceProto.WINDOWS; +import static com.android.server.wm.proto.RootWindowContainerProto.DISPLAYS; +import static com.android.server.wm.proto.RootWindowContainerProto.WINDOWS; +import static com.android.server.wm.proto.RootWindowContainerProto.WINDOW_CONTAINER; /** Root {@link WindowContainer} for the device. */ class RootWindowContainer extends WindowContainer<DisplayContent> { @@ -1077,7 +1079,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { } } - void writeToProto(ProtoOutputStream proto) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { + final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); if (mService.mDisplayReady) { final int count = mChildren.size(); for (int i = 0; i < count; ++i) { @@ -1088,6 +1094,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { forAllWindows((w) -> { w.writeIdentifierToProto(proto, WINDOWS); }, true); + proto.end(token); } @Override diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 55b6c912ef90..7464a9b92d40 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -34,7 +34,9 @@ import static com.android.server.wm.proto.TaskProto.BOUNDS; import static com.android.server.wm.proto.TaskProto.FILLS_PARENT; import static com.android.server.wm.proto.TaskProto.ID; import static com.android.server.wm.proto.TaskProto.TEMP_INSET_BOUNDS; +import static com.android.server.wm.proto.TaskProto.WINDOW_CONTAINER; +import android.annotation.CallSuper; import android.app.ActivityManager.StackId; import android.app.ActivityManager.TaskDescription; import android.content.pm.ActivityInfo; @@ -735,8 +737,11 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU return "Task=" + mTaskId; } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); proto.write(ID, mTaskId); for (int i = mChildren.size() - 1; i >= 0; i--) { final AppWindowToken appWindowToken = mChildren.get(i); diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java index 463240228fb6..751769a63d62 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotController.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java @@ -297,7 +297,7 @@ class TaskSnapshotController { return new TaskSnapshot(hwBitmap.createGraphicBufferHandle(), topChild.getConfiguration().orientation, mainWindow.mStableInsets, - false /* reduced */, 1.0f /* scale */); + ActivityManager.isLowRamDeviceStatic() /* reduced */, 1.0f /* scale */); } /** diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 4664dcbbfa75..126d820e69b6 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -41,7 +41,9 @@ import static com.android.server.wm.proto.StackProto.BOUNDS; import static com.android.server.wm.proto.StackProto.FILLS_PARENT; import static com.android.server.wm.proto.StackProto.ID; import static com.android.server.wm.proto.StackProto.TASKS; +import static com.android.server.wm.proto.StackProto.WINDOW_CONTAINER; +import android.annotation.CallSuper; import android.app.ActivityManager.StackId; import android.content.res.Configuration; import android.graphics.Rect; @@ -1219,8 +1221,11 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye return mMinimizeAmount != 0f; } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); proto.write(ID, mStackId); for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; taskNdx--) { mChildren.get(taskNdx).writeToProto(proto, TASKS); diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 926719ddf318..40923c8216c0 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -19,12 +19,14 @@ package com.android.server.wm; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; -import static android.content.res.Configuration.EMPTY; +import static com.android.server.wm.proto.WindowContainerProto.CONFIGURATION_CONTAINER; +import static com.android.server.wm.proto.WindowContainerProto.ORIENTATION; import android.annotation.CallSuper; import android.content.res.Configuration; import android.util.Pools; +import android.util.proto.ProtoOutputStream; import com.android.internal.util.ToBooleanFunction; import java.util.Comparator; @@ -685,6 +687,23 @@ a * Returns whether this child is on top of the window hierarchy. } } + /** + * Write to a protocol buffer output stream. Protocol buffer message definition is at + * {@link com.android.server.wm.proto.WindowContainerProto}. + * + * @param protoOutputStream Stream to write the WindowContainer object to. + * @param fieldId Field Id of the WindowContainer as defined in the parent message. + * @hide + */ + @CallSuper + @Override + public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) { + final long token = protoOutputStream.start(fieldId); + super.writeToProto(protoOutputStream, CONFIGURATION_CONTAINER); + protoOutputStream.write(ORIENTATION, mOrientation); + protoOutputStream.end(token); + } + String getName() { return toString(); } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 32ee51c8f751..6f796481cc08 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -109,6 +109,7 @@ import static com.android.server.wm.proto.WindowManagerServiceProto.FOCUSED_WIND import static com.android.server.wm.proto.WindowManagerServiceProto.INPUT_METHOD_WINDOW; import static com.android.server.wm.proto.WindowManagerServiceProto.LAST_ORIENTATION; import static com.android.server.wm.proto.WindowManagerServiceProto.POLICY; +import static com.android.server.wm.proto.WindowManagerServiceProto.ROOT_WINDOW_CONTAINER; import static com.android.server.wm.proto.WindowManagerServiceProto.ROTATION; import android.Manifest; @@ -6505,7 +6506,7 @@ public class WindowManagerService extends IWindowManager.Stub private void writeToProtoLocked(ProtoOutputStream proto) { mPolicy.writeToProto(proto, POLICY); - mRoot.writeToProto(proto); + mRoot.writeToProto(proto, ROOT_WINDOW_CONTAINER); if (mCurrentFocus != null) { mCurrentFocus.writeIdentifierToProto(proto, FOCUSED_WINDOW); } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 1b055664093f..8a2cb5a148d8 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -116,7 +116,9 @@ import static com.android.server.wm.proto.WindowStateProto.IDENTIFIER; import static com.android.server.wm.proto.WindowStateProto.PARENT_FRAME; import static com.android.server.wm.proto.WindowStateProto.STACK_ID; import static com.android.server.wm.proto.WindowStateProto.SURFACE_INSETS; +import static com.android.server.wm.proto.WindowStateProto.WINDOW_CONTAINER; +import android.annotation.CallSuper; import android.app.AppOpsManager; import android.content.Context; import android.content.res.Configuration; @@ -3124,8 +3126,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP || (isChildWindow() && getParentWindow().isDockedResizing()); } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); writeIdentifierToProto(proto, IDENTIFIER); proto.write(DISPLAY_ID, getDisplayId()); proto.write(STACK_ID, getStackId()); diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index 422615b10fc1..943448eea2b0 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -16,6 +16,7 @@ package com.android.server.wm; +import android.annotation.CallSuper; import android.util.proto.ProtoOutputStream; import java.util.Comparator; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; @@ -28,6 +29,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL; import static com.android.server.wm.proto.WindowTokenProto.HASH_CODE; import static com.android.server.wm.proto.WindowTokenProto.WINDOWS; +import static com.android.server.wm.proto.WindowTokenProto.WINDOW_CONTAINER; import android.os.Debug; import android.os.IBinder; @@ -263,8 +265,11 @@ class WindowToken extends WindowContainer<WindowState> { super.onDisplayChanged(dc); } - void writeToProto(ProtoOutputStream proto, long fieldId) { + @CallSuper + @Override + public void writeToProto(ProtoOutputStream proto, long fieldId) { final long token = proto.start(fieldId); + super.writeToProto(proto, WINDOW_CONTAINER); proto.write(HASH_CODE, System.identityHashCode(this)); for (int i = 0; i < mChildren.size(); i++) { final WindowState w = mChildren.get(i); diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 57271fa10950..2815da6e7a10 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1146,20 +1146,6 @@ public final class SystemServer { traceEnd(); } - /* - * StorageManagerService has a few dependencies: Notification Manager and - * AppWidget Provider. Make sure StorageManagerService is completely started - * first before continuing. - */ - if (storageManager != null && !mOnlyCore) { - traceBeginAndSlog("WaitForAsecScan"); - try { - storageManager.waitForAsecScan(); - } catch (RemoteException ignored) { - } - traceEnd(); - } - traceBeginAndSlog("StartNotificationManager"); mSystemServiceManager.startService(NotificationManagerService.class); SystemNotificationChannels.createAll(context); @@ -1209,18 +1195,6 @@ public final class SystemServer { traceEnd(); } - // timezone.RulesManagerService will prevent a device starting up if the chain of trust - // required for safe time zone updates might be broken. RuleManagerService cannot do - // this check when mOnlyCore == true, so we don't enable the service in this case. - final boolean startRulesManagerService = - !mOnlyCore && context.getResources().getBoolean( - R.bool.config_enableUpdateableTimeZoneRules); - if (startRulesManagerService) { - traceBeginAndSlog("StartTimeZoneRulesManagerService"); - mSystemServiceManager.startService(TIME_ZONE_RULES_MANAGER_SERVICE_CLASS); - traceEnd(); - } - traceBeginAndSlog("StartAudioService"); mSystemServiceManager.startService(AudioService.Lifecycle.class); traceEnd(); @@ -1361,6 +1335,19 @@ public final class SystemServer { } traceEnd(); + // timezone.RulesManagerService will prevent a device starting up if the chain of trust + // required for safe time zone updates might be broken. RuleManagerService cannot do + // this check when mOnlyCore == true, so we don't enable the service in this case. + // This service requires that JobSchedulerService is already started when it starts. + final boolean startRulesManagerService = + !mOnlyCore && context.getResources().getBoolean( + R.bool.config_enableUpdateableTimeZoneRules); + if (startRulesManagerService) { + traceBeginAndSlog("StartTimeZoneRulesManagerService"); + mSystemServiceManager.startService(TIME_ZONE_RULES_MANAGER_SERVICE_CLASS); + traceEnd(); + } + if (!disableNetwork && !disableNetworkTime) { traceBeginAndSlog("StartNetworkTimeUpdateService"); try { diff --git a/services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java b/services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java index e98e5bfb110e..f9d7f9d4904a 100644 --- a/services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/LockTaskControllerTest.java @@ -20,19 +20,13 @@ import static android.app.ActivityManager.LOCK_TASK_MODE_LOCKED; import static android.app.ActivityManager.LOCK_TASK_MODE_NONE; import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED; import static android.os.Process.SYSTEM_UID; + import static com.android.server.am.LockTaskController.STATUS_BAR_MASK_LOCKED; import static com.android.server.am.LockTaskController.STATUS_BAR_MASK_PINNED; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; + +import static org.junit.Assert.*; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import android.app.StatusBarManager; import android.app.admin.IDevicePolicyManager; @@ -72,7 +66,8 @@ import org.mockito.verification.VerificationMode; @SmallTest public class LockTaskControllerTest { private static final String TEST_PACKAGE_NAME = "com.test.package"; - private static final String TEST_CLASS_NAME = TEST_PACKAGE_NAME + ".TestClass"; + private static final String TEST_PACKAGE_NAME_2 = "com.test.package2"; + private static final String TEST_CLASS_NAME = ".TestClass"; private static final int TEST_USER_ID = 123; private static final int TEST_UID = 10467; @@ -309,15 +304,111 @@ public class LockTaskControllerTest { verify(mLockPatternUtils).requireCredentialEntry(UserHandle.USER_ALL); } + @Test + public void testUpdateLockTaskPackages() throws Exception { + String[] whitelist1 = {TEST_PACKAGE_NAME, TEST_PACKAGE_NAME_2}; + String[] whitelist2 = {TEST_PACKAGE_NAME}; + + // No package is whitelisted initially + for (String pkg : whitelist1) { + assertFalse("Package shouldn't be whitelisted: " + pkg, + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, pkg)); + assertFalse("Package shouldn't be whitelisted for user 0: " + pkg, + mLockTaskController.isPackageWhitelisted(0, pkg)); + } + + // Apply whitelist + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist1); + + // Assert the whitelist is applied to the correct user + for (String pkg : whitelist1) { + assertTrue("Package should be whitelisted: " + pkg, + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, pkg)); + assertFalse("Package shouldn't be whitelisted for user 0: " + pkg, + mLockTaskController.isPackageWhitelisted(0, pkg)); + } + + // Update whitelist + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist2); + + // Assert the new whitelist is applied + assertTrue("Package should remain whitelisted: " + TEST_PACKAGE_NAME, + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, TEST_PACKAGE_NAME)); + assertFalse("Package should no longer be whitelisted: " + TEST_PACKAGE_NAME_2, + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, TEST_PACKAGE_NAME_2)); + } + + @Test + public void testUpdateLockTaskPackages_taskRemoved() throws Exception { + // GIVEN two tasks which are whitelisted initially + TaskRecord tr1 = getTaskRecordForUpdate(TEST_PACKAGE_NAME, true); + TaskRecord tr2 = getTaskRecordForUpdate(TEST_PACKAGE_NAME_2, false); + String[] whitelist = {TEST_PACKAGE_NAME, TEST_PACKAGE_NAME_2}; + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist); + + // GIVEN the tasks are launched into LockTask mode + mLockTaskController.startLockTaskMode(tr1, false, TEST_UID); + mLockTaskController.startLockTaskMode(tr2, false, TEST_UID); + assertEquals(LOCK_TASK_MODE_LOCKED, mLockTaskController.getLockTaskModeState()); + assertTrue(mLockTaskController.checkLockedTask(tr1)); + assertTrue(mLockTaskController.checkLockedTask(tr2)); + verifyLockTaskStarted(STATUS_BAR_MASK_LOCKED); + + // WHEN removing one package from whitelist + whitelist = new String[] {TEST_PACKAGE_NAME}; + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist); + + // THEN the task running that package should be stopped + verify(tr2).performClearTaskLocked(); + assertFalse(mLockTaskController.checkLockedTask(tr2)); + // THEN the other task should remain locked + assertEquals(LOCK_TASK_MODE_LOCKED, mLockTaskController.getLockTaskModeState()); + assertTrue(mLockTaskController.checkLockedTask(tr1)); + verifyLockTaskStarted(STATUS_BAR_MASK_LOCKED); + + // WHEN removing the last package from whitelist + whitelist = new String[] {}; + mLockTaskController.updateLockTaskPackages(TEST_USER_ID, whitelist); + + // THEN the last task should be cleared, and the system should quit LockTask mode + verify(tr1).performClearTaskLocked(); + assertFalse(mLockTaskController.checkLockedTask(tr1)); + assertEquals(LOCK_TASK_MODE_NONE, mLockTaskController.getLockTaskModeState()); + verifyLockTaskStopped(times(1)); + } + private TaskRecord getTaskRecord(int lockTaskAuth) { + return getTaskRecord(TEST_PACKAGE_NAME, lockTaskAuth); + } + + private TaskRecord getTaskRecord(String pkg, int lockTaskAuth) { TaskRecord tr = mock(TaskRecord.class); tr.mLockTaskAuth = lockTaskAuth; tr.intent = new Intent() - .setComponent(new ComponentName(TEST_PACKAGE_NAME, TEST_CLASS_NAME)); + .setComponent(ComponentName.createRelative(pkg, TEST_CLASS_NAME)); tr.userId = TEST_USER_ID; return tr; } + /** + * @param isAppAware {@code true} if the app has marked if_whitelisted in its manifest + */ + private TaskRecord getTaskRecordForUpdate(String pkg, boolean isAppAware) { + final int authIfWhitelisted = isAppAware + ? TaskRecord.LOCK_TASK_AUTH_LAUNCHABLE + : TaskRecord.LOCK_TASK_AUTH_WHITELISTED; + TaskRecord tr = getTaskRecord(pkg, authIfWhitelisted); + doAnswer((invocation) -> { + boolean isWhitelisted = + mLockTaskController.isPackageWhitelisted(TEST_USER_ID, pkg); + tr.mLockTaskAuth = isWhitelisted + ? authIfWhitelisted + : TaskRecord.LOCK_TASK_AUTH_PINNABLE; + return null; + }).when(tr).setLockTaskAuth(); + return tr; + } + private void verifyLockTaskStarted(int statusBarMask) throws Exception { // THEN the keyguard should have been disabled verify(mWindowManager).disableKeyguard(any(IBinder.class), anyString()); diff --git a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java index 4475de5aa14e..419a161669aa 100644 --- a/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/UserControllerTest.java @@ -48,13 +48,13 @@ import java.util.List; import java.util.Set; import static android.content.pm.PackageManager.PERMISSION_GRANTED; -import static com.android.server.am.ActivityManagerService.CONTINUE_USER_SWITCH_MSG; -import static com.android.server.am.ActivityManagerService.REPORT_LOCKED_BOOT_COMPLETE_MSG; -import static com.android.server.am.ActivityManagerService.REPORT_USER_SWITCH_COMPLETE_MSG; -import static com.android.server.am.ActivityManagerService.REPORT_USER_SWITCH_MSG; -import static com.android.server.am.ActivityManagerService.SYSTEM_USER_CURRENT_MSG; -import static com.android.server.am.ActivityManagerService.SYSTEM_USER_START_MSG; -import static com.android.server.am.ActivityManagerService.USER_SWITCH_TIMEOUT_MSG; +import static com.android.server.am.UserController.CONTINUE_USER_SWITCH_MSG; +import static com.android.server.am.UserController.REPORT_LOCKED_BOOT_COMPLETE_MSG; +import static com.android.server.am.UserController.REPORT_USER_SWITCH_COMPLETE_MSG; +import static com.android.server.am.UserController.REPORT_USER_SWITCH_MSG; +import static com.android.server.am.UserController.SYSTEM_USER_CURRENT_MSG; +import static com.android.server.am.UserController.SYSTEM_USER_START_MSG; +import static com.android.server.am.UserController.USER_SWITCH_TIMEOUT_MSG; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; @@ -309,6 +309,7 @@ public class UserControllerTest extends AndroidTestCase { private static class TestInjector extends UserController.Injector { final Object lock = new Object(); TestHandler handler; + TestHandler uiHandler; HandlerThread handlerThread; UserManagerService userManagerMock; UserManagerInternal userManagerInternalMock; @@ -324,6 +325,7 @@ public class UserControllerTest extends AndroidTestCase { handlerThread = new HandlerThread(TAG); handlerThread.start(); handler = new TestHandler(handlerThread.getLooper()); + uiHandler = new TestHandler(handlerThread.getLooper()); userManagerMock = mock(UserManagerService.class); userManagerInternalMock = mock(UserManagerInternal.class); windowManagerMock = mock(WindowManagerService.class); @@ -337,11 +339,16 @@ public class UserControllerTest extends AndroidTestCase { } @Override - protected Handler getHandler() { + protected Handler getHandler(Handler.Callback callback) { return handler; } @Override + protected Handler getUiHandler(Handler.Callback callback) { + return uiHandler; + } + + @Override protected UserManagerService getUserManager() { return userManagerMock; } diff --git a/services/tests/servicestests/src/com/android/server/backup/testutils/PackageManagerStub.java b/services/tests/servicestests/src/com/android/server/backup/testutils/PackageManagerStub.java index 0e940f25a62a..f22dfdcadc2c 100644 --- a/services/tests/servicestests/src/com/android/server/backup/testutils/PackageManagerStub.java +++ b/services/tests/servicestests/src/com/android/server/backup/testutils/PackageManagerStub.java @@ -45,6 +45,7 @@ import java.util.List; */ public class PackageManagerStub extends PackageManager { public static PackageInfo sPackageInfo; + public static int sApplicationEnabledSetting = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT; @Override public PackageInfo getPackageInfo(String packageName, int flags) @@ -820,7 +821,7 @@ public class PackageManagerStub extends PackageManager { @Override public int getApplicationEnabledSetting(String packageName) { - return 0; + return sApplicationEnabledSetting; } @Override diff --git a/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java b/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java index db0ec0702b9f..ed26296ba72a 100644 --- a/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java @@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; import android.content.pm.Signature; import android.os.Process; import android.platform.test.annotations.Presubmit; @@ -27,6 +28,7 @@ import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.testutils.PackageManagerStub; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,6 +45,8 @@ public class AppBackupUtilsTest { private static final Signature SIGNATURE_3 = generateSignature((byte) 3); private static final Signature SIGNATURE_4 = generateSignature((byte) 4); + private final PackageManagerStub mPackageManagerStub = new PackageManagerStub(); + @Test public void appIsEligibleForBackup_backupNotAllowed_returnsFalse() throws Exception { ApplicationInfo applicationInfo = new ApplicationInfo(); @@ -51,7 +55,8 @@ public class AppBackupUtilsTest { applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; applicationInfo.packageName = TEST_PACKAGE_NAME; - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo); + boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, + mPackageManagerStub); assertThat(isEligible).isFalse(); } @@ -65,7 +70,8 @@ public class AppBackupUtilsTest { applicationInfo.backupAgentName = null; applicationInfo.packageName = TEST_PACKAGE_NAME; - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo); + boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, + mPackageManagerStub); assertThat(isEligible).isFalse(); } @@ -78,13 +84,14 @@ public class AppBackupUtilsTest { applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; applicationInfo.packageName = RefactoredBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo); + boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, + mPackageManagerStub); assertThat(isEligible).isFalse(); } @Test - public void appIsEligibleForBackup_systemAppWithCustomBackupAgent_returnsTrue() + public void appIsEligibleForBackup_systemAppWithCustomBackupAgentAndEnabled_returnsTrue() throws Exception { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.flags |= ApplicationInfo.FLAG_ALLOW_BACKUP; @@ -92,13 +99,17 @@ public class AppBackupUtilsTest { applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; applicationInfo.packageName = TEST_PACKAGE_NAME; - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo); + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + + boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, + mPackageManagerStub); assertThat(isEligible).isTrue(); } @Test - public void appIsEligibleForBackup_nonSystemAppWithoutCustomBackupAgent_returnsTrue() + public void appIsEligibleForBackup_nonSystemAppWithoutCustomBackupAgentAndEnabled_returnsTrue() throws Exception { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.flags |= ApplicationInfo.FLAG_ALLOW_BACKUP; @@ -106,13 +117,17 @@ public class AppBackupUtilsTest { applicationInfo.backupAgentName = null; applicationInfo.packageName = TEST_PACKAGE_NAME; - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo); + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + + boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, + mPackageManagerStub); assertThat(isEligible).isTrue(); } @Test - public void appIsEligibleForBackup_nonSystemAppWithCustomBackupAgent_returnsTrue() + public void appIsEligibleForBackup_nonSystemAppWithCustomBackupAgentAndEnabled_returnsTrue() throws Exception { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.flags |= ApplicationInfo.FLAG_ALLOW_BACKUP; @@ -120,12 +135,134 @@ public class AppBackupUtilsTest { applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; applicationInfo.packageName = TEST_PACKAGE_NAME; - boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo); + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + + boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, + mPackageManagerStub); assertThat(isEligible).isTrue(); } @Test + public void appIsEligibleForBackup_systemAppWithCustomBackupAgentAndDisabled_returnsFalse() + throws Exception { + ApplicationInfo applicationInfo = new ApplicationInfo(); + applicationInfo.flags |= ApplicationInfo.FLAG_ALLOW_BACKUP; + applicationInfo.uid = Process.SYSTEM_UID; + applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; + applicationInfo.packageName = TEST_PACKAGE_NAME; + + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_DISABLED; + + boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, + mPackageManagerStub); + + assertThat(isEligible).isFalse(); + } + + @Test + public void appIsEligibleForBackup_nonSystemAppWithoutCustomBackupAgentAndDisabled_returnsFalse() + throws Exception { + ApplicationInfo applicationInfo = new ApplicationInfo(); + applicationInfo.flags |= ApplicationInfo.FLAG_ALLOW_BACKUP; + applicationInfo.uid = Process.FIRST_APPLICATION_UID; + applicationInfo.backupAgentName = null; + applicationInfo.packageName = TEST_PACKAGE_NAME; + + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_DISABLED; + + boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, + mPackageManagerStub); + + assertThat(isEligible).isFalse(); + } + + @Test + public void appIsEligibleForBackup_nonSystemAppWithCustomBackupAgentAndDisbled_returnsFalse() + throws Exception { + ApplicationInfo applicationInfo = new ApplicationInfo(); + applicationInfo.flags |= ApplicationInfo.FLAG_ALLOW_BACKUP; + applicationInfo.uid = Process.FIRST_APPLICATION_UID; + applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; + applicationInfo.packageName = TEST_PACKAGE_NAME; + + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_DISABLED; + + boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, + mPackageManagerStub); + + assertThat(isEligible).isFalse(); + } + + @Test + public void appIsDisabled_stateEnabled_returnsFalse() throws Exception { + ApplicationInfo applicationInfo = new ApplicationInfo(); + applicationInfo.flags = 0; + applicationInfo.uid = Process.FIRST_APPLICATION_UID; + applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; + applicationInfo.packageName = TEST_PACKAGE_NAME; + + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_ENABLED; + + boolean isDisabled = AppBackupUtils.appIsDisabled(applicationInfo, mPackageManagerStub); + + assertThat(isDisabled).isFalse(); + } + + @Test + public void appIsDisabled_stateDisabled_returnsTrue() throws Exception { + ApplicationInfo applicationInfo = new ApplicationInfo(); + applicationInfo.flags = 0; + applicationInfo.uid = Process.FIRST_APPLICATION_UID; + applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; + applicationInfo.packageName = TEST_PACKAGE_NAME; + + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_DISABLED; + + boolean isDisabled = AppBackupUtils.appIsDisabled(applicationInfo, mPackageManagerStub); + + assertThat(isDisabled).isTrue(); + } + + @Test + public void appIsDisabled_stateDisabledUser_returnsTrue() throws Exception { + ApplicationInfo applicationInfo = new ApplicationInfo(); + applicationInfo.flags = 0; + applicationInfo.uid = Process.FIRST_APPLICATION_UID; + applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; + applicationInfo.packageName = TEST_PACKAGE_NAME; + + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER; + + boolean isDisabled = AppBackupUtils.appIsDisabled(applicationInfo, mPackageManagerStub); + + assertThat(isDisabled).isTrue(); + } + + @Test + public void appIsDisabled_stateDisabledUntilUsed_returnsTrue() throws Exception { + ApplicationInfo applicationInfo = new ApplicationInfo(); + applicationInfo.flags = 0; + applicationInfo.uid = Process.FIRST_APPLICATION_UID; + applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; + applicationInfo.packageName = TEST_PACKAGE_NAME; + + PackageManagerStub.sApplicationEnabledSetting = + PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED; + + boolean isDisabled = AppBackupUtils.appIsDisabled(applicationInfo, mPackageManagerStub); + + assertThat(isDisabled).isTrue(); + } + + @Test public void appIsStopped_returnsTrue() throws Exception { ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.flags |= ApplicationInfo.FLAG_STOPPED; diff --git a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java index 14b1ce1662c7..4559660351b0 100644 --- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java @@ -33,6 +33,10 @@ import org.junit.rules.TemporaryFolder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import static android.os.PowerManagerInternal.WAKEFULNESS_ASLEEP; +import static android.os.PowerManagerInternal.WAKEFULNESS_AWAKE; +import static android.os.PowerManagerInternal.WAKEFULNESS_DOZING; +import static android.os.PowerManagerInternal.WAKEFULNESS_DREAMING; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; @@ -83,4 +87,33 @@ public class PowerManagerServiceTest extends AndroidTestCase { SystemProperties.set(TEST_LAST_REBOOT_PROPERTY, ""); assertThat(reason).isEqualTo(PowerManager.SHUTDOWN_REASON_THERMAL_SHUTDOWN); } + + @SmallTest + public void testGetDesiredScreenPolicy_WithVR() throws Exception { + // Brighten up the screen + mService.setWakefulnessLocked(WAKEFULNESS_AWAKE, 0); + assertThat(mService.getDesiredScreenPolicyLocked()).isEqualTo( + DisplayPowerRequest.POLICY_BRIGHT); + + // Move to VR + mService.setVrModeEnabled(true); + assertThat(mService.getDesiredScreenPolicyLocked()).isEqualTo( + DisplayPowerRequest.POLICY_VR); + + // Then take a nap + mService.setWakefulnessLocked(WAKEFULNESS_ASLEEP, 0); + assertThat(mService.getDesiredScreenPolicyLocked()).isEqualTo( + DisplayPowerRequest.POLICY_OFF); + + // Wake up to VR + mService.setWakefulnessLocked(WAKEFULNESS_AWAKE, 0); + assertThat(mService.getDesiredScreenPolicyLocked()).isEqualTo( + DisplayPowerRequest.POLICY_VR); + + // And back to normal + mService.setVrModeEnabled(false); + assertThat(mService.getDesiredScreenPolicyLocked()).isEqualTo( + DisplayPowerRequest.POLICY_BRIGHT); + + } } diff --git a/services/tests/servicestests/src/com/android/server/timezone/PackageTrackerTest.java b/services/tests/servicestests/src/com/android/server/timezone/PackageTrackerTest.java index 38142d3681b6..7d73e82eaf76 100644 --- a/services/tests/servicestests/src/com/android/server/timezone/PackageTrackerTest.java +++ b/services/tests/servicestests/src/com/android/server/timezone/PackageTrackerTest.java @@ -107,7 +107,7 @@ public class PackageTrackerTest { mFakeIntentHelper.assertNotInitialized(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); } @Test @@ -119,7 +119,7 @@ public class PackageTrackerTest { mPackageTracker.start(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); try { // This call should also not be allowed and will throw an exception if tracking is @@ -129,7 +129,7 @@ public class PackageTrackerTest { } catch (IllegalStateException expected) {} // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); } @Test @@ -141,14 +141,14 @@ public class PackageTrackerTest { mPackageTracker.start(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); // Receiving a check result when tracking is disabled should cause the storage to be // reset. mPackageTracker.recordCheckResult(null /* checkToken */, true /* success */); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); // Assert the storage was reset. checkPackageStorageStatusIsInitialOrReset(); @@ -166,13 +166,13 @@ public class PackageTrackerTest { mPackageTracker.start(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); // Receiving a check result when tracking is disabled should cause the storage to be reset. mPackageTracker.recordCheckResult(createArbitraryCheckToken(), true /* success */); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); // Assert the storage was reset. checkPackageStorageStatusIsInitialOrReset(); @@ -195,7 +195,7 @@ public class PackageTrackerTest { mFakeIntentHelper.assertNotInitialized(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); } @Test @@ -215,7 +215,7 @@ public class PackageTrackerTest { mFakeIntentHelper.assertNotInitialized(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); } @Test @@ -235,7 +235,7 @@ public class PackageTrackerTest { mFakeIntentHelper.assertNotInitialized(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); } @Test @@ -255,7 +255,7 @@ public class PackageTrackerTest { mFakeIntentHelper.assertNotInitialized(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); } @Test @@ -289,7 +289,7 @@ public class PackageTrackerTest { mFakeIntentHelper.assertUpdateNotTriggered(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); // Assert the storage was not touched. checkPackageStorageStatusIsInitialOrReset(); @@ -325,7 +325,7 @@ public class PackageTrackerTest { mFakeIntentHelper.assertUpdateNotTriggered(); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); // Assert the storage was not touched. checkPackageStorageStatusIsInitialOrReset(); @@ -416,7 +416,7 @@ public class PackageTrackerTest { mPackageTracker.recordCheckResult(null /* checkToken */, success); // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); // Assert the storage was reset. checkPackageStorageStatusIsInitialOrReset(); @@ -627,7 +627,7 @@ public class PackageTrackerTest { mPackageTracker.recordCheckResult(token1, true /* success */); // Reliability triggering should still be enabled. - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); // Check the expected storage state. checkPackageStorageStatus(PackageStatus.CHECK_STARTED, packageVersions2); @@ -743,7 +743,7 @@ public class PackageTrackerTest { // Under the covers we expect it to fail to update because the storage should recognize that // the token is no longer valid. - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); // Peek inside the package tracker to make sure it is tracking failure counts properly. assertEquals(1, mPackageTracker.getCheckFailureCountForTests()); @@ -766,7 +766,7 @@ public class PackageTrackerTest { checkPackageStorageStatusIsInitialOrReset(); // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker did trigger an update. checkUpdateCheckTriggered(packageVersions); @@ -803,7 +803,7 @@ public class PackageTrackerTest { checkPackageStorageStatus(PackageStatus.CHECK_COMPLETED_SUCCESS, packageVersions); // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker did not attempt to trigger an update. mFakeIntentHelper.assertUpdateNotTriggered(); @@ -843,7 +843,7 @@ public class PackageTrackerTest { checkPackageStorageStatus(PackageStatus.CHECK_COMPLETED_FAILURE, oldPackageVersions); // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker did trigger an update. checkUpdateCheckTriggered(currentPackageVersions); @@ -890,7 +890,7 @@ public class PackageTrackerTest { for (int i = 0; i < retriesAllowed + 1; i++) { // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker did trigger an update. checkUpdateCheckTriggered(currentPackageVersions); @@ -912,9 +912,9 @@ public class PackageTrackerTest { // Check reliability triggering is in the correct state. if (i <= retriesAllowed) { - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); } else { - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); } } } @@ -950,7 +950,7 @@ public class PackageTrackerTest { // Fail (retries - 1) times. for (int i = 0; i < retriesAllowed - 1; i++) { // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker did trigger an update. checkUpdateCheckTriggered(currentPackageVersions); @@ -971,11 +971,11 @@ public class PackageTrackerTest { currentPackageVersions); // Check reliability triggering is still enabled. - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); } // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker did trigger an update. checkUpdateCheckTriggered(currentPackageVersions); @@ -1023,7 +1023,7 @@ public class PackageTrackerTest { checkPackageStorageStatus(PackageStatus.CHECK_COMPLETED_FAILURE, oldPackageVersions); // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker did trigger an update. checkUpdateCheckTriggered(currentPackageVersions); @@ -1033,18 +1033,18 @@ public class PackageTrackerTest { mFakeClock.incrementClock(checkDelayMillis - 1); // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker did not trigger an update. mFakeIntentHelper.assertUpdateNotTriggered(); checkPackageStorageStatus(PackageStatus.CHECK_STARTED, currentPackageVersions); - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); // Increment the clock slightly more. Should now consider the response overdue. mFakeClock.incrementClock(2); // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Triggering should have happened. checkUpdateCheckTriggered(currentPackageVersions); @@ -1096,7 +1096,7 @@ public class PackageTrackerTest { mFakeClock.incrementClock(checkDelayMillis + 1); // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker triggered an update. checkUpdateCheckTriggered(newPackageVersions); @@ -1154,18 +1154,18 @@ public class PackageTrackerTest { mFakeClock.incrementClock(checkDelayMillis - 1); // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Assert the PackageTracker did not trigger an update. mFakeIntentHelper.assertUpdateNotTriggered(); checkPackageStorageStatus(PackageStatus.CHECK_STARTED, newPackageVersions); - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); // Increment the clock slightly more. Should now consider the response overdue. mFakeClock.incrementClock(2); // Simulate a reliability trigger. - mFakeIntentHelper.simulateReliabilityTrigger(); + mPackageTracker.triggerUpdateIfNeeded(false /* packageChanged */); // Triggering should have happened. checkUpdateCheckTriggered(newPackageVersions); @@ -1202,7 +1202,7 @@ public class PackageTrackerTest { // If an update check was triggered reliability triggering should always be enabled to // ensure that it can be completed if it fails. - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); // Check the expected storage state. checkPackageStorageStatus(PackageStatus.CHECK_STARTED, packageVersions); @@ -1210,7 +1210,7 @@ public class PackageTrackerTest { private void checkUpdateCheckFailed(PackageVersions packageVersions) { // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); // Assert the storage was updated. checkPackageStorageStatus(PackageStatus.CHECK_COMPLETED_FAILURE, packageVersions); @@ -1218,7 +1218,7 @@ public class PackageTrackerTest { private void checkUpdateCheckSuccessful(PackageVersions packageVersions) { // Check reliability triggering state. - mFakeIntentHelper.assertReliabilityTriggeringDisabled(); + mFakeIntentHelper.assertReliabilityTriggerNotScheduled(); // Assert the storage was updated. checkPackageStorageStatus(PackageStatus.CHECK_COMPLETED_SUCCESS, packageVersions); @@ -1345,7 +1345,7 @@ public class PackageTrackerTest { mFakeIntentHelper.assertInitialized(UPDATE_APP_PACKAGE_NAME, DATA_APP_PACKAGE_NAME); // Assert that reliability tracking is always enabled after initialization. - mFakeIntentHelper.assertReliabilityTriggeringEnabled(); + mFakeIntentHelper.assertReliabilityTriggerScheduled(); } private void checkPackageStorageStatus( @@ -1368,34 +1368,34 @@ public class PackageTrackerTest { */ private static class FakeIntentHelper implements IntentHelper { - private Listener mListener; + private PackageTracker mPackageTracker; private String mUpdateAppPackageName; private String mDataAppPackageName; private CheckToken mLastToken; - private boolean mReliabilityTriggeringEnabled; + private boolean mReliabilityTriggerScheduled; @Override public void initialize(String updateAppPackageName, String dataAppPackageName, - Listener listener) { + PackageTracker packageTracker) { assertNotNull(updateAppPackageName); assertNotNull(dataAppPackageName); - assertNotNull(listener); - mListener = listener; + assertNotNull(packageTracker); + mPackageTracker = packageTracker; mUpdateAppPackageName = updateAppPackageName; mDataAppPackageName = dataAppPackageName; } public void assertInitialized( String expectedUpdateAppPackageName, String expectedDataAppPackageName) { - assertNotNull(mListener); + assertNotNull(mPackageTracker); assertEquals(expectedUpdateAppPackageName, mUpdateAppPackageName); assertEquals(expectedDataAppPackageName, mDataAppPackageName); } public void assertNotInitialized() { - assertNull(mListener); + assertNull(mPackageTracker); } @Override @@ -1407,21 +1407,21 @@ public class PackageTrackerTest { } @Override - public void enableReliabilityTriggering() { - mReliabilityTriggeringEnabled = true; + public void scheduleReliabilityTrigger(long minimumDelayMillis) { + mReliabilityTriggerScheduled = true; } @Override - public void disableReliabilityTriggering() { - mReliabilityTriggeringEnabled = false; + public void unscheduleReliabilityTrigger() { + mReliabilityTriggerScheduled = false; } - public void assertReliabilityTriggeringEnabled() { - assertTrue(mReliabilityTriggeringEnabled); + public void assertReliabilityTriggerScheduled() { + assertTrue(mReliabilityTriggerScheduled); } - public void assertReliabilityTriggeringDisabled() { - assertFalse(mReliabilityTriggeringEnabled); + public void assertReliabilityTriggerNotScheduled() { + assertFalse(mReliabilityTriggerScheduled); } public void assertUpdateTriggered() { @@ -1440,11 +1440,7 @@ public class PackageTrackerTest { } public void simulatePackageUpdatedEvent() { - mListener.triggerUpdateIfNeeded(true); - } - - public void simulateReliabilityTrigger() { - mListener.triggerUpdateIfNeeded(false); + mPackageTracker.triggerUpdateIfNeeded(true /* packageChanged */); } } diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index d5ff1adb607d..ff6711632252 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -77,9 +77,28 @@ public class PhoneNumberUtils public static final int TOA_International = 0x91; public static final int TOA_Unknown = 0x81; + /* + * The BCD extended type used to determine the extended char for the digit which is greater than + * 9. + * + * see TS 51.011 section 10.5.1 EF_ADN(Abbreviated dialling numbers) + */ + public static final int BCD_EXTENDED_TYPE_EF_ADN = 1; + + /* + * The BCD extended type used to determine the extended char for the digit which is greater than + * 9. + * + * see TS 24.008 section 10.5.4.7 Called party BCD number + */ + public static final int BCD_EXTENDED_TYPE_CALLED_PARTY = 2; + static final String LOG_TAG = "PhoneNumberUtils"; private static final boolean DBG = false; + private static final String BCD_EF_ADN_EXTENDED = "*#,N;"; + private static final String BCD_CALLED_PARTY_EXTENDED = "*#abc"; + /* * global-phone-number = ["+"] 1*( DIGIT / written-sep ) * written-sep = ("-"/".") @@ -799,11 +818,33 @@ public class PhoneNumberUtils * * @return partial string on invalid decode * - * FIXME(mkf) support alphanumeric address type - * currently implemented in SMSMessage.getAddress() + * @deprecated use {@link #calledPartyBCDToString(byte[], int, int, int)} instead. Calling this + * method is equivalent to calling {@link #calledPartyBCDToString(byte[], int, int)} with + * {@link #BCD_EXTENDED_TYPE_EF_ADN} as the extended type. */ - public static String - calledPartyBCDToString (byte[] bytes, int offset, int length) { + @Deprecated + public static String calledPartyBCDToString(byte[] bytes, int offset, int length) { + return calledPartyBCDToString(bytes, offset, length, BCD_EXTENDED_TYPE_EF_ADN); + } + + /** + * 3GPP TS 24.008 10.5.4.7 + * Called Party BCD Number + * + * See Also TS 51.011 10.5.1 "dialing number/ssc string" + * and TS 11.11 "10.3.1 EF adn (Abbreviated dialing numbers)" + * + * @param bytes the data buffer + * @param offset should point to the TOA (aka. TON/NPI) octet after the length byte + * @param length is the number of bytes including TOA byte + * and must be at least 2 + * @param bcdExtType used to determine the extended bcd coding + * @see #BCD_EXTENDED_TYPE_EF_ADN + * @see #BCD_EXTENDED_TYPE_CALLED_PARTY + * + */ + public static String calledPartyBCDToString( + byte[] bytes, int offset, int length, int bcdExtType) { boolean prependPlus = false; StringBuilder ret = new StringBuilder(1 + length * 2); @@ -817,7 +858,7 @@ public class PhoneNumberUtils } internalCalledPartyBCDFragmentToString( - ret, bytes, offset + 1, length - 1); + ret, bytes, offset + 1, length - 1, bcdExtType); if (prependPlus && ret.length() == 0) { // If the only thing there is a prepended plus, return "" @@ -902,14 +943,13 @@ public class PhoneNumberUtils return ret.toString(); } - private static void - internalCalledPartyBCDFragmentToString( - StringBuilder sb, byte [] bytes, int offset, int length) { + private static void internalCalledPartyBCDFragmentToString( + StringBuilder sb, byte [] bytes, int offset, int length, int bcdExtType) { for (int i = offset ; i < length + offset ; i++) { byte b; char c; - c = bcdToChar((byte)(bytes[i] & 0xf)); + c = bcdToChar((byte)(bytes[i] & 0xf), bcdExtType); if (c == 0) { return; @@ -930,7 +970,7 @@ public class PhoneNumberUtils break; } - c = bcdToChar(b); + c = bcdToChar(b, bcdExtType); if (c == 0) { return; } @@ -943,49 +983,65 @@ public class PhoneNumberUtils /** * Like calledPartyBCDToString, but field does not start with a * TOA byte. For example: SIM ADN extension fields + * + * @deprecated use {@link #calledPartyBCDFragmentToString(byte[], int, int, int)} instead. + * Calling this method is equivalent to calling + * {@link #calledPartyBCDFragmentToString(byte[], int, int, int)} with + * {@link #BCD_EXTENDED_TYPE_EF_ADN} as the extended type. */ + @Deprecated + public static String calledPartyBCDFragmentToString(byte[] bytes, int offset, int length) { + return calledPartyBCDFragmentToString(bytes, offset, length, BCD_EXTENDED_TYPE_EF_ADN); + } - public static String - calledPartyBCDFragmentToString(byte [] bytes, int offset, int length) { + /** + * Like calledPartyBCDToString, but field does not start with a + * TOA byte. For example: SIM ADN extension fields + */ + public static String calledPartyBCDFragmentToString( + byte[] bytes, int offset, int length, int bcdExtType) { StringBuilder ret = new StringBuilder(length * 2); - - internalCalledPartyBCDFragmentToString(ret, bytes, offset, length); - + internalCalledPartyBCDFragmentToString(ret, bytes, offset, length, bcdExtType); return ret.toString(); } - /** returns 0 on invalid value */ - private static char - bcdToChar(byte b) { + /** + * Returns the correspond character for given {@code b} based on {@code bcdExtType}, or 0 on + * invalid code. + */ + private static char bcdToChar(byte b, int bcdExtType) { if (b < 0xa) { - return (char)('0' + b); - } else switch (b) { - case 0xa: return '*'; - case 0xb: return '#'; - case 0xc: return PAUSE; - case 0xd: return WILD; + return (char) ('0' + b); + } - default: return 0; + String extended = null; + if (BCD_EXTENDED_TYPE_EF_ADN == bcdExtType) { + extended = BCD_EF_ADN_EXTENDED; + } else if (BCD_EXTENDED_TYPE_CALLED_PARTY == bcdExtType) { + extended = BCD_CALLED_PARTY_EXTENDED; } + if (extended == null || b - 0xa >= extended.length()) { + return 0; + } + + return extended.charAt(b - 0xa); } - private static int - charToBCD(char c) { - if (c >= '0' && c <= '9') { + private static int charToBCD(char c, int bcdExtType) { + if ('0' <= c && c <= '9') { return c - '0'; - } else if (c == '*') { - return 0xa; - } else if (c == '#') { - return 0xb; - } else if (c == PAUSE) { - return 0xc; - } else if (c == WILD) { - return 0xd; - } else if (c == WAIT) { - return 0xe; - } else { - throw new RuntimeException ("invalid char for BCD " + c); } + + String extended = null; + if (BCD_EXTENDED_TYPE_EF_ADN == bcdExtType) { + extended = BCD_EF_ADN_EXTENDED; + } else if (BCD_EXTENDED_TYPE_CALLED_PARTY == bcdExtType) { + extended = BCD_CALLED_PARTY_EXTENDED; + } + if (extended == null || extended.indexOf(c) == -1) { + throw new RuntimeException("invalid char for BCD " + c); + } + return 0xa + extended.indexOf(c); } /** @@ -1034,40 +1090,60 @@ public class PhoneNumberUtils * * Returns null if network portion is empty. */ - public static byte[] - networkPortionToCalledPartyBCD(String s) { + public static byte[] networkPortionToCalledPartyBCD(String s) { String networkPortion = extractNetworkPortion(s); - return numberToCalledPartyBCDHelper(networkPortion, false); + return numberToCalledPartyBCDHelper( + networkPortion, false, BCD_EXTENDED_TYPE_EF_ADN); } /** * Same as {@link #networkPortionToCalledPartyBCD}, but includes a * one-byte length prefix. */ - public static byte[] - networkPortionToCalledPartyBCDWithLength(String s) { + public static byte[] networkPortionToCalledPartyBCDWithLength(String s) { String networkPortion = extractNetworkPortion(s); - return numberToCalledPartyBCDHelper(networkPortion, true); + return numberToCalledPartyBCDHelper( + networkPortion, true, BCD_EXTENDED_TYPE_EF_ADN); + } + + /** + * Convert a dialing number to BCD byte array + * + * @param number dialing number string. If the dialing number starts with '+', set to + * international TOA + * + * @return BCD byte array + * + * @deprecated use {@link #numberToCalledPartyBCD(String, int)} instead. Calling this method + * is equivalent to calling {@link #numberToCalledPartyBCD(String, int)} with + * {@link #BCD_EXTENDED_TYPE_EF_ADN} as the extended type. + */ + @Deprecated + public static byte[] numberToCalledPartyBCD(String number) { + return numberToCalledPartyBCD(number, BCD_EXTENDED_TYPE_EF_ADN); } /** * Convert a dialing number to BCD byte array * - * @param number dialing number string - * if the dialing number starts with '+', set to international TOA + * @param number dialing number string. If the dialing number starts with '+', set to + * international TOA + * @param bcdExtType used to determine the extended bcd coding + * @see #BCD_EXTENDED_TYPE_EF_ADN + * @see #BCD_EXTENDED_TYPE_CALLED_PARTY + * * @return BCD byte array */ - public static byte[] - numberToCalledPartyBCD(String number) { - return numberToCalledPartyBCDHelper(number, false); + public static byte[] numberToCalledPartyBCD(String number, int bcdExtType) { + return numberToCalledPartyBCDHelper(number, false, bcdExtType); } /** * If includeLength is true, prepend a one-byte length value to * the return array. */ - private static byte[] - numberToCalledPartyBCDHelper(String number, boolean includeLength) { + private static byte[] numberToCalledPartyBCDHelper( + String number, boolean includeLength, int bcdExtType) { int numberLenReal = number.length(); int numberLenEffective = numberLenReal; boolean hasPlus = number.indexOf('+') != -1; @@ -1087,7 +1163,8 @@ public class PhoneNumberUtils char c = number.charAt(i); if (c == '+') continue; int shift = ((digitCount & 0x01) == 1) ? 4 : 0; - result[extraBytes + (digitCount >> 1)] |= (byte)((charToBCD(c) & 0x0F) << shift); + result[extraBytes + (digitCount >> 1)] |= + (byte)((charToBCD(c, bcdExtType) & 0x0F) << shift); digitCount++; } diff --git a/telephony/java/com/android/ims/ImsCallProfile.java b/telephony/java/com/android/ims/ImsCallProfile.java index 36abfc9d288e..489c208a0d46 100644 --- a/telephony/java/com/android/ims/ImsCallProfile.java +++ b/telephony/java/com/android/ims/ImsCallProfile.java @@ -19,7 +19,9 @@ package com.android.ims; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; +import android.os.PersistableBundle; import android.telecom.VideoProfile; +import android.util.Log; import com.android.internal.telephony.PhoneConstants; @@ -216,6 +218,29 @@ public class ImsCallProfile implements Parcelable { public int mServiceType; public int mCallType; public int mRestrictCause = CALL_RESTRICT_CAUSE_NONE; + + /** + * Extras associated with this {@link ImsCallProfile}. + * <p> + * Valid data types include: + * <ul> + * <li>{@link Integer} (and int)</li> + * <li>{@link Long} (and long)</li> + * <li>{@link Double} (and double)</li> + * <li>{@link String}</li> + * <li>{@code int[]}</li> + * <li>{@code long[]}</li> + * <li>{@code double[]}</li> + * <li>{@code String[]}</li> + * <li>{@link PersistableBundle}</li> + * <li>{@link Boolean} (and boolean)</li> + * <li>{@code boolean[]}</li> + * <li>Other {@link Parcelable} classes in the {@code android.*} namespace.</li> + * </ul> + * <p> + * Invalid types will be removed when the {@link ImsCallProfile} is parceled for transmit across + * a {@link android.os.Binder}. + */ public Bundle mCallExtras; public ImsStreamMediaProfile mMediaProfile; @@ -315,16 +340,17 @@ public class ImsCallProfile implements Parcelable { @Override public void writeToParcel(Parcel out, int flags) { + Bundle filteredExtras = maybeCleanseExtras(mCallExtras); out.writeInt(mServiceType); out.writeInt(mCallType); - out.writeParcelable(mCallExtras, 0); + out.writeBundle(filteredExtras); out.writeParcelable(mMediaProfile, 0); } private void readFromParcel(Parcel in) { mServiceType = in.readInt(); mCallType = in.readInt(); - mCallExtras = in.readParcelable(null); + mCallExtras = in.readBundle(); mMediaProfile = in.readParcelable(null); } @@ -465,6 +491,31 @@ public class ImsCallProfile implements Parcelable { } /** + * Cleanses a {@link Bundle} to ensure that it contains only data of type: + * 1. Primitive data types (e.g. int, bool, and other values determined by + * {@link android.os.PersistableBundle#isValidType(Object)}). + * 2. Other Bundles. + * 3. {@link Parcelable} objects in the {@code android.*} namespace. + * @param extras the source {@link Bundle} + * @return where all elements are valid types the source {@link Bundle} is returned unmodified, + * otherwise a copy of the {@link Bundle} with the invalid elements is returned. + */ + private Bundle maybeCleanseExtras(Bundle extras) { + if (extras == null) { + return null; + } + + int startSize = extras.size(); + Bundle filtered = extras.filterValues(); + int endSize = filtered.size(); + if (startSize != endSize) { + Log.i(TAG, "maybeCleanseExtras: " + (startSize - endSize) + " extra values were " + + "removed - only primitive types and system parcelables are permitted."); + } + return filtered; + } + + /** * Determines if a video state is set in a video state bit-mask. * * @param videoState The video state bit mask. diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmSmsAddress.java b/telephony/java/com/android/internal/telephony/gsm/GsmSmsAddress.java index 2fbf7ed5648c..bd8c83e63055 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmSmsAddress.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmSmsAddress.java @@ -17,6 +17,7 @@ package com.android.internal.telephony.gsm; import android.telephony.PhoneNumberUtils; + import java.text.ParseException; import com.android.internal.telephony.GsmAlphabet; import com.android.internal.telephony.SmsAddress; @@ -71,8 +72,11 @@ public class GsmSmsAddress extends SmsAddress { // Make sure the final unused BCD digit is 0xf origBytes[length - 1] |= 0xf0; } - address = PhoneNumberUtils.calledPartyBCDToString(origBytes, - OFFSET_TOA, length - OFFSET_TOA); + address = PhoneNumberUtils.calledPartyBCDToString( + origBytes, + OFFSET_TOA, + length - OFFSET_TOA, + PhoneNumberUtils.BCD_EXTENDED_TYPE_CALLED_PARTY); // And restore origBytes origBytes[length - 1] = lastByte; diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java index d4098d94ba6c..1ca19e01d6c8 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java @@ -535,8 +535,8 @@ public class SmsMessage extends SmsMessageBase { } else { // SC address try { - ret = PhoneNumberUtils - .calledPartyBCDToString(mPdu, mCur, len); + ret = PhoneNumberUtils.calledPartyBCDToString( + mPdu, mCur, len, PhoneNumberUtils.BCD_EXTENDED_TYPE_CALLED_PARTY); } catch (RuntimeException tr) { Rlog.d(LOG_TAG, "invalid SC address: ", tr); ret = null; diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java index f72a1c638ed5..262417620ca2 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java @@ -512,7 +512,7 @@ public class IpConnectivityEventBuilderTest { stats.nonApplicationWakeups = 1; stats.rootWakeups = 2; stats.systemWakeups = 3; - stats.unroutedWakeups = 3; + stats.noUidWakeups = 3; IpConnectivityEvent got = IpConnectivityEventBuilder.toProto(stats); String want = String.join("\n", @@ -526,11 +526,11 @@ public class IpConnectivityEventBuilderTest { " wakeup_stats <", " application_wakeups: 5", " duration_sec: 0", + " no_uid_wakeups: 3", " non_application_wakeups: 1", " root_wakeups: 2", " system_wakeups: 3", " total_wakeups: 14", - " unrouted_wakeups: 3", " >", ">", "version: 2\n"); diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java index ede5988cdc6d..a395c480f57a 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java @@ -423,11 +423,11 @@ public class IpConnectivityMetricsTest { " wakeup_stats <", " application_wakeups: 2", " duration_sec: 0", + " no_uid_wakeups: 0", " non_application_wakeups: 0", " root_wakeups: 0", " system_wakeups: 1", " total_wakeups: 3", - " unrouted_wakeups: 0", " >", ">", "events <", @@ -439,11 +439,11 @@ public class IpConnectivityMetricsTest { " wakeup_stats <", " application_wakeups: 1", " duration_sec: 0", + " no_uid_wakeups: 1", " non_application_wakeups: 0", " root_wakeups: 0", " system_wakeups: 2", " total_wakeups: 4", - " unrouted_wakeups: 1", " >", ">", "version: 2\n"); diff --git a/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java b/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java index 2b105e5c92ee..6723601fc5c3 100644 --- a/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java +++ b/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java @@ -163,11 +163,11 @@ public class NetdEventListenerServiceTest { " wakeup_stats <", " application_wakeups: 3", " duration_sec: 0", + " no_uid_wakeups: 0", " non_application_wakeups: 0", " root_wakeups: 0", " system_wakeups: 2", " total_wakeups: 5", - " unrouted_wakeups: 0", " >", ">", "events <", @@ -179,11 +179,11 @@ public class NetdEventListenerServiceTest { " wakeup_stats <", " application_wakeups: 2", " duration_sec: 0", + " no_uid_wakeups: 2", " non_application_wakeups: 1", " root_wakeups: 2", " system_wakeups: 3", " total_wakeups: 10", - " unrouted_wakeups: 2", " >", ">", "version: 2\n"); |